Merge master

2013-03-04 21:30:25 -06:00
parent 947b4a1cb9 ac8d15b509
commit 838bea1402
23 changed files with 261 additions and 261 deletions
--- a/assets/js/plugins/bootstrap/bootstrap-modal.js
+++ b/assets/js/plugins/bootstrap/bootstrap-modal.js
@@ -1,5 +1,5 @@
 /* =========================================================
- * bootstrap-modal.js v2.3.0
+ * bootstrap-modal.js v2.3.1
 * http://twitter.github.com/bootstrap/javascript.html#modals
 * =========================================================
 * Copyright 2012 Twitter, Inc.
@@ -148,7 +148,7 @@
      }

    , removeBackdrop: function () {
-        this.$backdrop.remove()
+        this.$backdrop && this.$backdrop.remove()
        this.$backdrop = null
      }