Returning false from a content.text callback to prevents the tooltip …

…from showing
qTip2 · Aug 25, 2010 · 75187fe · 75187fe
1 parent 5977b6a
commit 75187fe
Show file tree

Hide file tree

Showing 5 changed files with 42 additions and 42 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: Tue Aug 24 19:05:23 2010 +0100
+* Date: Wed Aug 25 19:13:02 2010 +0100
 */
 
 .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: Tue Aug 24 19:05:23 2010 +0100
+* Date: Wed Aug 25 19:13:02 2010 +0100
 */
 
 "use strict"; // Enable ECMAScript "strict" operation for this function. See more: http://ejohn.org/blog/ecmascript-5-strict-mode-json-and-more/
@@ -42,8 +42,8 @@ function sanitizeOptions(opts)
 				};
 			}
 
-			var noContent = opts.content.text || FALSE;
-			if((noContent.length < 1 || (!noContent && !noContent.attr) || ('object' === typeof noContent && !noContent.jquery)) && !$.isFunction(noContent)) {
+			var noContent = $.isFunction(opts.content.text) ? opts.content.text() : opts.content.text || FALSE;
+			if((!noContent && !noContent.attr) || noContent.length < 1 || ('object' === typeof noContent && !noContent.jquery)) {
 				opts.content.text = FALSE;
 			}