Merge pull request twbs#11933 from twbs/fat-10105

change where modal loads content -– fixes twbs#10105, twbs#9318, twbs#9459
lvleysuper · Dec 24, 2013 · 237b85a · 237b85a
2 parents 52a964d + fe839e6
commit 237b85a
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git 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 = {