Merge pull request #1 from angular/master

Update upstream

Author: GulajavaMinistudio

.github/ISSUE_TEMPLATE.md

@@ -26,7 +26,7 @@ please provide the *STEPS TO REPRODUCE* and if possible a *MINIMAL DEMO* of the
 https://plnkr.co or similar (you can use this template as a starting point: http://plnkr.co/edit/tpl:yBpEi4).
 -->
 
-**Angular version:** 1.x.y
+**AngularJS version:** 1.x.y
 <!-- Check whether this is still an issue in the most recent stable or in the snapshot AngularJS version (https://code.angularjs.org/snapshot/) -->
 
 **Browser:** [all | Chrome XX | Firefox XX | Edge XX | IE XX | Safari XX | Mobile Chrome XX | Android X.X Web Browser | iOS XX Safari | iOS XX UIWebView | iOS XX WKWebView ]

.travis.yml

@@ -36,6 +36,10 @@ addons:
     packages:
       - g++-4.8
 
+before_install:
+  - curl -o- -L https://yarnpkg.com/install.sh | bash -s -- --version 0.27.5
+  - export PATH="$HOME/.yarn/bin:$PATH"
+
 before_script:
   - du -sh ./node_modules ./bower_components/ || true
   - "./scripts/travis/before_build.sh"

CHANGELOG.md

@@ -131,7 +131,7 @@
 
 
 ## Bug Fixes
-- **Angular:**
+- **AngularJS:**
   - do not auto-bootstrap if the `src` exists but is empty
   ([3536e8](https://github.com/angular/angular.js/commit/3536e83d8a085b02bd6dcec8324800b7e6c734e4))
   - do not auto bootstrap if the currentScript has been clobbered
@@ -700,10 +700,10 @@ consolidating all the changes shown in the previous 1.6.0 release candidates.**
 - **feat($compile): set preAssignBindingsEnabled to false by default
   ([bcd0d4](https://github.com/angular/angular.js/commit/bcd0d4d896d0dfdd988ff4f849c1d40366125858))**:
 
-Previously, `$compileProvider.preAssignBindingsEnabled` was
-set to true by default. This means bindings were pre-assigned in component
-constructors. In Angular 1.5+ the place to put the initialization logic
-relying on bindings being present is the controller `$onInit` method.
+Previously, `$compileProvider.preAssignBindingsEnabled` was set to true by default. This means
+bindings were pre-assigned on component/directive controller instances (which made them available
+inside the constructors). In AngularJS 1.5+ the place to put the initialization logic relying on
+bindings being present is the controller's `$onInit` method.
 
 To migrate follow the example below:
 
@@ -1902,7 +1902,7 @@ validation), you can overwrite the built-in `step` validator with a custom direc
 # 1.5.9 timeturning-lockdown (2016-11-24)
 
 This is an interim release primarily to publish some security fixes, in particular a modification to
-ensure that Angular 1 can pass the linter checks for Mozilla add-ons.
+ensure that AngularJS can pass the linter checks for Mozilla add-ons.
 
 ## Security Fixes
 - **bootstrap:**
@@ -1990,7 +1990,7 @@ ensure that Angular 1 can pass the linter checks for Mozilla add-ons.
 
 Previously, `$compileProvider.preAssignBindingsEnabled` was
 set to true by default. This means bindings were pre-assigned in component
-constructors. In Angular 1.5+ the place to put the initialization logic
+constructors. In AngularJS 1.5+ the place to put the initialization logic
 relying on bindings being present is the controller `$onInit` method.
 
 To migrate follow the example below:
@@ -5116,12 +5116,12 @@ before the $parsers are applied. Previously, the modelValue
 
 This fixes issues where `input[date]` and `input[number]` cannot
 be validated because the viewValue string is parsed into
-`Date` and `Number` respectively (starting with Angular 1.3).
+`Date` and `Number` respectively (starting with AngularJS 1.3).
 It also brings the directives in line with HTML5 constraint
 validation, which validates against the input value.
 
 This change is unlikely to cause applications to fail, because even
-in Angular 1.2, the value that was validated by pattern could have
+in AngularJS 1.2, the value that was validated by pattern could have
 been manipulated by the $parsers, as all validation was done
 inside this pipeline.
 
@@ -5232,12 +5232,12 @@ before the $parsers are applied. Previously, the modelValue
 
 This fixes issues where `input[date]` and `input[number]` cannot
 be validated because the viewValue string is parsed into
-`Date` and `Number` respectively (starting with Angular 1.3).
+`Date` and `Number` respectively (starting with AngularJS 1.3).
 It also brings the directives in line with HTML5 constraint
 validation, which validates against the input value.
 
 This change is unlikely to cause applications to fail, because even
-in Angular 1.2, the value that was validated by pattern could have
+in AngularJS 1.2, the value that was validated by pattern could have
 been manipulated by the $parsers, as all validation was done
 inside this pipeline.
 
@@ -5451,7 +5451,7 @@ describe('$q.when', function() {
   it('should not need a call to $timeout.flush() to resolve already resolved promises',
       inject(function($q, $timeout) {
     $q.when('foo');
-    // In Angular 1.4.3 a call to `$timeout.flush();` was needed
+    // In AngularJS 1.4.3 a call to `$timeout.flush();` was needed
     $timeout.verifyNoPendingTasks();
   }));
 
@@ -6927,7 +6927,7 @@ it is now implemented in the ngOptions directive itself.
 the `select` directive will now use strict comparison of the `ngModel` scope value against `option`
 values to determine which option is selected. This means `Number` scope values will not be matched
 against numeric option strings.
-In Angular 1.3.x, setting `scope.x = 200` would select the `option` with the value 200 in the following `select`:
+In AngularJS 1.3.x, setting `scope.x = 200` would select the `option` with the value 200 in the following `select`:
 
 ```
 <select ng-model="x">
@@ -6936,7 +6936,7 @@ In Angular 1.3.x, setting `scope.x = 200` would select the `option` with the val
 </select>
 ```
 
-In Angular 1.4.x, the 'unknown option' will be selected.
+In AngularJS 1.4.x, the 'unknown option' will be selected.
 To remedy this, you can simply initialize the model as a string: `scope.x = '200'`, or if you want to
 keep the model as a `Number`, you can do the conversion via `$formatters` and `$parsers` on `ngModel`:
 
@@ -15510,7 +15510,7 @@ with the `$route` service
 
 ### Breaking changes
 - we now support ISO 8601 extended format datetime strings (YYYY-MM-DDTHH:mm:ss.SSSZ) as defined
-  in EcmaScript 5 throughout angular. This means that the following apis switched from
+  in EcmaScript 5 throughout AngularJS. This means that the following apis switched from
   YYYY-MM-DDTHH:mm:ssZ to YYYY-MM-DDTHH:mm:ss.SSSZ (note the added millis) when representing dates:
   - angular.Date.toString
   - angular.String.fromDate

docs/content/guide/migration.ngdoc

@@ -75,8 +75,8 @@ commits for more info.
 - **$location** now uses `'!'` as the default hash-prefix for hash-bang URLs, instead of the empty
   string. ([Details](guide/migration#commit-aa077e8))
 
-- **$compile** will (by default) not pre-assign bindings on controller instances.
-  ([Details](guide/migration#commit-bcd0d4))
+- **$compile** will (by default) not pre-assign bindings on component/directive controller
+  instances. ([Details](guide/migration#commit-bcd0d4))
 
 - **http** imposes additional restrictions to **JSONP** requests for security reasons
   (see [details](guide/migration#migrate1.5to1.6-ng-services-$http) below):
@@ -412,14 +412,14 @@ if the option does not provide a value attribute.
 <major />
 <a name="commit-bcd0d4"></a>
 **Due to [bcd0d4](https://github.com/angular/angular.js/commit/bcd0d4d896d0dfdd988ff4f849c1d40366125858)**,
-pre-assigning bindings on controller instances is disabled by default. It is still possible to turn
-it back on, which should help during the migration. Pre-assigning bindings has been deprecated and
-will be removed in a future version, so we strongly recommend migrating your applications to not
-rely on it as soon as possible.
+pre-assigning bindings on component/directive controller instances is disabled by default, which
+means that they will no longer be available inside the constructors. It is still possible to turn it
+back on, which should help during the migration. Pre-assigning bindings has been deprecated and will
+be removed in a future version, so we strongly recommend migrating your applications to not rely on
+it as soon as possible.
 
 Initialization logic that relies on bindings being present should be put in the controller's
-`$onInit()` method, which is guaranteed to always be called _after_ the bindings have been
-assigned.
+`$onInit()` method, which is guaranteed to always be called _after_ the bindings have been assigned.
 
 Before:
 
@@ -1685,12 +1685,12 @@ before the $parsers are applied. Previously, the `$modelValue`
 
 This fixes issues where `input[date]` and `input[number]` cannot
 be validated because the `$viewValue` string is parsed into
-`Date` and `Number` respectively (starting with Angular 1.3).
+`Date` and `Number` respectively (starting with AngularJS 1.3).
 It also brings the directives in line with HTML5 constraint
 validation, which validates against the input value.
 
 This change is unlikely to cause applications to fail, because even
-in Angular 1.2, the value that was validated by pattern could have
+in AngularJS 1.2, the value that was validated by pattern could have
 been manipulated by the $parsers, as all validation was done
 inside this pipeline.
 

karma-shared.conf.js

@@ -10,7 +10,7 @@ module.exports = function(config, specificOptions) {
     browserDisconnectTimeout: 10000,
     browserDisconnectTolerance: 2,
     browserNoActivityTimeout: 30000,
-    reporters: ['spec'],
+    reporters: ['dots'],
     specReporter: {
       maxLogLines: 5,             // limit number of lines logged per test
       suppressErrorSummary: true, // do not print error summary

scripts/code.angularjs.org-firebase/functions/index.js

@@ -175,31 +175,33 @@ function deleteOldSnapshotZip(event) {
   const bucketId = object.bucket;
   const filePath = object.name;
   const contentType = object.contentType;
+  const resourceState = object.resourceState;
 
   const bucket = gcs.bucket(bucketId);
 
-  if (event.eventType === 'providers/cloud.storage/eventTypes/object.change' &&
-      contentType === 'application/zip' &&
-      filePath.startsWith('snapshot/')
+  if (contentType !== 'application/zip' ||
+      !filePath.startsWith('snapshot/') ||
+      resourceState === 'not_exists' // Deletion event
     ) {
+    return;
+  }
 
-    bucket.getFiles({
-      prefix: 'snapshot/',
-      delimiter: '/',
-      autoPaginate: false
-    }).then(function(data) {
-      const files = data[0];
-
-      const oldZipFiles = files.filter(file => {
-        return file.metadata.name !== filePath && file.metadata.contentType === 'application/zip';
-      });
+  bucket.getFiles({
+    prefix: 'snapshot/',
+    delimiter: '/',
+    autoPaginate: false
+  }).then(function(data) {
+    const files = data[0];
 
-      oldZipFiles.forEach(function(file) {
-        file.delete();
-      });
+    const oldZipFiles = files.filter(file => {
+      return file.metadata.name !== filePath && file.metadata.contentType === 'application/zip';
+    });
 
+    oldZipFiles.forEach(function(file) {
+      file.delete();
     });
-  }
+
+  });
 }
 
 exports.sendStoredFile = functions.https.onRequest(sendStoredFile);