aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
diff options
context:
space:
mode:
authorBob Remeika <bob.remeika@gmail.com>2009-10-07 20:52:46 -0700
committerStefan Penner <stefan.penner@gmail.com>2010-01-27 12:44:30 -0600
commit9c12e66748ea96a1f869946cac68259b13a70e86 (patch)
tree1c98cdeb3bce46062309b8340d351f0d04c08a9e /actionpack
parentbd65e7f73d6aba48d4baadba916f1652a6c8aade (diff)
downloadrails-9c12e66748ea96a1f869946cac68259b13a70e86.tar.gz
rails-9c12e66748ea96a1f869946cac68259b13a70e86.tar.bz2
rails-9c12e66748ea96a1f869946cac68259b13a70e86.zip
Changed data-rails-type to data-js-type
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 e4684c4992..b94eb6c973 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-rails-type="observe_field">
+ <script type="application/json" data-js-type="observe_field">
//<![CDATA[
#{options.to_json}
// ]]>
diff --git a/actionpack/test/javascript/ajax_test.rb b/actionpack/test/javascript/ajax_test.rb
index fc6928b8c1..90aa2821ec 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-rails-type="observe_field")
+ %w(script type="application/json" data-js-type="observe_field")
end
test "using a url string" do