diff options
| author | Mark Otto <[email protected]> | 2013-12-24 12:17:48 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2013-12-24 12:17:48 -0800 |
| commit | 5c2dfbf33b133a5e31035df970ffa05585eba422 (patch) | |
| tree | 522b5814714b2df5064e441959d515a5ea4a89a0 /js | |
| parent | 679c7862374be9b742862923181302f76b3a8c06 (diff) | |
| parent | 25390716ea2a0bf9cd476858c826775d68c2f1cf (diff) | |
| download | bootstrap-5c2dfbf33b133a5e31035df970ffa05585eba422.tar.xz bootstrap-5c2dfbf33b133a5e31035df970ffa05585eba422.zip | |
Merge branch 'master' of github.com:twbs/bootstrap
Conflicts:
docs-assets/js/raw-files.js
Diffstat (limited to 'js')
| -rw-r--r-- | js/modal.js | 2 | ||||
| -rw-r--r-- | js/scrollspy.js | 2 | ||||
| -rw-r--r-- | js/tooltip.js | 2 |
3 files changed, 4 insertions, 2 deletions
diff --git a/js/modal.js b/js/modal.js index ff22950c3..fe02d71d4 100644 --- a/js/modal.js +++ b/js/modal.js @@ -18,7 +18,7 @@ this.$backdrop = this.isShown = null - if (this.options.remote) this.$element.load(this.options.remote) + if (this.options.remote) this.$element.find('.modal-content').load(this.options.remote) } Modal.DEFAULTS = { diff --git a/js/scrollspy.js b/js/scrollspy.js index 2e341bb89..79fa10e6d 100644 --- a/js/scrollspy.js +++ b/js/scrollspy.js @@ -47,7 +47,7 @@ .map(function () { var $el = $(this) var href = $el.data('target') || $el.attr('href') - var $href = /^#\w/.test(href) && $(href) + var $href = /^#./.test(href) && $(href) return ($href && $href.length diff --git a/js/tooltip.js b/js/tooltip.js index 656234dea..f24876139 100644 --- a/js/tooltip.js +++ b/js/tooltip.js @@ -177,6 +177,7 @@ var calculatedOffset = this.getCalculatedOffset(placement, pos, actualWidth, actualHeight) this.applyPlacement(calculatedOffset, placement) + this.hoverState = null this.$element.trigger('shown.bs.' + this.type) } } @@ -265,6 +266,7 @@ .emulateTransitionEnd(150) : complete() + this.hoverState = null this.$element.trigger('hidden.bs.' + this.type) return this |