iSharkFly-Docs
/
angular-docs-cn
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix(NgRepeat): activate index

This commit is contained in:
Marc Laval 2015-01-28 00:42:08 +01:00 committed by Rado Kirov
parent db0f0c462b
commit 52d88457c8
4 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
modules/core/src/compiler/view.js
View File

@ -71,8 +71,7 @@ export class View {
setLocal(contextName: string, value) { setLocal(contextName: string, value) {
if (!this.hydrated()) throw new BaseException('Cannot set locals on dehydrated view.'); if (!this.hydrated()) throw new BaseException('Cannot set locals on dehydrated view.');
if (!MapWrapper.contains(this.proto.variableBindings, contextName)) { if (!MapWrapper.contains(this.proto.variableBindings, contextName)) {
throw new BaseException( return;
`Local binding ${contextName} not defined in the view template.`);
} }
var templateName = MapWrapper.get(this.proto.variableBindings, contextName); var templateName = MapWrapper.get(this.proto.variableBindings, contextName);
this.context.set(templateName, value); this.context.set(templateName, value);

4
modules/core/test/compiler/view_spec.js
View File

@ -84,8 +84,8 @@ export function main() {
expect(view.context.get('template-foo')).toBe('bar'); expect(view.context.get('template-foo')).toBe('bar');
}); });
it('should throw on undeclared locals', () => { it('should not throw on undeclared locals', () => {
expect(() => view.setLocal('setMePlease', 'bar')).toThrowError(); expect(() => view.setLocal('setMePlease', 'bar')).not.toThrow();
}); });
it('when dehydrated should set locals to null', () => { it('when dehydrated should set locals to null', () => {

3
modules/directives/src/ng_repeat.js
View File

@ -50,8 +50,7 @@ export class NgRepeat extends OnChange {
perViewChange(view, record) { perViewChange(view, record) {
view.setLocal('ng-repeat', record.item); view.setLocal('ng-repeat', record.item);
// Uncomment when binding is ready. view.setLocal('index', record.currentIndex);
// view.setLocal('index', record.item);
} }
static bulkRemove(tuples, viewPort) { static bulkRemove(tuples, viewPort) {

7
modules/directives/test/ng_repeat_spec.js
View File

@ -191,10 +191,9 @@ export function main() {
}); });
}); });
/*
TODO(rado): enable after compiler is fixed.
it('should display indices correctly', (done) => { it('should display indices correctly', (done) => {
var INDEX_TEMPLATE = '<div><copy-me template="ng-repeat #item in items index #i">{{index.toString()}};</copy-me></div>'; var INDEX_TEMPLATE = '<div><copy-me template="ng-repeat #item in items index #i">{{i.toString()}}</copy-me></div>';
compileWithTemplate(INDEX_TEMPLATE).then((pv) => { compileWithTemplate(INDEX_TEMPLATE).then((pv) => {
createView(pv); createView(pv);
component.items = [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]; component.items = [0, 1, 2, 3, 4, 5, 6, 7, 8, 9];
@ -207,7 +206,7 @@ TODO(rado): enable after compiler is fixed.
done(); done();
}); });
}); });
*/
}); });
} }