Merge branch 'master' into data-disable

Conflicts:
	src/rails.js
	test/public/test/data-disable.js

Author: lucasmazza

src/rails.js

@@ -185,13 +185,20 @@
       form.submit();
     },
 
+    // Helper function that returns form elements that match the specified CSS selector
+    // If form is actually a "form" element this will return associated elements outside the from that have
+    // the html form attribute set
+    formElements: function(form, selector) {
+      return form.is('form') ? $(form[0].elements).filter(selector) : form.find(selector)
+    },
+
     /* Disables form elements:
       - Caches element value in 'ujs:enable-with' data store
       - Replaces element text with value of 'data-disable-with' attribute
       - Sets disabled property to true
     */
     disableFormElements: function(form) {
-      form.find(rails.disableSelector).each(function() {
+      rails.formElements(form, rails.disableSelector).each(function() {
         var element, method, replacement;
 
         element = $(this);
@@ -212,7 +219,7 @@
       - Sets disabled property to false
     */
     enableFormElements: function(form) {
-      form.find(rails.enableSelector).each(function() {
+      rails.formElements(form, rails.enableSelector).each(function() {
         var element = $(this), method = element.is('button') ? 'html' : 'val';
         if (element.data('ujs:enable-with')) element[method](element.data('ujs:enable-with'));
         element.prop('disabled', false);

test/public/test/data-disable-with.js

@@ -10,7 +10,8 @@ module('data-disable-with', {
 
     $('#qunit-fixture').append($('<form />', {
       action: '/echo',
-      method: 'post'
+      method: 'post',
+      id: 'not_remote'
     }))
       .find('form:last')
       // WEEIRDD: the form won't submit to an iframe if the button is name="submit" (??!)
@@ -21,6 +22,15 @@ module('data-disable-with', {
       href: '/echo',
       'data-disable-with': 'clicking...'
     }));
+
+
+    $('#qunit-fixture').append($('<input />', {
+      type: 'submit',
+      form: 'not_remote',
+      'data-disable-with': 'form attr submitting',
+      name: 'submit3',
+      value: 'Form Attr Submit'
+    }));
   },
   teardown: function() {
     $(document).unbind('iframe:loaded');
@@ -110,6 +120,27 @@ asyncTest('form[data-remote] input[data-disable-with] is replaced with disabled
   }).trigger('submit');
 });
 
+asyncTest('form input[type=submit][data-disable-with] using "form" attribute disables', 6, function() {
+  var form = $('#not_remote'), input = $('input[form=not_remote]');
+  App.checkEnabledState(input, 'Form Attr Submit');
+
+  // WEEIRDD: attaching this handler makes the test work in IE7
+  $(document).bind('iframe:loading', function(e, form) {});
+
+  $(document).bind('iframe:loaded', function(e, data) {
+    setTimeout(function() {
+      App.checkDisabledState(input, 'form attr submitting');
+      start();
+    }, 30);
+  });
+  form.trigger('submit');
+
+  setTimeout(function() {
+    App.checkDisabledState(input, 'form attr submitting');
+  }, 30);
+
+});
+
 asyncTest('form[data-remote] textarea[data-disable-with] attribute', 3, function() {
   var form = $('form[data-remote]'),
       textarea = $('<textarea data-disable-with="processing ..." name="user_bio">born, lived, died.</textarea>').appendTo(form);