style(*) add curly braces to multiline if and for statements

rzschech · petebacondarwin · commit 8a2c80ce7ff3 · 2015-02-02T14:48:55.000Z
Closes angular#10865
diff --git a/src/Angular.js b/src/Angular.js
@@ -626,8 +626,9 @@ function isElement(node) {
  */
 function makeMap(str) {
   var obj = {}, items = str.split(","), i;
-  for (i = 0; i < items.length; i++)
+  for (i = 0; i < items.length; i++) {
     obj[items[i]] = true;
+  }
   return obj;
 }
 
@@ -642,8 +643,9 @@ function includes(array, obj) {
 
 function arrayRemove(array, value) {
   var index = array.indexOf(value);
-  if (index >= 0)
+  if (index >= 0) {
     array.splice(index, 1);
+  }
   return index;
 }
 
diff --git a/src/jqLite.js b/src/jqLite.js
@@ -851,8 +851,9 @@ forEach({
   children: function(element) {
     var children = [];
     forEach(element.childNodes, function(element) {
-      if (element.nodeType === NODE_TYPE_ELEMENT)
+      if (element.nodeType === NODE_TYPE_ELEMENT) {
         children.push(element);
+      }
     });
     return children;
   },
diff --git a/src/ng/filter/filters.js b/src/ng/filter/filters.js
@@ -234,8 +234,9 @@ function padNumber(num, digits, trim) {
   }
   num = '' + num;
   while (num.length < digits) num = '0' + num;
-  if (trim)
+  if (trim) {
     num = num.substr(num.length - digits);
+  }
   return neg + num;
 }
 
@@ -244,8 +245,9 @@ function dateGetter(name, size, offset, trim) {
   offset = offset || 0;
   return function(date) {
     var value = date['get' + name]();
-    if (offset > 0 || value > -offset)
+    if (offset > 0 || value > -offset) {
       value += offset;
+    }
     if (value === 0 && offset == -12) value = 12;
     return padNumber(value, size, trim);
   };
diff --git a/src/ng/http.js b/src/ng/http.js
@@ -98,8 +98,9 @@ function headersGetter(headers) {
  * @returns {*} Transformed data.
  */
 function transformData(data, headers, status, fns) {
-  if (isFunction(fns))
+  if (isFunction(fns)) {
     return fns(data, headers, status);
+  }
 
   forEach(fns, function(fn) {
     data = fn(data, headers, status);
diff --git a/src/ng/location.js b/src/ng/location.js
@@ -373,8 +373,9 @@ var locationPrototype = {
    * @return {string} url
    */
   url: function(url) {
-    if (isUndefined(url))
+    if (isUndefined(url)) {
       return this.$$url;
+    }
 
     var match = PATH_MATCH.exec(url);
     if (match[1] || url === '') this.path(decodeURIComponent(match[1]));
@@ -613,8 +614,9 @@ forEach([LocationHashbangInHtml5Url, LocationHashbangUrl, LocationHtml5Url], fun
    * @return {object} state
    */
   Location.prototype.state = function(state) {
-    if (!arguments.length)
+    if (!arguments.length) {
       return this.$$state;
+    }
 
     if (Location !== LocationHtml5Url || !this.$$html5) {
       throw $locationMinErr('nostate', 'History API state support is available only ' +
@@ -639,8 +641,9 @@ function locationGetter(property) {
 
 function locationGetterSetter(property, preprocess) {
   return function(value) {
-    if (isUndefined(value))
+    if (isUndefined(value)) {
       return this[property];
+    }
 
     this[property] = preprocess(value);
     this.$$compose();
diff --git a/src/ng/parse.js b/src/ng/parse.js
@@ -235,8 +235,9 @@ Lexer.prototype = {
       if (escape) {
         if (ch === 'u') {
           var hex = this.text.substring(this.index + 1, this.index + 5);
-          if (!hex.match(/[\da-f]{4}/i))
+          if (!hex.match(/[\da-f]{4}/i)) {
             this.throwError('Invalid unicode escape [\\u' + hex + ']');
+          }
           this.index += 4;
           string += String.fromCharCode(parseInt(hex, 16));
         } else {
@@ -544,8 +545,9 @@ AST.prototype = {
   },
 
   peekToken: function() {
-    if (this.tokens.length === 0)
+    if (this.tokens.length === 0) {
       throw $parseMinErr('ueoe', 'Unexpected end of expression: {0}', this.text);
+    }
     return this.tokens[0];
   },
 
diff --git a/src/ngMock/angular-mocks.js b/src/ngMock/angular-mocks.js
@@ -599,8 +599,9 @@ function padNumber(num, digits, trim) {
   }
   num = '' + num;
   while (num.length < digits) num = '0' + num;
-  if (trim)
+  if (trim) {
     num = num.substr(num.length - digits);
+  }
   return neg + num;
 }
 
@@ -650,11 +651,12 @@ angular.mock.TzDate = function(offset, timestamp) {
     self.origDate = jsonStringToDate(timestamp);
 
     timestamp = self.origDate.getTime();
-    if (isNaN(timestamp))
+    if (isNaN(timestamp)) {
       throw {
         name: "Illegal Argument",
         message: "Arg '" + tsStr + "' passed into TzDate constructor is not a valid date string"
       };
+    }
   } else {
     self.origDate = new Date(timestamp);
   }
@@ -1184,14 +1186,16 @@ function createHttpBackendMock($rootScope, $timeout, $delegate, $browser) {
     }
 
     if (expectation && expectation.match(method, url)) {
-      if (!expectation.matchData(data))
+      if (!expectation.matchData(data)) {
         throw new Error('Expected ' + expectation + ' with different data\n' +
             'EXPECTED: ' + prettyPrint(expectation.data) + '\nGOT:      ' + data);
+      }
 
-      if (!expectation.matchHeaders(headers))
+      if (!expectation.matchHeaders(headers)) {
         throw new Error('Expected ' + expectation + ' with different headers\n' +
                         'EXPECTED: ' + prettyPrint(expectation.headers) + '\nGOT:      ' +
                         prettyPrint(headers));
+      }
 
       expectations.shift();
 
diff --git a/src/ngSanitize/sanitize.js b/src/ngSanitize/sanitize.js
@@ -372,8 +372,9 @@ function htmlParser(html, handler) {
 
     unary = voidElements[tagName] || !!unary;
 
-    if (!unary)
+    if (!unary) {
       stack.push(tagName);
+    }
 
     var attrs = {};
 
@@ -392,11 +393,12 @@ function htmlParser(html, handler) {
   function parseEndTag(tag, tagName) {
     var pos = 0, i;
     tagName = angular.lowercase(tagName);
-    if (tagName)
+    if (tagName) {
       // Find the closest opened tag of the same type
-      for (pos = stack.length - 1; pos >= 0; pos--)
-        if (stack[pos] == tagName)
-          break;
+      for (pos = stack.length - 1; pos >= 0; pos--) {
+        if (stack[pos] == tagName) break;
+      }
+    }
 
     if (pos >= 0) {
       // Close all the open elements, up the stack
diff --git a/src/ngScenario/Application.js b/src/ngScenario/Application.js
@@ -34,8 +34,9 @@ angular.scenario.Application.prototype.getFrame_ = function() {
  */
 angular.scenario.Application.prototype.getWindow_ = function() {
   var contentWindow = this.getFrame_().prop('contentWindow');
-  if (!contentWindow)
+  if (!contentWindow) {
     throw 'Frame window is not accessible.';
+  }
   return contentWindow;
 };
 
diff --git a/src/ngScenario/ObjectModel.js b/src/ngScenario/ObjectModel.js
@@ -76,8 +76,9 @@ angular.scenario.ObjectModel = function(runner) {
   runner.on('StepEnd', function(spec) {
     var it = self.getSpec(spec.id);
     var step = it.getLastStep();
-    if (step.name !== step.name)
+    if (step.name !== step.name) {
       throw 'Events fired in the wrong order. Step names don\'t match.';
+    }
     complete(step);
 
     // forward the event
diff --git a/src/ngScenario/Runner.js b/src/ngScenario/Runner.js
@@ -36,8 +36,9 @@ angular.scenario.Runner.prototype.emit = function(eventName) {
   var self = this;
   var args = Array.prototype.slice.call(arguments, 1);
   eventName = eventName.toLowerCase();
-  if (!this.listeners[eventName])
+  if (!this.listeners[eventName]) {
     return;
+  }
   angular.forEach(this.listeners[eventName], function(listener) {
     listener.apply(self, args);
   });
@@ -157,8 +158,9 @@ angular.scenario.Runner.prototype.createSpecRunner_ = function(scope) {
 
   // Export all the methods to child scope manually as now we don't mess controllers with scopes
   // TODO(vojta): refactor scenario runner so that these objects are not tightly coupled as current
-  for (var name in Cls.prototype)
+  for (var name in Cls.prototype) {
     child[name] = angular.bind(child, Cls.prototype[name]);
+  }
 
   Cls.call(child);
   return child;
diff --git a/src/ngScenario/Scenario.js b/src/ngScenario/Scenario.js
@@ -42,8 +42,9 @@ angular.scenario.dsl = angular.scenario.dsl || function(name, fn) {
     /* jshint -W040 *//* The dsl binds `this` for us when calling chained functions */
     function executeStatement(statement, args) {
       var result = statement.apply(this, args);
-      if (angular.isFunction(result) || result instanceof angular.scenario.Future)
+      if (angular.isFunction(result) || result instanceof angular.scenario.Future) {
         return result;
+      }
       var self = this;
       var chain = angular.extend({}, result);
       angular.forEach(chain, function(value, name) {
diff --git a/src/ngScenario/dsl.js b/src/ngScenario/dsl.js
@@ -276,8 +276,9 @@ angular.scenario.dsl('repeater', function() {
     return this.addFutureAction("repeater '" + this.label + "' row '" + index + "'",
       function($window, $document, done) {
         var matches = $document.elements().slice(index, index + 1);
-        if (!matches.length)
+        if (!matches.length) {
           return done('row ' + index + ' out of bounds');
+        }
         done(null, matches.bindings($window.angular.element));
     });
   };
diff --git a/test/helpers/testabilityPatch.js b/test/helpers/testabilityPatch.js
@@ -160,8 +160,9 @@ function sortedHtml(element, showNgClass) {
         attrs.push(' class="' + className + '"');
       }
       for (var i = 0; i < attributes.length; i++) {
-        if (i > 0 && attributes[i] == attributes[i - 1])
+        if (i > 0 && attributes[i] == attributes[i - 1]) {
           continue; //IE9 creates dupes. Ignore them!
+        }
 
         var attr = attributes[i];
         if (attr.name.match(/^ng[\:\-]/) ||
@@ -221,8 +222,9 @@ function sortedHtml(element, showNgClass) {
         var tmp = style;
         style = [];
         forEach(tmp, function(value) {
-          if (!value.match(/^max[^\-]/))
+          if (!value.match(/^max[^\-]/)) {
             style.push(value);
+          }
         });
         if (style.length) {
           html += ' style="' + style.join('; ') + ';"';
diff --git a/test/ngScenario/SpecRunnerSpec.js b/test/ngScenario/SpecRunnerSpec.js
@@ -43,8 +43,9 @@ describe('angular.scenario.SpecRunner', function() {
     runner = $root.$new();
 
     var Cls = angular.scenario.SpecRunner;
-    for (var name in Cls.prototype)
+    for (var name in Cls.prototype) {
       runner[name] = angular.bind(runner, Cls.prototype[name]);
+    }
 
     Cls.call(runner);
   }));
