Fixed bug in notation converter

qTip2 · Feb 9, 2011 · 2037b20 · 2037b20
1 parent 75abd09
commit 2037b20
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 30 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 Feb 8 23:07:43 2011 +0000
+* Date: Tue Feb 8 23:26:26 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: Tue Feb 8 23:07:43 2011 +0000
+* Date: Tue Feb 8 23:26:26 2011 +0000
 */
 
 "use strict"; // Enable ECMAScript "strict" operation for this function. See more: http://ejohn.org/blog/ecmascript-5-strict-mode-json-and-more/
@@ -158,24 +158,17 @@ function QTip(target, options, id, attr)
 	*/
 	function convertNotation(notation)
 	{
-		var i, obj,
+		var i = 0, obj, option = options, 
 
 		// Split notation into array
-		actual = notation.split('.'),
-
-		// Locate required option
-		option = options[ actual[0] ];
+		levels = notation.split('.');
 
 		// Loop through
-		for(i = 1; i < actual.length; i+=1) {
-			obj = option[ actual[i] ];
-			if(typeof obj === 'object' && !obj.jquery && !obj.precedance && !obj.url) {
-				option = option[ actual[i] ];
-			}
-			else { break; }
+		while( option = option[ levels[i++] ] ) {
+			if(i < levels.length) { obj = option; }
 		}
 
-		return actual[i] !== undefined ? [option, actual[i] ] : [options, actual[0]];
+		return [obj || options, levels.pop()];
 	}
 
 	function isVisible() {

diff --git a/dist/jquery.qtip.min.js b/dist/jquery.qtip.min.js