chore(npm): update grunt-jscs to 1.2.0 (jscs to 1.10.0), fix styles

petebacondarwin · petebacondarwin · commit 29ad3b7f3609 · 2015-01-30T12:36:18.000Z
Closes angular#10772
diff --git a/.jscs.json b/.jscs.json
@@ -36,6 +36,5 @@
   "requireSpacesInFunction": {
     "beforeOpeningCurlyBrace": true
   },
-  "validateLineBreaks": "LF",
-  "validateParameterSeparator": ", "
+  "validateLineBreaks": "LF"
 }
diff --git a/.jscs.json.todo b/.jscs.json.todo
@@ -4,6 +4,7 @@
 // that correct the existing code base issues and make the new check pass.
 
 {
+  "validateParameterSeparator": ", ", // Re-assert this rule when JSCS allows multiple spaces
   "requireCurlyBraces": ["if", "else", "for", "while", "do", "try", "catch"],
   "disallowImplicitTypeConversion": ["string"],
   "disallowMultipleLineBreaks": true,
diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json
diff --git a/package.json b/package.json
@@ -25,7 +25,7 @@
     "grunt-contrib-jshint": "~0.10.0",
     "grunt-ddescribe-iit": "~0.0.1",
     "grunt-jasmine-node": "git://github.com/vojtajina/grunt-jasmine-node.git#fix-grunt-exit-code",
-    "grunt-jscs": "~0.7.1",
+    "grunt-jscs": "~1.2.0",
     "grunt-merge-conflict": "~0.0.1",
     "grunt-shell": "~1.1.1",
     "gulp": "~3.8.0",
diff --git a/src/Angular.js b/src/Angular.js
@@ -628,7 +628,7 @@ function isElement(node) {
 function makeMap(str) {
   var obj = {}, items = str.split(","), i;
   for (i = 0; i < items.length; i++)
-    obj[ items[i] ] = true;
+    obj[items[i]] = true;
   return obj;
 }
 
diff --git a/src/ngSanitize/sanitize.js b/src/ngSanitize/sanitize.js
@@ -271,14 +271,14 @@ function htmlParser(html, handler) {
     }
   }
   var index, chars, match, stack = [], last = html, text;
-  stack.last = function() { return stack[ stack.length - 1 ]; };
+  stack.last = function() { return stack[stack.length - 1]; };
 
   while (html) {
     text = '';
     chars = true;
 
     // Make sure we're not in a script or style element
-    if (!stack.last() || !specialElements[ stack.last() ]) {
+    if (!stack.last() || !specialElements[stack.last()]) {
 
       // Comment
       if (html.indexOf("<!--") === 0) {
@@ -360,17 +360,17 @@ function htmlParser(html, handler) {
 
   function parseStartTag(tag, tagName, rest, unary) {
     tagName = angular.lowercase(tagName);
-    if (blockElements[ tagName ]) {
-      while (stack.last() && inlineElements[ stack.last() ]) {
+    if (blockElements[tagName]) {
+      while (stack.last() && inlineElements[stack.last()]) {
         parseEndTag("", stack.last());
       }
     }
 
-    if (optionalEndTagElements[ tagName ] && stack.last() == tagName) {
+    if (optionalEndTagElements[tagName] && stack.last() == tagName) {
       parseEndTag("", tagName);
     }
 
-    unary = voidElements[ tagName ] || !!unary;
+    unary = voidElements[tagName] || !!unary;
 
     if (!unary)
       stack.push(tagName);
@@ -395,13 +395,13 @@ function htmlParser(html, handler) {
     if (tagName)
       // Find the closest opened tag of the same type
       for (pos = stack.length - 1; pos >= 0; pos--)
-        if (stack[ pos ] == tagName)
+        if (stack[pos] == tagName)
           break;
 
     if (pos >= 0) {
       // Close all the open elements, up the stack
       for (i = stack.length - 1; i >= pos; i--)
-        if (handler.end) handler.end(stack[ i ]);
+        if (handler.end) handler.end(stack[i]);
 
       // Remove the open elements from the stack
       stack.length = pos;
diff --git a/test/ng/compileSpec.js b/test/ng/compileSpec.js
@@ -6347,7 +6347,7 @@ describe('$compile', function() {
             link: function(scope, element, attrs, ctrl, transclude) {
 
               // We use timeout here to simulate how ng-if works
-              $timeout(function()  {
+              $timeout(function() {
                 transclude(function(child) { element.append(child); });
               });
             }
diff --git a/test/ng/directive/inputSpec.js b/test/ng/directive/inputSpec.js
@@ -1641,9 +1641,9 @@ describe('input', function() {
       });
     });
 
-    describe('max', function()  {
+    describe('max', function() {
 
-      it('should invalidate', function()  {
+      it('should invalidate', function() {
         var inputElm = helper.compileInput('<input type="date" ng-model="value" name="alias" max="2019-01-01" />');
         helper.changeInputValueTo('2019-12-31');
         expect(inputElm).toBeInvalid();

Original file line number	Diff line number	Diff line change
`@@ -36,6 +36,5 @@`
`36`	`36`	`"requireSpacesInFunction": {`
`37`	`37`	`"beforeOpeningCurlyBrace": true`
`38`	`38`	`},`
`39`		`- "validateLineBreaks": "LF",`
`40`		`- "validateParameterSeparator": ", "`
	`39`	`+ "validateLineBreaks": "LF"`
`41`	`40`	`}`
Original file line number	Diff line number	Diff line change
`@@ -4,6 +4,7 @@`
`4`	`4`	`// that correct the existing code base issues and make the new check pass.`
`5`	`5`
`6`	`6`	`{`
	`7`	`+ "validateParameterSeparator": ", ", // Re-assert this rule when JSCS allows multiple spaces`
`7`	`8`	`"requireCurlyBraces": ["if", "else", "for", "while", "do", "try", "catch"],`
`8`	`9`	`"disallowImplicitTypeConversion": ["string"],`
`9`	`10`	`"disallowMultipleLineBreaks": true,`
Original file line number	Diff line number	Diff line change
`@@ -628,7 +628,7 @@ function isElement(node) {`
`628`	`628`	`function makeMap(str) {`
`629`	`629`	`var obj = {}, items = str.split(","), i;`
`630`	`630`	`for (i = 0; i < items.length; i++)`
`631`		`- obj[ items[i] ] = true;`
	`631`	`+ obj[items[i]] = true;`
`632`	`632`	`return obj;`
`633`	`633`	`}`
`634`	`634`
Original file line number	Diff line number	Diff line change
`@@ -6347,7 +6347,7 @@ describe('$compile', function() {`
`6347`	`6347`	`link: function(scope, element, attrs, ctrl, transclude) {`
`6348`	`6348`
`6349`	`6349`	`// We use timeout here to simulate how ng-if works`
`6350`		`- $timeout(function() {`
	`6350`	`+ $timeout(function() {`
`6351`	`6351`	`transclude(function(child) { element.append(child); });`
`6352`	`6352`	`});`
`6353`	`6353`	`}`