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

Merge "Support visual diffs on Special:ComparePages"

Browse source
This commit is contained in:
jenkins-bot 2017-08-06 11:46:57 +00:00 committed by Gerrit Code Review
parent 060c3d5558 5104f63cf3
commit 1e474e038e
2 changed files with 18 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
extension.json
View file

@ -1877,7 +1877,8 @@
"dependencies": [
"oojs-ui",
"oojs-ui.styles.icons-alerts",
"oojs-ui.styles.icons-editing-advanced"
"oojs-ui.styles.icons-editing-advanced",
"mediawiki.Uri"
],
"messages": [
"visualeditor-savedialog-review-visual",

23
modules/ve-mw/init/ve.init.mw.DiffPage.init.js
View file

@ -9,7 +9,7 @@
var $visualDiff,
reviewModeButtonSelect,
revCache = {},
pageName = mw.config.get( 'wgRelevantPageName' ),
uri = new mw.Uri(),
mode = 'source',
conf = mw.config.get( 'wgVisualEditorConfig' ),
pluginModules = conf.pluginModules.filter( mw.loader.getState );
@ -25,28 +25,37 @@
return null;
}
function fetchRevision( revId ) {
if ( !revCache[ revId ] ) {
revCache[ revId ] = mw.libs.ve.targetLoader.requestParsoidData( pageName, revId, 'diff' );
function fetchRevision( pageName, revId ) {
revCache[ pageName ] = revCache[ pageName ] || {};
if ( !revCache[ pageName ][ revId ] ) {
revCache[ pageName ][ revId ] = mw.libs.ve.targetLoader.requestParsoidData( pageName, revId, 'diff' );
}
return revCache[ revId ];
return revCache[ pageName ][ revId ];
}
function onReviewModeButtonSelectSelect( item ) {
var oldRevPromise, newRevPromise, modulePromise, progress,
oldPageName, newPageName,
$revSlider = $( '.mw-revslider-container' ),
$wikitextDiff = $( 'table.diff[data-mw="interface"]' ),
oldId = mw.config.get( 'wgDiffOldId' ),
newId = mw.config.get( 'wgDiffNewId' );
if ( mw.config.get( 'wgCanonicalSpecialPageName' ) !== 'ComparePages' ) {
oldPageName = newPageName = mw.config.get( 'wgRelevantPageName' );
} else {
oldPageName = uri.query.page1;
newPageName = uri.query.page2;
}
mode = item.getData();
if ( mode === 'visual' ) {
progress = new OO.ui.ProgressBarWidget( { classes: [ 've-init-mw-diffPage-loading' ] } );
$wikitextDiff.addClass( 'oo-ui-element-hidden' );
$wikitextDiff.before( progress.$element );
oldRevPromise = fetchRevision( oldId );
newRevPromise = fetchRevision( newId );
oldRevPromise = fetchRevision( oldPageName, oldId );
newRevPromise = fetchRevision( newPageName, newId );
// TODO: Load a smaller subset of VE for computing the visual diff
modulePromise = mw.loader.using( [ 'ext.visualEditor.desktopArticleTarget' ].concat( pluginModules ) );
$.when( oldRevPromise, newRevPromise, modulePromise ).then( function ( oldResponse, newResponse ) {