diff options
| author | fat <[email protected]> | 2013-12-29 17:53:59 -0800 |
|---|---|---|
| committer | fat <[email protected]> | 2013-12-29 17:53:59 -0800 |
| commit | ce4a2e435268a2eeb5578cbb4ff70bfaaed0eef9 (patch) | |
| tree | c7afbd31219bb41f5eca75539c430507952aeaab /dist/js/bootstrap.js | |
| parent | 5bf13914e49942409c0b21aeaf2ed756c41bd498 (diff) | |
| download | bootstrap-ce4a2e435268a2eeb5578cbb4ff70bfaaed0eef9.tar.xz bootstrap-ce4a2e435268a2eeb5578cbb4ff70bfaaed0eef9.zip | |
fixes #11288 - Vertical scroll position of modal saves between openings
Diffstat (limited to 'dist/js/bootstrap.js')
| -rw-r--r-- | dist/js/bootstrap.js | 14 |
1 files changed, 10 insertions, 4 deletions
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 |