Jforrester has uploaded a new change for review.
https://gerrit.wikimedia.org/r/278077
Change subject: build: Bump devDependencies to latest and make pass
......................................................................
build: Bump devDependencies to latest and make pass
grunt-contrib-csslint 0.5.0 → 1.0.0
grunt-contrib-jshint 0.11.3 → 1.0.0
grunt-contrib-watch 0.6.1 → 1.0.0
grunt-jscs 2.1.0 → 2.8.0
Change-Id: Ia6ca7c477b1c7ce8b3fc54994b1abf361c031eda
---
M .jscsrc
M .jshintrc
M modules/ext.templateDataGenerator.ui.js
M package.json
4 files changed, 49 insertions(+), 30 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/TemplateData
refs/changes/77/278077/1
diff --git a/.jscsrc b/.jscsrc
index 7367759..ef20cfb 100644
--- a/.jscsrc
+++ b/.jscsrc
@@ -3,5 +3,22 @@
"es3": true,
"disallowQuotedKeysInObjects": "allButReserved",
- "requireDotNotation": { "allExcept": [ "keywords" ] }
+ "requireDotNotation": { "allExcept": [ "keywords" ] },
+ "jsDoc": {
+ "checkAnnotations": {
+ "preset": "jsduck5",
+ "extra": {
+ "this": "some",
+ "source": "some",
+ "see": "some"
+ }
+ },
+ "checkTypes": "strictNativeCase",
+ "checkParamNames": true,
+ "checkRedundantAccess": true,
+ "checkRedundantReturns": true,
+ "requireNewlineAfterDescription": true,
+ "requireParamTypes": true,
+ "requireReturnTypes": true
+ }
}
diff --git a/.jshintrc b/.jshintrc
index 7ed54dc..b0f59f9 100644
--- a/.jshintrc
+++ b/.jshintrc
@@ -3,11 +3,13 @@
"bitwise": true,
"eqeqeq": true,
"freeze": true,
- "latedef": true,
+ "latedef": "nofunc",
+ "futurehostile": true,
"noarg": true,
"nonew": true,
"undef": true,
"unused": true,
+
"strict": false,
// Relaxing
diff --git a/modules/ext.templateDataGenerator.ui.js
b/modules/ext.templateDataGenerator.ui.js
index 380e4d7..f7dea12 100644
--- a/modules/ext.templateDataGenerator.ui.js
+++ b/modules/ext.templateDataGenerator.ui.js
@@ -58,6 +58,20 @@
},
/**
+ * Open the templatedata edit dialog
+ *
+ * @method openEditDialog
+ * @param {mw.TemplateData.Model} dataModel The data model
+ * associated with this edit dialog.
+ */
+ openEditDialog = function ( dataModel ) {
+ // Open the edit dialog
+ windowManager.openWindow( tdgDialog, {
+ model: dataModel
+ } );
+ },
+
+ /**
* Respond to edit dialog button click.
*
* @method onEditOpenDialogButton
@@ -114,30 +128,6 @@
},
/**
- * Open the templatedata edit dialog
- *
- * @method openEditDialog
- * @param {mw.TemplateData.Model} dataModel The data model
- * associated with this edit dialog.
- */
- openEditDialog = function ( dataModel ) {
- // Open the edit dialog
- windowManager.openWindow( tdgDialog, {
- model: dataModel
- } );
- },
-
- /**
- * Respond to edit dialog apply event
- *
- * @method onDialogApply
- * @param {Object} templateData New templatedata
- */
- onDialogApply = function ( templateData ) {
- $textbox.val( replaceTemplateData( templateData ) );
- },
-
- /**
* Replace the old templatedata string with the new one, or
* insert the new one into the page if an old one doesn't exist
*
@@ -181,6 +171,16 @@
}
}
return finalOutput;
+ },
+
+ /**
+ * Respond to edit dialog apply event
+ *
+ * @method onDialogApply
+ * @param {Object} templateData New templatedata
+ */
+ onDialogApply = function ( templateData ) {
+ $textbox.val( replaceTemplateData( templateData ) );
};
return {
diff --git a/package.json b/package.json
index 880c31d..8c16cea 100644
--- a/package.json
+++ b/package.json
@@ -18,11 +18,11 @@
"devDependencies": {
"grunt": "0.4.5",
"grunt-cli": "0.1.13",
- "grunt-contrib-csslint": "0.5.0",
- "grunt-contrib-jshint": "0.11.3",
- "grunt-contrib-watch": "0.6.1",
+ "grunt-contrib-csslint": "1.0.0",
+ "grunt-contrib-jshint": "1.0.0",
+ "grunt-contrib-watch": "1.0.0",
"grunt-banana-checker": "0.4.0",
- "grunt-jscs": "2.1.0",
+ "grunt-jscs": "2.8.0",
"grunt-jsonlint": "1.0.7"
}
}
--
To view, visit https://gerrit.wikimedia.org/r/278077
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia6ca7c477b1c7ce8b3fc54994b1abf361c031eda
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/TemplateData
Gerrit-Branch: master
Gerrit-Owner: Jforrester <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
