jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/382486 )
Change subject: Use parent #clearSurfaces method to clear surfaces
......................................................................
Use parent #clearSurfaces method to clear surfaces
Move mwTocWidget teardown to a destroy event listener.
Change-Id: If96be96aa67da55d3b17dd2565f5e954786ff3ff
---
M modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.js
1 file changed, 4 insertions(+), 9 deletions(-)
Approvals:
jenkins-bot: Verified
Jforrester: Looks good to me, approved
diff --git a/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.js
b/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.js
index 14347a5..77c2105 100644
--- a/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.js
+++ b/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.js
@@ -759,6 +759,9 @@
// TODO: mwTocWidget should probably live in a ve.ui.MWSurface subclass
if ( mw.config.get( 'wgVisualEditorConfig' ).enableTocWidget ) {
surface.mwTocWidget = new ve.ui.MWTocWidget( this.getSurface()
);
+ surface.once( 'destroy', function () {
+ surface.mwTocWidget.$element.remove();
+ } );
}
this.transformCategoryLinks( $( '#catlinks' ) );
@@ -1089,15 +1092,7 @@
}
return $.when.apply( null, promises ).then( function () {
- var surface;
- // Destroy surface
- while ( target.surfaces.length ) {
- surface = target.surfaces.pop();
- surface.destroy();
- if ( surface.mwTocWidget ) {
- surface.mwTocWidget.$element.remove();
- }
- }
+ target.clearSurfaces();
target.active = false;
} );
};
--
To view, visit https://gerrit.wikimedia.org/r/382486
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: If96be96aa67da55d3b17dd2565f5e954786ff3ff
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Esanders <[email protected]>
Gerrit-Reviewer: Jforrester <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
