Esanders has uploaded a new change for review.
https://gerrit.wikimedia.org/r/94884
Change subject: Use a global resizing flag on the surface to hide phantoms
......................................................................
Use a global resizing flag on the surface to hide phantoms
Otherwise you get rendering issues when you resizing adjacent
resizable nodes and you drag over the other node.
Change-Id: Ie70833fa6ae38879b70a19e8d7ecec13a1d54e92
---
M modules/ve/ce/ve.ce.ProtectedNode.js
M modules/ve/ce/ve.ce.ResizableNode.js
M modules/ve/ce/ve.ce.Surface.js
3 files changed, 4 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor
refs/changes/84/94884/1
diff --git a/modules/ve/ce/ve.ce.ProtectedNode.js
b/modules/ve/ce/ve.ce.ProtectedNode.js
index b32d07c..407ec37 100644
--- a/modules/ve/ce/ve.ce.ProtectedNode.js
+++ b/modules/ve/ce/ve.ce.ProtectedNode.js
@@ -163,7 +163,7 @@
* @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 94cba3b..58bab9b 100644
--- a/modules/ve/ce/ve.ce.ResizableNode.js
+++ b/modules/ve/ce/ve.ce.ResizableNode.js
@@ -246,6 +246,7 @@
// 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 @@
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 125b7d9..4daa7ab 100644
--- a/modules/ve/ce/ve.ce.Surface.js
+++ b/modules/ve/ce/ve.ce.Surface.js
@@ -45,6 +45,7 @@
this.dragging = false;
this.relocating = false;
this.selecting = false;
+ this.resizing = false;
this.contentBranchNodeChanged = false;
this.$phantoms = this.$( '<div>' );
this.$highlights = this.$( '<div>' );
--
To view, visit https://gerrit.wikimedia.org/r/94884
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie70833fa6ae38879b70a19e8d7ecec13a1d54e92
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Esanders <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
