jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/365989 )
Change subject: Use core wgDiffOldId/wgDiffNewId JS config values
......................................................................
Use core wgDiffOldId/wgDiffNewId JS config values
Newly introduced in a469795efc5bc1c585c9f84ee289ee099833661d.
This will require MediaWiki 1.30.
Change-Id: I9897a77b24e258bf037f8ec6cafa1d0684bf867d
---
M extension.json
M modules/ext.RevisionSlider.DiffPage.js
M modules/ext.RevisionSlider.SliderView.js
M modules/ext.RevisionSlider.init.js
M src/RevisionSliderHooks.php
M tests/qunit/RevisionSlider.DiffPage.test.js
M tests/qunit/RevisionSlider.SliderView.test.js
7 files changed, 15 insertions(+), 14 deletions(-)
Approvals:
Bartosz Dziewoński: Looks good to me, but someone else must approve
WMDE-Fisch: Looks good to me, approved
jenkins-bot: Verified
diff --git a/extension.json b/extension.json
index 88c4f78..6b188b5 100644
--- a/extension.json
+++ b/extension.json
@@ -16,7 +16,7 @@
"type": "other",
"manifest_version": 1,
"requires": {
- "MediaWiki": ">= 1.25.0"
+ "MediaWiki": ">= 1.30.0"
},
"ConfigRegistry": {
"revisionslider": "GlobalVarConfig::newInstance"
diff --git a/modules/ext.RevisionSlider.DiffPage.js
b/modules/ext.RevisionSlider.DiffPage.js
index bcbb668..aab89a6 100644
--- a/modules/ext.RevisionSlider.DiffPage.js
+++ b/modules/ext.RevisionSlider.DiffPage.js
@@ -68,8 +68,10 @@
uri.query.oldid = diff;
$( this ).attr( 'href', uri.toString()
);
} );
- // Update wgRevisionId (T161257)
+ // Update wgRevisionId (T161257), and
wgDiffOldId/NewId
mw.config.set( 'wgRevisionId', diff );
+ mw.config.set( 'wgDiffOldId', oldid );
+ mw.config.set( 'wgDiffNewId', diff );
$( '.mw-revslider-revisions-container'
).scrollLeft( scrollLeft );
diff --git a/modules/ext.RevisionSlider.SliderView.js
b/modules/ext.RevisionSlider.SliderView.js
index 093d02c..4957afb 100644
--- a/modules/ext.RevisionSlider.SliderView.js
+++ b/modules/ext.RevisionSlider.SliderView.js
@@ -129,7 +129,7 @@
this.slideView( Math.floor( ( this.getNewerPointerPos()
- 1 ) / this.slider.getRevisionsPerWindow() ), 0 );
this.diffPage.addHandlersToCoreLinks( this );
- this.diffPage.replaceState( mw.config.get(
'extRevisionSliderNewRev' ), mw.config.get( 'extRevisionSliderOldRev' ), this );
+ this.diffPage.replaceState( mw.config.get(
'wgDiffNewId' ), mw.config.get( 'wgDiffOldId' ), this );
this.diffPage.initOnPopState( this );
},
@@ -527,7 +527,7 @@
* @return {jQuery}
*/
getOldRevElement: function ( $revs ) {
- return $revs.find(
'div.mw-revslider-revision[data-revid="' + mw.config.get(
'extRevisionSliderOldRev' ) + '"]' );
+ return $revs.find(
'div.mw-revslider-revision[data-revid="' + mw.config.get( 'wgDiffOldId' ) +
'"]' );
},
/**
@@ -537,7 +537,7 @@
* @return {jQuery}
*/
getNewRevElement: function ( $revs ) {
- return $revs.find(
'div.mw-revslider-revision[data-revid="' + mw.config.get(
'extRevisionSliderNewRev' ) + '"]' );
+ return $revs.find(
'div.mw-revslider-revision[data-revid="' + mw.config.get( 'wgDiffNewId' ) +
'"]' );
},
/**
diff --git a/modules/ext.RevisionSlider.init.js
b/modules/ext.RevisionSlider.init.js
index e95356d..697727d 100644
--- a/modules/ext.RevisionSlider.init.js
+++ b/modules/ext.RevisionSlider.init.js
@@ -19,7 +19,7 @@
mw.libs.revisionSlider.HelpDialog.init();
api.fetchRevisionData( mw.config.get( 'wgPageName' ), {
- startId: mw.config.get(
'extRevisionSliderNewRev' ),
+ startId: mw.config.get( 'wgDiffNewId' ),
limit:
mw.libs.revisionSlider.calculateRevisionsPerWindow( 160, 16 )
} ).then( function ( data ) {
var revs,
diff --git a/src/RevisionSliderHooks.php b/src/RevisionSliderHooks.php
index 52e3db8..5273230 100644
--- a/src/RevisionSliderHooks.php
+++ b/src/RevisionSliderHooks.php
@@ -90,8 +90,6 @@
$stats->increment( 'RevisionSlider.event.lazyload' );
}
$out->addModuleStyles( 'ext.RevisionSlider.noscript' );
- $out->addJsConfigVars( 'extRevisionSliderOldRev',
$oldRev->getId() );
- $out->addJsConfigVars( 'extRevisionSliderNewRev',
$newRev->getId() );
$out->addJsConfigVars( 'extRevisionSliderTimeOffset', intval(
$timeOffset ) );
$out->enableOOUI();
diff --git a/tests/qunit/RevisionSlider.DiffPage.test.js
b/tests/qunit/RevisionSlider.DiffPage.test.js
index bf76e7d..8583db5 100644
--- a/tests/qunit/RevisionSlider.DiffPage.test.js
+++ b/tests/qunit/RevisionSlider.DiffPage.test.js
@@ -20,8 +20,9 @@
new Revision( { revid: 37, comment: '' } )
] ) )
);
- mw.config.values.extRevisionSliderOldRev = 1;
- mw.config.values.extRevisionSliderNewRev = 37;
+
+ mw.config.set( 'wgDiffOldId', 1 );
+ mw.config.set( 'wgDiffNewId', 37 );
sliderView.render( $( '<div>' ) );
histLength = history.length;
diff --git a/tests/qunit/RevisionSlider.SliderView.test.js
b/tests/qunit/RevisionSlider.SliderView.test.js
index 52c815a..12f3e22 100644
--- a/tests/qunit/RevisionSlider.SliderView.test.js
+++ b/tests/qunit/RevisionSlider.SliderView.test.js
@@ -26,8 +26,8 @@
$revisionOld,
$revisionNew;
- mw.config.values.extRevisionSliderOldRev = 1;
- mw.config.values.extRevisionSliderNewRev = 37;
+ mw.config.set( 'wgDiffOldId', 1 );
+ mw.config.set( 'wgDiffNewId', 37 );
view.render( $container );
@@ -48,8 +48,8 @@
new Revision( { revid: 37, size: 13, comment:
'Comment3', user: 'User3' } )
] ) ) );
- mw.config.values.extRevisionSliderOldRev = null;
- mw.config.values.extRevisionSliderNewRev = null;
+ mw.config.set( 'wgDiffOldId', null );
+ mw.config.set( 'wgDiffNewId', null );
assert.throws(
function () {
--
To view, visit https://gerrit.wikimedia.org/r/365989
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I9897a77b24e258bf037f8ec6cafa1d0684bf867d
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/RevisionSlider
Gerrit-Branch: master
Gerrit-Owner: Bartosz Dziewoński <[email protected]>
Gerrit-Reviewer: Addshore <[email protected]>
Gerrit-Reviewer: Andrew-WMDE <[email protected]>
Gerrit-Reviewer: Bartosz Dziewoński <[email protected]>
Gerrit-Reviewer: Esanders <[email protected]>
Gerrit-Reviewer: Tobias Gritschacher <[email protected]>
Gerrit-Reviewer: WMDE-Fisch <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
