jenkins-bot has submitted this change and it was merged.
Change subject: build: Bump eslint-config-wikimedia to v0.3.0 and make pass
......................................................................
build: Bump eslint-config-wikimedia to v0.3.0 and make pass
Change-Id: I774e05c4393eca8b4719f335a124efcb3d2a6dd5
---
M modules/ext.RevisionSlider.DiffPage.js
M modules/ext.RevisionSlider.PointerLine.js
M modules/ext.RevisionSlider.PointerView.js
M modules/ext.RevisionSlider.init.js
M package.json
M tests/qunit/RevisionSlider.Revision.test.js
6 files changed, 14 insertions(+), 7 deletions(-)
Approvals:
Esanders: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/ext.RevisionSlider.DiffPage.js
b/modules/ext.RevisionSlider.DiffPage.js
index faca14f..a010f4c 100644
--- a/modules/ext.RevisionSlider.DiffPage.js
+++ b/modules/ext.RevisionSlider.DiffPage.js
@@ -52,7 +52,7 @@
$sidePanel = $( '#mw-panel' ),
$navigation = $( '#p-views' ),
$catLinks = $( '#catlinks' ),
- $printFooter = $( '.printfooter' ),
+ $printFooter = $( '.printfooter' ),
scrollLeft = $container.find(
'.mw-revslider-revisions-container' ).scrollLeft();
// Add our current rendered slider into the
newly loaded container
@@ -76,9 +76,11 @@
// Following wikEdDiff.js-specific code is
deprecated and will be removed in the future.
// WikEdDiff should be updated to use a hook.
if ( self.wikEdDiffDetected() ) {
+ /* eslint-disable no-console */
console.log( 'You are running WikEdDiff
& your copy of the code may need to be updated to work with the
RevisionSlider.' );
console.log( 'Please see:
https://phabricator.wikimedia.org/T143199#2631963' );
console.log( 'If WikEdDiff is still
working while using the RevisonSlider then the code change has already been
done.' );
+ /* eslint-enable no-console */
}
}, function ( xhr ) {
@@ -87,6 +89,8 @@
this.tryCount++;
mw.track(
'counter.MediaWiki.RevisionSlider.error.refresh' );
if ( retryAttempt <= retryLimit ) {
+ // TODO Remove this debugging
code?
+ // eslint-disable-next-line
no-console
console.log( 'Retrying request'
);
self.refresh( revId1, revId2,
retryAttempt + 1 );
}
diff --git a/modules/ext.RevisionSlider.PointerLine.js
b/modules/ext.RevisionSlider.PointerLine.js
index dd4b817..e466530 100644
--- a/modules/ext.RevisionSlider.PointerLine.js
+++ b/modules/ext.RevisionSlider.PointerLine.js
@@ -110,7 +110,7 @@
if ( this.pointer.getView().isUpperPointer() ) {
$lowerLineDiv.removeClass(
'mw-revslider-lower-color' ).addClass( 'mw-revslider-upper-color' );
$upperLineDiv.removeClass(
'mw-revslider-lower-color' ).addClass( 'mw-revslider-upper-color' );
- $targetColumn = $( '.diff-ntitle' );
+ $targetColumn = $( '.diff-ntitle' );
} else {
$lowerLineDiv.removeClass(
'mw-revslider-upper-color' ).addClass( 'mw-revslider-lower-color' );
$upperLineDiv.removeClass(
'mw-revslider-upper-color' ).addClass( 'mw-revslider-lower-color' );
@@ -121,7 +121,7 @@
$upperLineDiv.addClass( 'mw-revslider-bottom-line' );
- if ( this.targetColumnIsRightFromPointer(
$sourcePointer, $targetColumn ) ) {
+ if ( this.targetColumnIsRightFromPointer(
$sourcePointer, $targetColumn ) ) {
$upperLineDiv.addClass(
'mw-revslider-left-line' );
$lowerLineDiv.addClass(
'mw-revslider-right-line' );
} else {
diff --git a/modules/ext.RevisionSlider.PointerView.js
b/modules/ext.RevisionSlider.PointerView.js
index 526557b..e23405a 100644
--- a/modules/ext.RevisionSlider.PointerView.js
+++ b/modules/ext.RevisionSlider.PointerView.js
@@ -115,7 +115,7 @@
if ( posBeforeSlider ) {
return this.animateTo( this.getOffset() - 2 *
slider.getView().revisionWidth, duration );
} else {
- return this.animateTo(
slider.getRevisionsPerWindow() * slider.getView().revisionWidth +
this.getOffset(), duration );
+ return this.animateTo(
slider.getRevisionsPerWindow() * slider.getView().revisionWidth +
this.getOffset(), duration );
}
},
diff --git a/modules/ext.RevisionSlider.init.js
b/modules/ext.RevisionSlider.init.js
index 2c45cdf..efd5177 100644
--- a/modules/ext.RevisionSlider.init.js
+++ b/modules/ext.RevisionSlider.init.js
@@ -53,6 +53,8 @@
} catch ( err ) {
$( '.mw-revslider-placeholder' )
.text( mw.message(
'revisionslider-loading-failed' ).text() );
+ // TODO: Replace with mw.log.error?
+ // eslint-disable-next-line no-console
console.log( err );
mw.track(
'counter.MediaWiki.RevisionSlider.error.init' );
}
@@ -61,6 +63,8 @@
}, function ( err ) {
$( '.mw-revslider-placeholder' )
.text( mw.message(
'revisionslider-loading-failed' ).text() );
+ // TODO: Replace with mw.log.error?
+ // eslint-disable-next-line no-console
console.log( err );
mw.track(
'counter.MediaWiki.RevisionSlider.error.init' );
} );
diff --git a/package.json b/package.json
index 8facbfe..fedc0ea 100644
--- a/package.json
+++ b/package.json
@@ -11,7 +11,7 @@
"test": "grunt test"
},
"devDependencies": {
- "eslint-config-wikimedia": "0.1.0",
+ "eslint-config-wikimedia": "0.3.0",
"grunt": "1.0.1",
"grunt-banana-checker": "0.5.0",
"grunt-eslint": "19.0.0",
@@ -19,4 +19,4 @@
"grunt-stylelint": "0.6.0",
"stylelint-config-wikimedia": "0.3.0"
}
-}
\ No newline at end of file
+}
diff --git a/tests/qunit/RevisionSlider.Revision.test.js
b/tests/qunit/RevisionSlider.Revision.test.js
index 3f53b7d..019bc64 100644
--- a/tests/qunit/RevisionSlider.Revision.test.js
+++ b/tests/qunit/RevisionSlider.Revision.test.js
@@ -108,4 +108,3 @@
} );
}( mediaWiki ) );
-
--
To view, visit https://gerrit.wikimedia.org/r/321824
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I774e05c4393eca8b4719f335a124efcb3d2a6dd5
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/RevisionSlider
Gerrit-Branch: master
Gerrit-Owner: Jforrester <jforres...@wikimedia.org>
Gerrit-Reviewer: Esanders <esand...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
