Adding logic so that applies even w/ the mask enabled.

anutron · Sep 10, 2012 · 069352b · 069352b
1 parent 899c4b0
commit 069352b
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 10 deletions.
diff --git a/Source/Behaviors/Behavior.BS.Tabs.js b/Source/Behaviors/Behavior.BS.Tabs.js
@@ -44,6 +44,22 @@ provides: [Behavior.BS.Tabs]
 		var tab = instance.tabs[now];
 		var section = tab.retrieve('section');
 		instance.fireEvent('active', [now, section, tab]);
+
+		var sections = instance.tabs.map(function(tab){
+			return tab.retrieve('section');
+		});
+
+		el.addEvent('click:relay(a[href^=#])', function(event, link){
+			if (link.get('href') == "#") return;
+			var target = el.getElement(link.get('href'));
+			if (instance.tabs.contains(target)) return;
+			if (!target) api.warn('Could not switch tab; no section found for ' + link.get('href'));
+			if (sections.contains(target)) {
+				event.preventDefault();
+				instance.show(sections.indexOf(target));
+			}
+		});
+
 	});
 
 })();
diff --git a/Source/UI/Bootstrap.Popup.js b/Source/UI/Bootstrap.Popup.js
@@ -162,17 +162,13 @@ Bootstrap.Popup = new Class({
 	_makeMask: function(){
 		if (this.options.mask){
 			if (!this._mask){
-				this._mask = new Element('div.modal-backdrop', {
-					events: {
-						click: this.bound.hide
-					}
-				});
-				if (this._checkAnimate()){
-					this._mask.addClass('fade');
-				}
+				this._mask = new Element('div.modal-backdrop');
+				if (this._checkAnimate()) this._mask.addClass('fade');
 			}
-		} else if (this.options.closeOnClickOut){
-			document.id(document.body).addEvent('click', this.bound.hide);
+		}
+		if (this.options.closeOnClickOut){
+			if (this._mask) this._mask.addEvent('click', this.bound.hide);
+			else document.id(document.body).addEvent('click', this.bound.hide);
 		}
 	}