Merge pull request #432 from balvig/blank_input_disable_with_bug

Disabled blank inputs don't reset on ajax submit
rails · Sep 1, 2015 · 49ffc9b · 49ffc9b
2 parents e677b20 + c7e5f8f
commit 49ffc9b
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 1 deletion.
diff --git a/src/rails.js b/src/rails.js
@@ -270,7 +270,7 @@
 
     enableFormElement: function(element) {
       var method = element.is('button') ? 'html' : 'val';
-      if (element.data('ujs:enable-with')) element[method](element.data('ujs:enable-with'));
+      if (typeof element.data('ujs:enable-with') !== 'undefined') element[method](element.data('ujs:enable-with'));
       element.prop('disabled', false);
     },
 

diff --git a/test/public/test/data-disable-with.js b/test/public/test/data-disable-with.js
@@ -61,6 +61,24 @@ asyncTest('form input field with "data-disable-with" attribute', 7, function() {
   App.checkDisabledState(input, 'processing ...');
 });
 
+asyncTest('blank form input field with "data-disable-with" attribute', 7, function() {
+  var form = $('form[data-remote]'), input = form.find('input[type=text]');
+
+  input.val('');
+  App.checkEnabledState(input, '');
+
+  form.bind('ajax:success', function(e, data) {
+    setTimeout(function() {
+      App.checkEnabledState(input, '');
+      equal(data.params.user_name, '');
+      start();
+    }, 13);
+  });
+  form.trigger('submit');
+
+  App.checkDisabledState(input, 'processing ...');
+});
+
 asyncTest('form button with "data-disable-with" attribute', 6, function() {
   var form = $('form[data-remote]'), button = $('<button data-disable-with="submitting ..." name="submit2">Submit</button>');
   form.append(button);