From 100b3dc7812c3de5e9344a02a1ee44a4ad796592 Mon Sep 17 00:00:00 2001 From: Sebastian Martinez Date: Fri, 19 Mar 2010 21:50:26 -0300 Subject: [PATCH] do not support 'data-url' anymore --- actionpack/lib/action_view/helpers/url_helper.rb | 2 -- .../app/templates/public/javascripts/rails.js | 3 +-- 2 files changed, 1 insertions(+), 4 deletions(-) diff --git a/actionpack/lib/action_view/helpers/url_helper.rb b/actionpack/lib/action_view/helpers/url_helper.rb index 79232e2..bc7302e 100644 --- a/actionpack/lib/action_view/helpers/url_helper.rb +++ b/actionpack/lib/action_view/helpers/url_helper.rb @@ -586,8 +586,6 @@ module ActionView add_confirm_to_attributes!(html_options, confirm) if confirm add_method_to_attributes!(html_options, method) if method - html_options["data-url"] = options[:url] if options.is_a?(Hash) && options[:url] - html_options end diff --git a/railties/lib/generators/rails/app/templates/public/javascripts/rails.js b/railties/lib/generators/rails/app/templates/public/javascripts/rails.js index f7ddba3..7342e1b 100644 --- a/railties/lib/generators/rails/app/templates/public/javascripts/rails.js +++ b/railties/lib/generators/rails/app/templates/public/javascripts/rails.js @@ -15,8 +15,7 @@ document.observe("dom:loaded", function() { params = element.serialize(true); } else { method = element.readAttribute('data-method') || 'get'; - // TODO: data-url support is going away, just use href - url = element.readAttribute('data-url') || element.readAttribute('href'); + url = element.readAttribute('href'); params = {}; } -- 1.6.3.3