Ensure reposition and redraw are only called once during initial render

qTip2 · Jul 25, 2011 · c1809f8 · c1809f8
1 parent 8f540e6
commit c1809f8
Show file tree

Hide file tree

Showing 6 changed files with 28 additions and 19 deletions.
diff --git a/dist/jquery.qtip.basic.js b/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: Mon Jul 25 12:20:22 2011 +0100
+* Date: Mon Jul 25 12:24:43 2011 +0100
 */
 
 /*jslint browser: true, onevar: true, undef: true, nomen: true, bitwise: true, regexp: true, newcap: true, immed: true, strict: true */
@@ -756,9 +756,9 @@ function QTip(target, options, id, attr)
 					})
 				);
 
-			// Set rendered flag and prevent redundant redraw calls for npw
+			// Set rendered flag and prevent redundant redraw/reposition calls for now
 			self.rendered = -1;
-			isDrawing = 1;
+			isDrawing = 1; isPositioning = 1;
 
 			// Update title
 			if(title) { 
@@ -798,10 +798,13 @@ function QTip(target, options, id, attr)
 				callback.originalEvent = cache.event;
 				tooltip.trigger(callback, [self]);
 
+				// Reset flags
+				isDrawing = 0; isPositioning = 0;
+
 				// Redraw the tooltip manually now we're fully rendered
-				isDrawing = 0; self.redraw();
+				self.redraw();
 
-				// Update tooltip position and show tooltip if needed
+				// Show tooltip if needed
 				if(options.show.ready || show) {
 					self.toggle(TRUE, cache.event);
 				}

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: Mon Jul 25 12:20:22 2011 +0100
+* Date: Mon Jul 25 12:24:43 2011 +0100
 */
 
 /* Core qTip styles */

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: Mon Jul 25 12:20:22 2011 +0100
+* Date: Mon Jul 25 12:24:43 2011 +0100
 */
 
 /*jslint browser: true, onevar: true, undef: true, nomen: true, bitwise: true, regexp: true, newcap: true, immed: true, strict: true */
@@ -756,9 +756,9 @@ function QTip(target, options, id, attr)
 					})
 				);
 
-			// Set rendered flag and prevent redundant redraw calls for npw
+			// Set rendered flag and prevent redundant redraw/reposition calls for now
 			self.rendered = -1;
-			isDrawing = 1;
+			isDrawing = 1; isPositioning = 1;
 
 			// Update title
 			if(title) { 
@@ -798,10 +798,13 @@ function QTip(target, options, id, attr)
 				callback.originalEvent = cache.event;
 				tooltip.trigger(callback, [self]);
 
+				// Reset flags
+				isDrawing = 0; isPositioning = 0;
+
 				// Redraw the tooltip manually now we're fully rendered
-				isDrawing = 0; self.redraw();
+				self.redraw();
 
-				// Update tooltip position and show tooltip if needed
+				// Show tooltip if needed
 				if(options.show.ready || show) {
 					self.toggle(TRUE, cache.event);
 				}

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
@@ -693,9 +693,9 @@ function QTip(target, options, id, attr)
 					})
 				);
 
-			// Set rendered flag and prevent redundant redraw calls for npw
+			// Set rendered flag and prevent redundant redraw/reposition calls for now
 			self.rendered = -1;
-			isDrawing = 1;
+			isDrawing = 1; isPositioning = 1;
 
 			// Update title
 			if(title) { 
@@ -735,10 +735,13 @@ function QTip(target, options, id, attr)
 				callback.originalEvent = cache.event;
 				tooltip.trigger(callback, [self]);
 
+				// Reset flags
+				isDrawing = 0; isPositioning = 0;
+
 				// Redraw the tooltip manually now we're fully rendered
-				isDrawing = 0; self.redraw();
+				self.redraw();
 
-				// Update tooltip position and show tooltip if needed
+				// Show tooltip if needed
 				if(options.show.ready || show) {
 					self.toggle(TRUE, cache.event);
 				}