diff options
| author | Mark Otto <[email protected]> | 2014-10-28 22:57:26 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2014-10-28 22:57:26 -0700 |
| commit | c4b053a0131e93a206429ee2575dd67fd9508e12 (patch) | |
| tree | be93b1e96719a75830a6ea6277ed5c042e9dad75 /js/button.js | |
| parent | bf3be5a456b3f6699a7832957dc0d1fbf6ac1590 (diff) | |
| parent | 45b59f4307da4c343c605abe41b4909ba632abf1 (diff) | |
| download | bootstrap-c4b053a0131e93a206429ee2575dd67fd9508e12.tar.xz bootstrap-c4b053a0131e93a206429ee2575dd67fd9508e12.zip | |
Merge branch 'master' into cursor_var
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) |