+
About
The NgAnimate module is a port with modifications of the original AngularJS animation module. The default implementation does nothing. @@ -22,6 +23,7 @@
About
added it allows you define and run css animations on your elements with pure CSS.Check out the demos above.
+ng-repeat Demo
diff --git a/example/web/animation/css_demo.dart b/example/web/animation/css_demo.dart index a09018595..5312556f3 100644 --- a/example/web/animation/css_demo.dart +++ b/example/web/animation/css_demo.dart @@ -4,25 +4,24 @@ part of animation; selector: 'css-demo', template: '''
-
-
-
+
+
''',
- publishAs: 'ctrl',
applyAuthorStyles: true)
class RepeatDemo {
var thing = 0;
diff --git a/example/web/animation/stress_demo.dart b/example/web/animation/stress_demo.dart
index 2f9b9a488..19938d5ff 100644
--- a/example/web/animation/stress_demo.dart
+++ b/example/web/animation/stress_demo.dart
@@ -4,14 +4,13 @@ part of animation;
selector: 'stress-demo',
template: '''
-
-
- +
-
-
-
- {{inner}} +
- {{inner}}
-
''',
- publishAs: 'ctrl',
applyAuthorStyles: true)
class StressDemo {
bool _visible = true;
diff --git a/example/web/animation/visibility_demo.dart b/example/web/animation/visibility_demo.dart
index 5dee51f2a..53830f3c0 100644
--- a/example/web/animation/visibility_demo.dart
+++ b/example/web/animation/visibility_demo.dart
@@ -4,19 +4,18 @@ part of animation;
selector: 'visibility-demo',
template: '''
-
- ');
ViewFactory viewFactory = compiler(element, directives);
View view = viewFactory(injector, element);
- scope.context['items'] = ['a', 'b'];
+ scope.context.items = ['a', 'b'];
scope.apply();
expect(element).toHaveText('ab');
});
it(r'should set create a list of items', (Scope scope, Compiler compiler, Injector injector) {
- scope.context['items'] = [];
+ scope.context.items = [];
scope.watch('1', (_, __) {
- scope.context['items'].add('a');
- scope.context['items'].add('b');
+ scope.context.items.add('a');
+ scope.context.items.add('b');
});
var element = es('');
ViewFactory viewFactory = compiler(element, directives);
@@ -61,7 +61,7 @@ main() {
var element = es('');
ViewFactory viewFactory = compiler(element, directives);
View view = viewFactory(injector, element);
- scope.context['items'] = ['a', 'b'].map((i) => i); // makes an iterable
+ scope.context.items = ['a', 'b'].map((i) => i); // makes an iterable
scope.apply();
expect(element).toHaveText('ab');
});
@@ -70,24 +70,24 @@ main() {
it(r'should iterate over an array of objects', () {
element = compile(
' _map = {};
- DynamicObject([Map init]) {
- init.forEach((key, value) {
- var symbol = _nameToSymbol[key];
- if (symbol == null) { throw "Missing nameToSymbol[$key]"; }
- _map[symbol] = value;
- });
- }
- toString() => "$_map";
- operator ==(DynamicObject other) {
- return (_map.length == other._map.length &&
- _map.keys.toSet().difference(other._map.keys.toSet()).length == 0 &&
- _map.keys.every((key) => _map[key] == other._map[key]));
- }
- int get hashCode => 0;
- noSuchMethod(Invocation invocation) {
- Symbol name = invocation.memberName;
- if (invocation.isGetter) {
- return _map[name];
- } else if (invocation.isSetter) {
- return _map[name] = invocation.positionalArguments[0];
- } else if (invocation.isMethod) {
- return Function.apply(_map[name],
- invocation.positionalArguments, invocation.namedArguments);
- } else {
- throw "DynamicObject: Unexpected invocation.";
- }
- }
-}
-
main() {
- D([Map init]) => new DynamicObject(init);
+ D([Map init]) => new DynamicObject()..addProperties(init);
describe('filter formatter', () {
var filter;
@@ -106,17 +63,17 @@ main() {
it('should formatter on specific property', () {
List items = [{'name': 'a', 'ignore': 'a'},
{'name': 'abc', 'ignore': 'a'},
- D({'name': 'abd'})];
+ {'name': 'abd'}];
expect(filter(items, {}).length).toBe(3);
- expect(filter(items, {'name': 'a'}).length).toBe(3);
+ expect(filter(items, {"this['name']": 'a'}).length).toBe(3);
- expect(filter(items, {'name': 'ab'}).length).toBe(2);
- expect(filter(items, {'name': 'ab'})[0]['name']).toBe('abc');
- expect(filter(items, {'name': 'ab'})[1].name).toBe('abd');
+ expect(filter(items, {"this['name']": 'ab'}).length).toBe(2);
+ expect(filter(items, {"this['name']": 'ab'})[0]['name']).toBe('abc');
+ expect(filter(items, {"this['name']": 'ab'})[1]['name']).toBe('abd');
- expect(filter(items, {'name': 'c'}).length).toBe(1);
- expect(filter(items, {'name': 'c'})[0]['name']).toBe('abc');
+ expect(filter(items, {"this['name']": 'c'}).length).toBe(1);
+ expect(filter(items, {"this['name']": 'c'})[0]['name']).toBe('abc');
});
it('should take function as predicate', () {
@@ -128,25 +85,25 @@ main() {
});
it('should take object as predicate', () {
- List items = [{'first': 'misko', 'last': 'hevery'},
- D({'first': 'adam', 'last': 'abrons'})];
-
- expect(filter(items, {'first':'', 'last':''}).length).toBe(2);
- expect(filter(items, {'first':'', 'last':'hevery'}).length).toBe(1);
- expect(filter(items, {'first':'adam', 'last':'hevery'}).length).toBe(0);
- expect(filter(items, {'first':'misko', 'last':'hevery'}).length).toBe(1);
- expect(filter(items, {'first':'misko', 'last':'hevery'})[0]).toEqual(items[0]);
+ List items = [new DynamicObject()..addProperties({'first': 'misko', 'last': 'hevery'}),
+ new DynamicObject()..addProperties({'first': 'adam', 'last': 'abrons'})];
+
+ expect(filter(items, {'first': '', 'last': ''}).length).toBe(2);
+ expect(filter(items, {'first': '', 'last': 'hevery'}).length).toBe(1);
+ expect(filter(items, {'first': 'adam', 'last': 'hevery'}).length).toBe(0);
+ expect(filter(items, {'first': 'misko', 'last': 'hevery'}).length).toBe(1);
+ expect(filter(items, {'first': 'misko', 'last': 'hevery'})[0]).toEqual(items[0]);
});
it('should support boolean properties', () {
List items = [{'name': 'tom', 'current': true},
- D({'name': 'demi', 'current': false}),
+ {'name': 'demi', 'current': false},
{'name': 'sofia'}];
- expect(filter(items, {'current':true}).length).toBe(1);
- expect(filter(items, {'current':true})[0]['name']).toBe('tom');
- expect(filter(items, {'current':false}).length).toBe(1);
- expect(filter(items, {'current':false})[0].name).toBe('demi');
+ expect(filter(items, {"this['current']": true}).length).toBe(1);
+ expect(filter(items, {"this['current']": true})[0]['name']).toBe('tom');
+ expect(filter(items, {"this['current']": false}).length).toBe(1);
+ expect(filter(items, {"this['current']": false})[0]['name']).toBe('demi');
});
it('should support negation operator', () {
@@ -168,16 +125,16 @@ main() {
items = [{'key': 'value1', 'nonkey': 1},
{'key': 'value2', 'nonkey': 2},
{'key': 'value12', 'nonkey': 3},
- D({'key': 'value1', 'nonkey': 4}),
- D({'key': 'Value1', 'nonkey': 5})];
- expr = {'key': 'value1'};
+ {'key': 'value1', 'nonkey': 4},
+ {'key': 'Value1', 'nonkey': 5}];
+ expr = {"this['key']": 'value1'};
expect(filter(items, expr, true)).toEqual([items[0], items[3]]);
items = [{'key': 1, 'nonkey': 1},
{'key': 2, 'nonkey': 2},
{'key': 12, 'nonkey': 3},
{'key': 1, 'nonkey': 4}];
- expr = {'key': 1};
+ expr = {"this['key']": 1};
expect(filter(items, expr, true)).toEqual([items[0], items[3]]);
expr = 12;
@@ -185,18 +142,17 @@ main() {
});
it('and use the function given to compare values', () {
- List items = [{'key': 1, 'nonkey': 1},
- {'key': 2, 'nonkey': 2},
- D({'key': 12, 'nonkey': 3}),
- {'key': 1, 'nonkey': 14},
+ List items = [{'key': 1, 'nonkey': 1},
+ {'key': 2, 'nonkey': 2},
+ {'key': 12, 'nonkey': 3},
+ {'key': 1, 'nonkey': 14},
{'key': 13, 'nonkey': 14}];
- var expr = {'key': 10};
var comparator = (obj, value) => obj is num && obj > value;
- expect(filter(items, expr, comparator)).toEqual([items[2], items[4]]);
- expr = 10;
- // DynamicObject doesn't match!
- expect(filter(items, expr, comparator)).toEqual([items[3], items[4]]);
+ // items having their 'key' item > 10
+ expect(filter(items, {"this['key']": 10}, comparator)).toEqual([items[2], items[4]]);
+ // items having any value > 10
+ expect(filter(items, 10, comparator)).toEqual([items[2], items[3], items[4]]);
});
});
diff --git a/test/formatter/json_spec.dart b/test/formatter/json_spec.dart
index c3c62597c..9c850308e 100644
--- a/test/formatter/json_spec.dart
+++ b/test/formatter/json_spec.dart
@@ -5,7 +5,7 @@ import '../_specs.dart';
void main() {
describe('json', () {
it('should convert primitives, array, map to json', inject((Scope scope, Parser parser, FormatterMap formatters) {
- scope.context['foo'] = [{"string":'foo', "number": 123, "bool": false}];
+ scope.context.foo = [{"string": 'foo', "number": 123, "bool": false}];
expect(parser('foo | json').eval(scope.context, formatters)).toEqual('[{"string":"foo","number":123,"bool":false}]');
}));
});
diff --git a/test/formatter/limit_to_spec.dart b/test/formatter/limit_to_spec.dart
index dce15b4be..b5ba18844 100644
--- a/test/formatter/limit_to_spec.dart
+++ b/test/formatter/limit_to_spec.dart
@@ -5,12 +5,12 @@ import '../_specs.dart';
main() {
describe('orderBy formatter', () {
beforeEach((Scope scope, Parser parse, FormatterMap formatters) {
- scope.context['list'] = 'abcdefgh'.split('');
- scope.context['string'] = 'tuvwxyz';
+ scope.context.list = 'abcdefgh'.split('');
+ scope.context.string = 'tuvwxyz';
});
it('should return the first X items when X is positive', (Scope scope, Parser parse, FormatterMap formatters) {
- scope.context['limit'] = 3;
+ scope.context.limit = 3;
expect(parse('list | limitTo: 3').eval(scope.context, formatters)).toEqual(['a', 'b', 'c']);
expect(parse('list | limitTo: limit').eval(scope.context, formatters)).toEqual(['a', 'b', 'c']);
expect(parse('string | limitTo: 3').eval(scope.context, formatters)).toEqual('tuv');
@@ -18,7 +18,7 @@ main() {
});
it('should return the last X items when X is negative', (Scope scope, Parser parse, FormatterMap formatters) {
- scope.context['limit'] = 3;
+ scope.context.limit = 3;
expect(parse('list | limitTo: -3').eval(scope.context, formatters)).toEqual(['f', 'g', 'h']);
expect(parse('list | limitTo: -limit').eval(scope.context, formatters)).toEqual(['f', 'g', 'h']);
expect(parse('string | limitTo: -3').eval(scope.context, formatters)).toEqual('xyz');
@@ -40,15 +40,20 @@ main() {
it('should return a copy of input array if X is exceeds array length',
(Scope scope, Parser parse, FormatterMap formatters) {
- expect(parse('list | limitTo: 20').eval(scope.context, formatters)).toEqual(scope.context['list']);
- expect(parse('list | limitTo: -20').eval(scope.context, formatters)).toEqual(scope.context['list']);
- expect(parse('list | limitTo: 20').eval(scope.context, formatters)).not.toBe(scope.context['list']);
+ expect(parse('list | limitTo: 20').eval(scope.context, formatters))
+ .toEqual(scope.context.list);
+ expect(parse('list | limitTo: -20').eval(scope.context, formatters))
+ .toEqual(scope.context.list);
+ expect(parse('list | limitTo: 20').eval(scope.context, formatters))
+ .not.toBe(scope.context.list);
});
it('should return the entire string if X exceeds input length',
(Scope scope, Parser parse, FormatterMap formatters) {
- expect(parse('string | limitTo: 20').eval(scope.context, formatters)).toEqual(scope.context['string']);
- expect(parse('string | limitTo: -20').eval(scope.context, formatters)).toEqual(scope.context['string']);
+ expect(parse('string | limitTo: 20').eval(scope.context, formatters))
+ .toEqual(scope.context.string);
+ expect(parse('string | limitTo: -20').eval(scope.context, formatters))
+ .toEqual(scope.context.string);
});
});
diff --git a/test/formatter/order_by_spec.dart b/test/formatter/order_by_spec.dart
index 42ad2ea34..0d09ca9d0 100644
--- a/test/formatter/order_by_spec.dart
+++ b/test/formatter/order_by_spec.dart
@@ -14,26 +14,40 @@ class Name {
}
+class AB {
+ var a;
+ var b;
+ AB(this.a, this.b);
+ String toString() => 'a=$a, b=$b';
+}
+
main() {
describe('orderBy formatter', () {
- var Emily___Bronte = new Name(firstName: 'Emily', lastName: 'Bronte'),
- Mark____Twain = {'firstName': 'Mark', 'lastName': 'Twain'},
- Jeffrey_Archer = {'firstName': 'Jeffrey', 'lastName': 'Archer'},
- Isaac___Asimov = new Name(firstName: 'Isaac', lastName: 'Asimov'),
- Oscar___Wilde = {'firstName': 'Oscar', 'lastName': 'Wilde'};
+ var Emily___Bronte = new Name(firstName: 'Emily', lastName: 'Bronte'),
+ Mark____Twain = new Name(firstName: 'Mark', lastName: 'Twain'),
+ Jeffrey_Archer = new Name(firstName: 'Jeffrey', lastName: 'Archer'),
+ Isaac___Asimov = new Name(firstName: 'Isaac', lastName: 'Asimov'),
+ Oscar___Wilde = new Name(firstName: 'Oscar', lastName: 'Wilde');
+
+ var _1010 = new AB(10, 10);
+ var _1020 = new AB(10, 20);
+ var _2010 = new AB(20, 10);
+ var _2020 = new AB(20, 20);
+
beforeEach((Scope scope, Parser parse, FormatterMap formatters) {
- scope.context['authors'] = [
+ scope.context.authors = [
Emily___Bronte,
Mark____Twain,
Jeffrey_Archer,
Isaac___Asimov,
Oscar___Wilde,
];
- scope.context['items'] = [
- {'a': 10, 'b': 10},
- {'a': 10, 'b': 20},
- {'a': 20, 'b': 10},
- {'a': 20, 'b': 20},
+
+ scope.context.items = [
+ _1010,
+ _1020,
+ _2010,
+ _2020,
];
});
@@ -43,12 +57,12 @@ main() {
});
it('should pass through argument when expression is null', (Scope scope, Parser parse, FormatterMap formatters) {
- var list = scope.context['list'] = [1, 3, 2];
+ var list = scope.context.list = [1, 3, 2];
expect(parse('list | orderBy:thisIsNull').eval(scope.context, formatters)).toBe(list);
});
it('should sort with "empty" expression using default comparator', (Scope scope, Parser parse, FormatterMap formatters) {
- scope.context['list'] = [1, 3, 2];
+ scope.context.list = [1, 3, 2];
expect(parse('list | orderBy:""').eval(scope.context, formatters)).toEqual([1, 2, 3]);
expect(parse('list | orderBy:"+"').eval(scope.context, formatters)).toEqual([1, 2, 3]);
expect(parse('list | orderBy:"-"').eval(scope.context, formatters)).toEqual([3, 2, 1]);
@@ -70,7 +84,7 @@ main() {
Oscar___Wilde,
]);
- scope.context['sortKey'] = 'firstName';
+ scope.context.sortKey = 'firstName';
expect(parse('authors | orderBy:sortKey').eval(scope.context, formatters)).toEqual([
Emily___Bronte,
Isaac___Asimov,
@@ -140,41 +154,41 @@ main() {
it('should support an array of expressions',
(Scope scope, Parser parse, FormatterMap formatters) {
expect(parse('items | orderBy:["-a", "-b"]').eval(scope.context, formatters)).toEqual([
- {'a': 20, 'b': 20},
- {'a': 20, 'b': 10},
- {'a': 10, 'b': 20},
- {'a': 10, 'b': 10},
+ _2020,
+ _2010,
+ _1020,
+ _1010,
]);
expect(parse('items | orderBy:["-b", "-a"]').eval(scope.context, formatters)).toEqual([
- {'a': 20, 'b': 20},
- {'a': 10, 'b': 20},
- {'a': 20, 'b': 10},
- {'a': 10, 'b': 10},
+ _2020,
+ _1020,
+ _2010,
+ _1010,
]);
expect(parse('items | orderBy:["a", "-b"]').eval(scope.context, formatters)).toEqual([
- {'a': 10, 'b': 20},
- {'a': 10, 'b': 10},
- {'a': 20, 'b': 20},
- {'a': 20, 'b': 10},
+ _1020,
+ _1010,
+ _2020,
+ _2010
]);
expect(parse('items | orderBy:["a", "-b"]:true').eval(scope.context, formatters)).toEqual([
- {'a': 20, 'b': 10},
- {'a': 20, 'b': 20},
- {'a': 10, 'b': 10},
- {'a': 10, 'b': 20},
+ _2010,
+ _2020,
+ _1010,
+ _1020,
]);
});
it('should support function expressions',
(Scope scope, Parser parse, FormatterMap formatters) {
- scope.context['func'] = (e) => -(e['a'] + e['b']);
+ scope.context.func = (e) => -(e.a + e.b);
expect(parse('items | orderBy:[func, "a", "-b"]').eval(scope.context, formatters)).toEqual([
- {'a': 20, 'b': 20},
- {'a': 10, 'b': 20},
- {'a': 20, 'b': 10},
- {'a': 10, 'b': 10},
+ _2020,
+ _1020,
+ _2010,
+ _1010,
]);
- scope.context['func'] = (e) => (e is Name) ? e.lastName : e['lastName'];
+ scope.context.func = (e) => e.lastName;
expect(parse('authors | orderBy:func').eval(scope.context, formatters)).toEqual([
Jeffrey_Archer,
Isaac___Asimov,
@@ -183,6 +197,5 @@ main() {
Oscar___Wilde,
]);
});
-
});
}
diff --git a/test/io/expression_extractor_spec.dart b/test/io/expression_extractor_spec.dart
index f9ce6a0c4..afe224824 100644
--- a/test/io/expression_extractor_spec.dart
+++ b/test/io/expression_extractor_spec.dart
@@ -36,19 +36,15 @@ void main() {
var expressions = _extractExpressions('test/io/test_files/main.dart');
expect(expressions, unorderedEquals([
- 'ctrl.expr',
- 'ctrl.anotherExpression',
- 'ctrl.callback',
- 'ctrl.twoWayStuff',
'attr',
'expr',
'anotherExpression',
'callback',
'twoWayStuff',
'exported + expression',
- 'ctrl.inline.template.expression',
+ 'inline.template.expression',
'ngIfCondition',
- 'ctrl.if'
+ 'if'
]));
});
diff --git a/test/io/test_files/main.dart b/test/io/test_files/main.dart
index cd263cdfd..094684265 100644
--- a/test/io/test_files/main.dart
+++ b/test/io/test_files/main.dart
@@ -16,7 +16,7 @@ class NgIfDirective {
'attr': '@attr',
'expr': '=>expr'
},
- template: '
'
'
+
+
-
- {{bounce.fps}} fps. ({{bounce.balls.length}} balls) [{{1000/bounce.fps}} ms]
- Digest: {{bounce.digestTime}} ms
- +1 - +10 - +100 + {{ fps }} fps. ({{ balls.length }} balls) [{{ 1000 / fps }} ms]
+ Digest: {{ digestTime }} ms
+ +1 + +10 + +100
- -1 - -10 - -100 + -1 + -10 + -100
- ▶❙❙
- Toggle CSS
- noop
+ ▶❙❙
+ Toggle CSS
+ noop
diff --git a/example/web/hello_world.dart b/example/web/hello_world.dart
index ab8953f72..54dcac0db 100644
--- a/example/web/hello_world.dart
+++ b/example/web/hello_world.dart
@@ -1,15 +1,13 @@
import 'package:angular/angular.dart';
import 'package:angular/application_factory.dart';
-@Controller(
- selector: '[hello-world-controller]',
- publishAs: 'ctrl')
+@Injectable()
class HelloWorld {
String name = "world";
}
main() {
applicationFactory()
- .addModule(new Module()..bind(HelloWorld))
+ .rootContextType(HelloWorld)
.run();
}
diff --git a/example/web/hello_world.html b/example/web/hello_world.html
index 705607d48..f419111cb 100644
--- a/example/web/hello_world.html
+++ b/example/web/hello_world.html
@@ -5,8 +5,8 @@
-
');
compiler([element], directives)(injector, [element]);
- scope.context['a'] = "one";
- scope.context['b'] = "two";
+ scope.context.a = "one";
+ scope.context.b = "two";
scope.apply();
// Bindings not contained by ng-non-bindable should resolve.
expect(element.querySelector("#s1").text.trim()).toEqual('one');
diff --git a/test/directive/ng_pluralize_spec.dart b/test/directive/ng_pluralize_spec.dart
index b70f4cfdf..d7df0b9d3 100644
--- a/test/directive/ng_pluralize_spec.dart
+++ b/test/directive/ng_pluralize_spec.dart
@@ -34,94 +34,94 @@ main() {
});
it('should show single/plural strings', () {
- _.rootScope.context['email'] = '0';
+ _.rootScope.context.email = '0';
_.rootScope.apply();
expect(element.text).toEqual('You have no new email');
expect(elementAlt.text).toEqual('You have no new email');
- _.rootScope.context['email'] = '0';
+ _.rootScope.context.email = '0';
_.rootScope.apply();
expect(element.text).toEqual('You have no new email');
expect(elementAlt.text).toEqual('You have no new email');
- _.rootScope.context['email'] = 1;
+ _.rootScope.context.email = 1;
_.rootScope.apply();
expect(element.text).toEqual('You have one new email');
expect(elementAlt.text).toEqual('You have one new email');
- _.rootScope.context['email'] = 0.01;
+ _.rootScope.context.email = 0.01;
_.rootScope.apply();
expect(element.text).toEqual('You have 0.01 new emails');
expect(elementAlt.text).toEqual('You have 0.01 new emails');
- _.rootScope.context['email'] = '0.1';
+ _.rootScope.context.email = '0.1';
_.rootScope.apply();
expect(element.text).toEqual('You have 0.1 new emails');
expect(elementAlt.text).toEqual('You have 0.1 new emails');
- _.rootScope.context['email'] = 2;
+ _.rootScope.context.email = 2;
_.rootScope.apply();
expect(element.text).toEqual('You have 2 new emails');
expect(elementAlt.text).toEqual('You have 2 new emails');
- _.rootScope.context['email'] = -0.1;
+ _.rootScope.context.email = -0.1;
_.rootScope.apply();
expect(element.text).toEqual('You have -0.1 new emails');
expect(elementAlt.text).toEqual('You have -0.1 new emails');
- _.rootScope.context['email'] = '-0.01';
+ _.rootScope.context.email = '-0.01';
_.rootScope.apply();
expect(element.text).toEqual('You have -0.01 new emails');
expect(elementAlt.text).toEqual('You have -0.01 new emails');
- _.rootScope.context['email'] = -2;
+ _.rootScope.context.email = -2;
_.rootScope.apply();
expect(element.text).toEqual('You have -2 new emails');
expect(elementAlt.text).toEqual('You have -2 new emails');
- _.rootScope.context['email'] = -1;
+ _.rootScope.context.email = -1;
_.rootScope.apply();
expect(element.text).toEqual('You have negative email. Whohoo!');
expect(elementAlt.text).toEqual('You have negative email. Whohoo!');
});
it('should show single/plural strings with mal-formed inputs', () {
- _.rootScope.context['email'] = '';
+ _.rootScope.context.email = '';
_.rootScope.apply();
expect(element.text).toEqual('');
expect(elementAlt.text).toEqual('');
- _.rootScope.context['email'] = null;
+ _.rootScope.context.email = null;
_.rootScope.apply();
expect(element.text).toEqual('');
expect(elementAlt.text).toEqual('');
- _.rootScope.context['email'] = 'a3';
+ _.rootScope.context.email = 'a3';
_.rootScope.apply();
expect(element.text).toEqual('');
expect(elementAlt.text).toEqual('');
- _.rootScope.context['email'] = '011';
+ _.rootScope.context.email = '011';
_.rootScope.apply();
expect(element.text).toEqual('You have 11 new emails');
expect(elementAlt.text).toEqual('You have 11 new emails');
- _.rootScope.context['email'] = '-011';
+ _.rootScope.context.email = '-011';
_.rootScope.apply();
expect(element.text).toEqual('You have -11 new emails');
expect(elementAlt.text).toEqual('You have -11 new emails');
- _.rootScope.context['email'] = '1fff';
+ _.rootScope.context.email = '1fff';
_.rootScope.apply();
expect(element.text).toEqual('');
expect(elementAlt.text).toEqual('');
- _.rootScope.context['email'] = '0aa22';
+ _.rootScope.context.email = '0aa22';
_.rootScope.apply();
expect(element.text).toEqual('');
expect(elementAlt.text).toEqual('');
- _.rootScope.context['email'] = '000001';
+ _.rootScope.context.email = '000001';
_.rootScope.apply();
expect(element.text).toEqual('You have one new email');
expect(elementAlt.text).toEqual('You have one new email');
@@ -136,7 +136,7 @@ main() {
"'one': 'Some text'," +
"'other': 'Some text'}\">" +
'');
- _.rootScope.context['email'] = '0';
+ _.rootScope.context.email = '0';
_.rootScope.apply();
expect(element.text).toEqual('');
}));
@@ -160,30 +160,30 @@ main() {
"when-one='\${p1}, \${p2} and one other person are viewing.'" +
"when-other='\${p1}, \${p2} and {} other people are viewing.'>" +
"");
- _.rootScope.context['p1'] = 'Igor';
- _.rootScope.context['p2'] = 'Misko';
+ _.rootScope.context.p1 = 'Igor';
+ _.rootScope.context.p2 = 'Misko';
- _.rootScope.context['viewCount'] = 0;
+ _.rootScope.context.viewCount = 0;
_.rootScope.apply();
expect(element.text).toEqual('Nobody is viewing.');
expect(elementAlt.text).toEqual('Nobody is viewing.');
- _.rootScope.context['viewCount'] = 1;
+ _.rootScope.context.viewCount = 1;
_.rootScope.apply();
expect(element.text).toEqual('Igor is viewing.');
expect(elementAlt.text).toEqual('Igor is viewing.');
- _.rootScope.context['viewCount'] = 2;
+ _.rootScope.context.viewCount = 2;
_.rootScope.apply();
expect(element.text).toEqual('Igor and Misko are viewing.');
expect(elementAlt.text).toEqual('Igor and Misko are viewing.');
- _.rootScope.context['viewCount'] = 3;
+ _.rootScope.context.viewCount = 3;
_.rootScope.apply();
expect(element.text).toEqual('Igor, Misko and one other person are viewing.');
expect(elementAlt.text).toEqual('Igor, Misko and one other person are viewing.');
- _.rootScope.context['viewCount'] = 4;
+ _.rootScope.context.viewCount = 4;
_.rootScope.apply();
expect(element.text).toEqual('Igor, Misko and 2 other people are viewing.');
expect(elementAlt.text).toEqual('Igor, Misko and 2 other people are viewing.');
diff --git a/test/directive/ng_repeat_spec.dart b/test/directive/ng_repeat_spec.dart
index 3dde712a0..a9ebe13f8 100644
--- a/test/directive/ng_repeat_spec.dart
+++ b/test/directive/ng_repeat_spec.dart
@@ -36,17 +36,17 @@ main() {
var element = es('Hello World. ng-if will create and destroy dom elements each time you toggle me.
+
''',
- publishAs: 'ctrl',
applyAuthorStyles: true)
class VisibilityDemo {
bool visible = false;
diff --git a/example/web/bouncing_balls.dart b/example/web/bouncing_balls.dart
index d2d3ca3a4..a53f10e59 100644
--- a/example/web/bouncing_balls.dart
+++ b/example/web/bouncing_balls.dart
@@ -26,20 +26,18 @@ class BallModel {
}
-@Controller(
- selector: '[bounce-controller]',
- publishAs: 'bounce')
-class BounceController {
+@Injectable()
+class BounceController implements ScopeAware {
+ Scope scope;
var lastTime = window.performance.now();
var run = false;
var fps = 0;
var digestTime = 0;
var currentDigestTime = 0;
var balls = [];
- final Scope scope;
var ballClassName = 'ball';
- BounceController(this.scope) {
+ BounceController() {
changeCount(100);
if (run) tick();
}
@@ -82,7 +80,7 @@ class BounceController {
var delay = now - lastTime;
fps = (1000/delay).round();
- for(var i=0, ii=balls.length; iHello World. ng-hide will add and remove the .ng-hide class from me to show and hide this view of text.
-
- Digest: {{bounce.digestTime}} ms
- +1 - +10 - +100 + {{ fps }} fps. ({{ balls.length }} balls) [{{ 1000 / fps }} ms]
+ Digest: {{ digestTime }} ms
+ +1 + +10 + +100
- -1 - -10 - -100 + -1 + -10 + -100
- ▶❙❙
- Toggle CSS
- noop
+ ▶❙❙
+ Toggle CSS
+ noop
Hello {{ctrl.name}}!
-name: +Hello {{ name }}!
+name: diff --git a/example/web/shadow_dom_components.dart b/example/web/shadow_dom_components.dart index d34a7d780..c973a8987 100644 --- a/example/web/shadow_dom_components.dart +++ b/example/web/shadow_dom_components.dart @@ -16,16 +16,15 @@ main() { @Component( selector: "my-component", - publishAs: "ctrl", template: """ -
+
""",
cssUrl: "/css/shadow_dom_components.css")
diff --git a/example/web/todo.dart b/example/web/todo.dart
index b4c1c7bbb..c6c187a5c 100644
--- a/example/web/todo.dart
+++ b/example/web/todo.dart
@@ -53,10 +53,7 @@ class HttpServer implements Server {
}
}
-
-@Controller(
- selector: '[todo-controller]',
- publishAs: 'todo')
+@Injectable()
class Todo {
var items = - [];
Item newItem;
@@ -94,18 +91,12 @@ class Todo {
main() {
print(window.location.search);
- var module = new Module()
- ..bind(Todo)
- ..bind(PlaybackHttpBackendConfig);
+ var module = new Module()..bind(PlaybackHttpBackendConfig);
// If these is a query in the URL, use the server-backed
// TodoController. Otherwise, use the stored-data controller.
var query = window.location.search;
- if (query.contains('?')) {
- module.bind(Server, toImplementation: HttpServer);
- } else {
- module.bind(Server, toImplementation: NoOpServer);
- }
+ module.bind(Server, toImplementation: query.contains('?') ? HttpServer : NoOpServer);
if (query == '?record') {
print('Using recording HttpBackend');
@@ -119,5 +110,8 @@ main() {
module.bind(HttpBackend, toImplementation: PlaybackHttpBackend);
}
- applicationFactory().addModule(module).run();
+ applicationFactory()
+ .addModule(module)
+ .rootContextType(Todo)
+ .run();
}
diff --git a/example/web/todo.html b/example/web/todo.html
index cbd32cc92..2dcb69f4a 100644
--- a/example/web/todo.html
+++ b/example/web/todo.html
@@ -11,19 +11,19 @@
'
);
- Probe probe1 = _.rootScope.context['i'];
+ Probe probe1 = _.rootScope.context.$probes['i'];
var ngModel1 = probe1.directive(NgModel);
InputElement inputElement1 = probe1.element;
- Probe probe2 = _.rootScope.context['j'];
+ Probe probe2 = _.rootScope.context.$probes['j'];
var ngModel2 = probe2.directive(NgModel);
InputElement inputElement2 = probe2.element;
ngModel1.render('on');
- scope.context['model'] = 'on';
+ scope.context.model = 'on';
expect(inputElement1.checked).toBe(false);
expect(inputElement2.checked).toBe(false);
@@ -1011,28 +1011,28 @@ void main() {
it('should update model from the input value', () {
_.compile('');
- Probe probe = _.rootScope.context['p'];
+ Probe probe = _.rootScope.context.$probes['p'];
var ngModel = probe.directive(NgModel);
InputElement inputElement = probe.element;
inputElement.value = 'xzy';
_.triggerEvent(inputElement, 'change');
- expect(_.rootScope.context['model']).toEqual('xzy');
+ expect(_.rootScope.context.model).toEqual('xzy');
inputElement.value = '123';
var input = probe.directive(InputTextLike);
input.processValue();
- expect(_.rootScope.context['model']).toEqual('123');
+ expect(_.rootScope.context.model).toEqual('123');
});
it('should only render the input value upon the next digest', (Scope scope) {
_.compile('');
- Probe probe = _.rootScope.context['p'];
+ Probe probe = _.rootScope.context.$probes['p'];
var ngModel = probe.directive(NgModel);
InputElement inputElement = probe.element;
ngModel.render('xyz');
- scope.context['model'] = 'xyz';
+ scope.context.model = 'xyz';
expect(inputElement.value).not.toEqual('xyz');
@@ -1065,28 +1065,28 @@ void main() {
it('should update model from the input value', () {
_.compile('');
- Probe probe = _.rootScope.context['p'];
+ Probe probe = _.rootScope.context.$probes['p'];
var ngModel = probe.directive(NgModel);
InputElement inputElement = probe.element;
inputElement.value = 'xzy';
_.triggerEvent(inputElement, 'change');
- expect(_.rootScope.context['model']).toEqual('xzy');
+ expect(_.rootScope.context.model).toEqual('xzy');
inputElement.value = '123';
var input = probe.directive(InputTextLike);
input.processValue();
- expect(_.rootScope.context['model']).toEqual('123');
+ expect(_.rootScope.context.model).toEqual('123');
});
it('should only render the input value upon the next digest', (Scope scope) {
_.compile('');
- Probe probe = _.rootScope.context['p'];
+ Probe probe = _.rootScope.context.$probes['p'];
var ngModel = probe.directive(NgModel);
InputElement inputElement = probe.element;
ngModel.render('xyz');
- scope.context['model'] = 'xyz';
+ scope.context.model = 'xyz';
expect(inputElement.value).not.toEqual('xyz');
@@ -1113,22 +1113,22 @@ void main() {
element.innerHtml = 'abc';
_.triggerEvent(element, 'change');
- expect(_.rootScope.context['model']).toEqual('abc');
+ expect(_.rootScope.context.model).toEqual('abc');
element.innerHtml = 'def';
var input = ngInjector(element).get(ContentEditable);
input.processValue();
- expect(_.rootScope.context['model']).toEqual('def');
+ expect(_.rootScope.context.model).toEqual('def');
});
it('should only render the input value upon the next digest', (Scope scope) {
_.compile('');
- Probe probe = _.rootScope.context['p'];
+ Probe probe = _.rootScope.context.$probes['p'];
var ngModel = probe.directive(NgModel);
Element element = probe.element;
ngModel.render('xyz');
- scope.context['model'] = 'xyz';
+ scope.context.model = 'xyz';
expect(element.innerHtml).not.toEqual('xyz');
@@ -1141,7 +1141,7 @@ void main() {
describe('pristine / dirty', () {
it('should be set to pristine by default', (Scope scope) {
_.compile('');
- Probe probe = _.rootScope.context['i'];
+ Probe probe = _.rootScope.context.$probes['i'];
var model = probe.directive(NgModel);
expect(model.pristine).toEqual(true);
@@ -1150,7 +1150,7 @@ void main() {
it('should add and remove the correct CSS classes when set to dirty and to pristine', (Scope scope) {
_.compile('');
- Probe probe = _.rootScope.context['i'];
+ Probe probe = _.rootScope.context.$probes['i'];
NgModel model = probe.directive(NgModel);
InputElement element = probe.element;
@@ -1175,17 +1175,17 @@ void main() {
it('should render the parent form/fieldset as dirty but not the other models',
(Scope scope) {
- _.compile('');
scope.apply();
- var probe1 = scope.context['i'];
+ var probe1 = _.rootScope.context.$probes['i'];
var input1 = probe1.element;
var model1 = probe1.directive(NgModel);
- var probe2 = scope.context['j'];
+ var probe2 = _.rootScope.context.$probes['j'];
var input2 = probe2.element;
var model2 = probe2.directive(NgModel);
@@ -1585,7 +1589,7 @@ void main() {
_.compile('');
scope.apply();
- var probe = scope.context['i'];
+ var probe = _.rootScope.context.$probes['i'];
var input = probe.element;
var model = probe.directive(NgModel);
model.converter = new LowercaseValueParser();
@@ -1606,11 +1610,10 @@ void main() {
});
}
-@Controller(
- selector: '[no-love]',
- publishAs: 'ctrl')
-class ControllerWithNoLove {
- var apathy = null;
+@Component(
+ selector: 'no-love',
+ template: '')
+class ComponentWithNoLove {
}
class LowercaseValueParser implements NgModelConverter {
diff --git a/test/directive/ng_model_validators_spec.dart b/test/directive/ng_model_validators_spec.dart
index 3aa9d54ee..b278bfb45 100644
--- a/test/directive/ng_model_validators_spec.dart
+++ b/test/directive/ng_model_validators_spec.dart
@@ -22,7 +22,7 @@ void main() {
describe('required', () {
it('should validate the input field if the required attribute is set', (RootScope scope) {
_.compile('');
- Probe probe = _.rootScope.context['i'];
+ Probe probe = _.rootScope.context.$probes['i'];
var model = probe.directive(NgModel);
model.validate();
@@ -30,7 +30,7 @@ void main() {
expect(model.invalid).toEqual(true);
_.rootScope.apply(() {
- _.rootScope.context['val'] = 'value';
+ _.rootScope.context.val = 'value';
});
expect(model.valid).toEqual(true);
@@ -40,7 +40,7 @@ void main() {
it('should validate a number input field if the required attribute is set', (RootScope scope) {
_.compile('');
- Probe probe = _.rootScope.context['i'];
+ Probe probe = _.rootScope.context.$probes['i'];
var model = probe.directive(NgModel);
_.rootScope.apply();
@@ -49,7 +49,7 @@ void main() {
expect(model.invalid).toEqual(true);
_.rootScope.apply(() {
- _.rootScope.context['val'] = 5;
+ _.rootScope.context.val = 5;
});
expect(model.valid).toEqual(true);
@@ -59,7 +59,7 @@ void main() {
it('should validate the input field depending on if ng-required is true', (RootScope scope) {
_.compile('');
- Probe probe = _.rootScope.context['i'];
+ Probe probe = _.rootScope.context.$probes['i'];
var model = probe.directive(NgModel);
_.rootScope.apply();
@@ -69,7 +69,7 @@ void main() {
expect(model.invalid).toEqual(false);
_.rootScope.apply(() {
- _.rootScope.context['requireMe'] = true;
+ _.rootScope.context.requireMe = true;
});
model.validate();
@@ -77,7 +77,7 @@ void main() {
expect(model.invalid).toEqual(true);
_.rootScope.apply(() {
- _.rootScope.context['requireMe'] = false;
+ _.rootScope.context.requireMe = false;
});
model.validate();
@@ -89,21 +89,21 @@ void main() {
describe('[type="url"]', () {
it('should validate the input field given a valid or invalid URL', (RootScope scope) {
_.compile('');
- Probe probe = _.rootScope.context['i'];
+ Probe probe = _.rootScope.context.$probes['i'];
var model = probe.directive(NgModel);
expect(model.valid).toEqual(true);
expect(model.invalid).toEqual(false);
_.rootScope.apply(() {
- _.rootScope.context['val'] = 'googledotcom';
+ _.rootScope.context.val = 'googledotcom';
});
expect(model.valid).toEqual(false);
expect(model.invalid).toEqual(true);
_.rootScope.apply(() {
- _.rootScope.context['val'] = 'http://www.google.com';
+ _.rootScope.context.val = 'http://www.google.com';
});
expect(model.valid).toEqual(true);
@@ -114,7 +114,7 @@ void main() {
describe('[type="email"]', () {
it('should validate the input field given a valid or invalid email address', (RootScope scope) {
_.compile('');
- Probe probe = _.rootScope.context['i'];
+ Probe probe = _.rootScope.context.$probes['i'];
var model = probe.directive(NgModel);
model.validate();
@@ -122,7 +122,7 @@ void main() {
expect(model.invalid).toEqual(false);
_.rootScope.apply(() {
- _.rootScope.context['val'] = 'matiasatemail.com';
+ _.rootScope.context.val = 'matiasatemail.com';
});
model.validate();
@@ -130,7 +130,7 @@ void main() {
expect(model.invalid).toEqual(true);
_.rootScope.apply(() {
- _.rootScope.context['val'] = 'matias@gmail.com';
+ _.rootScope.context.val = 'matias@gmail.com';
});
model.validate();
@@ -145,7 +145,7 @@ void main() {
(type) {
_.compile('');
- Probe probe = _.rootScope.context['i'];
+ Probe probe = _.rootScope.context.$probes['i'];
var model = probe.directive(NgModel);
model.validate();
@@ -153,7 +153,7 @@ void main() {
expect(model.invalid).toEqual(false);
_.rootScope.apply(() {
- _.rootScope.context['val'] = '11';
+ _.rootScope.context.val = '11';
});
model.validate();
@@ -162,7 +162,7 @@ void main() {
_.rootScope.apply(() {
- _.rootScope.context['val'] = 10;
+ _.rootScope.context.val = 10;
});
model.validate();
@@ -170,7 +170,7 @@ void main() {
expect(model.invalid).toEqual(false);
_.rootScope.apply(() {
- _.rootScope.context['val'] = 'twelve';
+ _.rootScope.context.val = 'twelve';
});
model.validate();
@@ -183,11 +183,11 @@ void main() {
(type) {
_.compile('');
- Probe probe = _.rootScope.context['i'];
+ Probe probe = _.rootScope.context.$probes['i'];
var model = probe.directive(NgModel);
_.rootScope.apply(() {
- _.rootScope.context['val'] = "8";
+ _.rootScope.context.val = "8";
});
model.validate();
@@ -196,7 +196,7 @@ void main() {
expect(model.hasErrorState('ng-max')).toBe(false);
_.rootScope.apply(() {
- _.rootScope.context['val'] = "99";
+ _.rootScope.context.val = "99";
});
model.validate();
@@ -205,7 +205,7 @@ void main() {
expect(model.hasErrorState('ng-max')).toBe(true);
_.rootScope.apply(() {
- _.rootScope.context['val'] = "a";
+ _.rootScope.context.val = "a";
});
model.validate();
@@ -220,7 +220,7 @@ void main() {
(type) {
_.compile('');
- Probe probe = _.rootScope.context['i'];
+ Probe probe = _.rootScope.context.$probes['i'];
var model = probe.directive(NgModel);
//should be valid even when no number is present
@@ -230,7 +230,7 @@ void main() {
expect(model.hasErrorState('ng-max')).toBe(false);
_.rootScope.apply(() {
- _.rootScope.context['val'] = "20";
+ _.rootScope.context.val = "20";
});
model.validate();
@@ -239,7 +239,7 @@ void main() {
expect(model.hasErrorState('ng-max')).toBe(false);
_.rootScope.apply(() {
- _.rootScope.context['maxVal'] = "19";
+ _.rootScope.context.maxVal = "19";
});
model.validate();
@@ -248,7 +248,7 @@ void main() {
expect(model.hasErrorState('ng-max')).toBe(true);
_.rootScope.apply(() {
- _.rootScope.context['maxVal'] = "22";
+ _.rootScope.context.maxVal = "22";
});
model.validate();
@@ -262,11 +262,11 @@ void main() {
(type) {
_.compile('');
- Probe probe = _.rootScope.context['i'];
+ Probe probe = _.rootScope.context.$probes['i'];
var model = probe.directive(NgModel);
_.rootScope.apply(() {
- _.rootScope.context['val'] = "8";
+ _.rootScope.context.val = "8";
});
model.validate();
@@ -275,7 +275,7 @@ void main() {
expect(model.hasErrorState('ng-min')).toBe(false);
_.rootScope.apply(() {
- _.rootScope.context['val'] = "-20";
+ _.rootScope.context.val = "-20";
});
model.validate();
@@ -284,7 +284,7 @@ void main() {
expect(model.hasErrorState('ng-min')).toBe(true);
_.rootScope.apply(() {
- _.rootScope.context['val'] = "x";
+ _.rootScope.context.val = "x";
});
model.validate();
@@ -299,7 +299,7 @@ void main() {
(type) {
_.compile('');
- Probe probe = _.rootScope.context['i'];
+ Probe probe = _.rootScope.context.$probes['i'];
var model = probe.directive(NgModel);
//should be valid even when no number is present
@@ -309,7 +309,7 @@ void main() {
expect(model.hasErrorState('ng-min')).toBe(false);
_.rootScope.apply(() {
- _.rootScope.context['val'] = "5";
+ _.rootScope.context.val = "5";
});
model.validate();
@@ -318,7 +318,7 @@ void main() {
expect(model.hasErrorState('ng-min')).toBe(false);
_.rootScope.apply(() {
- _.rootScope.context['minVal'] = "5.5";
+ _.rootScope.context.minVal = "5.5";
});
model.validate();
@@ -327,7 +327,7 @@ void main() {
expect(model.hasErrorState('ng-min')).toBe(true);
_.rootScope.apply(() {
- _.rootScope.context['val'] = "5.6";
+ _.rootScope.context.val = "5.6";
});
model.validate();
@@ -340,7 +340,7 @@ void main() {
describe('pattern', () {
it('should validate the input field if a ng-pattern attribute is provided', (RootScope scope) {
_.compile('');
- Probe probe = _.rootScope.context['i'];
+ Probe probe = _.rootScope.context.$probes['i'];
var model = probe.directive(NgModel);
model.validate();
@@ -348,8 +348,8 @@ void main() {
expect(model.invalid).toEqual(false);
_.rootScope.apply(() {
- _.rootScope.context['val'] = "abc";
- _.rootScope.context['myPattern'] = "[a-z]+";
+ _.rootScope.context.val = "abc";
+ _.rootScope.context.myPattern = "[a-z]+";
});
model.validate();
@@ -357,8 +357,8 @@ void main() {
expect(model.invalid).toEqual(false);
_.rootScope.apply(() {
- _.rootScope.context['val'] = "abc";
- _.rootScope.context['myPattern'] = "[0-9]+";
+ _.rootScope.context.val = "abc";
+ _.rootScope.context.myPattern = "[0-9]+";
});
model.validate();
@@ -366,8 +366,8 @@ void main() {
expect(model.invalid).toEqual(true);
_.rootScope.apply(() {
- _.rootScope.context['val'] = "123";
- _.rootScope.context['myPattern'] = "123";
+ _.rootScope.context.val = "123";
+ _.rootScope.context.myPattern = "123";
});
model.validate();
@@ -377,7 +377,7 @@ void main() {
it('should validate the input field if a pattern attribute is provided', (RootScope scope) {
_.compile('');
- Probe probe = _.rootScope.context['i'];
+ Probe probe = _.rootScope.context.$probes['i'];
var model = probe.directive(NgModel);
model.validate();
@@ -385,7 +385,7 @@ void main() {
expect(model.invalid).toEqual(false);
_.rootScope.apply(() {
- _.rootScope.context['val'] = "abc";
+ _.rootScope.context.val = "abc";
});
model.validate();
@@ -393,7 +393,7 @@ void main() {
expect(model.invalid).toEqual(true);
_.rootScope.apply(() {
- _.rootScope.context['val'] = "012345";
+ _.rootScope.context.val = "012345";
});
model.validate();
@@ -401,7 +401,7 @@ void main() {
expect(model.invalid).toEqual(false);
_.rootScope.apply(() {
- _.rootScope.context['val'] = "6789";
+ _.rootScope.context.val = "6789";
});
model.validate();
@@ -413,7 +413,7 @@ void main() {
describe('minlength', () {
it('should validate the input field if a minlength attribute is provided', (RootScope scope) {
_.compile('');
- Probe probe = _.rootScope.context['i'];
+ Probe probe = _.rootScope.context.$probes['i'];
var model = probe.directive(NgModel);
model.validate();
@@ -421,7 +421,7 @@ void main() {
expect(model.invalid).toEqual(false);
_.rootScope.apply(() {
- _.rootScope.context['val'] = "abc";
+ _.rootScope.context.val = "abc";
});
model.validate();
@@ -429,7 +429,7 @@ void main() {
expect(model.invalid).toEqual(true);
_.rootScope.apply(() {
- _.rootScope.context['val'] = "abcdef";
+ _.rootScope.context.val = "abcdef";
});
model.validate();
@@ -439,7 +439,7 @@ void main() {
it('should validate the input field if a ng-minlength attribute is provided', (RootScope scope) {
_.compile('');
- Probe probe = _.rootScope.context['i'];
+ Probe probe = _.rootScope.context.$probes['i'];
var model = probe.directive(NgModel);
model.validate();
@@ -447,8 +447,8 @@ void main() {
expect(model.invalid).toEqual(false);
_.rootScope.apply(() {
- _.rootScope.context['val'] = "abcdef";
- _.rootScope.context['len'] = 3;
+ _.rootScope.context.val = "abcdef";
+ _.rootScope.context.len = 3;
});
model.validate();
@@ -456,8 +456,8 @@ void main() {
expect(model.invalid).toEqual(false);
_.rootScope.apply(() {
- _.rootScope.context['val'] = "abc";
- _.rootScope.context['len'] = 5;
+ _.rootScope.context.val = "abc";
+ _.rootScope.context.len = 5;
});
model.validate();
@@ -469,7 +469,7 @@ void main() {
describe('maxlength', () {
it('should validate the input field if a maxlength attribute is provided', (RootScope scope) {
_.compile('');
- Probe probe = _.rootScope.context['i'];
+ Probe probe = _.rootScope.context.$probes['i'];
var model = probe.directive(NgModel);
model.validate();
@@ -477,7 +477,7 @@ void main() {
expect(model.invalid).toEqual(false);
_.rootScope.apply(() {
- _.rootScope.context['val'] = "abcdef";
+ _.rootScope.context.val = "abcdef";
});
model.validate();
@@ -485,7 +485,7 @@ void main() {
expect(model.invalid).toEqual(true);
_.rootScope.apply(() {
- _.rootScope.context['val'] = "abc";
+ _.rootScope.context.val = "abc";
});
model.validate();
@@ -495,7 +495,7 @@ void main() {
it('should validate the input field if a ng-maxlength attribute is provided', (RootScope scope) {
_.compile('');
- Probe probe = _.rootScope.context['i'];
+ Probe probe = _.rootScope.context.$probes['i'];
var model = probe.directive(NgModel);
model.validate();
@@ -503,8 +503,8 @@ void main() {
expect(model.invalid).toEqual(false);
_.rootScope.apply(() {
- _.rootScope.context['val'] = "abcdef";
- _.rootScope.context['len'] = 6;
+ _.rootScope.context.val = "abcdef";
+ _.rootScope.context.len = 6;
});
model.validate();
@@ -512,8 +512,8 @@ void main() {
expect(model.invalid).toEqual(false);
_.rootScope.apply(() {
- _.rootScope.context['val'] = "abc";
- _.rootScope.context['len'] = 1;
+ _.rootScope.context.val = "abc";
+ _.rootScope.context.len = 1;
});
model.validate();
@@ -528,21 +528,21 @@ void main() {
scope = _.rootScope;
build = (attr, type) {
input = _.compile('');
- model = scope.context['p'].directive(NgModel);
+ model = scope.context.$probes['p'].directive(NgModel);
};
});
it('ng-required', () {
var input = build('ng-required', 'text');
scope.apply(() {
- scope.context['attr'] = true;
- scope.context['value'] = '';
+ scope.context.attr = true;
+ scope.context.value = '';
});
expect(model.valid).toBe(false);
scope.apply(() {
- scope.context['attr'] = false;
+ scope.context.attr = false;
});
expect(model.valid).toBe(true);
@@ -551,14 +551,14 @@ void main() {
it('ng-pattern', () {
var input = build('ng-pattern', 'text');
scope.apply(() {
- scope.context['attr'] = '^\d+\$';
- scope.context['value'] = 'abc';
+ scope.context.attr = '^\d+\$';
+ scope.context.value = 'abc';
});
expect(model.valid).toBe(false);
scope.apply(() {
- scope.context['attr'] = null;
+ scope.context.attr = null;
});
expect(model.valid).toBe(true);
@@ -567,14 +567,14 @@ void main() {
it('ng-minlength', () {
var input = build('ng-minlength', 'text');
scope.apply(() {
- scope.context['attr'] = '10';
- scope.context['value'] = 'abc';
+ scope.context.attr = '10';
+ scope.context.value = 'abc';
});
expect(model.valid).toBe(false);
scope.apply(() {
- scope.context['attr'] = null;
+ scope.context.attr = null;
});
expect(model.valid).toBe(true);
@@ -583,14 +583,14 @@ void main() {
it('ng-minlength', () {
var input = build('ng-maxlength', 'text');
scope.apply(() {
- scope.context['attr'] = '3';
- scope.context['value'] = 'abcd';
+ scope.context.attr = '3';
+ scope.context.value = 'abcd';
});
expect(model.valid).toBe(false);
scope.apply(() {
- scope.context['attr'] = null;
+ scope.context.attr = null;
});
expect(model.valid).toBe(true);
@@ -599,14 +599,14 @@ void main() {
it('ng-min', () {
var input = build('ng-min', 'number');
scope.apply(() {
- scope.context['attr'] = '5.0';
- scope.context['value'] = 3;
+ scope.context.attr = '5.0';
+ scope.context.value = 3;
});
expect(model.valid).toBe(false);
scope.apply(() {
- scope.context['attr'] = null;
+ scope.context.attr = null;
});
expect(model.valid).toBe(true);
@@ -615,18 +615,18 @@ void main() {
it('ng-max', () {
var input = build('ng-max', 'number');
scope.apply(() {
- scope.context['attr'] = '5.0';
- scope.context['value'] = 8;
+ scope.context.attr = '5.0';
+ scope.context.value = 8;
});
expect(model.valid).toBe(false);
scope.apply(() {
- scope.context['attr'] = null;
+ scope.context.attr = null;
});
expect(model.valid).toBe(true);
});
- });
+ });
});
}
diff --git a/test/directive/ng_non_bindable_spec.dart b/test/directive/ng_non_bindable_spec.dart
index a2ec3fb3d..989050161 100644
--- a/test/directive/ng_non_bindable_spec.dart
+++ b/test/directive/ng_non_bindable_spec.dart
@@ -20,8 +20,8 @@ main() {
' ' +
'Wait, Dart is loading this awesome app...
-
+
diff --git a/lib/application.dart b/lib/application.dart
index 56ee41488..32adf89a0 100644
--- a/lib/application.dart
+++ b/lib/application.dart
@@ -8,15 +8,9 @@
* import 'package:angular/angular.dart';
* import 'package:angular/application_factory.dart';
*
- * class MyModule extends Module {
- * MyModule() {
- * bind(HelloWorldController);
- * }
- * }
- *
* main() {
* applicationFactory()
- * .addModule(new MyModule())
+ * .rootContextType(HelloWorldController)
* .run();
* }
*
@@ -159,6 +153,11 @@ abstract class Application {
return this;
}
+ Application rootContextType(Type rootContext) {
+ modules.add(new Module()..bind(Object, toImplementation: rootContext));
+ return this;
+ }
+
Injector run() {
publishToJavaScript();
return zone.run(() {
diff --git a/lib/application_factory.dart b/lib/application_factory.dart
index 25b95cd40..4971042ef 100644
--- a/lib/application_factory.dart
+++ b/lib/application_factory.dart
@@ -51,7 +51,6 @@ import 'dart:html';
metaTargets: const [
Injectable,
Decorator,
- Controller,
Component,
Formatter
])
diff --git a/lib/application_factory_static.dart b/lib/application_factory_static.dart
index 3379177ff..ad663a4f7 100644
--- a/lib/application_factory_static.dart
+++ b/lib/application_factory_static.dart
@@ -11,15 +11,9 @@
* import 'package:angular/angular.dart';
* import 'package:angular/application_factory_static.dart';
*
- * class MyModule extends Module {
- * MyModule() {
- * bind(HelloWorldController);
- * }
- * }
- *
* main() {
* staticApplicationFactory()
- * .addModule(new MyModule())
+ * .rootContextType(HelloWorldController)
* .run();
* }
*
@@ -56,7 +50,8 @@ class _StaticApplication extends Application {
ngModule
..bind(MetadataExtractor, toValue: new StaticMetadataExtractor(metadata))
..bind(FieldGetterFactory, toValue: new StaticFieldGetterFactory(fieldGetters))
- ..bind(ClosureMap, toValue: new StaticClosureMap(fieldGetters, fieldSetters, symbols));
+ ..bind(ClosureMap, toFactory: (_) =>
+ new StaticClosureMap(fieldGetters, fieldSetters, symbols));
}
Injector createInjector() =>
@@ -64,32 +59,31 @@ class _StaticApplication extends Application {
}
/**
- * Bootstraps Angular as part of the `main()` function.
- *
- * `staticApplication()` replaces `dynamicApplication()` in the main function during pub build,
- * and is populated with the getters, setters, annotations, and factories generated by
- * Angular's transformers for dart2js compilation. It is not typically called directly.
- *
- * For example,
- *
- * main() {
- * applicationFactory()
- * .addModule(new Module()..bind(HelloWorld))
- * .run();
- * }
- *
- * becomes:
- *
- * main() {
- * staticApplication(generated_static_injector.factories,
- * generated_static_metadata.typeAnnotations,
- * generated_static_expressions.getters,
- * generated_static_expressions.setters,
- * generated_static_expressions.symbols)
- * .addModule(new Module()..bind(HelloWorldController))
- * .run();
- *
- */
+* Bootstraps Angular as part of the `main()` function.
+*
+* `staticApplication()` replaces `dynamicApplication()` in the main function during pub build,
+* and is populated with the getters, setters, annotations, and factories generated by
+* Angular's transformers for dart2js compilation. It is not typically called directly.
+*
+* For example,
+*
+* main() {
+* applicationFactory()
+* .rootContextType(HelloWorld)
+* .run();
+* }
+*
+* becomes:
+*
+* main() {
+* staticApplication(generated_static_injector.factories,
+* generated_static_metadata.typeAnnotations,
+* generated_static_expressions.getters,
+* generated_static_expressions.setters,
+* generated_static_expressions.symbols)
+* .rootContextType(HelloWorld)
+* .run();
+*/
Application staticApplicationFactory(
Map typeFactories,
Map metadata,
diff --git a/lib/change_detection/context_locals.dart b/lib/change_detection/context_locals.dart
new file mode 100644
index 000000000..05098d68a
--- /dev/null
+++ b/lib/change_detection/context_locals.dart
@@ -0,0 +1,24 @@
+part of angular.watch_group;
+
+class ContextLocals {
+ final Map _locals = {};
+
+ final Object _parentContext;
+ Object get parentContext => _parentContext;
+
+ ContextLocals(this._parentContext, [Map locals = null]) {
+ assert(_parentContext != null);
+ if (locals != null) _locals.addAll(locals);
+ }
+
+ static ContextLocals wrapper(context, Map locals) =>
+ new ContextLocals(context, locals);
+
+ bool hasProperty(String prop) => _locals.containsKey(prop);
+
+ void operator[]=(String prop, value) {
+ _locals[prop] = value;
+ }
+
+ dynamic operator[](String prop) => _locals[prop];
+}
diff --git a/lib/change_detection/dirty_checking_change_detector.dart b/lib/change_detection/dirty_checking_change_detector.dart
index 867a302c5..adb54e0d6 100644
--- a/lib/change_detection/dirty_checking_change_detector.dart
+++ b/lib/change_detection/dirty_checking_change_detector.dart
@@ -2,6 +2,7 @@ library dirty_checking_change_detector;
import 'dart:collection';
import 'package:angular/change_detection/change_detection.dart';
+import 'package:angular/change_detection/watch_group.dart';
/**
* [DirtyCheckingChangeDetector] determines which object properties have changed
@@ -369,7 +370,7 @@ class _ChangeIterator implements Iterator>{
* removing efficient. [DirtyCheckingRecord] also has a [nextChange] field which
* creates a single linked list of all of the changes for efficient traversal.
*/
-class DirtyCheckingRecord implements Record, WatchRecord {
+class DirtyCheckingRecord implements WatchRecord {
static const List _MODE_NAMES = const [
'MARKER',
'NOOP',
@@ -423,9 +424,10 @@ class DirtyCheckingRecord implements Record, WatchRecord {
* [DirtyCheckingRecord] into different access modes. If Object it sets up
* reflection. If [Map] then it sets up map accessor.
*/
- void set object(obj) {
- _object = obj;
- if (obj == null) {
+ void set object(Object object) {
+ _object = object;
+
+ if (object == null) {
_mode = _MODE_IDENTITY_;
_getter = null;
return;
@@ -433,7 +435,8 @@ class DirtyCheckingRecord implements Record, WatchRecord {
if (field == null) {
_getter = null;
- if (obj is Map) {
+
+ if (object is Map) {
if (_mode != _MODE_MAP_) {
_mode = _MODE_MAP_;
currentValue = new _MapChangeRecord();
@@ -445,8 +448,7 @@ class DirtyCheckingRecord implements Record, WatchRecord {
// new reference.
currentValue._revertToPreviousState();
}
-
- } else if (obj is Iterable) {
+ } else if (object is Iterable) {
if (_mode != _MODE_ITERABLE_) {
_mode = _MODE_ITERABLE_;
currentValue = new _CollectionChangeRecord();
@@ -465,13 +467,17 @@ class DirtyCheckingRecord implements Record, WatchRecord {
return;
}
- if (obj is Map) {
- _mode = _MODE_MAP_FIELD_;
- _getter = null;
- } else {
- _mode = _MODE_GETTER_OR_METHOD_CLOSURE_;
- _getter = _fieldGetterFactory.getter(obj, field);
+ while (object is ContextLocals) {
+ var ctx = object as ContextLocals;
+ if (ctx.hasProperty(field)) {
+ _mode = _MODE_MAP_FIELD_;
+ _getter = null;
+ return;
+ }
+ object = ctx.parentContext;
}
+ _mode = _MODE_GETTER_OR_METHOD_CLOSURE_;
+ _getter = _fieldGetterFactory.getter(object, field);
}
bool check() {
diff --git a/lib/change_detection/prototype_map.dart b/lib/change_detection/prototype_map.dart
deleted file mode 100644
index 130444184..000000000
--- a/lib/change_detection/prototype_map.dart
+++ /dev/null
@@ -1,37 +0,0 @@
-part of angular.watch_group;
-
-class PrototypeMap implements Map {
- final Map prototype;
- final Map self = new Map();
-
- PrototypeMap(this.prototype);
-
- void operator []=(name, value) {
- self[name] = value;
- }
- V operator [](name) => self.containsKey(name) ? self[name] : prototype[name];
-
- bool get isEmpty => self.isEmpty && prototype.isEmpty;
- bool get isNotEmpty => self.isNotEmpty || prototype.isNotEmpty;
- // todo(vbe) include prototype keys ?
- Iterable get keys => self.keys;
- // todo(vbe) include prototype values ?
- Iterable get values => self.values;
- int get length => self.length;
-
- void forEach(fn) {
- // todo(vbe) include prototype ?
- self.forEach(fn);
- }
- V remove(key) => self.remove(key);
- clear() => self.clear;
- // todo(vbe) include prototype ?
- bool containsKey(key) => self.containsKey(key);
- // todo(vbe) include prototype ?
- bool containsValue(key) => self.containsValue(key);
- void addAll(map) {
- self.addAll(map);
- }
- // todo(vbe) include prototype ?
- V putIfAbsent(key, fn) => self.putIfAbsent(key, fn);
-}
diff --git a/lib/change_detection/watch_group.dart b/lib/change_detection/watch_group.dart
index 14d327d5f..c6cb65dcd 100644
--- a/lib/change_detection/watch_group.dart
+++ b/lib/change_detection/watch_group.dart
@@ -4,7 +4,7 @@ import 'package:angular/change_detection/change_detection.dart';
part 'linked_list.dart';
part 'ast.dart';
-part 'prototype_map.dart';
+part 'context_locals.dart';
/**
* A function that is notified of changes to the model.
@@ -774,24 +774,31 @@ class _EvalWatchRecord implements WatchRecord<_Handler> {
get object => _object;
- set object(value) {
+ void set object(object) {
assert(mode != _MODE_DELETED_);
assert(mode != _MODE_MARKER_);
assert(mode != _MODE_FUNCTION_);
assert(mode != _MODE_PURE_FUNCTION_);
assert(mode != _MODE_PURE_FUNCTION_APPLY_);
- _object = value;
+ _object = object;
- if (value == null) {
+ if (object == null) {
mode = _MODE_NULL_;
+ } else if (object is Map) {
+ mode = _MODE_MAP_CLOSURE_;
} else {
- if (value is Map) {
- mode = _MODE_MAP_CLOSURE_;
- } else {
- mode = _MODE_FIELD_OR_METHOD_CLOSURE_;
- fn = _fieldGetterFactory.getter(value, name);
+ while (object is ContextLocals) {
+ var ctx = object as ContextLocals;
+ if (ctx.hasProperty(name)) {
+ mode = _MODE_MAP_CLOSURE_;
+ return;
+ }
+ object = ctx.parentContext;
}
+ mode = _MODE_FIELD_OR_METHOD_CLOSURE_;
+ fn = _fieldGetterFactory.getter(object, name);
}
+
}
bool check() {
diff --git a/lib/core/annotation.dart b/lib/core/annotation.dart
index 768def9aa..dcd2f23fd 100644
--- a/lib/core/annotation.dart
+++ b/lib/core/annotation.dart
@@ -15,7 +15,6 @@ export "package:angular/core/annotation_src.dart" show
Directive,
Component,
- Controller,
Decorator,
DirectiveAnnotation,
diff --git a/lib/core/annotation_src.dart b/lib/core/annotation_src.dart
index a8c1fb043..32bbd3ed4 100644
--- a/lib/core/annotation_src.dart
+++ b/lib/core/annotation_src.dart
@@ -34,7 +34,7 @@ class Injectable {
}
/**
- * Abstract supper class of [Controller], [Component], and [Decorator].
+ * Abstract supper class of [Component], and [Decorator].
*/
abstract class Directive {
@@ -301,14 +301,6 @@ class Component extends Directive {
}
final bool _resetStyleInheritance;
- /**
- * An expression under which the component's controller instance will be
- * published into. This allows the expressions in the template to be referring
- * to controller instance and its properties.
- */
- @deprecated
- final String publishAs;
-
/**
* If set to true, this component will always use shadow DOM.
* If set to false, this component will never use shadow DOM.
@@ -322,7 +314,6 @@ class Component extends Directive {
cssUrl,
applyAuthorStyles,
resetStyleInheritance,
- this.publishAs,
module,
map,
selector,
@@ -352,7 +343,6 @@ class Component extends Directive {
cssUrl: cssUrls,
applyAuthorStyles: applyAuthorStyles,
resetStyleInheritance: resetStyleInheritance,
- publishAs: publishAs,
map: newMap,
module: module,
selector: selector,
@@ -402,62 +392,6 @@ class Decorator extends Directive {
exportExpressionAttrs: exportExpressionAttrs);
}
-/**
- * Annotation placed on a class which should act as a controller for your
- * application.
- *
- * Controllers are essentially [Decorator]s with few key differences:
- *
- * * Controllers create a new scope at the element.
- * * Controllers should not do any DOM manipulation.
- * * Controllers are meant for application-logic
- * (rather then DOM manipulation logic which directives are meant for.)
- *
- * Controllers can implement [AttachAware], [DetachAware] and
- * declare these optional methods:
- *
- * * `attach()` - Called on first [Scope.apply()].
- * * `detach()` - Called on when owning scope is destroyed.
- */
-@deprecated
-class Controller extends Decorator {
- /**
- * An expression under which the controller instance will be published into.
- * This allows the expressions in the template to be referring to controller
- * instance and its properties.
- */
- final String publishAs;
-
- const Controller({
- children: Directive.COMPILE_CHILDREN,
- this.publishAs,
- map,
- module,
- selector,
- visibility,
- exportExpressions,
- exportExpressionAttrs
- })
- : super(selector: selector,
- children: children,
- visibility: visibility,
- map: map,
- module: module,
- exportExpressions: exportExpressions,
- exportExpressionAttrs: exportExpressionAttrs);
-
- Directive _cloneWithNewMap(newMap) =>
- new Controller(
- children: children,
- publishAs: publishAs,
- module: module,
- map: newMap,
- selector: selector,
- visibility: visibility,
- exportExpressions: exportExpressions,
- exportExpressionAttrs: exportExpressionAttrs);
-}
-
/**
* Abstract supper class of [NgAttr], [NgCallback], [NgOneWay], [NgOneWayOneTime], and [NgTwoWay].
*/
diff --git a/lib/core/module.dart b/lib/core/module.dart
index d4b3d6a24..0dd28d432 100644
--- a/lib/core/module.dart
+++ b/lib/core/module.dart
@@ -65,9 +65,10 @@ export "package:angular/core/module_internal.dart" show
Interpolate,
VmTurnZone,
WebPlatform,
- PrototypeMap,
RootScope,
+ ContextLocals,
Scope,
+ ScopeAware,
ScopeDigestTTL,
ScopeEvent,
ScopeStats,
diff --git a/lib/core/parser/dynamic_parser.dart b/lib/core/parser/dynamic_parser.dart
index 041ebb33d..6bacf45ee 100644
--- a/lib/core/parser/dynamic_parser.dart
+++ b/lib/core/parser/dynamic_parser.dart
@@ -1,7 +1,9 @@
library angular.core.parser.dynamic_parser;
import 'package:angular/core/annotation_src.dart' hide Formatter;
-import 'package:angular/core/module_internal.dart' show FormatterMap;
+import 'package:angular/core/module_internal.dart' show
+ FormatterMap,
+ ContextLocals;
import 'package:angular/core/parser/parser.dart';
import 'package:angular/core/parser/lexer.dart';
@@ -68,7 +70,7 @@ class DynamicExpression extends Expression {
@Injectable()
class DynamicParserBackend extends ParserBackend {
final ClosureMap _closures;
- DynamicParserBackend(this._closures);
+ DynamicParserBackend(ClosureMap _closures): _closures = new ClosureMapLocalsAware(_closures);
bool isAssignable(Expression expression) => expression.isAssignable;
@@ -137,3 +139,61 @@ class DynamicParserBackend extends ParserBackend {
}
}
+// todo(vicb) Would probably be better to remove this from the parser
+class ClosureMapLocalsAware implements ClosureMap {
+ final ClosureMap wrappedClsMap;
+
+ ClosureMapLocalsAware(this.wrappedClsMap);
+
+ Getter lookupGetter(String name) {
+ return (o) {
+ while (o is ContextLocals) {
+ var ctx = o as ContextLocals;
+ if (ctx.hasProperty(name)) return ctx[name];
+ o = ctx.parentContext;
+ }
+ var getter = wrappedClsMap.lookupGetter(name);
+ return getter(o);
+ };
+ }
+
+ Setter lookupSetter(String name) {
+ return (o, value) {
+ while (o is ContextLocals) {
+ var ctx = o as ContextLocals;
+ if (ctx.hasProperty(name)) return ctx[name] = value;
+ o = ctx.parentContext;
+ }
+ var setter = wrappedClsMap.lookupSetter(name);
+ return setter(o, value);
+ };
+ }
+
+ MethodClosure lookupFunction(String name, CallArguments arguments) {
+ return (o, pArgs, nArgs) {
+ while (o is ContextLocals) {
+ var ctx = o as ContextLocals;
+ if (ctx.hasProperty(name)) {
+ var fn = ctx[name];
+ if (fn is Function) {
+ var snArgs = {};
+ nArgs.forEach((name, value) {
+ var symbol = wrappedClsMap.lookupGetter(name);
+ snArgs[symbol] = value;
+ });
+ return Function.apply(fn, pArgs, snArgs);
+ } else {
+ throw "Property '$name' is not of type function.";
+ }
+ }
+ o = ctx.parentContext;
+ }
+ var fn = wrappedClsMap.lookupFunction(name, arguments);
+ return fn(o, pArgs, nArgs);
+ };
+ }
+
+ Symbol lookupSymbol(String name) => wrappedClsMap.lookupSymbol(name);
+}
+
+
diff --git a/lib/core/parser/eval_access.dart b/lib/core/parser/eval_access.dart
index 0fdfa61c0..34eb1cb29 100644
--- a/lib/core/parser/eval_access.dart
+++ b/lib/core/parser/eval_access.dart
@@ -38,22 +38,23 @@ class AccessKeyed extends syntax.AccessKeyed {
* where we have a pair of pre-compiled getter and setter functions that we
* use to do the access the field.
*/
+// todo(vicb) - parser should not depend on ContextLocals
abstract class AccessFast {
String get name;
Getter get getter;
Setter get setter;
- _eval(holder) {
+ dynamic _eval(holder) {
if (holder == null) return null;
- return (holder is Map) ? holder[name] : getter(holder);
+ return getter(holder);
}
- _assign(scope, holder, value) {
+ dynamic _assign(scope, holder, value) {
if (holder == null) {
_assignToNonExisting(scope, value);
return value;
} else {
- return (holder is Map) ? (holder[name] = value) : setter(holder, value);
+ return setter(holder, value);
}
}
diff --git a/lib/core/parser/parser_dynamic.dart b/lib/core/parser/parser_dynamic.dart
index 967db7bed..761cb3ca0 100644
--- a/lib/core/parser/parser_dynamic.dart
+++ b/lib/core/parser/parser_dynamic.dart
@@ -8,24 +8,14 @@ class DynamicClosureMap implements ClosureMap {
final Map symbols = {};
Getter lookupGetter(String name) {
var symbol = new Symbol(name);
- return (o) {
- if (o is Map) {
- return o[name];
- } else {
- return reflect(o).getField(symbol).reflectee;
- }
- };
+ return (o) => reflect(o).getField(symbol).reflectee;
}
Setter lookupSetter(String name) {
var symbol = new Symbol(name);
return (o, value) {
- if (o is Map) {
- return o[name] = value;
- } else {
- reflect(o).setField(symbol, value);
- return value;
- }
+ reflect(o).setField(symbol, value);
+ return value;
};
}
@@ -37,19 +27,10 @@ class DynamicClosureMap implements ClosureMap {
var symbol = symbols.putIfAbsent(name, () => new Symbol(name));
sNamedArgs[symbol] = value;
});
- if (o is Map) {
- var fn = o[name];
- if (fn is Function) {
- return Function.apply(fn, posArgs, sNamedArgs);
- } else {
- throw "Property '$name' is not of type function.";
- }
- } else {
- try {
- return reflect(o).invoke(symbol, posArgs, sNamedArgs).reflectee;
- } on NoSuchMethodError catch (e) {
- throw 'Undefined function $name';
- }
+ try {
+ return reflect(o).invoke(symbol, posArgs, sNamedArgs).reflectee;
+ } on NoSuchMethodError catch (e) {
+ throw 'Undefined function $name';
}
};
}
diff --git a/lib/core/parser/parser_static.dart b/lib/core/parser/parser_static.dart
index cf1c53255..84c99f557 100644
--- a/lib/core/parser/parser_static.dart
+++ b/lib/core/parser/parser_static.dart
@@ -27,16 +27,7 @@ class StaticClosureMap extends ClosureMap {
return (o, posArgs, namedArgs) {
var sNamedArgs = {};
namedArgs.forEach((name, value) => sNamedArgs[symbols[name]] = value);
- if (o is Map) {
- var fn = o[name];
- if (fn is Function) {
- return Function.apply(fn, posArgs, sNamedArgs);
- } else {
- throw "Property '$name' is not of type function.";
- }
- } else {
- return Function.apply(fn(o), posArgs, sNamedArgs);
- }
+ return Function.apply(fn(o), posArgs, sNamedArgs);
};
}
diff --git a/lib/core/parser/utils.dart b/lib/core/parser/utils.dart
index 82a898d7b..1105a4c63 100644
--- a/lib/core/parser/utils.dart
+++ b/lib/core/parser/utils.dart
@@ -80,6 +80,11 @@ getKeyed(object, key) {
} else if (object == null) {
throw new EvalError('Accessing null object');
} else {
+ while (object is ContextLocals) {
+ var ctx = object as ContextLocals;
+ if (ctx.hasProperty(key)) break;
+ object = ctx.parentContext;
+ }
return object[key];
}
}
@@ -93,6 +98,11 @@ setKeyed(object, key, value) {
} else if (object is Map) {
object["$key"] = value; // toString dangerous?
} else {
+ while (object is ContextLocals) {
+ var ctx = object as ContextLocals;
+ if (ctx.hasProperty(key)) break;
+ object = ctx.parentContext;
+ }
object[key] = value;
}
return value;
diff --git a/lib/core/scope.dart b/lib/core/scope.dart
index 145d55be9..6b52647d7 100644
--- a/lib/core/scope.dart
+++ b/lib/core/scope.dart
@@ -84,44 +84,34 @@ class ScopeDigestTTL {
ScopeDigestTTL.value(this.ttl);
}
-//TODO(misko): I don't think this should be in scope.
-class ScopeLocals implements Map {
- static wrapper(scope, Map locals) =>
- new ScopeLocals(scope, locals);
-
- Map _scope;
- Map _locals;
-
- ScopeLocals(this._scope, this._locals);
-
- void operator []=(String name, value) {
- _scope[name] = value;
- }
- dynamic operator [](String name) {
- // Map needed to clear Dart2js warning
- Map map = _locals.containsKey(name) ? _locals : _scope;
- return map[name];
- }
-
- bool get isEmpty => _scope.isEmpty && _locals.isEmpty;
- bool get isNotEmpty => _scope.isNotEmpty || _locals.isNotEmpty;
- List get keys => _scope.keys;
- List get values => _scope.values;
- int get length => _scope.length;
-
- void forEach(fn) {
- _scope.forEach(fn);
- }
- dynamic remove(key) => _scope.remove(key);
- void clear() {
- _scope.clear;
- }
- bool containsKey(key) => _scope.containsKey(key);
- bool containsValue(key) => _scope.containsValue(key);
- void addAll(map) {
- _scope.addAll(map);
- }
- dynamic putIfAbsent(key, fn) => _scope.putIfAbsent(key, fn);
+/**
+ * When a [Component] or the root context class implements [ScopeAware] the context setter will be
+ * called to set the [Scope] on this component.
+ *
+ * Typically classes implementing [ScopeAware] will declare a `Scope scope` property which will get
+ * initialized after the [Scope] is available. For this reason the `scope` property will not be
+ * initialized during the execution of the constructor - it will be immediately after.
+ *
+ * However if you need to execute some code as soon as the scope is available you should implement
+ * a `scope` setter:
+ *
+ * @Component(...)
+ * class MyComponent implements ScopeAware {
+ * Watch watch;
+ *
+ * MyComponent(Dependency myDep) {
+ * // It is an error to add a Scope / RootScope argument to the ctor and will result in a DI
+ * // circular dependency error - the scope is never accessible in the class constructor
+ * }
+ *
+ * void set scope(Scope scope) {
+ * // This setter gets called to initialize the scope
+ * watch = scope.rootScope.watch("expression", (v, p) => ...);
+ * }
+ * }
+ */
+abstract class ScopeAware {
+ void set scope(Scope scope);
}
/**
@@ -186,7 +176,10 @@ class Scope {
Scope(Object this.context, this.rootScope, this._parentScope,
this._readWriteGroup, this._readOnlyGroup, this.id,
- this._stats);
+ this._stats)
+ {
+ if (context is ScopeAware) (context as ScopeAware).scope = this;
+ }
/**
* Use [watch] to set up change detection on an expression.
@@ -252,8 +245,8 @@ class Scope {
expression is String ||
expression is Function);
if (expression is String && expression.isNotEmpty) {
- var obj = locals == null ? context : new ScopeLocals(context, locals);
- return rootScope._parser(expression).eval(obj);
+ var ctx = locals == null ? context : new ContextLocals(context, locals);
+ return rootScope._parser(expression).eval(ctx);
}
assert(locals == null);
@@ -296,8 +289,8 @@ class Scope {
var child = new Scope(childContext, rootScope, this,
_readWriteGroup.newGroup(childContext),
_readOnlyGroup.newGroup(childContext),
- '$id:${_childScopeNextId++}',
- _stats);
+ '$id:${_childScopeNextId++}',
+ _stats);
var prev = _childTail;
child._prev = prev;
diff --git a/lib/core_dom/common.dart b/lib/core_dom/common.dart
index a60a050ee..ca982f99d 100644
--- a/lib/core_dom/common.dart
+++ b/lib/core_dom/common.dart
@@ -39,7 +39,7 @@ Injector forceNewDirectivesAndFormatters(Injector injector, List modules
modules.add(new Module()
..bind(Scope, toFactory: (i) {
var scope = i.parent.get(Scope);
- return scope.createChild(new PrototypeMap(scope.context));
+ return scope.createChild(scope.context);
}));
return injector.createChild(modules,
diff --git a/lib/core_dom/element_binder.dart b/lib/core_dom/element_binder.dart
index 79be68c1c..5ff18e144 100644
--- a/lib/core_dom/element_binder.dart
+++ b/lib/core_dom/element_binder.dart
@@ -121,7 +121,7 @@ class ElementBinder {
}
void _bindCallback(dstPathFn, controller, expression, scope) {
- dstPathFn.assign(controller, _parser(expression).bind(scope.context, ScopeLocals.wrapper));
+ dstPathFn.assign(controller, _parser(expression).bind(scope.context, ContextLocals.wrapper));
}
@@ -211,13 +211,9 @@ class ElementBinder {
probe.directives.add(directive);
assert((linkMapTimer = _perf.startTimer('ng.view.link.map', ref.type)) != false);
- if (ref.annotation is Controller) {
- scope.context[(ref.annotation as Controller).publishAs] = directive;
- }
-
- var tasks = new _TaskList(directive is AttachAware ? () {
- if (scope.isAttached) directive.attach();
- } : null);
+ var tasks = new _TaskList(directive is AttachAware ?
+ () {if (scope.isAttached) directive.attach();} :
+ null);
if (ref.mappings.isNotEmpty) {
if (nodeAttrs == null) nodeAttrs = new _AnchorAttrs(ref);
@@ -313,16 +309,11 @@ class ElementBinder {
directiveRefs.forEach((DirectiveRef ref) {
Directive annotation = ref.annotation;
- var visibility = ref.annotation.visibility;
- if (ref.annotation is Controller) {
- scope = scope.createChild(new PrototypeMap(scope.context));
- nodeModule.bind(Scope, toValue: scope);
- }
_createDirectiveFactories(ref, nodeModule, node, nodesAttrsDirectives, nodeAttrs,
- visibility);
- if (ref.annotation.module != null) {
- nodeModule.install(ref.annotation.module());
+ annotation.visibility);
+ if (annotation.module != null) {
+ nodeModule.install(annotation.module());
}
});
diff --git a/lib/core_dom/event_handler.dart b/lib/core_dom/event_handler.dart
index 1a0f5d9b5..e3ce28275 100644
--- a/lib/core_dom/event_handler.dart
+++ b/lib/core_dom/event_handler.dart
@@ -4,7 +4,7 @@ typedef void EventFunction(event);
/**
* [EventHandler] is responsible for handling events bound using on-* syntax
- * (i.e. `on-click="ctrl.doSomething();"`). The root of the application has an
+ * (i.e. `on-click="doSomething();"`). The root of the application has an
* EventHandler attached as does every [Component].
*
* Events bound within [Component] are handled by EventHandler attached to
@@ -16,12 +16,14 @@ typedef void EventFunction(event);
* Example:
*
* nodes;
- _Row(this.id);
+ _Row(this.id, this.scope, this.view);
}
diff --git a/lib/directive/ng_switch.dart b/lib/directive/ng_switch.dart
index c9aec1275..01d2193eb 100644
--- a/lib/directive/ng_switch.dart
+++ b/lib/directive/ng_switch.dart
@@ -57,56 +57,30 @@ part of angular.directive;
},
visibility: Directive.DIRECT_CHILDREN_VISIBILITY)
class NgSwitch {
- Map> cases = new Map>();
- List<_ViewScopePair> currentViews = <_ViewScopePair>[];
+ final _cases = >{'?': <_Case>[]};
+ final _currentViews = <_ViewRef>[];
Function onChange;
- final Scope scope;
+ final Scope _scope;
- NgSwitch(this.scope) {
- cases['?'] = <_Case>[];
- }
+ NgSwitch(this._scope);
- addCase(String value, ViewPort anchor, BoundViewFactory viewFactory) {
- cases.putIfAbsent(value, () => <_Case>[]);
- cases[value].add(new _Case(anchor, viewFactory));
+ void addCase(String value, ViewPort anchor, BoundViewFactory viewFactory) {
+ _cases.putIfAbsent(value, () => <_Case>[]).add(new _Case(anchor, viewFactory));
}
- set value(val) {
- currentViews
- ..forEach((_ViewScopePair pair) {
- pair.port.remove(pair.view);
- pair.scope.destroy();
- })
- ..clear();
+ void set value(val) {
+ _currentViews..forEach((_ViewRef view) => view.remove())
+ ..clear();
val = '!$val';
- (cases.containsKey(val) ? cases[val] : cases['?'])
- .forEach((_Case caze) {
- Scope childScope = scope.createChild(new PrototypeMap(scope.context));
- var view = caze.viewFactory(childScope);
- caze.anchor.insert(view);
- currentViews.add(new _ViewScopePair(view, caze.anchor,
- childScope));
- });
- if (onChange != null) {
- onChange();
- }
- }
-}
-
-class _ViewScopePair {
- final View view;
- final ViewPort port;
- final Scope scope;
-
- _ViewScopePair(this.view, this.port, this.scope);
-}
+ var cases = _cases.containsKey(val) ? _cases[val] : _cases['?'];
+ cases.forEach((_Case c) {
+ var childScope = _scope.createChild(_scope.context);
+ _currentViews.add(c.createView(childScope));
+ });
-class _Case {
- final ViewPort anchor;
- final BoundViewFactory viewFactory;
-
- _Case(this.anchor, this.viewFactory);
+ if (onChange != null) onChange();
+ }
}
@Decorator(
@@ -114,23 +88,46 @@ class _Case {
children: Directive.TRANSCLUDE_CHILDREN,
map: const {'.': '@value'})
class NgSwitchWhen {
- final NgSwitch ngSwitch;
- final ViewPort port;
- final BoundViewFactory viewFactory;
- final Scope scope;
+ final NgSwitch _ngSwitch;
+ final ViewPort _port;
+ final BoundViewFactory _viewFactory;
- NgSwitchWhen(this.ngSwitch, this.port, this.viewFactory, this.scope);
+ NgSwitchWhen(this._ngSwitch, this._port, this._viewFactory);
- set value(String value) => ngSwitch.addCase('!$value', port, viewFactory);
+ void set value(String value) => _ngSwitch.addCase('!$value', _port, _viewFactory);
}
@Decorator(
children: Directive.TRANSCLUDE_CHILDREN,
selector: '[ng-switch-default]')
class NgSwitchDefault {
-
- NgSwitchDefault(NgSwitch ngSwitch, ViewPort port,
- BoundViewFactory viewFactory, Scope scope) {
+ NgSwitchDefault(NgSwitch ngSwitch, ViewPort port, BoundViewFactory viewFactory) {
ngSwitch.addCase('?', port, viewFactory);
}
}
+
+class _ViewRef {
+ final View _view;
+ final ViewPort _port;
+ final Scope _scope;
+
+ _ViewRef(this._view, this._port, this._scope);
+
+ void remove() {
+ _port.remove(_view);
+ _scope.destroy();
+ }
+}
+
+class _Case {
+ final ViewPort port;
+ final BoundViewFactory viewFactory;
+
+ _Case(this.port, this.viewFactory);
+
+ _ViewRef createView(Scope scope) {
+ var view = viewFactory(scope);
+ port.insert(view);
+ return new _ViewRef(view, port, scope);
+ }
+}
diff --git a/lib/formatter/filter.dart b/lib/formatter/filter.dart
index 5cc8fe503..a47e8b9ee 100644
--- a/lib/formatter/filter.dart
+++ b/lib/formatter/filter.dart
@@ -1,8 +1,7 @@
part of angular.formatter_internal;
-// Too bad you can't stick typedef's inside a class.
-typedef bool _Predicate(e);
-typedef bool _Equals(a, b);
+typedef bool _PredicateFn(e);
+typedef bool _CompareFn(a, b);
/**
* Selects a subset of items from the provided [List] and returns it as a new
@@ -17,11 +16,11 @@ typedef bool _Equals(a, b);
*
* The expression can be of the following types:
*
- * - [String], [bool] and [num]:Â Only items in the list that directly
+ * - [String], [bool] and [num]:Â Only items in the list that directly
* match this expression, items that are Maps with any value matching this
* item, and items that are lists containing a matching items are returned.
*
- * - [Map]: This defines a pattern map. Filters specific properties on objects
+ * - [Map]: This defines a pattern map. Filters specific properties on objects
* contained in the input list. For example `{name:"M", phone:"1"}` predicate
* will return a list of items which have property `name` containing "M" and
* property `phone` containing "1". A special property name, `$`, can be used
@@ -29,25 +28,25 @@ typedef bool _Equals(a, b);
* That's equivalent to the simple substring match with a `String` as
* described above.
*
- * - [Function]:Â This allows you to supply a custom function to filter the
- * List. The function is called for each element of the List. The returned
+ * - [Function]:Â This allows you to supply a custom function to filter the
+ * List. The function is called for each element of the List. The returned
* List contains exactly those elements for which this function returned
* `true`.
*
*
* The comparator is optional and can be one of the following:
*
- * - `bool comparator(expected, actual)`:Â The function will be called with the
+ * - `bool comparator(expected, actual)`:Â The function will be called with the
* object value and the predicate value to compare and should return true if
* the item should be included in filtered result.
*
* - `true`:Â Specifies that only identical objects matching the expression
- * exactly should be considered matches. Two strings are considered identical
- * if they are equal. Two numbers are considered identical if they are either
- * equal or both are `NaN`. All other objects are identical iff
+ * exactly should be considered matches. Two strings are considered identical
+ * if they are equal. Two numbers are considered identical if they are either
+ * equal or both are `NaN`. All other objects are identical iff
* identical(expected, actual) is true.
*
- * - `false|null`:Â Specifies case insensitive substring matching.
+ * - `false|null`: Specifies case insensitive substring matching.
*
*
* # Example ([view in plunker](http://plnkr.co/edit/6Mxz6r?p=info)):
@@ -105,27 +104,30 @@ typedef bool _Equals(a, b);
@Formatter(name: 'filter')
class Filter implements Function {
Parser _parser;
- _Equals _comparator;
- _Equals _stringComparator;
+ _CompareFn _comparator;
+ _CompareFn _stringComparator;
static _nop(e) => e;
+
static _ensureBool(val) => (val is bool && val);
+
static _isSubstringCaseInsensitive(String a, String b) =>
a != null && b != null && a.toLowerCase().contains(b.toLowerCase());
+
static _identical(a, b) => identical(a, b) ||
(a is String && b is String && a == b) ||
(a is num && b is num && a.isNaN && b.isNaN);
Filter(this._parser);
- void _configureComparator(var comparatorExpression) {
+ void _configureComparator(comparatorExpression) {
if (comparatorExpression == null || comparatorExpression == false) {
_stringComparator = _isSubstringCaseInsensitive;
_comparator = _defaultComparator;
} else if (comparatorExpression == true) {
_stringComparator = _identical;
_comparator = _defaultComparator;
- } else if (comparatorExpression is _Equals) {
+ } else if (comparatorExpression is _CompareFn) {
_comparator = (a, b) => _ensureBool(comparatorExpression(a, b));
} else {
_comparator = null;
@@ -135,67 +137,58 @@ class Filter implements Function {
// Preconditions
// - what: NOT a Map
// - item: neither a Map nor a List
- bool _defaultComparator(var item, var what) {
- if (what == null) {
- return false;
- } else if (item == null) {
- return what == '';
- } else if (what is String && what.startsWith('!')) {
- return !_search(item, what.substring(1));
- } else if (item is String) {
- return (what is String) && _stringComparator(item, what);
- } else if (item is bool) {
+ bool _defaultComparator(item, what) {
+ if (what == null) return false;
+ if (item == null) return what == '';
+ if (what is String && what.startsWith('!')) return !_search(item, what.substring(1));
+ if (item is String) return (what is String) && _stringComparator(item, what);
+ if (item is bool) {
if (what is bool) {
return item == what;
} else if (what is String) {
what = (what as String).toLowerCase();
return item ? (what == "true" || what == "yes" || what == "on")
: (what == "false" || what == "no" || what == "off");
- } else {
- return false;
}
- } else if (item is num) {
- if (what is num) {
- return item == what || (item.isNaN && what.isNaN);
- } else {
- return what is String && _stringComparator('$item', what);
- }
- } else {
- return false; // Unsupported item type.
+ return false;
}
+ if (item is num) {
+ return what is num ?
+ item == what || (item.isNaN && what.isNaN) :
+ what is String && _stringComparator('$item', what);
+ }
+ return false; // Unsupported item type.
}
- bool _search(var item, var what) {
+ bool _search(item, what) {
if (what is Map) {
return what.keys.every((key) => _search(
(key == r'$') ? item : _parser(key).eval(item), what[key]));
- } else if (item is Map) {
- return item.keys.any((k) => !k.startsWith(r'$') && _search(item[k], what));
- } else if (item is List) {
- return item.any((i) => _search(i, what));
- } else {
- return _comparator(item, what);
}
+ if (item is Map) return item.keys.any((k) => !k.startsWith(r'$') && _search(item[k], what));
+ if (item is List) return item.any((i) => _search(i, what));
+ return _comparator(item, what);
}
- _Predicate _toPredicate(var expression) {
- if (expression is _Predicate) {
- return (item) => _ensureBool(expression(item));
- } else if (_comparator == null) {
- return (item) => false; // Bad comparator → no items for you!
- } else {
- return (item) => _search(item, expression);
- }
+ _PredicateFn _toPredicate(var expression) {
+ if (expression is _PredicateFn) return (item) => _ensureBool(expression(item));
+ if (_comparator == null) return (_) => false; // Bad comparator → no items for you!
+ return (item) => _search(item, expression);
}
- List call(List items, var expression, [var comparator]) {
- if (expression == null) {
- return items.toList(growable: false); // Missing expression → passthrough.
- } else if (expression is! Map && expression is! Function &&
- expression is! String && expression is! bool &&
- expression is! num) {
- return const []; // Bad expression → no items for you!
+ List call(List items, expression, [comparator]) {
+ // Missing expression → passthrough.
+ if (expression == null) return items.toList(growable: false);
+
+ // Bad expression → no items for you!
+ if (expression is! Map &&
+ expression is! Function &&
+ expression is! String &&
+ expression is! bool &&
+ expression is! num) {
+ return const [];
}
+
_configureComparator(comparator);
List results = items.where(_toPredicate(expression)).toList(growable: false);
_comparator = null;
diff --git a/lib/mock/module.dart b/lib/mock/module.dart
index 29a430b01..6ba1f4c0a 100644
--- a/lib/mock/module.dart
+++ b/lib/mock/module.dart
@@ -17,6 +17,7 @@ import 'dart:async' as dart_async;
import 'dart:collection' show ListBase;
import 'dart:html';
import 'dart:js' as js;
+import 'dart:mirrors' as mirrors;
import 'package:angular/angular.dart';
import 'package:angular/core/module_internal.dart';
@@ -62,13 +63,50 @@ class AngularMockModule extends Module {
bind(Element, toValue: document.body);
bind(Node, toValue: document.body);
bind(HttpBackend, toFactory: (Injector i) => i.get(MockHttpBackend));
- bind(VmTurnZone, toFactory: (_) {
- return new VmTurnZone()
- ..onError = (e, s, LongStackTrace ls) => dump('EXCEPTION: $e\n$s\n$ls');
- });
+ bind(VmTurnZone, toFactory: (_) =>
+ new VmTurnZone()..onError = (e, s, LongStackTrace ls) => dump('EXCEPTION: $e\n$s\n$ls'));
bind(Window, toImplementation: MockWindow);
var mockPlatform = new MockWebPlatform();
bind(MockWebPlatform, toValue: mockPlatform);
bind(WebPlatform, toValue: mockPlatform);
+ bind(Object, toImplementation: TestContext);
}
}
+
+/**
+ * [DynamicObject] helps testing angular.dart.
+ *
+ * Setting the test context to an instance of [DynamicObject] avoid having to write a specific class
+ * for every new test by allowing the dynamic addition of properties through the use of
+ * [Object.noSuchMethod]
+ *
+ */
+@proxy
+class DynamicObject {
+ Map _locals = {};
+
+ void addProperties(Map locals) {
+ assert(locals != null);
+ _locals.addAll(locals);
+ }
+
+ noSuchMethod(Invocation invocation) {
+ var pArgs = invocation.positionalArguments;
+ var field = mirrors.MirrorSystem.getName(invocation.memberName);
+ if (invocation.isGetter) {
+ return _locals[field];
+ }
+ if (invocation.isSetter) {
+ field = field.substring(0, field.length - 1);
+ return _locals[field] = pArgs[0];
+ }
+ if (invocation.isMethod) {
+ return Function.apply(_locals[field], pArgs, invocation.namedArguments);
+ }
+ throw new UnimplementedError(field);
+ }
+}
+
+class TestContext extends DynamicObject {
+ final $probes = {};
+}
diff --git a/lib/mock/probe.dart b/lib/mock/probe.dart
index 09bc60a81..fa7b8a3a5 100644
--- a/lib/mock/probe.dart
+++ b/lib/mock/probe.dart
@@ -1,13 +1,12 @@
part of angular.mock;
/*
- * Use Probe directive to capture the Scope, Injector and Element from any DOM
- * location into root-scope. This is useful for testing to get a hold of
- * any directive.
+ * Use Probe directive to capture the Scope, Injector and Element from any DOM location into
+ * root-scope. This is useful for testing to get a hold of any directive.
*
* get parameters {
var res = {};
- var p = _viewRoute;
- while (p != null) {
- res.addAll(p.parameters);
- p = p.parent;
+ var route = _viewRoute;
+ while (route != null) {
+ res.addAll(route.parameters);
+ route = route.parent;
}
return res;
}
diff --git a/lib/transformer.dart b/lib/transformer.dart
index 0d8668203..5f2f888bb 100644
--- a/lib/transformer.dart
+++ b/lib/transformer.dart
@@ -36,7 +36,6 @@ TransformOptions _parseSettings(Map args) {
var annotations = [
'angular.core.annotation_src.Injectable',
'angular.core.annotation_src.Decorator',
- 'angular.core.annotation_src.Controller',
'angular.core.annotation_src.Component',
'angular.core.annotation_src.Formatter'];
annotations.addAll(_readStringListValue(args, 'injectable_annotations'));
diff --git a/test/angular_spec.dart b/test/angular_spec.dart
index def7303c1..25f04f80c 100644
--- a/test/angular_spec.dart
+++ b/test/angular_spec.dart
@@ -97,7 +97,6 @@ main() {
"angular.core.annotation.ShadowRootAware",
"angular.core.annotation_src.AttachAware",
"angular.core.annotation_src.Component",
- "angular.core.annotation_src.Controller",
"angular.core.annotation_src.Decorator",
"angular.core.annotation_src.DetachAware",
"angular.core.annotation_src.Directive",
@@ -146,6 +145,7 @@ main() {
"angular.core_internal.Interpolate",
"angular.core_internal.RootScope",
"angular.core_internal.Scope",
+ "angular.core_internal.ScopeAware",
"angular.core_internal.ScopeDigestTTL",
"angular.core_internal.ScopeEvent",
"angular.core_internal.ScopeStats",
@@ -239,7 +239,7 @@ main() {
"angular.routing.RouteProvider",
"angular.routing.RouteViewFactory",
"angular.routing.RoutingModule",
- "angular.watch_group.PrototypeMap",
+ "angular.watch_group.ContextLocals",
"angular.watch_group.ReactionFn",
"angular.watch_group.Watch",
"change_detection.AvgStopwatch",
diff --git a/test/change_detection/context_locals_spec.dart b/test/change_detection/context_locals_spec.dart
new file mode 100644
index 000000000..84780907a
--- /dev/null
+++ b/test/change_detection/context_locals_spec.dart
@@ -0,0 +1,50 @@
+library context_locals_spec;
+
+import '../_specs.dart';
+import 'package:angular/change_detection/watch_group.dart';
+
+class RootContext {
+ String a, b, c;
+ RootContext(this.a, this.b, this.c);
+}
+
+void main() {
+ describe('Context Locals', () {
+ RootContext rootCtx;
+ beforeEach(() {
+ rootCtx = new RootContext('#a', '#b', '#c');
+ });
+
+ it('should allow retrieving the parent context', () {
+ var localCtx = new ContextLocals(rootCtx);
+ expect(localCtx.parentContext).toBe(rootCtx);
+ });
+
+ it('should allow testing for supported locals', () {
+ var localCtx = new ContextLocals(rootCtx, {'foo': 'bar'});
+ expect(localCtx.hasProperty('foo')).toBeTruthy();
+ expect(localCtx.hasProperty('far')).toBeFalsy();
+ expect(localCtx['foo']).toBe('bar');
+ });
+
+ it('should not allow modifying the root context', () {
+ var localCtx = new ContextLocals(rootCtx, {'a': '@a'});
+ expect(localCtx['a']).toBe('@a');
+ localCtx['a'] = '@foo';
+ expect(localCtx['a']).toBe('@foo');
+ expect(rootCtx.a).toBe('#a');
+ });
+
+ it('should write to the local context', () {
+ var localCtx = new ContextLocals(rootCtx, {'a': 0});
+ var childCtx = new ContextLocals(localCtx);
+ expect(childCtx.hasProperty('a')).toBeFalsy();
+ childCtx['a'] = '@a';
+ childCtx['b'] = '@b';
+ expect(localCtx['a']).toBe(0);
+ expect(childCtx['a']).toBe('@a');
+ expect(childCtx['b']).toBe('@b');
+ expect(localCtx.hasProperty('b')).toBeFalsy();
+ });
+ });
+}
\ No newline at end of file
diff --git a/test/change_detection/dirty_checking_change_detector_spec.dart b/test/change_detection/dirty_checking_change_detector_spec.dart
index 1107cb28d..bf77dde74 100644
--- a/test/change_detection/dirty_checking_change_detector_spec.dart
+++ b/test/change_detection/dirty_checking_change_detector_spec.dart
@@ -76,11 +76,12 @@ void testWithGetterFactory(FieldGetterFactory getterFactory) {
});
it('should treat map field dereference as []', () {
- var obj = {'name':'misko'};
+ var obj = new DynamicObject();
+ obj.name = 'misko';
detector.watch(obj, 'name', null);
detector.collectChanges(); // throw away first set
- obj['name'] = 'Misko';
+ obj.name = 'Misko';
var changeIterator = detector.collectChanges();
expect(changeIterator.moveNext()).toEqual(true);
expect(changeIterator.current.currentValue).toEqual('Misko');
@@ -90,11 +91,11 @@ void testWithGetterFactory(FieldGetterFactory getterFactory) {
describe('insertions / removals', () {
it('should insert at the end of list', () {
- var obj = {};
+ var obj = new DynamicObject();
var a = detector.watch(obj, 'a', 'a');
var b = detector.watch(obj, 'b', 'b');
- obj['a'] = obj['b'] = 1;
+ obj.a = obj.b = 1;
var changeIterator = detector.collectChanges();
expect(changeIterator.moveNext()).toEqual(true);
expect(changeIterator.current.handler).toEqual('a');
@@ -102,21 +103,21 @@ void testWithGetterFactory(FieldGetterFactory getterFactory) {
expect(changeIterator.current.handler).toEqual('b');
expect(changeIterator.moveNext()).toEqual(false);
- obj['a'] = obj['b'] = 2;
+ obj.a = obj.b = 2;
a.remove();
changeIterator = detector.collectChanges();
expect(changeIterator.moveNext()).toEqual(true);
expect(changeIterator.current.handler).toEqual('b');
expect(changeIterator.moveNext()).toEqual(false);
- obj['a'] = obj['b'] = 3;
+ obj.a = obj.b = 3;
b.remove();
changeIterator = detector.collectChanges();
expect(changeIterator.moveNext()).toEqual(false);
});
it('should remove all watches in group and group\'s children', () {
- var obj = {};
+ var obj = new DynamicObject();
detector.watch(obj, 'a', '0a');
var child1a = detector.newGroup();
var child1b = detector.newGroup();
@@ -128,37 +129,36 @@ void testWithGetterFactory(FieldGetterFactory getterFactory) {
child2.watch(obj,'a', '2A');
var iterator;
- obj['a'] = 1;
+ obj.a = 1;
expect(detector.collectChanges(),
toEqualChanges(['0a', '0A', '1a', '1A', '2A', '1b']));
- obj['a'] = 2;
+ obj.a = 2;
child1a.remove(); // should also remove child2
expect(detector.collectChanges(), toEqualChanges(['0a', '0A', '1b']));
});
it('should add watches within its own group', () {
- var obj = {};
+ var obj = new DynamicObject();
var ra = detector.watch(obj, 'a', 'a');
var child = detector.newGroup();
- var cb = child.watch(obj,'b', 'b');
- var iterotar;
+ var cb = child.watch(obj, 'b', 'b');
- obj['a'] = obj['b'] = 1;
+ obj.a = obj.b = 1;
expect(detector.collectChanges(), toEqualChanges(['a', 'b']));
- obj['a'] = obj['b'] = 2;
+ obj.a = obj.b = 2;
ra.remove();
expect(detector.collectChanges(), toEqualChanges(['b']));
- obj['a'] = obj['b'] = 3;
+ obj.a = obj.b = 3;
cb.remove();
expect(detector.collectChanges(), toEqualChanges([]));
// TODO: add them back in wrong order, assert events in right order
cb = child.watch(obj,'b', 'b');
ra = detector.watch(obj, 'a', 'a');
- obj['a'] = obj['b'] = 4;
+ obj.a = obj.b = 4;
expect(detector.collectChanges(), toEqualChanges(['a', 'b']));
});
@@ -723,6 +723,12 @@ void main() {
"toString": (o) => o.toString,
"isUnderAge": (o) => o.isUnderAge,
"isUnderAgeAsVariable": (o) => o.isUnderAgeAsVariable,
+ "a": (o) => o.a,
+ "b": (o) => o.b,
+ "name": (o) => o.name,
+ "someField": (o) => o.someField,
+ "f1": (o) => o.f1,
+ "f2": (o) => o.f2,
}));
}
diff --git a/test/change_detection/watch_group_spec.dart b/test/change_detection/watch_group_spec.dart
index cf1a8ac42..db5e8cf55 100644
--- a/test/change_detection/watch_group_spec.dart
+++ b/test/change_detection/watch_group_spec.dart
@@ -23,7 +23,7 @@ void main() {
ExpressionVisitor visitor;
beforeEach(inject((Logger _logger, Parser _parser) {
- context = {};
+ context = new DynamicObject();
var getterFactory = new DynamicFieldGetterFactory();
changeDetector = new DirtyCheckingChangeDetector(getterFactory);
watchGrp = new RootWatchGroup(getterFactory, changeDetector, context);
@@ -64,7 +64,6 @@ void main() {
}
beforeEach(inject((Logger _logger) {
- context = {};
var getterFactory = new DynamicFieldGetterFactory();
changeDetector = new DirtyCheckingChangeDetector(getterFactory);
watchGrp = new RootWatchGroup(getterFactory, changeDetector, context);
@@ -73,7 +72,7 @@ void main() {
it('should have a toString for debugging', () {
watchGrp.watch(parse('a'), (v, p) {});
- watchGrp.newGroup({});
+ watchGrp.newGroup(new DynamicObject());
expect("$watchGrp").toEqual(
'WATCHES: MARKER[null], MARKER[null]\n'
'WatchGroup[](watches: MARKER[null])\n'
@@ -83,7 +82,7 @@ void main() {
describe('watch lifecycle', () {
it('should prevent reaction fn on removed', () {
- context['a'] = 'hello';
+ context.a = 'hello';
var watch ;
watchGrp.watch(parse('a'), (v, p) {
logger('removed');
@@ -97,7 +96,7 @@ void main() {
describe('property chaining', () {
it('should read property', () {
- context['a'] = 'hello';
+ context.a = 'hello';
// should fire on initial adding
expect(watchGrp.fieldCost).toEqual(0);
@@ -112,21 +111,21 @@ void main() {
expect(logger).toEqual(['hello']);
// Should detect value change
- context['a'] = 'bye';
+ context.a = 'bye';
watchGrp.detectChanges();
expect(logger).toEqual(['hello', 'bye']);
// should cleanup after itself
watch.remove();
expect(watchGrp.fieldCost).toEqual(0);
- context['a'] = 'cant see me';
+ context.a = 'cant see me';
watchGrp.detectChanges();
expect(logger).toEqual(['hello', 'bye']);
});
describe('sequence mutations and ref changes', () {
it('should handle a simultaneous map mutation and reference change', () {
- context['a'] = context['b'] = {1: 10, 2: 20};
+ context.a = context.b = {1: 10, 2: 20};
var watchA = watchGrp.watch(new CollectionAST(parse('a')), (v, p) => logger(v));
var watchB = watchGrp.watch(new CollectionAST(parse('b')), (v, p) => logger(v));
@@ -141,9 +140,9 @@ void main() {
logger.clear();
// context['a'] is set to a copy with an addition.
- context['a'] = new Map.from(context['a'])..[3] = 30;
+ context.a = new Map.from(context.a)..[3] = 30;
// context['b'] still has the original collection. We'll mutate it.
- context['b'].remove(1);
+ context.b.remove(1);
watchGrp.detectChanges();
expect(logger.length).toEqual(2);
@@ -159,7 +158,7 @@ void main() {
});
it('should handle a simultaneous list mutation and reference change', () {
- context['a'] = context['b'] = [0, 1];
+ context.a = context.b = [0, 1];
var watchA = watchGrp.watch(new CollectionAST(parse('a')), (v, p) => logger(v));
var watchB = watchGrp.watch(new CollectionAST(parse('b')), (v, p) => logger(v));
@@ -176,9 +175,9 @@ void main() {
logger.clear();
// context['a'] is set to a copy with an addition.
- context['a'] = context['a'].toList()..add(2);
+ context.a = context.a.toList()..add(2);
// context['b'] still has the original collection. We'll mutate it.
- context['b'].remove(0);
+ context.b.remove(0);
watchGrp.detectChanges();
expect(logger.length).toEqual(2);
@@ -198,7 +197,7 @@ void main() {
});
it('should work correctly with UnmodifiableListView', () {
- context['a'] = new UnmodifiableListView([0, 1]);
+ context.a = new UnmodifiableListView([0, 1]);
var watch = watchGrp.watch(new CollectionAST(parse('a')), (v, p) => logger(v));
watchGrp.detectChanges();
@@ -208,7 +207,7 @@ void main() {
previous: ['0', '1']));
logger.clear();
- context['a'] = new UnmodifiableListView([1, 0]);
+ context.a = new UnmodifiableListView([1, 0]);
watchGrp.detectChanges();
expect(logger.length).toEqual(1);
@@ -222,7 +221,7 @@ void main() {
});
it('should read property chain', () {
- context['a'] = {'b': 'hello'};
+ context.a = new DynamicObject()..b = 'hello';
// should fire on initial adding
expect(watchGrp.fieldCost).toEqual(0);
@@ -239,33 +238,35 @@ void main() {
expect(logger).toEqual(['hello']);
// make sure no changes or logged when intermediary object changes
- context['a'] = {'b': 'hello'};
+ context.a.b = 'hello';
watchGrp.detectChanges();
expect(logger).toEqual(['hello']);
// Should detect value change
- context['a'] = {'b': 'hello2'};
+ context.a.b = 'hello2';
watchGrp.detectChanges();
expect(logger).toEqual(['hello', 'hello2']);
// Should detect value change
- context['a']['b'] = 'bye';
+ context.a.b = 'bye';
watchGrp.detectChanges();
expect(logger).toEqual(['hello', 'hello2', 'bye']);
// should cleanup after itself
watch.remove();
expect(watchGrp.fieldCost).toEqual(0);
- context['a']['b'] = 'cant see me';
+ context.a.b = 'cant see me';
watchGrp.detectChanges();
expect(logger).toEqual(['hello', 'hello2', 'bye']);
});
it('should reuse handlers', () {
- var user1 = {'first': 'misko', 'last': 'hevery'};
- var user2 = {'first': 'misko', 'last': 'Hevery'};
+ var user1 = new DynamicObject();
+ user1..first = 'misko'..last='hevery';
+ var user2 = new DynamicObject();
+ user2..first = 'misko'..last='Hevery';
- context['user'] = user1;
+ context.user = user1;
// should fire on initial adding
expect(watchGrp.fieldCost).toEqual(0);
@@ -278,11 +279,10 @@ void main() {
expect(logger).toEqual([user1, 'misko', 'hevery']);
logger.clear();
- context['user'] = user2;
+ context.user = user2;
watchGrp.detectChanges();
expect(logger).toEqual([user2, 'Hevery']);
-
watch.remove();
expect(watchGrp.fieldCost).toEqual(3);
@@ -296,7 +296,7 @@ void main() {
});
it('should eval pure FunctionApply', () {
- context['a'] = {'val': 1};
+ context.a = new DynamicObject()..val = 1;
FunctionApply fn = new LoggingFunctionApply(logger);
var watch = watchGrp.watch(
@@ -313,15 +313,15 @@ void main() {
expect(logger).toEqual([[1], null]);
logger.clear();
- context['a'] = {'val': 2};
+ context.a.val = 2;
watchGrp.detectChanges();
expect(logger).toEqual([[2]]);
});
it('should eval pure function', () {
- context['a'] = {'val': 1};
- context['b'] = {'val': 2};
+ context.a = new DynamicObject()..val = 1;
+ context.b = new DynamicObject()..val = 2;
var watch = watchGrp.watch(
new PureFunctionAST('add',
@@ -345,8 +345,8 @@ void main() {
expect(logger).toEqual(['+', 3]);
// multiple arg changes should only trigger function once.
- context['a']['val'] = 3;
- context['b']['val'] = 4;
+ context.a.val = 3;
+ context.b.val = 4;
watchGrp.detectChanges();
expect(logger).toEqual(['+', 3, '+', 7]);
@@ -355,8 +355,8 @@ void main() {
expect(watchGrp.fieldCost).toEqual(0);
expect(watchGrp.evalCost).toEqual(0);
- context['a']['val'] = 0;
- context['b']['val'] = 0;
+ context.a.val = 0;
+ context.b.val = 0;
watchGrp.detectChanges();
expect(logger).toEqual(['+', 3, '+', 7]);
@@ -364,8 +364,8 @@ void main() {
it('should eval closure', () {
- context['a'] = {'val': 1};
- context['b'] = {'val': 2};
+ context.a = new DynamicObject()..val = 1;
+ context.b = new DynamicObject()..val = 2;
var innerState = 1;
var watch = watchGrp.watch(
@@ -391,8 +391,8 @@ void main() {
logger.clear();
// multiple arg changes should only trigger function once.
- context['a']['val'] = 3;
- context['b']['val'] = 4;
+ context.a.val = 3;
+ context.b.val = 4;
watchGrp.detectChanges();
expect(logger).toEqual(['+', 8]);
@@ -409,8 +409,8 @@ void main() {
expect(watchGrp.fieldCost).toEqual(0);
expect(watchGrp.evalCost).toEqual(0);
- context['a']['val'] = 0;
- context['b']['val'] = 0;
+ context.a.val = 0;
+ context.b.val = 0;
watchGrp.detectChanges();
expect(logger).toEqual([]);
@@ -418,9 +418,9 @@ void main() {
it('should eval chained pure function', () {
- context['a'] = {'val': 1};
- context['b'] = {'val': 2};
- context['c'] = {'val': 3};
+ context.a = new DynamicObject()..val = 1;
+ context.b = new DynamicObject()..val = 2;
+ context.c = new DynamicObject()..val = 3;
var a_plus_b = new PureFunctionAST('add1',
(a, b) { logger('$a+$b'); return a + b; },
@@ -448,19 +448,19 @@ void main() {
logger.clear();
// multiple arg changes should only trigger function once.
- context['a']['val'] = 3;
- context['b']['val'] = 4;
- context['c']['val'] = 5;
+ context.a.val = 3;
+ context.b.val = 4;
+ context.c.val = 5;
watchGrp.detectChanges();
expect(logger).toEqual(['3+4', '7+5', 12]);
logger.clear();
- context['a']['val'] = 9;
+ context.a.val = 9;
watchGrp.detectChanges();
expect(logger).toEqual(['9+4', '13+5', 18]);
logger.clear();
- context['c']['val'] = 9;
+ context.c.val = 9;
watchGrp.detectChanges();
expect(logger).toEqual(['13+9', 22]);
logger.clear();
@@ -470,8 +470,8 @@ void main() {
expect(watchGrp.fieldCost).toEqual(0);
expect(watchGrp.evalCost).toEqual(0);
- context['a']['val'] = 0;
- context['b']['val'] = 0;
+ context.a.val = 0;
+ context.b.val = 0;
watchGrp.detectChanges();
expect(logger).toEqual([]);
@@ -487,8 +487,8 @@ void main() {
},
'valA': 'A'
};
- context['obj'] = obj;
- context['arg0'] = 1;
+ context.obj = obj;
+ context.arg0 = 1;
var watch = watchGrp.watch(
new MethodAST(parse('obj'), 'methodA', [parse('arg0')]),
@@ -510,7 +510,7 @@ void main() {
logger.clear();
obj['valA'] = 'B';
- context['arg0'] = 2;
+ context.arg0 = 2;
watchGrp.detectChanges();
expect(logger).toEqual(['methodA(2) => B', 'B']);
@@ -521,7 +521,7 @@ void main() {
expect(watchGrp.evalCost).toEqual(0);
obj['valA'] = 'C';
- context['arg0'] = 3;
+ context.arg0 = 3;
watchGrp.detectChanges();
expect(logger).toEqual([]);
@@ -531,8 +531,8 @@ void main() {
it('should eval method', () {
var obj = new MyClass(logger);
obj.valA = 'A';
- context['obj'] = obj;
- context['arg0'] = 1;
+ context.obj = obj;
+ context.arg0 = 1;
var watch = watchGrp.watch(
new MethodAST(parse('obj'), 'methodA', [parse('arg0')]),
@@ -554,7 +554,7 @@ void main() {
logger.clear();
obj.valA = 'B';
- context['arg0'] = 2;
+ context.arg0 = 2;
watchGrp.detectChanges();
expect(logger).toEqual(['methodA(2) => B', 'B']);
@@ -565,7 +565,7 @@ void main() {
expect(watchGrp.evalCost).toEqual(0);
obj.valA = 'C';
- context['arg0'] = 3;
+ context.arg0 = 3;
watchGrp.detectChanges();
expect(logger).toEqual([]);
@@ -576,9 +576,9 @@ void main() {
var obj2 = new MyClass(logger);
obj1.valA = obj2;
obj2.valA = 'A';
- context['obj'] = obj1;
- context['arg0'] = 0;
- context['arg1'] = 1;
+ context.obj = obj1;
+ context.arg0 = 0;
+ context.arg1 = 1;
// obj.methodA(arg0)
var ast = new MethodAST(parse('obj'), 'methodA', [parse('arg0')]);
@@ -601,8 +601,8 @@ void main() {
logger.clear();
obj2.valA = 'B';
- context['arg0'] = 10;
- context['arg1'] = 11;
+ context.arg0 = 10;
+ context.arg1 = 11;
watchGrp.detectChanges();
expect(logger).toEqual(['methodA(10) => MyClass', 'methodA(11) => B', 'B']);
@@ -613,15 +613,15 @@ void main() {
expect(watchGrp.evalCost).toEqual(0);
obj2.valA = 'C';
- context['arg0'] = 20;
- context['arg1'] = 21;
+ context.arg0 = 20;
+ context.arg1 = 21;
watchGrp.detectChanges();
expect(logger).toEqual([]);
});
it('should not return null when evaling method first time', () {
- context['text'] ='abc';
+ context.text = 'abc';
var ast = new MethodAST(parse('text'), 'toUpperCase', []);
var watch = watchGrp.watch(ast, (v, p) => logger(v));
@@ -630,7 +630,7 @@ void main() {
});
it('should not eval a function if registered during reaction', () {
- context['text'] ='abc';
+ context.text = 'abc';
var ast = new MethodAST(parse('text'), 'toLowerCase', []);
var watch = watchGrp.watch(ast, (v, p) {
var ast = new MethodAST(parse('text'), 'toUpperCase', []);
@@ -647,9 +647,9 @@ void main() {
it('should eval function eagerly when registered during reaction', () {
var fn = (arg) { logger('fn($arg)'); return arg; };
- context['obj'] = {'fn': fn};
- context['arg1'] = 'OUT';
- context['arg2'] = 'IN';
+ context.obj = {'fn': fn};
+ context.arg1 = 'OUT';
+ context.arg2 = 'IN';
var ast = new MethodAST(parse('obj'), 'fn', [parse('arg1')]);
var watch = watchGrp.watch(ast, (v, p) {
var ast = new MethodAST(parse('obj'), 'fn', [parse('arg2')]);
@@ -682,7 +682,7 @@ void main() {
});
it('should wrap iterable in ObservableList', () {
- context['list'] = [];
+ context.list = [];
var watch = watchGrp.watch(new CollectionAST(parse('list')), (v, p) => logger(v));
expect(watchGrp.fieldCost).toEqual(1);
@@ -698,7 +698,7 @@ void main() {
removals: []));
logger.clear();
- context['list'] = [1];
+ context.list = [1];
watchGrp.detectChanges();
expect(logger.length).toEqual(1);
expect(logger[0], toEqualCollectionRecord(
@@ -715,7 +715,7 @@ void main() {
});
it('should watch literal arrays made of expressions', () {
- context['a'] = 1;
+ context.a = 1;
var ast = new CollectionAST(
new PureFunctionAST('[a]', new ArrayFn(), [parse('a')])
);
@@ -728,7 +728,7 @@ void main() {
removals: []));
logger.clear();
- context['a'] = 2;
+ context.a = 2;
watchGrp.detectChanges();
expect(logger[0], toEqualCollectionRecord(
collection: ['2[null -> 0]'],
@@ -740,7 +740,7 @@ void main() {
});
it('should watch pure function whose result goes to pure function', () {
- context['a'] = 1;
+ context.a = 1;
var ast = new PureFunctionAST(
'-',
(v) => -v,
@@ -752,7 +752,7 @@ void main() {
expect(logger).toEqual([-2]);
logger.clear();
- context['a'] = 2;
+ context.a = 2;
expect(watchGrp.detectChanges()).not.toBe(null);
expect(logger).toEqual([-3]);
});
@@ -765,15 +765,15 @@ void main() {
});
it('should support context access', () {
- context['x'] = 42;
+ context.x = 42;
expect(eval('x')).toBe(42);
- context['y'] = 87;
+ context.y = 87;
expect(eval('y')).toBe(87);
});
it('should support custom context', () {
- expect(eval('x', {'x': 42})).toBe(42);
- expect(eval('x', {'x': 87})).toBe(87);
+ expect(eval('x', new _Context(42))).toBe(42);
+ expect(eval('x', new _Context(87))).toBe(87);
});
it('should support named arguments for scope calls', () {
@@ -787,34 +787,8 @@ void main() {
expect(eval("sub2(b: 4)", data)).toEqual(-4);
});
- it('should support named arguments for scope calls (map)', () {
- context["sub1"] = (a, {b: 0}) => a - b;
- expect(eval("sub1(1)")).toEqual(1);
- expect(eval("sub1(3, b: 2)")).toEqual(1);
-
- context["sub2"] = ({a: 0, b: 0}) => a - b;
- expect(eval("sub2()")).toEqual(0);
- expect(eval("sub2(a: 3)")).toEqual(3);
- expect(eval("sub2(a: 3, b: 2)")).toEqual(1);
- expect(eval("sub2(b: 4)")).toEqual(-4);
- });
-
it('should support named arguments for member calls', () {
- context['o'] = new TestData();
- expect(eval("o.sub1(1)")).toEqual(1);
- expect(eval("o.sub1(3, b: 2)")).toEqual(1);
-
- expect(eval("o.sub2()")).toEqual(0);
- expect(eval("o.sub2(a: 3)")).toEqual(3);
- expect(eval("o.sub2(a: 3, b: 2)")).toEqual(1);
- expect(eval("o.sub2(b: 4)")).toEqual(-4);
- });
-
- it('should support named arguments for member calls (map)', () {
- context['o'] = {
- 'sub1': (a, {b: 0}) => a - b,
- 'sub2': ({a: 0, b: 0}) => a - b
- };
+ context.o = new TestData();
expect(eval("o.sub1(1)")).toEqual(1);
expect(eval("o.sub1(3, b: 2)")).toEqual(1);
@@ -827,10 +801,11 @@ void main() {
describe('child group', () {
it('should remove all field watches in group and group\'s children', () {
+ context.a = null;
watchGrp.watch(parse('a'), (v, p) => logger('0a'));
- var child1a = watchGrp.newGroup(new PrototypeMap(context));
- var child1b = watchGrp.newGroup(new PrototypeMap(context));
- var child2 = child1a.newGroup(new PrototypeMap(context));
+ var child1a = watchGrp.newGroup(new ContextLocals(context));
+ var child1b = watchGrp.newGroup(new ContextLocals(context));
+ var child2 = child1a.newGroup(new ContextLocals(context));
child1a.watch(parse('a'), (v, p) => logger('1a'));
child1b.watch(parse('a'), (v, p) => logger('1b'));
watchGrp.watch(parse('a'), (v, p) => logger('0A'));
@@ -845,12 +820,12 @@ void main() {
expect(watchGrp.totalFieldCost).toEqual(4);
logger.clear();
- context['a'] = 1;
+ context.a = 1;
expect(watchGrp.detectChanges()).toEqual(6);
expect(logger).toEqual(['0a', '0A', '1a', '1A', '2A', '1b']); // we go by group order
logger.clear();
- context['a'] = 2;
+ context.a = 2;
child1a.remove(); // should also remove child2
expect(watchGrp.detectChanges()).toEqual(3);
expect(logger).toEqual(['0a', '0A', '1b']);
@@ -859,15 +834,16 @@ void main() {
});
it('should remove all method watches in group and group\'s children', () {
- context['my'] = new MyClass(logger);
+ var myClass = new MyClass(logger);
+ context.my = myClass;
AST countMethod = new MethodAST(parse('my'), 'count', []);
watchGrp.watch(countMethod, (v, p) => logger('0a'));
expectOrder(['0a']);
- var child1a = watchGrp.newGroup(new PrototypeMap(context));
- var child1b = watchGrp.newGroup(new PrototypeMap(context));
- var child2 = child1a.newGroup(new PrototypeMap(context));
- var child3 = child2.newGroup(new PrototypeMap(context));
+ var child1a = watchGrp.newGroup(new ContextLocals(context, {'my': myClass}));
+ var child1b = watchGrp.newGroup(new ContextLocals(context, {'my': myClass}));
+ var child2 = child1a.newGroup(new ContextLocals(context, {'my': myClass}));
+ var child3 = child2.newGroup(new ContextLocals(context, {'my': myClass}));
child1a.watch(countMethod, (v, p) => logger('1a'));
expectOrder(['0a', '1a']);
child1b.watch(countMethod, (v, p) => logger('1b'));
@@ -891,10 +867,11 @@ void main() {
});
it('should add watches within its own group', () {
- context['my'] = new MyClass(logger);
+ var myClass = new MyClass(logger);
+ context.my = myClass;
AST countMethod = new MethodAST(parse('my'), 'count', []);
var ra = watchGrp.watch(countMethod, (v, p) => logger('a'));
- var child = watchGrp.newGroup(new PrototypeMap(context));
+ var child = watchGrp.newGroup(new ContextLocals(context, {'my': myClass}));
var cb = child.watch(countMethod, (v, p) => logger('b'));
expectOrder(['a', 'b']);
@@ -915,7 +892,7 @@ void main() {
it('should not call reaction function on removed group', () {
var log = [];
- context['name'] = 'misko';
+ context.name = 'misko';
var child = watchGrp.newGroup(context);
watchGrp.watch(parse('name'), (v, _) {
log.add('root $v');
@@ -928,7 +905,7 @@ void main() {
expect(log).toEqual(['root misko', 'child misko']);
log.clear();
- context['name'] = 'destroy';
+ context.name = 'destroy';
watchGrp.detectChanges();
expect(log).toEqual(['root destroy']);
});
@@ -936,9 +913,9 @@ void main() {
it('should watch children', () {
- var childContext = new PrototypeMap(context);
- context['a'] = 'OK';
- context['b'] = 'BAD';
+ var childContext = new ContextLocals(context);
+ context.a = 'OK';
+ context.b = 'BAD';
childContext['b'] = 'OK';
watchGrp.watch(parse('a'), (v, p) => logger(v));
watchGrp.newGroup(childContext).watch(parse('b'), (v, p) => logger(v));
@@ -947,7 +924,7 @@ void main() {
expect(logger).toEqual(['OK', 'OK']);
logger.clear();
- context['a'] = 'A';
+ context.a = 'A';
childContext['b'] = 'B';
watchGrp.detectChanges();
@@ -981,3 +958,8 @@ class LoggingFunctionApply extends FunctionApply {
LoggingFunctionApply(this.logger);
apply(List args) => logger(args);
}
+
+class _Context {
+ var x;
+ _Context(this.x);
+}
\ No newline at end of file
diff --git a/test/core/annotation_src_spec.dart b/test/core/annotation_src_spec.dart
index 2bfeafce3..ddf508173 100644
--- a/test/core/annotation_src_spec.dart
+++ b/test/core/annotation_src_spec.dart
@@ -39,7 +39,6 @@ void main() => describe('annotations', () {
cssUrl: [''],
applyAuthorStyles: true,
resetStyleInheritance: true,
- publishAs: '',
module: (){},
map: {},
selector: '',
@@ -76,25 +75,4 @@ void main() => describe('annotations', () {
expect(variables(cloneWithNewMap(decorator, {}))).toEqual(variables(decorator));
});
});
-
- describe('controller', () {
- it('should set all fields on clone when all the fields are set', () {
- var controller = new Controller(
- publishAs: '',
- children: 'xxx',
- map: {},
- selector: '',
- module: (){},
- visibility: Directive.LOCAL_VISIBILITY,
- exportExpressions: [],
- exportExpressionAttrs: []
- );
-
- // Check that no fields are null
- expect(nullFields(controller)).toEqual([]);
-
- // Check that the clone is the same as the original.
- expect(variables(cloneWithNewMap(controller, {}))).toEqual(variables(controller));
- });
- });
});
diff --git a/test/core/core_directive_spec.dart b/test/core/core_directive_spec.dart
index ab4cd3149..86b2e73b3 100644
--- a/test/core/core_directive_spec.dart
+++ b/test/core/core_directive_spec.dart
@@ -23,7 +23,6 @@ void main() {
expect(annotation.template).toEqual('template');
expect(annotation.templateUrl).toEqual('templateUrl');
expect(annotation.cssUrls).toEqual(['cssUrls']);
- expect(annotation.publishAs).toEqual('ctrl');
expect(annotation.map).toEqual({
'foo': '=>foo',
'attr': '@attr',
@@ -104,7 +103,6 @@ class NullParser implements Parser {
template: 'template',
templateUrl: 'templateUrl',
cssUrl: const ['cssUrls'],
- publishAs: 'ctrl',
module: AnnotatedIoComponent.module,
visibility: Directive.LOCAL_VISIBILITY,
exportExpressions: const ['exportExpressions'],
diff --git a/test/core/parser/parser_spec.dart b/test/core/parser/parser_spec.dart
index 60ecd68dc..d5b5f856b 100644
--- a/test/core/parser/parser_spec.dart
+++ b/test/core/parser/parser_spec.dart
@@ -47,7 +47,7 @@ toBool(x) => (x is num) ? x != 0 : x == true;
main() {
describe('parse', () {
- Map context;
+ DynamicObject context;
Parser parser;
FormatterMap formatters;
@@ -63,9 +63,12 @@ main() {
eval(String text, [FormatterMap f]) =>
parser(text).eval(context, f == null ? formatters : f);
+
expectEval(String expr) => expect(() => eval(expr));
- beforeEach((){ context = {}; });
+ beforeEach((){
+ context = new DynamicObject();
+ });
describe('expressions', () {
it('should parse numerical expressions', () {
@@ -131,11 +134,11 @@ main() {
expect(eval("true||false?10:20")).toEqual(true||false?10:20);
expect(eval("true&&false?10:20")).toEqual(true&&false?10:20);
expect(eval("true?a=10:a=20")).toEqual(true?a=10:a=20);
- expect([context['a'], a]).toEqual([10, 10]);
- context['a'] = a = null;
+ expect([context.a, a]).toEqual([10, 10]);
+ context.a = a = null;
expect(eval("b=true?a=false?11:c=12:a=13")).toEqual(
b=true?a=false?11:c=12:a=13);
- expect([context['a'], context['b'], context['c']]).toEqual([a, b, c]);
+ expect([context.b, context.b, context.c]).toEqual([a, b, c]);
expect([a, b, c]).toEqual([12, 12, 12]);
});
@@ -149,9 +152,9 @@ main() {
});
it('should allow keyed access on non-maps', () {
- context['nonmap'] = new BracketButNotMap();
+ context.nonmap = new BracketButNotMap();
expect(eval("nonmap['hello']")).toEqual('hello');
- expect(eval("nonmap['hello']=3")).toEqual(3);
+ expect(eval("nonmap['hello'] = 3")).toEqual(3);
});
});
@@ -201,43 +204,44 @@ main() {
it('should fail gracefully when invoking non-function', () {
expect(() {
- parser('a[0]()').eval({'a': [4]});
+ parser('a[0]()').eval(new ContextLocals(context, {'a': [4]}));
}).toThrow('a[0] is not a function');
expect(() {
- parser('a[x()]()').eval({'a': [4], 'x': () => 0});
+ parser('a[x()]()').eval(new ContextLocals(context, {'a': [4], 'x': () => 0}));
}).toThrow('a[x()] is not a function');
expect(() {
- parser('{}()').eval({});
+ parser('{}()').eval(context);
}).toThrow('{} is not a function');
});
it('should throw on undefined functions (relaxed message)', () {
+ context = null;
expectEval("notAFn()").toThrow('notAFn');
});
it('should fail gracefully when missing a function (relaxed message)', () {
expect(() {
- parser('doesNotExist()').eval({});
+ parser('doesNotExist()').eval(new ExistsContext());
}).toThrow('doesNotExist');
expect(() {
- parser('exists(doesNotExist())').eval({'exists': () => true});
+ parser('exists(doesNotExist())').eval(new ExistsContext(() => true));
}).toThrow('doesNotExist');
expect(() {
- parser('doesNotExists(exists())').eval({'exists': () => true});
+ parser('doesNotExists(exists())').eval(new ExistsContext(() => true));
}).toThrow('doesNotExist');
expect(() {
- parser('doesNotExist(1)').eval({});
+ parser('doesNotExist(1)').eval(new ExistsContext(() => true));
}).toThrow('doesNotExist');
expect(() {
- parser('doesNotExist(1, 2)').eval({});
+ parser('doesNotExist(1, 2)').eval(new ExistsContext(() => true));
}).toThrow('doesNotExist');
expect(() {
@@ -253,33 +257,33 @@ main() {
}).toThrow('doesNotExist');
expect(() {
- parser('a.doesNotExist()').eval({'a': {}});
+ parser('a.doesNotExist()').eval(new ContextLocals(context, {'a': {}}));
}).toThrow('doesNotExist');
expect(() {
- parser('a.doesNotExist(1)').eval({'a': {}});
+ parser('a.doesNotExist(1)').eval(new ContextLocals(context, {'a': {}}));
}).toThrow('doesNotExist');
expect(() {
- parser('a.doesNotExist(1, 2)').eval({'a': {}});
+ parser('a.doesNotExist(1, 2)').eval(new ContextLocals(context, {'a': {}}));
}).toThrow('doesNotExist');
expect(() {
- parser('a.doesNotExist()').eval({'a': new TestData()});
+ parser('a.doesNotExist()').eval(new ContextLocals(context, {'a': new TestData()}));
}).toThrow('doesNotExist');
expect(() {
- parser('a.doesNotExist(1)').eval({'a': new TestData()});
+ parser('a.doesNotExist(1)').eval(new ContextLocals(context, {'a': new TestData()}));
}).toThrow('doesNotExist');
expect(() {
- parser('a.doesNotExist(1, 2)').eval({'a': new TestData()});
+ parser('a.doesNotExist(1, 2)').eval(new ContextLocals(context, {'a': new TestData()}));
}).toThrow('doesNotExist');
});
it('should let null be null', () {
- context['map'] = {};
+ context.map = {};
expect(eval('null')).toBe(null);
expect(() => eval('map.null'))
@@ -370,69 +374,66 @@ main() {
describe('setters', () {
it('should set a field in a map', () {
- context['map'] = {};
+ context.map = {};
eval('map["square"] = 6');
- eval('map.dot = 7');
-
- expect(context['map']['square']).toEqual(6);
- expect(context['map']['dot']).toEqual(7);
+ expect(context.map['square']).toEqual(6);
});
it('should set a field in a list', () {
- context['list'] = [];
+ context.list = [];
eval('list[3] = 2');
- expect(context['list'].length).toEqual(4);
- expect(context['list'][3]).toEqual(2);
+ expect(context.list.length).toEqual(4);
+ expect(context.list[3]).toEqual(2);
});
it('should set a field on an object', () {
- context['obj'] = new SetterObject();
+ context.obj = new SetterObject();
eval('obj.field = 1');
- expect(context['obj'].field).toEqual(1);
+ expect(context.obj.field).toEqual(1);
});
it('should set a setter on an object', () {
- context['obj'] = new SetterObject();
+ context.obj = new SetterObject();
eval('obj.setter = 2');
- expect(context['obj'].setterValue).toEqual(2);
+ expect(context.obj.setterValue).toEqual(2);
});
it('should set a []= on an object', () {
- context['obj'] = new OverloadObject();
- eval('obj.overload = 7');
+ context.obj = new OverloadObject();
+ eval('obj["overload"] = 7');
- expect(context['obj'].overloadValue).toEqual(7);
+ expect(context.obj.overloadValue).toEqual(7);
});
it('should set a field in a nested map on an object', () {
- context['obj'] = new SetterObject();
- eval('obj.map.mapKey = 3');
+ context.obj = new SetterObject();
+ eval('obj.map["mapKey"] = 3');
- expect(context['obj'].map['mapKey']).toEqual(3);
+ expect(context.obj.map['mapKey']).toEqual(3);
});
it('should set a field in a nested object on an object', () {
- context['obj'] = new SetterObject();
+ context.obj = new SetterObject();
eval('obj.nested.field = 1');
- expect(context['obj'].nested.field).toEqual(1);
+ expect(context.obj.nested.field).toEqual(1);
});
it('should create a map for dotted acces', () {
- context['obj'] = new SetterObject();
+ context.obj = new SetterObject();
eval('obj.field.key = 4');
- expect(context['obj'].field['key']).toEqual(4);
+ expect(context.obj.field['key']).toEqual(4);
});
@@ -538,11 +539,11 @@ main() {
it('should parse ternary', () {
- var returnTrue = context['returnTrue'] = () => true;
- var returnFalse = context['returnFalse'] = () => false;
- var returnString = context['returnString'] = () => 'asd';
- var returnInt = context['returnInt'] = () => 123;
- var identity = context['identity'] = (x) => x;
+ var returnTrue = context.returnTrue = () => true;
+ var returnFalse = context.returnFalse = () => false;
+ var returnString = context.returnString = () => 'asd';
+ var returnInt = context.returnInt = () => 123;
+ var identity = context.identity = (x) => x;
var B = toBool;
// Simple.
@@ -613,36 +614,41 @@ main() {
it('should access scope', () {
- context['a'] = 123;
- context['b'] = {'c': 456};
+ context.a = 123;
+ context.b = {'c': 456};
expect(eval("a")).toEqual(123);
- expect(eval("b.c")).toEqual(456);
+ expect(eval("b['c']")).toEqual(456);
expect(eval("x.y.z")).toEqual(null);
});
it('should access classes on scope', () {
- context['ident'] = new Ident();
+ context.ident = new Ident();
expect(eval('ident.id(6)')).toEqual(6);
expect(eval('ident.doubleId(4,5)')).toEqual([4, 5]);
});
it('should resolve deeply nested paths (important for CSP mode)', () {
- context['a'] = {'b': {'c': {'d': {'e': {'f': {'g': {'h': {'i': {'j': {'k': {'l': {'m': {'n': 'nooo!'}}}}}}}}}}}}};
- expect(eval("a.b.c.d.e.f.g.h.i.j.k.l.m.n")).toBe('nooo!');
+ context
+ .a = new DynamicObject()
+ ..b = (new DynamicObject()
+ ..c = (new DynamicObject()
+ ..d = 'nooo!'));
+
+ expect(eval("a.b.c.d")).toBe('nooo!');
});
it('should be forgiving', () {
- context = {'a': {'b': 23}};
+ context.a = {'b': 23};
expect(eval('b')).toBeNull();
- expect(eval('a.x')).toBeNull();
+ expect(eval('a["x"]')).toBeNull();
});
it('should catch NoSuchMethod', () {
- context = {'a': {'b': 23}};
+ context.a = {'b': 23};
expect(() => eval('a.b.c.d')).toThrow('NoSuchMethod');
});
@@ -653,20 +659,18 @@ main() {
it('should evaluate assignments', () {
- context = {'g': 4, 'arr': [3,4]};
+ context.g = 1;
+ context.arr = [3,4];
expect(eval("a=12")).toEqual(12);
- expect(context["a"]).toEqual(12);
+ expect(context.a).toEqual(12);
expect(eval("arr[c=1]")).toEqual(4);
- expect(context["c"]).toEqual(1);
-
- expect(eval("x.y.z=123;")).toEqual(123);
- expect(context["x"]["y"]["z"]).toEqual(123);
+ expect(context.c).toEqual(1);
expect(eval("a=123; b=234")).toEqual(234);
- expect(context["a"]).toEqual(123);
- expect(context["b"]).toEqual(234);
+ expect(context.a).toEqual(123);
+ expect(context.b).toEqual(234);
});
// TODO: assignment to an arr[c]
@@ -675,49 +679,41 @@ main() {
it('should evaluate function call without arguments', () {
- context['constN'] = () => 123;
+ context.constN = () => 123;
expect(eval("constN()")).toEqual(123);
});
-
- it('should access a protected keyword on scope', () {
- context['const'] = 3;
- expect(eval('this["const"]')).toEqual(3);
- });
-
-
it('should evaluate scope call with arguments', () {
- context["add"] = (a,b) => a + b;
+ context.add = (a,b) => a + b;
expect(eval("add(1,2)")).toEqual(3);
});
it('should evaluate function call from a return value', () {
- context["val"] = 33;
- context["getter"] = () { return () { return context["val"]; };};
+ context.val = 33;
+ context.getter = () => () => context.val;
expect(eval("getter()()")).toBe(33);
});
it('should evaluate methods on object', () {
- context['obj'] = ['ABC'];
+ context.obj = ['ABC'];
var fn = parser("obj.elementAt(0)").eval;
expect(fn(context)).toEqual('ABC');
});
it('should only check locals on first dereference', () {
- context['a'] = {'b': 1};
- context['this'] = context;
+ context.a = new _Context(1);
var locals = {'b': 2};
- var fn = parser("this['a'].b").bind(context, ScopeLocals.wrapper);
+ var fn = parser("this.a.b").bind(context, ContextLocals.wrapper);
expect(fn(locals)).toEqual(1);
});
it('should evaluate multiplication and division', () {
- context["taxRate"] = 8;
- context["subTotal"] = 100;
+ context.taxRate = 8;
+ context.subTotal = 100;
expect(eval("taxRate / 100 * subTotal")).toEqual(8);
expect(eval("taxRate ~/ 100 * subTotal")).toEqual(0);
expect(eval("subTotal * taxRate / 100")).toEqual(8);
@@ -771,27 +767,26 @@ main() {
it('should evaluate objects on scope context', () {
- context["a"] = "abc";
- expect(eval("{a:a}")["a"]).toEqual("abc");
+ context.a = "abc";
+ expect(eval("{a: a}")["a"]).toEqual("abc");
});
it('should evaluate field access on function call result', () {
- context["a"] = () {
- return {'name':'misko'};
- };
- expect(eval("a().name")).toEqual("misko");
+ context.a = () => new _Context('misko');
+ expect(eval("a().b")).toEqual("misko");
});
it('should evaluate field access after array access', () {
- context["items"] = [{}, {'name':'misko'}];
- expect(eval('items[1].name')).toEqual("misko");
+ var ctx = new _Context("misko");
+ context.items = [{}, ctx];
+ expect(eval('items[1].b')).toEqual("misko");
});
it('should evaluate array assignment', () {
- context["items"] = [];
+ context.items = [];
expect(eval('items[1] = "abc"')).toEqual("abc");
expect(eval('items[1]')).toEqual("abc");
@@ -847,20 +842,20 @@ main() {
it('should evaluate undefined', () {
expect(eval("undefined")).toBeNull();
expect(eval("a=undefined")).toBeNull();
- expect(context["a"]).toBeNull();
+ expect(context.a).toBeNull();
});
it('should allow assignment after array dereference', () {
- context["obj"] = [{}];
- eval('obj[0].name=1');
+ context.obj = [{}];
+ eval('obj[0]["name"] = 1');
// can not be expressed in Dart expect(scope["obj"]["name"]).toBeNull();
- expect(context["obj"][0]["name"]).toEqual(1);
+ expect(context.obj[0]["name"]).toEqual(1);
});
it('should short-circuit AND operator', () {
- context["run"] = () {
+ context.run = () {
throw "IT SHOULD NOT HAVE RUN";
};
expect(eval('false && run()')).toBe(false);
@@ -868,28 +863,28 @@ main() {
it('should short-circuit OR operator', () {
- context["run"] = () {
+ context.run = () {
throw "IT SHOULD NOT HAVE RUN";
};
expect(eval('true || run()')).toBe(true);
});
- it('should support method calls on primitive types', () {
- context["empty"] = '';
- context["zero"] = 0;
- context["bool"] = false;
+ xit('should support method calls on primitive types', () {
+ context.empty = '';
+ context.zero = 0;
+ context.bool = false;
// DOES NOT WORK. String.substring is not reflected. Or toString
- // expect(eval('empty.substring(0)')).toEqual('');
- // expect(eval('zero.toString()')).toEqual('0');
+ expect(eval('empty.substring(0)')).toEqual('');
+ expect(eval('zero.toString()')).toEqual('0');
// DOES NOT WORK. bool.toString is not reflected
- // expect(eval('bool.toString()')).toEqual('false');
+ expect(eval('bool.toString()')).toEqual('false');
});
it('should support map getters', () {
- expect(parser('a').eval({'a': 4})).toEqual(4);
+ expect(parser("this['a']").eval({'a': 4})).toEqual(4);
});
@@ -909,9 +904,9 @@ main() {
it('should support array setters', () {
- var data = {'a': [1,3]};
- expect(parser('a[1]=2').eval(data)).toEqual(2);
- expect(data['a'][1]).toEqual(2);
+ context.a = [1, 3];
+ expect(parser('a[1] = 2').eval(context)).toEqual(2);
+ expect(context.a[1]).toEqual(2);
});
@@ -931,18 +926,19 @@ main() {
it('should support map getters from superclass', () {
InheritedMapData mapData = new InheritedMapData();
- expect(parser('notmixed').eval(mapData)).toEqual('mapped-notmixed');
+ expect(parser('this["notmixed"]').eval(mapData)).toEqual('mapped-notmixed');
});
-
it('should support map getters from mixins', () {
MixedMapData data = new MixedMapData();
- expect(parser('str').eval(data)).toEqual('mapped-str');
+ expect(parser("this['str']").eval(data)).toEqual('mapped-str');
});
it('should parse functions for object indices', () {
- expect(parser('a[x()]()').eval({'a': [()=>6], 'x': () => 0})).toEqual(6);
+ context.a = [() => 6];
+ context.x = () => 0;
+ expect(parser('a[x()]()').eval(context)).toEqual(6);
});
});
@@ -951,40 +947,42 @@ main() {
it('should expose assignment function', () {
var fn = parser('a');
expect(fn.assign).toBeNotNull();
- var scope = {};
+ var scope = new DynamicObject();
fn.assign(scope, 123);
- expect(scope).toEqual({'a':123});
+ expect(scope.a).toEqual(123);
});
});
-
describe('locals', () {
it('should expose local variables', () {
- expect(parser('a').bind({'a': 6}, ScopeLocals.wrapper)({'a': 1})).toEqual(1);
- expect(parser('add(a,b)').
- bind({'b': 1, 'add': (a, b) { return a + b; }}, ScopeLocals.wrapper)({'a': 2})).toEqual(3);
+ expect(parser('a').bind({'a': 6}, ContextLocals.wrapper)({'a': 1})).toEqual(1);
+
+ expect(parser('add(a,b)')
+ .bind(new _Context(), ContextLocals.wrapper)({'a': 2})).toEqual(3);
});
it('should expose traverse locals', () {
- expect(parser('a.b').bind({'a': {'b': 6}}, ScopeLocals.wrapper)({'a': {'b':1}})).toEqual(1);
- expect(parser('a.b').bind({'a': null}, ScopeLocals.wrapper)({'a': {'b':1}})).toEqual(1);
- expect(parser('a.b').bind({'a': {'b': 5}}, ScopeLocals.wrapper)({'a': null})).toEqual(null);
+ var ctx = new DynamicObject();
+ ctx.a = {'b': 6};
+ expect(parser('a["b"]').bind(ctx, ContextLocals.wrapper)({'a': {'b':1}})).toEqual(1);
+ ctx.a = null;
+ expect(parser('a["b"]').bind(ctx, ContextLocals.wrapper)({'a': {'b':1}})).toEqual(1);
});
it('should work with scopes', (Scope scope) {
- scope.context['a'] = {'b': 6};
- expect(parser('a.b').bind(scope.context, ScopeLocals.wrapper)({'a': {'b':1}})).toEqual(1);
+ scope.context.a = {'b': 6};
+ expect(parser('a["b"]').bind(scope.context, ContextLocals.wrapper)({'a': {'b':1}})).toEqual(1);
});
it('should expose assignment function', () {
- var fn = parser('a.b');
+ var fn = parser('a["b"]');
expect(fn.assign).toBeNotNull();
- var scope = {};
+ var scope = new DynamicObject();
var locals = {"a": {}};
- fn.bind(scope, ScopeLocals.wrapper).assign(123, locals);
- expect(scope).toEqual({});
+ fn.bind(scope, ContextLocals.wrapper).assign(123, locals);
+ expect(scope.a).toBeNull();
expect(locals["a"]).toEqual({'b':123});
});
});
@@ -1004,11 +1002,11 @@ main() {
it('should be supported for scope calls (map)', () {
- context["sub1"] = (a, {b: 0}) => a - b;
+ context.sub1 = (a, {b: 0}) => a - b;
expect(eval("sub1(1)")).toEqual(1);
expect(eval("sub1(3, b: 2)")).toEqual(1);
- context["sub2"] = ({a: 0, b: 0}) => a - b;
+ context.sub2 = ({a: 0, b: 0}) => a - b;
expect(eval("sub2()")).toEqual(0);
expect(eval("sub2(a: 3)")).toEqual(3);
expect(eval("sub2(a: 3, b: 2)")).toEqual(1);
@@ -1017,7 +1015,7 @@ main() {
it('should be supported for member calls', () {
- context['o'] = new TestData();
+ context.o = new TestData();
expect(eval("o.sub1(1)")).toEqual(1);
expect(eval("o.sub1(3, b: 2)")).toEqual(1);
@@ -1029,26 +1027,25 @@ main() {
it('should be supported for member calls (map)', () {
- context['o'] = {
- 'sub1': (a, {b: 0}) => a - b,
- 'sub2': ({a: 0, b: 0}) => a - b
- };
- expect(eval("o.sub1(1)")).toEqual(1);
- expect(eval("o.sub1(3, b: 2)")).toEqual(1);
+ context.sub1 = (a, {b: 0}) => a - b;
+ context.sub2 = ({a: 0, b: 0}) => a - b;
- expect(eval("o.sub2()")).toEqual(0);
- expect(eval("o.sub2(a: 3)")).toEqual(3);
- expect(eval("o.sub2(a: 3, b: 2)")).toEqual(1);
- expect(eval("o.sub2(b: 4)")).toEqual(-4);
+ expect(eval("this.sub1(1)")).toEqual(1);
+ expect(eval("this.sub1(3, b: 2)")).toEqual(1);
+
+ expect(eval("this.sub2()")).toEqual(0);
+ expect(eval("this.sub2(a: 3)")).toEqual(3);
+ expect(eval("this.sub2(a: 3, b: 2)")).toEqual(1);
+ expect(eval("this.sub2(b: 4)")).toEqual(-4);
});
it('should be supported for function calls', () {
- context["sub1"] = (a, {b: 0}) => a - b;
+ context.sub1 = (a, {b: 0}) => a - b;
expect(eval("(sub1)(1)")).toEqual(1);
expect(eval("(sub1)(3, b: 2)")).toEqual(1);
- context["sub2"] = ({a: 0, b: 0}) => a - b;
+ context.sub2 = ({a: 0, b: 0}) => a - b;
expect(eval("(sub2)()")).toEqual(0);
expect(eval("(sub2)(a: 3)")).toEqual(3);
expect(eval("(sub2)(a: 3, b: 2)")).toEqual(1);
@@ -1120,7 +1117,7 @@ main() {
});
it('should evaluate grouped formatters', () {
- context = {'name': 'MISKO'};
+ context.name = 'MISKO';
expect(eval('n = (name|lowercase)', formatters)).toEqual('misko');
expect(eval('n')).toEqual('misko');
});
@@ -1133,7 +1130,7 @@ main() {
eval("1|nonexistent", formatters);
}).toThrow('No Formatter: nonexistent found!');
- context['offset'] = 3;
+ context.offset = 3;
expect(eval("'abcd'|substring:1:offset")).toEqual("bc");
expect(eval("'abcd'|substring:1:3|uppercase")).toEqual("BC");
});
@@ -1187,8 +1184,11 @@ class OverloadObject implements Map {
}
class BracketButNotMap {
+ var propName;
operator[](String name) => name;
- operator[]=(String name, value) {}
+ operator[]=(String name, value) {
+ propName = value;
+ }
}
class ScopeWithErrors {
@@ -1215,3 +1215,14 @@ class HelloFormatter {
return 'Hello, $str!';
}
}
+
+class _Context {
+ var b;
+ _Context([this.b = 1]);
+ add(a, b) => a + b;
+}
+
+class ExistsContext {
+ var exists;
+ ExistsContext([this.exists]);
+}
\ No newline at end of file
diff --git a/test/core/scope_spec.dart b/test/core/scope_spec.dart
index 704f7b523..c321b4c0e 100644
--- a/test/core/scope_spec.dart
+++ b/test/core/scope_spec.dart
@@ -9,11 +9,8 @@ import 'dart:math';
void main() {
describe('scope', () {
beforeEachModule((Module module) {
- Map context = {};
module
..bind(ChangeDetector, toImplementation: DirtyCheckingChangeDetector)
- ..bind(Object, toValue: context)
- ..bind(Map, toValue: context)
..bind(RootScope)
..bind(_MultiplyFormatter)
..bind(_ListHeadFormatter)
@@ -25,8 +22,8 @@ void main() {
});
describe('AST Bridge', () {
- it('should watch field', (Logger logger, Map context, RootScope rootScope) {
- context['field'] = 'Worked!';
+ it('should watch field', (Logger logger, RootScope rootScope) {
+ rootScope.context.field = 'Worked!';
rootScope.watch('field', (value, previous) => logger([value, previous]));
expect(logger).toEqual([]);
rootScope.digest();
@@ -35,36 +32,40 @@ void main() {
expect(logger).toEqual([['Worked!', null]]);
});
- it('should watch field path', (Logger logger, Map context, RootScope rootScope) {
- context['a'] = {'b': 'AB'};
+ it('should watch field path', (Logger logger, RootScope rootScope) {
+ var ctx = new Context();
+ rootScope.context.a = ctx;
+ ctx.b = 'AB';
rootScope.watch('a.b', (value, previous) => logger(value));
rootScope.digest();
expect(logger).toEqual(['AB']);
- context['a']['b'] = '123';
+ ctx.b = '123';
rootScope.digest();
expect(logger).toEqual(['AB', '123']);
- context['a'] = {'b': 'XYZ'};
+ ctx.b = 'XYZ';
rootScope.digest();
expect(logger).toEqual(['AB', '123', 'XYZ']);
});
- it('should watch math operations', (Logger logger, Map context, RootScope rootScope) {
- context['a'] = 1;
- context['b'] = 2;
+ it('should watch math operations', (Logger logger, RootScope rootScope) {
+ var context = rootScope.context;
+ context.a = 1;
+ context.b = 2;
rootScope.watch('a + b + 1', (value, previous) => logger(value));
rootScope.digest();
expect(logger).toEqual([4]);
- context['a'] = 3;
+ context.a = 3;
rootScope.digest();
expect(logger).toEqual([4, 6]);
- context['b'] = 5;
+ context.b = 5;
rootScope.digest();
expect(logger).toEqual([4, 6, 9]);
});
- it('should watch literals', (Logger logger, Map context, RootScope rootScope) {
- context['a'] = 1;
+ it('should watch literals', (Logger logger, RootScope rootScope) {
+ var context = rootScope.context;
+ context.a = 1;
rootScope
..watch('', (value, previous) => logger(value))
..watch('""', (value, previous) => logger(value))
@@ -75,12 +76,12 @@ void main() {
..digest();
expect(logger).toEqual(['', '', 1, 'str', [1, 2, 3], {'a': 1, 'b': 2}]);
logger.clear();
- context['a'] = 3;
+ context.a = 3;
rootScope.digest();
expect(logger).toEqual([[3, 2, 3], {'a': 3, 'b': 2}]);
});
- it('should watch nulls', (Logger logger, Map context, RootScope rootScope) {
+ it('should watch nulls', (Logger logger, RootScope rootScope) {
var r = (value, _) => logger(value);
rootScope
..watch('null < 0',r)
@@ -97,12 +98,13 @@ void main() {
expect(logger).toEqual([null, null, 6, 5, -4, 3, 0, 0, true, false]);
});
- it('should invoke closures', (Logger logger, Map context, RootScope rootScope) {
- context['fn'] = () {
+ it('should invoke closures', (Logger logger, RootScope rootScope) {
+ var context = rootScope.context;
+ context.fn = () {
logger('fn');
return 1;
};
- context['a'] = {'fn': () {
+ context.a = {'fn': () {
logger('a.fn');
return 2;
}};
@@ -116,22 +118,23 @@ void main() {
expect(logger).toEqual(['fn', 'a.fn']);
});
- it('should perform conditionals', (Logger logger, Map context, RootScope rootScope) {
- context['a'] = 1;
- context['b'] = 2;
- context['c'] = 3;
+ it('should perform conditionals', (Logger logger, RootScope rootScope) {
+ var context = rootScope.context;
+ context.a = 1;
+ context.b = 2;
+ context.c = 3;
rootScope.watch('a?b:c', (value, previous) => logger(value));
rootScope.digest();
expect(logger).toEqual([2]);
logger.clear();
- context['a'] = 0;
+ context.a = 0;
rootScope.digest();
expect(logger).toEqual([3]);
});
- xit('should call function', (Logger logger, Map context, RootScope rootScope) {
- context['a'] = () {
+ xit('should call function', (Logger logger, RootScope rootScope) {
+ rootScope.context.a = () {
return () { return 123; };
};
rootScope.watch('a()()', (value, previous) => logger(value));
@@ -142,8 +145,9 @@ void main() {
expect(logger).toEqual([]);
});
- it('should access bracket', (Logger logger, Map context, RootScope rootScope) {
- context['a'] = {'b': 123};
+ it('should access bracket', (Logger logger, RootScope rootScope) {
+ var context = rootScope.context;
+ context.a = {'b': 123};
rootScope.watch('a["b"]', (value, previous) => logger(value));
rootScope.digest();
expect(logger).toEqual([123]);
@@ -152,27 +156,29 @@ void main() {
expect(logger).toEqual([]);
logger.clear();
- context['a']['b'] = 234;
+ context.a['b'] = 234;
rootScope.digest();
expect(logger).toEqual([234]);
});
- it('should prefix', (Logger logger, Map context, RootScope rootScope) {
- context['a'] = true;
+ it('should prefix', (Logger logger, RootScope rootScope) {
+ var context = rootScope.context;
+ context.a = true;
rootScope.watch('!a', (value, previous) => logger(value));
rootScope.digest();
expect(logger).toEqual([false]);
logger.clear();
- context['a'] = false;
+ context.a = false;
rootScope.digest();
expect(logger).toEqual([true]);
});
- it('should support formatters', (Logger logger, Map context,
- RootScope rootScope, FormatterMap formatters) {
- context['a'] = 123;
- context['b'] = 2;
+ it('should support formatters', (Logger logger, RootScope rootScope,
+ FormatterMap formatters) {
+ var context = rootScope.context;
+ context.a = 123;
+ context.b = 2;
rootScope.watch('a | multiply:b', (value, previous) => logger(value),
formatters: formatters);
rootScope.digest();
@@ -183,9 +189,10 @@ void main() {
logger.clear();
});
- it('should support arrays in formatters', (Logger logger, Map context,
- RootScope rootScope, FormatterMap formatters) {
- context['a'] = [1];
+ it('should support arrays in formatters', (Logger logger, RootScope rootScope,
+ FormatterMap formatters) {
+ var context = rootScope.context;
+ context.a = [1];
rootScope.watch('a | sort | listHead:"A" | listTail:"B"',
(value, previous) => logger(value), formatters: formatters);
rootScope.digest();
@@ -196,22 +203,23 @@ void main() {
expect(logger).toEqual([]);
logger.clear();
- context['a'].add(2);
+ context.a.add(2);
rootScope.digest();
expect(logger).toEqual(['sort', 'listHead', 'listTail', ['A', 1, 2, 'B']]);
logger.clear();
// We change the order, but sort should change it to same one and it should not
// call subsequent formatters.
- context['a'] = [2, 1];
+ context.a = [2, 1];
rootScope.digest();
expect(logger).toEqual(['sort']);
logger.clear();
});
- it('should support maps in formatters', (Logger logger, Map context,
- RootScope rootScope, FormatterMap formatters) {
- context['a'] = {'foo': 'bar'};
+ it('should support maps in formatters', (Logger logger, RootScope rootScope,
+ FormatterMap formatters) {
+ var context = rootScope.context;
+ context.a = {'foo': 'bar'};
rootScope.watch('a | identity | keys',
(value, previous) => logger(value), formatters: formatters);
rootScope.digest();
@@ -222,7 +230,7 @@ void main() {
expect(logger).toEqual([]);
logger.clear();
- context['a']['bar'] = 'baz';
+ context.a['bar'] = 'baz';
rootScope.digest();
expect(logger).toEqual(['identity', 'keys', ['foo', 'bar']]);
logger.clear();
@@ -238,9 +246,9 @@ void main() {
});
it('children should point to root', (RootScope rootScope) {
- var child = rootScope.createChild(new PrototypeMap(rootScope.context));
+ var child = rootScope.createChild(rootScope.context);
expect(child.rootScope).toEqual(rootScope);
- expect(child.createChild(new PrototypeMap(rootScope.context)).rootScope).toEqual(rootScope);
+ expect(child.createChild(rootScope.context).rootScope).toEqual(rootScope);
});
});
@@ -253,11 +261,11 @@ void main() {
it('should point to parent', (RootScope rootScope) {
- var child = rootScope.createChild(new PrototypeMap(rootScope.context));
+ var child = rootScope.createChild(rootScope.context);
expect(child.id).toEqual(':0');
expect(rootScope.parentScope).toEqual(null);
expect(child.parentScope).toEqual(rootScope);
- expect(child.createChild(new PrototypeMap(rootScope.context)).parentScope).toEqual(child);
+ expect(child.createChild(rootScope.context).parentScope).toEqual(child);
});
});
});
@@ -274,7 +282,7 @@ void main() {
it(r'should add listener for both emit and broadcast events', (RootScope rootScope) {
var log = '',
- child = rootScope.createChild(new PrototypeMap(rootScope.context));
+ child = rootScope.createChild(rootScope.context);
eventFn(event) {
expect(event).not.toEqual(null);
@@ -294,7 +302,7 @@ void main() {
it(r'should return a function that deregisters the listener', (RootScope rootScope) {
var log = '';
- var child = rootScope.createChild(new PrototypeMap(rootScope.context));
+ var child = rootScope.createChild(rootScope.context);
var subscription;
eventFn(e) {
@@ -411,7 +419,7 @@ void main() {
var random = new Random();
for (var i = 0; i < 1000; i++) {
if (i % 10 == 0) {
- scopes = [root.createChild(null)];
+ scopes = [root.createChild({})];
listeners = [];
steps = [];
}
@@ -420,9 +428,9 @@ void main() {
if (scopes.length > 10) break;
var index = random.nextInt(scopes.length);
Scope scope = scopes[index];
- var child = scope.createChild(null);
+ var child = scope.createChild({});
scopes.add(child);
- steps.add('scopes[$index].createChild(null)');
+ steps.add('scopes[$index].createChild({})');
break;
case 1:
var index = random.nextInt(scopes.length);
@@ -461,17 +469,18 @@ void main() {
var log, child, grandChild, greatGrandChild;
logger(event) {
- log.add(event.currentScope.context['id']);
+ var ctx = event.currentScope.context;
+ log.add(ctx is num ? ctx : ctx.id);
}
beforeEachModule(() {
return (RootScope rootScope) {
log = [];
- child = rootScope.createChild({'id': 1});
- grandChild = child.createChild({'id': 2});
- greatGrandChild = grandChild.createChild({'id': 3});
+ child = rootScope.createChild(1);
+ grandChild = child.createChild(2);
+ greatGrandChild = grandChild.createChild(3);
- rootScope.context['id'] = 0;
+ rootScope.context.id = 0;
rootScope.on('myEvent').listen(logger);
child.on('myEvent').listen(logger);
@@ -503,7 +512,7 @@ void main() {
it('should throw "model unstable" error when observer is present', (RootScope rootScope, VmTurnZone zone, ExceptionHandler e) {
// Generates a different, equal, list on each evaluation.
- rootScope.context['list'] = new UnstableList();
+ rootScope.context.list = new UnstableList();
rootScope.watch('list.list', (n, v) => null, canChangeModel: true);
try {
@@ -569,30 +578,24 @@ void main() {
var log, child1, child2, child3, grandChild11, grandChild21, grandChild22, grandChild23,
greatGrandChild211;
- logger(event) {
- log.add(event.currentScope.context['id']);
+ logger(e) {
+ log.add(e.currentScope.context is num ?
+ e.currentScope.context :
+ e.currentScope.context.id);
}
beforeEach((RootScope rootScope) {
log = [];
- child1 = rootScope.createChild({});
- child2 = rootScope.createChild({});
- child3 = rootScope.createChild({});
- grandChild11 = child1.createChild({});
- grandChild21 = child2.createChild({});
- grandChild22 = child2.createChild({});
- grandChild23 = child2.createChild({});
- greatGrandChild211 = grandChild21.createChild({});
-
- rootScope.context['id'] = 0;
- child1.context['id'] = 1;
- child2.context['id'] = 2;
- child3.context['id'] = 3;
- grandChild11.context['id'] = 11;
- grandChild21.context['id'] = 21;
- grandChild22.context['id'] = 22;
- grandChild23.context['id'] = 23;
- greatGrandChild211.context['id'] = 211;
+ child1 = rootScope.createChild(1);
+ child2 = rootScope.createChild(2);
+ child3 = rootScope.createChild(3);
+ grandChild11 = child1.createChild(11);
+ grandChild21 = child2.createChild(21);
+ grandChild22 = child2.createChild(22);
+ grandChild23 = child2.createChild(23);
+ greatGrandChild211 = grandChild21.createChild(211);
+
+ rootScope.context.id = 0;
rootScope.on('myEvent').listen(logger);
child1.on('myEvent').listen(logger);
@@ -777,7 +780,7 @@ void main() {
it('should not call reaction function on destroyed scope', (RootScope rootScope, Logger log) {
- rootScope.context['name'] = 'misko';
+ rootScope.context.name = 'misko';
var child = rootScope.createChild(rootScope.context);
rootScope.watch('name', (v, _) {
log('root $v');
@@ -791,14 +794,14 @@ void main() {
expect(log).toEqual(['root misko', 'root2 misko', 'child misko']);
log.clear();
- rootScope.context['name'] = 'destroy';
+ rootScope.context.name = 'destroy';
rootScope.apply();
expect(log).toEqual(['root destroy', 'root2 destroy']);
});
it('should not call reaction fn when destroyed', (RootScope scope) {
- var testScope = scope.createChild({});
+ var testScope = scope.createChild(scope.context);
bool called = false;
testScope.watch('items', (_, __) {
called = true;
@@ -813,7 +816,8 @@ void main() {
describe('digest lifecycle', () {
it(r'should apply expression with full lifecycle', (RootScope rootScope) {
var log = '';
- var child = rootScope.createChild({"parent": rootScope.context});
+ var child = rootScope.createChild(
+ new ContextLocals(rootScope.context, {"parent": rootScope.context}));
rootScope.watch('a', (a, _) { log += '1'; });
child.apply('parent.a = 0');
expect(log).toEqual('1');
@@ -826,7 +830,7 @@ void main() {
});
beforeEach((RootScope rootScope) {
- rootScope.context['log'] = () { log += 'digest;'; return null; };
+ rootScope.context.log = () { log += 'digest;'; return null; };
log = '';
rootScope.watch('log()', (v, o) => null);
rootScope.digest();
@@ -838,7 +842,7 @@ void main() {
var log = [];
var child = rootScope.createChild({});
rootScope.watch('a', (a, _) => log.add('1'));
- rootScope.context['a'] = 0;
+ rootScope.context.a = 0;
child.apply(() { throw 'MyError'; });
expect(log.join(',')).toEqual('1');
expect(exceptionHandler.errors[0].error).toEqual('MyError');
@@ -850,15 +854,15 @@ void main() {
it(r'should execute and return value and update', inject(
(RootScope rootScope, ExceptionHandler e) {
LoggingExceptionHandler exceptionHandler = e;
- rootScope.context['name'] = 'abc';
- expect(rootScope.apply((context) => context['name'])).toEqual('abc');
+ rootScope.context.name = 'abc';
+ expect(rootScope.apply((context) => context.name)).toEqual('abc');
expect(log).toEqual('digest;digest;');
exceptionHandler.assertEmpty();
}));
it(r'should execute and return value and update', (RootScope rootScope) {
- rootScope.context['name'] = 'abc';
+ rootScope.context.name = 'abc';
expect(rootScope.apply('name', {'name': 123})).toEqual(123);
});
@@ -883,7 +887,8 @@ void main() {
describe('flush lifecycle', () {
it(r'should apply expression with full lifecycle', (RootScope rootScope) {
var log = '';
- var child = rootScope.createChild({"parent": rootScope.context});
+ var child = rootScope.createChild(
+ new ContextLocals(rootScope.context , {"parent": rootScope.context}));
rootScope.watch('a', (a, _) { log += '1'; }, canChangeModel: false);
child.apply('parent.a = 0');
expect(log).toEqual('1');
@@ -892,7 +897,8 @@ void main() {
it(r'should schedule domWrites and domReads', (RootScope rootScope) {
var log = '';
- var child = rootScope.createChild({"parent": rootScope.context});
+ var child = rootScope.createChild(
+ new ContextLocals(rootScope.context , {"parent": rootScope.context}));
rootScope.watch('a', (a, _) { log += '1'; }, canChangeModel: false);
child.apply('parent.a = 0');
expect(log).toEqual('1');
@@ -904,7 +910,7 @@ void main() {
return module.bind(ExceptionHandler, toImplementation: LoggingExceptionHandler);
});
beforeEach((RootScope rootScope) {
- rootScope.context['log'] = () { log += 'digest;'; return null; };
+ rootScope.context.log = () { log += 'digest;'; return null; };
log = '';
rootScope.watch('log()', (v, o) => null, canChangeModel: false);
rootScope.digest();
@@ -916,7 +922,7 @@ void main() {
var log = [];
var child = rootScope.createChild({});
rootScope.watch('a', (a, _) => log.add('1'), canChangeModel: false);
- rootScope.context['a'] = 0;
+ rootScope.context.a = 0;
child.apply(() { throw 'MyError'; });
expect(log.join(',')).toEqual('1');
expect(exceptionHandler.errors[0].error).toEqual('MyError');
@@ -927,14 +933,14 @@ void main() {
it(r'should execute and return value and update', inject(
(RootScope rootScope, ExceptionHandler e) {
LoggingExceptionHandler exceptionHandler = e;
- rootScope.context['name'] = 'abc';
- expect(rootScope.apply((context) => context['name'])).toEqual('abc');
+ rootScope.context.name = 'abc';
+ expect(rootScope.apply((context) => context.name)).toEqual('abc');
expect(log).toEqual('digest;digest;');
exceptionHandler.assertEmpty();
}));
it(r'should execute and return value and update', (RootScope rootScope) {
- rootScope.context['name'] = 'abc';
+ rootScope.context.name = 'abc';
expect(rootScope.apply('name', {'name': 123})).toEqual(123);
});
@@ -948,7 +954,7 @@ void main() {
it(r'should throw assertion when model changes in flush', (RootScope rootScope, Logger log) {
var retValue = 1;
- rootScope.context['logger'] = (name) { log(name); return retValue; };
+ rootScope.context.logger = (name) { log(name); return retValue; };
rootScope.watch('logger("watch")', (n, v) => null);
rootScope.watch('logger("flush")', (n, v) => null,
@@ -971,37 +977,6 @@ void main() {
});
-
- describe('ScopeLocals', () {
- it('should read from locals', (RootScope scope) {
- scope.context['a'] = 'XXX';
- scope.context['c'] = 'C';
- var scopeLocal = new ScopeLocals(scope.context, {'a': 'A', 'b': 'B'});
- expect(scopeLocal['a']).toEqual('A');
- expect(scopeLocal['b']).toEqual('B');
- expect(scopeLocal['c']).toEqual('C');
- });
-
- it('should write to Scope', (RootScope scope) {
- scope.context['a'] = 'XXX';
- scope.context['c'] = 'C';
- var scopeLocal = new ScopeLocals(scope.context, {'a': 'A', 'b': 'B'});
-
- scopeLocal['a'] = 'aW';
- scopeLocal['b'] = 'bW';
- scopeLocal['c'] = 'cW';
-
- expect(scope.context['a']).toEqual('aW');
- expect(scope.context['b']).toEqual('bW');
- expect(scope.context['c']).toEqual('cW');
-
- expect(scopeLocal['a']).toEqual('A');
- expect(scopeLocal['b']).toEqual('B');
- expect(scopeLocal['c']).toEqual('cW');
- });
- });
-
-
describe(r'watch/digest', () {
it(r'should watch and fire on simple property change', (RootScope rootScope) {
var log;
@@ -1015,17 +990,19 @@ void main() {
expect(log).toEqual(null);
rootScope.digest();
expect(log).toEqual(null);
- rootScope.context['name'] = 'misko';
+ rootScope.context.name = 'misko';
rootScope.digest();
expect(log).toEqual(['misko', null]);
});
- it('should watch/observe on objects other then contex', (RootScope rootScope) {
+ it('should watch/observe on objects other than context', (RootScope rootScope) {
var log = '';
- var map = {'a': 'A', 'b': 'B'};
- rootScope.watch('a', (a, b) => log += a, context: map);
- rootScope.watch('b', (a, b) => log += a, context: map);
+ var ctx = new Context()
+ ..a = 'A'
+ ..b = 'B';
+ rootScope.watch('a', (v, _) => log += v, context: ctx);
+ rootScope.watch('b', (v, _) => log += v, context: ctx);
rootScope.apply();
expect(log).toEqual('AB');
});
@@ -1034,15 +1011,15 @@ void main() {
it(r'should watch and fire on expression change', (RootScope rootScope) {
var log;
- rootScope.watch('name.first', (a, b) => log = [a, b]);
+ rootScope.watch('name["first"]', (a, b) => log = [a, b]);
rootScope.digest();
log = null;
- rootScope.context['name'] = {};
+ rootScope.context.name = {};
expect(log).toEqual(null);
rootScope.digest();
expect(log).toEqual(null);
- rootScope.context['name']['first'] = 'misko';
+ rootScope.context.name['first'] = 'misko';
rootScope.digest();
expect(log).toEqual(['misko', null]);
});
@@ -1055,7 +1032,7 @@ void main() {
it(r'should delegate exceptions', (RootScope rootScope, ExceptionHandler e) {
LoggingExceptionHandler exceptionHandler = e;
rootScope.watch('a', (n, o) {throw 'abc';});
- rootScope.context['a'] = 1;
+ rootScope.context.a = 1;
rootScope.digest();
expect(exceptionHandler.errors.length).toEqual(1);
expect(exceptionHandler.errors[0].error).toEqual('abc');
@@ -1071,7 +1048,7 @@ void main() {
..watch('a', (a, b) { log += 'a'; })
..watch('b', (a, b) { log += 'b'; })
..watch('c', (a, b) { log += 'c'; })
- ..context['a'] = rootScope.context['b'] = rootScope.context['c'] = 1
+ ..context.a = rootScope.context.b = rootScope.context.c = 1
..digest();
expect(log).toEqual('abc');
});
@@ -1080,13 +1057,13 @@ void main() {
it(r'should call child watchers in addition order', (RootScope rootScope) {
// this is not an external guarantee, just our own sanity
var log = '';
- var childA = rootScope.createChild({});
- var childB = rootScope.createChild({});
- var childC = rootScope.createChild({});
+ var childA = rootScope.createChild(rootScope.context);
+ var childB = rootScope.createChild(rootScope.context);
+ var childC = rootScope.createChild(rootScope.context);
childA.watch('a', (a, b) { log += 'a'; });
childB.watch('b', (a, b) { log += 'b'; });
childC.watch('c', (a, b) { log += 'c'; });
- childA.context['a'] = childB.context['b'] = childC.context['c'] = 1;
+ childA.context.a = childB.context.b = childC.context.c = 1;
rootScope.digest();
expect(log).toEqual('abc');
});
@@ -1096,10 +1073,10 @@ void main() {
(RootScope rootScope) {
// tests a traversal edge case which we originally missed
var log = [];
- var childA = rootScope.createChild({'log': log});
- var childB = rootScope.createChild({'log': log});
+ var childA = rootScope.createChild(new ContextLocals(rootScope.context, {'log': log}));
+ var childB = rootScope.createChild(new ContextLocals(rootScope.context, {'log': log}));
- rootScope.context['log'] = log;
+ rootScope.context.log = log;
rootScope.watch("log.add('r')", (_, __) => null);
childA.watch("log.add('a')", (_, __) => null);
@@ -1114,24 +1091,24 @@ void main() {
it(r'should repeat watch cycle while model changes are identified', (RootScope rootScope) {
var log = '';
rootScope
- ..watch('c', (v, b) {rootScope.context['d'] = v; log+='c'; })
- ..watch('b', (v, b) {rootScope.context['c'] = v; log+='b'; })
- ..watch('a', (v, b) {rootScope.context['b'] = v; log+='a'; })
+ ..watch('c', (v, b) {rootScope.context.d = v; log+='c'; })
+ ..watch('b', (v, b) {rootScope.context.c = v; log+='b'; })
+ ..watch('a', (v, b) {rootScope.context.b = v; log+='a'; })
..digest();
log = '';
- rootScope.context['a'] = 1;
+ rootScope.context.a = 1;
rootScope.digest();
- expect(rootScope.context['b']).toEqual(1);
- expect(rootScope.context['c']).toEqual(1);
- expect(rootScope.context['d']).toEqual(1);
+ expect(rootScope.context.b).toEqual(1);
+ expect(rootScope.context.c).toEqual(1);
+ expect(rootScope.context.d).toEqual(1);
expect(log).toEqual('abc');
});
it(r'should repeat watch cycle from the root element', (RootScope rootScope) {
var log = [];
- rootScope.context['log'] = log;
- var child = rootScope.createChild({'log':log});
+ rootScope.context.log = log;
+ var child = rootScope.createChild(new ContextLocals(rootScope.context, {'log':log}));
rootScope.watch("log.add('a')", (_, __) => null);
child.watch("log.add('b')", (_, __) => null);
rootScope.digest();
@@ -1141,7 +1118,7 @@ void main() {
it(r'should not fire upon watch registration on initial digest', (RootScope rootScope) {
var log = '';
- rootScope.context['a'] = 1;
+ rootScope.context.a = 1;
rootScope.watch('a', (a, b) { log += 'a'; });
rootScope.watch('b', (a, b) { log += 'b'; });
rootScope.digest();
@@ -1159,7 +1136,7 @@ void main() {
}).toThrow(r'digest already in progress');
callCount++;
});
- rootScope.context['name'] = 'a';
+ rootScope.context.name = 'a';
rootScope.digest();
expect(callCount).toEqual(1);
});
@@ -1176,12 +1153,12 @@ void main() {
expect(watch).toBeDefined();
listener.reset();
- rootScope.context['foo'] = 'bar';
+ rootScope.context.foo = 'bar';
rootScope.digest(); //trigger
expect(listener).toHaveBeenCalledOnce();
listener.reset();
- rootScope.context['foo'] = 'baz';
+ rootScope.context.foo = 'baz';
watch.remove();
rootScope.digest(); //trigger
expect(listener).not.toHaveBeenCalled();
@@ -1190,7 +1167,7 @@ void main() {
it(r'should be possible to remove every watch',
(RootScope rootScope, FormatterMap formatters) {
- rootScope.context['foo'] = 'bar';
+ rootScope.context.foo = 'bar';
var watch1 = rootScope.watch('(foo|json)+"bar"', (v, p) => null,
formatters: formatters);
var watch2 = rootScope.watch('(foo|json)+"bar"', (v, p) => null,
@@ -1202,7 +1179,7 @@ void main() {
it(r'should not infinitely digest when current value is NaN', (RootScope rootScope) {
- rootScope.context['nan'] = double.NAN;
+ rootScope.context.nan = double.NAN;
rootScope.watch('nan', (_, __) => null);
expect(() {
@@ -1212,18 +1189,18 @@ void main() {
it(r'should prevent infinite digest and should log firing expressions', (RootScope rootScope) {
- rootScope.context['a'] = 0;
- rootScope.context['b'] = 0;
- rootScope.watch('a', (a, __) => rootScope.context['a'] = a + 1);
- rootScope.watch('b', (b, __) => rootScope.context['b'] = b + 1);
+ rootScope.context.a = 0;
+ rootScope.context.b = 0;
+ rootScope.watch('a', (a, __) => rootScope.context.a = a + 1);
+ rootScope.watch('b', (b, __) => rootScope.context.b = b + 1);
expect(() {
rootScope.digest();
}).toThrow('Model did not stabilize in 5 digests. '
- 'Last 3 iterations:\n'
- 'a: 2 <= 1, b: 2 <= 1\n'
- 'a: 3 <= 2, b: 3 <= 2\n'
- 'a: 4 <= 3, b: 4 <= 3');
+ 'Last 3 iterations:\n'
+ 'a: 2 <= 1, b: 2 <= 1\n'
+ 'a: 3 <= 2, b: 3 <= 2\n'
+ 'a: 4 <= 3, b: 4 <= 3');
});
@@ -1236,11 +1213,11 @@ void main() {
};
rootScope
- ..context['nanValue'] = double.NAN
- ..context['nullValue'] = null
- ..context['emptyString'] = ''
- ..context['falseValue'] = false
- ..context['numberValue'] = 23
+ ..context.nanValue = double.NAN
+ ..context.nullValue = null
+ ..context.emptyString = ''
+ ..context.falseValue = false
+ ..context.numberValue = 23
..watch('nanValue', logger)
..watch('nullValue', logger)
..watch('emptyString', logger)
@@ -1265,23 +1242,23 @@ void main() {
it('should properly watch array of fields 1', (RootScope rootScope, Logger log) {
- rootScope.context['foo'] = 12;
- rootScope.context['bar'] = 34;
+ rootScope.context.foo = 12;
+ rootScope.context.bar = 34;
rootScope.watch('[foo, bar]', (v, o) => log([v, o]));
expect(log).toEqual([]);
rootScope.apply();
expect(log).toEqual([[[12, 34], null]]);
log.clear();
- rootScope.context['foo'] = 56;
- rootScope.context['bar'] = 78;
+ rootScope.context.foo = 56;
+ rootScope.context.bar = 78;
rootScope.apply();
expect(log).toEqual([[[56, 78], [12, 34]]]);
});
it('should properly watch array of fields 2', (RootScope rootScope, Logger log) {
- rootScope.context['foo'] = () => 12;
+ rootScope.context.foo = () => 12;
rootScope.watch('foo()', (v, o) => log(v));
expect(log).toEqual([]);
rootScope.apply();
@@ -1290,7 +1267,7 @@ void main() {
it('should properly watch array of fields 3', (RootScope rootScope, Logger log) {
- rootScope.context['foo'] = 'abc';
+ rootScope.context.foo = 'abc';
rootScope.watch('foo.contains("b")', (v, o) => log([v, o]));
expect(log).toEqual([]);
rootScope.apply();
@@ -1299,9 +1276,9 @@ void main() {
});
it('should watch closures both as a leaf and as method call', (RootScope rootScope, Logger log) {
- rootScope.context['foo'] = new Foo();
- rootScope.context['increment'] = null;
- rootScope.watch('foo.increment', (v, _) => rootScope.context['increment'] = v);
+ rootScope.context.foo = new Foo();
+ rootScope.context.increment = null;
+ rootScope.watch('foo.increment', (v, _) => rootScope.context.increment = v);
rootScope.watch('increment(1)', (v, o) => log([v, o]));
expect(log).toEqual([]);
rootScope.apply();
@@ -1311,10 +1288,10 @@ void main() {
it('should not trigger new watcher in the flush where it was added', (Scope scope) {
var log = [] ;
- scope.context['foo'] = () => 'foo';
- scope.context['name'] = 'misko';
- scope.context['list'] = [2, 3];
- scope.context['map'] = {'bar': 'chocolate'};
+ scope.context.foo = () => 'foo';
+ scope.context.name = 'misko';
+ scope.context.list = [2, 3];
+ scope.context.map = {'bar': 'chocolate'};
scope.watch('1', (value, __) {
expect(value).toEqual(1);
scope.watch('foo()', (value, __) => log.add(value));
@@ -1367,13 +1344,13 @@ void main() {
it('should properly watch array of fields 4', (RootScope rootScope, Logger log) {
- rootScope.watch('[ctrl.foo, ctrl.bar]', (v, o) => log([v, o]));
+ rootScope.watch('[ctrl["foo"], ctrl["bar"]]', (v, o) => log([v, o]));
expect(log).toEqual([]);
rootScope.apply();
expect(log).toEqual([[[null, null], null]]);
log.clear();
- rootScope.context['ctrl'] = {'foo': 56, 'bar': 78};
+ rootScope.context.ctrl = {'foo': 56, 'bar': 78};
rootScope.apply();
expect(log).toEqual([[[56, 78], [null, null]]]);
});
@@ -1390,17 +1367,17 @@ void main() {
expect(log).toEqual(['foo:null']);
log.clear();
- rootScope.context['foo'] = true;
+ rootScope.context.foo = true;
rootScope.apply();
expect(log).toEqual(['foo:true', ':foo:true', '::foo:true']);
log.clear();
- rootScope.context['foo'] = 123;
+ rootScope.context.foo = 123;
rootScope.apply();
expect(log).toEqual(['foo:123', ':foo:123']);
log.clear();
- rootScope.context['foo'] = null;
+ rootScope.context.foo = null;
rootScope.apply();
expect(log).toEqual(['foo:null']);
log.clear();
@@ -1418,25 +1395,25 @@ void main() {
});
it(r'should cause a digest rerun', (RootScope rootScope) {
- rootScope.context['log'] = '';
- rootScope.context['value'] = 0;
+ rootScope.context.log = '';
+ rootScope.context.value = 0;
// NOTE(deboer): watch listener string functions not yet supported
//rootScope.watch('value', 'log = log + ".";');
- rootScope.watch('value', (_, __) { rootScope.context['log'] += "."; });
+ rootScope.watch('value', (_, __) { rootScope.context.log += "."; });
rootScope.watch('init', (_, __) {
rootScope.runAsync(() => rootScope.eval('value = 123; log = log + "=" '));
- expect(rootScope.context['value']).toEqual(0);
+ expect(rootScope.context.value).toEqual(0);
});
rootScope.digest();
- expect(rootScope.context['log']).toEqual('.=.');
+ expect(rootScope.context.log).toEqual('.=.');
});
it(r'should run async in the same order as added', (RootScope rootScope) {
- rootScope.context['log'] = '';
+ rootScope.context.log = '';
rootScope.runAsync(() => rootScope.eval("log = log + 1"));
rootScope.runAsync(() => rootScope.eval("log = log + 2"));
rootScope.digest();
- expect(rootScope.context['log']).toEqual('12');
+ expect(rootScope.context.log).toEqual('12');
});
});
@@ -1486,7 +1463,7 @@ void main() {
it('should call ExceptionHandler on digest errors',
async((RootScope rootScope, VmTurnZone zone, ExceptionHandler e) {
- rootScope.context['badOne'] = () => new Map();
+ rootScope.context.badOne = () => {};
rootScope.watch('badOne()', (_, __) => null);
try {
@@ -1636,3 +1613,8 @@ class UnstableList {
class Foo {
increment(x) => x+1;
}
+
+class Context {
+ var a;
+ var b;
+}
diff --git a/test/core_dom/compiler_spec.dart b/test/core_dom/compiler_spec.dart
index fab93e00b..2a0b5a035 100644
--- a/test/core_dom/compiler_spec.dart
+++ b/test/core_dom/compiler_spec.dart
@@ -73,10 +73,7 @@ void main() {
..bind(IncludeTranscludeAttrDirective)
..bind(LocalAttrDirective)
..bind(OneOfTwoDirectives)
- ..bind(TwoOfTwoDirectives)
- ..bind(MyController)
- ..bind(MyParentController)
- ..bind(MyChildController);
+ ..bind(TwoOfTwoDirectives);
});
beforeEach(inject((TestBed tb) => _ = tb));
@@ -84,7 +81,7 @@ void main() {
it('should compile basic hello world', () {
var element = _.compile('');
- _.rootScope.context['name'] = 'angular';
+ _.rootScope.context.name = 'angular';
expect(element.text).toEqual('');
_.rootScope.apply();
@@ -113,7 +110,7 @@ void main() {
it('should compile a directive in a child', () {
var element = _.compile('');
- _.rootScope.context['items'] = ['A', 'b'];
+ _.rootScope.context.items = ['A', 'b'];
expect(element.text).toEqual('');
_.rootScope.apply();
expect(element.text).toEqual('Ab');
- _.rootScope.context['items'] = [];
+ _.rootScope.context.items = [];
_.rootScope.apply();
expect(element).toHaveHtml('');
});
it('should compile text', (Compiler compile) {
var element = _.compile('
'
);
- Probe probe = _.rootScope.context['i'];
+ Probe probe = _.rootScope.context.$probes['i'];
var model = probe.directive(NgModel);
@@ -967,16 +967,16 @@ void main() {
'Things To Do ;-)
-
-
+
+
- Remaining {{todo.remaining()}} of {{todo.items.length}} items.
+Remaining {{ remaining() }} of {{ items.length }} items.
-
-
- +
-
@@ -31,9 +31,9 @@
Things To Do ;-)
- * ;
+ * ;
*
*
- * @Component(selector: '[foo]', publishAs: ctrl)
- * class FooController {
- * say(String something) => print(something);
+ * @Component(selector: '[foo]')
+ * class FooComponent {
+ * void say(String something) {
+ * print(something);
+ * }
* }
*
* When button is clicked, "Hello" will be printed in the console.
diff --git a/lib/core_dom/module_internal.dart b/lib/core_dom/module_internal.dart
index d4077c25b..78125647b 100644
--- a/lib/core_dom/module_internal.dart
+++ b/lib/core_dom/module_internal.dart
@@ -14,7 +14,7 @@ import 'package:angular/core/module_internal.dart';
import 'package:angular/core/parser/parser.dart';
import 'package:angular/core_dom/dom_util.dart' as util;
-import 'package:angular/change_detection/watch_group.dart' show Watch, PrototypeMap;
+import 'package:angular/change_detection/watch_group.dart' show Watch, ContextLocals;
import 'package:angular/core/registry.dart';
import 'package:angular/directive/module.dart' show NgBaseCss;
@@ -66,7 +66,6 @@ class CoreDomModule extends Module {
bind(ContentPort, toValue: null);
bind(ComponentCssRewriter);
bind(WebPlatform);
-
bind(Http);
bind(UrlRewriter);
bind(HttpBackend);
diff --git a/lib/core_dom/shadow_dom_component_factory.dart b/lib/core_dom/shadow_dom_component_factory.dart
index dbfab856e..1cff13369 100644
--- a/lib/core_dom/shadow_dom_component_factory.dart
+++ b/lib/core_dom/shadow_dom_component_factory.dart
@@ -52,23 +52,12 @@ class ShadowDomComponentFactory implements ComponentFactory {
_expando,
baseCss,
_styleElementCache);
- var controller = componentFactory.call(injector, scope, viewCache, http, templateCache,
- directives);
-
- componentFactory.shadowScope.context[component.publishAs] = controller;
- return controller;
+ return componentFactory.call(injector, scope, viewCache, http, templateCache, directives);
};
}
}
-
-/**
- * ComponentFactory is responsible for setting up components. This includes
- * the shadowDom, fetching template, importing styles, setting up attribute
- * mappings, publishing the controller, and compiling and caching the template.
- */
class _ComponentFactory implements Function {
-
final dom.Element element;
final Type type;
final Component component;
@@ -93,10 +82,9 @@ class _ComponentFactory implements Function {
ViewCache viewCache, Http http, TemplateCache templateCache,
DirectiveMap directives) {
shadowDom = element.createShadowRoot()
- ..applyAuthorStyles = component.applyAuthorStyles
- ..resetStyleInheritance = component.resetStyleInheritance;
+ ..applyAuthorStyles = component.applyAuthorStyles
+ ..resetStyleInheritance = component.resetStyleInheritance;
- shadowScope = scope.createChild({}); // Isolate
// TODO(pavelgj): fetching CSS with Http is mainly an attempt to
// work around an unfiled Chrome bug when reloading same CSS breaks
// styles all over the page. We shouldn't be doing browsers work,
@@ -109,8 +97,7 @@ class _ComponentFactory implements Function {
cssFutures = cssUrls.map((cssUrl) => _styleElementCache.putIfAbsent(
new _ComponentAssetKey(tag, cssUrl), () =>
http.get(cssUrl, cache: templateCache)
- .then((resp) => resp.responseText,
- onError: (e) => '/*\n$e\n*/\n')
+ .then((resp) => resp.responseText, onError: (e) => '/*\n$e\n*/\n')
.then((String css) {
// Shim CSS if required
@@ -120,15 +107,14 @@ class _ComponentFactory implements Function {
// If a css rewriter is installed, run the css through a rewriter
var styleElement = new dom.StyleElement()
- ..appendText(componentCssRewriter(css, selector: tag,
- cssUrl: cssUrl));
+ ..appendText(componentCssRewriter(css, selector: tag, cssUrl: cssUrl));
// ensure there are no invalid tags or modifications
treeSanitizer.sanitizeTree(styleElement);
// If the css shim is required, it means that scoping does not
// work, and adding the style to the head of the document is
- // preferrable.
+ // preferable.
if (platform.cssShimRequired) {
dom.document.head.append(styleElement);
}
@@ -164,7 +150,9 @@ class _ComponentFactory implements Function {
}
return shadowDom;
}));
- controller = createShadowInjector(injector, templateLoader).get(type);
+
+ var shadowInjector = createShadowInjector(scope, injector, templateLoader);
+ var controller = shadowInjector.get(type);
ComponentFactory._setupOnShadowDomAttach(controller, templateLoader, shadowScope);
return controller;
}
@@ -175,19 +163,23 @@ class _ComponentFactory implements Function {
return shadowDom;
}
- Injector createShadowInjector(injector, TemplateLoader templateLoader) {
+ Injector createShadowInjector(Scope scope, Injector injector, TemplateLoader templateLoader) {
var probe;
var shadowModule = new Module()
- ..bind(type)
- ..bind(NgElement)
- ..bind(EventHandler, toImplementation: ShadowRootEventHandler)
- ..bind(Scope, toValue: shadowScope)
- ..bind(TemplateLoader, toValue: templateLoader)
- ..bind(dom.ShadowRoot, toValue: shadowDom)
- ..bind(ElementProbe, toFactory: (_) => probe);
+ ..bind(type)
+ ..bind(NgElement)
+ ..bind(EventHandler, toImplementation: ShadowRootEventHandler)
+ ..bind(Scope, toFactory: (Injector inj) => scope.createChild(inj.get(type)))
+ ..bind(TemplateLoader, toValue: templateLoader)
+ ..bind(dom.ShadowRoot, toValue: shadowDom)
+ ..bind(ElementProbe, toFactory: (_) => probe);
+
shadowInjector = injector.createChild([shadowModule], name: SHADOW_DOM_INJECTOR_NAME);
+ shadowScope = shadowInjector.get(Scope);
+
probe = _expando[shadowDom] = new ElementProbe(
injector.get(ElementProbe), shadowDom, shadowInjector, shadowScope);
+
return shadowInjector;
}
}
@@ -220,4 +212,4 @@ class ComponentCssRewriter {
String call(String css, { String selector, String cssUrl} ) {
return css;
}
-}
\ No newline at end of file
+}
diff --git a/lib/core_dom/transcluding_component_factory.dart b/lib/core_dom/transcluding_component_factory.dart
index f5732c512..94cee6e0f 100644
--- a/lib/core_dom/transcluding_component_factory.dart
+++ b/lib/core_dom/transcluding_component_factory.dart
@@ -12,7 +12,7 @@ class Content implements AttachAware, DetachAware {
if (_port == null) return;
_beginComment = _port.content(_element);
}
-
+
void detach() {
if (_port == null) return;
_port.detachContent(_beginComment);
@@ -101,21 +101,20 @@ class TranscludingComponentFactory implements ComponentFactory {
}
TemplateLoader templateLoader = new TemplateLoader(elementFuture);
- Scope shadowScope = scope.createChild({});
-
var probe;
var childModule = new Module()
..bind(ref.type)
..bind(NgElement)
..bind(ContentPort, toValue: contentPort)
- ..bind(Scope, toValue: shadowScope)
+ ..bind(Scope, toFactory: (Injector inj) => scope.createChild(inj.get(ref.type)))
..bind(TemplateLoader, toValue: templateLoader)
..bind(dom.ShadowRoot, toValue: new ShadowlessShadowRoot(element))
..bind(ElementProbe, toFactory: (_) => probe);
childInjector = injector.createChild([childModule], name: SHADOW_DOM_INJECTOR_NAME);
var controller = childInjector.get(ref.type);
- shadowScope.context[component.publishAs] = controller;
+ var shadowScope = childInjector.get(Scope);
+
ComponentFactory._setupOnShadowDomAttach(controller, templateLoader, shadowScope);
return controller;
};
diff --git a/lib/directive/module.dart b/lib/directive/module.dart
index 3231baeb9..f62147de3 100644
--- a/lib/directive/module.dart
+++ b/lib/directive/module.dart
@@ -12,7 +12,8 @@
*
* For example:
*
- * this text is conditionally visible
+ * this text is conditionally visible
+ *
*/
library angular.directive;
diff --git a/lib/directive/ng_class.dart b/lib/directive/ng_class.dart
index 1ece01593..373a1cc4c 100644
--- a/lib/directive/ng_class.dart
+++ b/lib/directive/ng_class.dart
@@ -171,7 +171,8 @@ abstract class _NgClassBase {
nodeAttrs.observe('class', (String cls) {
if (prevCls != cls) {
prevCls = cls;
- _applyChanges(_scope.context[r'$index']);
+ var index = _hasLocal(_scope, r'$index') ? _getLocal(_scope, r'$index') : null;
+ _applyChanges(index);
}
});
}
@@ -180,7 +181,8 @@ abstract class _NgClassBase {
if (_watchExpression != null) _watchExpression.remove();
_watchExpression = _scope.watch(expression, (v, _) {
_computeChanges(v);
- _applyChanges(_scope.context[r'$index']);
+ var index = _hasLocal(_scope, r'$index') ? _getLocal(_scope, r'$index') : null;
+ _applyChanges(index);
},
canChangeModel: false,
collection: true);
@@ -276,3 +278,21 @@ abstract class _NgClassBase {
_previousSet = _currentSet.toSet();
}
}
+
+bool _hasLocal(context, name) {
+ var ctx = context;
+ while (ctx is ContextLocals) {
+ if (ctx.hasProperty(name)) return true;
+ ctx = ctx.parentScope;
+ }
+ return false;
+}
+
+dynamic _getLocal(context, name) {
+ var ctx = context;
+ while (ctx is ContextLocals) {
+ if (ctx.hasProperty(name)) return ctx[name];
+ ctx = ctx.parentScope;
+ }
+ return null;
+}
diff --git a/lib/directive/ng_control.dart b/lib/directive/ng_control.dart
index a13b623c7..649d11ebb 100644
--- a/lib/directive/ng_control.dart
+++ b/lib/directive/ng_control.dart
@@ -3,9 +3,9 @@ part of angular.directive;
/**
* Contains info and error states used during form and input validation.
*
- * NgControl is a common superclass for forms and input controls that handles info and error states, as well as
- * status flags. NgControl is used with the form and fieldset as well as all other directives that are used for
- * user input with NgModel.
+ * [NgControl] is a common superclass for forms and input controls that handles info and error
+ * states, as well as status flags. NgControl is used with the form and fieldset as well as all
+ * other directives that are used for user input with NgModel.
*/
abstract class NgControl implements AttachAware, DetachAware {
static const NG_VALID = "ng-valid";
diff --git a/lib/directive/ng_events.dart b/lib/directive/ng_events.dart
index 14c422d3f..5ccdc3b23 100644
--- a/lib/directive/ng_events.dart
+++ b/lib/directive/ng_events.dart
@@ -206,4 +206,4 @@ class NgEvent {
set onTouchMove(value) => initListener(element.onTouchMove, value);
set onTouchStart(value) => initListener(element.onTouchStart, value);
set onTransitionEnd(value) => initListener(element.onTransitionEnd, value);
-}
+}
\ No newline at end of file
diff --git a/lib/directive/ng_form.dart b/lib/directive/ng_form.dart
index 302de1c49..1b778470a 100644
--- a/lib/directive/ng_form.dart
+++ b/lib/directive/ng_form.dart
@@ -58,7 +58,6 @@ class NgForm extends NgControl {
set name(String value) {
if (value != null) {
super.name = value;
- _scope.context[name] = this;
}
}
diff --git a/lib/directive/ng_if.dart b/lib/directive/ng_if.dart
index 562bfa181..1ce6ba1be 100644
--- a/lib/directive/ng_if.dart
+++ b/lib/directive/ng_if.dart
@@ -10,23 +10,16 @@ abstract class _NgUnlessIfAttrDirectiveBase {
View _view;
- /**
- * The new child scope. This child scope is recreated whenever the `ng-if`
- * subtree is inserted into the DOM and destroyed when it's removed from the
- * DOM. Refer
- * https://github.com/angular/angular.js/wiki/The-Nuances-of-Scope-prototypical-Inheritance prototypical inheritance
- */
Scope _childScope;
- _NgUnlessIfAttrDirectiveBase(this._boundViewFactory, this._viewPort,
- this._scope);
+ _NgUnlessIfAttrDirectiveBase(this._boundViewFactory, this._viewPort, this._scope);
// Override in subclass.
void set condition(value);
void _ensureViewExists() {
if (_view == null) {
- _childScope = _scope.createChild(new PrototypeMap(_scope.context));
+ _childScope = _scope.createChild(_scope.context);
_view = _boundViewFactory(_childScope);
var view = _view;
_scope.rootScope.domWrite(() {
@@ -42,8 +35,8 @@ abstract class _NgUnlessIfAttrDirectiveBase {
_viewPort.remove(view);
});
_childScope.destroy();
- _view = null;
_childScope = null;
+ _view = null;
}
}
}
diff --git a/lib/directive/ng_include.dart b/lib/directive/ng_include.dart
index be450524f..923902271 100644
--- a/lib/directive/ng_include.dart
+++ b/lib/directive/ng_include.dart
@@ -27,7 +27,7 @@ class NgInclude {
final DirectiveMap directives;
View _view;
- Scope _scope;
+ Scope _childScope;
NgInclude(this.element, this.scope, this.viewCache, this.injector, this.directives);
@@ -35,19 +35,18 @@ class NgInclude {
if (_view == null) return;
_view.nodes.forEach((node) => node.remove);
- _scope.destroy();
+ _childScope.destroy();
+ _childScope = null;
element.innerHtml = '';
_view = null;
- _scope = null;
+
}
_updateContent(createView) {
// create a new scope
- _scope = scope.createChild(new PrototypeMap(scope.context));
- _view = createView(injector.createChild([new Module()
- ..bind(Scope, toValue: _scope)]));
-
+ _childScope = scope.createChild(scope.context);
+ _view = createView(injector.createChild([new Module()..bind(Scope, toValue: _childScope)]));
_view.nodes.forEach((node) => element.append(node));
}
diff --git a/lib/directive/ng_repeat.dart b/lib/directive/ng_repeat.dart
index f4b480b7c..15e857e26 100644
--- a/lib/directive/ng_repeat.dart
+++ b/lib/directive/ng_repeat.dart
@@ -112,8 +112,7 @@ class NgRepeat {
..[r'$index'] = index
..[r'$id'] = (obj) => obj;
if (_keyIdentifier != null) context[_keyIdentifier] = key;
- return relaxFnArgs(trackBy.eval)(new ScopeLocals(_scope.context,
- context));
+ return relaxFnArgs(trackBy.eval)(new ContextLocals(_scope.context, context));
});
}
@@ -151,17 +150,12 @@ class NgRepeat {
var domIndex;
var addRow = (int index, value, View previousView) {
- var childContext = _updateContext(new PrototypeMap(_scope.context), index,
- length)..[_valueIdentifier] = value;
+ var childContext = new ContextLocals(_scope.context);
+ childContext = _updateContext(childContext, index, length);
+ childContext[_valueIdentifier] = value;
var childScope = _scope.createChild(childContext);
var view = _boundViewFactory(childScope);
- var nodes = view.nodes;
- rows[index] = new _Row(_generateId(index, value, index))
- ..view = view
- ..scope = childScope
- ..nodes = nodes
- ..startNode = nodes.first
- ..endNode = nodes.last;
+ rows[index] = new _Row(_generateId(index, value, index), childScope, view);
_viewPort.insert(view, insertAfter: previousView);
};
@@ -224,8 +218,7 @@ class NgRepeat {
if (changeFn == null) {
rows[targetIndex] = _rows[targetIndex];
domIndex--;
- // The element has not moved but `$last` and `$middle` might still need
- // to be updated
+ // The element has not moved but `$last` and `$middle` might still need to be updated
_updateContext(rows[targetIndex].scope.context, targetIndex, length);
} else {
changeFn(targetIndex, previousView);
@@ -236,9 +229,10 @@ class NgRepeat {
_rows = rows;
}
- PrototypeMap _updateContext(PrototypeMap context, int index, int length) {
- var first = (index == 0);
- var last = (index == length - 1);
+ ContextLocals _updateContext(ContextLocals context, int index, int len) {
+ var first = index == 0;
+ var last = index == len - 1;
+
return context
..[r'$index'] = index
..[r'$first'] = first
@@ -253,9 +247,6 @@ class _Row {
final id;
Scope scope;
View view;
- dom.Element startNode;
- dom.Element endNode;
- List..
*
- * rootScope.myProbe.directive(SomeAttrDirective);
+ * rootScope.context.myProbe.directive(SomeAttrDirective);
*/
@Decorator(selector: '[probe]')
class Probe implements DetachAware {
@@ -18,11 +17,11 @@ class Probe implements DetachAware {
Probe(this.scope, this.injector, this.element) {
_probeName = element.attributes['probe'];
- scope.rootScope.context[_probeName] = this;
+ scope.rootScope.context.$probes[_probeName] = this;
}
void detach() {
- scope.rootScope.context[_probeName] = null;
+ scope.rootScope.context.$probes[_probeName] = null;
}
/**
diff --git a/lib/routing/ng_view.dart b/lib/routing/ng_view.dart
index 5c3659bd4..390353028 100644
--- a/lib/routing/ng_view.dart
+++ b/lib/routing/ng_view.dart
@@ -114,9 +114,10 @@ class NgView implements DetachAware, RouteProvider {
var viewFuture = viewDef.templateHtml != null ?
new Future.value(_viewCache.fromHtml(viewDef.templateHtml, newDirectives)) :
_viewCache.fromUrl(viewDef.template, newDirectives);
+
viewFuture.then((viewFactory) {
_cleanUp();
- _childScope = _scope.createChild(new PrototypeMap(_scope.context));
+ _childScope = _scope.createChild(_scope.context);
_view = viewFactory(
viewInjector.createChild([new Module()..bind(Scope, toValue: _childScope)]));
_view.nodes.forEach((elm) => _element.append(elm));
@@ -128,9 +129,8 @@ class NgView implements DetachAware, RouteProvider {
_view.nodes.forEach((node) => node.remove());
_childScope.destroy();
-
- _view = null;
_childScope = null;
+ _view = null;
}
Route get route => _viewRoute;
@@ -139,10 +139,10 @@ class NgView implements DetachAware, RouteProvider {
Map');
- _.rootScope.context['name'] = 'angular';
+ _.rootScope.context.name = 'angular';
expect(element.text).toEqual('');
_.rootScope.apply();
@@ -123,13 +120,13 @@ void main() {
it('should compile repeater', () {
var element = _.compile('
');
- _.rootScope.context['items'] = ['A', 'b'];
+ _.rootScope.context.items = ['A', 'b'];
expect(element.text).toEqual('');
_.rootScope.apply();
expect(element.text).toEqual('Ab');
- _.rootScope.context['items'] = [];
+ _.rootScope.context.items = [];
_.rootScope.apply();
expect(element).toHaveHtml('');
});
@@ -164,20 +161,20 @@ void main() {
it('should compile repeater with children', (Compiler compile) {
var element = _.compile('
{{name}}!
');
- _.rootScope.context['name'] = 'OK';
+ _.rootScope.context.name = 'OK';
microLeap();
_.rootScope.apply();
@@ -186,13 +183,13 @@ void main() {
it('should compile nested repeater', (Compiler compile) {
var element = _.compile(
- '' +
- '{{logger("inner")}} ');
compile(elts, _.injector.get(DirectiveMap))(_.injector.createChild([new Module()..bind(Scope, toValue: scope)]), elts);
expect(logger).toEqual(['new']);
@@ -633,7 +619,7 @@ void main() {
microLeap();
backend.flush();
microLeap();
- expect(logger).toEqual(['templateLoaded', _.rootScope.context['shadowRoot']]);
+ expect(logger).toEqual(['templateLoaded', _.rootScope.context.shadowRoot]);
logger.clear();
scope.destroy();
@@ -644,7 +630,7 @@ void main() {
it('should should not call attach after scope is destroyed', async((Compiler compile, Logger logger, MockHttpBackend backend) {
backend.whenGET('foo.html').respond('SHADOW-CONTENT )')
class SimpleComponent {
- Scope scope;
- SimpleComponent(Scope this.scope) {
- scope.context['name'] = 'INNER';
- }
+ var name = 'INNER';
}
@Component(
@@ -999,8 +900,7 @@ class ShadowlessComponent {
@Component(
selector: 'sometimes',
- template: r'
');
- _.rootScope.context['foo'] = 'success';
+ _.rootScope.context.foo = 'success';
_.rootScope.apply();
expect(_.rootElement.querySelector('span').text).toEqual('success');
});
diff --git a/test/directive/ng_model_spec.dart b/test/directive/ng_model_spec.dart
index 20b87665b..a12a31a05 100644
--- a/test/directive/ng_model_spec.dart
+++ b/test/directive/ng_model_spec.dart
@@ -39,7 +39,7 @@ void main() {
beforeEachModule((Module module) {
module
- ..bind(ControllerWithNoLove)
+ ..bind(ComponentWithNoLove)
..bind(MyCustomInputValidator)
..bind(CountingValidator);
});
@@ -69,18 +69,18 @@ void main() {
it('should update model from the input value', () {
_.compile('');
- Probe probe = _.rootScope.context['p'];
+ Probe probe = _.rootScope.context.$probes['p'];
var ngModel = probe.directive(NgModel);
InputElement inputElement = probe.element;
inputElement.value = 'abc';
_.triggerEvent(inputElement, 'change');
- expect(_.rootScope.context['model']).toEqual('abc');
+ expect(_.rootScope.context.model).toEqual('abc');
inputElement.value = 'def';
var input = probe.directive(InputTextLike);
input.processValue();
- expect(_.rootScope.context['model']).toEqual('def');
+ expect(_.rootScope.context.model).toEqual('def');
});
it('should write to input only if the value is different',
@@ -105,7 +105,7 @@ void main() {
..selectionEnd = 2;
scope.apply(() {
- scope.context['model'] = 'abc';
+ scope.context.model = 'abc';
});
expect(element.value).toEqual('abc');
@@ -114,7 +114,7 @@ void main() {
expect(element.selectionEnd).toEqual(2);
scope.apply(() {
- scope.context['model'] = 'xyz';
+ scope.context.model = 'xyz';
});
// Value updated. selectionStart/End changed.
@@ -125,12 +125,12 @@ void main() {
it('should only render the input value upon the next digest', (Scope scope) {
_.compile('');
- Probe probe = _.rootScope.context['p'];
+ Probe probe = _.rootScope.context.$probes['p'];
var ngModel = probe.directive(NgModel);
InputElement inputElement = probe.element;
ngModel.render('xyz');
- scope.context['model'] = 'xyz';
+ scope.context.model = 'xyz';
expect(inputElement.value).not.toEqual('xyz');
@@ -144,44 +144,44 @@ void main() {
it('should update model from the input value for type=number', () {
_.compile('');
- Probe probe = _.rootScope.context['p'];
+ Probe probe = _.rootScope.context.$probes['p'];
var ngModel = probe.directive(NgModel);
InputElement inputElement = probe.element;
inputElement.value = '12';
_.triggerEvent(inputElement, 'change');
- expect(_.rootScope.context['model']).toEqual(12);
+ expect(_.rootScope.context.model).toEqual(12);
inputElement.value = '14';
var input = probe.directive(InputNumberLike);
input.processValue();
- expect(_.rootScope.context['model']).toEqual(14);
+ expect(_.rootScope.context.model).toEqual(14);
});
it('should update input type=number to blank when model is null', () {
_.compile('');
- Probe probe = _.rootScope.context['p'];
+ Probe probe = _.rootScope.context.$probes['p'];
var ngModel = probe.directive(NgModel);
InputElement inputElement = probe.element;
inputElement.value = '12';
_.triggerEvent(inputElement, 'change');
- expect(_.rootScope.context['model']).toEqual(12);
+ expect(_.rootScope.context.model).toEqual(12);
- _.rootScope.context['model'] = null;
+ _.rootScope.context.model = null;
_.rootScope.apply();
expect(inputElement.value).toEqual('');
});
it('should be invalid when the input value results in a NaN value', () {
_.compile('');
- Probe probe = _.rootScope.context['p'];
+ Probe probe = _.rootScope.context.$probes['p'];
var ngModel = probe.directive(NgModel);
InputElement inputElement = probe.element;
inputElement.value = 'aa';
_.triggerEvent(inputElement, 'change');
- expect(_.rootScope.context['model'].isNaN).toBe(true);
+ expect(_.rootScope.context.model.isNaN).toBe(true);
expect(ngModel.valid).toBe(false);
});
@@ -201,19 +201,19 @@ void main() {
simulateTypingText(element, '1');
_.triggerEvent(element, 'change');
expect(element.value).toEqual('1');
- expect(_.rootScope.context[modelFieldName]).toEqual(1);
+ expect(_.rootScope.context.modelForNumFromInvalid1).toEqual(1);
simulateTypingText(element, 'e');
// Because the text is not a valid number, the element value is empty.
expect(element.value).toEqual('');
// When the input is invalid, the model is [double.NAN]:
_.triggerEvent(element, 'change');
- expect(_.rootScope.context[modelFieldName].isNaN).toBeTruthy();
+ expect(_.rootScope.context.modelForNumFromInvalid1.isNaN).toBeTruthy();
simulateTypingText(element, '1');
_.triggerEvent(element, 'change');
expect(element.value).toEqual('1e1');
- expect(_.rootScope.context[modelFieldName]).toEqual(10);
+ expect(_.rootScope.context.modelForNumFromInvalid1).toEqual(10);
});
it('should not reformat user input to equivalent numeric representation', (Injector i) {
@@ -226,7 +226,7 @@ void main() {
simulateTypingText(element, '1e-1');
expect(element.value).toEqual('1e-1');
- expect(_.rootScope.context[modelFieldName]).toEqual(0.1);
+ expect(_.rootScope.context.modelForNumFromInvalid2).toEqual(0.1);
});
it('should update input value from model', () {
@@ -247,56 +247,56 @@ void main() {
it('should update model from the input value', () {
_.compile('');
- Probe probe = _.rootScope.context['p'];
+ Probe probe = _.rootScope.context.$probes['p'];
var ngModel = probe.directive(NgModel);
InputElement inputElement = probe.element;
inputElement.value = '42';
_.triggerEvent(inputElement, 'change');
- expect(_.rootScope.context['model']).toEqual(42);
+ expect(_.rootScope.context.model).toEqual(42);
inputElement.value = '43';
var input = probe.directive(InputNumberLike);
input.processValue();
- expect(_.rootScope.context['model']).toEqual(43);
+ expect(_.rootScope.context.model).toEqual(43);
});
it('should update model to NaN from a blank input value', () {
_.compile('');
- Probe probe = _.rootScope.context['p'];
+ Probe probe = _.rootScope.context.$probes['p'];
var ngModel = probe.directive(NgModel);
InputElement inputElement = probe.element;
inputElement.value = '';
_.triggerEvent(inputElement, 'change');
- expect(_.rootScope.context['model'].isNaN).toBeTruthy();
+ expect(_.rootScope.context.model.isNaN).toBeTruthy();
});
it('should update model from the input value for range inputs', () {
_.compile('');
- Probe probe = _.rootScope.context['p'];
+ Probe probe = _.rootScope.context.$probes['p'];
var ngModel = probe.directive(NgModel);
InputElement inputElement = probe.element;
inputElement.value = '42';
_.triggerEvent(inputElement, 'change');
- expect(_.rootScope.context['model']).toEqual(42);
+ expect(_.rootScope.context.model).toEqual(42);
inputElement.value = '43';
var input = probe.directive(InputNumberLike);
input.processValue();
- expect(_.rootScope.context['model']).toEqual(43);
+ expect(_.rootScope.context.model).toEqual(43);
});
it('should update model to a native default value from a blank range input value', () {
_.compile('');
- Probe probe = _.rootScope.context['p'];
+ Probe probe = _.rootScope.context.$probes['p'];
var ngModel = probe.directive(NgModel);
InputElement inputElement = probe.element;
inputElement.value = '';
_.triggerEvent(inputElement, 'change');
- expect(_.rootScope.context['model']).toBeDefined();
+ expect(_.rootScope.context.model).toBeDefined();
});
it('should render null as blank', () {
@@ -309,12 +309,12 @@ void main() {
it('should only render the input value upon the next digest', (Scope scope) {
_.compile('');
- Probe probe = _.rootScope.context['p'];
+ Probe probe = _.rootScope.context.$probes['p'];
var ngModel = probe.directive(NgModel);
InputElement inputElement = probe.element;
ngModel.render(123);
- scope.context['model'] = 123;
+ scope.context.model = 123;
expect(inputElement.value).not.toEqual('123');
@@ -348,18 +348,18 @@ void main() {
it('should update model from the input value', () {
_.compile('');
- Probe probe = _.rootScope.context['p'];
+ Probe probe = _.rootScope.context.$probes['p'];
var ngModel = probe.directive(NgModel);
InputElement inputElement = probe.element;
inputElement.value = 'abc';
_.triggerEvent(inputElement, 'change');
- expect(_.rootScope.context['model']).toEqual('abc');
+ expect(_.rootScope.context.model).toEqual('abc');
inputElement.value = 'def';
var input = probe.directive(InputTextLike);
input.processValue();
- expect(_.rootScope.context['model']).toEqual('def');
+ expect(_.rootScope.context.model).toEqual('def');
});
@@ -385,7 +385,7 @@ void main() {
..selectionEnd = 2;
scope.apply(() {
- scope.context['model'] = 'abc';
+ scope.context.model = 'abc';
});
expect(element.value).toEqual('abc');
@@ -393,7 +393,7 @@ void main() {
expect(element.selectionEnd).toEqual(2);
scope.apply(() {
- scope.context['model'] = 'xyz';
+ scope.context.model = 'xyz';
});
expect(element.value).toEqual('xyz');
@@ -403,12 +403,12 @@ void main() {
it('should only render the input value upon the next digest', (Scope scope) {
_.compile('');
- Probe probe = _.rootScope.context['p'];
+ Probe probe = _.rootScope.context.$probes['p'];
var ngModel = probe.directive(NgModel);
InputElement inputElement = probe.element;
ngModel.render('xyz');
- scope.context['model'] = 'xyz';
+ scope.context.model = 'xyz';
expect(inputElement.value).not.toEqual('xyz');
@@ -441,18 +441,18 @@ void main() {
it('should update model from the input value', () {
_.compile('');
- Probe probe = _.rootScope.context['p'];
+ Probe probe = _.rootScope.context.$probes['p'];
var ngModel = probe.directive(NgModel);
InputElement inputElement = probe.element;
inputElement.value = 'abc';
_.triggerEvent(inputElement, 'change');
- expect(_.rootScope.context['model']).toEqual('abc');
+ expect(_.rootScope.context.model).toEqual('abc');
inputElement.value = 'def';
var input = probe.directive(InputTextLike);
input.processValue();
- expect(_.rootScope.context['model']).toEqual('def');
+ expect(_.rootScope.context.model).toEqual('def');
});
it('should write to input only if value is different',
@@ -477,7 +477,7 @@ void main() {
..selectionEnd = 2;
scope.apply(() {
- scope.context['model'] = 'abc';
+ scope.context.model = 'abc';
});
expect(element.value).toEqual('abc');
@@ -486,7 +486,7 @@ void main() {
expect(element.selectionEnd).toEqual(2);
scope.apply(() {
- scope.context['model'] = 'xyz';
+ scope.context.model = 'xyz';
});
// Value updated. selectionStart/End changed.
@@ -497,12 +497,12 @@ void main() {
it('should only render the input value upon the next digest', (Scope scope) {
_.compile('');
- Probe probe = _.rootScope.context['p'];
+ Probe probe = _.rootScope.context.$probes['p'];
var ngModel = probe.directive(NgModel);
InputElement inputElement = probe.element;
ngModel.render('xyz');
- scope.context['model'] = 'xyz';
+ scope.context.model = 'xyz';
expect(inputElement.value).not.toEqual('xyz');
@@ -541,18 +541,18 @@ void main() {
it('should update model from the input value', () {
_.compile('');
- Probe probe = _.rootScope.context['p'];
+ Probe probe = _.rootScope.context.$probes['p'];
var ngModel = probe.directive(NgModel);
InputElement inputElement = probe.element;
inputElement.value = 'abc';
_.triggerEvent(inputElement, 'change');
- expect(_.rootScope.context['model']).toEqual('abc');
+ expect(_.rootScope.context.model).toEqual('abc');
inputElement.value = 'def';
var input = probe.directive(InputTextLike);
input.processValue();
- expect(_.rootScope.context['model']).toEqual('def');
+ expect(_.rootScope.context.model).toEqual('def');
});
it('should write to input only if value is different',
@@ -577,7 +577,7 @@ void main() {
..selectionEnd = 2;
scope.apply(() {
- scope.context['model'] = 'abc';
+ scope.context.model = 'abc';
});
expect(element.value).toEqual('abc');
@@ -585,7 +585,7 @@ void main() {
expect(element.selectionEnd).toEqual(2);
scope.apply(() {
- scope.context['model'] = 'xyz';
+ scope.context.model = 'xyz';
});
expect(element.value).toEqual('xyz');
@@ -595,12 +595,12 @@ void main() {
it('should only render the input value upon the next digest', (Scope scope) {
_.compile('');
- Probe probe = _.rootScope.context['p'];
+ Probe probe = _.rootScope.context.$probes['p'];
var ngModel = probe.directive(NgModel);
InputElement inputElement = probe.element;
ngModel.render('xyz');
- scope.context['model'] = 'xyz';
+ scope.context.model = 'xyz';
expect(inputElement.value).not.toEqual('xyz');
@@ -615,19 +615,19 @@ void main() {
var element = _.compile('');
scope.apply(() {
- scope.context['model'] = true;
+ scope.context.model = true;
});
expect(element.checked).toBe(true);
scope.apply(() {
- scope.context['model'] = false;
+ scope.context.model = false;
});
expect(element.checked).toBe(false);
});
it('should render as dirty when checked', (Scope scope) {
var element = _.compile('');
- Probe probe = _.rootScope.context['i'];
+ Probe probe = _.rootScope.context.$probes['i'];
var model = probe.directive(NgModel);
expect(model.pristine).toEqual(true);
@@ -643,39 +643,39 @@ void main() {
var element = _.compile('');
scope.apply(() {
- scope.context['model'] = 1;
+ scope.context.model = 1;
});
expect(element.checked).toBe(true);
scope.apply(() {
- scope.context['model'] = 0;
+ scope.context.model = 0;
});
expect(element.checked).toBe(false);
element.checked = true;
_.triggerEvent(element, 'change');
- expect(scope.context['model']).toBe(1);
+ expect(scope.context.model).toBe(1);
element.checked = false;
_.triggerEvent(element, 'change');
- expect(scope.context['model']).toBe(0);
+ expect(scope.context.model).toBe(0);
});
it('should allow non boolean values like null, 0, 1', (Scope scope) {
var element = _.compile('');
scope.apply(() {
- scope.context['model'] = 0;
+ scope.context.model = 0;
});
expect(element.checked).toBe(false);
scope.apply(() {
- scope.context['model'] = 1;
+ scope.context.model = 1;
});
expect(element.checked).toBe(true);
scope.apply(() {
- scope.context['model'] = null;
+ scope.context.model = null;
});
expect(element.checked).toBe(false);
});
@@ -685,38 +685,38 @@ void main() {
element.checked = true;
_.triggerEvent(element, 'change');
- expect(scope.context['model']).toBe(true);
+ expect(scope.context.model).toBe(true);
element.checked = false;
_.triggerEvent(element, 'change');
- expect(scope.context['model']).toBe(false);
+ expect(scope.context.model).toBe(false);
});
it('should update model from the input using ng-true-value/false', (Scope scope) {
- var element = _.compile('');
+ var element = _.compile(
+ '');
scope.apply(() {
- scope.context['yes'] = 'yes sir!';
- scope.context['no'] = 'no, sorry';
+ scope.context.yes = 'yes sir!';
+ scope.context.no = 'no, sorry';
});
element.checked = true;
_.triggerEvent(element, 'change');
- expect(scope.context['model']).toEqual('yes sir!');
+ expect(scope.context.model).toEqual('yes sir!');
element.checked = false;
_.triggerEvent(element, 'change');
- expect(scope.context['model']).toEqual('no, sorry');
+ expect(scope.context.model).toEqual('no, sorry');
});
it('should only render the input value upon the next digest', (Scope scope) {
_.compile('');
- Probe probe = _.rootScope.context['p'];
+ Probe probe = _.rootScope.context.$probes['p'];
var ngModel = probe.directive(NgModel);
InputElement inputElement = probe.element;
ngModel.render('xyz');
- scope.context['model'] = true;
+ scope.context.model = true;
expect(inputElement.checked).toBe(false);
@@ -749,18 +749,18 @@ void main() {
it('should update model from the input value', () {
_.compile('');
- Probe probe = _.rootScope.context['p'];
+ Probe probe = _.rootScope.context.$probes['p'];
var ngModel = probe.directive(NgModel);
TextAreaElement inputElement = probe.element;
ngModel.render('xyz');
- scope.context['model'] = 'xyz';
+ scope.context.model = 'xyz';
expect(inputElement.value).not.toEqual('xyz');
@@ -826,9 +826,9 @@ void main() {
'');
_.rootScope.apply();
- RadioButtonInputElement redBtn = _.rootScope.context['r'].element;
- RadioButtonInputElement greenBtn = _.rootScope.context['g'].element;
- RadioButtonInputElement blueBtn = _.rootScope.context['b'].element;
+ RadioButtonInputElement redBtn = _.rootScope.context.$probes['r'].element;
+ RadioButtonInputElement greenBtn = _.rootScope.context.$probes['g'].element;
+ RadioButtonInputElement blueBtn = _.rootScope.context.$probes['b'].element;
expect(redBtn.checked).toBe(false);
expect(greenBtn.checked).toBe(false);
@@ -851,13 +851,13 @@ void main() {
// Should update model with value of checked element.
_.triggerEvent(redBtn, 'click');
- expect(_.rootScope.context['color']).toEqual('red');
+ expect(_.rootScope.context.color).toEqual('red');
expect(redBtn.checked).toBe(true);
expect(greenBtn.checked).toBe(false);
expect(blueBtn.checked).toBe(false);
_.triggerEvent(greenBtn, 'click');
- expect(_.rootScope.context['color']).toEqual('green');
+ expect(_.rootScope.context.color).toEqual('green');
expect(redBtn.checked).toBe(false);
expect(greenBtn.checked).toBe(true);
expect(blueBtn.checked).toBe(false);
@@ -872,22 +872,22 @@ void main() {
var green = {'name': 'GREEN'};
var blue = {'name': 'BLUE'};
_.rootScope.context
- ..['red'] = red
- ..['green'] = green
- ..['blue'] = blue;
+ ..red = red
+ ..green = green
+ ..blue = blue;
_.rootScope.apply();
- RadioButtonInputElement redBtn = _.rootScope.context['r'].element;
- RadioButtonInputElement greenBtn = _.rootScope.context['g'].element;
- RadioButtonInputElement blueBtn = _.rootScope.context['b'].element;
+ RadioButtonInputElement redBtn = _.rootScope.context.$probes['r'].element;
+ RadioButtonInputElement greenBtn = _.rootScope.context.$probes['g'].element;
+ RadioButtonInputElement blueBtn = _.rootScope.context.$probes['b'].element;
expect(redBtn.checked).toBe(false);
expect(greenBtn.checked).toBe(false);
expect(blueBtn.checked).toBe(false);
// Should change correct element to checked.
- _.rootScope.context['color'] = green;
+ _.rootScope.context.color = green;
_.rootScope.apply();
expect(redBtn.checked).toBe(false);
@@ -895,7 +895,7 @@ void main() {
expect(blueBtn.checked).toBe(false);
// Non-existing element.
- _.rootScope.context['color'] = {};
+ _.rootScope.context.color = {};
_.rootScope.apply();
expect(redBtn.checked).toBe(false);
@@ -905,13 +905,13 @@ void main() {
// Should update model with value of checked element.
_.triggerEvent(redBtn, 'click');
- expect(_.rootScope.context['color']).toEqual(red);
+ expect(_.rootScope.context.color).toEqual(red);
expect(redBtn.checked).toBe(true);
expect(greenBtn.checked).toBe(false);
expect(blueBtn.checked).toBe(false);
_.triggerEvent(greenBtn, 'click');
- expect(_.rootScope.context['color']).toEqual(green);
+ expect(_.rootScope.context.color).toEqual(green);
expect(redBtn.checked).toBe(false);
expect(greenBtn.checked).toBe(true);
expect(blueBtn.checked).toBe(false);
@@ -924,7 +924,7 @@ void main() {
' ' +
'- ' +
- '
- {{li}} ' + - '
'
+ '
');
- _.rootScope.context['uls'] = [['A'], ['b']];
+ _.rootScope.context.uls = [['A'], ['b']];
_.rootScope.apply();
expect(element.text).toEqual('Ab');
@@ -229,7 +226,7 @@ void main() {
it('should support bind- syntax', () {
var element = _.compile('');
- _.rootScope.context['name'] = 'angular';
+ _.rootScope.context.name = 'angular';
expect(element.text).toEqual('');
_.rootScope.apply();
@@ -239,19 +236,18 @@ void main() {
it('should work with attrs, one-way, two-way and callbacks', async(() {
_.compile('- '
+ '
- {{li}} ' + '
{{name}}
');
- _.rootScope.context['name'] = 'angular';
+ _.rootScope.context.name = 'angular';
_.rootScope.apply();
expect(element.text).toEqual('angular');
@@ -289,7 +285,6 @@ void main() {
..bind(NonAssignableMappingComponent)
..bind(ParentExpressionComponent)
..bind(PublishMeComponent)
- ..bind(PublishMeDirective)
..bind(LogComponent)
..bind(AttachDetachComponent)
..bind(SimpleAttachComponent)
@@ -322,7 +317,7 @@ void main() {
_.rootScope.apply();
expect(element).toHaveText('And ');
- _.rootScope.context['sometimes'] = true;
+ _.rootScope.context.sometimes = true;
microLeap();
_.rootScope.apply();
expect(element).toHaveText('And jump');
@@ -332,17 +327,17 @@ void main() {
var element = _.compile(r'And jump
');
document.body.append(element);
- _.rootScope.context['sometimes'] = true;
+ _.rootScope.context.sometimes = true;
microLeap();
_.rootScope.apply();
expect(element).toHaveText('And jump');
- _.rootScope.context['sometimes'] = false;
+ _.rootScope.context.sometimes = false;
microLeap();
_.rootScope.apply();
expect(element).toHaveText('And ');
- _.rootScope.context['sometimes'] = true;
+ _.rootScope.context.sometimes = true;
microLeap();
_.rootScope.apply();
expect(element).toHaveText('And jump');
@@ -356,7 +351,7 @@ void main() {
expect(simpleElement).toHaveText('INNER(innerText)');
var simpleProbe = ngProbe(simpleElement);
var simpleComponent = simpleProbe.injector.get(SimpleComponent);
- expect(simpleComponent.scope.context['name']).toEqual('INNER');
+ expect(simpleComponent.name).toEqual('INNER');
var shadowRoot = simpleElement.shadowRoot;
// If there is no shadow root, skip this.
@@ -369,7 +364,7 @@ void main() {
}));
it('should create a simple component', async((VmTurnZone zone) {
- _.rootScope.context['name'] = 'OUTTER';
+ _.rootScope.context.name = 'OUTTER';
var element = _.compile(r'{{name}}:{{name}}
');
microLeap();
_.rootScope.apply();
@@ -377,8 +372,8 @@ void main() {
}));
it('should create a component that can access parent scope', async((VmTurnZone zone) {
- _.rootScope.context['fromParent'] = "should not be used";
- _.rootScope.context['val'] = "poof";
+ _.rootScope.context.fromParent = "should not be used";
+ _.rootScope.context.val = "poof";
var element = _.compile('{{ctrlName.value}}
WORKED
');
- var scope = _.rootScope.createChild({});
- scope.context['isReady'] = 'ready';
- scope.context['logger'] = logger;
- scope.context['once'] = null;
+ var scope = _.rootScope.createChild(_.rootScope.context);
+ scope.context.isReady = 'ready';
+ scope.context.logger = logger;
+ scope.context.once = null;
var elts = es('WORKED
');
var elts = es('view
');
- microLeap();
-
- _.rootScope.apply();
- expect(log.result()).toEqual('IncludeTransclude; SimpleTransclude');
- }));
-
- it('should expose a parent controller to the scope of its children', (TestBed _) {
- var element = _.compile(''
- '
');
-
- _.rootScope.apply();
-
- expect(element.text).toContain('my data');
- });
-
- it('should expose a ancestor controller to the scope of its children thru a undecorated element', (TestBed _) {
- var element = _.compile(
- '{{ my_parent.data() }}
'
- ''
- '
');
-
- _.rootScope.apply();
-
- expect(element.text).toContain('my data');
- });
- });
-
-
- describe('Decorator', () {
- it('should allow creation of a new scope', () {
- _.rootScope.context['name'] = 'cover me';
- _.compile(''
- '
'
- '{{ my_parent.data() }}
'
- '{{name}}
inside {{fromParent()}}
',
map: const {
- 'from-parent': '&scope.context.fromParent',
+ 'from-parent': '&fromParent',
})
class ParentExpressionComponent {
Scope scope;
- ParentExpressionComponent(Scope this.scope);
+ var fromParent;
}
@Component(
selector: 'publish-me',
- template: r'{{ctrlName.value}}',
- publishAs: 'ctrlName')
+ template: r'{{value}}')
class PublishMeComponent {
String value = 'WORKED';
}
-@Controller (
- selector: '[publish-me]',
- publishAs: 'ctrlName')
-class PublishMeDirective {
- String value = 'WORKED';
-}
-
-
@Component(
selector: 'log',
- template: r'
-
+
- ''',
- publishAs: 'ctrl')
+ ''')
class BarComponent {
var invoked = false;
BarComponent(RootScope scope) {
- scope.context['ctrl'] = this;
+ scope.context.ctrl = this;
}
}
@@ -28,7 +21,6 @@ main() {
Element ngAppElement;
beforeEachModule((Module module) {
ngAppElement = new DivElement()..attributes['ng-app'] = '';
- module..bind(FooController);
module..bind(BarComponent);
module..bind(Node, toValue: ngAppElement);
document.body.append(ngAppElement);
@@ -47,29 +39,28 @@ main() {
it('should register and handle event', inject((TestBed _) {
var e = compile(_,
- '''
-
+ '''
' +
'
+
''');
_.triggerEvent(e.querySelector('[on-abc]'), 'abc');
- expect(_.getScope(e).context['ctrl'].invoked).toEqual(true);
+ expect(_.rootScope.context.invoked).toEqual(true);
}));
it('shoud register and handle event with long name', inject((TestBed _) {
var e = compile(_,
- '''
-
+ '''
');
- _.rootScope.context['model'] = 'b';
- _.rootScope.context['attached'] = true;
+ _.rootScope.context.model = 'b';
+ _.rootScope.context.attached = true;
_.rootScope.apply();
expect(_.rootElement).toEqualSelect(['a', ['b']]);
- _.rootScope.context['attached'] = false;
+ _.rootScope.context.attached = false;
_.rootScope.apply();
expect(_.rootElement).toEqualSelect([]);
- _.rootScope.context['attached'] = true;
+ _.rootScope.context.attached = true;
_.rootScope.apply();
expect(_.rootElement).toEqualSelect(['a', ['b']]);
});
@@ -410,14 +410,14 @@ main() {
'' +
'
+
''');
_.triggerEvent(e.querySelector('[on-my-new-event]'), 'myNewEvent');
- var fooScope = _.getScope(e);
- expect(fooScope.context['ctrl'].invoked).toEqual(true);
+ expect(_.rootScope.context.invoked).toEqual(true);
}));
it('shoud have model updates applied correctly', inject((TestBed _) {
var e = compile(_,
- '''
-
' +
'{{ctrl.description}}
+ '''
+
''');
var el = document.querySelector('[on-abc]');
el.dispatchEvent(new Event('abc'));
@@ -85,15 +76,15 @@ main() {
var shadowRoot = e.shadowRoot;
var span = shadowRoot.querySelector('span');
span.dispatchEvent(new CustomEvent('abc'));
- var ctrl = _.rootScope.context['ctrl'];
+ var ctrl = _.rootScope.context.ctrl;
expect(ctrl.invoked).toEqual(true);
}));
it('shoud handle event within content only once', async(inject((TestBed _) {
var e = compile(_,
- '''{{description}}
+ '''
-
+
''');
@@ -102,10 +93,9 @@ main() {
document.querySelector('[on-abc]').dispatchEvent(new Event('abc'));
var shadowRoot = document.querySelector('bar').shadowRoot;
var shadowRootScope = _.getScope(shadowRoot);
- expect(shadowRootScope.context['ctrl'].invoked).toEqual(false);
+ expect(shadowRootScope.context.invoked).toEqual(false);
- var fooScope = _.getScope(document.querySelector('[foo]'));
- expect(fooScope.context['ctrl'].invoked).toEqual(true);
+ expect(_.rootScope.context.invoked).toEqual(true);
})));
});
}
diff --git a/test/core_dom/mustache_spec.dart b/test/core_dom/mustache_spec.dart
index ba47f09b6..f49030f46 100644
--- a/test/core_dom/mustache_spec.dart
+++ b/test/core_dom/mustache_spec.dart
@@ -17,7 +17,7 @@ main() {
var element = es('
'],
(html) {
- var values = rootScope.context['values'] = [1, 2, 3, 4];
+ var values = rootScope.context.values = [1, 2, 3, 4];
compile(html);
expect(element).toHaveText('repeat;repeat;repeat;repeat;if;repeat2;repeat2;repeat2;repeat2;');
rootScope.apply(() {
@@ -137,17 +158,17 @@ main() {
'{{name}}!
');
var template = compile(element, directives);
- rootScope.context['name'] = 'OK';
+ rootScope.context.name = 'OK';
var view = template(injector);
element = view.nodes;
@@ -36,7 +36,7 @@ main() {
expect(_.rootElement.attributes['dir-foo']).toEqual('');
_.rootScope.apply(() {
- _.rootScope.context['val'] = 'value';
+ _.rootScope.context.val = 'value';
});
// _FooDirective should have observed exactly one change.
expect(_.rootElement.attributes['dir-foo']).toEqual('value');
@@ -51,8 +51,8 @@ main() {
e('');
var template = compile([element], directives);
- rootScope.context['name'] = 'OK';
- rootScope.context['age'] = 23;
+ rootScope.context.name = 'OK';
+ rootScope.context.age = 23;
var view = template(injector);
element = view.nodes[0];
@@ -70,8 +70,8 @@ main() {
e('');
var template = compile([element], directives);
- rootScope.context['line1'] = 'L1';
- rootScope.context['line2'] = 'L2';
+ rootScope.context.line1 = 'L1';
+ rootScope.context.line2 = 'L2';
var view = template(injector);
element = view.nodes[0];
@@ -107,12 +107,12 @@ main() {
expect(element).not.toHaveClass('ng-hide');
_.rootScope.apply(() {
- _.rootScope.context['isVisible'] = true;
+ _.rootScope.context.isVisible = true;
});
expect(element).not.toHaveClass('ng-hide');
_.rootScope.apply(() {
- _.rootScope.context['isVisible'] = false;
+ _.rootScope.context.isVisible = false;
});
expect(element).toHaveClass('ng-hide');
});
@@ -125,13 +125,13 @@ main() {
expect(element).not.toHaveClass('ng-hide');
_.rootScope.apply(() {
- _.rootScope.context['currentCls'] = 'active';
+ _.rootScope.context.currentCls = 'active';
});
expect(element).toHaveClass('active');
expect(element).toHaveClass('ng-hide');
_.rootScope.apply(() {
- _.rootScope.context['isVisible'] = true;
+ _.rootScope.context.isVisible = true;
});
expect(element).toHaveClass('active');
expect(element).not.toHaveClass('ng-hide');
diff --git a/test/core_dom/view_spec.dart b/test/core_dom/view_spec.dart
index f43ba12ee..f833a29b8 100644
--- a/test/core_dom/view_spec.dart
+++ b/test/core_dom/view_spec.dart
@@ -199,7 +199,9 @@ main() {
..bind(Log)
..bind(AFormatter)
..bind(ADirective)
- ..bind(Node, toFactory: (injector) => document.body);
+ ..bind(Node, toFactory: (injector) => document.body)
+ ..bind(Object, toImplementation: TestContext)
+ ;
Injector rootInjector = applicationFactory()
.addModule(rootModule)
diff --git a/test/core_dom/web_platform_spec.dart b/test/core_dom/web_platform_spec.dart
index 647e34c39..3f8cc2fb0 100644
--- a/test/core_dom/web_platform_spec.dart
+++ b/test/core_dom/web_platform_spec.dart
@@ -170,7 +170,6 @@ main() {
@Component(
selector: "test-wptc",
- publishAs: "ctrl",
templateUrl: "template.html",
cssUrl: "style.css")
class WebPlatformTestComponent {
@@ -178,7 +177,6 @@ class WebPlatformTestComponent {
@Component(
selector: "my-inner",
- publishAs: "ctrl",
templateUrl: "inner-html.html",
cssUrl: "inner-style.css")
class InnerComponent {
@@ -186,7 +184,6 @@ class InnerComponent {
@Component(
selector: "my-outer",
- publishAs: "ctrl",
templateUrl: "outer-html.html",
cssUrl: "outer-style.css")
class OuterComponent {
diff --git a/test/directive/ng_a_spec.dart b/test/directive/ng_a_spec.dart
index 7663f7592..2c331e49b 100644
--- a/test/directive/ng_a_spec.dart
+++ b/test/directive/ng_a_spec.dart
@@ -14,15 +14,15 @@ main() {
it('should bind click listener when href zero length string', (Scope scope) {
_.compile('');
_.triggerEvent(_.rootElement, 'click', 'MouseEvent');
- expect(_.rootScope.context['abc']).toEqual(4);
- expect(_.rootScope.context['event'] is dom.UIEvent).toEqual(true);
+ expect(_.rootScope.context.abc).toEqual(4);
+ expect(_.rootScope.context.event is dom.UIEvent).toEqual(true);
});
- it('should bind click listener when href empty', (Scope scope) {
+ it('should bind click listener when href empty', () {
_.compile('');
_.triggerEvent(_.rootElement, 'click', 'MouseEvent');
- expect(_.rootScope.context['abc']).toEqual(5);
- expect(_.rootScope.context['event'] is dom.UIEvent).toEqual(true);
+ expect(_.rootScope.context.abc).toEqual(5);
+ expect(_.rootScope.context.event is dom.UIEvent).toEqual(true);
});
it('should not bind click listener to non empty href', (Scope scope) {
@@ -43,10 +43,10 @@ main() {
_.compile('');
_.triggerEvent(_.rootElement, 'click', 'MouseEvent');
- expect(_.rootScope.context['abc']).toEqual(true);
- expect(_.rootScope.context['event'] is dom.UIEvent).toEqual(true);
+ expect(_.rootScope.context.abc).toEqual(true);
+ expect(_.rootScope.context.event is dom.UIEvent).toEqual(true);
window.location.href = '#';
- _.rootScope.context['url'] = '#url';
+ _.rootScope.context.url = '#url';
_.rootScope.apply();
_.triggerEvent(_.rootElement, 'click', 'MouseEvent');
expect(window.location.href.endsWith("#url")).toEqual(true);
diff --git a/test/directive/ng_bind_html_spec.dart b/test/directive/ng_bind_html_spec.dart
index e1a0ad665..43d6707a3 100644
--- a/test/directive/ng_bind_html_spec.dart
+++ b/test/directive/ng_bind_html_spec.dart
@@ -10,7 +10,7 @@ main() {
(Scope scope, Injector injector, Compiler compiler, DirectiveMap directives) {
var element = es('');
compiler(element, directives)(injector, element);
- scope.context['htmlVar'] = 'Google!';
+ scope.context.htmlVar = 'Google!';
scope.apply();
// Sanitization removes the href attribute on the tag.
expect(element).toHaveHtml('Google!');
@@ -29,7 +29,7 @@ main() {
it('should use injected NodeValidator and override default sanitize behavior', (Scope scope, Injector injector, Compiler compiler, DirectiveMap directives) {
var element = es('');
compiler(element, directives)(injector, element);
- scope.context['htmlVar'] = 'Google!';
+ scope.context.htmlVar = 'Google!';
scope.apply();
// Sanitation allows href attributes per injected sanitizer.
expect(element).toHaveHtml('Google!');
diff --git a/test/directive/ng_bind_spec.dart b/test/directive/ng_bind_spec.dart
index af65f7f9d..7e9946701 100644
--- a/test/directive/ng_bind_spec.dart
+++ b/test/directive/ng_bind_spec.dart
@@ -11,7 +11,7 @@ main() {
it('should set.text', (Scope scope, Injector injector, Compiler compiler, DirectiveMap directives) {
var element = e('');
compiler([element], directives)(injector, [element]);
- scope.context['a'] = "abc123";
+ scope.context.a = "abc123";
scope.apply();
expect(element.text).toEqual('abc123');
});
@@ -21,17 +21,17 @@ main() {
var element = _.compile('');
scope.apply(() {
- scope.context['value'] = null;
+ scope.context.value = null;
});
expect(element.text).toEqual('');
scope.apply(() {
- scope.context['value'] = true;
+ scope.context.value = true;
});
expect(element.text).toEqual('true');
scope.apply(() {
- scope.context['value'] = 1;
+ scope.context.value = 1;
});
expect(element.text).toEqual('1');
});
diff --git a/test/directive/ng_bind_template_spec.dart b/test/directive/ng_bind_template_spec.dart
index 3516c7e4e..b85c8b068 100644
--- a/test/directive/ng_bind_template_spec.dart
+++ b/test/directive/ng_bind_template_spec.dart
@@ -11,13 +11,13 @@ main() {
it('should bind template',
(Scope scope, Injector injector, Compiler compiler) {
var element = _.compile('');
- scope.context['salutation'] = 'Hello';
- scope.context['name'] = 'Heisenberg';
+ scope.context.salutation = 'Hello';
+ scope.context.name = 'Heisenberg';
scope.apply();
expect(element.text).toEqual('Hello Heisenberg!');
- scope.context['salutation'] = 'Good-Bye';
+ scope.context.salutation = 'Good-Bye';
scope.apply();
expect(element.text).toEqual('Good-Bye Heisenberg!');
diff --git a/test/directive/ng_class_spec.dart b/test/directive/ng_class_spec.dart
index 3f3111bef..93c1e93a2 100644
--- a/test/directive/ng_class_spec.dart
+++ b/test/directive/ng_class_spec.dart
@@ -10,18 +10,18 @@ main() {
it('should add new and remove old classes dynamically', () {
var element = _.compile('');
- _.rootScope.context['dynClass'] = 'A';
+ _.rootScope.context.dynClass = 'A';
_.rootScope.apply();
expect(element).toHaveClass('existing');
expect(element).toHaveClass('A');
- _.rootScope.context['dynClass'] = 'B';
+ _.rootScope.context.dynClass = 'B';
_.rootScope.apply();
expect(element).toHaveClass('existing');
expect(element).not.toHaveClass('A');
expect(element).toHaveClass('B');
- _.rootScope.context['dynClass'] = null;
+ _.rootScope.context.dynClass = null;
_.rootScope.apply();
expect(element).toHaveClass('existing');
expect(element).not.toHaveClass('A');
@@ -30,9 +30,9 @@ main() {
it('should support adding multiple classes via an array', () {
- _.rootScope.context['a'] = 'a';
- _.rootScope.context['b'] = '';
- _.rootScope.context['c'] = null;
+ _.rootScope.context.a = 'a';
+ _.rootScope.context.b = '';
+ _.rootScope.context.c = null;
var element = _.compile('');
_.rootScope.apply();
expect(element).toHaveClass('existing');
@@ -40,9 +40,9 @@ main() {
expect(element).not.toHaveClass('b');
expect(element).not.toHaveClass('c');
expect(element).not.toHaveClass('null');
- _.rootScope.context['a'] = null;
- _.rootScope.context['b'] = 'b';
- _.rootScope.context['c'] = 'c';
+ _.rootScope.context.a = null;
+ _.rootScope.context.b = 'b';
+ _.rootScope.context.c = 'c';
_.rootScope.apply();
expect(element).not.toHaveClass('a');
expect(element).toHaveClass('b');
@@ -56,15 +56,15 @@ main() {
'' +
'
');
- _.rootScope.context['conditionA'] = true;
- _.rootScope.context['conditionB'] = () { return false; };
+ _.rootScope.context.conditionA = true;
+ _.rootScope.context.conditionB = () => false;
_.rootScope.apply();
expect(element).toHaveClass('existing');
expect(element).toHaveClass('A');
expect(element).not.toHaveClass('B');
expect(element).toHaveClass('AnotB');
- _.rootScope.context['conditionB'] = () { return true; };
+ _.rootScope.context.conditionB = () => true;
_.rootScope.apply();
expect(element).toHaveClass('existing');
expect(element).toHaveClass('A');
@@ -76,11 +76,11 @@ main() {
it('should remove classes when the referenced object is the same but its property is changed',
() {
var element = _.compile('');
- _.rootScope.context['classes'] = { 'A': true, 'B': true };
+ _.rootScope.context.classes = { 'A': true, 'B': true };
_.rootScope.apply();
expect(element).toHaveClass('A');
expect(element).toHaveClass('B');
- _.rootScope.context['classes']['A'] = false;
+ _.rootScope.context.classes['A'] = false;
_.rootScope.apply();
expect(element).not.toHaveClass('A');
expect(element).toHaveClass('B');
@@ -97,13 +97,13 @@ main() {
it('should preserve class added post compilation with pre-existing classes', () {
var element = _.compile('');
- _.rootScope.context['dynClass'] = 'A';
+ _.rootScope.context.dynClass = 'A';
_.rootScope.apply();
expect(element).toHaveClass('existing');
// add extra class, change model and eval
element.classes.add('newClass');
- _.rootScope.context['dynClass'] = 'B';
+ _.rootScope.context.dynClass = 'B';
_.rootScope.apply();
expect(element).toHaveClass('existing');
@@ -114,13 +114,13 @@ main() {
it('should preserve class added post compilation without pre-existing classes"', () {
var element = _.compile('');
- _.rootScope.context['dynClass'] = 'A';
+ _.rootScope.context.dynClass = 'A';
_.rootScope.apply();
expect(element).toHaveClass('A');
// add extra class, change model and eval
element.classes.add('newClass');
- _.rootScope.context['dynClass'] = 'B';
+ _.rootScope.context.dynClass = 'B';
_.rootScope.apply();
expect(element).toHaveClass('B');
@@ -130,9 +130,9 @@ main() {
it('should preserve other classes with similar name"', () {
var element = _.compile('');
- _.rootScope.context['dynCls'] = 'panel';
+ _.rootScope.context.dynCls = 'panel';
_.rootScope.apply();
- _.rootScope.context['dynCls'] = 'foo';
+ _.rootScope.context.dynCls = 'foo';
_.rootScope.apply();
// TODO(deboer): Abstract ng-binding
expect(element.className.replaceAll(' ng-binding', '')).toEqual('ui-panel ui-selected foo');
@@ -141,7 +141,7 @@ main() {
it('should not add duplicate classes', () {
var element = _.compile('');
- _.rootScope.context['dynCls'] = 'panel';
+ _.rootScope.context.dynCls = 'panel';
_.rootScope.apply();
// TODO(deboer): Abstract ng-binding
expect(element.className.replaceAll(' ng-binding', '')).toEqual('panel bar');
@@ -150,9 +150,9 @@ main() {
it('should remove classes even if it was specified via class attribute', () {
var element = _.compile('');
- _.rootScope.context['dynCls'] = 'panel';
+ _.rootScope.context.dynCls = 'panel';
_.rootScope.apply();
- _.rootScope.context['dynCls'] = 'window';
+ _.rootScope.context.dynCls = 'window';
_.rootScope.apply();
// TODO(deboer): Abstract ng-binding
expect(element.className.replaceAll(' ng-binding', '')).toEqual('bar window');
@@ -161,10 +161,10 @@ main() {
it('should remove classes even if they were added by another code', () {
var element = _.compile('');
- _.rootScope.context['dynCls'] = 'foo';
+ _.rootScope.context.dynCls = 'foo';
_.rootScope.apply();
element.classes.add('foo');
- _.rootScope.context['dynCls'] = '';
+ _.rootScope.context.dynCls = '';
_.rootScope.apply();
});
@@ -227,8 +227,8 @@ main() {
var element = _.compile('');
_.rootScope.apply(() {
- _.rootScope.context['cls'] = "two";
- _.rootScope.context['four'] = true;
+ _.rootScope.context.cls = "two";
+ _.rootScope.context.four = true;
});
expect(element).toHaveClass('one');
expect(element).toHaveClass('two'); // interpolated
@@ -236,7 +236,7 @@ main() {
expect(element).toHaveClass('four');
_.rootScope.apply(() {
- _.rootScope.context['cls'] = "too";
+ _.rootScope.context.cls = "too";
});
expect(element).toHaveClass('one');
@@ -246,7 +246,7 @@ main() {
expect(element).not.toHaveClass('two');
_.rootScope.apply(() {
- _.rootScope.context['cls'] = "to";
+ _.rootScope.context.cls = "to";
});
expect(element).toHaveClass('one');
@@ -259,9 +259,9 @@ main() {
it('should not mess up class value due to observing an interpolated class attribute', () {
- _.rootScope.context['foo'] = true;
+ _.rootScope.context.foo = true;
_.rootScope.watch("anything", (_0, _1) {
- _.rootScope.context['foo'] = false;
+ _.rootScope.context.foo = false;
});
var element = _.compile('');
_.rootScope.apply();
@@ -274,10 +274,10 @@ main() {
'' +
'- ');
- _.rootScope.context['items'] = ['a','b','c'];
+ _.rootScope.context.items = ['a','b','c'];
_.rootScope.apply();
- _.rootScope.context['items'] = ['a','b'];
+ _.rootScope.context.items = ['a','b'];
_.rootScope.apply();
var e1 = element.nodes[1];
@@ -296,10 +296,10 @@ main() {
'
- i ' + '
- ');
- _.rootScope.context['items'] = ['a','b'];
+ _.rootScope.context.items = ['a','b'];
_.rootScope.apply();
- _.rootScope.context['items'] = ['b','a'];
+ _.rootScope.context.items = ['b','a'];
_.rootScope.apply();
var e1 = element.nodes[1];
diff --git a/test/directive/ng_events_spec.dart b/test/directive/ng_events_spec.dart
index 8ec945627..13a528bda 100644
--- a/test/directive/ng_events_spec.dart
+++ b/test/directive/ng_events_spec.dart
@@ -16,8 +16,8 @@ void addTest(String name, [String eventType='MouseEvent', String eventName, excl
it('should evaluate the expression on $name', () {
_.compile('');
_.triggerEvent(_.rootElement, eventName, eventType);
- expect(_.rootScope.context['abc']).toEqual(true);
- expect(_.rootScope.context['event'] is dom.UIEvent).toEqual(true);
+ expect(_.rootScope.context.abc).toEqual(true);
+ expect(_.rootScope.context.event is dom.UIEvent).toEqual(true);
});
};
diff --git a/test/directive/ng_form_spec.dart b/test/directive/ng_form_spec.dart
index 1821f217a..1d1841415 100644
--- a/test/directive/ng_form_spec.dart
+++ b/test/directive/ng_form_spec.dart
@@ -6,75 +6,60 @@ void main() {
describe('form', () {
TestBed _;
- it('should set the name of the form and attach it to the scope', (Scope scope, TestBed _) {
- expect(scope.context['myForm']).toBeNull();
-
- _.compile('
' +
'
',
// ng-unless
''.trim() +
- ' inside {{setBy}};'.trim() +
+ ' inside {{ctx}};'.trim() +
'
'.trim() +
- ' outside {{setBy}}'.trim() +
+ ' outside {{ctx}}'.trim() +
'' +
'
'],
(html) {
- rootScope.context['setBy'] = 'topLevel';
+ rootScope.context.ctx = 'parent';
+
+ var getChildScope = () => rootScope.context.$probes['probe'] == null ?
+ null : rootScope.context.$probes['probe'].scope;
+
compile(html);
- expect(element).toHaveText('outside topLevel');
+ expect(element).toHaveText('outside parent');
+ expect(getChildScope()).toBeNull();
+
+ rootScope.apply(() {
+ rootScope.context.isVisible = true;
+ });
+ // The nested scope uses the parent context
+ expect(element).toHaveText('inside parent;outside parent');
+ expect(element.querySelector('#outside')).toHaveHtml('outside parent');
+ expect(element.querySelector('#inside')).toHaveHtml('inside parent;');
+
+ var childScope1 = getChildScope();
+ expect(childScope1).toBeNotNull();
+ var destroyListener = guinness.createSpy('destroy child scope');
+ var watcher = childScope1.on(ScopeEvent.DESTROY).listen(destroyListener);
+
+ rootScope.apply(() {
+ rootScope.context.isVisible = false;
+ });
+ expect(getChildScope()).toBeNull();
+ expect(destroyListener).toHaveBeenCalledOnce();
rootScope.apply(() {
- rootScope.context['isVisible'] = true;
+ rootScope.context.isVisible = true;
});
- expect(element).toHaveText('inside childController;outside topLevel');
- // The value on the parent scope.context['should'] be unchanged.
- expect(rootScope.context['setBy']).toEqual('topLevel');
- expect(element.querySelector('#outside')).toHaveHtml('outside topLevel');
- // A child scope.context['must'] have been created and hold a different value.
- expect(element.querySelector('#inside')).toHaveHtml('inside childController;');
+ var childScope2 = getChildScope();
+ expect(childScope2).toBeNotNull();
+ expect(childScope2).not.toBe(childScope1);
}
);
@@ -118,7 +139,7 @@ main() {
' '.trim() +
- ' inside {{setBy}};'.trim() +
+ ' inside {{ctx}};'.trim() +
'
'.trim() +
- ' outside {{setBy}}'.trim() +
+ ' outside {{ctx}}'.trim() +
'repeat2;
'.trim() +
'content
',
'content
'],
(html) {
- rootScope.context['isVisible'] = true;
+ rootScope.context.isVisible = true;
compile(html);
expect(element).toHaveText('content');
element.querySelector('span').classes.remove('my-class');
expect(element.querySelector('span')).not.toHaveClass('my-class');
rootScope.apply(() {
- rootScope.context['isVisible'] = false;
+ rootScope.context.isVisible = false;
});
expect(element).toHaveText('');
rootScope.apply(() {
- rootScope.context['isVisible'] = true;
+ rootScope.context.isVisible = true;
});
// The newly inserted node should be a copy of the compiled state.
expect(element.querySelector('span')).toHaveClass('my-class');
@@ -161,7 +182,7 @@ main() {
(html) {
compile(html);
rootScope.apply(() {
- rootScope.context['isVisible'] = false;
+ rootScope.context.isVisible = false;
});
expect(element.querySelectorAll('span').length).toEqual(0);
}
@@ -176,14 +197,14 @@ main() {
expect(element.querySelectorAll('span').length).toEqual(0);
rootScope.apply(() {
- rootScope.context['isVisible'] = false;
+ rootScope.context.isVisible = false;
});
expect(element.querySelectorAll('span').length).toEqual(0);
expect(logger.result()).toEqual('ALWAYS');
rootScope.apply(() {
- rootScope.context['isVisible'] = true;
+ rootScope.context.isVisible = true;
});
expect(element.querySelector('span')).toHaveHtml('content');
expect(logger.result()).toEqual('ALWAYS; JAMES');
@@ -200,8 +221,8 @@ main() {
expect(() {
rootScope.apply(() {
- rootScope.context['a'] = true;
- rootScope.context['b'] = false;
+ rootScope.context.a = true;
+ rootScope.context.b = false;
});
}).not.toThrow();
expect(element.querySelectorAll('span').length).toEqual(0);
@@ -209,8 +230,8 @@ main() {
expect(() {
rootScope.apply(() {
- rootScope.context['a'] = false;
- rootScope.context['b'] = true;
+ rootScope.context.a = false;
+ rootScope.context.b = true;
});
}).not.toThrow();
expect(element.querySelectorAll('span').length).toEqual(0);
diff --git a/test/directive/ng_include_spec.dart b/test/directive/ng_include_spec.dart
index b1b793b70..cef8ce299 100644
--- a/test/directive/ng_include_spec.dart
+++ b/test/directive/ng_include_spec.dart
@@ -13,12 +13,12 @@ main() {
var element = _.compile('');
- expect(element.innerHtml).toEqual('');
+ expect(element).toHaveText('');
microLeap(); // load the template from cache.
- scope.context['name'] = 'Vojta';
+ scope.context.name = 'Vojta';
scope.apply();
- expect(element.text).toEqual('my name is Vojta');
+ expect(element).toHaveText('my name is Vojta');
}));
it('should fetch template from url using interpolation', async((Scope scope, TemplateCache cache) {
@@ -27,23 +27,62 @@ main() {
var element = _.compile('');
- expect(element.innerHtml).toEqual('');
+ expect(element).toHaveText('');
- scope.context['name'] = 'Vojta';
- scope.context['template'] = 'tpl1.html';
+ scope.context.name = 'Vojta';
+ scope.context.template = 'tpl1.html';
microLeap();
scope.apply();
microLeap();
scope.apply();
- expect(element.text).toEqual('My name is Vojta');
+ expect(element).toHaveText('My name is Vojta');
- scope.context['template'] = 'tpl2.html';
+ scope.context.template = 'tpl2.html';
microLeap();
scope.apply();
microLeap();
scope.apply();
- expect(element.text).toEqual('I am Vojta');
+ expect(element).toHaveText('I am Vojta');
}));
+ it('should create and destroy a child scope', async((Scope scope, TemplateCache cache) {
+ cache.put('tpl.html', new HttpResponse(200, 'include
')); + + var getChildScope = () => scope.context.$probes['probe'] == null ? + null : scope.context.$probes['probe'].scope; + + var element = _.compile(''); + + expect(element).toHaveText(''); + expect(getChildScope()).toBeNull(); + + scope.context.template = 'tpl.html'; + microLeap(); + scope.apply(); + microLeap(); + scope.apply(); + expect(element).toHaveText('include'); + var childScope1 = getChildScope(); + expect(childScope1).toBeNotNull(); + var destroyListener = guinness.createSpy('destroy child scope'); + var watcher = childScope1.on(ScopeEvent.DESTROY).listen(destroyListener); + + scope.context.template = null; + microLeap(); + scope.apply(); + expect(element).toHaveText(''); + expect(getChildScope()).toBeNull(); + expect(destroyListener).toHaveBeenCalledOnce(); + + scope.context.template = 'tpl.html'; + microLeap(); + scope.apply(); + microLeap(); + scope.apply(); + expect(element).toHaveText('include'); + var childScope2 = getChildScope(); + expect(childScope2).toBeNotNull(); + expect(childScope2).not.toBe(childScope1); + })); }); } diff --git a/test/directive/ng_model_datelike_spec.dart b/test/directive/ng_model_datelike_spec.dart index d690b0e58..40b18f792 100644 --- a/test/directive/ng_model_datelike_spec.dart +++ b/test/directive/ng_model_datelike_spec.dart @@ -31,7 +31,7 @@ void main() { return (dt != null && !dt.isUtc) ? dt.toUtc() : dt; } - bool isBrowser(String pattern) => + bool isBrowser(String pattern) => dom.window.navigator.userAgent.indexOf(pattern) > 0; /** Use this function to determine if a non type=text or type=textarea @@ -69,7 +69,7 @@ void main() { _.rootScope.apply(); expect(inputValueAsDate()).toBeNull(); - _.rootScope.context['model'] = dateTime; + _.rootScope.context.model = dateTime; _.rootScope.apply(); expect(inputValueAsDate()).toEqual(dateTime); }); @@ -81,7 +81,7 @@ void main() { _.rootScope.apply(); expect(inputElement.value).toEqual(''); - _.rootScope.context['model'] = dtAsString; + _.rootScope.context.model = dtAsString; _.rootScope.apply(); expect(inputElement.value).toEqual(dtAsString); }); @@ -93,7 +93,7 @@ void main() { inputElement.valueAsDate = dateTime; _.triggerEvent(inputElement, 'change'); - expect(_.rootScope.context['model']).toEqual(dateTime); + expect(_.rootScope.context.model).toEqual(dateTime); }); it('should update model from the input "value" IDL attribute', () { @@ -103,7 +103,7 @@ void main() { inputElement.value = dtAsString; _.triggerEvent(inputElement, 'change'); - expect(_.rootScope.context['model']).toEqual(dateTime); + expect(_.rootScope.context.model).toEqual(dateTime); }); it('should clear input when model is the empty string', () { @@ -111,11 +111,11 @@ void main() { inputElement = _.rootElement as dom.InputElement; if (!nonTextInputElementSupported(inputElement)) return; // skip test - _.rootScope.context['model'] = dateTime; + _.rootScope.context.model = dateTime; _.rootScope.apply(); expect(inputValueAsDate()).toEqual(dateTime); - _.rootScope.context['model'] = ''; + _.rootScope.context.model = ''; _.rootScope.apply(); expect(inputValueAsDate()).toBeNull(); expect(inputElement.value).toEqual(''); @@ -126,11 +126,11 @@ void main() { inputElement = _.rootElement as dom.InputElement; if (!nonTextInputElementSupported(inputElement)) return; // skip test - _.rootScope.context['model'] = dateTime; + _.rootScope.context.model = dateTime; _.rootScope.apply(); expect(inputValueAsDate()).toEqual(dateTime); - _.rootScope.context['model'] = null; + _.rootScope.context.model = null; _.rootScope.apply(); expect(inputValueAsDate()).toBeNull(); expect(inputElement.value).toEqual(''); @@ -148,7 +148,7 @@ void main() { _.rootScope.apply(); expect(inputValueAsDate()).toBeNull(); - _.rootScope.context['model'] = dateTime; + _.rootScope.context.model = dateTime; _.rootScope.apply(); expect(inputValueAsDate()).toEqual(dateTime); }); @@ -160,7 +160,7 @@ void main() { _.rootScope.apply(); expect(inputElement.value).toEqual(''); - _.rootScope.context['model'] = dtAsString; + _.rootScope.context.model = dtAsString; _.rootScope.apply(); expect(inputElement.value).toEqual(dtAsString); }); @@ -172,7 +172,7 @@ void main() { inputElement.valueAsDate = dateTime; _.triggerEvent(inputElement, 'change'); - expect(_.rootScope.context['model']).toEqual(dateTime); + expect(_.rootScope.context.model).toEqual(dateTime); }); it('should update model from the input "value" IDL attribute', () { @@ -182,7 +182,7 @@ void main() { inputElement.value = dtAsString; _.triggerEvent(inputElement, 'change'); - expect(_.rootScope.context['model']).toEqual(dateTime); + expect(_.rootScope.context.model).toEqual(dateTime); }); it('should clear input when model is the empty string', () { @@ -190,11 +190,11 @@ void main() { inputElement = _.rootElement as dom.InputElement; if (!nonTextInputElementSupported(inputElement)) return; // skip test - _.rootScope.context['model'] = dateTime; + _.rootScope.context.model = dateTime; _.rootScope.apply(); expect(inputValueAsDate()).toEqual(dateTime); - _.rootScope.context['model'] = ''; + _.rootScope.context.model = ''; _.rootScope.apply(); expect(inputValueAsDate()).toBeNull(); expect(inputElement.value).toEqual(''); @@ -205,11 +205,11 @@ void main() { inputElement = _.rootElement as dom.InputElement; if (!nonTextInputElementSupported(inputElement)) return; // skip test - _.rootScope.context['model'] = dateTime; + _.rootScope.context.model = dateTime; _.rootScope.apply(); expect(inputValueAsDate()).toEqual(dateTime); - _.rootScope.context['model'] = null; + _.rootScope.context.model = null; _.rootScope.apply(); expect(inputValueAsDate()).toBeNull(); expect(inputElement.value).toEqual(''); @@ -228,7 +228,7 @@ void main() { _.rootScope.apply(); expect(inputElement.valueAsNumber.isNaN).toBeTruthy(); - _.rootScope.context['model'] = dateTime; + _.rootScope.context.model = dateTime; _.rootScope.apply(); expect(inputElement.valueAsNumber).toEqual(dateTime); }); @@ -240,7 +240,7 @@ void main() { _.rootScope.apply(); expect(inputElement.value).toEqual(''); - _.rootScope.context['model'] = dtAsString; + _.rootScope.context.model = dtAsString; _.rootScope.apply(); expect(inputElement.value).toEqual(dtAsString); }); @@ -254,7 +254,7 @@ void main() { inputElement.valueAsNumber = dateTime; expect(inputElement.valueAsNumber).toEqual(dateTime); _.triggerEvent(inputElement, 'change'); - expect(_.rootScope.context['model']).toEqual(dateTime); + expect(_.rootScope.context.model).toEqual(dateTime); }); it('should update model from the input "value" IDL attribute', () { @@ -264,7 +264,7 @@ void main() { inputElement.value = dtAsString; _.triggerEvent(inputElement, 'change'); - expect(_.rootScope.context['model']).toEqual(dateTime); + expect(_.rootScope.context.model).toEqual(dateTime); }); it('should clear input when model is the empty string', () { @@ -272,11 +272,11 @@ void main() { inputElement = _.rootElement as dom.InputElement; if (!nonTextInputElementSupported(inputElement)) return; // skip test - _.rootScope.context['model'] = dateTime; + _.rootScope.context.model = dateTime; _.rootScope.apply(); expect(inputElement.valueAsNumber).toEqual(dateTime); - _.rootScope.context['model'] = ''; + _.rootScope.context.model = ''; _.rootScope.apply(); expect(inputElement.valueAsNumber.isNaN).toBeTruthy(); expect(inputElement.value).toEqual(''); @@ -287,11 +287,11 @@ void main() { inputElement = _.rootElement as dom.InputElement; if (!nonTextInputElementSupported(inputElement)) return; // skip test - _.rootScope.context['model'] = dateTime; + _.rootScope.context.model = dateTime; _.rootScope.apply(); expect(inputElement.valueAsNumber).toEqual(dateTime); - _.rootScope.context['model'] = null; + _.rootScope.context.model = null; _.rootScope.apply(); expect(inputElement.valueAsNumber.isNaN).toBeTruthy(); expect(inputElement.value).toEqual(''); @@ -313,7 +313,7 @@ void main() { _.rootScope.apply(); expect(inputElement.value).toEqual(''); - _.rootScope.context['model'] = dtAsString; + _.rootScope.context.model = dtAsString; _.rootScope.apply(); expect(inputElement.value).toEqual(dtAsString); }); @@ -326,7 +326,7 @@ void main() { inputElement.value = dtAsString; _.triggerEvent(inputElement, 'change'); - expect(_.rootScope.context['model']).toEqual(dtAsString); + expect(_.rootScope.context.model).toEqual(dtAsString); }); }); @@ -341,7 +341,7 @@ void main() { _.rootScope.apply(); expect(inputValueAsDate()).toBeNull(); - _.rootScope.context['model'] = dateTime; + _.rootScope.context.model = dateTime; _.rootScope.apply(); expect(inputValueAsDate()).toEqual(dateTime); }); @@ -352,7 +352,7 @@ void main() { _.rootScope.apply(); expect(inputElement.value).toEqual(''); - _.rootScope.context['model'] = dtAsString; + _.rootScope.context.model = dtAsString; _.rootScope.apply(); expect(inputElement.value).toEqual(dtAsString); }); @@ -364,7 +364,7 @@ void main() { inputElement.valueAsDate = dateTime; _.triggerEvent(inputElement, 'change'); - expect(_.rootScope.context['model']).toEqual(dateTime); + expect(_.rootScope.context.model).toEqual(dateTime); }); it('should update model from the input "value" IDL attribute', () { @@ -374,7 +374,7 @@ void main() { inputElement.value = dtAsString; _.triggerEvent(inputElement, 'change'); - expect(_.rootScope.context['model']).toEqual(dateTime); + expect(_.rootScope.context.model).toEqual(dateTime); }); it('should clear input when model is the empty string', () { @@ -382,11 +382,11 @@ void main() { inputElement = _.rootElement as dom.InputElement; if (!nonTextInputElementSupported(inputElement)) return; // skip test - _.rootScope.context['model'] = dateTime; + _.rootScope.context.model = dateTime; _.rootScope.apply(); expect(inputValueAsDate()).toEqual(dateTime); - _.rootScope.context['model'] = ''; + _.rootScope.context.model = ''; _.rootScope.apply(); expect(inputValueAsDate()).toBeNull(); expect(inputElement.value).toEqual(''); @@ -397,11 +397,11 @@ void main() { inputElement = _.rootElement as dom.InputElement; if (!nonTextInputElementSupported(inputElement)) return; // skip test - _.rootScope.context['model'] = dateTime; + _.rootScope.context.model = dateTime; _.rootScope.apply(); expect(inputValueAsDate()).toEqual(dateTime); - _.rootScope.context['model'] = null; + _.rootScope.context.model = null; _.rootScope.apply(); expect(inputValueAsDate()).toBeNull(); expect(inputElement.value).toEqual(''); @@ -419,7 +419,7 @@ void main() { _.rootScope.apply(); expect(inputValueAsDate()).toBeNull(); - _.rootScope.context['model'] = dateTime; + _.rootScope.context.model = dateTime; _.rootScope.apply(); expect(inputValueAsDate()).toEqual(dateTime); }); @@ -430,7 +430,7 @@ void main() { _.rootScope.apply(); expect(inputElement.value).toEqual(''); - _.rootScope.context['model'] = dtAsString; + _.rootScope.context.model = dtAsString; _.rootScope.apply(); expect(inputElement.value).toEqual(dtAsString); }); @@ -442,7 +442,7 @@ void main() { inputElement.valueAsDate = dateTime; _.triggerEvent(inputElement, 'change'); - expect(_.rootScope.context['model']).toEqual(dateTime); + expect(_.rootScope.context.model).toEqual(dateTime); }); it('should update model from the input "value" IDL attribute', () { @@ -452,7 +452,7 @@ void main() { inputElement.value = dtAsString; _.triggerEvent(inputElement, 'change'); - expect(_.rootScope.context['model']).toEqual(dateTime); + expect(_.rootScope.context.model).toEqual(dateTime); }); it('should clear input when model is the empty string', () { @@ -460,11 +460,11 @@ void main() { inputElement = _.rootElement as dom.InputElement; if (!nonTextInputElementSupported(inputElement)) return; // skip test - _.rootScope.context['model'] = dateTime; + _.rootScope.context.model = dateTime; _.rootScope.apply(); expect(inputValueAsDate()).toEqual(dateTime); - _.rootScope.context['model'] = ''; + _.rootScope.context.model = ''; _.rootScope.apply(); expect(inputValueAsDate()).toBeNull(); expect(inputElement.value).toEqual(''); @@ -475,11 +475,11 @@ void main() { inputElement = _.rootElement as dom.InputElement; if (!nonTextInputElementSupported(inputElement)) return; // skip test - _.rootScope.context['model'] = dateTime; + _.rootScope.context.model = dateTime; _.rootScope.apply(); expect(inputValueAsDate()).toEqual(dateTime); - _.rootScope.context['model'] = null; + _.rootScope.context.model = null; _.rootScope.apply(); expect(inputValueAsDate()).toBeNull(); expect(inputElement.value).toEqual(''); diff --git a/test/directive/ng_model_select_spec.dart b/test/directive/ng_model_select_spec.dart index 9ef64fbe1..8e6860e12 100644 --- a/test/directive/ng_model_select_spec.dart +++ b/test/directive/ng_model_select_spec.dart @@ -14,36 +14,36 @@ main() { it('should retrieve using ng-value', () { _.compile( ''); - var r2d2 = {"name":"r2d2"}; - var c3p0 = {"name":"c3p0"}; - _.rootScope.context['robots'] = [ r2d2, c3p0 ]; + var r2d2 = {"name": "r2d2"}; + var c3p0 = {"name": "c3p0"}; + _.rootScope.context.robots = [ r2d2, c3p0 ]; _.rootScope.apply(); _.selectOption(_.rootElement, 'c3p0'); - expect(_.rootScope.context['robot']).toEqual(c3p0); + expect(_.rootScope.context.robot).toEqual(c3p0); - _.rootScope.context['robot'] = r2d2; + _.rootScope.context.robot = r2d2; _.rootScope.apply(); - expect(_.rootScope.context['robot']).toEqual(r2d2); + expect(_.rootScope.context.robot).toEqual(r2d2); expect(_.rootElement).toEqualSelect([['r2d2'], 'c3p0']); }); it('should retrieve using ng-value', () { _.compile( ''); - var r2d2 = { "name":"r2d2"}; - var c3p0 = {"name":"c3p0"}; - _.rootScope.context['robots'] = [ r2d2, c3p0 ]; + var r2d2 = {"name": "r2d2"}; + var c3p0 = {"name": "c3p0"}; + _.rootScope.context.robots = [ r2d2, c3p0 ]; _.rootScope.apply(); _.selectOption(_.rootElement, 'c3p0'); - expect(_.rootScope.context['robot']).toEqual([c3p0]); + expect(_.rootScope.context.robot).toEqual([c3p0]); - _.rootScope.context['robot'] = [r2d2]; + _.rootScope.context.robot = [r2d2]; _.rootScope.apply(); - expect(_.rootScope.context['robot']).toEqual([r2d2]); + expect(_.rootScope.context.robot).toEqual([r2d2]); expect(_.rootElement).toEqualSelect([['r2d2'], 'c3p0']); }); }); @@ -62,8 +62,8 @@ main() { '' ''); _.rootScope.apply(() { - _.rootScope.context['a'] = 'foo'; - _.rootScope.context['b'] = 'bar'; + _.rootScope.context.a = 'foo'; + _.rootScope.context.b = 'bar'; }); expect(_.rootElement.text).toEqual('foobarC'); @@ -88,11 +88,11 @@ main() { '' ''); - _.rootScope.context['robots'] = ['c3p0', 'r2d2']; - _.rootScope.context['robot'] = 'r2d2'; + _.rootScope.context.robots = ['c3p0', 'r2d2']; + _.rootScope.context.robot = 'r2d2'; _.rootScope.apply(); - var select = _.rootScope.context['p'].directive(InputSelect); + var select = _.rootScope.context.$probes['p'].directive(InputSelect); expect(_.rootElement).toEqualSelect(['c3p0', ['r2d2']]); _.rootElement.querySelectorAll('option')[0].selected = true; @@ -100,21 +100,21 @@ main() { expect(_.rootElement).toEqualSelect([['c3p0'], 'r2d2']); - expect(_.rootScope.context['robot']).toEqual('c3p0'); + expect(_.rootScope.context.robot).toEqual('c3p0'); _.rootScope.apply(() { - _.rootScope.context['robots'].insert(0, 'wallee'); + _.rootScope.context.robots.insert(0, 'wallee'); }); expect(_.rootElement).toEqualSelect(['wallee', ['c3p0'], 'r2d2']); - expect(_.rootScope.context['robot']).toEqual('c3p0'); + expect(_.rootScope.context.robot).toEqual('c3p0'); _.rootScope.apply(() { - _.rootScope.context['robots'] = ['c3p0+', 'r2d2+']; - _.rootScope.context['robot'] = 'r2d2+'; + _.rootScope.context.robots = ['c3p0+', 'r2d2+']; + _.rootScope.context.robot = 'r2d2+'; }); expect(_.rootElement).toEqualSelect(['c3p0+', ['r2d2+']]); - expect(_.rootScope.context['robot']).toEqual('r2d2+'); + expect(_.rootScope.context.robot).toEqual('r2d2+'); }); describe('empty option', () { @@ -143,7 +143,7 @@ main() { }); it('should set the model to empty string when empty option is selected', () { - _.rootScope.context['robot'] = 'x'; + _.rootScope.context.robot = 'x'; _.compile( ''); _.rootScope.apply(); - var select = _.rootScope.context['p'].directive(InputSelect); + var select = _.rootScope.context.$probes['p'].directive(InputSelect); expect(_.rootElement).toEqualSelect(['', ['x'], 'y']); _.selectOption(_.rootElement, '--select--'); expect(_.rootElement).toEqualSelect([[''], 'x', 'y']); - expect(_.rootScope.context['robot']).toEqual(null); + expect(_.rootScope.context.robot).toEqual(null); }); describe('interactions with repeated options', () { it('should select empty option when model is undefined', () { - _.rootScope.context['robots'] = ['c3p0', 'r2d2']; + _.rootScope.context.robots = ['c3p0', 'r2d2']; _.compile( ''); _.rootScope.apply(() { - _.rootScope.context['robots'] = ['c3p0', 'r2d2']; - _.rootScope.context['robot'] = 'c3p0'; + _.rootScope.context.robots = ['c3p0', 'r2d2']; + _.rootScope.context.robot = 'c3p0'; }); expect(_.rootElement).toEqualSelect(['', ['c3p0'], 'r2d2']); _.rootScope.apply(() { - _.rootScope.context['robots'] = ['wallee']; - _.rootScope.context['robot'] = ''; + _.rootScope.context.robots = ['wallee']; + _.rootScope.context.robot = ''; }); expect(_.rootElement).toEqualSelect([[''], 'wallee']); @@ -228,13 +228,13 @@ main() { expect(_.rootElement).toEqualSelect([['?'], 'c3p0', 'r2d2']); _.rootScope.apply(() { - _.rootScope.context['robot'] = 'r2d2'; + _.rootScope.context.robot = 'r2d2'; }); expect(_.rootElement).toEqualSelect(['c3p0', ['r2d2']]); _.rootScope.apply(() { - _.rootScope.context['robot'] = "wallee"; + _.rootScope.context.robot = "wallee"; }); expect(_.rootElement).toEqualSelect([['?'], 'c3p0', 'r2d2']); }); @@ -250,27 +250,27 @@ main() { _.rootScope.apply(); expect(_.rootElement).toEqualSelect([[''], 'c3p0', 'r2d2']); - expect(_.rootScope.context['robot']).toEqual(null); + expect(_.rootScope.context.robot).toEqual(null); _.rootScope.apply(() { - _.rootScope.context['robot'] = 'wallee'; + _.rootScope.context.robot = 'wallee'; }); expect(_.rootElement).toEqualSelect([['?'], '', 'c3p0', 'r2d2']); _.rootScope.apply(() { - _.rootScope.context['robot'] = 'r2d2'; + _.rootScope.context.robot = 'r2d2'; }); expect(_.rootElement).toEqualSelect(['', 'c3p0', ['r2d2']]); _.rootScope.apply(() { - _.rootScope.context['robot'] = null; + _.rootScope.context.robot = null; }); expect(_.rootElement).toEqualSelect([[''], 'c3p0', 'r2d2']); }); it("should insert&select temporary unknown option when no options-model match, empty " + "option is present and model is defined", () { - _.rootScope.context['robot'] = 'wallee'; + _.rootScope.context.robot = 'wallee'; _.compile( ''); _.rootScope.apply(() { - _.rootScope.context['robots'] = []; + _.rootScope.context.robots = []; }); expect(_.rootElement).toEqualSelect([['']]); - expect(_.rootScope.context['robot']).toEqual(null); + expect(_.rootScope.context.robot).toEqual(null); _.rootScope.apply(() { - _.rootScope.context['robot'] = 'r2d2'; + _.rootScope.context.robot = 'r2d2'; }); expect(_.rootElement).toEqualSelect([['?'], '']); - expect(_.rootScope.context['robot']).toEqual('r2d2'); + expect(_.rootScope.context.robot).toEqual('r2d2'); _.rootScope.apply(() { - _.rootScope.context['robots'] = ['c3p0', 'r2d2']; + _.rootScope.context.robots = ['c3p0', 'r2d2']; }); expect(_.rootElement).toEqualSelect(['', 'c3p0', ['r2d2']]); - expect(_.rootScope.context['robot']).toEqual('r2d2'); + expect(_.rootScope.context.robot).toEqual('r2d2'); }); it('should insert unknown element when repeater shrinks and selected option is ' + @@ -348,30 +348,30 @@ main() { '' + ''); _.rootScope.apply(() { - _.rootScope.context['robots'] = ['c3p0', 'r2d2']; - _.rootScope.context['robot'] = 'r2d2'; + _.rootScope.context.robots = ['c3p0', 'r2d2']; + _.rootScope.context.robot = 'r2d2'; }); expect(_.rootElement).toEqualSelect(['c3p0', ['r2d2']]); - expect(_.rootScope.context['robot']).toEqual('r2d2'); + expect(_.rootScope.context.robot).toEqual('r2d2'); _.rootScope.apply(() { - _.rootScope.context['robots'].remove('r2d2'); + _.rootScope.context.robots.remove('r2d2'); }); - expect(_.rootScope.context['robot']).toEqual('r2d2'); + expect(_.rootScope.context.robot).toEqual('r2d2'); expect(_.rootElement).toEqualSelect([['?'], 'c3p0']); _.rootScope.apply(() { - _.rootScope.context['robots'].insert(0, 'r2d2'); + _.rootScope.context.robots.insert(0, 'r2d2'); }); expect(_.rootElement).toEqualSelect([['r2d2'], 'c3p0']); - expect(_.rootScope.context['robot']).toEqual('r2d2'); + expect(_.rootScope.context.robot).toEqual('r2d2'); _.rootScope.apply(() { - _.rootScope.context['robots'].clear(); + _.rootScope.context.robots.clear(); }); expect(_.rootElement).toEqualSelect([['?']]); - expect(_.rootScope.context['robot']).toEqual('r2d2'); + expect(_.rootScope.context.robot).toEqual('r2d2'); }); }); }); @@ -387,14 +387,14 @@ main() { '' + '{{item}}
{{item}}
{{item}}
- '
- '
- {{item.name}}; ' + '
- {{item["name"]}}; ' '
'
'
');
_.rootScope.apply();
- var getChildScope = () => _.rootScope.context['probe'] == null ?
- null : _.rootScope.context['probe'].scope;
+ var getChildScope = () => _.rootScope.context.$probes['probe'] == null ?
+ null : _.rootScope.context.$probes['probe'].scope;
expect(getChildScope()).toBeNull();
- _.rootScope.context['url'] = 'a';
- _.rootScope.context['name'] = 'works';
+ _.rootScope.context.url = 'a';
+ _.rootScope.context.name = 'works';
_.rootScope.apply();
var child1 = getChildScope();
expect(child1).toBeNotNull();
@@ -189,13 +189,13 @@ void main() {
var destroyListener = guinness.createSpy('watch listener');
var watcher = child1.on(ScopeEvent.DESTROY).listen(destroyListener);
- _.rootScope.context['url'] = 'x';
+ _.rootScope.context.url = 'x';
_.rootScope.apply();
expect(getChildScope()).toBeNull();
expect(destroyListener).toHaveBeenCalledOnce();
watcher.cancel();
- _.rootScope.context['url'] = 'a';
+ _.rootScope.context.url = 'a';
_.rootScope.apply();
var child2 = getChildScope();
expect(child2).toBeDefined();
diff --git a/test/formatter/filter_spec.dart b/test/formatter/filter_spec.dart
index 0c614912a..e388f68ab 100644
--- a/test/formatter/filter_spec.dart
+++ b/test/formatter/filter_spec.dart
@@ -2,51 +2,8 @@ library filter_spec;
import '../_specs.dart';
-// Const keys to keep the compiler fast
-var _nameToSymbol = const {
- 'name': const Symbol('name'),
- 'current': const Symbol('current'),
- 'first': const Symbol('first'),
- 'last': const Symbol('last'),
- 'done': const Symbol('done'),
- 'key': const Symbol('key'),
- 'nonkey': const Symbol('nonkey')
-};
-
-// Helper to simulate some real objects. Purposefully doesn't implement Map.
-class DynamicObject {
- final Map- '
@@ -120,13 +120,13 @@ main() {
expect(element.querySelectorAll('li').length).toEqual(2);
expect(element.text).toEqual('odin;dva;');
- scope.context['items'] = null;
+ scope.context.items = null;
scope.apply();
expect(element.querySelectorAll('ul').length).toEqual(1);
expect(element.querySelectorAll('li').length).toEqual(0);
expect(element.text).toEqual('');
- scope.context['items'] = ['odin', 'dva', 'tri'];
+ scope.context.items = ['odin', 'dva', 'tri'];
scope.apply();
expect(element.querySelectorAll('ul').length).toEqual(1);
expect(element.querySelectorAll('li').length).toEqual(3);
@@ -137,14 +137,14 @@ main() {
it('should support formatters', () {
element = compile(
'
- {{item.name}}; ' + '
- {{item["name"]}}; ' '
- {{item.name}}; ' + r'
- {{item["name"]}}; ' '
- {{item}}:{{\$index}}| ' + '
- {{item}}:{{\$first}}-{{\$middle}}-{{\$last}}| ' '
- {{item}}:{{\$odd}}-{{\$even}}| ' '
- {{item}} ' - '
- {{item}} ' ''); - scope..context['items'] = ['a', 'b', 'c'] + scope..context.items = ['a', 'b', 'c'] ..apply() // grow - ..context['items'].add('d') + ..context.items.add('d') ..apply() // shrink - ..context['items'].removeLast() + ..context.items.removeLast() ..apply() - ..context['items'].removeAt(0) + ..context.items.removeAt(0) ..apply(); expect(element).toHaveText('bc'); diff --git a/test/directive/ng_show_hide_spec.dart b/test/directive/ng_show_hide_spec.dart index fcbdaf7b7..d6fbc8ec8 100644 --- a/test/directive/ng_show_hide_spec.dart +++ b/test/directive/ng_show_hide_spec.dart @@ -14,17 +14,17 @@ main() { expect(_.rootElement).not.toHaveClass('ng-hide'); _.rootScope.apply(() { - _.rootScope.context['isHidden'] = true; + _.rootScope.context.isHidden = true; }); expect(_.rootElement).toHaveClass('ng-hide'); _.rootScope.apply(() { - _.rootScope.context['isHidden'] = false; + _.rootScope.context.isHidden = false; }); expect(_.rootElement).not.toHaveClass('ng-hide'); }); }); - + describe('NgShow', () { TestBed _; beforeEach((TestBed tb) => _ = tb); @@ -35,12 +35,12 @@ main() { expect(_.rootElement).not.toHaveClass('ng-hide'); _.rootScope.apply(() { - _.rootScope.context['isShown'] = true; + _.rootScope.context.isShown = true; }); expect(_.rootElement).not.toHaveClass('ng-hide'); _.rootScope.apply(() { - _.rootScope.context['isShown'] = false; + _.rootScope.context.isShown = false; }); expect(_.rootElement).toHaveClass('ng-hide'); }); diff --git a/test/directive/ng_src_boolean_spec.dart b/test/directive/ng_src_boolean_spec.dart index 8062ded57..2b8425707 100644 --- a/test/directive/ng_src_boolean_spec.dart +++ b/test/directive/ng_src_boolean_spec.dart @@ -11,10 +11,10 @@ main() { it('should properly evaluate 0 as false', () { _.compile(''); - _.rootScope.context['isDisabled'] = 0; + _.rootScope.context.isDisabled = 0; _.rootScope.apply(); expect(_.rootElement.attributes['disabled']).toBeFalsy(); - _.rootScope.context['isDisabled'] = 1; + _.rootScope.context.isDisabled = 1; _.rootScope.apply(); expect(_.rootElement.attributes['disabled']).toBeTruthy(); }); @@ -22,10 +22,10 @@ main() { it('should bind disabled', () { _.compile(''); - _.rootScope.context['isDisabled'] = false; + _.rootScope.context.isDisabled = false; _.rootScope.apply(); expect(_.rootElement.attributes['disabled']).toBeFalsy(); - _.rootScope.context['isDisabled'] = true; + _.rootScope.context.isDisabled = true; _.rootScope.apply(); expect(_.rootElement.attributes['disabled']).toBeTruthy(); }); @@ -33,10 +33,10 @@ main() { it('should bind checked', () { _.compile(''); - _.rootScope.context['isChecked'] = false; + _.rootScope.context.isChecked = false; _.rootScope.apply(); expect(_.rootElement.attributes['checked']).toBeFalsy(); - _.rootScope.context['isChecked']=true; + _.rootScope.context.isChecked = true; _.rootScope.apply(); expect(_.rootElement.attributes['checked']).toBeTruthy(); }); @@ -44,10 +44,10 @@ main() { it('should bind selected', () { _.compile(''); - _.rootScope.context['isSelected']=false; + _.rootScope.context.isSelected = false; _.rootScope.apply(); expect((_.rootElement.childNodes[1] as dom.OptionElement).selected).toBeFalsy(); - _.rootScope.context['isSelected']=true; + _.rootScope.context.isSelected = true; _.rootScope.apply(); expect((_.rootElement.childNodes[1] as dom.OptionElement).selected).toBeTruthy(); }); @@ -55,10 +55,10 @@ main() { it('should bind readonly', () { _.compile(''); - _.rootScope.context['isReadonly']=false; + _.rootScope.context.isReadonly = false; _.rootScope.apply(); expect(_.rootElement.attributes['readOnly']).toBeFalsy(); - _.rootScope.context['isReadonly']=true; + _.rootScope.context.isReadonly = true; _.rootScope.apply(); expect(_.rootElement.attributes['readOnly']).toBeTruthy(); }); @@ -66,10 +66,10 @@ main() { it('should bind open', () { _.compile('
{{item}}
');
- scope.context['items'] = ['foo', 'bar', 'baz'];
- scope.context['myFilter'] = (String item) => item.startsWith('b');
+ scope.context.items = ['foo', 'bar', 'baz'];
+ scope.context.myFilter = (String item) => item.startsWith('b');
scope.apply();
expect(element.querySelectorAll('span').length).toEqual(2);
});
it('should support function as a formatter', () {
- scope.context['isEven'] = (num) => num % 2 == 0;
+ scope.context.isEven = (int n) => n.isEven;
var element = compile(
''
'{{r}}'
@@ -158,14 +158,14 @@ main() {
it(r'should track using expression function', () {
element = compile(
'
');
_.rootScope.apply();
expect(element.text).toEqual('other');
- _.rootScope.context['select'] = 1;
+ _.rootScope.context.select = 1;
_.rootScope.apply();
expect(element.text).toEqual('one');
});
@@ -88,7 +88,7 @@ void main() {
'- '
- '
- '
- r'
- ' +
'
- '
'
- '
'
{{group}}|
X' +
'' +
'');
- scope.context['groups'] = [['a', 'b'], ['c','d']];
+ scope.context.groups = [['a', 'b'], ['c','d']];
scope.apply();
expect(element.text).toEqual('a|b|Xc|d|X');
@@ -389,14 +389,14 @@ main() {
c = {};
d = {};
- scope.context['items'] = [a, b, c];
+ scope.context.items = [a, b, c];
scope.apply();
lis = element.querySelectorAll('li');
});
it(r'should preserve the order of elements', () {
- scope.context['items'] = [a, c, d];
+ scope.context.items = [a, c, d];
scope.apply();
var newElements = element.querySelectorAll('li');
expect(newElements[0]).toEqual(lis[0]);
@@ -405,18 +405,18 @@ main() {
});
it(r'should not throw an error on duplicates', () {
- scope.context['items'] = [a, a, a];
+ scope.context.items = [a, a, a];
expect(() => scope.apply()).not.toThrow();
- scope.context['items'].add(a);
+ scope.context.items.add(a);
expect(() => scope.apply()).not.toThrow();
});
it(r'should reverse items when the collection is reversed', () {
- scope.context['items'] = [a, b, c];
+ scope.context.items = [a, b, c];
scope.apply();
lis = element.querySelectorAll('li');
- scope.context['items'] = [c, b, a];
+ scope.context.items = [c, b, a];
scope.apply();
var newElements = element.querySelectorAll('li');
expect(newElements.length).toEqual(3);
@@ -430,12 +430,12 @@ main() {
// rebuilding repeater from scratch can be expensive, we should try to
// avoid it even for model that is composed of primitives.
- scope.context['items'] = ['hello', 'cau', 'ahoj'];
+ scope.context.items = ['hello', 'cau', 'ahoj'];
scope.apply();
lis = element.querySelectorAll('li');
lis[2].id = 'yes';
- scope.context['items'] = ['ahoj', 'hello', 'cau'];
+ scope.context.items = ['ahoj', 'hello', 'cau'];
scope.apply();
var newLis = element.querySelectorAll('li');
expect(newLis.length).toEqual(3);
@@ -447,15 +447,15 @@ main() {
it('should correctly handle detached state', () {
- scope.context['items'] = [1];
+ scope.context.items = [1];
- var parentScope = scope.createChild(new PrototypeMap(scope.context));
+ var childScope = scope.createChild(scope.context);
element = compile(
'- '
'
');
- _.rootScope.context['isOpen']=false;
+ _.rootScope.context.isOpen = false;
_.rootScope.apply();
expect(_.rootElement.attributes['open']).toBeFalsy();
- _.rootScope.context['isOpen']=true;
+ _.rootScope.context.isOpen = true;
_.rootScope.apply();
expect(_.rootElement.attributes['open']).toBeTruthy();
});
@@ -78,10 +78,10 @@ main() {
describe('multiple', () {
it('should NOT bind to multiple via ngMultiple', () {
_.compile('');
- _.rootScope.context['isMultiple']=false;
+ _.rootScope.context.isMultiple = false;
_.rootScope.apply();
expect(_.rootElement.attributes['multiple']).toBeFalsy();
- _.rootScope.context['isMultiple']='multiple';
+ _.rootScope.context.isMultiple = 'multiple';
_.rootScope.apply();
expect(_.rootElement.attributes['multiple']).toBeFalsy(); // ignore
});
@@ -100,7 +100,7 @@ main() {
expect(_.rootElement.attributes['src']).toEqual(null);
_.rootScope.apply(() {
- _.rootScope.context['id'] = '/somewhere/here';
+ _.rootScope.context.id = '/somewhere/here';
});
expect(_.rootElement.attributes['src']).toEqual('/somewhere/here');
});
@@ -113,7 +113,7 @@ main() {
expect(_.rootElement.attributes['src']).toEqual(null);
_.rootScope.apply(() {
- _.rootScope.context['id'] = sce.trustAsResourceUrl('http://somewhere');
+ _.rootScope.context.id = sce.trustAsResourceUrl('http://somewhere');
});
expect(_.rootElement.attributes['src']).toEqual('http://somewhere');
});
@@ -133,7 +133,7 @@ main() {
_.rootScope.apply();
expect(_.rootElement.attributes['foo']).toEqual('some/');
_.rootScope.apply(() {
- _.rootScope.context['id'] = 1;
+ _.rootScope.context.id = 1;
});
expect(_.rootElement.attributes['foo']).toEqual('some/1');
});
@@ -143,7 +143,7 @@ main() {
expect(() {
_.compile('');
_.rootScope.apply(() {
- _.rootScope.context['id'] = sce.trustAsUrl('http://somewhere');
+ _.rootScope.context.id = sce.trustAsUrl('http://somewhere');
});
_.rootElement.attributes['src'];
}).toThrow("Can't interpolate: {{id}}\nError: [sce:insecurl] Viewed " +
@@ -164,7 +164,7 @@ main() {
expect(_.rootElement.attributes['srcset']).toEqual('some/ 2x');
_.rootScope.apply(() {
- _.rootScope.context['id'] = 1;
+ _.rootScope.context.id = 1;
});
expect(_.rootElement.attributes['srcset']).toEqual('some/1 2x');
});
@@ -181,7 +181,7 @@ main() {
expect(_.rootElement.attributes['href']).toEqual('some/');
_.rootScope.apply(() {
- _.rootScope.context['id'] = 1;
+ _.rootScope.context.id = 1;
});
expect(_.rootElement.attributes['href']).toEqual('some/1');
});
@@ -189,8 +189,8 @@ main() {
it('should bind href and merge with other attrs', () {
_.compile('');
- _.rootScope.context['url'] = 'http://server';
- _.rootScope.context['rel'] = 'REL';
+ _.rootScope.context.url = 'http://server';
+ _.rootScope.context.rel = 'REL';
_.rootScope.apply();
expect(_.rootElement.attributes['href']).toEqual('http://server');
expect(_.rootElement.attributes['rel']).toEqual('REL');
@@ -214,7 +214,7 @@ main() {
expect(_.rootElement.attributes['foo']).toEqual('some/');
_.rootScope.apply(() {
- _.rootScope.context['id'] = 1;
+ _.rootScope.context.id = 1;
});
expect(_.rootElement.attributes['foo']).toEqual('some/1');
});
@@ -222,16 +222,16 @@ main() {
it('should bind * and merge with other attrs', () {
_.compile('
');
- _.rootScope.context['bar'] = 'foo';
- _.rootScope.context['bar2'] = 'foo2';
- _.rootScope.context['bam'] = 'boom';
+ _.rootScope.context.bar = 'foo';
+ _.rootScope.context.bar2 = 'foo2';
+ _.rootScope.context.bam = 'boom';
_.rootScope.apply();
expect(_.rootElement.attributes['bar']).toEqual('foo');
expect(_.rootElement.attributes['bar2']).toEqual('foo2');
expect(_.rootElement.attributes['bam']).toEqual('boom');
- _.rootScope.context['bar'] = 'FOO';
- _.rootScope.context['bar2'] = 'FOO2';
- _.rootScope.context['bam'] = 'BOOM';
+ _.rootScope.context.bar = 'FOO';
+ _.rootScope.context.bar2 = 'FOO2';
+ _.rootScope.context.bam = 'BOOM';
_.rootScope.apply();
expect(_.rootElement.attributes['bar']).toEqual('FOO');
expect(_.rootElement.attributes['bar2']).toEqual('FOO2');
diff --git a/test/directive/ng_style_spec.dart b/test/directive/ng_style_spec.dart
index ccbac6174..c88b6b081 100644
--- a/test/directive/ng_style_spec.dart
+++ b/test/directive/ng_style_spec.dart
@@ -37,7 +37,7 @@ void main() {
document.body.append(element);
_.compile(element);
scope = _.rootScope;
- scope.context['styleObj'] = {'margin-top': '44px'};
+ scope.context.styleObj = {'margin-top': '44px'};
scope.apply();
element.style.height = heightVal;
});
@@ -60,7 +60,7 @@ void main() {
it(r'should not mess up stuff after $apply with non-colliding model changes', () {
- scope.context['styleObj'] = {'padding-top': '99px'};
+ scope.context.styleObj = {'padding-top': '99px'};
scope.apply();
expect(element.style.width).toEqual(widthVal);
expect(element.style.marginTop).not.toEqual('44px');
@@ -70,11 +70,11 @@ void main() {
it(r'should overwrite original styles after a colliding model change', () {
- scope.context['styleObj'] = {'height': '99px', 'width': '88px'};
+ scope.context.styleObj = {'height': '99px', 'width': '88px'};
scope.apply();
expect(element.style.width).toEqual('88px');
expect(element.style.height).toEqual('99px');
- scope.context['styleObj'] = {};
+ scope.context.styleObj = {};
scope.apply();
expect(element.style.width).not.toEqual('88px');
expect(element.style.height).not.toEqual('99px');
diff --git a/test/directive/ng_switch_spec.dart b/test/directive/ng_switch_spec.dart
index e289113aa..1991b6ac3 100644
--- a/test/directive/ng_switch_spec.dart
+++ b/test/directive/ng_switch_spec.dart
@@ -17,19 +17,19 @@ void main() {
'
');
expect(element.innerHtml).toEqual(
'');
- _.rootScope.context['select'] = 1;
+ _.rootScope.context.select = 1;
_.rootScope.apply();
expect(element.text).toEqual('first:');
- _.rootScope.context['name'] = "shyam";
+ _.rootScope.context.name = "shyam";
_.rootScope.apply();
expect(element.text).toEqual('first:shyam');
- _.rootScope.context['select'] = 2;
+ _.rootScope.context.select = 2;
_.rootScope.apply();
expect(element.text).toEqual('second:shyam');
- _.rootScope.context['name'] = 'misko';
+ _.rootScope.context.name = 'misko';
_.rootScope.apply();
expect(element.text).toEqual('second:misko');
- _.rootScope.context['select'] = true;
+ _.rootScope.context.select = true;
_.rootScope.apply();
expect(element.text).toEqual('true:misko');
});
@@ -47,19 +47,19 @@ void main() {
''
''
'');
- _.rootScope.context['select'] = 1;
+ _.rootScope.context.select = 1;
_.rootScope.apply();
expect(element.text).toEqual('first:, first too:');
- _.rootScope.context['name'] = "shyam";
+ _.rootScope.context.name = "shyam";
_.rootScope.apply();
expect(element.text).toEqual('first:shyam, first too:shyam');
- _.rootScope.context['select'] = 2;
+ _.rootScope.context.select = 2;
_.rootScope.apply();
expect(element.text).toEqual('second:shyam');
- _.rootScope.context['name'] = 'misko';
+ _.rootScope.context.name = 'misko';
_.rootScope.apply();
expect(element.text).toEqual('second:misko');
- _.rootScope.context['select'] = true;
+ _.rootScope.context.select = true;
_.rootScope.apply();
expect(element.text).toEqual('true:misko');
});
@@ -73,7 +73,7 @@ void main() {
'' +
'
');
- _.rootScope.context['url'] = 'a';
+ _.rootScope.context.url = 'a';
_.rootScope.apply();
- expect(_.rootScope.context['name']).toEqual('works');
+ expect(_.rootScope.context.name).toEqual('works');
expect(element.text).toEqual('works');
});
@@ -175,13 +175,13 @@ void main() {
'{{name}}
' +
'{{ctrl.inline.template.expression}}
',
+ template: '{{inline.template.expression}}
',
exportExpressionAttrs: const ['exported-attr'],
exportExpressions: const ['exported + expression'])
class MyComponent {
diff --git a/test/io/test_files/main.html b/test/io/test_files/main.html
index 95ecc8ad0..41b1ff188 100644
--- a/test/io/test_files/main.html
+++ b/test/io/test_files/main.html
@@ -1,16 +1,15 @@
-
+
+ attr="attr2" expr="expr2"
+ another-expression="anotherExpression2"
+ callback="callback2"
+ two-way-stuff="twoWayStuff2">
-
\ No newline at end of file
diff --git a/test/mock/test_bed_spec.dart b/test/mock/test_bed_spec.dart
index a35872f5f..42eac4be2 100644
--- a/test/mock/test_bed_spec.dart
+++ b/test/mock/test_bed_spec.dart
@@ -21,7 +21,7 @@ void main() {
_.compile('', scope: childScope);
- Probe probe = _.rootScope.context['i'];
+ Probe probe = _.rootScope.context.$probes['i'];
var directiveInst = probe.directive(MyTestBedDirective);
childScope.destroy();
diff --git a/test/routing/ng_bind_route_spec.dart b/test/routing/ng_bind_route_spec.dart
index a3351b863..7d4387065 100644
--- a/test/routing/ng_bind_route_spec.dart
+++ b/test/routing/ng_bind_route_spec.dart
@@ -20,14 +20,14 @@ main() {
it('should inject null RouteProvider when no ng-bind-route', async(() {
Element root = _.compile('');
- expect(_.rootScope.context['routeProbe'].injector.get(RouteProvider)).toBeNull();
+ expect(_.rootScope.context.$probes['routeProbe'].injector.get(RouteProvider)).toBeNull();
}));
it('should inject RouteProvider with correct flat route', async(() {
Element root = _.compile(
'
-
+
');
- expect(_.rootScope.context['routeProbe'].injector.get(RouteProvider).routeName)
+ expect(_.rootScope.context.$probes['routeProbe'].injector.get(RouteProvider).routeName)
.toEqual('library');
}));
@@ -39,14 +39,14 @@ main() {
' '
'