change where modal loads content -– fixes #10105, #9318, #9459

fe839e6e · fat · 1fc08c19 · fe839e6e · fe839e6e · fe839e6e
Commit fe839e6e authored 11 years ago by fat
Expand all Hide whitespace changes
Inline Side-by-side

Showing

with 4 additions and 4 deletions
+4 -4
--- 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 = {

--- a/dist/js/bootstrap.min.js
+++ b/dist/js/bootstrap.min.js
--- a/docs-assets/js/raw-files.js
+++ b/docs-assets/js/raw-files.js
--- a/js/modal.js
+++ b/js/modal.js
@@ -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 = {