Bartosz Dziewoński has uploaded a new change for review.
https://gerrit.wikimedia.org/r/319392
Change subject: Make /*jshint -W024*/ global
......................................................................
Make /*jshint -W024*/ global
We use it all over the place in things that use OOjs, which uses the
'static' property internally. While we support some non-ES5 browsers,
this ES5 feature (being able to parse code that uses a reserved word
as an object property name) works in all of them too.
Change-Id: If641642242292fe38c95f690a9409edaf3683a9f
---
M .jshintrc
M resources/src/mediawiki.widgets/mw.widgets.CalendarWidget.js
M resources/src/mediawiki.widgets/mw.widgets.CategoryCapsuleItemWidget.js
M resources/src/mediawiki.widgets/mw.widgets.ComplexTitleInputWidget.js
M resources/src/mediawiki/htmlform/hide-if.js
M resources/src/mediawiki/htmlform/multiselect.js
M resources/src/mediawiki/mediawiki.Upload.Dialog.js
M tests/qunit/suites/resources/mediawiki/mediawiki.Title.test.js
M tests/qunit/suites/resources/mediawiki/mediawiki.Uri.test.js
M tests/qunit/suites/resources/mediawiki/mediawiki.test.js
10 files changed, 1 insertion(+), 18 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/92/319392/1
diff --git a/.jshintrc b/.jshintrc
index 441c4e3..518d5cb 100644
--- a/.jshintrc
+++ b/.jshintrc
@@ -15,6 +15,7 @@
// Relaxing
"laxbreak": true,
"multistr": true,
+ "-W024": false,
// Environment
"browser": true,
diff --git a/resources/src/mediawiki.widgets/mw.widgets.CalendarWidget.js
b/resources/src/mediawiki.widgets/mw.widgets.CalendarWidget.js
index 3daa70a..3e0d91d 100644
--- a/resources/src/mediawiki.widgets/mw.widgets.CalendarWidget.js
+++ b/resources/src/mediawiki.widgets/mw.widgets.CalendarWidget.js
@@ -520,9 +520,7 @@
*/
mw.widgets.CalendarWidget.prototype.onKeyDown = function ( e ) {
var
- /*jshint -W024*/
dir = OO.ui.Element.static.getDir( this.$element ),
- /*jshint +W024*/
nextDirectionKey = dir === 'ltr' ? OO.ui.Keys.RIGHT :
OO.ui.Keys.LEFT,
prevDirectionKey = dir === 'ltr' ? OO.ui.Keys.LEFT :
OO.ui.Keys.RIGHT,
changed = true;
diff --git
a/resources/src/mediawiki.widgets/mw.widgets.CategoryCapsuleItemWidget.js
b/resources/src/mediawiki.widgets/mw.widgets.CategoryCapsuleItemWidget.js
index 4d86cfd..c4a8664 100644
--- a/resources/src/mediawiki.widgets/mw.widgets.CategoryCapsuleItemWidget.js
+++ b/resources/src/mediawiki.widgets/mw.widgets.CategoryCapsuleItemWidget.js
@@ -146,7 +146,6 @@
this.$label.replaceWith( this.$link );
this.setLabelElement( this.$link );
- /*jshint -W024*/
if ( !this.constructor.static.pageExistenceCaches[ this.apiUrl
] ) {
this.constructor.static.pageExistenceCaches[
this.apiUrl ] =
new PageExistenceCache( new mw.ForeignApi(
this.apiUrl ) );
@@ -156,7 +155,6 @@
.done( function ( exists ) {
widget.setMissing( !exists );
} );
- /*jshint +W024*/
};
/* Setup */
@@ -165,7 +163,6 @@
/* Static Properties */
- /*jshint -W024*/
/**
* Map of API URLs to PageExistenceCache objects.
*
@@ -176,7 +173,6 @@
mw.widgets.CategoryCapsuleItemWidget.static.pageExistenceCaches = {
'': new PageExistenceCache()
};
- /*jshint +W024*/
/* Methods */
diff --git
a/resources/src/mediawiki.widgets/mw.widgets.ComplexTitleInputWidget.js
b/resources/src/mediawiki.widgets/mw.widgets.ComplexTitleInputWidget.js
index ddae9b1..8f48ec3 100644
--- a/resources/src/mediawiki.widgets/mw.widgets.ComplexTitleInputWidget.js
+++ b/resources/src/mediawiki.widgets/mw.widgets.ComplexTitleInputWidget.js
@@ -51,7 +51,6 @@
OO.inheritClass( mw.widgets.ComplexTitleInputWidget, OO.ui.Widget );
/* Static Methods */
- /*jshint -W024*/
/**
* @inheritdoc
@@ -84,8 +83,6 @@
);
return state;
};
-
- /*jshint +W024*/
/* Methods */
diff --git a/resources/src/mediawiki/htmlform/hide-if.js
b/resources/src/mediawiki/htmlform/hide-if.js
index 0fbbcbe..c4513d5 100644
--- a/resources/src/mediawiki/htmlform/hide-if.js
+++ b/resources/src/mediawiki/htmlform/hide-if.js
@@ -4,8 +4,6 @@
*/
( function ( mw, $ ) {
- /*jshint -W024*/
-
/**
* Helper function for hide-if to find the nearby form field.
*
diff --git a/resources/src/mediawiki/htmlform/multiselect.js
b/resources/src/mediawiki/htmlform/multiselect.js
index 9ab2532..791b8ea 100644
--- a/resources/src/mediawiki/htmlform/multiselect.js
+++ b/resources/src/mediawiki/htmlform/multiselect.js
@@ -98,7 +98,6 @@
modules.push.apply( modules,
extraModules );
}
mw.loader.using( modules, function () {
- /*jshint -W024*/
convertCheckboxesWidgetToCapsules( OO.ui.FieldLayout.static.infuse( $el ) );
} );
} else {
diff --git a/resources/src/mediawiki/mediawiki.Upload.Dialog.js
b/resources/src/mediawiki/mediawiki.Upload.Dialog.js
index a719ffe..8bda601 100644
--- a/resources/src/mediawiki/mediawiki.Upload.Dialog.js
+++ b/resources/src/mediawiki/mediawiki.Upload.Dialog.js
@@ -57,7 +57,6 @@
* @inheritdoc
* @property title
*/
- /*jshint -W024*/
mw.Upload.Dialog.static.title = mw.msg( 'upload-dialog-title' );
/**
@@ -96,8 +95,6 @@
modes: 'upload'
}
];
-
- /*jshint +W024*/
/* Methods */
diff --git a/tests/qunit/suites/resources/mediawiki/mediawiki.Title.test.js
b/tests/qunit/suites/resources/mediawiki/mediawiki.Title.test.js
index 886e2b6..910bcc1 100644
--- a/tests/qunit/suites/resources/mediawiki/mediawiki.Title.test.js
+++ b/tests/qunit/suites/resources/mediawiki/mediawiki.Title.test.js
@@ -1,4 +1,3 @@
-/*jshint -W024 */
( function ( mw, $ ) {
var repeat = function ( input, multiplier ) {
return new Array( multiplier + 1 ).join( input );
diff --git a/tests/qunit/suites/resources/mediawiki/mediawiki.Uri.test.js
b/tests/qunit/suites/resources/mediawiki/mediawiki.Uri.test.js
index b12803d..97185fc 100644
--- a/tests/qunit/suites/resources/mediawiki/mediawiki.Uri.test.js
+++ b/tests/qunit/suites/resources/mediawiki/mediawiki.Uri.test.js
@@ -1,4 +1,3 @@
-/*jshint -W024 */
( function ( mw, $ ) {
QUnit.module( 'mediawiki.Uri', QUnit.newMwEnvironment( {
setup: function () {
diff --git a/tests/qunit/suites/resources/mediawiki/mediawiki.test.js
b/tests/qunit/suites/resources/mediawiki/mediawiki.test.js
index 1518a80..5e0d03a 100644
--- a/tests/qunit/suites/resources/mediawiki/mediawiki.test.js
+++ b/tests/qunit/suites/resources/mediawiki/mediawiki.test.js
@@ -1,4 +1,3 @@
-/*jshint -W024 */
( function ( mw ) {
var specialCharactersPageName,
// Can't mock SITENAME since jqueryMsg caches it at load
--
To view, visit https://gerrit.wikimedia.org/r/319392
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: If641642242292fe38c95f690a9409edaf3683a9f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Bartosz Dziewoński <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
