Addshore has uploaded a new change for review.
https://gerrit.wikimedia.org/r/288416
Change subject: Use JS config vars instead of DOM injection
......................................................................
Use JS config vars instead of DOM injection
Change-Id: I0d670de6e6c6c2a86e1f1227487b16b85a10b4f4
---
M RevisionSlider.hooks.php
M modules/ext.RevisionSlider.SliderView.js
2 files changed, 7 insertions(+), 11 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/RevisionSlider
refs/changes/16/288416/1
diff --git a/RevisionSlider.hooks.php b/RevisionSlider.hooks.php
index fb66023..4e54769 100755
--- a/RevisionSlider.hooks.php
+++ b/RevisionSlider.hooks.php
@@ -29,14 +29,14 @@
$out = RequestContext::getMain()->getOutput();
$out->addModules( 'ext.RevisionSlider.init' );
+ $out->addJsConfigVars( 'extRevisionSliderOldRev',
$oldRev->getId() );
+ $out->addJsConfigVars( 'extRevisionSliderNewRev',
$newRev->getId() );
$out->addHTML(
Html::rawElement(
'div',
[
'id' => 'revision-slider-container',
'style' => 'min-height: 150px;',
- 'data-oldrev' => $oldRev->getId(),
- 'data-newrev' => $newRev->getId(),
],
Html::element(
'p',
diff --git a/modules/ext.RevisionSlider.SliderView.js
b/modules/ext.RevisionSlider.SliderView.js
index 003fa77..6260df9 100644
--- a/modules/ext.RevisionSlider.SliderView.js
+++ b/modules/ext.RevisionSlider.SliderView.js
@@ -91,23 +91,19 @@
this.slider.setRevisionsPerWindow( $slider.find(
'.revisions-container' ).width() / this.revisionWidth );
- this.initializePointers(
- $container.data( 'oldrev' ),
- $container.data( 'newrev' ),
- $revisions
- );
+ this.initializePointers( $revisions );
this.$element = $slider;
$container.html( $slider );
this.slide( Math.floor( this.rightPointer.getPosition()
/ this.slider.getRevisionsPerWindow() ), 0 );
- diffPage.pushState( $container.attr( 'data-oldrev' ),
$container.attr( 'data-newrev' ), this );
+ diffPage.pushState(
mw.config.values.extRevisionSliderOldRev,
mw.config.values.extRevisionSliderNewRev, this );
diffPage.initOnPopState( this );
},
- initializePointers: function ( oldRevId, newRevId, $revisions )
{
- var oldRevElement = $revisions.find(
'div.revision[data-revid=\'' + oldRevId + '\']' ),
- newRevElement = $revisions.find(
'div.revision[data-revid=\'' + newRevId + '\']' );
+ initializePointers: function ( $revisions ) {
+ var oldRevElement = $revisions.find(
'div.revision[data-revid=\'' + mw.config.values.extRevisionSliderOldRev + '\']'
),
+ newRevElement = $revisions.find(
'div.revision[data-revid=\'' + mw.config.values.extRevisionSliderNewRev + '\']'
);
if ( oldRevElement.length === 0 || newRevElement.length
=== 0 ) {
// Note: this is currently caught in init.js
--
To view, visit https://gerrit.wikimedia.org/r/288416
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I0d670de6e6c6c2a86e1f1227487b16b85a10b4f4
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/RevisionSlider
Gerrit-Branch: master
Gerrit-Owner: Addshore <addshorew...@gmail.com>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
