Skip to content

Commit e5405e4

Browse files
PatrickJStbosch
authored andcommitted
fix(forms): Remove cyclic dependency
correctly resolve Renderer by removing cyclic dependencies Closes angular#2856
1 parent b60d714 commit e5405e4

File tree

11 files changed

+23
-11
lines changed

11 files changed

+23
-11
lines changed

modules/angular2/src/forms/directives/checkbox_value_accessor.ts

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
1-
import {Directive, Renderer, ElementRef} from 'angular2/angular2';
1+
import {Renderer} from 'angular2/render';
2+
import {Directive} from 'angular2/annotations';
3+
import {ElementRef} from 'angular2/core';
4+
25
import {NgControl} from './ng_control';
36
import {ControlValueAccessor} from './control_value_accessor';
47
import {isPresent} from 'angular2/src/facade/lang';

modules/angular2/src/forms/directives/default_value_accessor.ts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
1-
import {Directive, Renderer, ElementRef} from 'angular2/angular2';
1+
import {Renderer} from 'angular2/render';
2+
import {Directive} from 'angular2/annotations';
3+
import {ElementRef} from 'angular2/core';
24
import {NgControl} from './ng_control';
35
import {ControlValueAccessor} from './control_value_accessor';
46
import {isBlank, isPresent} from 'angular2/src/facade/lang';

modules/angular2/src/forms/directives/ng_control_group.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import {Directive, onDestroy, onInit} from 'angular2/angular2';
1+
import {Directive, onDestroy, onInit} from 'angular2/annotations';
22
import {Inject, Ancestor, forwardRef, Binding} from 'angular2/di';
33
import {List, ListWrapper} from 'angular2/src/facade/collection';
44
import {CONST_EXPR} from 'angular2/src/facade/lang';

modules/angular2/src/forms/directives/ng_control_name.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@ import {CONST_EXPR} from 'angular2/src/facade/lang';
22
import {EventEmitter, ObservableWrapper} from 'angular2/src/facade/async';
33
import {List, StringMapWrapper, StringMap} from 'angular2/src/facade/collection';
44

5-
import {Directive, onDestroy, onChange, Query, QueryList} from 'angular2/angular2';
5+
import {Directive, Query, onDestroy, onChange} from 'angular2/annotations';
6+
import {QueryList} from 'angular2/core';
67
import {forwardRef, Ancestor, Binding, Inject} from 'angular2/di';
78

89
import {ControlContainer} from './control_container';

modules/angular2/src/forms/directives/ng_form.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import {PromiseWrapper, ObservableWrapper, EventEmitter} from 'angular2/src/facade/async';
22
import {StringMapWrapper, List, ListWrapper} from 'angular2/src/facade/collection';
33
import {isPresent, isBlank, CONST_EXPR} from 'angular2/src/facade/lang';
4-
import {Directive} from 'angular2/src/core/annotations/decorators';
4+
import {Directive} from 'angular2/annotations';
55
import {forwardRef, Binding} from 'angular2/di';
66
import {NgControl} from './ng_control';
77
import {Form} from './form_interface';

modules/angular2/src/forms/directives/ng_form_control.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@ import {CONST_EXPR} from 'angular2/src/facade/lang';
22
import {StringMapWrapper} from 'angular2/src/facade/collection';
33
import {EventEmitter, ObservableWrapper} from 'angular2/src/facade/async';
44

5-
import {Directive, onChange, Query, QueryList} from 'angular2/angular2';
5+
import {Directive, Query, onChange} from 'angular2/annotations';
6+
import {QueryList} from 'angular2/core';
67
import {forwardRef, Ancestor, Binding} from 'angular2/di';
78

89
import {NgControl} from './ng_control';

modules/angular2/src/forms/directives/ng_form_model.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import {CONST_EXPR} from 'angular2/src/facade/lang';
22
import {List, ListWrapper} from 'angular2/src/facade/collection';
33
import {ObservableWrapper, EventEmitter} from 'angular2/src/facade/async';
44

5-
import {Directive, onChange} from 'angular2/angular2';
5+
import {Directive, onChange} from 'angular2/annotations';
66
import {forwardRef, Binding} from 'angular2/di';
77
import {NgControl} from './ng_control';
88
import {NgControlGroup} from './ng_control_group';

modules/angular2/src/forms/directives/ng_model.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@ import {CONST_EXPR} from 'angular2/src/facade/lang';
22
import {EventEmitter, ObservableWrapper} from 'angular2/src/facade/async';
33
import {StringMapWrapper} from 'angular2/src/facade/collection';
44

5-
import {Directive, onChange, QueryList, Query} from 'angular2/angular2';
5+
import {Directive, Query, onChange} from 'angular2/annotations';
6+
import {QueryList} from 'angular2/core';
67
import {forwardRef, Ancestor, Binding} from 'angular2/di';
78

89
import {NgControl} from './ng_control';

modules/angular2/src/forms/directives/select_control_value_accessor.ts

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
1-
import {Directive, Query, QueryList, Renderer, ElementRef} from 'angular2/angular2';
1+
import {Renderer} from 'angular2/render';
2+
import {ElementRef, QueryList} from 'angular2/core';
3+
import {Directive, Query, onDestroy, onChange} from 'angular2/annotations';
4+
25
import {NgControl} from './ng_control';
36
import {ControlValueAccessor} from './control_value_accessor';
47
import {isPresent} from 'angular2/src/facade/lang';

modules/angular2/src/forms/directives/shared.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@ import {NgControl} from './ng_control';
66
import {NgValidator} from './validators';
77
import {Control} from '../model';
88
import {Validators} from '../validators';
9-
import {Renderer, ElementRef, QueryList} from 'angular2/angular2';
9+
import {Renderer} from 'angular2/render';
10+
import {ElementRef, QueryList} from 'angular2/core';
1011

1112

1213
export function controlPath(name: string, parent: ControlContainer): string[] {

0 commit comments

Comments
 (0)