diff options
| author | Chris Rebert <[email protected]> | 2014-05-08 16:35:03 -0700 |
|---|---|---|
| committer | Chris Rebert <[email protected]> | 2014-05-08 16:35:03 -0700 |
| commit | cb2ef1eff4cbfad8998f94adf7f61cdf574ca100 (patch) | |
| tree | e435b00ce3961439575462560fe71feea4a8bad5 /dist/js/bootstrap.js | |
| parent | 91607900c017777a2c8346f14dd939d65b66fa9d (diff) | |
| download | bootstrap-cb2ef1eff4cbfad8998f94adf7f61cdf574ca100.tar.xz bootstrap-cb2ef1eff4cbfad8998f94adf7f61cdf574ca100.zip | |
grunt dist
Diffstat (limited to 'dist/js/bootstrap.js')
| -rw-r--r-- | dist/js/bootstrap.js | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/dist/js/bootstrap.js b/dist/js/bootstrap.js index 886209b31..4ce288b22 100644 --- a/dist/js/bootstrap.js +++ b/dist/js/bootstrap.js @@ -99,7 +99,8 @@ if (typeof jQuery === 'undefined') { throw new Error('Bootstrap\'s JavaScript re $parent.removeClass('in') function removeElement() { - $parent.trigger('closed.bs.alert').remove() + // detach from parent, fire event then clean up data + $parent.detach().trigger('closed.bs.alert').remove() } $.support.transition && $parent.hasClass('fade') ? @@ -178,9 +179,9 @@ if (typeof jQuery === 'undefined') { throw new Error('Bootstrap\'s JavaScript re state = state + 'Text' - if (!data.resetText) $el.data('resetText', $el[val]()) + if (data.resetText == null) $el.data('resetText', $el[val]()) - $el[val](data[state] || this.options[state]) + $el[val](data[state] == null ? this.options[state] : data[state]) // push to event loop to allow forms to submit setTimeout($.proxy(function () { @@ -1535,7 +1536,7 @@ if (typeof jQuery === 'undefined') { throw new Error('Bootstrap\'s JavaScript re placement: 'right', trigger: 'click', content: '', - template: '<div class="popover"><div class="arrow"></div><h3 class="popover-title"></h3><div class="popover-content"></div></div>' + template: '<div class="popover" role="tooltip"><div class="arrow"></div><h3 class="popover-title"></h3><div class="popover-content"></div></div>' }) |