Additional fix to tip colour detection

qTip2 · Dec 8, 2010 · 5bedd42 · 5bedd42
1 parent 064b55c
commit 5bedd42
Show file tree

Hide file tree

Showing 5 changed files with 47 additions and 45 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: Wed Dec 8 19:03:35 2010 +0000
+* Date: Wed Dec 8 19:15:20 2010 +0000
 */
 
 .ui-tooltip-accessible{

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: Wed Dec 8 19:03:35 2010 +0000
+* Date: Wed Dec 8 19:15:20 2010 +0000
 */
 
 "use strict"; // Enable ECMAScript "strict" operation for this function. See more: http://ejohn.org/blog/ecmascript-5-strict-mode-json-and-more/
@@ -1934,11 +1934,12 @@ function Tip(qTip, command)
 				precedance = self.corner[ self.corner.precedance ],
 				borderSide = 'border-' + precedance + '-color',
 				invalid = /rgba?\(0, 0, 0(, 0)?\)|transparent/i,
-				elemFill = elems.titlebar.length && corner.y === 'top' ? elems.titlebar : elems.wrapper,
-				elemBorder = qTip.options.style.widget ? elems.content : elems.wrapper;
+				isTitleTop = elems.titlebar.length && corner.y === 'top',
+				elemFill = isTitleTop ? elems.titlebar : elems.wrapper,
+				elemBorder = isTitleTop ? elems.wrapper : qTip.options.style.widget ? elems.content : elems.wrapper;
 
 			// Detect tip colours
-			color.fill = tip.css('background-color', '').css('border', '').css('background-color') || 'transparent';
+			color.fill = tip.css({ backgroundColor: '', border: '' }).css('background-color') || 'transparent';
 			color.border = tip.get(0).style ? tip.get(0).style['border' + precedance.charAt(0) + precedance.substr(1) + 'Color'] : tip.css(borderSide) || 'transparent';
 
 			// Make sure colours are valid and reset background and border properties