Merge pull request twbs#14457 from hnrch02/button-set-val-after-event-loop

hnrch02 · hnrch02 · commit e851b8685a13 · 2014-10-29T04:28:22.000+01:00
Change value of stateful button after event loop
diff --git a/js/button.js b/js/button.js
@@ -35,10 +35,10 @@
 
     if (data.resetText == null) $el.data('resetText', $el[val]())
 
-    $el[val](data[state] == null ? this.options[state] : data[state])
-
     // push to event loop to allow forms to submit
     setTimeout($.proxy(function () {
+      $el[val](data[state] == null ? this.options[state] : data[state])
+
       if (state == 'loadingText') {
         this.isLoading = true
         $el.addClass(d).attr(d, d)
diff --git a/js/tests/unit/button.js b/js/tests/unit/button.js
@@ -33,9 +33,9 @@ $(function () {
     var $btn = $('<button class="btn" data-loading-text="fat">mdo</button>')
     equal($btn.html(), 'mdo', 'btn text equals mdo')
     $btn.bootstrapButton('loading')
-    equal($btn.html(), 'fat', 'btn text equals fat')
     stop()
     setTimeout(function () {
+      equal($btn.html(), 'fat', 'btn text equals fat')
       ok($btn[0].hasAttribute('disabled'), 'btn is disabled')
       ok($btn.hasClass('disabled'), 'btn has disabled class')
       start()
@@ -46,16 +46,16 @@ $(function () {
     var $btn = $('<button class="btn" data-loading-text="fat">mdo</button>')
     equal($btn.html(), 'mdo', 'btn text equals mdo')
     $btn.bootstrapButton('loading')
-    equal($btn.html(), 'fat', 'btn text equals fat')
     stop()
     setTimeout(function () {
+      equal($btn.html(), 'fat', 'btn text equals fat')
       ok($btn[0].hasAttribute('disabled'), 'btn is disabled')
       ok($btn.hasClass('disabled'), 'btn has disabled class')
       start()
       stop()
       $btn.bootstrapButton('reset')
-      equal($btn.html(), 'mdo', 'btn text equals mdo')
       setTimeout(function () {
+        equal($btn.html(), 'mdo', 'btn text equals mdo')
         ok(!$btn[0].hasAttribute('disabled'), 'btn is not disabled')
         ok(!$btn.hasClass('disabled'), 'btn does not have disabled class')
         start()
@@ -67,16 +67,16 @@ $(function () {
     var $btn = $('<button class="btn" data-loading-text="fat"/>')
     equal($btn.html(), '', 'btn text equals ""')
     $btn.bootstrapButton('loading')
-    equal($btn.html(), 'fat', 'btn text equals fat')
     stop()
     setTimeout(function () {
+      equal($btn.html(), 'fat', 'btn text equals fat')
       ok($btn[0].hasAttribute('disabled'), 'btn is disabled')
       ok($btn.hasClass('disabled'), 'btn has disabled class')
       start()
       stop()
       $btn.bootstrapButton('reset')
-      equal($btn.html(), '', 'btn text equals ""')
       setTimeout(function () {
+        equal($btn.html(), '', 'btn text equals ""')
         ok(!$btn[0].hasAttribute('disabled'), 'btn is not disabled')
         ok(!$btn.hasClass('disabled'), 'btn does not have disabled class')
         start()
