fix(forms): Remove cyclic dependency

correctly resolve Renderer by removing cyclic dependencies

Closes #2856
This commit is contained in:
gdi2290 2015-07-02 14:20:50 -07:00 committed by Tobias Bosch
parent b60d714acf
commit e5405e4ba2
11 changed files with 23 additions and 11 deletions

View File

@ -1,4 +1,7 @@
import {Directive, Renderer, ElementRef} from 'angular2/angular2';
import {Renderer} from 'angular2/render';
import {Directive} from 'angular2/annotations';
import {ElementRef} from 'angular2/core';
import {NgControl} from './ng_control';
import {ControlValueAccessor} from './control_value_accessor';
import {isPresent} from 'angular2/src/facade/lang';

View File

@ -1,4 +1,6 @@
import {Directive, Renderer, ElementRef} from 'angular2/angular2';
import {Renderer} from 'angular2/render';
import {Directive} from 'angular2/annotations';
import {ElementRef} from 'angular2/core';
import {NgControl} from './ng_control';
import {ControlValueAccessor} from './control_value_accessor';
import {isBlank, isPresent} from 'angular2/src/facade/lang';

View File

@ -1,4 +1,4 @@
import {Directive, onDestroy, onInit} from 'angular2/angular2';
import {Directive, onDestroy, onInit} from 'angular2/annotations';
import {Inject, Ancestor, forwardRef, Binding} from 'angular2/di';
import {List, ListWrapper} from 'angular2/src/facade/collection';
import {CONST_EXPR} from 'angular2/src/facade/lang';

View File

@ -2,7 +2,8 @@ import {CONST_EXPR} from 'angular2/src/facade/lang';
import {EventEmitter, ObservableWrapper} from 'angular2/src/facade/async';
import {List, StringMapWrapper, StringMap} from 'angular2/src/facade/collection';
import {Directive, onDestroy, onChange, Query, QueryList} from 'angular2/angular2';
import {Directive, Query, onDestroy, onChange} from 'angular2/annotations';
import {QueryList} from 'angular2/core';
import {forwardRef, Ancestor, Binding, Inject} from 'angular2/di';
import {ControlContainer} from './control_container';

View File

@ -1,7 +1,7 @@
import {PromiseWrapper, ObservableWrapper, EventEmitter} from 'angular2/src/facade/async';
import {StringMapWrapper, List, ListWrapper} from 'angular2/src/facade/collection';
import {isPresent, isBlank, CONST_EXPR} from 'angular2/src/facade/lang';
import {Directive} from 'angular2/src/core/annotations/decorators';
import {Directive} from 'angular2/annotations';
import {forwardRef, Binding} from 'angular2/di';
import {NgControl} from './ng_control';
import {Form} from './form_interface';

View File

@ -2,7 +2,8 @@ import {CONST_EXPR} from 'angular2/src/facade/lang';
import {StringMapWrapper} from 'angular2/src/facade/collection';
import {EventEmitter, ObservableWrapper} from 'angular2/src/facade/async';
import {Directive, onChange, Query, QueryList} from 'angular2/angular2';
import {Directive, Query, onChange} from 'angular2/annotations';
import {QueryList} from 'angular2/core';
import {forwardRef, Ancestor, Binding} from 'angular2/di';
import {NgControl} from './ng_control';

View File

@ -2,7 +2,7 @@ import {CONST_EXPR} from 'angular2/src/facade/lang';
import {List, ListWrapper} from 'angular2/src/facade/collection';
import {ObservableWrapper, EventEmitter} from 'angular2/src/facade/async';
import {Directive, onChange} from 'angular2/angular2';
import {Directive, onChange} from 'angular2/annotations';
import {forwardRef, Binding} from 'angular2/di';
import {NgControl} from './ng_control';
import {NgControlGroup} from './ng_control_group';

View File

@ -2,7 +2,8 @@ import {CONST_EXPR} from 'angular2/src/facade/lang';
import {EventEmitter, ObservableWrapper} from 'angular2/src/facade/async';
import {StringMapWrapper} from 'angular2/src/facade/collection';
import {Directive, onChange, QueryList, Query} from 'angular2/angular2';
import {Directive, Query, onChange} from 'angular2/annotations';
import {QueryList} from 'angular2/core';
import {forwardRef, Ancestor, Binding} from 'angular2/di';
import {NgControl} from './ng_control';

View File

@ -1,4 +1,7 @@
import {Directive, Query, QueryList, Renderer, ElementRef} from 'angular2/angular2';
import {Renderer} from 'angular2/render';
import {ElementRef, QueryList} from 'angular2/core';
import {Directive, Query, onDestroy, onChange} from 'angular2/annotations';
import {NgControl} from './ng_control';
import {ControlValueAccessor} from './control_value_accessor';
import {isPresent} from 'angular2/src/facade/lang';

View File

@ -6,7 +6,8 @@ import {NgControl} from './ng_control';
import {NgValidator} from './validators';
import {Control} from '../model';
import {Validators} from '../validators';
import {Renderer, ElementRef, QueryList} from 'angular2/angular2';
import {Renderer} from 'angular2/render';
import {ElementRef, QueryList} from 'angular2/core';
export function controlPath(name: string, parent: ControlContainer): string[] {

View File

@ -1,6 +1,6 @@
import {forwardRef, Binding} from 'angular2/di';
import {CONST_EXPR} from 'angular2/src/facade/lang';
import {Directive} from '../../../angular2';
import {Directive} from 'angular2/annotations';
import {Validators} from '../validators';
export class NgValidator {