Skip to content
This repository has been archived by the owner on Jun 14, 2020. It is now read-only.

Commit

Permalink
Browse files Browse the repository at this point in the history
Ensure tip takes border into account when positioning
  • Loading branch information
Craga89 committed May 29, 2012
1 parent 014e2da commit e5c89fe
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 14 deletions.
2 changes: 1 addition & 1 deletion dist/jquery.qtip.basic.js
Expand Up @@ -9,7 +9,7 @@
* http://en.wikipedia.org/wiki/MIT_License
* http://en.wikipedia.org/wiki/GNU_General_Public_License
*
* Date: Tue May 29 20:04:37 2012 +0100
* Date: Tue May 29 21:02:22 2012 +0100
*/

/*jslint browser: true, onevar: true, undef: true, nomen: true, bitwise: true, regexp: true, newcap: true, immed: true, strict: true */
Expand Down
2 changes: 1 addition & 1 deletion dist/jquery.qtip.css
Expand Up @@ -9,7 +9,7 @@
* http://en.wikipedia.org/wiki/MIT_License
* http://en.wikipedia.org/wiki/GNU_General_Public_License
*
* Date: Tue May 29 20:04:37 2012 +0100
* Date: Tue May 29 21:02:22 2012 +0100
*/

/* Core qTip styles */
Expand Down
8 changes: 3 additions & 5 deletions dist/jquery.qtip.js
Expand Up @@ -9,7 +9,7 @@
* http://en.wikipedia.org/wiki/MIT_License
* http://en.wikipedia.org/wiki/GNU_General_Public_License
*
* Date: Tue May 29 20:04:37 2012 +0100
* Date: Tue May 29 21:02:22 2012 +0100
*/

/*jslint browser: true, onevar: true, undef: true, nomen: true, bitwise: true, regexp: true, newcap: true, immed: true, strict: true */
Expand Down Expand Up @@ -3288,12 +3288,10 @@ function Tip(qTip, command)
position['margin-' + b] = -Math.round(dimensions[ precedance === 'y' ? 'width' : 'height' ] / 2) + userOffset;
}
else {
b = borderWidth(corner, side, TRUE);
b = borderWidth(corner, side);
br = borderRadius(corner);

position[ side ] = i ?
border ? borderWidth(corner, side) : 0 :
userOffset + (br > b ? br : -b);
position[ side ] = i ? 0 : (userOffset + (br > b ? br : -b));
}
});

Expand Down
6 changes: 3 additions & 3 deletions dist/jquery.qtip.min.js

Large diffs are not rendered by default.

6 changes: 2 additions & 4 deletions src/tips/tips.js
Expand Up @@ -552,12 +552,10 @@ function Tip(qTip, command)
position['margin-' + b] = -Math.round(dimensions[ precedance === 'y' ? 'width' : 'height' ] / 2) + userOffset;
}
else {
b = borderWidth(corner, side, TRUE);
b = borderWidth(corner, side);
br = borderRadius(corner);

position[ side ] = i ?
border ? borderWidth(corner, side) : 0 :
userOffset + (br > b ? br : -b);
position[ side ] = i ? 0 : (userOffset + (br > b ? br : -b));
}
});

Expand Down

0 comments on commit e5c89fe

Please sign in to comment.