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

Merge "Check for normalized and converted titles in ve.init.mw.ApiResponseCache"

Browse source
This commit is contained in:
jenkins-bot 2018-06-15 19:44:42 +00:00 committed by Gerrit Code Review
parent a6ae8424f7 86615fcedc
commit 4f98d3bfb6
1 changed files with 12 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
modules/ve-mw/init/ve.init.mw.ApiResponseCache.js
View file

@ -160,11 +160,14 @@ ve.init.mw.ApiResponseCache.prototype.processQueue = function () {
} }
function processResult( data ) { function processResult( data ) {
var i, pageid, page, processedPage, redirects, var i, pageid, page, processedPage, from, mappedTitles = [],
pages = ( data.query && data.query.pages ) || data.pages, pages = ( data.query && data.query.pages ) || data.pages,
processed = {}; processed = {};
redirects = ( data.query && data.query.redirects ) || []; [ 'redirects', 'normalized', 'converted' ].forEach( function ( map ) {
mappedTitles = mappedTitles.concat( ( data.query && data.query[ map ] ) || [] );
} );
if ( pages ) { if ( pages ) {
for ( pageid in pages ) { for ( pageid in pages ) {
page = pages[ pageid ]; page = pages[ pageid ];
@ -173,10 +176,13 @@ ve.init.mw.ApiResponseCache.prototype.processQueue = function () {
processed[ page.title ] = processedPage; processed[ page.title ] = processedPage;
} }
} }
for ( i = 0; i < redirects.length; i++ ) { for ( i = 0; i < mappedTitles.length; i++ ) {
// Locate the title in redirects, if any. // Locate the title in mapped titles, if any.
if ( redirects[ i ].to === page.title ) { if ( mappedTitles[ i ].to === page.title ) {
processed[ redirects[ i ].from ] = processedPage; from = mappedTitles[ i ].fromencoded === '' ?
decodeURIComponent( mappedTitles[ i ].from ) :
mappedTitles[ i ].from;
processed[ from ] = processedPage;
break; break;
} }
} }