Merge branch 'fix_hide_before_show_bug' of...

Merge branch 'fix_hide_before_show_bug' of https://github.com/aaronj1335/bootstrap into aaronj1335-fix_hide_before_show_bug

js/bootstrap-modal.js

@@ -100,6 +100,10 @@
     , hide: function (e) {
         e && e.preventDefault()
 
+        if (! this.isShown) {
+            return this
+        }
+
         var that = this
         this.isShown = false