Better border-radius detection for tips plugin. Made post-commit hook…

… executable
qTip2 · Jul 28, 2012 · deb07a7 · deb07a7
1 parent 11fe3b1
commit deb07a7
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 7 deletions.
diff --git a/dist/jquery.qtip.js b/dist/jquery.qtip.js
@@ -2371,10 +2371,11 @@ function Tip(qTip, command)
 			elem = isTitleTop ? elems.titlebar : elems.content,
 			moz = $.browser.mozilla,
 			prefix = moz ? '-moz-' : $.browser.webkit ? '-webkit-' : '',
-			side = corner.y + (moz ? '' : '-') + corner.x,
-			css = prefix + (moz ? 'border-radius-' + side : 'border-' + side + '-radius');
+			nonStandard = 'border-radius-' + corner.y + corner.x,
+			standard = 'border-' + corner.y + '-' + corner.x + '-radius';
 
-		return parseInt(elem.css(css), 10) || parseInt(tooltip.css(css), 10) || 0;
+		function r(c) { console.log(c); return parseInt(elem.css(c), 10) || parseInt(tooltip.css(c), 10); }
+		return r(standard) || r(prefix + standard) || r(prefix + nonStandard) || r(nonStandard) || 0;
 	}
 
 	function calculateSize(corner) {

diff --git a/dist/jquery.qtip.min.js b/dist/jquery.qtip.min.js
diff --git a/hooks/post-commit b/hooks/post-commit
diff --git a/src/tips/tips.js b/src/tips/tips.js
@@ -206,10 +206,11 @@ function Tip(qTip, command)
 			elem = isTitleTop ? elems.titlebar : elems.content,
 			moz = $.browser.mozilla,
 			prefix = moz ? '-moz-' : $.browser.webkit ? '-webkit-' : '',
-			side = corner.y + (moz ? '' : '-') + corner.x,
-			css = prefix + (moz ? 'border-radius-' + side : 'border-' + side + '-radius');
+			nonStandard = 'border-radius-' + corner.y + corner.x,
+			standard = 'border-' + corner.y + '-' + corner.x + '-radius';
 
-		return parseInt(elem.css(css), 10) || parseInt(tooltip.css(css), 10) || 0;
+		function r(c) { console.log(c); return parseInt(elem.css(c), 10) || parseInt(tooltip.css(c), 10); }
+		return r(standard) || r(prefix + standard) || r(prefix + nonStandard) || r(nonStandard) || 0;
 	}
 
 	function calculateSize(corner) {