jenkins-bot has submitted this change and it was merged.
Change subject: Remove resize handles on surface teardown
......................................................................
Remove resize handles on surface teardown
Add teardown call to surface destruction in mw target, and
teardown listener to resizeable node.
Bug: 48530
Change-Id: I807a0f32d3d1eb490456d887f7bf867bdb896df4
---
M modules/ve/ce/ve.ce.ResizableNode.js
M modules/ve/ce/ve.ce.Surface.js
M modules/ve/ce/ve.ce.View.js
3 files changed, 29 insertions(+), 1 deletion(-)
Approvals:
Catrope: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/ve/ce/ve.ce.ResizableNode.js
b/modules/ve/ce/ve.ce.ResizableNode.js
index cb50c64..a948245 100644
--- a/modules/ve/ce/ve.ce.ResizableNode.js
+++ b/modules/ve/ce/ve.ce.ResizableNode.js
@@ -22,7 +22,11 @@
this.$resizeHandles = $( '<div>' );
// Events
- this.connect( this, { 'focus': 'onResizableFocus', 'blur':
'onResizableBlur' } );
+ this.connect( this, {
+ 'focus': 'onResizableFocus',
+ 'blur': 'onResizableBlur',
+ 'live': 'onResizableLive'
+ } );
// Initialization
this.$resizeHandles
@@ -79,6 +83,18 @@
};
/**
+ * Handle live event.
+ *
+ * @method
+ * @param {boolean} live
+ */
+ve.ce.ResizableNode.prototype.onResizableLive = function ( live ) {
+ if ( !live ) {
+ this.$resizeHandles.remove();
+ }
+};
+
+/**
* Handle bounding box handle mousedown.
*
* @method
diff --git a/modules/ve/ce/ve.ce.Surface.js b/modules/ve/ce/ve.ce.Surface.js
index 6dfffd2..0f82695 100644
--- a/modules/ve/ce/ve.ce.Surface.js
+++ b/modules/ve/ce/ve.ce.Surface.js
@@ -229,6 +229,7 @@
* @returns {ve.ui.Context} Context user interface
*/
ve.ce.Surface.prototype.destroy = function () {
+ this.documentView.getDocumentNode().setLive( false );
this.$.remove();
this.$phantoms.remove();
};
diff --git a/modules/ve/ce/ve.ce.View.js b/modules/ve/ce/ve.ce.View.js
index 0b348d6..751c0ab 100644
--- a/modules/ve/ce/ve.ce.View.js
+++ b/modules/ve/ce/ve.ce.View.js
@@ -51,6 +51,15 @@
/**
* @event live
+ * @param {boolean} live The view is being set live
+ */
+
+/**
+ * @event setup
+ */
+
+/**
+ * @event teardown
*/
/* Static Members */
@@ -135,6 +144,8 @@
* @method
* @param {boolean} live The view has been attached to the live DOM (use false
on detach)
* @emits live
+ * @emits setup
+ * @emits teardown
*/
ve.ce.View.prototype.setLive = function ( live ) {
this.live = live;
--
To view, visit https://gerrit.wikimedia.org/r/64917
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I807a0f32d3d1eb490456d887f7bf867bdb896df4
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Esanders <esand...@wikimedia.org>
Gerrit-Reviewer: Catrope <roan.katt...@gmail.com>
Gerrit-Reviewer: Trevor Parscal <tpars...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
