merging master into my local branch

Author: Michel Boudreau

.jscs.json

@@ -1,6 +1,7 @@
 {
   "excludeFiles": ["src/ngLocale/**"],
   "disallowKeywords": ["with"],
+  "disallowKeywordsOnNewLine": ["else"],
   "disallowMixedSpacesAndTabs": true,
   "disallowMultipleLineStrings": true,
   "disallowNewlineBeforeBlockStatements": true,
@@ -11,13 +12,19 @@
   "disallowSpacesInAnonymousFunctionExpression": {
     "beforeOpeningRoundBrace": true
   },
+  "disallowSpacesInCallExpression": true,
   "disallowSpacesInFunctionDeclaration": {
     "beforeOpeningRoundBrace": true
   },
   "disallowSpacesInNamedFunctionExpression": {
     "beforeOpeningRoundBrace": true
   },
   "disallowSpacesInsideArrayBrackets": true,
+  "requireSpaceBeforeKeywords": [
+    "else",
+    "while",
+    "catch"
+  ],
   "disallowSpacesInsideParentheses": true,
   "disallowTrailingComma": true,
   "disallowTrailingWhitespace": true,
@@ -33,9 +40,9 @@
     "afterConsequent": true,
     "beforeAlternate": true
   },
+  "requireSpacesInForStatement": true,
   "requireSpacesInFunction": {
     "beforeOpeningCurlyBrace": true
   },
-  "validateLineBreaks": "LF",
-  "validateParameterSeparator": ", "
+  "validateLineBreaks": "LF"
 }

.jscs.json.todo

@@ -4,10 +4,10 @@
 // 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,
-  "disallowKeywordsOnNewLine": ["else"],
   "validateJSDoc": {
     "checkParamNames": true,
     "requireParamTypes": true

benchmarks/largetable-bp/main.html

@@ -14,6 +14,7 @@
       <div>ngBind: <input type="radio" ng-model="benchmarkType" value="ngBind"></div>
       <div>ngBindOnce: <input type="radio" ng-model="benchmarkType" value="ngBindOnce"></div>
       <div>interpolation: <input type="radio" ng-model="benchmarkType" value="interpolation"></div>
+      <div>interpolation + bind-once: <input type="radio" ng-model="benchmarkType" value="bindOnceInterpolation"></div>
       <div>attribute interpolation: <input type="radio" ng-model="benchmarkType" value="interpolationAttr"></div>
       <div>ngBind + fnInvocation: <input type="radio" ng-model="benchmarkType" value="ngBindFn"></div>
       <div>interpolation + fnInvocation: <input type="radio" ng-model="benchmarkType" value="interpolationFn"></div>
@@ -35,7 +36,7 @@ <h2>baseline binding</h2>
         </div>
         <div ng-switch-when="ngBindOnce">
           <h2>baseline binding once</h2>
-          <div ng-repeat="row in data">
+          <div ng-repeat="row in ::data">
             <span ng-repeat="column in ::row">
               <span ng-bind="::column.i"></span>:<span ng-bind="::column.j"></span>|
             </span>
@@ -47,6 +48,12 @@ <h2>baseline interpolation</h2>
             <span ng-repeat="column in row">{{column.i}}:{{column.j}}|</span>
           </div>
         </div>
+        <div ng-switch-when="bindOnceInterpolation">
+          <h2>baseline one-time interpolation</h2>
+          <div ng-repeat="row in ::data">
+            <span ng-repeat="column in ::row">{{::column.i}}:{{::column.j}}|</span>
+          </div>
+        </div>
         <div ng-switch-when="interpolationAttr">
           <h2>attribute interpolation</h2>
           <div ng-repeat="row in data">
@@ -80,4 +87,4 @@ <h2>interpolation with filter</h2>
       </ng-switch>
     </div>
   </div>
-</div>
+</div>

docs/content/error/$compile/noctrl.ngdoc

@@ -0,0 +1,12 @@
+@ngdoc error
+@name $compile:noctrl
+@fullName Controller is required.
+@description
+
+When using the `bindToController` feature of AngularJS, a directive is required
+to have a Controller. A controller may be specified by adding a "controller"
+property to the directive definition object. Its value should be either a
+string, or an invokable object (a function, or an array whose last element is a
+function).
+
+For more information, see the {@link guide/directive directives guide}.

docs/content/error/$compile/noident.ngdoc

@@ -0,0 +1,71 @@
+@ngdoc error
+@name $compile:noident
+@fullName Controller identifier is required.
+@description
+
+When using the `bindToController` feature of AngularJS, a directive is required
+to have a Controller identifier, which is initialized in scope with the value of
+the controller instance. This can be supplied using the "controllerAs" property
+of the directive object, or alternatively by adding " as IDENTIFIER" to the controller
+name.
+
+For example, the following directives are valid:
+
+```js
+// OKAY, because controller is a string with an identifier component.
+directive("okay", function() {
+  return {
+    bindToController: true,
+    controller: "myCtrl as $ctrl"
+    scope: {
+      text: "@text"
+    }
+  };
+});
+
+
+// OKAY, because the directive uses the controllerAs property to override
+// the controller identifier.
+directive("okay2", function() {
+  return {
+    bindToController: true,
+    controllerAs: "$ctrl",
+    controller: function() {
+
+    },
+    scope: {
+      text: "@text"
+    }
+  };
+});
+```
+
+While the following are invalid:
+
+```js
+// BAD, because the controller property is a string with no identifier.
+directive("bad", function() {
+  return {
+    bindToController: true,
+    controller: "noIdentCtrl",
+    scope: {
+      text: "@text"
+    }
+  };
+});
+
+
+// BAD because the controller is not a string (therefore has no identifier),
+// and there is no controllerAs property.
+directive("bad2", function() {
+  return {
+    bindToController: true,
+    controller: function noControllerAs() {
+
+    },
+    scope: {
+      text: "@text"
+    }
+  };
+});
+```

docs/content/error/$controller/ctrlfmt.ngdoc

@@ -0,0 +1,46 @@
+@ngdoc error
+@name $controller:ctrlfmt
+@fullName Badly formed controller string
+@description
+
+This error occurs when {@link ng.$controller $controller} service is called
+with a string that does not match the supported controller string formats.
+
+Supported formats:
+
+1. `__name__`
+2. `__name__ as __identifier__`
+
+N'either `__name__` or `__identifier__` may contain spaces.
+
+Example of incorrect usage that leads to this error:
+```html
+<!-- unclosed ng-controller attribute messes up the format -->
+<div ng-controller="myController>
+```
+
+or
+
+```js
+// does not match `__name__` or `__name__ as __identifier__`
+var myCtrl = $controller("mY contRoller", { $scope: newScope });
+```
+
+or
+
+```js
+directive("myDirective", function() {
+  return {
+    // does not match `__name__` or `__name__ as __identifier__`
+    controller: "mY contRoller",
+    link: function() {}
+  };
+});
+```
+
+To fix the examples above, ensure that the controller string matches the supported
+formats, and that any html attributes which are used as controller expressions are
+closed.
+
+
+Please consult the {@link ng.$controller $controller} service api docs to learn more.

docs/content/error/ng/cpta.ngdoc

@@ -0,0 +1,7 @@
+@ngdoc error
+@name ng:cpta
+@fullName Copying TypedArray
+@description
+
+Copying TypedArray's with a destination is not supported because TypedArray
+objects can not be mutated, they are fixed length.

docs/content/guide/production.ngdoc

@@ -10,13 +10,13 @@ There are a few things you might consider when running your AngularJS applicatio
 
 ## Disabling Debug Data
 
-By default AngularJS attaches information about scopes to DOM nodes, and adds CSS classes
-to data-bound elements. The information that is not included is:
+By default AngularJS attaches information about binding and scopes to DOM nodes,
+and adds CSS classes to data-bound elements:
 
-As a result of `ngBind`, `ngBindHtml` or `{{...}}` interpolations, binding data and CSS class
-`ng-class` is attached to the corresponding element.
+- As a result of `ngBind`, `ngBindHtml` or `{{...}}` interpolations, binding data and CSS class
+`ng-binding` are attached to the corresponding element.
 
-Where the compiler has created a new scope, the scope and either `ng-scope` or `ng-isolated-scope`
+- Where the compiler has created a new scope, the scope and either `ng-scope` or `ng-isolated-scope`
 CSS class are attached to the corresponding element. These scope references can then be accessed via
 `element.scope()` and `element.isolateScope()`.
 

docs/content/tutorial/step_11.ngdoc

@@ -288,5 +288,5 @@ learn how to improve this application with animations.
 <ul doc-tutorial-nav="11"></ul>
 
 [restful]: http://en.wikipedia.org/wiki/Representational_State_Transfer
-[jasmine-matchers]: https://github.com/pivotal/jasmine/wiki/Matchers
+[jasmine-matchers]: http://jasmine.github.io/1.3/introduction.html#section-Matchers
 [bower]: http://bower.io/

lib/versions/version-info.js

@@ -16,9 +16,9 @@ var currentPackage, previousVersions, cdnVersion, gitRepoInfo;
 var getPackage = function() {
   // Search up the folder hierarchy for the first package.json
   var packageFolder = path.resolve('.');
-  while ( !fs.existsSync(path.join(packageFolder, 'package.json')) ) {
+  while (!fs.existsSync(path.join(packageFolder, 'package.json'))) {
     var parent = path.dirname(packageFolder);
-    if ( parent === packageFolder) { break; }
+    if (parent === packageFolder) { break; }
     packageFolder = parent;
   }
   return JSON.parse(fs.readFileSync(path.join(packageFolder,'package.json'), 'UTF-8'));
@@ -48,11 +48,11 @@ var getGitRepoInfo = function() {
  * @return {String}         The codename if found, otherwise null/undefined
  */
 var getCodeName = function(tagName) {
-  var gitCatOutput = shell.exec('git cat-file -p '+ tagName, {silent:true}).output;
+  var gitCatOutput = shell.exec('git cat-file -p ' + tagName, {silent:true}).output;
   var tagMessage = gitCatOutput.match(/^.*codename.*$/mg)[0];
   var codeName = tagMessage && tagMessage.match(/codename\((.*)\)/)[1];
   if (!codeName) {
-    throw new Error("Could not extract release code name. The message of tag "+tagName+
+    throw new Error("Could not extract release code name. The message of tag " + tagName +
       " must match '*codename(some release name)*'");
   }
   return codeName;
@@ -65,7 +65,7 @@ var getCodeName = function(tagName) {
  */
 function getBuild() {
   var hash = shell.exec('git rev-parse --short HEAD', {silent: true}).output.replace('\n', '');
-  return 'sha.'+hash;
+  return 'sha.' + hash;
 }
 
 
@@ -76,11 +76,11 @@ function getBuild() {
 var getTaggedVersion = function() {
   var gitTagResult = shell.exec('git describe --exact-match', {silent:true});
 
-  if ( gitTagResult.code === 0 ) {
+  if (gitTagResult.code === 0) {
     var tag = gitTagResult.output.trim();
     var version = semver.parse(tag);
 
-    if ( version && semver.satisfies(version, currentPackage.branchVersion)) {
+    if (version && semver.satisfies(version, currentPackage.branchVersion)) {
       version.codeName = getCodeName(tag);
       version.full = version.version;
       version.branch = 'v' + currentPackage.branchPattern.replace('*', 'x');
@@ -102,7 +102,7 @@ var getPreviousVersions =  function() {
   var repo_url = currentPackage.repository.url;
   var tagResults = shell.exec('git ls-remote --tags ' + repo_url,
                               {silent: true});
-  if ( tagResults.code === 0 ) {
+  if (tagResults.code === 0) {
     return _(tagResults.output.match(/v[0-9].*[0-9]$/mg))
       .map(function(tag) {
         var version = semver.parse(tag);
@@ -112,7 +112,7 @@ var getPreviousVersions =  function() {
       .map(function(version) {
         version.docsUrl = 'http://code.angularjs.org/' + version.version + '/docs';
         // Versions before 1.0.2 had a different docs folder name
-        if ( version.major < 1 || (version.major === 1 && version.minor === 0 && version.dot < 2 ) ) {
+        if (version.major < 1 || (version.major === 1 && version.minor === 0 && version.dot < 2)) {
           version.docsUrl += '-' + version.version;
         }
         return version;
@@ -130,18 +130,14 @@ var getCdnVersion = function() {
       return semver.satisfies(tag, currentPackage.branchVersion);
     })
     .reverse()
-    .tap(function(versions) {
-      console.log(versions);
-    })
     .reduce(function(cdnVersion, version) {
       if (!cdnVersion) {
         // Note: need to use shell.exec and curl here
         // as version-infos returns its result synchronously...
-        var cdnResult = shell.exec('curl http://ajax.googleapis.com/ajax/libs/angularjs/'+version+'/angular.min.js '+
+        var cdnResult = shell.exec('curl http://ajax.googleapis.com/ajax/libs/angularjs/' + version + '/angular.min.js ' +
                   '--head --write-out "%{http_code}" -o /dev/null -silent',
-                                    {silent: false});
-        console.log('http://ajax.googleapis.com/ajax/libs/angularjs/'+version+'/angular.min.js');
-        if ( cdnResult.code === 0 ) {
+                                    {silent: true});
+        if (cdnResult.code === 0) {
           var statusCode = cdnResult.output.trim();
           if (statusCode === '200') {
             cdnVersion = version;
@@ -163,7 +159,7 @@ var getSnapshotVersion = function() {
     })
     .last();
 
-  if ( !version ) {
+  if (!version) {
     // a snapshot version before the first tag on the branch
     version = semver(currentPackage.branchPattern.replace('*','0-beta.1'));
   }