diff --git a/src/ng/rootScope.js b/src/ng/rootScope.js index a37eda5a8ee0..bb12362b74f6 100644 --- a/src/ng/rootScope.js +++ b/src/ng/rootScope.js @@ -616,9 +616,10 @@ function $RootScopeProvider(){ * - `targetScope` - {Scope}: the scope on which the event was `$emit`-ed or `$broadcast`-ed. * - `currentScope` - {Scope}: the current scope which is handling the event. * - `name` - {string}: Name of the event. - * - `cancel` - {function=}: calling `cancel` function will cancel further event propagation + * - `stopPropagation` - {function=}: calling `stopPropagation` function will cancel further event propagation * (available only for events that were `$emit`-ed). - * - `cancelled` - {boolean}: Whether the event was cancelled. + * - `preventDefault` - {function}: calling `preventDefault` sets `defaultPrevented` flag to true. + * - `defaultPrevented` - {boolean}: true if `preventDefault` was called. */ $on: function(name, listener) { var namedListeners = this.$$listeners[name]; @@ -659,11 +660,15 @@ function $RootScopeProvider(){ var empty = [], namedListeners, scope = this, + stopPropagation = false, event = { name: name, targetScope: scope, - cancel: function() {event.cancelled = true;}, - cancelled: false + stopPropagation: function() {stopPropagation = true;}, + preventDefault: function() { + event.defaultPrevented = true; + }, + defaultPrevented: false }, listenerArgs = concat([event], arguments, 1), i, length; @@ -674,7 +679,7 @@ function $RootScopeProvider(){ for (i=0, length=namedListeners.length; i1>'); }); @@ -685,17 +685,6 @@ describe('Scope', function() { }); - it('should return event object with cancelled property', function() { - child.$on('some', function(event) { - event.cancel(); - }); - - var result = grandChild.$emit('some'); - expect(result).toBeDefined(); - expect(result.cancelled).toBe(true); - }); - - describe('event object', function() { it('should have methods/properties', function() { var event; @@ -708,6 +697,18 @@ describe('Scope', function() { grandChild.$emit('myEvent'); expect(event).toBeDefined(); }); + + + it('should have preventDefault method and defaultPrevented property', function() { + var event = grandChild.$emit('myEvent'); + expect(event.defaultPrevented).toBe(false); + + child.$on('myEvent', function(event) { + event.preventDefault(); + }); + event = grandChild.$emit('myEvent'); + expect(event.defaultPrevented).toBe(true); + }); }); });