Merge pull request #485 from XhmikosR/globals

nschonni · nschonni · commit 8b52eeb179c2 · 2014-04-09T17:41:39.000-04:00
Move global config to JSHint's configuration.
diff --git a/Gruntfile.js b/Gruntfile.js
@@ -221,7 +221,7 @@ module.exports = function(grunt) {
 
     //Run the YUITest suite
     grunt.registerMultiTask("yuitest", "Run the YUITests for the project", function() {
-        /*jshint evil:true, node: true */
+        /*jshint evil:true, node:true*/
 
         var start = Date.now();
         var YUITest = require("yuitest");
diff --git a/src/cli/rhino.js b/src/cli/rhino.js
@@ -1,8 +1,9 @@
 /*
  * CSSLint Rhino Command Line Interface
  */
-/*jshint rhino:true*/
-/*global cli, File*/
+
+/* jshint rhino:true */
+/* global cli, File */
 
 importPackage(java.io);
 
diff --git a/src/cli/wsh.js b/src/cli/wsh.js
@@ -1,9 +1,12 @@
 /*
  * Windows Script Host Command Line Interface
  */
-/*global ActiveXObject, WScript, Enumerator, cli*/
+
 //TODO: This file needs major cleanup!!!
 
+/* jshint wsh:true */
+/* global cli */
+
 var wshapi = (function(){
     var fso = new ActiveXObject("Scripting.FileSystemObject");
     var shell = WScript.CreateObject("WScript.Shell");
diff --git a/tests/all-rules.js b/tests/all-rules.js
@@ -11,7 +11,6 @@
 /*jshint loopfunc: true */
 
 (function(){
-    /*global YUITest, CSSLint*/
     var Assert = YUITest.Assert,
         suite   = new YUITest.TestSuite("General Tests for all Rules"),
         rules   = CSSLint.getRules(),
diff --git a/tests/core/CSSLint.js b/tests/core/CSSLint.js
@@ -1,6 +1,4 @@
 (function(){
-
-    /*global YUITest, CSSLint*/
     var Assert = YUITest.Assert;
 
     YUITest.TestRunner.add(new YUITest.TestCase({
diff --git a/tests/core/Reporter.js b/tests/core/Reporter.js
@@ -1,6 +1,4 @@
 (function(){
-
-    /*global YUITest, CSSLint, Reporter*/
     var Assert = YUITest.Assert;
 
     YUITest.TestRunner.add(new YUITest.TestCase({
diff --git a/tests/formatters/checkstyle-xml.js b/tests/formatters/checkstyle-xml.js
@@ -1,6 +1,4 @@
 (function(){
-
-    /*global YUITest, CSSLint*/
     var Assert = YUITest.Assert;
 
     YUITest.TestRunner.add(new YUITest.TestCase({
diff --git a/tests/formatters/compact.js b/tests/formatters/compact.js
@@ -1,6 +1,4 @@
 (function(){
-
-    /*global YUITest, CSSLint*/
     var Assert = YUITest.Assert;
 
     YUITest.TestRunner.add(new YUITest.TestCase({
diff --git a/tests/formatters/csslint-xml.js b/tests/formatters/csslint-xml.js
@@ -1,6 +1,4 @@
 (function(){
-
-    /*global YUITest, CSSLint*/
     var Assert = YUITest.Assert;
 
     YUITest.TestRunner.add(new YUITest.TestCase({
diff --git a/tests/formatters/junit-xml.js b/tests/formatters/junit-xml.js
@@ -1,6 +1,4 @@
 (function(){
-
-    /*global YUITest, CSSLint*/
     var Assert = YUITest.Assert;
 
     YUITest.TestRunner.add(new YUITest.TestCase({
diff --git a/tests/formatters/lint-xml.js b/tests/formatters/lint-xml.js
@@ -1,6 +1,4 @@
 (function(){
-
-    /*global YUITest, CSSLint*/
     var Assert = YUITest.Assert;
 
     YUITest.TestRunner.add(new YUITest.TestCase({
diff --git a/tests/formatters/text.js b/tests/formatters/text.js
@@ -1,6 +1,4 @@
 (function(){
-
-    /*global YUITest, CSSLint*/
     var Assert = YUITest.Assert;
 
     YUITest.TestRunner.add(new YUITest.TestCase({
diff --git a/tests/rules/adjoining-classes.js b/tests/rules/adjoining-classes.js
@@ -1,6 +1,4 @@
 (function(){
-
-    /*global YUITest, CSSLint*/
     var Assert = YUITest.Assert;
 
     YUITest.TestRunner.add(new YUITest.TestCase({
diff --git a/tests/rules/box-model.js b/tests/rules/box-model.js
@@ -1,6 +1,4 @@
 (function(){
-
-    /*global YUITest, CSSLint*/
     var Assert = YUITest.Assert;
 
     YUITest.TestRunner.add(new YUITest.TestCase({
diff --git a/tests/rules/box-sizing.js b/tests/rules/box-sizing.js
@@ -1,6 +1,4 @@
 (function(){
-
-    /*global YUITest, CSSLint*/
     var Assert = YUITest.Assert;
 
     YUITest.TestRunner.add(new YUITest.TestCase({
diff --git a/tests/rules/bulletproof-font-face.js b/tests/rules/bulletproof-font-face.js
@@ -1,6 +1,4 @@
 (function(){
-
-    /*global YUITest, CSSLint*/
     var Assert = YUITest.Assert;
 
     YUITest.TestRunner.add(new YUITest.TestCase({
diff --git a/tests/rules/compatible-vendor-prefixes.js b/tests/rules/compatible-vendor-prefixes.js
@@ -1,6 +1,4 @@
 (function(){
-
-    /*global YUITest, CSSLint*/
     var Assert = YUITest.Assert;
 
     YUITest.TestRunner.add(new YUITest.TestCase({
diff --git a/tests/rules/display-property-grouping.js b/tests/rules/display-property-grouping.js
@@ -1,6 +1,4 @@
 (function(){
-
-    /*global YUITest, CSSLint*/
     var Assert = YUITest.Assert;
 
     YUITest.TestRunner.add(new YUITest.TestCase({
diff --git a/tests/rules/duplicate-background-images.js b/tests/rules/duplicate-background-images.js
@@ -1,6 +1,4 @@
 (function(){
-
-    /*global YUITest, CSSLint*/
     var Assert = YUITest.Assert;
 
     YUITest.TestRunner.add(new YUITest.TestCase({
diff --git a/tests/rules/duplicate-properties.js b/tests/rules/duplicate-properties.js
@@ -1,6 +1,4 @@
 (function(){
-
-    /*global YUITest, CSSLint*/
     var Assert = YUITest.Assert;
 
     YUITest.TestRunner.add(new YUITest.TestCase({
diff --git a/tests/rules/empty-rules.js b/tests/rules/empty-rules.js
@@ -1,6 +1,4 @@
 (function(){
-
-    /*global YUITest, CSSLint*/
     var Assert = YUITest.Assert;
 
     YUITest.TestRunner.add(new YUITest.TestCase({
diff --git a/tests/rules/errors.js b/tests/rules/errors.js
@@ -1,6 +1,4 @@
 (function(){
-
-    /*global YUITest, CSSLint*/
     var Assert = YUITest.Assert;
 
     YUITest.TestRunner.add(new YUITest.TestCase({
diff --git a/tests/rules/fallback-colors.js b/tests/rules/fallback-colors.js
@@ -1,6 +1,4 @@
 (function(){
-
-    /*global YUITest, CSSLint*/
     var Assert = YUITest.Assert;
 
     YUITest.TestRunner.add(new YUITest.TestCase({
diff --git a/tests/rules/floats.js b/tests/rules/floats.js
@@ -1,6 +1,4 @@
 (function(){
-
-    /*global YUITest, CSSLint*/
     var Assert = YUITest.Assert;
 
     YUITest.TestRunner.add(new YUITest.TestCase({
diff --git a/tests/rules/font-faces.js b/tests/rules/font-faces.js
@@ -1,6 +1,4 @@
 (function(){
-
-    /*global YUITest, CSSLint*/
     var Assert = YUITest.Assert;
 
     YUITest.TestRunner.add(new YUITest.TestCase({
diff --git a/tests/rules/font-sizes.js b/tests/rules/font-sizes.js
@@ -1,6 +1,4 @@
 (function(){
-
-    /*global YUITest, CSSLint*/
     var Assert = YUITest.Assert;
 
     YUITest.TestRunner.add(new YUITest.TestCase({
diff --git a/tests/rules/gradients.js b/tests/rules/gradients.js
@@ -1,6 +1,4 @@
 (function(){
-
-    /*global YUITest, CSSLint*/
     var Assert = YUITest.Assert;
 
     YUITest.TestRunner.add(new YUITest.TestCase({
diff --git a/tests/rules/ids.js b/tests/rules/ids.js
@@ -1,6 +1,4 @@
 (function(){
-
-    /*global YUITest, CSSLint*/
     var Assert = YUITest.Assert;
 
     YUITest.TestRunner.add(new YUITest.TestCase({
diff --git a/tests/rules/import.js b/tests/rules/import.js
@@ -1,6 +1,4 @@
 (function(){
-
-    /*global YUITest, CSSLint*/
     var Assert = YUITest.Assert;
 
     YUITest.TestRunner.add(new YUITest.TestCase({
diff --git a/tests/rules/important.js b/tests/rules/important.js
@@ -1,6 +1,4 @@
 (function(){
-
-    /*global YUITest, CSSLint*/
     var Assert = YUITest.Assert;
 
     YUITest.TestRunner.add(new YUITest.TestCase({
diff --git a/tests/rules/known-properties.js b/tests/rules/known-properties.js
@@ -1,6 +1,4 @@
 (function(){
-
-    /*global YUITest, CSSLint*/
     var Assert = YUITest.Assert;
 
     YUITest.TestRunner.add(new YUITest.TestCase({
diff --git a/tests/rules/order-alphabetical.js b/tests/rules/order-alphabetical.js
@@ -1,6 +1,4 @@
 (function(){
-
-    /*global YUITest, CSSLint*/
     var Assert = YUITest.Assert;
 
     YUITest.TestRunner.add(new YUITest.TestCase({
diff --git a/tests/rules/outline-none.js b/tests/rules/outline-none.js
@@ -1,6 +1,4 @@
 (function(){
-
-    /*global YUITest, CSSLint*/
     var Assert = YUITest.Assert;
 
     YUITest.TestRunner.add(new YUITest.TestCase({
diff --git a/tests/rules/overqualified-elements.js b/tests/rules/overqualified-elements.js
@@ -1,6 +1,4 @@
 (function(){
-
-    /*global YUITest, CSSLint*/
     var Assert = YUITest.Assert;
 
     YUITest.TestRunner.add(new YUITest.TestCase({
diff --git a/tests/rules/qualified-headings.js b/tests/rules/qualified-headings.js
@@ -1,6 +1,4 @@
 (function(){
-
-    /*global YUITest, CSSLint*/
     var Assert = YUITest.Assert;
 
     YUITest.TestRunner.add(new YUITest.TestCase({
diff --git a/tests/rules/regex-selectors.js b/tests/rules/regex-selectors.js
@@ -1,6 +1,4 @@
 (function(){
-
-    /*global YUITest, CSSLint*/
     var Assert = YUITest.Assert;
 
     YUITest.TestRunner.add(new YUITest.TestCase({
diff --git a/tests/rules/selector-max-approaching.js b/tests/rules/selector-max-approaching.js
@@ -1,6 +1,4 @@
 (function(){
-
-    /*global YUITest, CSSLint*/
     var Assert = YUITest.Assert, i, j, css1 = "", css2 = "", css3 = "", css4 = "";
 
     // create css1, which has only 4095 rules and 4095 selectors
diff --git a/tests/rules/selector-max.js b/tests/rules/selector-max.js
@@ -1,6 +1,4 @@
 (function(){
-
-    /*global YUITest, CSSLint*/
     var Assert = YUITest.Assert, i, j, css1 = "", css2 = "", css3 = "", css4 = "";
 
     // create css1, which has only 4095 rules and 4095 selectors
diff --git a/tests/rules/selector-newline.js b/tests/rules/selector-newline.js
@@ -1,4 +1,3 @@
-/*global YUITest, CSSLint*/
 (function () {
 
     var ruleId = "selector-newline", expectWarning, expectPass;
diff --git a/tests/rules/shorthand.js b/tests/rules/shorthand.js
@@ -1,6 +1,4 @@
 (function(){
-
-    /*global YUITest, CSSLint*/
     var Assert = YUITest.Assert;
 
     YUITest.TestRunner.add(new YUITest.TestCase({
diff --git a/tests/rules/star-property-hack.js b/tests/rules/star-property-hack.js
@@ -1,6 +1,4 @@
 (function(){
-
-    /*global YUITest, CSSLint*/
     var Assert = YUITest.Assert;
 
     YUITest.TestRunner.add(new YUITest.TestCase({
diff --git a/tests/rules/text-indent.js b/tests/rules/text-indent.js
@@ -1,6 +1,4 @@
 (function(){
-
-    /*global YUITest, CSSLint*/
     var Assert = YUITest.Assert;
 
     YUITest.TestRunner.add(new YUITest.TestCase({
diff --git a/tests/rules/underscore-property-hack.js b/tests/rules/underscore-property-hack.js
@@ -1,6 +1,4 @@
 (function(){
-
-    /*global YUITest, CSSLint*/
     var Assert = YUITest.Assert;
 
     YUITest.TestRunner.add(new YUITest.TestCase({
diff --git a/tests/rules/unique-headings.js b/tests/rules/unique-headings.js
@@ -1,6 +1,4 @@
 (function(){
-
-    /*global YUITest, CSSLint*/
     var Assert = YUITest.Assert;
 
     YUITest.TestRunner.add(new YUITest.TestCase({
diff --git a/tests/rules/universal-selector.js b/tests/rules/universal-selector.js
@@ -1,6 +1,4 @@
 (function(){
-
-    /*global YUITest, CSSLint*/
     var Assert = YUITest.Assert;
 
     YUITest.TestRunner.add(new YUITest.TestCase({
diff --git a/tests/rules/unqualified-attributes.js b/tests/rules/unqualified-attributes.js
@@ -1,6 +1,4 @@
 (function(){
-
-    /*global YUITest, CSSLint*/
     var Assert = YUITest.Assert;
 
     YUITest.TestRunner.add(new YUITest.TestCase({
diff --git a/tests/rules/vendor-prefix.js b/tests/rules/vendor-prefix.js
@@ -1,6 +1,4 @@
 (function(){
-
-    /*global YUITest, CSSLint*/
     var Assert = YUITest.Assert;
 
     YUITest.TestRunner.add(new YUITest.TestCase({
diff --git a/tests/rules/zero-units.js b/tests/rules/zero-units.js
@@ -1,6 +1,4 @@
 (function(){
-
-    /*global YUITest, CSSLint*/
     var Assert = YUITest.Assert;
 
     YUITest.TestRunner.add(new YUITest.TestCase({
