Permalink
Browse files

refactor(scope.$emit): rename event.cancel() to event.stopPropagation()

Breaks event.cancel() is event.stopPropagation()
  • Loading branch information...
1 parent acf095d commit 91db99208e197a73584a88a8d835eeb55c466335 @vojtajina vojtajina committed Apr 27, 2012
Showing with 6 additions and 18 deletions.
  1. +4 −5 src/ng/rootScope.js
  2. +2 −13 test/ng/rootScopeSpec.js
View
@@ -616,9 +616,8 @@ 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.
*/
$on: function(name, listener) {
var namedListeners = this.$$listeners[name];
@@ -659,11 +658,11 @@ 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;}
},
listenerArgs = concat([event], arguments, 1),
i, length;
@@ -674,7 +673,7 @@ function $RootScopeProvider(){
for (i=0, length=namedListeners.length; i<length; i++) {
try {
namedListeners[i].apply(null, listenerArgs);
- if (event.cancelled) return event;
+ if (stopPropagation) return event;
} catch (e) {
$exceptionHandler(e);
}
@@ -668,8 +668,8 @@ describe('Scope', function() {
}));
- it('should allow cancelation of event propagation', function() {
- child.$on('myEvent', function(event) { event.cancel(); });
+ it('should allow stopping event propagation', function() {
+ child.$on('myEvent', function(event) { event.stopPropagation(); });
grandChild.$emit('myEvent');
expect(log).toEqual('2>1>');
});
@@ -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;

0 comments on commit 91db992

Please sign in to comment.