Merge pull request #228 from texel/infinite-timer

Basic sanity check to make sure dimension polling doesn't wait forever.

dist/jquery.qtip.basic.js

@@ -9,7 +9,7 @@
 *   http://en.wikipedia.org/wiki/MIT_License
 *   http://en.wikipedia.org/wiki/GNU_General_Public_License
 *
-* Date: Sat Aug 27 17:34:23 2011 +0100
+* Date: Sun Aug 28 14:05:44 2011 -0700
 */
 
 /*jslint browser: true, onevar: true, undef: true, nomen: true, bitwise: true, regexp: true, newcap: true, immed: true, strict: true */
@@ -389,13 +389,20 @@ function QTip(target, options, id, attr)
 				// Skip if the src is already present
 				if(srcs[elem.src] !== undefined) { return; }
 
+        // Keep track of how many times we poll for image dimensions.
+        // If it doesn't return in a reasonable amount of time, it's better
+        // to display the tooltip, rather than hold up the queue.
+        var iterations = 0, maxIterations = 3;
+
 				(function timer(){
 					// When the dimensions are found, remove the image from the queue
-					if(elem.height || elem.width) { return imageLoad(elem); }
+					if(elem.height || elem.width || (iterations > maxIterations)) { return imageLoad(elem); }
+
+          iterations += 1;
 
 					// Restart timer
 					self.timers.img[elem.src] = setTimeout(timer, 700);
-				}());
+				}());  
 
 				// Also apply regular load/error event handlers
 				$(elem).bind('error'+namespace+' load'+namespace, function(){ imageLoad(this); });
@@ -1932,4 +1939,4 @@ QTIP.defaults = {
 };
 
 
-}(jQuery, window));
+}(jQuery, window));

dist/jquery.qtip.css

@@ -9,7 +9,7 @@
 *   http://en.wikipedia.org/wiki/MIT_License
 *   http://en.wikipedia.org/wiki/GNU_General_Public_License
 *
-* Date: Sat Aug 27 17:34:23 2011 +0100
+* Date: Sun Aug 28 14:05:44 2011 -0700
 */
 
 /* Core qTip styles */
@@ -559,4 +559,4 @@
 .ui-tooltip:not(.ie9haxors) div.ui-tooltip-titlebar{
 	filter: none;
 	-ms-filter: none;
-}
+}

dist/jquery.qtip.js

@@ -9,7 +9,7 @@
 *   http://en.wikipedia.org/wiki/MIT_License
 *   http://en.wikipedia.org/wiki/GNU_General_Public_License
 *
-* Date: Sat Aug 27 17:34:23 2011 +0100
+* Date: Sun Aug 28 14:05:44 2011 -0700
 */
 
 /*jslint browser: true, onevar: true, undef: true, nomen: true, bitwise: true, regexp: true, newcap: true, immed: true, strict: true */
@@ -389,13 +389,20 @@ function QTip(target, options, id, attr)
 				// Skip if the src is already present
 				if(srcs[elem.src] !== undefined) { return; }
 
+        // Keep track of how many times we poll for image dimensions.
+        // If it doesn't return in a reasonable amount of time, it's better
+        // to display the tooltip, rather than hold up the queue.
+        var iterations = 0, maxIterations = 3;
+
 				(function timer(){
 					// When the dimensions are found, remove the image from the queue
-					if(elem.height || elem.width) { return imageLoad(elem); }
+					if(elem.height || elem.width || (iterations > maxIterations)) { return imageLoad(elem); }
+
+          iterations += 1;
 
 					// Restart timer
 					self.timers.img[elem.src] = setTimeout(timer, 700);
-				}());
+				}());  
 
 				// Also apply regular load/error event handlers
 				$(elem).bind('error'+namespace+' load'+namespace, function(){ imageLoad(this); });
@@ -3169,4 +3176,4 @@ $.extend(TRUE, QTIP.defaults, {
 });
 
 
-}(jQuery, window));
+}(jQuery, window));

src/core.js

@@ -326,13 +326,20 @@ function QTip(target, options, id, attr)
 				// Skip if the src is already present
 				if(srcs[elem.src] !== undefined) { return; }
 
+        // Keep track of how many times we poll for image dimensions.
+        // If it doesn't return in a reasonable amount of time, it's better
+        // to display the tooltip, rather than hold up the queue.
+        var iterations = 0, maxIterations = 3;
+
 				(function timer(){
 					// When the dimensions are found, remove the image from the queue
-					if(elem.height || elem.width) { return imageLoad(elem); }
+					if(elem.height || elem.width || (iterations > maxIterations)) { return imageLoad(elem); }
+
+          iterations += 1;
 
 					// Restart timer
 					self.timers.img[elem.src] = setTimeout(timer, 700);
-				}());
+				}());  
 
 				// Also apply regular load/error event handlers
 				$(elem).bind('error'+namespace+' load'+namespace, function(){ imageLoad(this); });