Mattflaschen has uploaded a new change for review.
https://gerrit.wikimedia.org/r/187887
Change subject: Make jscs (JS style checker) pass, and run it by default
......................................................................
Make jscs (JS style checker) pass, and run it by default
This is using an older version of jscs. Since upgrading picks
up newer Wikimedia style rules, we would need to fix those as
part of that commit.
Change-Id: Ic9b05368fa636f0f51a4422a661ddf7f3a8b82c9
---
M Gruntfile.js
M modules/engine/components/board/features/flow-board-loadmore.js
M modules/engine/components/board/features/flow-board-toc.js
M modules/engine/components/common/flow-component-events.js
4 files changed, 10 insertions(+), 15 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Flow
refs/changes/87/187887/1
diff --git a/Gruntfile.js b/Gruntfile.js
index 1ea69c0..dfba617 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -44,8 +44,7 @@
}
} );
- // XXX jscs not passing in this patch
- grunt.registerTask( 'lint', [ 'jshint', 'csslint', 'banana' ] );
+ grunt.registerTask( 'lint', [ 'jscs', 'jshint', 'csslint', 'banana' ] );
grunt.registerTask( 'test', 'lint' );
grunt.registerTask( 'default', 'test' );
};
diff --git a/modules/engine/components/board/features/flow-board-loadmore.js
b/modules/engine/components/board/features/flow-board-loadmore.js
index dd197a2..9ff612d 100644
--- a/modules/engine/components/board/features/flow-board-loadmore.js
+++ b/modules/engine/components/board/features/flow-board-loadmore.js
@@ -585,9 +585,7 @@
for ( i = 0; i < topicsData.roots.length; i++ ) {
topicId = topicsData.roots[ i ];
- if ( flowBoard.renderedTopics[ topicId ] ) {
- // already rendered, update?
- } else {
+ if ( !flowBoard.renderedTopics[ topicId ] ) {
flowBoard.renderedTopics[ topicId ] = _render(
[ topicId ] );
$allRendered.push( flowBoard.renderedTopics[
topicId ][0] );
toInsert.push( topicId );
@@ -625,8 +623,6 @@
// Put the new topic after the found topic
above it
if ( j >= 0 ) {
$topic.after( flowBoard.renderedTopics[
flowBoard.orderedTopicIds[ i ] ] );
- } else {
- // @todo log something about failures?
}
}
diff --git a/modules/engine/components/board/features/flow-board-toc.js
b/modules/engine/components/board/features/flow-board-toc.js
index 346ec7b..66fccfc 100644
--- a/modules/engine/components/board/features/flow-board-toc.js
+++ b/modules/engine/components/board/features/flow-board-toc.js
@@ -64,7 +64,8 @@
*/
function flowBoardComponentTocFeatureMixinTopicListApiPreHandler(
event, info, extraParameters ) {
var $this = $( this ),
- isLoadMoreButton = $this.data( 'flow-load-handler' )
=== 'loadMore';
+ isLoadMoreButton = $this.data( 'flow-load-handler' )
=== 'loadMore',
+ overrides;
if ( !isLoadMoreButton && !( extraParameters || {}
).skipMenuToggle ) {
// Re-scroll the TOC (in case the scroll that tracks
the page scroll failed
@@ -82,7 +83,7 @@
}
// Send some overrides to this API request
- var overrides = {
+ overrides = {
topiclist_sortby: info.component.$board.data(
'flow-sortby' ),
topiclist_limit: 50,
topiclist_toconly: true
@@ -302,11 +303,10 @@
function flowBoardComponentTocFeatureScrollTocToActiveItem() {
// Set TOC active item
var $tocContainer = this.$tocMenu,
- requestedScrollTop, afterScrollTop; // For debugging
-
- var $scrollTarget = $tocContainer.find( 'a[data-flow-id]' )
- .removeClass( 'active' )
- .filter( '[data-flow-id=' + this.readingTopicId + ']' )
+ requestedScrollTop, afterScrollTop, // For debugging
+ $scrollTarget = $tocContainer.find( 'a[data-flow-id]' )
+ .removeClass( 'active' )
+ .filter( '[data-flow-id=' + this.readingTopicId
+ ']' )
.addClass( 'active' )
.closest( 'li' )
.next();
diff --git a/modules/engine/components/common/flow-component-events.js
b/modules/engine/components/common/flow-component-events.js
index 792dbdb..b7080b8 100644
--- a/modules/engine/components/common/flow-component-events.js
+++ b/modules/engine/components/common/flow-component-events.js
@@ -542,7 +542,7 @@
var args = Array.prototype.slice.call( arguments, 0 ),
$context = $( event.currentTarget ||
event.delegateTarget || event.target ),
- // Have either of these been forced via trigger
extraParameters?
+ // Have either of these been forced via trigger
extraParameters?
interactiveHandlerName = ( extraParameters || {}
).interactiveHandler || $context.data( 'flow-interactive-handler' ),
apiHandlerName = ( extraParameters || {} ).apiHandler
|| $context.data( 'flow-api-handler' );
--
To view, visit https://gerrit.wikimedia.org/r/187887
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic9b05368fa636f0f51a4422a661ddf7f3a8b82c9
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Flow
Gerrit-Branch: master
Gerrit-Owner: Mattflaschen <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
