clones/bootstrap
1
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2024-09-22 02:57:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #11933 from twbs/fat-10105

Browse Source 
change where modal loads content -– fixes #10105, #9318, #9459
This commit is contained in:
Jacob 2013-12-23 23:31:11 -08:00
commit 237b85a7c1
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dist/js/bootstrap.js vendored
View File

@ -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 = {

2
dist/js/bootstrap.min.js vendored
View File

File diff suppressed because one or more lines are too long

2
docs-assets/js/raw-files.js
View File

File diff suppressed because one or more lines are too long

2
js/modal.js
View File

@ -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 = {