.set() no longer requires tooltip to be rendered. Fixed hide/show .se…

…t() calls
qTip2 · Apr 8, 2011 · 1ab8137 · 1ab8137
1 parent d2a0297
commit 1ab8137
Show file tree

Hide file tree

Showing 5 changed files with 30 additions and 40 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: Thu Apr 7 20:07:06 2011 +0100
+* Date: Fri Apr 8 15:54:19 2011 +0100
 */
 
 /* 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: Thu Apr 7 20:07:06 2011 +0100
+* Date: Fri Apr 8 15:54:19 2011 +0100
 */
 
 "use strict"; // Enable ECMAScript "strict" operation for this function. See more: http://ejohn.org/blog/ecmascript-5-strict-mode-json-and-more/
@@ -639,12 +639,15 @@ function QTip(target, options, id, attr)
 		'^(show|hide).(event|target|fixed|delay|inactive)$': function(obj, o, v, p, match) {
 			// Setup arguments
 			var args = [1,0,0];
-			args[match[0] === 'show' ? 'push' : 'unshift'](0);
+			args[match[1] === 'show' ? 'push' : 'unshift'](0);
 
 			unassignEvents.apply(self, args);
 			assignEvents.apply(self, [1,1,0,0]);
 		},
-		'^show.ready$': function() { if(!self.rendered) { self.show(); } },
+		'^show.ready$': function() {
+			if(!self.rendered) { self.render(1); }
+			else { self.show(); }
+		},
 
 		// Style checks
 		'^style.classes$': function(obj, o, v) { 
@@ -782,30 +785,22 @@ function QTip(target, options, id, attr)
 
 		set: function(option, value)
 		{
-			var rmove = /^position.(my|at|adjust|target|container)|style|content/i,
+			var rmove = /^position\.(my|at|adjust|target|container)|style|content|show\.ready/i,
 				reposition = FALSE,
 				checks = self.checks,
 				name;
 
 			function callback(notation, args) {
 				var category, rule, match;
 
-				if(self.rendered) {
-					for(category in checks) {
-						for(rule in checks[category]) {
-							if(match = (new RegExp(rule, 'i')).exec(notation)) {
-								args.push(match);
-								checks[category][rule].apply(self, args);
-							}
+				for(category in checks) {
+					for(rule in checks[category]) {
+						if(match = (new RegExp(rule, 'i')).exec(notation)) {
+							args.push(match);
+							checks[category][rule].apply(self, args);
 						}
 					}
 				}
-
-				// If we're not rendered and show.ready was set, render it
-				else if(notation === 'show.ready' && args[2]) {
-					isPositioning = 0; isDrawing = 0;
-					self.render(TRUE);
-				}
 			}
 
 			// Convert singular option/value pair into object form
@@ -817,7 +812,7 @@ function QTip(target, options, id, attr)
 			// Set all of the defined options to their new values
 			$.each(option, function(notation, value) {
 				var obj = convertNotation( notation.toLowerCase() ), previous;
-				
+
 				// Set new obj value
 				previous = obj[0][ obj[1] ];
 				obj[0][ obj[1] ] = 'object' === typeof value && value.nodeType ? $(value) : value;

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/core.js b/src/core.js
@@ -597,12 +597,15 @@ function QTip(target, options, id, attr)
 		'^(show|hide).(event|target|fixed|delay|inactive)$': function(obj, o, v, p, match) {
 			// Setup arguments
 			var args = [1,0,0];
-			args[match[0] === 'show' ? 'push' : 'unshift'](0);
+			args[match[1] === 'show' ? 'push' : 'unshift'](0);
 
 			unassignEvents.apply(self, args);
 			assignEvents.apply(self, [1,1,0,0]);
 		},
-		'^show.ready$': function() { if(!self.rendered) { self.show(); } },
+		'^show.ready$': function() {
+			if(!self.rendered) { self.render(1); }
+			else { self.show(); }
+		},
 
 		// Style checks
 		'^style.classes$': function(obj, o, v) { 
@@ -740,30 +743,22 @@ function QTip(target, options, id, attr)
 
 		set: function(option, value)
 		{
-			var rmove = /^position.(my|at|adjust|target|container)|style|content/i,
+			var rmove = /^position\.(my|at|adjust|target|container)|style|content|show\.ready/i,
 				reposition = FALSE,
 				checks = self.checks,
 				name;
 
 			function callback(notation, args) {
 				var category, rule, match;
 
-				if(self.rendered) {
-					for(category in checks) {
-						for(rule in checks[category]) {
-							if(match = (new RegExp(rule, 'i')).exec(notation)) {
-								args.push(match);
-								checks[category][rule].apply(self, args);
-							}
+				for(category in checks) {
+					for(rule in checks[category]) {
+						if(match = (new RegExp(rule, 'i')).exec(notation)) {
+							args.push(match);
+							checks[category][rule].apply(self, args);
 						}
 					}
 				}
-
-				// If we're not rendered and show.ready was set, render it
-				else if(notation === 'show.ready' && args[2]) {
-					isPositioning = 0; isDrawing = 0;
-					self.render(TRUE);
-				}
 			}
 
 			// Convert singular option/value pair into object form
@@ -775,7 +770,7 @@ function QTip(target, options, id, attr)
 			// Set all of the defined options to their new values
 			$.each(option, function(notation, value) {
 				var obj = convertNotation( notation.toLowerCase() ), previous;
-				
+
 				// Set new obj value
 				previous = obj[0][ obj[1] ];
 				obj[0][ obj[1] ] = 'object' === typeof value && value.nodeType ? $(value) : value;