Small fix to the ajax.loading functionality to ensure there's no prob…

…lem with custom effects
qTip2 · Sep 14, 2011 · 0d36d3e · 0d36d3e
1 parent 437b5af
commit 0d36d3e
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 21 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 Sep 13 17:05:46 2011 +0100
+* Date: Wed Sep 14 00:29:45 2011 +0100
 */
 
 /*jslint browser: true, onevar: true, undef: true, nomen: true, bitwise: true, regexp: true, newcap: true, immed: true, strict: true */

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 Sep 13 17:05:46 2011 +0100
+* Date: Wed Sep 14 00:29:45 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: Tue Sep 13 17:05:46 2011 +0100
+* Date: Wed Sep 14 00:29:45 2011 +0100
 */
 
 /*jslint browser: true, onevar: true, undef: true, nomen: true, bitwise: true, regexp: true, newcap: true, immed: true, strict: true */
@@ -1990,17 +1990,18 @@ function Ajax(api)
 
 		load: function(event, first)
 		{
-			// Make sure default event hasn't been prevented
-			if(event && event.isDefaultPrevented()) { return self; }
-
+
 			var hasSelector = opts.url.indexOf(' '),
 				url = opts.url,
 				selector,
 				hideFirst = opts.once && !opts.loading && first;
 
-			// If loading option is disabled, hide the tooltip until content is retrieved (first time only)
-			if(hideFirst) { tooltip.css('visibility', 'hidden'); }
+			// If loading option is disabled, prevent the tooltip showing until we've completed the request
+			if(hideFirst) { try{ event.preventDefault(); } catch(e) {} }
 
+			// Make sure default event hasn't been prevented
+			else if(event && event.isDefaultPrevented()) { return self; }
+
 			// Check if user delcared a content selector like in .load()
 			if(hasSelector > -1) {
 				selector = url.substr(hasSelector);
@@ -2010,7 +2011,7 @@ function Ajax(api)
 			// Define common after callback for both success/error handlers
 			function after() {
 				// Re-display tip if loading and first time, and reset first flag
-				if(hideFirst) { tooltip.css('visibility', ''); first = FALSE; }
+				if(hideFirst) { api.show(event.originalEvent); first = FALSE; }
 
 				// Call users complete if it was defined
 				if($.isFunction(opts.complete)) { opts.complete.apply(this, arguments); }
@@ -2038,8 +2039,6 @@ function Ajax(api)
 
 			// Setup $.ajax option object and process the request
 			$.ajax( $.extend({ success: successHandler, error: errorHandler, context: api }, opts, { url: url, complete: after }) );
-
-			return self;
 		}
 	});
 

diff --git a/dist/jquery.qtip.min.js b/dist/jquery.qtip.min.js
diff --git a/src/ajax/ajax.js b/src/ajax/ajax.js
@@ -37,17 +37,18 @@ function Ajax(api)
 
 		load: function(event, first)
 		{
-			// Make sure default event hasn't been prevented
-			if(event && event.isDefaultPrevented()) { return self; }
-
+
 			var hasSelector = opts.url.indexOf(' '),
 				url = opts.url,
 				selector,
 				hideFirst = opts.once && !opts.loading && first;
 
-			// If loading option is disabled, hide the tooltip until content is retrieved (first time only)
-			if(hideFirst) { tooltip.css('visibility', 'hidden'); }
+			// If loading option is disabled, prevent the tooltip showing until we've completed the request
+			if(hideFirst) { try{ event.preventDefault(); } catch(e) {} }
 
+			// Make sure default event hasn't been prevented
+			else if(event && event.isDefaultPrevented()) { return self; }
+
 			// Check if user delcared a content selector like in .load()
 			if(hasSelector > -1) {
 				selector = url.substr(hasSelector);
@@ -57,7 +58,7 @@ function Ajax(api)
 			// Define common after callback for both success/error handlers
 			function after() {
 				// Re-display tip if loading and first time, and reset first flag
-				if(hideFirst) { tooltip.css('visibility', ''); first = FALSE; }
+				if(hideFirst) { api.show(event.originalEvent); first = FALSE; }
 
 				// Call users complete if it was defined
 				if($.isFunction(opts.complete)) { opts.complete.apply(this, arguments); }
@@ -85,8 +86,6 @@ function Ajax(api)
 
 			// Setup $.ajax option object and process the request
 			$.ajax( $.extend({ success: successHandler, error: errorHandler, context: api }, opts, { url: url, complete: after }) );
-
-			return self;
 		}
 	});