Merge pull request #3 from angular/master

Update dari upstream

Author: GulajavaMinistudio

.eslintignore

@@ -1,6 +1,5 @@
 bower_components/**
 build/**
-docs/bower_components/**
 docs/app/assets/js/angular-bootstrap/**
 docs/config/templates/**
 node_modules/**

.github/ISSUE_TEMPLATE.md

@@ -1,27 +1,36 @@
-***Note*: for support questions, please use one of these channels: https://github.com/angular/angular.js/blob/master/CONTRIBUTING.md#question. This repository's issues are reserved for feature requests and bug reports.**
-
-**Do you want to request a *feature* or report a *bug*?**
-
-
-
-**What is the current behavior?**
-
-
-
-**If the current behavior is a bug, please provide the steps to reproduce and if possible a minimal demo of the problem via https://plnkr.co or similar (template: http://plnkr.co/edit/tpl:yBpEi4).**
-
-
-
-**What is the expected behavior?**
-
-
-
-**What is the motivation / use case for changing the behavior?**
-
-
-
-**Which versions of AngularJS, and which browser / OS are affected by this issue? Did this work in previous versions of AngularJS? Please also test with the latest stable and snapshot (https://code.angularjs.org/snapshot/) versions.**
-
-
-
-**Other information (e.g. stacktraces, related issues, suggestions how to fix)**
+<!--
+IF YOU DON'T FILL OUT THE FOLLOWING INFORMATION WE MIGHT CLOSE YOUR ISSUE WITHOUT INVESTIGATION
+-->
+
+<!--
+- For *SUPPORT QUESTIONS*, use one of the
+[support channels](https://github.com/angular/angular.js/blob/master/CONTRIBUTING.md#question).
+- Before submitting, please **SEARCH GITHUB** for a similar issue or PR. -->
+
+**I'm submitting a ...**
+<!-- (check one with "x") -->
+- [ ] bug report
+- [ ] feature request
+- [ ] other (Please do not submit support requests here (see above))
+
+**Current behavior:**
+<!-- Describe how the bug manifests / how the current features are insufficient. -->
+
+**Expected / new behavior:**
+<!-- Describe what the behavior would be without the bug / how the feature would improve AngularJS -->
+
+**Minimal reproduction of the problem with instructions:**
+<!--
+If the current behavior is a bug or you can illustrate your feature request better with an example,
+please provide the *STEPS TO REPRODUCE* and if possible a *MINIMAL DEMO* of the problem via
+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
+<!-- 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 | IE XX | Safari XX | Mobile Chrome XX | Android X.X Web Browser | iOS XX Safari | iOS XX UIWebView | iOS XX WKWebView ]
+<!-- All browsers where this could be reproduced (and Operating System if relevant) -->
+
+**Anything else:**
+<!-- e.g. stacktraces, related issues, suggestions how to fix -->

.travis.yml

@@ -4,10 +4,9 @@ node_js:
   - '6'
 
 cache:
+  yarn: true
   directories:
-    - node_modules
     - bower_components
-    - docs/bower_components
 
 branches:
   except:
@@ -36,12 +35,8 @@ addons:
     packages:
       - g++-4.8
 
-before_install:
-  - curl -o- -L https://raw.githubusercontent.com/yarnpkg/yarn/2a0afc73210c7a82082585283e518eeb88ca19ae/scripts/install-latest.sh | bash -s -- --version 0.17.9
-  - export PATH=$HOME/.yarn/bin:$PATH
-
 before_script:
-  - du -sh ./node_modules ./bower_components/ ./docs/bower_components/ || true
+  - du -sh ./node_modules ./bower_components/ || true
   - ./scripts/travis/before_build.sh
 
 script:

Gruntfile.js

@@ -172,7 +172,6 @@ module.exports = function(grunt) {
           'test/**/*.js',
           'i18n/**/*.js',
           '!docs/app/assets/js/angular-bootstrap/**',
-          '!docs/bower_components/**',
           '!docs/config/templates/**',
           '!src/angular.bind.js',
           '!i18n/closure/**',

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

@@ -0,0 +1,38 @@
+@ngdoc error
+@name $compile:noslot
+@fullName No matching slot in parent directive
+@description
+
+This error occurs when declaring a specific slot in a {@link ng.ngTransclude `ngTransclude`} 
+which does not map to a specific slot defined in the transclude property of the directive.
+
+In this example the template has declared a slot missing from the transclude definition.
+This example will generate a noslot error.
+```js
+var componentConfig = {
+  template: '<div>' +
+                '<div ng-transclude="slotProvided"></div>' +
+                '<div ng-transclude="noSlotProvided"></div>' +
+            '</div>',
+  transclude: {
+  	// The key value pairs here are considered "slots" that are provided for components to slot into.
+    slotProvided: 'slottedComponent', // mandatory transclusion
+    // There is no slot provided here for the transclude 'noSlotProvided' declared in the above template.
+  }
+};
+```
+
+If we make the following change we will no longer get the noslot error.
+```js
+var componentConfig = {
+  template: '<div>' +
+                '<div ng-transclude="slotProvided"></div>' +
+                '<div ng-transclude="noSlotProvided"></div>' +
+            '</div>',
+  transclude: {
+    slotProvided: 'slottedComponent',
+    noSlotProvided: 'otherComponent' // now it is declared and the error should cease
+  }
+};
+
+```

docs/content/guide/component-router.ngdoc

@@ -5,15 +5,15 @@
 
 # Component Router
 
-<div class="alert alert-info">
+<div class="alert alert-danger">
 **Deprecation Notice:** In an effort to keep synchronized with router changes in the new Angular, this implementation of the Component Router (ngComponentRouter module) has been deprecated and will not receive further updates.
 We are investigating backporting the new Angular Router to AngularJS, but alternatively, use the {@link ngRoute} module or community developed projects (e.g. [ui-router](https://github.com/angular-ui/ui-router)).
 </div>
 
 This guide describes the Component Router for AngularJS.
 
 <div class="alert alert-info">
-  If you are looking for information about the old router for AngularJS have a look at the {@link ngRoute} module.
+  If you are looking for information about the default router for AngularJS have a look at the {@link ngRoute} module.
 
   If you are looking for information about the Component Router for the new Angular then
   check out the [Angular Router Guide](https://angular.io/docs/ts/latest/guide/router.html).

docs/content/misc/faq.ngdoc

@@ -55,6 +55,16 @@ extracted from the commits. We can quickly see in the new changelog exactly what
 changes and so can application developers when they are deciding whether to update to a new version of
 AngularJS.
 
+#### When are deprecated features removed from the library?
+Most of the time we remove a deprecated feature in a next minor version bump. For example, the
+`preAssignBindingsEnabled` `$compileProvider` method was defined in AngularJS `1.5.10`, deprecated in `1.6` and
+will be removed in `1.7`.
+
+In case of jqLite we apply a different strategy - we deprecate features that have an equivalent in jQuery that
+is also deprecated but we only remove the feature once it's removed from jQuery to improve compatibility between
+jqLite and jQuery. One such example is the `bind` method, deprecated in favor of `on` but unlikely to be removed
+from jqLite any time soon.
+
 
 ### Is AngularJS a templating system?
 

package.json

@@ -10,7 +10,7 @@
   },
   "engines": {
     "node": "^6.9.1",
-    "yarn": ">=0.17.9",
+    "yarn": ">=0.21.3",
     "grunt": "^1.2.0"
   },
   "scripts": {

scripts/jenkins/init-node.sh

@@ -8,7 +8,7 @@ nvm install
 
 # clean out and install yarn
 rm -rf ~/.yarn
-curl -o- -L https://raw.githubusercontent.com/yarnpkg/yarn/2a0afc73210c7a82082585283e518eeb88ca19ae/scripts/install-latest.sh | bash -s -- --version 0.17.9
+curl -o- -L https://yarnpkg.com/install.sh | bash -s -- --version 0.21.3
 export PATH="$HOME/.yarn/bin:$PATH"
 
 # Ensure that we have the local dependencies installed

src/ng/controller.js

@@ -54,7 +54,7 @@ function $ControllerProvider() {
     }
   };
 
-  this.$get = ['$injector', '$window', function($injector, $window) {
+  this.$get = ['$injector', function($injector) {
 
     /**
      * @ngdoc service

test/ng/compileSpec.js

@@ -2080,17 +2080,49 @@ describe('$compile', function() {
         ));
 
 
-        it('should work when directive is in a repeater', inject(
-          function($compile, $httpBackend, $rootScope) {
-            $httpBackend.expect('GET', 'hello.html').
+        describe('when directive is in a repeater', function() {
+          var is;
+          beforeEach(function() {
+            is = [1, 2];
+          });
+
+          function runTest() {
+            inject(function($compile, $httpBackend, $rootScope) {
+              $httpBackend.expect('GET', 'hello.html').
                 respond('<span>i=<span ng-transclude></span>;</span>');
-            element = jqLite('<div><b class=hello ng-repeat="i in [1,2]">{{i}}</b></div>');
-            $compile(element)($rootScope);
+              element = jqLite('<div><b class=hello ng-repeat="i in [' + is + ']">{{i}}</b></div>');
+              $compile(element)($rootScope);
 
-            $httpBackend.flush();
-            expect(element.text()).toEqual('i=1;i=2;');
+              $httpBackend.flush();
+              expect(element.text()).toEqual('i=' + is.join(';i=') + ';');
+            });
           }
-        ));
+
+          it('should work in jqLite and jQuery with jQuery.cleanData last patched by Angular', runTest);
+
+          if (jQuery) {
+            it('should work with another library patching jQuery.cleanData after Angular', function() {
+              var cleanedCount = 0;
+              var currentCleanData = jqLite.cleanData;
+              jqLite.cleanData = function(elems) {
+                cleanedCount += elems.length;
+                // Don't return the output and explicitly pass only the first parameter
+                // so that we're sure we're not relying on either of them. jQuery UI patch
+                // behaves in this way.
+                currentCleanData(elems);
+              };
+
+              runTest();
+
+              // The initial ng-repeat div is dumped after parsing hence we expect cleanData
+              // count to be one larger than size of the iterated array.
+              expect(cleanedCount).toBe(is.length + 1);
+
+              // Restore the previous cleanData.
+              jqLite.cleanData = currentCleanData;
+            });
+          }
+        });
 
         describe('replace and not exactly one root element', function() {
 
@@ -8573,46 +8605,46 @@ describe('$compile', function() {
         });
       });
 
-      if (jQuery) {
-        describe('cleaning up after a replaced element', function() {
-          var $compile, xs;
-          beforeEach(inject(function(_$compile_) {
-            $compile = _$compile_;
-            xs = [0, 1];
-          }));
+      describe('cleaning up after a replaced element', function() {
+        var $compile, xs;
+        beforeEach(inject(function(_$compile_) {
+          $compile = _$compile_;
+          xs = [0, 1];
+        }));
 
-          function testCleanup() {
-            var privateData, firstRepeatedElem;
+        function testCleanup() {
+          var privateData, firstRepeatedElem;
 
-            element = $compile('<div><div ng-repeat="x in xs" ng-click="noop()">{{x}}</div></div>')($rootScope);
+          element = $compile('<div><div ng-repeat="x in xs" ng-click="noop()">{{x}}</div></div>')($rootScope);
 
-            $rootScope.$apply('xs = [' + xs + ']');
-            firstRepeatedElem = element.children('.ng-scope').eq(0);
+          $rootScope.$apply('xs = [' + xs + ']');
+          firstRepeatedElem = element.children('.ng-scope').eq(0);
 
-            expect(firstRepeatedElem.data('$scope')).toBeDefined();
-            privateData = jQuery._data(firstRepeatedElem[0]);
-            expect(privateData.events).toBeDefined();
-            expect(privateData.events.click).toBeDefined();
-            expect(privateData.events.click[0]).toBeDefined();
+          expect(firstRepeatedElem.data('$scope')).toBeDefined();
+          privateData = jqLite._data(firstRepeatedElem[0]);
+          expect(privateData.events).toBeDefined();
+          expect(privateData.events.click).toBeDefined();
+          expect(privateData.events.click[0]).toBeDefined();
 
-            //Ensure the AngularJS $destroy event is still sent
-            var destroyCount = 0;
-            element.find('div').on('$destroy', function() { destroyCount++; });
+          // Ensure the AngularJS $destroy event is still sent
+          var destroyCount = 0;
+          element.find('div').on('$destroy', function() { destroyCount++; });
 
-            $rootScope.$apply('xs = null');
+          $rootScope.$apply('xs = null');
 
-            expect(destroyCount).toBe(2);
-            expect(firstRepeatedElem.data('$scope')).not.toBeDefined();
-            privateData = jQuery._data(firstRepeatedElem[0]);
-            expect(privateData && privateData.events).not.toBeDefined();
-          }
+          expect(destroyCount).toBe(2);
+          expect(firstRepeatedElem.data('$scope')).not.toBeDefined();
+          privateData = jqLite._data(firstRepeatedElem[0]);
+          expect(privateData && privateData.events).not.toBeDefined();
+        }
 
-          it('should work without external libraries (except jQuery)', testCleanup);
+        it('should work without external libraries (except jQuery)', testCleanup);
 
+        if (jQuery) {
           it('should work with another library patching jQuery.cleanData after AngularJS', function() {
             var cleanedCount = 0;
-            var currentCleanData = jQuery.cleanData;
-            jQuery.cleanData = function(elems) {
+            var currentCleanData = jqLite.cleanData;
+            jqLite.cleanData = function(elems) {
               cleanedCount += elems.length;
               // Don't return the output and explicitly pass only the first parameter
               // so that we're sure we're not relying on either of them. jQuery UI patch
@@ -8626,11 +8658,11 @@ describe('$compile', function() {
             // and each clone of the ng-repeat template is also removed (xs.length)
             expect(cleanedCount).toBe(xs.length + 1);
 
-            // Restore the previous jQuery.cleanData.
-            jQuery.cleanData = currentCleanData;
+            // Restore the previous cleanData.
+            jqLite.cleanData = currentCleanData;
           });
-        });
-      }
+        }
+      });
 
 
       it('should add a $$transcluded property onto the transcluded scope', function() {

test/ng/parseSpec.js

@@ -1867,6 +1867,8 @@ describe('parser', function() {
         expect(scope.$eval('+\'1\'')).toEqual(+'1');
         expect(scope.$eval('-\'1\'')).toEqual(-'1');
         expect(scope.$eval('+undefined')).toEqual(0);
+
+        // Note: don't change toEqual to toBe as toBe collapses 0 & -0.
         expect(scope.$eval('-undefined')).toEqual(-0);
         expect(scope.$eval('+null')).toEqual(+null);
         expect(scope.$eval('-null')).toEqual(-null);