mirrors/bootstrap
2
0
Fork 0
mirror of https://github.com/tenrok/bootstrap.git synced 2026-06-05 16:42:29 +03:00
Code Activity

Merge branch 'master' of github.com:twbs/bootstrap

Browse Source 
Conflicts:
	docs-assets/js/raw-files.js
This commit is contained in:
Mark Otto
2013-12-24 12:17:48 -08:00
parent 679c786237 25390716ea
commit 5c2dfbf33b
27 changed files with 36 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
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 = {