update grunt deps after 0.4 release. fix jshint 1.0.0 errors.

adobe · Feb 26, 2013 · b13ac1c · b13ac1c
1 parent f50c02e
commit b13ac1c
Show file tree

Hide file tree

Showing 6 changed files with 24 additions and 24 deletions.
diff --git a/package.json b/package.json
@@ -12,12 +12,12 @@
         "SHA": ""
     },
     "devDependencies": {
-        "grunt": ">=0.4.0rc5",
-        "grunt-cli": ">=0.1.6",
-        "grunt-contrib-jshint": ">=0.1.1rc6",
-        "grunt-contrib-watch": ">=0.2.0rc5",
-        "grunt-contrib-jasmine": ">=0.3.0rc7",
-        "grunt-template-jasmine-requirejs": ">=0.1.0"
+        "grunt": "~0.4.0",
+        "grunt-cli": "~0.1.0",
+        "grunt-contrib-jshint": "~0.2.0",
+        "grunt-contrib-watch": "~0.2.0",
+        "grunt-contrib-jasmine": "~0.3.0",
+        "grunt-template-jasmine-requirejs": "~0.1.0"
     },
     "scripts": {
         "postinstall": "grunt install",

diff --git a/src/command/KeyBindingManager.js b/src/command/KeyBindingManager.js
@@ -22,7 +22,7 @@
  */
 
 
-/*jslint vars: true, plusplus: true, devel: true, nomen: true, indent: 4, maxerr: 50, regexp: true */
+/*jslint vars: true, plusplus: true, devel: true, nomen: true, indent: 4, maxerr: 50, regexp: true, boss: true */
 /*global define, $, brackets, window */
 
 /**

diff --git a/src/config.json b/src/config.json
@@ -27,12 +27,12 @@
         "SHA": ""
     },
     "devDependencies": {
-        "grunt": ">=0.4.0rc5",
-        "grunt-cli": ">=0.1.6",
-        "grunt-contrib-jshint": ">=0.1.1rc6",
-        "grunt-contrib-watch": ">=0.2.0rc5",
-        "grunt-contrib-jasmine": ">=0.3.0rc7",
-        "grunt-template-jasmine-requirejs": ">=0.1.0"
+        "grunt": "~0.4.0",
+        "grunt-cli": "~0.1.0",
+        "grunt-contrib-jshint": "~0.2.0",
+        "grunt-contrib-watch": "~0.2.0",
+        "grunt-contrib-jasmine": "~0.3.0",
+        "grunt-template-jasmine-requirejs": "~0.1.0"
     },
     "scripts": {
         "postinstall": "grunt install",

diff --git a/src/extensions/default/InlineColorEditor/unittests.js b/src/extensions/default/InlineColorEditor/unittests.js
@@ -743,11 +743,11 @@ define(function (require, exports, module) {
 
                     makeUI(opts.color || "hsla(50, 25%, 50%, 0.5)");
 
-                    var orig = getParam();
+                    var before = getParam();
                     colorEditor[opts.item].trigger(makeKeyEvent(opts));
 
-                    var final = getParam();
-                    checkNear(final, orig + opts.delta, opts.tolerance);
+                    var after = getParam();
+                    checkNear(after, before + opts.delta, opts.tolerance);
                 }
 
                 /**

diff --git a/src/extensions/samples/InlineImageViewer/main.js b/src/extensions/samples/InlineImageViewer/main.js
@@ -55,12 +55,12 @@ define(function (require, exports, module) {
             var string = token.string;
 
             // Strip quotes
-            var char = string[0];
-            if (char === "\"" || char === "'") {
+            var ch = string[0];
+            if (ch === "\"" || ch === "'") {
                 string = string.substr(1);
             }
-            char = string[string.length - 1];
-            if (char === "\"" || char === "'") {
+            ch = string[string.length - 1];
+            if (ch === "\"" || ch === "'") {
                 string = string.substr(0, string.length - 1);
             }
 

diff --git a/test/spec/SpecRunnerUtils.js b/test/spec/SpecRunnerUtils.js
@@ -324,7 +324,7 @@ define(function (require, exports, module) {
             output  = [],
             i       = 0,
             line    = 0,
-            char    = 0,
+            charAt  = 0,
             ch      = 0,
             length  = text.length,
             exec    = null,
@@ -349,10 +349,10 @@ define(function (require, exports, module) {
             }
 
             if (!found) {
-                char = text.substr(i, 1);
-                output.push(char);
+                charAt = text.substr(i, 1);
+                output.push(charAt);
 
-                if (char === '\n') {
+                if (charAt === '\n') {
                     line++;
                     ch = 0;
                 } else {