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:29 -0600
commit081e057b174620993bdf4e534f5aba3fe266e88e (patch)
treed9c4765e6d92639a106f9de84adc359462f0349b /actionpack
parentefb70f0f9fa1a33363f8eabb58caf707cba8382d (diff)
downloadrails-081e057b174620993bdf4e534f5aba3fe266e88e.tar.gz
rails-081e057b174620993bdf4e534f5aba3fe266e88e.tar.bz2
rails-081e057b174620993bdf4e534f5aba3fe266e88e.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 510980da08..246ad10371 100644
--- a/actionpack/lib/action_view/helpers/ajax_helper.rb
+++ b/actionpack/lib/action_view/helpers/ajax_helper.rb
@@ -79,7 +79,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