Latest master merge

dist/basic/jquery.qtip.css

@@ -1,4 +1,4 @@
-/*! qTip2 - Pretty powerful tooltips - v2.0.0 - 2012-11-02
+/*! qTip2 - Pretty powerful tooltips - v2.0.0 - 2012-11-15
 * http://craigsworks.com/projects/qtip2/
 * Copyright (c) 2012 Craig Michael Thompson; Licensed MIT, GPL */
 

dist/basic/jquery.qtip.js

@@ -1,4 +1,4 @@
-/*! qTip2 - Pretty powerful tooltips - v2.0.0 - 2012-11-02
+/*! qTip2 - Pretty powerful tooltips - v2.0.0 - 2012-11-15
 * http://craigsworks.com/projects/qtip2/
 * Copyright (c) 2012 Craig Michael Thompson; Licensed MIT, GPL */
 

dist/jquery.qtip.css

@@ -1,4 +1,4 @@
-/*! qTip2 - Pretty powerful tooltips - v2.0.0 - 2012-11-02
+/*! qTip2 - Pretty powerful tooltips - v2.0.0 - 2012-11-15
 * http://craigsworks.com/projects/qtip2/
 * Copyright (c) 2012 Craig Michael Thompson; Licensed MIT, GPL */
 
@@ -589,3 +589,8 @@
 		-ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=70)";
 	}
 
+
+/* IE6 Modal plugin fix */
+#qtip-overlay.ie6-fix{
+	position: absolute !important;
+}

dist/jquery.qtip.js

@@ -1,4 +1,4 @@
-/*! qTip2 - Pretty powerful tooltips - v2.0.0 - 2012-11-02
+/*! qTip2 - Pretty powerful tooltips - v2.0.0 - 2012-11-15
 * http://craigsworks.com/projects/qtip2/
 * Copyright (c) 2012 Craig Michael Thompson; Licensed MIT, GPL */
 
@@ -2767,7 +2767,7 @@ function Modal(api)
 
 		create: function()
 		{
-			var elem = $(overlaySelector);
+			var elem = $(overlaySelector), win = $(window);
 
 			// Return if overlay is already rendered
 			if(elem.length) {
@@ -2787,11 +2787,11 @@ function Modal(api)
 			// Update position on window resize or scroll
 			function resize() {
 				overlay.css({
-					height: $(window).height(),
-					width: $(window).width()
+					height: win.height(),
+					width: win.width()
 				});
 			}
-			$(window).unbind(globalNamespace).bind('resize'+globalNamespace, resize);
+			win.unbind(globalNamespace).bind('resize'+globalNamespace, resize);
 			resize(); // Fire it initially too
 
 			return overlay;
@@ -3220,6 +3220,7 @@ function IE6(api)
 		namespace = '.ie6-' + api.id,
 		bgiframe = $('select, object').length < 1,
 		isDrawing = 0,
+		modalProcessed = FALSE,
 		redrawContainer;
 
 	api.checks.ie6 = {
@@ -3229,6 +3230,8 @@ function IE6(api)
 	$.extend(self, {
 		init: function()
 		{
+			var win = $(window), scroll;
+
 			// Create the BGIFrame element if needed
 			if(bgiframe) {
 				elems.bgiframe = $('<iframe class="qtip-bgiframe" frameborder="0" tabindex="-1" src="javascript:\'\';" ' +
@@ -3248,6 +3251,19 @@ function IE6(api)
 
 			// Set dimensions
 			self.redraw();
+
+			// Fixup modal plugin if present too
+			if(elems.overlay && !modalProcessed) {
+				scroll = function() {
+					elems.overlay[0].style.top = win.scrollTop() + 'px';
+				};
+				win.bind('scroll.qtip-ie6, resize.qtip-ie6', scroll);
+				scroll(); // Fire it initially too
+
+				elem.overlay.addClass('ie6-fix'); // Add fix class
+
+				modalProcessed = TRUE; // Set flag
+			}
 		},
 
 		adjustBGIFrame: function()

grunt.js

@@ -35,7 +35,7 @@ module.exports = function(grunt) {
 			modal: { js: '<%=dirs.src%>/modal/modal.js', css: '<%=dirs.src%>/modal/modal.css' },
 			viewport: { js: '<%=dirs.src%>/viewport/viewport.js' },
 			imagemap: { js: '<%=dirs.src%>/imagemap/imagemap.js' },
-			ie6: { js: '<%=dirs.src%>/ie6/ie6.js' }
+			ie6: { js: '<%=dirs.src%>/ie6/ie6.js', css: '<%=dirs.src%>/ie6/ie6.css' }
 		},
 
 		// Actual tasks

src/ie6/ie6.css

@@ -0,0 +1,4 @@
+/* IE6 Modal plugin fix */
+#qtip-overlay.ie6-fix{
+	position: absolute !important;
+}

src/ie6/ie6.js

@@ -11,6 +11,7 @@ function IE6(api)
 		namespace = '.ie6-' + api.id,
 		bgiframe = $('select, object').length < 1,
 		isDrawing = 0,
+		modalProcessed = FALSE,
 		redrawContainer;
 
 	api.checks.ie6 = {
@@ -20,6 +21,8 @@ function IE6(api)
 	$.extend(self, {
 		init: function()
 		{
+			var win = $(window), scroll;
+
 			// Create the BGIFrame element if needed
 			if(bgiframe) {
 				elems.bgiframe = $('<iframe class="qtip-bgiframe" frameborder="0" tabindex="-1" src="javascript:\'\';" ' +
@@ -39,6 +42,19 @@ function IE6(api)
 
 			// Set dimensions
 			self.redraw();
+
+			// Fixup modal plugin if present too
+			if(elems.overlay && !modalProcessed) {
+				scroll = function() {
+					elems.overlay[0].style.top = win.scrollTop() + 'px';
+				};
+				win.bind('scroll.qtip-ie6, resize.qtip-ie6', scroll);
+				scroll(); // Fire it initially too
+
+				elem.overlay.addClass('ie6-fix'); // Add fix class
+
+				modalProcessed = TRUE; // Set flag
+			}
 		},
 
 		adjustBGIFrame: function()

src/modal/modal.js

@@ -152,7 +152,7 @@ function Modal(api)
 
 		create: function()
 		{
-			var elem = $(overlaySelector);
+			var elem = $(overlaySelector), win = $(window);
 
 			// Return if overlay is already rendered
 			if(elem.length) {
@@ -172,11 +172,11 @@ function Modal(api)
 			// Update position on window resize or scroll
 			function resize() {
 				overlay.css({
-					height: $(window).height(),
-					width: $(window).width()
+					height: win.height(),
+					width: win.width()
 				});
 			}
-			$(window).unbind(globalNamespace).bind('resize'+globalNamespace, resize);
+			win.unbind(globalNamespace).bind('resize'+globalNamespace, resize);
 			resize(); // Fire it initially too
 
 			return overlay;