wikimedia/mediawiki-extensions-VisualEditor
1
0
Fork 0
mirror of https://gerrit.wikimedia.org/r/mediawiki/extensions/VisualEditor synced 2024-12-01 09:26:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "Recalculate $resizable offset when positioning resize label"

Browse source
This commit is contained in:
jenkins-bot 2013-10-22 20:28:27 +00:00 committed by Gerrit Code Review
parent 776e9d4b9c 1efa327121
commit a2587ce927
1 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
modules/ve/ce/ve.ce.ResizableNode.js
View file

@ -82,21 +82,24 @@ ve.ce.ResizableNode.prototype.updateSizeLabel = function ( dimensions ) {
if ( !this.$sizeLabel ) { if ( !this.$sizeLabel ) {
return; return;
} }
var node, top, height; var offset, node, top, height;
if ( dimensions ) { if ( dimensions ) {
offset = ve.Element.getRelativePosition(
this.$resizable, this.getRoot().getSurface().getSurface().$
);
// Things get a bit tight below 100px, so put the label on the outside // Things get a bit tight below 100px, so put the label on the outside
if ( dimensions.width < 100 ) { if ( dimensions.width < 100 ) {
top = dimensions.top + dimensions.height; top = offset.top + dimensions.height;
height = 30; height = 30;
} else { } else {
top = dimensions.top; top = offset.top;
height = dimensions.height; height = dimensions.height;
} }
this.$sizeLabel this.$sizeLabel
.addClass( 've-ce-resizableNode-sizeLabel-resizing' ) .addClass( 've-ce-resizableNode-sizeLabel-resizing' )
.css( { .css( {
'top': top, 'top': top,
'left': dimensions.left, 'left': offset.left,
'width': dimensions.width, 'width': dimensions.width,
'height': height, 'height': height,
'lineHeight': height + 'px' 'lineHeight': height + 'px'