Merge pull request #412 from pothibo/master

Links with [disabled] attribute set will not trigger AJAX

Author: rafaelfranca

Diff for: src/rails.js

@@ -24,7 +24,7 @@
 
   $.rails = rails = {
     // Link elements bound by jquery-ujs
-    linkClickSelector: 'a[data-confirm], a[data-method], a[data-remote], a[data-disable-with], a[data-disable]',
+    linkClickSelector: 'a[data-confirm], a[data-method], a[data-remote]:not([disabled]), a[data-disable-with], a[data-disable]',
 
     // Button elements bound by jquery-ujs
     buttonClickSelector: 'button[data-remote]:not([form]):not(form button), button[data-confirm]:not([form]):not(form button)',

Diff for: test/public/test/data-remote.js

@@ -19,6 +19,12 @@ module('data-remote', {
         method: 'post',
         id: 'my-remote-form'
       }))
+      .append($('<a />', {
+        href: '/echo',
+        'data-remote': 'true',
+        disabled: 'disabled',
+        text: 'Disabed link'
+      }))
       .find('form').append($('<input type="text" name="user_name" value="john">'));
 
   }
@@ -85,6 +91,19 @@ asyncTest('clicking on a link with data-remote attribute', 5, function() {
     .trigger('click');
 });
 
+asyncTest('clicking on a link with disabled attribute', 0, function() {
+  $('a[disabled]')
+  .bind("ajax:before", function(e, data, status, xhr) {
+    App.assertCallbackNotInvoked('ajax:success')
+  })
+  .bind('ajax:complete', function() { start() })
+  .trigger('click')
+
+  setTimeout(function() {
+    start();
+  }, 13);
+});
+
 asyncTest('clicking on a button with data-remote attribute', 5, function() {
   $('button[data-remote]')
     .bind('ajax:success', function(e, data, status, xhr) {