Make sure child elements of a tooltip target don't trigger an unfocus…

… call
qTip2 · Feb 7, 2012 · df63eaa · df63eaa
1 parent 41e9a84
commit df63eaa
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 11 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: Tue Jan 31 18:16:37 2012 +0000
+* Date: Mon Feb 6 19:01:26 2012 +0000
 */
 
 /*jslint browser: true, onevar: true, undef: true, nomen: true, bitwise: true, regexp: true, newcap: true, immed: true, strict: true */
@@ -552,7 +552,9 @@ function QTip(target, options, id, attr)
 				var $target = $(event.target),
 					enabled = !tooltip.hasClass(disabled) && tooltip.is(':visible');
 
-				if($target[0] !== tooltip[0] && $target.parents(selector).length === 0 && $target.add(target).length > 1 && !$target.attr('disabled')) {
+				if($target[0] !== tooltip[0] && $target.parents(selector).length === 0 && 
+					!$target.closest(target).length && !$target.attr('disabled')
+				) {
 					self.hide(event);
 				}
 			});
@@ -1803,7 +1805,9 @@ PLUGINS = QTIP.plugins = {
 					pos.top -= coffset.top + (parseInt(parent.css('borderTopWidth'), 10) || 0);
 
 					overflow = parent.css('overflow');
-					if(overflow === 'scroll' || overflow === 'auto') { deep++; }
+					if(overflow === 'scroll' || overflow === 'auto') {
+						scroll(parent, 1); deep++;
+					}
 				}
 
 				if(parent[0] === docBody) { break; }

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: Tue Jan 31 18:16:37 2012 +0000
+* Date: Mon Feb 6 19:01:26 2012 +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: Tue Jan 31 18:16:37 2012 +0000
+* Date: Mon Feb 6 19:01:26 2012 +0000
 */
 
 /*jslint browser: true, onevar: true, undef: true, nomen: true, bitwise: true, regexp: true, newcap: true, immed: true, strict: true */
@@ -552,7 +552,9 @@ function QTip(target, options, id, attr)
 				var $target = $(event.target),
 					enabled = !tooltip.hasClass(disabled) && tooltip.is(':visible');
 
-				if($target[0] !== tooltip[0] && $target.parents(selector).length === 0 && $target.add(target).length > 1 && !$target.attr('disabled')) {
+				if($target[0] !== tooltip[0] && $target.parents(selector).length === 0 && 
+					!$target.closest(target).length && !$target.attr('disabled')
+				) {
 					self.hide(event);
 				}
 			});
@@ -1803,7 +1805,9 @@ PLUGINS = QTIP.plugins = {
 					pos.top -= coffset.top + (parseInt(parent.css('borderTopWidth'), 10) || 0);
 
 					overflow = parent.css('overflow');
-					if(overflow === 'scroll' || overflow === 'auto') { deep++; }
+					if(overflow === 'scroll' || overflow === 'auto') {
+						scroll(parent, 1); deep++;
+					}
 				}
 
 				if(parent[0] === docBody) { break; }

diff --git a/dist/jquery.qtip.min.js b/dist/jquery.qtip.min.js
diff --git a/src/core.js b/src/core.js
@@ -489,7 +489,9 @@ function QTip(target, options, id, attr)
 				var $target = $(event.target),
 					enabled = !tooltip.hasClass(disabled) && tooltip.is(':visible');
 
-				if($target[0] !== tooltip[0] && $target.parents(selector).length === 0 && $target.add(target).length > 1 && !$target.attr('disabled')) {
+				if($target[0] !== tooltip[0] && $target.parents(selector).length === 0 && 
+					!$target.closest(target).length && !$target.attr('disabled')
+				) {
 					self.hide(event);
 				}
 			});
@@ -1740,7 +1742,9 @@ PLUGINS = QTIP.plugins = {
 					pos.top -= coffset.top + (parseInt(parent.css('borderTopWidth'), 10) || 0);
 
 					overflow = parent.css('overflow');
-					if(overflow === 'scroll' || overflow === 'auto') { deep++; }
+					if(overflow === 'scroll' || overflow === 'auto') {
+						scroll(parent, 1); deep++;
+					}
 				}
 
 				if(parent[0] === docBody) { break; }