jenkins-bot has submitted this change and it was merged.
Change subject: build: Updating development dependencies
......................................................................
build: Updating development dependencies
* grunt-jscs: 1.8.0 → 2.1.0
Change-Id: Ifb509978756122bdc0733a2c293ad28ba2ad89e4
---
M Gruntfile.js
M package.json
M resources/betafeatures.js
M resources/ext.betaFeatures.popup.js
4 files changed, 5 insertions(+), 4 deletions(-)
Approvals:
Jforrester: Looks good to me, approved
jenkins-bot: Verified
diff --git a/Gruntfile.js b/Gruntfile.js
index 6860195..0ec2649 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -6,13 +6,13 @@
/*jshint node:true */
module.exports = function ( grunt ) {
+ var conf = grunt.file.readJSON( 'extension.json' );
grunt.loadNpmTasks( 'grunt-jsonlint' );
grunt.loadNpmTasks( 'grunt-banana-checker' );
grunt.loadNpmTasks( 'grunt-contrib-jshint' );
grunt.loadNpmTasks( 'grunt-jsonlint' );
grunt.loadNpmTasks( 'grunt-contrib-watch' );
grunt.loadNpmTasks( 'grunt-jscs' );
- var conf = grunt.file.readJSON( 'extension.json' );
grunt.initConfig( {
jshint: {
diff --git a/package.json b/package.json
index 4d43d7e..b87d36a 100644
--- a/package.json
+++ b/package.json
@@ -12,7 +12,7 @@
"grunt-banana-checker": "0.2.2",
"grunt-contrib-jshint": "0.11.2",
"grunt-contrib-watch": "0.6.1",
- "grunt-jscs": "1.8.0",
+ "grunt-jscs": "2.1.0",
"grunt-jsonlint": "1.0.4"
}
}
diff --git a/resources/betafeatures.js b/resources/betafeatures.js
index 39d8a62..a9b2c7f 100644
--- a/resources/betafeatures.js
+++ b/resources/betafeatures.js
@@ -28,7 +28,7 @@
for ( preference in features ) {
$input = $( '#mw-input-wp' + preference );
$field = $input.closest( '.mw-ui-feature-field' );
- blacklist = features[preference] &&
features[preference].blacklist;
+ blacklist = features[ preference ] && features[
preference ].blacklist;
if ( blacklist && $.client.test( blacklist, null, true
) ) {
// Browser not compatible
diff --git a/resources/ext.betaFeatures.popup.js
b/resources/ext.betaFeatures.popup.js
index 7f037b6..847010f 100644
--- a/resources/ext.betaFeatures.popup.js
+++ b/resources/ext.betaFeatures.popup.js
@@ -19,8 +19,9 @@
*/
( function ( mw, $ ) {
+ var $link;
if ( !mw.user.options.get( 'betafeatures-popup-disable' ) ) {
- var $link = $( '#pt-betafeatures a' );
+ $link = $( '#pt-betafeatures a' );
if ( $link.length > 0 ) {
$link.tipsy()
--
To view, visit https://gerrit.wikimedia.org/r/233171
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ifb509978756122bdc0733a2c293ad28ba2ad89e4
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BetaFeatures
Gerrit-Branch: master
Gerrit-Owner: Legoktm <[email protected]>
Gerrit-Reviewer: Jforrester <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
