Added code to prevent parallel calling of reposition method

qTip2 · Dec 9, 2010 · 1ea1e32 · 1ea1e32
1 parent 3770742
commit 1ea1e32
Show file tree

Hide file tree

Showing 5 changed files with 30 additions and 22 deletions.
diff --git a/dist/jquery.qtip.css b/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: Thu Dec 9 04:00:53 2010 +0000
+* Date: Thu Dec 9 04:03:40 2010 +0000
 */
 
 .ui-tooltip-accessible{

diff --git a/dist/jquery.qtip.js b/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: Thu Dec 9 04:00:53 2010 +0000
+* Date: Thu Dec 9 04:03:40 2010 +0000
 */
 
 "use strict"; // Enable ECMAScript "strict" operation for this function. See more: http://ejohn.org/blog/ecmascript-5-strict-mode-json-and-more/
@@ -974,7 +974,11 @@ function QTip(target, options, id)
 
 		reposition: function(event)
 		{
-			if(self.rendered === FALSE) { return FALSE; }
+			// Return if tooltip isn't rendered or we're already processing a previous call
+			if(self.rendered === FALSE || self.cache.processing) { return FALSE; }
+
+			// Set processing flag and continue otherwise
+			else { self.cache.processing = 1; }
 
 			var target = options.position.target,
 				tooltip = self.elements.tooltip,
@@ -1039,9 +1043,6 @@ function QTip(target, options, id)
 				scrollTop: viewport.scrollTop()
 			};
 
-
-
-
 			// Check if mouse was the target
 			if(target === 'mouse') {
 				// Force left top to allow flipping
@@ -1138,6 +1139,9 @@ function QTip(target, options, id)
 				tooltip.css(position);
 			}
 
+			// Revoke processing flag now we're done
+			self.cache.processing = 0;
+
 			return self;
 		},
 

diff --git a/dist/jquery.qtip.min.js b/dist/jquery.qtip.min.js
diff --git a/dist/jquery.qtip.pack.js b/dist/jquery.qtip.pack.js
diff --git a/src/core.js b/src/core.js
@@ -949,7 +949,11 @@ function QTip(target, options, id)
 
 		reposition: function(event)
 		{
-			if(self.rendered === FALSE) { return FALSE; }
+			// Return if tooltip isn't rendered or we're already processing a previous call
+			if(self.rendered === FALSE || self.cache.processing) { return FALSE; }
+
+			// Set processing flag and continue otherwise
+			else { self.cache.processing = 1; }
 
 			var target = options.position.target,
 				tooltip = self.elements.tooltip,
@@ -1014,9 +1018,6 @@ function QTip(target, options, id)
 				scrollTop: viewport.scrollTop()
 			};
 
-
-
-
 			// Check if mouse was the target
 			if(target === 'mouse') {
 				// Force left top to allow flipping
@@ -1113,6 +1114,9 @@ function QTip(target, options, id)
 				tooltip.css(position);
 			}
 
+			// Revoke processing flag now we're done
+			self.cache.processing = 0;
+
 			return self;
 		},