style(*): add jscs rule disallowKeywordsOnNewLine: "else"

hzoo · petebacondarwin · commit d9498a173c61 · 2015-01-30T12:36:18.000Z
Closes angular#10772
diff --git a/.jscs.json b/.jscs.json
@@ -1,6 +1,7 @@
 {
   "excludeFiles": ["src/ngLocale/**"],
   "disallowKeywords": ["with"],
+  "disallowKeywordsOnNewLine": ["else"],
   "disallowMixedSpacesAndTabs": true,
   "disallowMultipleLineStrings": true,
   "disallowNewlineBeforeBlockStatements": true,
diff --git a/.jscs.json.todo b/.jscs.json.todo
@@ -8,7 +8,6 @@
   "requireCurlyBraces": ["if", "else", "for", "while", "do", "try", "catch"],
   "disallowImplicitTypeConversion": ["string"],
   "disallowMultipleLineBreaks": true,
-  "disallowKeywordsOnNewLine": ["else"],
   "validateJSDoc": {
     "checkParamNames": true,
     "requireParamTypes": true
diff --git a/src/Angular.js b/src/Angular.js
@@ -312,8 +312,7 @@ function nextUid() {
 function setHashKey(obj, h) {
   if (h) {
     obj.$$hashKey = h;
-  }
-  else {
+  } else {
     delete obj.$$hashKey;
   }
 }
diff --git a/src/ng/q.js b/src/ng/q.js
@@ -347,8 +347,7 @@ function qFactory(nextTick, exceptionHandler) {
           'qcycle',
           "Expected promise to be resolved with value other than itself '{0}'",
           val));
-      }
-      else {
+      } else {
         this.$$resolve(val);
       }
 
diff --git a/src/ngAnimate/animate.js b/src/ngAnimate/animate.js
@@ -1327,8 +1327,7 @@ angular.module('ngAnimate', ['ng'])
           } else if (lastAnimation.event == 'setClass') {
             animationsToCancel.push(lastAnimation);
             cleanup(element, className);
-          }
-          else if (runningAnimations[className]) {
+          } else if (runningAnimations[className]) {
             var current = runningAnimations[className];
             if (current.event == animationEvent) {
               skipAnimation = true;
diff --git a/src/ngRoute/route.js b/src/ngRoute/route.js
@@ -485,8 +485,7 @@ function $RouteProvider() {
               $location.path(interpolate(this.current.$$route.originalPath, newParams));
               // interpolate modifies newParams, only query params are left
               $location.search(newParams);
-            }
-            else {
+            } else {
               throw $routeMinErr('norout', 'Tried updating route when with no current route');
             }
           }
diff --git a/src/ngScenario/browserTrigger.js b/src/ngScenario/browserTrigger.js
@@ -55,8 +55,7 @@
       if (window.WebKitTransitionEvent) {
         evnt = new WebKitTransitionEvent(eventType, eventData);
         evnt.initEvent(eventType, false, true);
-      }
-      else {
+      } else {
         try {
           evnt = new TransitionEvent(eventType, eventData);
         }
@@ -65,13 +64,11 @@
           evnt.initTransitionEvent(eventType, null, null, null, eventData.elapsedTime || 0);
         }
       }
-    }
-    else if (/animationend/.test(eventType)) {
+    } else if (/animationend/.test(eventType)) {
       if (window.WebKitAnimationEvent) {
         evnt = new WebKitAnimationEvent(eventType, eventData);
         evnt.initEvent(eventType, false, true);
-      }
-      else {
+      } else {
         try {
           evnt = new AnimationEvent(eventType, eventData);
         }
@@ -80,8 +77,7 @@
           evnt.initAnimationEvent(eventType, null, null, null, eventData.elapsedTime || 0);
         }
       }
-    }
-    else {
+    } else {
       evnt = document.createEvent('MouseEvents');
       x = x || 0;
       y = y || 0;
diff --git a/test/ng/snifferSpec.js b/test/ng/snifferSpec.js
@@ -87,11 +87,9 @@ describe('$sniffer', function() {
         var ua = $window.navigator.userAgent.toLowerCase();
         if (/chrome/i.test(ua) || /safari/i.test(ua) || /webkit/i.test(ua)) {
           expectedPrefix = 'Webkit';
-        }
-        else if (/firefox/i.test(ua)) {
+        } else if (/firefox/i.test(ua)) {
           expectedPrefix = 'Moz';
-        }
-        else if (/ie/i.test(ua) || /trident/i.test(ua)) {
+        } else if (/ie/i.test(ua) || /trident/i.test(ua)) {
           expectedPrefix = 'Ms';
         }
         expect($sniffer.vendorPrefix).toBe(expectedPrefix);

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"excludeFiles": ["src/ngLocale/**"],`
`3`	`3`	`"disallowKeywords": ["with"],`
	`4`	`+ "disallowKeywordsOnNewLine": ["else"],`
`4`	`5`	`"disallowMixedSpacesAndTabs": true,`
`5`	`6`	`"disallowMultipleLineStrings": true,`
`6`	`7`	`"disallowNewlineBeforeBlockStatements": true,`
Original file line number	Diff line number	Diff line change
`@@ -312,8 +312,7 @@ function nextUid() {`
`312`	`312`	`function setHashKey(obj, h) {`
`313`	`313`	`if (h) {`
`314`	`314`	`obj.$$hashKey = h;`
`315`		`- }`
`316`		`- else {`
	`315`	`+ } else {`
`317`	`316`	`delete obj.$$hashKey;`
`318`	`317`	`}`
`319`	`318`	`}`
Original file line number	Diff line number	Diff line change
`@@ -347,8 +347,7 @@ function qFactory(nextTick, exceptionHandler) {`
`347`	`347`	`'qcycle',`
`348`	`348`	`"Expected promise to be resolved with value other than itself '{0}'",`
`349`	`349`	`val));`
`350`		`- }`
`351`		`- else {`
	`350`	`+ } else {`
`352`	`351`	`this.$$resolve(val);`
`353`	`352`	`}`
`354`	`353`
Original file line number	Diff line number	Diff line change
`@@ -485,8 +485,7 @@ function $RouteProvider() {`
`485`	`485`	`$location.path(interpolate(this.current.$$route.originalPath, newParams));`
`486`	`486`	`// interpolate modifies newParams, only query params are left`
`487`	`487`	`$location.search(newParams);`
`488`		`- }`
`489`		`- else {`
	`488`	`+ } else {`
`490`	`489`	`throw $routeMinErr('norout', 'Tried updating route when with no current route');`
`491`	`490`	`}`
`492`	`491`	`}`
Original file line number	Diff line number	Diff line change
`@@ -55,8 +55,7 @@`
`55`	`55`	`if (window.WebKitTransitionEvent) {`
`56`	`56`	`evnt = new WebKitTransitionEvent(eventType, eventData);`
`57`	`57`	`evnt.initEvent(eventType, false, true);`
`58`		`- }`
`59`		`- else {`
	`58`	`+ } else {`
`60`	`59`	`try {`
`61`	`60`	`evnt = new TransitionEvent(eventType, eventData);`
`62`	`61`	`}`
`@@ -65,13 +64,11 @@`
`65`	`64`	`evnt.initTransitionEvent(eventType, null, null, null, eventData.elapsedTime \|\| 0);`
`66`	`65`	`}`
`67`	`66`	`}`
`68`		`- }`
`69`		`- else if (/animationend/.test(eventType)) {`
	`67`	`+ } else if (/animationend/.test(eventType)) {`
`70`	`68`	`if (window.WebKitAnimationEvent) {`
`71`	`69`	`evnt = new WebKitAnimationEvent(eventType, eventData);`
`72`	`70`	`evnt.initEvent(eventType, false, true);`
`73`		`- }`
`74`		`- else {`
	`71`	`+ } else {`
`75`	`72`	`try {`
`76`	`73`	`evnt = new AnimationEvent(eventType, eventData);`
`77`	`74`	`}`
`@@ -80,8 +77,7 @@`
`80`	`77`	`evnt.initAnimationEvent(eventType, null, null, null, eventData.elapsedTime \|\| 0);`
`81`	`78`	`}`
`82`	`79`	`}`
`83`		`- }`
`84`		`- else {`
	`80`	`+ } else {`
`85`	`81`	`evnt = document.createEvent('MouseEvents');`
`86`	`82`	`x = x \|\| 0;`
`87`	`83`	`y = y \|\| 0;`