From a87b150bc771e3bc6e62fd2ca8a4ea938c48e28c Mon Sep 17 00:00:00 2001 From: fat Date: Mon, 23 Dec 2013 22:08:43 -0800 Subject: fixes #10205 Scrollspy Doesn't Support Chinese ID Targets http://mathiasbynens.be/notes/html5-id-class --- dist/js/bootstrap.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'dist/js/bootstrap.js') diff --git a/dist/js/bootstrap.js b/dist/js/bootstrap.js index 3623bba59..bbe4784a2 100644 --- a/dist/js/bootstrap.js +++ b/dist/js/bootstrap.js @@ -1532,7 +1532,7 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery" .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 -- cgit v1.2.3 From 1fc08c1973b30a1fc57a241a5bb68566cfc1d981 Mon Sep 17 00:00:00 2001 From: fat Date: Mon, 23 Dec 2013 22:57:39 -0800 Subject: fixes #10568 - kill hoverstate info once command has been executed --- dist/js/bootstrap.js | 2 ++ 1 file changed, 2 insertions(+) (limited to 'dist/js/bootstrap.js') diff --git a/dist/js/bootstrap.js b/dist/js/bootstrap.js index bbe4784a2..767898ad5 100644 --- a/dist/js/bootstrap.js +++ b/dist/js/bootstrap.js @@ -1179,6 +1179,7 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery" var calculatedOffset = this.getCalculatedOffset(placement, pos, actualWidth, actualHeight) this.applyPlacement(calculatedOffset, placement) + this.hoverState = null this.$element.trigger('shown.bs.' + this.type) } } @@ -1267,6 +1268,7 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery" .emulateTransitionEnd(150) : complete() + this.hoverState = null this.$element.trigger('hidden.bs.' + this.type) return this -- cgit v1.2.3 From fe839e6e78fa07ab422b5d38189bc8f8929cead0 Mon Sep 17 00:00:00 2001 From: fat Date: Wed, 18 Dec 2013 21:38:35 -0800 Subject: =?UTF-8?q?change=20where=20modal=20loads=20content=20-=E2=80=93?= =?UTF-8?q?=20fixes=20#10105,=20#9318,=20#9459?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- dist/js/bootstrap.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'dist/js/bootstrap.js') diff --git a/dist/js/bootstrap.js b/dist/js/bootstrap.js index 767898ad5..bb90ebabe 100644 --- a/dist/js/bootstrap.js +++ b/dist/js/bootstrap.js @@ -785,7 +785,7 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery" 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 = { -- cgit v1.2.3