diff options
| author | Jacob Thornton <jacobthornton@gmail.com> | 2012-06-01 21:53:47 +0400 |
|---|---|---|
| committer | Jacob Thornton <jacobthornton@gmail.com> | 2012-06-01 21:53:47 +0400 |
| commit | 5657ab46c5351d5a5718eff3e8f7acf5cb43f752 (patch) | |
| tree | ef81c0025662070b5a0e265f5c30155189f74e6f /docs/assets/js/bootstrap.js | |
| parent | a85c8fe74e2bea9c99ad405dd667035b5307e31e (diff) | |
| parent | 4eaeea81fd909e6711f57049fc4372f4045fa5aa (diff) | |
Merge branch '2.0.4-wip'
Diffstat (limited to 'docs/assets/js/bootstrap.js')
| -rw-r--r-- | docs/assets/js/bootstrap.js | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/docs/assets/js/bootstrap.js b/docs/assets/js/bootstrap.js index 7244954107..7b267fc23f 100644 --- a/docs/assets/js/bootstrap.js +++ b/docs/assets/js/bootstrap.js @@ -968,9 +968,9 @@ , leave: function (e) { var self = $(e.currentTarget)[this.type](this._options).data(this.type) + if (this.timeout) clearTimeout(this.timeout) if (!self.options.delay || !self.options.delay.hide) return self.hide() - clearTimeout(this.timeout) self.hoverState = 'out' this.timeout = setTimeout(function() { if (self.hoverState == 'out') self.hide() @@ -1156,7 +1156,8 @@ , delay: 0 } -}(window.jQuery);/* =========================================================== +}(window.jQuery); +/* =========================================================== * bootstrap-popover.js v2.0.3 * http://twitter.github.com/bootstrap/javascript.html#popovers * =========================================================== |