aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
diff options
context:
space:
mode:
authorBob Remeika <bob.remeika@gmail.com>2009-10-07 23:21:30 -0700
committerStefan Penner <stefan.penner@gmail.com>2010-01-27 12:44:30 -0600
commit5491a663da4bc8a26eb40fb59491199ce253d140 (patch)
tree9be06ad4d200e59723bd92f7c242ecb2f00d9742 /actionpack
parent9c12e66748ea96a1f869946cac68259b13a70e86 (diff)
downloadrails-5491a663da4bc8a26eb40fb59491199ce253d140.tar.gz
rails-5491a663da4bc8a26eb40fb59491199ce253d140.tar.bz2
rails-5491a663da4bc8a26eb40fb59491199ce253d140.zip
Changed observe_field to field_observer
Diffstat (limited to 'actionpack')
-rw-r--r--actionpack/lib/action_view/helpers/ajax_helper.rb2
-rw-r--r--actionpack/test/javascript/ajax_test.rb2
2 files changed, 2 insertions, 2 deletions
diff --git a/actionpack/lib/action_view/helpers/ajax_helper.rb b/actionpack/lib/action_view/helpers/ajax_helper.rb
index b94eb6c973..8707378738 100644
--- a/actionpack/lib/action_view/helpers/ajax_helper.rb
+++ b/actionpack/lib/action_view/helpers/ajax_helper.rb
@@ -102,7 +102,7 @@ module ActionView
options[:name] = name
<<-SCRIPT
- <script type="application/json" data-js-type="observe_field">
+ <script type="application/json" data-js-type="field_observer">
//<![CDATA[
#{options.to_json}
// ]]>
diff --git a/actionpack/test/javascript/ajax_test.rb b/actionpack/test/javascript/ajax_test.rb
index 90aa2821ec..41bfdbd9b9 100644
--- a/actionpack/test/javascript/ajax_test.rb
+++ b/actionpack/test/javascript/ajax_test.rb
@@ -354,7 +354,7 @@ class ObserveFieldTest < AjaxTestCase
test "basic" do
assert_html field,
- %w(script type="application/json" data-js-type="observe_field")
+ %w(script type="application/json" data-js-type="field_observer")
end
test "using a url string" do