mirrors/bootstrap
2
0
Fork 0
mirror of https://github.com/tenrok/bootstrap.git synced 2026-06-02 16:04:07 +03:00
Code 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
parent 52a964d19b fe839e6e78
commit 237b85a7c1
4 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
dist/js/bootstrap.js
Vendored
+1 -1
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 = {
dist/js/bootstrap.min.js
Vendored
+1 -1
View File
File diff suppressed because one or more lines are too long
docs-assets/js/raw-files.js
+1 -1
View File
File diff suppressed because one or more lines are too long
js/modal.js
+1 -1
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 = {