Skip to content
This repository has been archived by the owner on Feb 22, 2018. It is now read-only.

Update Angular to use package:observable #1761

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion benchmark/watch_group_perf.dart
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down Expand Up @@ -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); }
Expand Down
2 changes: 1 addition & 1 deletion lib/change_detection/dirty_checking_change_detector.dart
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
5 changes: 3 additions & 2 deletions pubspec.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name: angular
version: '1.1.2+2'
version: '1.1.2+3'
authors:
- Misko Hevery <misko@hevery.com>
- Pavel Jbanov <pavelgj@gmail.com>
Expand All @@ -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:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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<String> detector;

Expand Down Expand Up @@ -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) {
Expand Down