Merge pull request #108 from angular/master

Update upstream

Author: GulajavaMinistudio

src/Angular.js

@@ -1909,7 +1909,7 @@ function bindJQuery() {
   jqLite.cleanData = function(elems) {
     var events;
     for (var i = 0, elem; (elem = elems[i]) != null; i++) {
-      events = jqLite._data(elem).events;
+      events = (jqLite._data(elem) || {}).events;
       if (events && events.$destroy) {
         jqLite(elem).triggerHandler('$destroy');
       }

src/ng/directive/ngEventDirs.js

@@ -50,7 +50,7 @@ forEach(
   'click dblclick mousedown mouseup mouseover mouseout mousemove mouseenter mouseleave keydown keyup keypress submit focus blur copy cut paste'.split(' '),
   function(eventName) {
     var directiveName = directiveNormalize('ng-' + eventName);
-    ngEventDirectives[directiveName] = ['$parse', '$rootScope', function($parse, $rootScope) {
+    ngEventDirectives[directiveName] = ['$parse', '$rootScope', '$exceptionHandler', function($parse, $rootScope, $exceptionHandler) {
       return {
         restrict: 'A',
         compile: function($element, attr) {
@@ -64,10 +64,17 @@ forEach(
               var callback = function() {
                 fn(scope, {$event: event});
               };
-              if (forceAsyncEvents[eventName] && $rootScope.$$phase) {
+
+              if (!$rootScope.$$phase) {
+                scope.$apply(callback);
+              } else if (forceAsyncEvents[eventName]) {
                 scope.$evalAsync(callback);
               } else {
-                scope.$apply(callback);
+                try {
+                  callback();
+                } catch (error) {
+                  $exceptionHandler(error);
+                }
               }
             });
           };

src/ngMock/angular-mocks.js

@@ -262,7 +262,7 @@ angular.mock.$Browser.prototype = {
  *
  * <div class="alert alert-info">
  *   Periodic tasks scheduled via {@link $interval} use a different queue and are not flushed by
- *   `$flushPendingTasks()`. Use {@link ngMock.$interval#flush $interval.flush([millis])} instead.
+ *   `$flushPendingTasks()`. Use {@link ngMock.$interval#flush $interval.flush(millis)} instead.
  * </div>
  *
  * @param {number=} delay - The number of milliseconds to flush.
@@ -650,7 +650,7 @@ angular.mock.$IntervalProvider = function() {
      *
      * Runs interval tasks scheduled to be run in the next `millis` milliseconds.
      *
-     * @param {number=} millis maximum timeout amount to flush up until.
+     * @param {number} millis maximum timeout amount to flush up until.
      *
      * @return {number} The amount of time moved forward.
      */

src/ngMock/browserTrigger.js

@@ -28,6 +28,9 @@
    *  - `charcode`: [charCode](https://developer.mozilla.org/docs/Web/API/KeyboardEvent/charcode)
    *    for keyboard events (keydown, keypress, and keyup).
    *
+   *  - `data`: [data](https://developer.mozilla.org/en-US/docs/Web/API/CompositionEvent/data) for
+   *    [CompositionEvents](https://developer.mozilla.org/en-US/docs/Web/API/CompositionEvent).
+   *
    *  - `elapsedTime`: the elapsedTime for
    *    [TransitionEvent](https://developer.mozilla.org/docs/Web/API/TransitionEvent)
    *    and [AnimationEvent](https://developer.mozilla.org/docs/Web/API/AnimationEvent).

src/ngRoute/route.js

@@ -185,7 +185,7 @@ function $RouteProvider() {
    *      route definition, will cause the latter to be ignored.
    *
    *    - `[reloadOnUrl=true]` - `{boolean=}` - reload route when any part of the URL changes
-   *      (inluding the path) even if the new URL maps to the same route.
+   *      (including the path) even if the new URL maps to the same route.
    *
    *      If the option is set to `false` and the URL in the browser changes, but the new URL maps
    *      to the same route, then a `$routeUpdate` event is broadcasted on the root scope (without

test/jqLiteSpec.js

@@ -501,6 +501,12 @@ describe('jqLite', function() {
       expect(jqLite(c).data('prop')).toBeUndefined();
     });
 
+    it('should not break on cleanData(), if element has no data', function() {
+      var selected = jqLite([a, b, c]);
+      spyOn(jqLite, '_data').and.returnValue(undefined);
+      expect(function() { jqLite.cleanData(selected); }).not.toThrow();
+    });
+
 
     it('should add and remove data on SVGs', function() {
       var svg = jqLite('<svg><rect></rect></svg>');

test/ng/directive/ngEventDirsSpec.js

@@ -148,6 +148,133 @@ describe('event directives', function() {
       expect($rootScope.blur).toHaveBeenCalledOnce();
       expect(element.val()).toBe('newValue');
     }));
+  });
+
+
+  it('should call the listener synchronously if the event is triggered inside of a digest',
+      inject(function($rootScope, $compile) {
+    var watchedVal;
+
+    element = $compile('<button type="button" ng-click="click()">Button</button>')($rootScope);
+    $rootScope.$watch('value', function(newValue) {
+      watchedVal = newValue;
+    });
+    $rootScope.click = jasmine.createSpy('click').and.callFake(function() {
+      $rootScope.value = 'newValue';
+    });
+
+    $rootScope.$apply(function() {
+      element.triggerHandler('click');
+    });
+
+    expect($rootScope.click).toHaveBeenCalledOnce();
+    expect(watchedVal).toEqual('newValue');
+  }));
+
+
+  it('should call the listener synchronously if the event is triggered outside of a digest',
+      inject(function($rootScope, $compile) {
+    var watchedVal;
+
+    element = $compile('<button type="button" ng-click="click()">Button</button>')($rootScope);
+    $rootScope.$watch('value', function(newValue) {
+      watchedVal = newValue;
+    });
+    $rootScope.click = jasmine.createSpy('click').and.callFake(function() {
+      $rootScope.value = 'newValue';
+    });
+
+    element.triggerHandler('click');
+
+    expect($rootScope.click).toHaveBeenCalledOnce();
+    expect(watchedVal).toEqual('newValue');
+  }));
+
+
+  describe('throwing errors in event handlers', function() {
+
+    it('should not stop execution if the event is triggered outside a digest', function() {
+
+      module(function($exceptionHandlerProvider) {
+        $exceptionHandlerProvider.mode('log');
+      });
+
+      inject(function($rootScope, $compile, $exceptionHandler, $log) {
+
+        element = $compile('<button ng-click="click()">Click</button>')($rootScope);
+        expect($log.assertEmpty());
+        $rootScope.click = function() {
+          throw new Error('listener error');
+        };
+
+        $rootScope.do = function() {
+          element.triggerHandler('click');
+          $log.log('done');
+        };
+
+        $rootScope.do();
 
+        expect($exceptionHandler.errors).toEqual([Error('listener error')]);
+        expect($log.log.logs).toEqual([['done']]);
+        $log.reset();
+      });
+    });
+
+
+    it('should not stop execution if the event is triggered inside a digest', function() {
+
+      module(function($exceptionHandlerProvider) {
+        $exceptionHandlerProvider.mode('log');
+      });
+
+      inject(function($rootScope, $compile, $exceptionHandler, $log) {
+
+        element = $compile('<button ng-click="click()">Click</button>')($rootScope);
+        expect($log.assertEmpty());
+        $rootScope.click = function() {
+          throw new Error('listener error');
+        };
+
+        $rootScope.do = function() {
+          element.triggerHandler('click');
+          $log.log('done');
+        };
+
+        $rootScope.$apply(function() {
+          $rootScope.do();
+        });
+
+        expect($exceptionHandler.errors).toEqual([Error('listener error')]);
+        expect($log.log.logs).toEqual([['done']]);
+        $log.reset();
+      });
+    });
+
+
+    it('should not stop execution if the event is triggered in a watch expression function', function() {
+
+      module(function($exceptionHandlerProvider) {
+        $exceptionHandlerProvider.mode('log');
+      });
+
+      inject(function($rootScope, $compile, $exceptionHandler, $log) {
+
+        element = $compile('<button ng-click="click()">Click</button>')($rootScope);
+        $rootScope.click = function() {
+          throw new Error('listener error');
+        };
+
+        $rootScope.$watch(function() {
+          element.triggerHandler('click');
+          $log.log('done');
+        });
+
+        $rootScope.$digest();
+
+        expect($exceptionHandler.errors).toEqual([Error('listener error'), Error('listener error')]);
+        expect($log.log.logs).toEqual([['done'], ['done']]);
+        $log.reset();
+      });
+    });
   });
 });