Updated screen adjustment to prevent overlapping of the content when …

…adjusting
qTip2 · Aug 26, 2010 · c44ec1b · c44ec1b
1 parent 75187fe
commit c44ec1b
Show file tree

Hide file tree

Showing 5 changed files with 65 additions and 61 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 Aug 25 19:13:02 2010 +0100
+* Date: Wed Aug 25 22:13:40 2010 +0100
 */
 
 .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 Aug 25 19:13:02 2010 +0100
+* Date: Wed Aug 25 22:13:40 2010 +0100
 */
 
 "use strict"; // Enable ECMAScript "strict" operation for this function. See more: http://ejohn.org/blog/ecmascript-5-strict-mode-json-and-more/
@@ -865,15 +865,16 @@ function QTip(target, options, id)
 							myOffset = my.x === 'left' ? -elemWidth : my.x === 'right' ? elemWidth : elemWidth / 2,
 							atOffset = at.x === 'left' ? targetWidth : at.x === 'right' ? -targetWidth : targetWidth / 2,
 							adjustX = -2 * posOptions.adjust.x,
+							adjustWidth = my.x !== at.x && at.x !== 'center' ? targetWidth : 0,
 							newOffset = atOffset + myOffset + adjustX,
 							overflowLeft = winScroll - posLeft,
 							overflowRight = posLeft + elemWidth - winWidth - winScroll;
 
 						if(overflowLeft > 0 && !(posLeft >= targetLeft && posLeft < targetLeft + targetWidth)) {
-							position.left += newOffset - atOffset;
+							position.left += newOffset - atOffset + adjustWidth;
 						}
 						else if(overflowRight > 0 && posLeft + elemWidth > targetLeft) {
-							position.left += my.x === 'center' ? -newOffset + atOffset : newOffset - atOffset;
+							position.left += (my.x === 'center' ? -1 : 1) * (newOffset - atOffset - adjustWidth);
 						}
 
 						return position.left - posLeft;
@@ -884,6 +885,7 @@ function QTip(target, options, id)
 							myOffset = my.y === 'top' ? -elemHeight : my.y === 'bottom' ? elemHeight : -elemHeight / 2,
 							atOffset = at.y === 'top' ? targetHeight : at.y === 'bottom' ? -targetHeight : 0,
 							adjustY = -2 * posOptions.adjust.y,
+							adjustHeight = my.y !== at.y && at.y !== 'center' ? targetHeight : 0,
 							newOffset = atOffset + myOffset + adjustY,
 							overflowTop = winScroll - posTop,
 							overflowBottom = posTop + elemHeight - winHeight - winScroll;
@@ -892,7 +894,7 @@ function QTip(target, options, id)
 							position.top += my.y === 'center' ? -newOffset + atOffset : newOffset;
 						}
 						else if(overflowBottom > 0) {
-							position.top += newOffset - atOffset;
+							position.top += newOffset - atOffset - adjustHeight;
 						}
 
 						return position.top - posTop;