Fixed problem with set() and content.ajax

qTip2 · Feb 8, 2011 · 75abd09 · 75abd09
1 parent 630a22e
commit 75abd09
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 8 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: Sat Feb 5 23:05:34 2011 +0000
+* Date: Tue Feb 8 23:07:43 2011 +0000
 */
 
 /* Fluid class for determining actual width in IE */

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: Sat Feb 5 23:05:34 2011 +0000
+* Date: Tue Feb 8 23:07:43 2011 +0000
 */
 
 "use strict"; // Enable ECMAScript "strict" operation for this function. See more: http://ejohn.org/blog/ecmascript-5-strict-mode-json-and-more/
@@ -169,7 +169,7 @@ function QTip(target, options, id, attr)
 		// Loop through
 		for(i = 1; i < actual.length; i+=1) {
 			obj = option[ actual[i] ];
-			if(typeof obj === 'object' && !obj.jquery && !obj.precedance) {
+			if(typeof obj === 'object' && !obj.jquery && !obj.precedance && !obj.url) {
 				option = option[ actual[i] ];
 			}
 			else { break; }
@@ -1699,6 +1699,9 @@ QTIP.defaults = {
 			else if(opts && opts.url) {
 				self.load();
 			}
+			else {
+				self.destroy();
+			}
 		}
 	};
 

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/ajax.js b/src/ajax.js
@@ -14,6 +14,9 @@ function Ajax(api)
 			else if(opts && opts.url) {
 				self.load();
 			}
+			else {
+				self.destroy();
+			}
 		}
 	};
 

diff --git a/src/core.js b/src/core.js
@@ -127,7 +127,7 @@ function QTip(target, options, id, attr)
 		// Loop through
 		for(i = 1; i < actual.length; i+=1) {
 			obj = option[ actual[i] ];
-			if(typeof obj === 'object' && !obj.jquery && !obj.precedance) {
+			if(typeof obj === 'object' && !obj.jquery && !obj.precedance && !obj.url) {
 				option = option[ actual[i] ];
 			}
 			else { break; }