aboutsummaryrefslogtreecommitdiffstats
path: root/guides/source
diff options
context:
space:
mode:
authorKoichi ITO <koic.ito@gmail.com>2017-06-03 17:31:39 +0900
committerKoichi ITO <koic.ito@gmail.com>2017-06-03 17:32:30 +0900
commit116b70ca7d45f734b888073e847fec113e9f4a7f (patch)
treea2822a63afc1d713dd550e04732bbcb8e1f100f5 /guides/source
parent7e2465c6de86b43028685c0de434e60cb21773d0 (diff)
downloadrails-116b70ca7d45f734b888073e847fec113e9f4a7f.tar.gz
rails-116b70ca7d45f734b888073e847fec113e9f4a7f.tar.bz2
rails-116b70ca7d45f734b888073e847fec113e9f4a7f.zip
Change default application.js included in new Rails app [ci skip]
Diffstat (limited to 'guides/source')
-rw-r--r--guides/source/asset_pipeline.md6
1 files changed, 3 insertions, 3 deletions
diff --git a/guides/source/asset_pipeline.md b/guides/source/asset_pipeline.md
index 22b6b278d7..5d774566dd 100644
--- a/guides/source/asset_pipeline.md
+++ b/guides/source/asset_pipeline.md
@@ -447,15 +447,15 @@ For example, a new Rails application includes a default
```js
// ...
-//= require jquery
-//= require jquery_ujs
+//= require rails-ujs
+//= require turbolinks
//= require_tree .
```
In JavaScript files, Sprockets directives begin with `//=`. In the above case,
the file is using the `require` and the `require_tree` directives. The `require`
directive is used to tell Sprockets the files you wish to require. Here, you are
-requiring the files `jquery.js` and `jquery_ujs.js` that are available somewhere
+requiring the files `rails-ujs.js` and `turbolinks.js` that are available somewhere
in the search path for Sprockets. You need not supply the extensions explicitly.
Sprockets assumes you are requiring a `.js` file when done from within a `.js`
file.