couple bug fixes

FaisalAbid · Nov 13, 2012 · 4368f65 · 4368f65
1 parent 80c9296
commit 4368f65
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/js/bootstrap-modal.js b/js/bootstrap-modal.js
@@ -52,6 +52,8 @@
 			var that = this, 
 				e = $.Event('show');
 
+			if (this.isShown) return;
+
 			this.$element.triggerHandler(e);
 
 			if (e.isDefaultPrevented()) return;

diff --git a/js/bootstrap-modalmanager.js b/js/bootstrap-modalmanager.js
@@ -125,7 +125,7 @@
 			}
 
 			this.removeContainer(modal);
-			
+
 			this.setFocus();
 		},