diff options
| author | wycats <wycats@gmail.com> | 2010-04-30 11:17:58 -0700 |
|---|---|---|
| committer | wycats <wycats@gmail.com> | 2010-04-30 11:17:58 -0700 |
| commit | 0fe8827bf384cb99ab757236555c7af18793d515 (patch) | |
| tree | a7ac2143c78964cad8ee87d9ff8a1c52abf61249 /actionpack/lib/action_view/helpers/prototype_helper.rb | |
| parent | 91963e9e33eb5a28297323f1346aeb8b643e9d65 (diff) | |
| parent | 6b559474fb7fae0160860fc62752da347af032b2 (diff) | |
| download | rails-0fe8827bf384cb99ab757236555c7af18793d515.tar.gz rails-0fe8827bf384cb99ab757236555c7af18793d515.tar.bz2 rails-0fe8827bf384cb99ab757236555c7af18793d515.zip | |
Merge branch 'master' of github.com:rails/rails
Diffstat (limited to 'actionpack/lib/action_view/helpers/prototype_helper.rb')
| -rw-r--r-- | actionpack/lib/action_view/helpers/prototype_helper.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_view/helpers/prototype_helper.rb b/actionpack/lib/action_view/helpers/prototype_helper.rb index ebe0b4e876..a798c3eaef 100644 --- a/actionpack/lib/action_view/helpers/prototype_helper.rb +++ b/actionpack/lib/action_view/helpers/prototype_helper.rb @@ -767,7 +767,7 @@ module ActionView end def grep(variable, pattern, &block) - enumerate :grep, :variable => variable, :return => true, :method_args => [pattern], :yield_args => %w(value index), &block + enumerate :grep, :variable => variable, :return => true, :method_args => [::ActiveSupport::JSON::Variable.new(pattern.inspect)], :yield_args => %w(value index), &block end def in_groups_of(variable, number, fill_with = nil) |