aboutsummaryrefslogtreecommitdiff
path: root/js/modal.js
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2013-12-18 13:06:47 -0800
committerMark Otto <[email protected]>2013-12-18 13:06:47 -0800
commit5bba8744679ddead8673c003997410c71fc47000 (patch)
tree7cb520f428a788652871240a19a9fcc401ecf9f6 /js/modal.js
parent6315043b1c11c6391f155e0c7299783a13cfee74 (diff)
parent3f577ab86c4e07493d5d24f5fdd3dba30c199400 (diff)
downloadbootstrap-5bba8744679ddead8673c003997410c71fc47000.tar.xz
bootstrap-5bba8744679ddead8673c003997410c71fc47000.zip
Merge branch 'master' into docs_derp
Diffstat (limited to 'js/modal.js')
-rw-r--r--js/modal.js6
1 files changed, 3 insertions, 3 deletions
diff --git a/js/modal.js b/js/modal.js
index c284b4dc6..bcb49708d 100644
--- a/js/modal.js
+++ b/js/modal.js
@@ -33,9 +33,9 @@
}
Modal.DEFAULTS = {
- backdrop: true
- , keyboard: true
- , show: true
+ backdrop: true,
+ keyboard: true,
+ show: true
}
Modal.prototype.toggle = function (_relatedTarget) {