From c1d1569383722d138679ce26e18614bf08e353ed Mon Sep 17 00:00:00 2001 From: Todd Volkert Date: Sat, 1 Oct 2016 08:44:16 -0700 Subject: [PATCH 1/2] Update Angular to use package:observable --- benchmark/watch_group_perf.dart | 3 ++- lib/change_detection/dirty_checking_change_detector.dart | 2 +- .../dirty_checking_change_detector_spec.dart | 9 +++------ 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/benchmark/watch_group_perf.dart b/benchmark/watch_group_perf.dart index 5db33e498..2ed46d6d0 100644 --- a/benchmark/watch_group_perf.dart +++ b/benchmark/watch_group_perf.dart @@ -6,6 +6,7 @@ import 'package:angular/change_detection/dirty_checking_change_detector_dynamic. import 'package:angular/change_detection/dirty_checking_change_detector_static.dart'; import 'package:angular/change_detection/watch_group.dart'; import 'package:benchmark_harness/benchmark_harness.dart'; +import 'package:observable/observable.dart'; import 'package:observe/observe.dart'; import 'package:observe/mirrors_used.dart'; import "dart:io"; @@ -419,7 +420,7 @@ class _Obj { methodT() => t; } -class _ObservableObj extends ChangeNotifier { +class _ObservableObj extends Observable { @reflectable @observable dynamic get a => __$a; dynamic __$a = 1; @reflectable set a(dynamic value) { __$a = notifyPropertyChange(#a, __$a, value); } diff --git a/lib/change_detection/dirty_checking_change_detector.dart b/lib/change_detection/dirty_checking_change_detector.dart index cb8ab2a05..c9f4bc916 100644 --- a/lib/change_detection/dirty_checking_change_detector.dart +++ b/lib/change_detection/dirty_checking_change_detector.dart @@ -4,7 +4,7 @@ import 'dart:collection'; import 'package:angular/change_detection/change_detection.dart'; import 'package:angular/change_detection/watch_group.dart'; import 'dart:async'; -import 'package:observe/observe.dart' as obs; +import 'package:observable/observable.dart' as obs; /** * [DirtyCheckingChangeDetector] determines which object properties have changed diff --git a/test/change_detection/dirty_checking_change_detector_spec.dart b/test/change_detection/dirty_checking_change_detector_spec.dart index a3ec85ee9..62fb51745 100644 --- a/test/change_detection/dirty_checking_change_detector_spec.dart +++ b/test/change_detection/dirty_checking_change_detector_spec.dart @@ -7,11 +7,8 @@ import 'package:angular/change_detection/dirty_checking_change_detector_static.d import 'package:angular/change_detection/dirty_checking_change_detector_dynamic.dart'; import 'dart:collection'; import 'dart:math'; -import 'package:observe/observe.dart' - show ObservableList, - ObservableMap, - ChangeNotifier, - observable; +import 'package:observable/observable.dart' show Observable, ObservableList, ObservableMap; +import 'package:observe/observe.dart' show observable; DirtyCheckingChangeDetector detector; @@ -1222,7 +1219,7 @@ class _User { } } -class _ObservableUser extends ChangeNotifier { +class _ObservableUser extends Observable { String __$first; String get first => __$first; void set first(String value) { From cf730b7bb5050aa425d8d94ea8f1bb641e4877d1 Mon Sep 17 00:00:00 2001 From: Todd Volkert Date: Sat, 1 Oct 2016 08:49:22 -0700 Subject: [PATCH 2/2] Update pubspec.yaml to match observable update --- pubspec.yaml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pubspec.yaml b/pubspec.yaml index c5256d145..94b181bac 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -1,5 +1,5 @@ name: angular -version: '1.1.2+2' +version: '1.1.2+3' authors: - Misko Hevery - Pavel Jbanov @@ -23,7 +23,8 @@ dependencies: di: '>=3.3.7 <4.0.0' html5lib: '>=0.12.0 <0.13.0' intl: '>=0.8.7 <0.12.0' - observe: '>=0.12.0 <0.14.0' + observable: '^0.14.0' + observe: '^0.14.0' perf_api: '>=0.0.9 <0.1.0' route_hierarchical: '>=0.6.1 <0.7.0' dev_dependencies: