|
|
@@ -22,17 +22,14 @@
|
|
|
*/
|
|
|
|
|
|
exports.$broadcast = function () {
|
|
|
- var children = this.children
|
|
|
+ var children = this._children
|
|
|
for (var i = 0, l = children.length; i < l; i++) {
|
|
|
var child = children[i]
|
|
|
- child._emitter.applyEmit.apply(
|
|
|
- child._emitter,
|
|
|
- arguments
|
|
|
- )
|
|
|
- child.$broadcast.apply(
|
|
|
- child,
|
|
|
- arguments
|
|
|
- )
|
|
|
+ var emitter = child._emitter
|
|
|
+ emitter.applyEmit.apply(emitter, arguments)
|
|
|
+ if (!emitter._cancelled) {
|
|
|
+ child.$broadcast.apply(child, arguments)
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
|
|
|
@@ -44,15 +41,12 @@ exports.$broadcast = function () {
|
|
|
*/
|
|
|
|
|
|
exports.$dispatch = function () {
|
|
|
- this._emitter.applyEmit.apply(
|
|
|
- this._emitter,
|
|
|
- arguments
|
|
|
- )
|
|
|
- var parent = this.$parent
|
|
|
- if (parent) {
|
|
|
- parent.$dispatch.apply(
|
|
|
- parent,
|
|
|
- arguments
|
|
|
- )
|
|
|
+ var emitter = this._emitter
|
|
|
+ emitter.applyEmit.apply(emitter, arguments)
|
|
|
+ if (!emitter._cancelled) {
|
|
|
+ var parent = this.$parent
|
|
|
+ if (parent) {
|
|
|
+ parent.$dispatch.apply(parent, arguments)
|
|
|
+ }
|
|
|
}
|
|
|
}
|