ef7ce0d fix(web worker): remove usages of deprecated zone API

angular · Nov 25, 2015 · 58c2ad7 · 58c2ad7
1 parent 4c29af8
commit 58c2ad7
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 15 deletions.
diff --git a/BUILD_INFO b/BUILD_INFO
@@ -1,2 +1,2 @@
-Wed Nov 25 01:19:45 UTC 2015
-019cb41dd8f96ecdc801226bca8a1e4cbc1570a8
+Wed Nov 25 19:34:34 UTC 2015
+ef7ce0df1552b24a9df845b99f411d44b4a3a135
diff --git a/lib/src/mock/ng_zone_mock.dart b/lib/src/mock/ng_zone_mock.dart
@@ -1,13 +1,20 @@
 library angular2.src.mock.ng_zone_mock;
 
 import "package:angular2/src/core/zone/ng_zone.dart" show NgZone;
+import "package:angular2/src/facade/async.dart"
+    show EventEmitter, ObservableWrapper;
 
 class MockNgZone extends NgZone {
   /** @internal */
-  dynamic /* () => void */ _onEventDone;
+  EventEmitter<dynamic> _mockOnEventDone;
   MockNgZone() : super(enableLongStackTrace: false) {
     /* super call moved to initializer */;
+    this._mockOnEventDone = new EventEmitter<dynamic>(false);
   }
+  get onEventDone {
+    return this._mockOnEventDone;
+  }
+
   dynamic run(Function fn) {
     return fn();
   }
@@ -16,12 +23,7 @@ class MockNgZone extends NgZone {
     return fn();
   }
 
-  void overrideOnEventDone(dynamic /* () => void */ fn,
-      [bool opt_waitForAsync = false]) {
-    this._onEventDone = fn;
-  }
-
   void simulateZoneExit() {
-    this._onEventDone();
+    ObservableWrapper.callNext(this.onEventDone, null);
   }
 }
diff --git a/lib/src/web_workers/shared/generic_message_bus.dart b/lib/src/web_workers/shared/generic_message_bus.dart
@@ -45,12 +45,14 @@ abstract class GenericMessageBusSink implements MessageBusSink {
 
   void attachToZone(NgZone zone) {
     _zone = zone;
-    _zone.overrideOnEventDone(() {
-      if (_messageBuffer.length > 0) {
-        sendMessages(_messageBuffer);
-        _messageBuffer.clear();
-      }
-    }, false);
+    _zone.runOutsideAngular(() {
+      _zone.onEventDone.listen((_) {
+        if (_messageBuffer.length > 0) {
+          sendMessages(_messageBuffer);
+          _messageBuffer.clear();
+        }
+      });
+    });
   }
 
   void initChannel(String channelName, [bool runInZone = true]) {