diff options
| author | Xavier Noria <fxn@hashref.com> | 2011-02-21 11:42:26 +0100 |
|---|---|---|
| committer | Xavier Noria <fxn@hashref.com> | 2011-02-21 11:42:26 +0100 |
| commit | f826e058355606d1b0503b0395519728335324f4 (patch) | |
| tree | 4ad040efe6e5691bb408e8ebc0b6df4a216a1730 /railties/lib/rails/generators | |
| parent | cd12c369961a612f6b083fc0e3b877cf59b737f4 (diff) | |
| parent | b481574a33764e2db1caf01c233a9c9ac9723780 (diff) | |
| download | rails-f826e058355606d1b0503b0395519728335324f4.tar.gz rails-f826e058355606d1b0503b0395519728335324f4.tar.bz2 rails-f826e058355606d1b0503b0395519728335324f4.zip | |
Merge branch 'master' of git://github.com/lifo/docrails
Diffstat (limited to 'railties/lib/rails/generators')
| -rw-r--r-- | railties/lib/rails/generators/rails/app/templates/public/javascripts/jquery.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/railties/lib/rails/generators/rails/app/templates/public/javascripts/jquery.js b/railties/lib/rails/generators/rails/app/templates/public/javascripts/jquery.js index 5c99a8d4a8..aa3a4f34fd 100644 --- a/railties/lib/rails/generators/rails/app/templates/public/javascripts/jquery.js +++ b/railties/lib/rails/generators/rails/app/templates/public/javascripts/jquery.js @@ -2136,7 +2136,7 @@ jQuery.event = { eventHandle = elemData.handle; if ( typeof events === "function" ) { - // On plain objects events is a fn that holds the the data + // On plain objects events is a fn that holds the data // which prevents this data from being JSON serialized // the function does not need to be called, it just contains the data eventHandle = events.handle; |