wikimedia/mediawiki-extensions-VisualEditor
1
0
Fork 0
mirror of https://gerrit.wikimedia.org/r/mediawiki/extensions/VisualEditor synced 2024-11-25 23:05:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "Fix callout position when popup widget has been moved"

Browse source
This commit is contained in:
jenkins-bot 2013-06-26 11:07:40 +00:00 committed by Gerrit Code Review
parent ac8d5eccb2 6b5ed9c711
commit 01a0ae93b9
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
modules/ve/ui/widgets/ve.ui.PopupWidget.js
View file

@ -134,7 +134,7 @@ ve.ui.PopupWidget.prototype.hide = function () {
*/ */
ve.ui.PopupWidget.prototype.display = function ( x, y, width, height, transition ) { ve.ui.PopupWidget.prototype.display = function ( x, y, width, height, transition ) {
var left, overlapLeft, overlapRight, var left, overlapLeft, overlapRight,
padding = 15; overlapOffset = 0, padding = 7;
switch ( this.align ) { switch ( this.align ) {
case 'left': case 'left':
@ -155,9 +155,9 @@ ve.ui.PopupWidget.prototype.display = function ( x, y, width, height, transition
overlapRight = this.$$( 'body' ).width() - ( x + ( width + left + ( padding * 2 ) ) ); overlapRight = this.$$( 'body' ).width() - ( x + ( width + left + ( padding * 2 ) ) );
overlapLeft = x + ( left - ( padding * 2 ) ); overlapLeft = x + ( left - ( padding * 2 ) );
if ( overlapRight < 0 ) { if ( overlapRight < 0 ) {
left += overlapRight; overlapOffset = overlapRight;
} else if ( overlapLeft < 0 ) { } else if ( overlapLeft < 0 ) {
left -= overlapLeft; overlapOffset -= overlapLeft;
} }
// Prevent transition from being interrupted // Prevent transition from being interrupted
@ -176,7 +176,7 @@ ve.ui.PopupWidget.prototype.display = function ( x, y, width, height, transition
// Position body relative to anchor and adjust size // Position body relative to anchor and adjust size
this.$body.css( { this.$body.css( {
'left': left, 'width': width, 'height': height === undefined ? 'auto' : height 'left': left + overlapOffset, 'width': width, 'height': height === undefined ? 'auto' : height
} ); } );
return this; return this;