Fix Issue #13: Improve on() stream when no type is specified

marcojakob · May 13, 2015 · 447da02 · 447da02
1 parent 8e20a1a
commit 447da02
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,10 @@
 # Changelog
 
+## Version 0.4.1 (2015-05-13)
+
+* Fix Issue #13: Improve on() stream when no type is specified
+
+
 ## Version 0.4.0 (2015-05-03)
 
 * BREAKING CHANGE: Moved the `HierarchicalEventBus` to a separate library to 

diff --git a/lib/event_bus.dart b/lib/event_bus.dart
@@ -45,8 +45,11 @@ class EventBus {
    * subscribe again (avoids memory leak).
    */
   Stream on([Type eventType]) {
-    return streamController.stream.where((event) => eventType == null ||
-        event.runtimeType == eventType);
+    if (eventType == null) {
+      return streamController.stream;
+    } else {
+      return streamController.stream.where((event) => event.runtimeType == eventType);
+    }
   }
 
   /**

diff --git a/lib/event_bus_hierarchical.dart b/lib/event_bus_hierarchical.dart
@@ -40,7 +40,11 @@ class HierarchicalEventBus extends EventBus {
    * subscribe again (avoids memory leak).
    */
   Stream on([Type eventType]) {
-    return streamController.stream.where((event) => eventType == null ||
-        reflect(event).type.isSubclassOf(reflectClass(eventType)));
+    if (eventType == null) {
+      return streamController.stream;
+    } else {
+      return streamController.stream.where((event) =>
+          reflect(event).type.isSubclassOf(reflectClass(eventType)));
+    }
   }
 }
diff --git a/pubspec.yaml b/pubspec.yaml
@@ -1,5 +1,5 @@
 name: event_bus
-version: 0.4.0
+version: 0.4.1
 author: Marco Jakob <[email protected]>
 description: A simple Event Bus using Dart Streams for decoupling applications
 homepage: http://code.makery.ch/library/dart-event-bus