From ce4a2e435268a2eeb5578cbb4ff70bfaaed0eef9 Mon Sep 17 00:00:00 2001 From: fat Date: Sun, 29 Dec 2013 17:53:59 -0800 Subject: fixes #11288 - Vertical scroll position of modal saves between openings --- dist/js/bootstrap.js | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) (limited to 'dist/js/bootstrap.js') diff --git a/dist/js/bootstrap.js b/dist/js/bootstrap.js index a62bc17bc..4e15cf199 100644 --- a/dist/js/bootstrap.js +++ b/dist/js/bootstrap.js @@ -787,9 +787,13 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery" this.$backdrop = this.isShown = null - if (this.options.remote) this.$element.find('.modal-content').load(this.options.remote, $.proxy(function () { - this.$element.trigger('loaded.bs.modal') - }, this)) + if (this.options.remote) { + this.$element + .find('.modal-content') + .load(this.options.remote, $.proxy(function () { + this.$element.trigger('loaded.bs.modal') + }, this)) + } } Modal.DEFAULTS = { @@ -823,7 +827,9 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery" that.$element.appendTo(document.body) // don't move modals dom position } - that.$element.show() + that.$element + .show() + .scrollTop(0) if (transition) { that.$element[0].offsetWidth // force reflow -- cgit v1.2.3