diff options
| author | Heinrich Fenkart <[email protected]> | 2014-10-29 04:28:22 +0100 |
|---|---|---|
| committer | Heinrich Fenkart <[email protected]> | 2014-10-29 04:28:22 +0100 |
| commit | e851b8685a13ee4c8ab79ca517dcdbb49c891b9a (patch) | |
| tree | c26f1704482184f9dcb3dc8f376cb7c5cdfaa84b /js/button.js | |
| parent | 2aac61ed175164fdc885573a0ca0d49306d20851 (diff) | |
| parent | c207b5b66b2f41472b706b9e37557c6105eb1a80 (diff) | |
| download | bootstrap-e851b8685a13ee4c8ab79ca517dcdbb49c891b9a.tar.xz bootstrap-e851b8685a13ee4c8ab79ca517dcdbb49c891b9a.zip | |
Merge pull request #14457 from hnrch02/button-set-val-after-event-loop
Change value of stateful button after event loop
Diffstat (limited to 'js/button.js')
| -rw-r--r-- | js/button.js | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/js/button.js b/js/button.js index 901e47a6e..7a449980a 100644 --- 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) |