Fixed bug with show.inactive not working when calling .show() manually

qTip2 · Nov 4, 2011 · 808e124 · 808e124
1 parent 1bf4467
commit 808e124
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 14 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: Fri Nov 4 18:13:21 2011 +0000
+* Date: Fri Nov 4 20:40:57 2011 +0000
 */
 
 /*jslint browser: true, onevar: true, undef: true, nomen: true, bitwise: true, regexp: true, newcap: true, immed: true, strict: true */
@@ -451,9 +451,6 @@ function QTip(target, options, id, attr)
 		{
 			if(tooltip.hasClass(disabled)) { return FALSE; }
 
-			// If set, hide tooltip when inactive for delay period
-			targets.show.trigger('qtip-'+id+'-inactive');
-
 			// Clear hide timers
 			clearTimeout(self.timers.show);
 			clearTimeout(self.timers.hide);
@@ -1032,6 +1029,9 @@ function QTip(target, options, id, attr)
 					callback = $.Event('tooltipvisible');
 					callback.originalEvent = event ? cache.event : NULL;
 					tooltip.trigger(callback, [self]);
+
+					// If set, hide tooltip when inactive for delay period
+					opts.target.trigger('qtip-'+id+'-inactive');
 				}
 				else {
 					// Reset CSS states

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: Fri Nov 4 18:13:21 2011 +0000
+* Date: Fri Nov 4 20:40:57 2011 +0000
 */
 
 /* 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: Fri Nov 4 18:13:21 2011 +0000
+* Date: Fri Nov 4 20:40:57 2011 +0000
 */
 
 /*jslint browser: true, onevar: true, undef: true, nomen: true, bitwise: true, regexp: true, newcap: true, immed: true, strict: true */
@@ -451,9 +451,6 @@ function QTip(target, options, id, attr)
 		{
 			if(tooltip.hasClass(disabled)) { return FALSE; }
 
-			// If set, hide tooltip when inactive for delay period
-			targets.show.trigger('qtip-'+id+'-inactive');
-
 			// Clear hide timers
 			clearTimeout(self.timers.show);
 			clearTimeout(self.timers.hide);
@@ -1032,6 +1029,9 @@ function QTip(target, options, id, attr)
 					callback = $.Event('tooltipvisible');
 					callback.originalEvent = event ? cache.event : NULL;
 					tooltip.trigger(callback, [self]);
+
+					// If set, hide tooltip when inactive for delay period
+					opts.target.trigger('qtip-'+id+'-inactive');
 				}
 				else {
 					// Reset CSS states

diff --git a/dist/jquery.qtip.min.js b/dist/jquery.qtip.min.js
diff --git a/src/core.js b/src/core.js
@@ -388,9 +388,6 @@ function QTip(target, options, id, attr)
 		{
 			if(tooltip.hasClass(disabled)) { return FALSE; }
 
-			// If set, hide tooltip when inactive for delay period
-			targets.show.trigger('qtip-'+id+'-inactive');
-
 			// Clear hide timers
 			clearTimeout(self.timers.show);
 			clearTimeout(self.timers.hide);
@@ -969,6 +966,9 @@ function QTip(target, options, id, attr)
 					callback = $.Event('tooltipvisible');
 					callback.originalEvent = event ? cache.event : NULL;
 					tooltip.trigger(callback, [self]);
+
+					// If set, hide tooltip when inactive for delay period
+					opts.target.trigger('qtip-'+id+'-inactive');
 				}
 				else {
 					// Reset CSS states