aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVipul A M <vipulnsward@gmail.com>2019-02-21 01:45:57 +0530
committerGitHub <noreply@github.com>2019-02-21 01:45:57 +0530
commit0f70b025839f4df9267de0d5a7fb23d4db1a0c83 (patch)
tree6d6b5052e6ac5d77920add685c3f0fed303be7ba
parent4650874073bef4f02da3c2b0bfc4ba2a6fd5d562 (diff)
parent955eac5a5282cad348fef882465f3bd01c4d52b9 (diff)
downloadrails-0f70b025839f4df9267de0d5a7fb23d4db1a0c83.tar.gz
rails-0f70b025839f4df9267de0d5a7fb23d4db1a0c83.tar.bz2
rails-0f70b025839f4df9267de0d5a7fb23d4db1a0c83.zip
Merge pull request #35342 from alkesh26/actionview-typo-fixes
[ci skip] actionview typo fixes.
-rw-r--r--actionview/app/assets/javascripts/rails-ujs/utils/event.coffee2
-rw-r--r--actionview/lib/action_view/base.rb2
2 files changed, 2 insertions, 2 deletions
diff --git a/actionview/app/assets/javascripts/rails-ujs/utils/event.coffee b/actionview/app/assets/javascripts/rails-ujs/utils/event.coffee
index a7eee52060..768d9683d4 100644
--- a/actionview/app/assets/javascripts/rails-ujs/utils/event.coffee
+++ b/actionview/app/assets/javascripts/rails-ujs/utils/event.coffee
@@ -27,7 +27,7 @@ if typeof CustomEvent isnt 'function'
# obj::
# a native DOM element
# name::
-# string that corrspends to the event you want to trigger
+# string that corresponds to the event you want to trigger
# e.g. 'click', 'submit'
# data::
# data you want to pass when you dispatch an event
diff --git a/actionview/lib/action_view/base.rb b/actionview/lib/action_view/base.rb
index 22d1895560..c4565ca272 100644
--- a/actionview/lib/action_view/base.rb
+++ b/actionview/lib/action_view/base.rb
@@ -253,7 +253,7 @@ module ActionView #:nodoc:
else
ActiveSupport::Deprecation.warn <<~eowarn
ActionView::Base instances should be constructed with a lookup context,
- assigments, and a controller.
+ assignments, and a controller.
eowarn
@lookup_context = self.class.build_lookup_context(lookup_context)
end