Added check to make sure tip doesn't extend off the end of the tooltip

qTip2 · Apr 13, 2011 · 94801a0 · 94801a0
1 parent 623c9b3
commit 94801a0
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 15 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: Wed Apr 13 23:41:51 2011 +0100
+* Date: Wed Apr 13 23:43:02 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: Wed Apr 13 23:41:51 2011 +0100
+* Date: Wed Apr 13 23:43:02 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: Wed Apr 13 23:41:51 2011 +0100
+* Date: Wed Apr 13 23:43:02 2011 +0100
 */
 
 "use strict"; // Enable ECMAScript "strict" operation for this function. See more: http://ejohn.org/blog/ecmascript-5-strict-mode-json-and-more/
@@ -2337,7 +2337,7 @@ function Tip(qTip, command)
 
 			// Calculate tip position
 			$.each(corners, function(i, side) {
-				var b, br;
+				var d, b, br;
 
 				if(side === 'center') {
 					b = precedance === 'y' ? 'left' : 'top';
@@ -2347,10 +2347,12 @@ function Tip(qTip, command)
 				else {
 					b = borderWidth(corner, side, TRUE);
 					br = borderRadius(corner);
+					d = i && precedance === 'y' ? 'height' : 'width';
 
-					position[ side ] = i ?
-						borderWidth(corner, side) + (!i ? br : 0) :
-						offsets[i] + (br > b ? br : 0);
+					position[ side ] = Math.min(
+						tooltip[d]() - size[d] - border,
+						i ? borderWidth(corner, side) + (!i ? br : 0) : offsets[i] + (br > b ? br : 0)
+					);
 				}
 			});
 

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
@@ -459,7 +459,7 @@ function Tip(qTip, command)
 
 			// Calculate tip position
 			$.each(corners, function(i, side) {
-				var b, br;
+				var d, b, br;
 
 				if(side === 'center') {
 					b = precedance === 'y' ? 'left' : 'top';
@@ -469,10 +469,12 @@ function Tip(qTip, command)
 				else {
 					b = borderWidth(corner, side, TRUE);
 					br = borderRadius(corner);
+					d = i && precedance === 'y' ? 'height' : 'width';
 
-					position[ side ] = i ?
-						borderWidth(corner, side) + (!i ? br : 0) :
-						offsets[i] + (br > b ? br : 0);
+					position[ side ] = Math.min(
+						tooltip[d]() - size[d] - border,
+						i ? borderWidth(corner, side) + (!i ? br : 0) : offsets[i] + (br > b ? br : 0)
+					);
 				}
 			});