wikimedia/mediawiki-extensions-VisualEditor
1
0
Fork 0
mirror of https://gerrit.wikimedia.org/r/mediawiki/extensions/VisualEditor synced 2024-11-24 14:33:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "Tear down the save dialog and remove it from memory on surface teardown"

Browse source
This commit is contained in:
jenkins-bot 2013-12-01 22:23:06 +00:00 committed by Gerrit Code Review
parent b8ff6dac4d 5b9231d49d
commit 97adcc2103
1 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
modules/ve-mw/init/targets/ve.init.mw.ViewPageTarget.js
View file

@ -195,11 +195,6 @@ ve.init.mw.ViewPageTarget.prototype.deactivate = function ( override ) {
this.detachToolbarButtons();
}
if ( this.saveDialog ) {
// If we got as far as setting up the save dialog, tear it down
this.saveDialog.reset();
this.saveDialog.close();
}
// Check we got as far as setting up the surface
if ( this.active ) {
// If we got as far as setting up the surface, tear that down
@ -1062,6 +1057,12 @@ ve.init.mw.ViewPageTarget.prototype.tearDownSurface = function () {
}
this.tearDownToolbar();
this.restoreDocumentTitle();
if ( this.saveDialog ) {
// If we got as far as setting up the save dialog, tear it down
this.saveDialog.close();
this.saveDialog.teardown();
this.saveDialog = null;
}
// Destroy surface
if ( this.surface ) {
this.surface.destroy();