Merge pull request #1 from BrandwatchLtd/brandwatch-fixes

spmason · spmason · commit 168558ca977f · 2015-03-04T14:06:25.000Z
Brandwatch fixes
diff --git a/src/overlay/overlay.js b/src/overlay/overlay.js
@@ -26,10 +26,7 @@
 			closeOnEsc: true,			
 			closeSpeed: 'fast',
 			effect: 'default',
-			
-			// since 1.2. fixed positioning not supported by IE6
-			fixed: !$.browser.msie || $.browser.version > 6, 
-			
+			fixed: true, 
 			left: 'center',		
 			load: false, // 1.2
 			mask: null,  
diff --git a/src/toolbox/toolbox.expose.js b/src/toolbox/toolbox.expose.js
@@ -41,7 +41,7 @@
 	function viewport() {
 				
 		// the horror case
-		if ($.browser.msie) {
+		if ($('html').hasClass('ie')) {
 			
 			// if there are no scrollbars then use window.height
 			var d = $(document).height(), w = $(window).height();
diff --git a/src/tooltip/tooltip.js b/src/tooltip/tooltip.js
@@ -10,6 +10,11 @@
  * Date: @DATE 
  */
 (function($) { 	
+
+	function isIE(){
+		return $('html').hasClass('ie');
+	}
+
 	// static constructs
 	$.tools = $.tools || {version: '@VERSION'};
 	
@@ -69,7 +74,7 @@
 		fade: [
 			function(done) {
 				var conf = this.getConf();
-				if (!$.browser.msie || conf.fadeIE) {
+				if (!isIE() || conf.fadeIE) {
 					this.getTip().fadeTo(conf.fadeInSpeed, conf.opacity, done);
 				}
 				else {
@@ -79,7 +84,7 @@
 			},
 			function(done) {
 				var conf = this.getConf();
-				if (!$.browser.msie || conf.fadeIE) {
+				if (!isIE() || conf.fadeIE) {
 					this.getTip().fadeOut(conf.fadeOutSpeed, done);
 				}
 				else {
