diff options
| author | Matthew Eagar <meagar@gmail.com> | 2017-01-26 08:32:05 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-01-26 08:32:05 -0500 |
| commit | 4cf981f84637022bcf225afd3f13e088d3b0d154 (patch) | |
| tree | 88421e27bcf10b4dc4ae0beae62d2e8c198b8454 /actionview/app | |
| parent | 255babc98b650db7469653aba6405a60efc9e608 (diff) | |
| parent | f543b97fcc52168119d4e016eb50afbda702e601 (diff) | |
| download | rails-4cf981f84637022bcf225afd3f13e088d3b0d154.tar.gz rails-4cf981f84637022bcf225afd3f13e088d3b0d154.tar.bz2 rails-4cf981f84637022bcf225afd3f13e088d3b0d154.zip | |
Merge branch 'master' into fix-missing-partial-iteration
Diffstat (limited to 'actionview/app')
| -rw-r--r-- | actionview/app/assets/javascripts/utils/event.coffee | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/actionview/app/assets/javascripts/utils/event.coffee b/actionview/app/assets/javascripts/utils/event.coffee index 049b2a3ecd..d25fe8e546 100644 --- a/actionview/app/assets/javascripts/utils/event.coffee +++ b/actionview/app/assets/javascripts/utils/event.coffee @@ -13,7 +13,7 @@ if typeof CustomEvent is 'function' evt CustomEvent.prototype = window.Event.prototype -# Triggers an custom event on an element and returns false if the event result is false +# Triggers a custom event on an element and returns false if the event result is false fire = Rails.fire = (obj, name, data) -> event = new CustomEvent( name, |