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

Merge "Clear cache key when deactivating target"

Browse source
This commit is contained in:
jenkins-bot 2013-12-03 18:24:28 +00:00 committed by Gerrit Code Review
parent 5cc0706067 75449ea597
commit 9c3610afb3
2 changed files with 26 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -215,6 +215,9 @@ ve.init.mw.ViewPageTarget.prototype.deactivate = function ( override ) {
this.loading.abort(); this.loading.abort();
} }
this.clearState();
this.docToSave = null;
this.deactivating = false; this.deactivating = false;
mw.hook( 've.deactivationComplete' ).fire(); mw.hook( 've.deactivationComplete' ).fire();
} }

37
modules/ve-mw/init/ve.init.mw.Target.js
View file

@ -60,20 +60,7 @@ ve.init.mw.Target = function VeInitMwTarget( $container, pageName, revisionId )
this.pluginCallbacks = []; this.pluginCallbacks = [];
this.modulesReady = $.Deferred(); this.modulesReady = $.Deferred();
this.preparedCacheKeyPromise = null; this.preparedCacheKeyPromise = null;
this.loading = false; this.clearState();
this.saving = false;
this.diffing = false;
this.serializing = false;
this.submitting = false;
this.baseTimeStamp = null;
this.startTimeStamp = null;
this.doc = null;
this.editNotices = null;
this.$checkboxes = null;
this.remoteNotices = [];
this.localNoticeMessages = [];
this.sanityCheckFinished = false;
this.sanityCheckVerified = false;
this.isMobileDevice = ( this.isMobileDevice = (
'ontouchstart' in window || 'ontouchstart' in window ||
( window.DocumentTouch && document instanceof window.DocumentTouch ) ( window.DocumentTouch && document instanceof window.DocumentTouch )
@ -744,6 +731,28 @@ ve.init.mw.Target.prototype.load = function ( additionalModules ) {
return true; return true;
}; };
/**
* Clear the state of this target, preparing it to be reactivated later.
*/
ve.init.mw.Target.prototype.clearState = function () {
this.clearPreparedCacheKey();
this.loading = false;
this.saving = false;
this.diffing = false;
this.serializing = false;
this.submitting = false;
this.baseTimeStamp = null;
this.startTimeStamp = null;
this.doc = null;
this.originalHtml = null;
this.editNotices = null;
this.$checkboxes = null;
this.remoteNotices = [];
this.localNoticeMessages = [];
this.sanityCheckFinished = false;
this.sanityCheckVerified = false;
};
/** /**
* Serialize the current document and store the result in the serialization cache on the server. * Serialize the current document and store the result in the serialization cache on the server.
* *