[MediaWiki-commits] [Gerrit] mediawiki...VisualEditor[master]: MWTable: Cleanup events and prevent fire after teardown

2017-12-05 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/394745 )

Change subject: MWTable: Cleanup events and prevent fire after teardown
..


MWTable: Cleanup events and prevent fire after teardown

Bug: T181767
Change-Id: I9b86d810269f3e3e15ba4736d264dbf48c9a0fe3
---
M modules/ve-mw/ce/nodes/ve.ce.MWTableNode.js
1 file changed, 17 insertions(+), 0 deletions(-)

Approvals:
  DLynch: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/modules/ve-mw/ce/nodes/ve.ce.MWTableNode.js 
b/modules/ve-mw/ce/nodes/ve.ce.MWTableNode.js
index db0e814..14f09c8 100644
--- a/modules/ve-mw/ce/nodes/ve.ce.MWTableNode.js
+++ b/modules/ve-mw/ce/nodes/ve.ce.MWTableNode.js
@@ -54,6 +54,18 @@
 
 ve.ce.MWTableNode.static.name = 'mwTable';
 
+/* Methods */
+
+/**
+ * @inheritdoc
+ */
+ve.ce.MWTableNode.prototype.destroy = function () {
+   this.model.getMatrix().disconnect( this );
+
+   // Parent method
+   ve.ce.MWTableNode.super.prototype.destroy.apply( this, arguments );
+};
+
 /**
  * Update sortable headers (if the table is sortable).
  *
@@ -64,6 +76,11 @@
view = this,
cellModels, cellViews;
 
+   if ( !this.model ) {
+   // Fired after teardown due to debounce
+   return;
+   }
+
this.$element.toggleClass( 'jquery-tablesorter', 
this.model.getAttribute( 'sortable' ) );
 
this.$sortableHeaders.removeClass( 'headerSort' );

-- 
To view, visit https://gerrit.wikimedia.org/r/394745
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I9b86d810269f3e3e15ba4736d264dbf48c9a0fe3
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Esanders 
Gerrit-Reviewer: DLynch 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...VisualEditor[master]: MWTable: Cleanup events and prevent fire after teardown

2017-12-02 Thread Esanders (Code Review) 
Esanders has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/394745 )

Change subject: MWTable: Cleanup events and prevent fire after teardown
..

MWTable: Cleanup events and prevent fire after teardown

Bug: T181767
Change-Id: I9b86d810269f3e3e15ba4736d264dbf48c9a0fe3
---
M modules/ve-mw/ce/nodes/ve.ce.MWTableNode.js
1 file changed, 17 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor 
refs/changes/45/394745/1

diff --git a/modules/ve-mw/ce/nodes/ve.ce.MWTableNode.js 
b/modules/ve-mw/ce/nodes/ve.ce.MWTableNode.js
index db0e814..14f09c8 100644
--- a/modules/ve-mw/ce/nodes/ve.ce.MWTableNode.js
+++ b/modules/ve-mw/ce/nodes/ve.ce.MWTableNode.js
@@ -54,6 +54,18 @@
 
 ve.ce.MWTableNode.static.name = 'mwTable';
 
+/* Methods */
+
+/**
+ * @inheritdoc
+ */
+ve.ce.MWTableNode.prototype.destroy = function () {
+   this.model.getMatrix().disconnect( this );
+
+   // Parent method
+   ve.ce.MWTableNode.super.prototype.destroy.apply( this, arguments );
+};
+
 /**
  * Update sortable headers (if the table is sortable).
  *
@@ -64,6 +76,11 @@
view = this,
cellModels, cellViews;
 
+   if ( !this.model ) {
+   // Fired after teardown due to debounce
+   return;
+   }
+
this.$element.toggleClass( 'jquery-tablesorter', 
this.model.getAttribute( 'sortable' ) );
 
this.$sortableHeaders.removeClass( 'headerSort' );

-- 
To view, visit https://gerrit.wikimedia.org/r/394745
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I9b86d810269f3e3e15ba4736d264dbf48c9a0fe3
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Esanders 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits