Jforrester has uploaded a new change for review.
https://gerrit.wikimedia.org/r/208344
Change subject: Follow-up b2245d61: Undo over-rides in .jscsrc and make pass
instead
......................................................................
Follow-up b2245d61: Undo over-rides in .jscsrc and make pass instead
Change-Id: Id3cb11eb35b049d2057669f8e63fffb445436de9
---
M .jscsrc
M javascripts/ButtonWithSpinner.js
M javascripts/experiments.js
M javascripts/modules.js
M javascripts/modules/WikiDataApi.js
M javascripts/modules/bannerImage/Image.js
M javascripts/modules/bannerImage/MobileViewBannerImageRepository.js
M javascripts/modules/editor/EditorOverlay.js
M javascripts/modules/errorReport/init.js
M javascripts/modules/references/init.js
M javascripts/modules/search/MobileWebSearchLogger.js
M javascripts/modules/search/SearchApi.js
M javascripts/modules/toc/init.js
M javascripts/modules/uploads/PhotoApi.js
M javascripts/modules/uploads/init.js
M tests/qunit/modules/bannerImage/test_MobileViewBannerImageRepository.js
M tests/qunit/modules/editor/test_EditorApi.js
M tests/qunit/modules/search/test_MobileWebSearchLogger.js
M tests/qunit/test_experiments.js
19 files changed, 58 insertions(+), 53 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MobileFrontend
refs/changes/44/208344/1
diff --git a/.jscsrc b/.jscsrc
index c658e0c..85a5555 100644
--- a/.jscsrc
+++ b/.jscsrc
@@ -1,12 +1,8 @@
{
"preset": "wikimedia",
- "disallowSpacesInCallExpression": null,
- "disallowNewlineBeforeBlockStatements": null,
- "requireSpaceAfterLineComment": null,
-
"requireMultipleVarDecl": "onevar",
- "requireLineBreakAfterVariableAssignment": null,
+ "requireLineBreakAfterVariableAssignment": true,
"disallowOperatorBeforeLineBreak": ["."],
"requireBlocksOnNewline": true,
"requireLineFeedAtFileEnd": true,
@@ -19,7 +15,7 @@
"requireParamTypes": true,
"checkRedundantParams": true
},
- "validateIndentation": null,
+ "validateIndentation": "\t",
"excludeFiles": ["javascripts/externals/**/*.js", "javascripts/README.md"],
"additionalRules": [
"node_modules/jscs-jsdoc/lib/rules/*.js"
diff --git a/javascripts/ButtonWithSpinner.js b/javascripts/ButtonWithSpinner.js
index 11d47c3..23012c3 100644
--- a/javascripts/ButtonWithSpinner.js
+++ b/javascripts/ButtonWithSpinner.js
@@ -37,4 +37,4 @@
};
M.define( 'ButtonWithSpinner', ButtonWithSpinner );
-} ( mw.mobileFrontend ) );
+}( mw.mobileFrontend ) );
diff --git a/javascripts/experiments.js b/javascripts/experiments.js
index 6895d88..6f6695a 100644
--- a/javascripts/experiments.js
+++ b/javascripts/experiments.js
@@ -114,4 +114,4 @@
}
} );
-} ( mw.mobileFrontend ) );
+}( mw.mobileFrontend ) );
diff --git a/javascripts/modules.js b/javascripts/modules.js
index edb10b7..13dec79 100644
--- a/javascripts/modules.js
+++ b/javascripts/modules.js
@@ -110,4 +110,4 @@
// inception to support testing (!!)
mw.mobileFrontend.define( 'ModuleLoader', ModuleLoader );
-} () );
+}() );
diff --git a/javascripts/modules/WikiDataApi.js
b/javascripts/modules/WikiDataApi.js
index f2d1922..a1cafee 100644
--- a/javascripts/modules/WikiDataApi.js
+++ b/javascripts/modules/WikiDataApi.js
@@ -139,12 +139,12 @@
this.getInfo().done( function ( info ) {
self.postWithToken( 'csrf', {
- action: 'wbsetdescription',
- id: self.subjectId,
- value: value,
- language: self.language,
- baserevid: info.lastrevid,
- bot: 1
+ action: 'wbsetdescription',
+ id: self.subjectId,
+ value: value,
+ language: self.language,
+ baserevid: info.lastrevid,
+ bot: 1
} ).done( function ( resp ) {
d.resolve( resp );
} ).fail( $.proxy( d, 'reject' ) );
@@ -163,16 +163,16 @@
d = $.Deferred();
self.postWithToken( 'csrf', {
- action: 'wbcreateclaim',
- entity: self.subjectId,
- snaktype: 'value',
- property: property,
- value: JSON.stringify( {
- 'entity-type': 'item',
- // FIXME: yuk.
- 'numeric-id': value.replace(
'Q', '' )
- } ),
- summary: 'MobileFrontend Infobox alpha
edit'
+ action: 'wbcreateclaim',
+ entity: self.subjectId,
+ snaktype: 'value',
+ property: property,
+ value: JSON.stringify( {
+ 'entity-type': 'item',
+ // FIXME: yuk.
+ 'numeric-id': value.replace( 'Q', '' )
+ } ),
+ summary: 'MobileFrontend Infobox alpha edit'
} ).done( function ( resp ) {
d.resolve( resp );
} ).fail( $.proxy( d, 'reject' ) );
diff --git a/javascripts/modules/bannerImage/Image.js
b/javascripts/modules/bannerImage/Image.js
index 51ae1d2..164a5c9 100644
--- a/javascripts/modules/bannerImage/Image.js
+++ b/javascripts/modules/bannerImage/Image.js
@@ -45,4 +45,4 @@
M.define( 'modules/bannerImage/Image', Image );
-} ( mw.mobileFrontend, jQuery ) );
+}( mw.mobileFrontend, jQuery ) );
diff --git a/javascripts/modules/bannerImage/MobileViewBannerImageRepository.js
b/javascripts/modules/bannerImage/MobileViewBannerImageRepository.js
index d88d74a..60b00dd 100644
--- a/javascripts/modules/bannerImage/MobileViewBannerImageRepository.js
+++ b/javascripts/modules/bannerImage/MobileViewBannerImageRepository.js
@@ -84,4 +84,4 @@
M.define( 'modules/bannerImage/MobileViewBannerImageRepository',
MobileViewBannerImageRepository );
-} ( mw.mobileFrontend, jQuery ) );
+}( mw.mobileFrontend, jQuery ) );
diff --git a/javascripts/modules/editor/EditorOverlay.js
b/javascripts/modules/editor/EditorOverlay.js
index 9bff4d4..fd39c4a 100644
--- a/javascripts/modules/editor/EditorOverlay.js
+++ b/javascripts/modules/editor/EditorOverlay.js
@@ -225,8 +225,9 @@
new Section( {
el: self.$preview,
text: parsedText
- // bug 49218: stop links from being clickable
(note user can still hold down to navigate to them)
- } ).$( 'a' ).on( 'click', false );
+ } )
+ // bug 49218: stop links from being
clickable (note user can still hold down to navigate to them)
+ .$( 'a' ).on( 'click', false );
// Emit event so we can perform enhancements to
page
M.emit( 'edit-preview', self );
} ).fail( function () {
diff --git a/javascripts/modules/errorReport/init.js
b/javascripts/modules/errorReport/init.js
index 9258696..b196667 100644
--- a/javascripts/modules/errorReport/init.js
+++ b/javascripts/modules/errorReport/init.js
@@ -28,7 +28,7 @@
result.resolve( new
ErrorReportOverlay() );
errorButton.hideSpinner();
} );
- // FIXME: Use event logging on fail event
+ // FIXME: Use event logging on fail event
return result;
} );
diff --git a/javascripts/modules/references/init.js
b/javascripts/modules/references/init.js
index 6709420..eaa1dfb 100644
--- a/javascripts/modules/references/init.js
+++ b/javascripts/modules/references/init.js
@@ -36,7 +36,7 @@
text: getReference( href ).html()
} );
ev.preventDefault();
- //don't hide drawer (stop propagation of click) if it is
already shown (e.g. click another reference)
+ // don't hide drawer (stop propagation of click) if it is
already shown (e.g. click another reference)
if ( drawer.isVisible() ) {
ev.stopPropagation();
} else {
diff --git a/javascripts/modules/search/MobileWebSearchLogger.js
b/javascripts/modules/search/MobileWebSearchLogger.js
index c6a9348..e919595 100644
--- a/javascripts/modules/search/MobileWebSearchLogger.js
+++ b/javascripts/modules/search/MobileWebSearchLogger.js
@@ -138,4 +138,4 @@
M.define( 'modules/search/MobileWebSearchLogger', MobileWebSearchLogger
);
-} ( mw.mobileFrontend, mw, jQuery ) );
+}( mw.mobileFrontend, mw, jQuery ) );
diff --git a/javascripts/modules/search/SearchApi.js
b/javascripts/modules/search/SearchApi.js
index fbd3681..36f50e7 100644
--- a/javascripts/modules/search/SearchApi.js
+++ b/javascripts/modules/search/SearchApi.js
@@ -133,7 +133,7 @@
if (
$.inArray( id, pageIds ) === -1 ) {
if ( info ) {
// return all possible page data
-
pageIds.push ( id );
+
pageIds.push( id );
results.push( {
id: info.pageid,
heading: highlightSearchTerm( info.title, query ),
diff --git a/javascripts/modules/toc/init.js b/javascripts/modules/toc/init.js
index e22c9e6..96c5b63 100644
--- a/javascripts/modules/toc/init.js
+++ b/javascripts/modules/toc/init.js
@@ -16,10 +16,11 @@
// TODO: remove wgTOC when caches with old HTML expire
enableToc = mw.config.get( 'wgMFTocEnabled' ) ||
mw.config.get( 'wgTOC' );
- if ( enableToc ||
+ if (
+ enableToc ||
// Fallback for old cached HTML, added 26 June, 2014
- ( enableToc === null && sections.length > 0 &&
!page.isMainPage() ) )
- {
+ ( enableToc === null && sections.length > 0 &&
!page.isMainPage() )
+ ) {
toc = new TableOfContents( {
sections: sections
} );
diff --git a/javascripts/modules/uploads/PhotoApi.js
b/javascripts/modules/uploads/PhotoApi.js
index 980a23e..475a1c8 100644
--- a/javascripts/modules/uploads/PhotoApi.js
+++ b/javascripts/modules/uploads/PhotoApi.js
@@ -258,7 +258,7 @@
if ( self.editorApi && !isNewFile ) {
self.editorApi.setPrependText(
'[[File:' + options.fileName + '|thumbnail|' + options.description + ']]\n\n' );
self.editorApi.save( {
- summary:
mw.msg( 'mobile-frontend-photo-upload-comment' )
+ summary: mw.msg(
'mobile-frontend-photo-upload-comment' )
} )
.done( function () {
result.resolve(
options.fileName, descriptionUrl );
diff --git a/javascripts/modules/uploads/init.js
b/javascripts/modules/uploads/init.js
index b01ca54..17fa4fb 100644
--- a/javascripts/modules/uploads/init.js
+++ b/javascripts/modules/uploads/init.js
@@ -42,11 +42,16 @@
$( '#ca-upload' ).remove();
}
} else {
- if ( !page.isEditable( user ) || !validNamespace ||
- // FIXME: Anonymous users cannot upload
but really this should also check rights of user via getRights
- // (without triggering an additional
HTTP request)
- user.isAnon() ||
- mw.util.getParamValue( 'action' ) ||
!needsPhoto( $lead ) || mw.config.get( 'wgIsMainPage' ) ) {
+ if (
+ !page.isEditable( user ) ||
+ !validNamespace ||
+ // FIXME: Anonymous users cannot upload but
really this should also check rights of user via getRights
+ // (without triggering an additional HTTP
request)
+ user.isAnon() ||
+ mw.util.getParamValue( 'action' ) ||
+ !needsPhoto( $lead ) ||
+ mw.config.get( 'wgIsMainPage' )
+ ) {
$( '#ca-upload' ).remove();
}
}
@@ -60,8 +65,8 @@
if ( isSupported ) {
$( initialize );
} else {
- // FIXME: We want to enable it to these users however
we must first deal with what to show
- // to users who haven't uploaded anything to make the
page useful.
+ // FIXME: We want to enable it to these users however we must
first deal with what to show
+ // to users who haven't uploaded anything to make the page
useful.
$( function () {
// FIXME: Move to MainMenu.js
$( '#mw-mf-page-left li.menu-item-upload' ).remove();
diff --git
a/tests/qunit/modules/bannerImage/test_MobileViewBannerImageRepository.js
b/tests/qunit/modules/bannerImage/test_MobileViewBannerImageRepository.js
index ccb9f48..0864b63 100644
--- a/tests/qunit/modules/bannerImage/test_MobileViewBannerImageRepository.js
+++ b/tests/qunit/modules/bannerImage/test_MobileViewBannerImageRepository.js
@@ -97,4 +97,4 @@
assert.strictEqual( this.getSpy.callCount, 1 );
} );
-} ( mw.mobileFrontend, mw, jQuery ) );
+}( mw.mobileFrontend, mw, jQuery ) );
diff --git a/tests/qunit/modules/editor/test_EditorApi.js
b/tests/qunit/modules/editor/test_EditorApi.js
index 5d43098..4d462aa 100644
--- a/tests/qunit/modules/editor/test_EditorApi.js
+++ b/tests/qunit/modules/editor/test_EditorApi.js
@@ -68,9 +68,10 @@
QUnit.test( '#getContent, missing section', 2, function ( assert ) {
var editorApi = new EditorApi( {
- title: 'test',
- sectionId: 1
- } ), doneSpy = this.sandbox.spy();
+ title: 'test',
+ sectionId: 1
+ } ),
+ doneSpy = this.sandbox.spy();
EditorApi.prototype.get.restore();
this.sandbox.stub( EditorApi.prototype, 'get' ).returns(
$.Deferred().resolve( {
@@ -489,9 +490,10 @@
QUnit.test( '#getPreview', 2, function ( assert ) {
var editorApi = new EditorApi( {
- title: 'Test',
- sectionId: 1
- } ), doneSpy = this.sandbox.spy();
+ title: 'Test',
+ sectionId: 1
+ } ),
+ doneSpy = this.sandbox.spy();
this.sandbox.stub( editorApi, 'post' ).returns(
$.Deferred().resolve( {
parse: {
title: 'test',
diff --git a/tests/qunit/modules/search/test_MobileWebSearchLogger.js
b/tests/qunit/modules/search/test_MobileWebSearchLogger.js
index a78946f..27ad62f 100644
--- a/tests/qunit/modules/search/test_MobileWebSearchLogger.js
+++ b/tests/qunit/modules/search/test_MobileWebSearchLogger.js
@@ -119,4 +119,4 @@
);
} );
-} ( mw.mobileFrontend ) );
+}( mw.mobileFrontend ) );
diff --git a/tests/qunit/test_experiments.js b/tests/qunit/test_experiments.js
index 5c71afb..72ba0ad 100644
--- a/tests/qunit/test_experiments.js
+++ b/tests/qunit/test_experiments.js
@@ -55,4 +55,4 @@
assert.strictEqual( 'control', this.experiments.getBucket(
'foo' ) );
} );
-} ( mw, mw.mobileFrontend ) );
+}( mw, mw.mobileFrontend ) );
--
To view, visit https://gerrit.wikimedia.org/r/208344
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Id3cb11eb35b049d2057669f8e63fffb445436de9
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Jforrester <jforres...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
