Fixed tip canvas colour issue

qTip2 · May 9, 2011 · e34e454 · e34e454
1 parent bd6c090
commit e34e454
Show file tree

Hide file tree

Showing 6 changed files with 23 additions and 19 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: Mon May 9 00:36:47 2011 +0100
+* Date: Mon May 9 00:37:46 2011 +0100
 */
 
 "use strict"; // Enable ECMAScript "strict" operation for this function. See more: http://ejohn.org/blog/ecmascript-5-strict-mode-json-and-more/

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: Mon May 9 00:36:47 2011 +0100
+* Date: Mon May 9 00:37:46 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: Mon May 9 00:36:47 2011 +0100
+* Date: Mon May 9 00:37:46 2011 +0100
 */
 
 "use strict"; // Enable ECMAScript "strict" operation for this function. See more: http://ejohn.org/blog/ecmascript-5-strict-mode-json-and-more/
@@ -2235,21 +2235,23 @@ function Tip(qTip, command)
 			tooltip.addClass(fluid);
 
 			// Detect tip colours from CSS styles
-			fill = tip.css(backgroundColor) || transparent;
-			border = tip[0].style[ borderSideCamel ];
+			fill = tip.css(backgroundColor);
+			border = tip[0].style[ borderSideCamel ] || tooltip.css(borderSide);
 
 			// Make sure colours are valid
 			if(!fill || invalid.test(fill)) {
-				color.fill = colorElem.css(backgroundColor);
+				color.fill = colorElem.css(backgroundColor) || transparent;
 				if(invalid.test(color.fill)) {
 					color.fill = tooltip.css(backgroundColor) || fill;
 				}
 			}
 			if(!border || invalid.test(border)) {
-				color.border = tooltip.css(borderSide);
+				color.border = tooltip.css(borderSide) || transparent;
 				if(invalid.test(color.border) || color.border === bodyBorder) {
-					color.border = colorElem.css(borderSide);
-					if(color.border === contentColour) { color.border = border; }
+					color.border = colorElem.css(borderSide) || transparent;
+					if(color.border === contentColour || invalid.test(color.border)) {
+						color.border = border;
+					}
 				}
 			}
 

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/tips.js b/src/tips.js
@@ -284,21 +284,23 @@ function Tip(qTip, command)
 			tooltip.addClass(fluid);
 
 			// Detect tip colours from CSS styles
-			fill = tip.css(backgroundColor) || transparent;
-			border = tip[0].style[ borderSideCamel ];
+			fill = tip.css(backgroundColor);
+			border = tip[0].style[ borderSideCamel ] || tooltip.css(borderSide);
 
 			// Make sure colours are valid
 			if(!fill || invalid.test(fill)) {
-				color.fill = colorElem.css(backgroundColor);
+				color.fill = colorElem.css(backgroundColor) || transparent;
 				if(invalid.test(color.fill)) {
 					color.fill = tooltip.css(backgroundColor) || fill;
 				}
 			}
 			if(!border || invalid.test(border)) {
-				color.border = tooltip.css(borderSide);
+				color.border = tooltip.css(borderSide) || transparent;
 				if(invalid.test(color.border) || color.border === bodyBorder) {
-					color.border = colorElem.css(borderSide);
-					if(color.border === contentColour) { color.border = border; }
+					color.border = colorElem.css(borderSide) || transparent;
+					if(color.border === contentColour || invalid.test(color.border)) {
+						color.border = border;
+					}
 				}
 			}