diff options
| author | Aaron Patterson <tenderlove@github.com> | 2019-01-11 11:21:53 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-01-11 11:21:53 -0800 |
| commit | 74bef0970fff60eaf5faefde30a23f3c36c0b3ee (patch) | |
| tree | 628b6013130e0d2868b2afbac3f00f24629dbb9c /actionview | |
| parent | 1e923b498492424ae627d7a2c61339148f887503 (diff) | |
| parent | 3a1b2a21965c0cd7bcccff586ce04b029eb4c359 (diff) | |
| download | rails-74bef0970fff60eaf5faefde30a23f3c36c0b3ee.tar.gz rails-74bef0970fff60eaf5faefde30a23f3c36c0b3ee.tar.bz2 rails-74bef0970fff60eaf5faefde30a23f3c36c0b3ee.zip | |
Merge branch 'master' into ac_params_exists
Diffstat (limited to 'actionview')
| -rw-r--r-- | actionview/app/assets/javascripts/README.md | 10 | ||||
| -rw-r--r-- | actionview/lib/action_view/helpers/form_options_helper.rb | 2 | ||||
| -rw-r--r-- | actionview/package.json | 2 |
3 files changed, 7 insertions, 7 deletions
diff --git a/actionview/app/assets/javascripts/README.md b/actionview/app/assets/javascripts/README.md index b74fa1afad..2b110e604f 100644 --- a/actionview/app/assets/javascripts/README.md +++ b/actionview/app/assets/javascripts/README.md @@ -17,11 +17,11 @@ Note that the `data` attributes this library adds are a feature of HTML5. If you ### NPM - npm install rails-ujs --save - + npm install @rails/ujs --save + ### Yarn - - yarn add rails-ujs + + yarn add @rails/ujs Ensure that `.yarnclean` does not include `assets` if you use [yarn autoclean](https://yarnpkg.com/lang/en/docs/cli/autoclean/). @@ -40,7 +40,7 @@ In a conventional Rails application that uses the asset pipeline, require `rails If you're using the Webpacker gem or some other JavaScript bundler, add the following to your main JS file: ```javascript -import Rails from 'rails-ujs'; +import Rails from "@rails/ujs" Rails.start() ``` diff --git a/actionview/lib/action_view/helpers/form_options_helper.rb b/actionview/lib/action_view/helpers/form_options_helper.rb index ebdd96f570..a7747456a4 100644 --- a/actionview/lib/action_view/helpers/form_options_helper.rb +++ b/actionview/lib/action_view/helpers/form_options_helper.rb @@ -654,7 +654,7 @@ module ActionView # # ==== Gotcha # - # The HTML specification says when nothing is select on a collection of radio buttons + # The HTML specification says when nothing is selected on a collection of radio buttons # web browsers do not send any value to server. # Unfortunately this introduces a gotcha: # if a +User+ model has a +category_id+ field and in the form no category is selected, no +category_id+ parameter is sent. So, diff --git a/actionview/package.json b/actionview/package.json index 1f74df79d3..d6cf412c6d 100644 --- a/actionview/package.json +++ b/actionview/package.json @@ -1,5 +1,5 @@ { - "name": "rails-ujs", + "name": "@rails/ujs", "version": "6.0.0-alpha", "description": "Ruby on Rails unobtrusive scripting adapter", "main": "lib/assets/compiled/rails-ujs.js", |