diff options
| author | fat <[email protected]> | 2013-02-05 20:34:39 -0800 |
|---|---|---|
| committer | fat <[email protected]> | 2013-02-05 20:34:39 -0800 |
| commit | a866a51a2ecac07748501f0375a324ebb57002f2 (patch) | |
| tree | 35888cbf1e9e5ca6f541c19594f3880b9c31e78c /docs/assets/js/bootstrap.js | |
| parent | 566380b257e5322a014fe52f935381ff86637f43 (diff) | |
| download | bootstrap-a866a51a2ecac07748501f0375a324ebb57002f2.tar.xz bootstrap-a866a51a2ecac07748501f0375a324ebb57002f2.zip | |
clear interval in cycle + rebuild
Diffstat (limited to 'docs/assets/js/bootstrap.js')
| -rw-r--r-- | docs/assets/js/bootstrap.js | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/docs/assets/js/bootstrap.js b/docs/assets/js/bootstrap.js index bd123341d..f6ed1ed73 100644 --- a/docs/assets/js/bootstrap.js +++ b/docs/assets/js/bootstrap.js @@ -300,6 +300,7 @@ cycle: function (e) { if (!e) this.paused = false + if (this.interval) clearInterval(this.interval); this.options.interval && !this.paused && (this.interval = setInterval($.proxy(this.next, this), this.options.interval)) @@ -788,13 +789,14 @@ * =================================== */ $(document) - .on('click.dropdown.data-api touchstart.dropdown.data-api', clearMenus) - .on('click.dropdown.data-api touchstart.dropdown.data-api', '.dropdown form', function (e) { e.stopPropagation() }) - .on('touchstart.dropdown.data-api', '.dropdown-menu', function (e) { e.stopPropagation() }) - .on('click.dropdown.data-api touchstart.dropdown.data-api' , toggle, Dropdown.prototype.toggle) - .on('keydown.dropdown.data-api touchstart.dropdown.data-api', toggle + ', [role=menu]' , Dropdown.prototype.keydown) + .on('click.dropdown.data-api', clearMenus) + .on('click.dropdown.data-api', '.dropdown form', function (e) { e.stopPropagation() }) + .on('.dropdown-menu', function (e) { e.stopPropagation() }) + .on('click.dropdown.data-api' , toggle, Dropdown.prototype.toggle) + .on('keydown.dropdown.data-api', toggle + ', [role=menu]' , Dropdown.prototype.keydown) -}(window.jQuery);/* ========================================================= +}(window.jQuery); +/* ========================================================= * bootstrap-modal.js v2.3.0 * http://twitter.github.com/bootstrap/javascript.html#modals * ========================================================= @@ -1252,7 +1254,7 @@ , getPosition: function () { var el = this.$element[0] - return $.extend({}, el.getBoundingClientRect ? el.getBoundingClientRect() : { + return $.extend({}, (typeof el.getBoundingClientRect == 'function') ? el.getBoundingClientRect() : { width: el.offsetWidth , height: el.offsetHeight }, this.$element.offset()) |