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

ve.init.mw.ArticleTarget: Stop when we fail to load metadata

Browse source 
This early return in loadSuccess() has been incorrectly removed in
b2718b186a.

As a very unexpected result of loading the editor twice in case
loading metadata is retried, the "Publish" button was staying
disabled. See the task for investigation.

Bug: T209542
Change-Id: If528afe1ca052062005937f03fe822c5c8d0958b
This commit is contained in:
Bartosz Dziewoński 2018-11-29 04:19:08 +01:00
parent fc126c1260
commit 32f5256736
1 changed files with 12 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
modules/ve-mw/init/ve.init.mw.ArticleTarget.js
View file

@ -346,13 +346,16 @@ ve.init.mw.ArticleTarget.prototype.loadSuccess = function ( response ) {
this.switched = data.switched || 'wteswitched' in new mw.Uri( location.href ).query;
this.doc = this.constructor.static.parseDocument( this.originalHtml, this.getDefaultMode() );
// Parse data this not available in RESTBase
this.parseMetadata( response );
// Properties that don't come from the API
this.initialSourceRange = data.initialSourceRange;
this.recovered = data.recovered;
// Parse data this not available in RESTBase
if ( !this.parseMetadata( response ) ) {
// Invalid metadata, loadFail() or load() has been called
return;
}
this.track( 'trace.parseResponse.exit' );
// Everything worked, the page was loaded, continue initializing the editor
@ -370,6 +373,8 @@ ve.init.mw.ArticleTarget.prototype.loadSuccess = function ( response ) {
* Parse document metadata from the API response
*
* @param {Object} response API response data
* @return {boolean} Whether metadata was loaded successfully. If true, you should call
* loadSuccess(). If false, either that loadFail() has been called or we're retrying via load().
*/
ve.init.mw.ArticleTarget.prototype.parseMetadata = function ( response ) {
var i, len, linkData, aboutDoc, docRevIdMatches, docRevId,
@ -378,7 +383,7 @@ ve.init.mw.ArticleTarget.prototype.parseMetadata = function ( response ) {
if ( !data ) {
this.loadFail( 've-api', 'No metadata content in response from server' );
return;
return false;
}
this.remoteNotices = ve.getObjectValues( data.notices );
@ -438,7 +443,7 @@ ve.init.mw.ArticleTarget.prototype.parseMetadata = function ( response ) {
this.requestedRevId = Math.max( docRevId, this.revid );
this.load();
}
return;
return false;
} else {
// Set this to false after a successful load, so we don't immediately give up
// if a subsequent load mismatches again
@ -480,6 +485,8 @@ ve.init.mw.ArticleTarget.prototype.parseMetadata = function ( response ) {
this.checkboxesByName[ name ] = checkbox;
}
}
return true;
};
/**