diff --git a/modules/ve/ce/ve.ce.ProtectedNode.js b/modules/ve/ce/ve.ce.ProtectedNode.js index b32d07c02a..407ec377c4 100644 --- a/modules/ve/ce/ve.ce.ProtectedNode.js +++ b/modules/ve/ce/ve.ce.ProtectedNode.js @@ -163,7 +163,7 @@ ve.ce.ProtectedNode.prototype.onPhantomMouseDown = function ( e ) { * @method */ ve.ce.ProtectedNode.prototype.onProtectedMouseEnter = function () { - if ( !this.root.getSurface().dragging && !this.resizing ) { + if ( !this.root.getSurface().dragging && !this.root.getSurface().resizing ) { this.createPhantoms(); } }; diff --git a/modules/ve/ce/ve.ce.ResizableNode.js b/modules/ve/ce/ve.ce.ResizableNode.js index 94cba3becb..58bab9b02d 100644 --- a/modules/ve/ce/ve.ce.ResizableNode.js +++ b/modules/ve/ce/ve.ce.ResizableNode.js @@ -246,6 +246,7 @@ ve.ce.ResizableNode.prototype.onResizeHandlesCornerMouseDown = function ( e ) { // Bind resize events this.resizing = true; + this.root.getSurface().resizing = true; this.updateSizeLabel( this.resizeInfo ); this.$( this.getElementDocument() ).on( { 'mousemove.ve-ce-resizableNode': ve.bind( this.onDocumentMouseMove, this ), @@ -409,6 +410,7 @@ ve.ce.ResizableNode.prototype.onDocumentMouseUp = function () { this.$resizeHandles.removeClass( 've-ce-resizableNode-handles-resizing' ); this.$( this.getElementDocument() ).off( '.ve-ce-resizableNode' ); this.resizing = false; + this.root.getSurface().resizing = false; this.updateSizeLabel(); // Apply changes to the model diff --git a/modules/ve/ce/ve.ce.Surface.js b/modules/ve/ce/ve.ce.Surface.js index 074d095913..ba3f92c21a 100644 --- a/modules/ve/ce/ve.ce.Surface.js +++ b/modules/ve/ce/ve.ce.Surface.js @@ -45,6 +45,7 @@ ve.ce.Surface = function VeCeSurface( model, surface, options ) { this.dragging = false; this.relocating = false; this.selecting = false; + this.resizing = false; this.contentBranchNodeChanged = false; this.$phantoms = this.$( '
' ); this.$highlights = this.$( '
' );