Merge branch 'master' of https://github.com/angular/angular.js

Author: Simon Tsvilik

.travis.yml

@@ -1,6 +1,6 @@
 language: node_js
 node_js:
-  - 0.8
+  - 0.10
 
 env:
   global:

Gruntfile.js

@@ -31,11 +31,12 @@ module.exports = function(grunt) {
           stream: true
         },
         tasks: [
+          {grunt: true, args: ['test:docgen']},
           util.parallelTask('tests:docs'),
           util.parallelTask('tests:modules'),
           util.parallelTask('tests:jquery'),
           util.parallelTask('tests:jqlite'),
-          util.parallelTask('tests:end2end')
+          util.parallelTask('test:e2e')
         ]
       }
     },
@@ -61,6 +62,11 @@ module.exports = function(grunt) {
       },
       testserver: {
         options: {
+          // We use end2end task (which does not start the webserver)
+          // and start the webserver as a separate process (in travis_build.sh)
+          // to avoid https://github.com/joyent/libuv/issues/826
+          port: 8000,
+          hostname: '0.0.0.0',
           middleware: function(connect, options){
             return [
               function(req, resp, next) {

docs/component-spec/annotationsSpec.js

@@ -65,10 +65,9 @@ describe('Docs Annotations', function() {
 
   describe('foldout directive', function() {
 
-    var $scope, parent, element, url, window;
+    var $scope, parent, element, url;
     beforeEach(function() {
       module(function($provide, $animateProvider) {
-        $provide.value('$window', window = angular.mock.createMockWindow());
         $animateProvider.register('.foldout', function($timeout) {
           return {
             enter : function(element, done) {
@@ -158,17 +157,13 @@ describe('Docs Annotations', function() {
 
   describe('DocsController fold', function() {
 
-    var window, $scope, ctrl;
+    var $scope, ctrl;
     beforeEach(function() {
-      module(function($provide, $animateProvider) {
-        $provide.value('$window', window = angular.mock.createMockWindow());
-      });
       inject(function($rootScope, $controller, $location, $cookies, sections) {
         $scope = $rootScope.$new();
         ctrl = $controller('DocsController',{
           $scope : $scope,
           $location : $location,
-          $window : window,
           $cookies : $cookies,
           sections : sections
         });

docs/component-spec/mocks.js

@@ -0,0 +1,29 @@
+var createMockWindow = function() {
+  var mockWindow = {};
+  var setTimeoutQueue = [];
+
+  mockWindow.location = window.location;
+  mockWindow.document = window.document;
+  mockWindow.getComputedStyle = angular.bind(window, window.getComputedStyle);
+  mockWindow.scrollTo = angular.bind(window, window.scrollTo);
+  mockWindow.navigator = window.navigator;
+  mockWindow.setTimeout = function(fn, delay) {
+    setTimeoutQueue.push({fn: fn, delay: delay});
+  };
+  mockWindow.setTimeout.queue = setTimeoutQueue;
+  mockWindow.setTimeout.expect = function(delay) {
+    if (setTimeoutQueue.length > 0) {
+      return {
+        process: function() {
+          var tick = setTimeoutQueue.shift();
+          expect(tick.delay).toEqual(delay);
+          tick.fn();
+        }
+      };
+    } else {
+      expect('SetTimoutQueue empty. Expecting delay of ').toEqual(delay);
+    }
+  };
+
+  return mockWindow;
+};

docs/component-spec/versionJumpSpec.js

@@ -22,7 +22,7 @@ describe('DocsApp', function() {
           '1.1.4',
           '2.1.3'
         ]);
-        $provide.value('$window', window = angular.mock.createMockWindow());
+        $provide.value('$window', window = createMockWindow());
       });
       inject(function($controller, $rootScope) {
         $scope = $rootScope.$new();
@@ -84,7 +84,7 @@ describe('DocsApp', function() {
 
         $scope.jumpToDocsVersion('2.1.3');
         expect(window.location).toBe('http://code.angularjs.org/2.1.3/docs');
-      }); 
+      });
 
       it('should jump to the older versions of current docs for version >= 1.0.2', function() {
         $scope.jumpToDocsVersion('1.0.1');

docs/content/tutorial/index.ngdoc

@@ -64,8 +64,8 @@ and follow the instructions for setting up your computer.
       <pre>npm install -g karma</pre>
       <li><p>You'll also need Git, which you can get from
          <a href="http://git-scm.com/download">the Git site</a>.</p></li>
-      <li><p>Clone the angular-phonecat repository located at <a
-href="https://github.com/angular/angular-phonecat">Github</a> by running the following command:</p>
+      <li><p>Clone the angular-phonecat repository located at
+      <a href="https://github.com/angular/angular-phonecat">Github</a> by running the following command:</p>
       <pre>git clone git://github.com/angular/angular-phonecat.git</pre>
       <p>This command creates the <code>angular-phonecat</code> directory in your current
 directory.</p></li>

docs/src/ngdoc.js

@@ -39,15 +39,15 @@ exports.merge = merge;
 exports.Doc = Doc;
 
 exports.ngVersions = function() {
-  var line, versions = [], regex = /^v([1-9]\d*(?:\.\d+)+)$/; //only fetch >= 1.0.0 versions
+  var versions = [], regex = /^v([1-9]\d*(?:\.\d+\S+)+)$/; //only fetch >= 1.0.0 versions
   shell.exec('git tag', {silent: true}).output.split(/\s*\n\s*/)
     .forEach(function(line) {
       var matches = regex.exec(line);
       if(matches && matches.length > 0) {
         versions.push(matches[1]);
       }
     });
-  versions.push(exports.ngCurrentVersion().number);
+  versions.push(exports.ngCurrentVersion().full);
   return versions;
 };
 
@@ -295,7 +295,7 @@ Doc.prototype = {
     }
     pageClassName = pageClassName || prepareClassName(this.name || 'docs') + suffix;
 
-    text = '<div class="' + pageClassName + '">' + 
+    text = '<div class="' + pageClassName + '">' +
              marked(text) +
            '</div>';
     text = text.replace(/(?:<p>)?(REPLACEME\d+)(?:<\/p>)?/g, function(_, id) {
@@ -318,8 +318,8 @@ Doc.prototype = {
           text = content;
         }
         return "\n" + line.replace(pattern, function(match) {
-          return '<div class="nocode nocode-content" data-popover ' + 
-                   'data-content="' + text + '" ' + 
+          return '<div class="nocode nocode-content" data-popover ' +
+                   'data-content="' + text + '" ' +
                    'data-title="' + title + '">' +
                       match +
                  '</div>';

docs/src/templates/js/docs.js

@@ -4,9 +4,9 @@ var docsApp = {
   serviceFactory: {}
 };
 
-docsApp.controller.DocsVersionsCtrl = ['$scope', '$window', 'NG_VERSIONS', function($scope, $window, NG_VERSIONS) {
+docsApp.controller.DocsVersionsCtrl = ['$scope', '$window', 'NG_VERSIONS', 'NG_VERSION', function($scope, $window, NG_VERSIONS, NG_VERSION) {
   $scope.versions = expandVersions(NG_VERSIONS);
-  $scope.version  = ($scope.version || angular.version.full).match(/^([\d\.]+\d+)/)[1]; //match only the number
+  $scope.version  = ($scope.version || NG_VERSION).match(/^([\d\.]+\d+\S+)/)[1]; //match only the number
 
   $scope.jumpToDocsVersion = function(value) {
     var isLastStable,

lib/grunt/utils.js

@@ -7,7 +7,9 @@ var version;
 module.exports = {
 
   init: function() {
-    shell.exec('npm install');
+    if (!process.env.TRAVIS) {
+      shell.exec('npm install');
+    }
   },
 
 
@@ -20,9 +22,7 @@ module.exports = {
     var hash = shell.exec('git rev-parse --short HEAD', {silent: true}).output.replace('\n', '');
 
     var fullVersion = (match[1] + (match[2] ? '-' + hash : ''));
-    var numVersion = semver[0] + '.' + semver[1] + '.' + semver[2];
     version = {
-      number: numVersion,
       full: fullVersion,
       major: semver[0],
       minor: semver[1],

lib/sauce/sauce_connect_setup.sh

@@ -25,8 +25,17 @@ unzip $CONNECT_DOWNLOAD
 rm $CONNECT_DOWNLOAD
 
 
+
+ARGS=""
+
+# Set tunnel-id only on Travis, to make local testing easier.
+if [ ! -z "$TRAVIS_JOB_NUMBER" ]; then
+  ARGS="$ARGS --tunnel-identifier $TRAVIS_JOB_NUMBER"
+fi
+if [ ! -z "$SAUCE_CONNECT_READY_FILE" ]; then
+  ARGS="$ARGS --readyfile $SAUCE_CONNECT_READY_FILE"
+fi
+
 echo "Starting Sauce Connect in the background"
 echo "Logging into $CONNECT_LOG"
-java -jar Sauce-Connect.jar --readyfile $SAUCE_CONNECT_READY_FILE \
-    --tunnel-identifier $TRAVIS_JOB_NUMBER \
-    $SAUCE_USERNAME $SAUCE_ACCESS_KEY > $CONNECT_LOG &
+java -jar Sauce-Connect.jar $ARGS $SAUCE_USERNAME $SAUCE_ACCESS_KEY > $CONNECT_LOG &

package.json

@@ -15,14 +15,14 @@
     "q-fs": "0.1.36",
     "qq": "0.3.5",
     "shelljs": "0.1.2",
-    "karma": "~0.9.4",
-    "karma-jasmine": "~0.0.1",
-    "karma-chrome-launcher": "~0.0.2",
-    "karma-firefox-launcher": "~0.0.1",
-    "karma-ng-scenario": "~0.0.1",
-    "karma-junit-reporter": "~0.0.1",
-    "karma-sauce-launcher": "~0.0.4",
-    "karma-script-launcher": "~0.0.1",
+    "karma": "~0.10",
+    "karma-jasmine": "~0.1",
+    "karma-chrome-launcher": "~0.1",
+    "karma-firefox-launcher": "~0.1",
+    "karma-ng-scenario": "~0.1",
+    "karma-junit-reporter": "~0.1",
+    "karma-sauce-launcher": "~0.1",
+    "karma-script-launcher": "~0.1",
     "yaml-js": "0.0.5",
     "marked": "~0.2.9",
     "rewire": "1.1.3",

src/ng/filter/orderBy.js

@@ -125,8 +125,10 @@ function orderByFilter($parse){
       var t1 = typeof v1;
       var t2 = typeof v2;
       if (t1 == t2) {
-        if (t1 == "string") v1 = v1.toLowerCase();
-        if (t1 == "string") v2 = v2.toLowerCase();
+        if (t1 == "string") {
+           v1 = v1.toLowerCase();
+           v2 = v2.toLowerCase();
+        }
         if (v1 === v2) return 0;
         return v1 < v2 ? -1 : 1;
       } else {

src/ng/http.js

@@ -412,6 +412,7 @@ function $HttpProvider() {
      *     return function(promise) {
      *       return promise.then(function(response) {
      *         // do something on success
+     *         return response;
      *       }, function(response) {
      *         // do something on error
      *         if (canRecover(response)) {

src/ng/timeout.js

@@ -45,17 +45,15 @@ function $TimeoutProvider() {
           deferred.reject(e);
           $exceptionHandler(e);
         }
+        finally {
+          delete deferreds[promise.$$timeoutId];
+        }
 
         if (!skipApply) $rootScope.$apply();
       }, delay);
 
-      cleanup = function() {
-        delete deferreds[promise.$$timeoutId];
-      };
-
       promise.$$timeoutId = timeoutId;
       deferreds[timeoutId] = deferred;
-      promise.then(cleanup, cleanup);
 
       return promise;
     }
@@ -77,6 +75,7 @@ function $TimeoutProvider() {
     timeout.cancel = function(promise) {
       if (promise && promise.$$timeoutId in deferreds) {
         deferreds[promise.$$timeoutId].reject('canceled');
+        delete deferreds[promise.$$timeoutId];
         return $browser.defer.cancel(promise.$$timeoutId);
       }
       return false;

test/ng/timeoutSpec.js

@@ -68,6 +68,27 @@ describe('$timeout', function() {
   }));
 
 
+  it('should forget references to deferreds when callback called even if skipApply is true',
+      inject(function($timeout, $browser) {
+    // $browser.defer.cancel is only called on cancel if the deferred object is still referenced
+    var cancelSpy = spyOn($browser.defer, 'cancel').andCallThrough();
+
+    var promise1 = $timeout(function() {}, 0, false);
+    var promise2 = $timeout(function() {}, 100, false);
+    expect(cancelSpy).not.toHaveBeenCalled();
+
+    $timeout.flushNext(0);
+
+    // Promise1 deferred object should already be removed from the list and not cancellable
+    $timeout.cancel(promise1);
+    expect(cancelSpy).not.toHaveBeenCalled();
+
+    // Promise2 deferred object should not have been called and should be cancellable
+    $timeout.cancel(promise2);
+    expect(cancelSpy).toHaveBeenCalled();
+  }));
+
+
   describe('exception handling', function() {
 
     beforeEach(module(function($exceptionHandlerProvider) {
@@ -106,6 +127,20 @@ describe('$timeout', function() {
 
       expect(log).toEqual('error: Some Error');
     }));
+
+
+    it('should forget references to relevant deferred even when exception is thrown',
+        inject(function($timeout, $browser) {
+      // $browser.defer.cancel is only called on cancel if the deferred object is still referenced
+      var cancelSpy = spyOn($browser.defer, 'cancel').andCallThrough();
+
+      var promise = $timeout(function() { throw "Test Error"; }, 0, false);
+      $timeout.flush();
+
+      expect(cancelSpy).not.toHaveBeenCalled();
+      $timeout.cancel(promise);
+      expect(cancelSpy).not.toHaveBeenCalled();
+    }));
   });
 
 
@@ -147,5 +182,21 @@ describe('$timeout', function() {
     it('should not throw a runtime exception when given an undefined promise', inject(function($timeout) {
       expect($timeout.cancel()).toBe(false);
     }));
+
+
+    it('should forget references to relevant deferred', inject(function($timeout, $browser) {
+      // $browser.defer.cancel is only called on cancel if the deferred object is still referenced
+      var cancelSpy = spyOn($browser.defer, 'cancel').andCallThrough();
+
+      var promise = $timeout(function() {}, 0, false);
+
+      expect(cancelSpy).not.toHaveBeenCalled();
+      $timeout.cancel(promise);
+      expect(cancelSpy).toHaveBeenCalledOnce();
+
+      // Promise deferred object should already be removed from the list and not cancellable again
+      $timeout.cancel(promise);
+      expect(cancelSpy).toHaveBeenCalledOnce();
+    }));
   });
 });

travis_build.sh

@@ -2,25 +2,9 @@
 
 set -xe
 
-warn() {
-  tput setaf 1
-  echo "[ERROR] Received $1"
-  tput sgr0
-  exit 1
-}
-
-trap "warn SIGINT" SIGINT
-trap "warn SIGTERM" SIGTERM
-trap "warn SIGHUP" SIGHUP
-
 export SAUCE_ACCESS_KEY=`echo $SAUCE_ACCESS_KEY | rev`
 ./lib/sauce/sauce_connect_setup.sh
 npm install -g grunt-cli
 grunt ci-checks package
-
-echo ">>> grunt exited with code: $?"
-echo ""
-echo ""
-
 ./lib/sauce/sauce_connect_block.sh
 grunt parallel:travis --reporters dots --browsers SL_Chrome