diff --git a/modules/angular2/core.dart b/modules/angular2/core.dart index db4f420fed..11f8f7a064 100644 --- a/modules/angular2/core.dart +++ b/modules/angular2/core.dart @@ -5,7 +5,7 @@ export 'package:angular2/src/core/metadata.dart'; export 'package:angular2/src/core/util.dart'; export 'package:angular2/src/core/di.dart'; export 'package:angular2/src/common/pipes.dart'; -export 'package:angular2/src/core/facade.dart'; +export 'package:angular2/src/facade/facade.dart'; // Do not export application for dart. Must import from angular2/bootstrap //export 'package:angular2/src/core/application.dart'; export 'package:angular2/src/core/application_ref.dart' diff --git a/modules/angular2/core.ts b/modules/angular2/core.ts index 390ed4b5ea..37d8ecb081 100644 --- a/modules/angular2/core.ts +++ b/modules/angular2/core.ts @@ -7,7 +7,7 @@ export * from './src/core/metadata'; export * from './src/core/util'; export * from './src/core/di'; export * from './src/common/pipes'; -export * from './src/core/facade'; +export * from './src/facade/facade'; export * from './src/core/application'; export * from './src/core/bootstrap'; export * from './src/core/services'; diff --git a/modules/angular2/examples/router/ts/can_activate/can_activate_spec.ts b/modules/angular2/examples/router/ts/can_activate/can_activate_spec.ts index a06d7f690a..3f5728bb7a 100644 --- a/modules/angular2/examples/router/ts/can_activate/can_activate_spec.ts +++ b/modules/angular2/examples/router/ts/can_activate/can_activate_spec.ts @@ -1,5 +1,5 @@ import {verifyNoBrowserErrors} from 'angular2/src/testing/e2e_util'; -import {Promise} from 'angular2/src/core/facade/async'; +import {Promise} from 'angular2/src/facade/async'; function waitForElement(selector) { var EC = (protractor).ExpectedConditions; diff --git a/modules/angular2/examples/router/ts/can_deactivate/can_deactivate_spec.ts b/modules/angular2/examples/router/ts/can_deactivate/can_deactivate_spec.ts index a70533a47c..b92fd26332 100644 --- a/modules/angular2/examples/router/ts/can_deactivate/can_deactivate_spec.ts +++ b/modules/angular2/examples/router/ts/can_deactivate/can_deactivate_spec.ts @@ -1,5 +1,5 @@ import {verifyNoBrowserErrors} from 'angular2/src/testing/e2e_util'; -import {Promise} from 'angular2/src/core/facade/async'; +import {Promise} from 'angular2/src/facade/async'; function waitForElement(selector) { var EC = (protractor).ExpectedConditions; diff --git a/modules/angular2/examples/router/ts/on_activate/on_activate_spec.ts b/modules/angular2/examples/router/ts/on_activate/on_activate_spec.ts index d37804c4ed..3e15a69952 100644 --- a/modules/angular2/examples/router/ts/on_activate/on_activate_spec.ts +++ b/modules/angular2/examples/router/ts/on_activate/on_activate_spec.ts @@ -1,5 +1,5 @@ import {verifyNoBrowserErrors} from 'angular2/src/testing/e2e_util'; -import {Promise} from 'angular2/src/core/facade/async'; +import {Promise} from 'angular2/src/facade/async'; function waitForElement(selector) { var EC = (protractor).ExpectedConditions; diff --git a/modules/angular2/examples/router/ts/on_deactivate/on_deactivate_spec.ts b/modules/angular2/examples/router/ts/on_deactivate/on_deactivate_spec.ts index c06a8ff228..5f48717d0c 100644 --- a/modules/angular2/examples/router/ts/on_deactivate/on_deactivate_spec.ts +++ b/modules/angular2/examples/router/ts/on_deactivate/on_deactivate_spec.ts @@ -1,5 +1,5 @@ import {verifyNoBrowserErrors} from 'angular2/src/testing/e2e_util'; -import {Promise} from 'angular2/src/core/facade/async'; +import {Promise} from 'angular2/src/facade/async'; function waitForElement(selector) { var EC = (protractor).ExpectedConditions; diff --git a/modules/angular2/examples/router/ts/reuse/reuse_spec.ts b/modules/angular2/examples/router/ts/reuse/reuse_spec.ts index a004da063d..e1f2454722 100644 --- a/modules/angular2/examples/router/ts/reuse/reuse_spec.ts +++ b/modules/angular2/examples/router/ts/reuse/reuse_spec.ts @@ -1,5 +1,5 @@ import {verifyNoBrowserErrors} from 'angular2/src/testing/e2e_util'; -import {Promise} from 'angular2/src/core/facade/async'; +import {Promise} from 'angular2/src/facade/async'; function waitForElement(selector) { var EC = (protractor).ExpectedConditions; diff --git a/modules/angular2/router.ts b/modules/angular2/router.ts index 9fc456fbbd..64d65bcb11 100644 --- a/modules/angular2/router.ts +++ b/modules/angular2/router.ts @@ -28,8 +28,8 @@ import {RouterLink} from './src/router/router_link'; import {RouteRegistry} from './src/router/route_registry'; import {Location} from './src/router/location'; import {ApplicationRef, provide, OpaqueToken, Provider} from 'angular2/angular2'; -import {CONST_EXPR} from './src/core/facade/lang'; -import {BaseException} from 'angular2/src/core/facade/exceptions'; +import {CONST_EXPR} from './src/facade/lang'; +import {BaseException} from 'angular2/src/facade/exceptions'; /** diff --git a/modules/angular2/src/animate/animation.ts b/modules/angular2/src/animate/animation.ts index b70bf27023..a9130d6aba 100644 --- a/modules/angular2/src/animate/animation.ts +++ b/modules/angular2/src/animate/animation.ts @@ -4,10 +4,10 @@ import { RegExpWrapper, NumberWrapper, isPresent -} from 'angular2/src/core/facade/lang'; -import {Math} from 'angular2/src/core/facade/math'; +} from 'angular2/src/facade/lang'; +import {Math} from 'angular2/src/facade/math'; import {camelCaseToDashCase} from 'angular2/src/core/render/dom/util'; -import {StringMapWrapper} from 'angular2/src/core/facade/collection'; +import {StringMapWrapper} from 'angular2/src/facade/collection'; import {DOM} from 'angular2/src/core/dom/dom_adapter'; import {BrowserDetails} from './browser_details'; diff --git a/modules/angular2/src/animate/browser_details.ts b/modules/angular2/src/animate/browser_details.ts index 5ba634213c..3af818f2f7 100644 --- a/modules/angular2/src/animate/browser_details.ts +++ b/modules/angular2/src/animate/browser_details.ts @@ -1,5 +1,5 @@ import {Injectable} from 'angular2/src/core/di'; -import {Math} from 'angular2/src/core/facade/math'; +import {Math} from 'angular2/src/facade/math'; import {DOM} from 'angular2/src/core/dom/dom_adapter'; @Injectable() diff --git a/modules/angular2/src/common/common_directives.ts b/modules/angular2/src/common/common_directives.ts index 29a00569c9..3407469043 100644 --- a/modules/angular2/src/common/common_directives.ts +++ b/modules/angular2/src/common/common_directives.ts @@ -1,4 +1,4 @@ -import {CONST_EXPR, Type} from 'angular2/src/core/facade/lang'; +import {CONST_EXPR, Type} from 'angular2/src/facade/lang'; import {FORM_DIRECTIVES} from './forms'; import {CORE_DIRECTIVES} from './directives'; diff --git a/modules/angular2/src/common/directives/core_directives.ts b/modules/angular2/src/common/directives/core_directives.ts index cde7f53c23..f02231a5f9 100644 --- a/modules/angular2/src/common/directives/core_directives.ts +++ b/modules/angular2/src/common/directives/core_directives.ts @@ -1,4 +1,4 @@ -import {CONST_EXPR, Type} from 'angular2/src/core/facade/lang'; +import {CONST_EXPR, Type} from 'angular2/src/facade/lang'; import {NgClass} from './ng_class'; import {NgFor} from './ng_for'; import {NgIf} from './ng_if'; diff --git a/modules/angular2/src/common/directives/ng_class.ts b/modules/angular2/src/common/directives/ng_class.ts index 72c8fbb1a1..a503b98cc0 100644 --- a/modules/angular2/src/common/directives/ng_class.ts +++ b/modules/angular2/src/common/directives/ng_class.ts @@ -1,4 +1,4 @@ -import {isPresent, isString, StringWrapper, isBlank, isArray} from 'angular2/src/core/facade/lang'; +import {isPresent, isString, StringWrapper, isBlank, isArray} from 'angular2/src/facade/lang'; import {DoCheck, OnDestroy} from 'angular2/lifecycle_hooks'; import {Directive} from 'angular2/src/core/metadata'; import {ElementRef} from 'angular2/src/core/linker'; @@ -9,7 +9,7 @@ import { KeyValueDiffers } from 'angular2/src/core/change_detection'; import {Renderer} from 'angular2/src/core/render'; -import {StringMapWrapper, isListLikeIterable} from 'angular2/src/core/facade/collection'; +import {StringMapWrapper, isListLikeIterable} from 'angular2/src/facade/collection'; /** * The `NgClass` directive conditionally adds and removes CSS classes on an HTML element based on diff --git a/modules/angular2/src/common/directives/ng_for.ts b/modules/angular2/src/common/directives/ng_for.ts index b95a1c3e51..f2bb8616f6 100644 --- a/modules/angular2/src/common/directives/ng_for.ts +++ b/modules/angular2/src/common/directives/ng_for.ts @@ -6,7 +6,7 @@ import { IterableDiffers } from 'angular2/src/core/change_detection'; import {ViewContainerRef, TemplateRef, ViewRef} from 'angular2/src/core/linker'; -import {isPresent, isBlank} from 'angular2/src/core/facade/lang'; +import {isPresent, isBlank} from 'angular2/src/facade/lang'; /** * The `NgFor` directive instantiates a template once per item from an iterable. The context for diff --git a/modules/angular2/src/common/directives/ng_if.ts b/modules/angular2/src/common/directives/ng_if.ts index 6f9b492721..3c24bea24b 100644 --- a/modules/angular2/src/common/directives/ng_if.ts +++ b/modules/angular2/src/common/directives/ng_if.ts @@ -1,6 +1,6 @@ import {Directive} from 'angular2/src/core/metadata'; import {ViewContainerRef, TemplateRef} from 'angular2/src/core/linker'; -import {isBlank} from 'angular2/src/core/facade/lang'; +import {isBlank} from 'angular2/src/facade/lang'; /** * Removes or recreates a portion of the DOM tree based on an {expression}. diff --git a/modules/angular2/src/common/directives/ng_style.ts b/modules/angular2/src/common/directives/ng_style.ts index cb9669f94b..041b6437f1 100644 --- a/modules/angular2/src/common/directives/ng_style.ts +++ b/modules/angular2/src/common/directives/ng_style.ts @@ -6,7 +6,7 @@ import { import {ElementRef} from 'angular2/src/core/linker'; import {Directive} from 'angular2/src/core/metadata'; import {Renderer} from 'angular2/src/core/render'; -import {isPresent, isBlank, print} from 'angular2/src/core/facade/lang'; +import {isPresent, isBlank, print} from 'angular2/src/facade/lang'; /** * The `NgStyle` directive changes styles based on a result of expression evaluation. diff --git a/modules/angular2/src/common/directives/ng_switch.ts b/modules/angular2/src/common/directives/ng_switch.ts index 53ff430eeb..728cb17457 100644 --- a/modules/angular2/src/common/directives/ng_switch.ts +++ b/modules/angular2/src/common/directives/ng_switch.ts @@ -1,8 +1,8 @@ import {Directive} from 'angular2/src/core/metadata'; import {Host} from 'angular2/src/core/di'; import {ViewContainerRef, TemplateRef} from 'angular2/src/core/linker'; -import {isPresent, isBlank, normalizeBlank, CONST_EXPR} from 'angular2/src/core/facade/lang'; -import {ListWrapper, Map} from 'angular2/src/core/facade/collection'; +import {isPresent, isBlank, normalizeBlank, CONST_EXPR} from 'angular2/src/facade/lang'; +import {ListWrapper, Map} from 'angular2/src/facade/collection'; const _WHEN_DEFAULT = CONST_EXPR(new Object()); diff --git a/modules/angular2/src/common/directives/observable_list_diff.ts b/modules/angular2/src/common/directives/observable_list_diff.ts index 999747f607..08d07c5007 100644 --- a/modules/angular2/src/common/directives/observable_list_diff.ts +++ b/modules/angular2/src/common/directives/observable_list_diff.ts @@ -1,5 +1,5 @@ // TS does not have Observables // I need to be here to make TypeScript think this is a module. -import {} from 'angular2/src/core/facade/lang'; +import {} from 'angular2/src/facade/lang'; export var workaround_empty_observable_list_diff: any; diff --git a/modules/angular2/src/common/forms/directives.ts b/modules/angular2/src/common/forms/directives.ts index 70b6fd4c14..0a3bcbbd5a 100644 --- a/modules/angular2/src/common/forms/directives.ts +++ b/modules/angular2/src/common/forms/directives.ts @@ -1,4 +1,4 @@ -import {Type, CONST_EXPR} from 'angular2/src/core/facade/lang'; +import {Type, CONST_EXPR} from 'angular2/src/facade/lang'; import {NgControlName} from './directives/ng_control_name'; import {NgFormControl} from './directives/ng_form_control'; import {NgModel} from './directives/ng_model'; diff --git a/modules/angular2/src/common/forms/directives/abstract_control_directive.ts b/modules/angular2/src/common/forms/directives/abstract_control_directive.ts index 989fb80162..a31a05ed11 100644 --- a/modules/angular2/src/common/forms/directives/abstract_control_directive.ts +++ b/modules/angular2/src/common/forms/directives/abstract_control_directive.ts @@ -1,6 +1,6 @@ import {AbstractControl} from '../model'; -import {isPresent} from 'angular2/src/core/facade/lang'; -import {unimplemented} from 'angular2/src/core/facade/exceptions'; +import {isPresent} from 'angular2/src/facade/lang'; +import {unimplemented} from 'angular2/src/facade/exceptions'; /** * Base class for control directives. diff --git a/modules/angular2/src/common/forms/directives/checkbox_value_accessor.ts b/modules/angular2/src/common/forms/directives/checkbox_value_accessor.ts index 256b949531..2e886a5dbb 100644 --- a/modules/angular2/src/common/forms/directives/checkbox_value_accessor.ts +++ b/modules/angular2/src/common/forms/directives/checkbox_value_accessor.ts @@ -4,7 +4,7 @@ import {ElementRef} from 'angular2/src/core/linker'; import {Self, forwardRef, Provider} from 'angular2/src/core/di'; import {NG_VALUE_ACCESSOR, ControlValueAccessor} from './control_value_accessor'; -import {CONST_EXPR} from 'angular2/src/core/facade/lang'; +import {CONST_EXPR} from 'angular2/src/facade/lang'; import {setProperty} from './shared'; const CHECKBOX_VALUE_ACCESSOR = CONST_EXPR(new Provider( diff --git a/modules/angular2/src/common/forms/directives/control_value_accessor.ts b/modules/angular2/src/common/forms/directives/control_value_accessor.ts index 9c0cf781da..aa1ffbbc54 100644 --- a/modules/angular2/src/common/forms/directives/control_value_accessor.ts +++ b/modules/angular2/src/common/forms/directives/control_value_accessor.ts @@ -1,4 +1,4 @@ -import {CONST_EXPR} from 'angular2/src/core/facade/lang'; +import {CONST_EXPR} from 'angular2/src/facade/lang'; import {OpaqueToken} from 'angular2/src/core/di'; /** diff --git a/modules/angular2/src/common/forms/directives/default_value_accessor.ts b/modules/angular2/src/common/forms/directives/default_value_accessor.ts index 3d5c86f97e..836ee088b3 100644 --- a/modules/angular2/src/common/forms/directives/default_value_accessor.ts +++ b/modules/angular2/src/common/forms/directives/default_value_accessor.ts @@ -3,7 +3,7 @@ import {ElementRef} from 'angular2/src/core/linker'; import {Renderer} from 'angular2/src/core/render'; import {Self, forwardRef, Provider} from 'angular2/src/core/di'; import {NG_VALUE_ACCESSOR, ControlValueAccessor} from './control_value_accessor'; -import {isBlank, CONST_EXPR} from 'angular2/src/core/facade/lang'; +import {isBlank, CONST_EXPR} from 'angular2/src/facade/lang'; import {setProperty} from './shared'; const DEFAULT_VALUE_ACCESSOR = CONST_EXPR(new Provider( diff --git a/modules/angular2/src/common/forms/directives/ng_control.ts b/modules/angular2/src/common/forms/directives/ng_control.ts index 1b68f4c38e..b43bff5dc0 100644 --- a/modules/angular2/src/common/forms/directives/ng_control.ts +++ b/modules/angular2/src/common/forms/directives/ng_control.ts @@ -1,6 +1,6 @@ import {ControlValueAccessor} from './control_value_accessor'; import {AbstractControlDirective} from './abstract_control_directive'; -import {unimplemented} from 'angular2/src/core/facade/exceptions'; +import {unimplemented} from 'angular2/src/facade/exceptions'; /** * A base class that all control directive extend. diff --git a/modules/angular2/src/common/forms/directives/ng_control_group.ts b/modules/angular2/src/common/forms/directives/ng_control_group.ts index 310c38a8a1..db8bd54cb3 100644 --- a/modules/angular2/src/common/forms/directives/ng_control_group.ts +++ b/modules/angular2/src/common/forms/directives/ng_control_group.ts @@ -1,8 +1,8 @@ import {OnInit, OnDestroy} from 'angular2/lifecycle_hooks'; import {Directive} from 'angular2/src/core/metadata'; import {Optional, Inject, Host, SkipSelf, forwardRef, Provider} from 'angular2/src/core/di'; -import {ListWrapper} from 'angular2/src/core/facade/collection'; -import {CONST_EXPR} from 'angular2/src/core/facade/lang'; +import {ListWrapper} from 'angular2/src/facade/collection'; +import {CONST_EXPR} from 'angular2/src/facade/lang'; import {ControlContainer} from './control_container'; import {controlPath, composeValidators, composeAsyncValidators} from './shared'; diff --git a/modules/angular2/src/common/forms/directives/ng_control_name.ts b/modules/angular2/src/common/forms/directives/ng_control_name.ts index a36522b5dc..f2124ac437 100644 --- a/modules/angular2/src/common/forms/directives/ng_control_name.ts +++ b/modules/angular2/src/common/forms/directives/ng_control_name.ts @@ -1,5 +1,5 @@ -import {CONST_EXPR} from 'angular2/src/core/facade/lang'; -import {EventEmitter, ObservableWrapper} from 'angular2/src/core/facade/async'; +import {CONST_EXPR} from 'angular2/src/facade/lang'; +import {EventEmitter, ObservableWrapper} from 'angular2/src/facade/async'; import {OnChanges, OnDestroy} from 'angular2/lifecycle_hooks'; import {SimpleChange} from 'angular2/src/core/change_detection'; import {Query, Directive} from 'angular2/src/core/metadata'; diff --git a/modules/angular2/src/common/forms/directives/ng_control_status.ts b/modules/angular2/src/common/forms/directives/ng_control_status.ts index 1f1712f4a7..fa3287a13d 100644 --- a/modules/angular2/src/common/forms/directives/ng_control_status.ts +++ b/modules/angular2/src/common/forms/directives/ng_control_status.ts @@ -1,7 +1,7 @@ import {Directive} from 'angular2/src/core/metadata'; import {Self} from 'angular2/src/core/di'; import {NgControl} from './ng_control'; -import {isBlank, isPresent} from 'angular2/src/core/facade/lang'; +import {isBlank, isPresent} from 'angular2/src/facade/lang'; @Directive({ selector: '[ng-control],[ng-model],[ng-form-control]', diff --git a/modules/angular2/src/common/forms/directives/ng_form.ts b/modules/angular2/src/common/forms/directives/ng_form.ts index 937697356a..7c28eee81d 100644 --- a/modules/angular2/src/common/forms/directives/ng_form.ts +++ b/modules/angular2/src/common/forms/directives/ng_form.ts @@ -3,9 +3,9 @@ import { ObservableWrapper, EventEmitter, PromiseCompleter -} from 'angular2/src/core/facade/async'; -import {StringMapWrapper, ListWrapper} from 'angular2/src/core/facade/collection'; -import {isPresent, isBlank, CONST_EXPR} from 'angular2/src/core/facade/lang'; +} from 'angular2/src/facade/async'; +import {StringMapWrapper, ListWrapper} from 'angular2/src/facade/collection'; +import {isPresent, isBlank, CONST_EXPR} from 'angular2/src/facade/lang'; import {Directive} from 'angular2/src/core/metadata'; import {forwardRef, Provider, Optional, Inject} from 'angular2/src/core/di'; import {NgControl} from './ng_control'; diff --git a/modules/angular2/src/common/forms/directives/ng_form_control.ts b/modules/angular2/src/common/forms/directives/ng_form_control.ts index 4de8844061..a4413753b5 100644 --- a/modules/angular2/src/common/forms/directives/ng_form_control.ts +++ b/modules/angular2/src/common/forms/directives/ng_form_control.ts @@ -1,6 +1,6 @@ -import {CONST_EXPR} from 'angular2/src/core/facade/lang'; -import {StringMapWrapper} from 'angular2/src/core/facade/collection'; -import {EventEmitter, ObservableWrapper} from 'angular2/src/core/facade/async'; +import {CONST_EXPR} from 'angular2/src/facade/lang'; +import {StringMapWrapper} from 'angular2/src/facade/collection'; +import {EventEmitter, ObservableWrapper} from 'angular2/src/facade/async'; import {OnChanges} from 'angular2/lifecycle_hooks'; import {SimpleChange} from 'angular2/src/core/change_detection'; import {Query, Directive} from 'angular2/src/core/metadata'; diff --git a/modules/angular2/src/common/forms/directives/ng_form_model.ts b/modules/angular2/src/common/forms/directives/ng_form_model.ts index 45e9a141d9..e6161b8b98 100644 --- a/modules/angular2/src/common/forms/directives/ng_form_model.ts +++ b/modules/angular2/src/common/forms/directives/ng_form_model.ts @@ -1,6 +1,6 @@ -import {CONST_EXPR} from 'angular2/src/core/facade/lang'; -import {ListWrapper, StringMapWrapper} from 'angular2/src/core/facade/collection'; -import {ObservableWrapper, EventEmitter} from 'angular2/src/core/facade/async'; +import {CONST_EXPR} from 'angular2/src/facade/lang'; +import {ListWrapper, StringMapWrapper} from 'angular2/src/facade/collection'; +import {ObservableWrapper, EventEmitter} from 'angular2/src/facade/async'; import {SimpleChange} from 'angular2/src/core/change_detection'; import {OnChanges} from 'angular2/lifecycle_hooks'; diff --git a/modules/angular2/src/common/forms/directives/ng_model.ts b/modules/angular2/src/common/forms/directives/ng_model.ts index b1471fc0be..b13f8d85c9 100644 --- a/modules/angular2/src/common/forms/directives/ng_model.ts +++ b/modules/angular2/src/common/forms/directives/ng_model.ts @@ -1,5 +1,5 @@ -import {CONST_EXPR} from 'angular2/src/core/facade/lang'; -import {EventEmitter, ObservableWrapper} from 'angular2/src/core/facade/async'; +import {CONST_EXPR} from 'angular2/src/facade/lang'; +import {EventEmitter, ObservableWrapper} from 'angular2/src/facade/async'; import {OnChanges} from 'angular2/lifecycle_hooks'; import {SimpleChange} from 'angular2/src/core/change_detection'; import {Query, Directive} from 'angular2/src/core/metadata'; diff --git a/modules/angular2/src/common/forms/directives/number_value_accessor.ts b/modules/angular2/src/common/forms/directives/number_value_accessor.ts index c574e9783e..82c5caac46 100644 --- a/modules/angular2/src/common/forms/directives/number_value_accessor.ts +++ b/modules/angular2/src/common/forms/directives/number_value_accessor.ts @@ -3,7 +3,7 @@ import {ElementRef} from 'angular2/src/core/linker'; import {Renderer} from 'angular2/src/core/render'; import {Self, forwardRef, Provider} from 'angular2/src/core/di'; import {NG_VALUE_ACCESSOR, ControlValueAccessor} from './control_value_accessor'; -import {isBlank, CONST_EXPR, NumberWrapper} from 'angular2/src/core/facade/lang'; +import {isBlank, CONST_EXPR, NumberWrapper} from 'angular2/src/facade/lang'; import {setProperty} from './shared'; const NUMBER_VALUE_ACCESSOR = CONST_EXPR(new Provider( diff --git a/modules/angular2/src/common/forms/directives/select_control_value_accessor.ts b/modules/angular2/src/common/forms/directives/select_control_value_accessor.ts index de7eb63292..b27e66dc4c 100644 --- a/modules/angular2/src/common/forms/directives/select_control_value_accessor.ts +++ b/modules/angular2/src/common/forms/directives/select_control_value_accessor.ts @@ -3,9 +3,9 @@ import {Renderer} from 'angular2/src/core/render'; import {ElementRef, QueryList} from 'angular2/src/core/linker'; import {Query, Directive} from 'angular2/src/core/metadata'; -import {ObservableWrapper} from 'angular2/src/core/facade/async'; +import {ObservableWrapper} from 'angular2/src/facade/async'; import {NG_VALUE_ACCESSOR, ControlValueAccessor} from './control_value_accessor'; -import {CONST_EXPR} from 'angular2/src/core/facade/lang'; +import {CONST_EXPR} from 'angular2/src/facade/lang'; import {setProperty} from './shared'; const SELECT_VALUE_ACCESSOR = CONST_EXPR(new Provider( diff --git a/modules/angular2/src/common/forms/directives/shared.ts b/modules/angular2/src/common/forms/directives/shared.ts index 0dbd7edf5d..e0f753dd88 100644 --- a/modules/angular2/src/common/forms/directives/shared.ts +++ b/modules/angular2/src/common/forms/directives/shared.ts @@ -1,6 +1,6 @@ -import {ListWrapper, StringMapWrapper} from 'angular2/src/core/facade/collection'; -import {isBlank, isPresent, looseIdentical} from 'angular2/src/core/facade/lang'; -import {BaseException, WrappedException} from 'angular2/src/core/facade/exceptions'; +import {ListWrapper, StringMapWrapper} from 'angular2/src/facade/collection'; +import {isBlank, isPresent, looseIdentical} from 'angular2/src/facade/lang'; +import {BaseException, WrappedException} from 'angular2/src/facade/exceptions'; import {ControlContainer} from './control_container'; import {NgControl} from './ng_control'; diff --git a/modules/angular2/src/common/forms/directives/validators.ts b/modules/angular2/src/common/forms/directives/validators.ts index be1d7f8ab1..fb7741c1c3 100644 --- a/modules/angular2/src/common/forms/directives/validators.ts +++ b/modules/angular2/src/common/forms/directives/validators.ts @@ -1,10 +1,10 @@ import {forwardRef, Provider, OpaqueToken} from 'angular2/src/core/di'; -import {CONST_EXPR} from 'angular2/src/core/facade/lang'; +import {CONST_EXPR} from 'angular2/src/facade/lang'; import {Attribute, Directive} from 'angular2/src/core/metadata'; import {Validators, NG_VALIDATORS} from '../validators'; import {Control} from '../model'; import * as modelModule from '../model'; -import {NumberWrapper} from "angular2/src/core/facade/lang"; +import {NumberWrapper} from "angular2/src/facade/lang"; /** diff --git a/modules/angular2/src/common/forms/form_builder.ts b/modules/angular2/src/common/forms/form_builder.ts index 227894df48..15a66ed5c9 100644 --- a/modules/angular2/src/common/forms/form_builder.ts +++ b/modules/angular2/src/common/forms/form_builder.ts @@ -1,6 +1,6 @@ import {Injectable} from 'angular2/src/core/di'; -import {StringMapWrapper} from 'angular2/src/core/facade/collection'; -import {isPresent, isArray, CONST_EXPR, Type} from 'angular2/src/core/facade/lang'; +import {StringMapWrapper} from 'angular2/src/facade/collection'; +import {isPresent, isArray, CONST_EXPR, Type} from 'angular2/src/facade/lang'; import * as modelModule from './model'; diff --git a/modules/angular2/src/common/forms/model.ts b/modules/angular2/src/common/forms/model.ts index 8d91dcd46c..613c836fbc 100644 --- a/modules/angular2/src/common/forms/model.ts +++ b/modules/angular2/src/common/forms/model.ts @@ -1,7 +1,7 @@ -import {StringWrapper, isPresent, isBlank, normalizeBool} from 'angular2/src/core/facade/lang'; -import {Observable, EventEmitter, ObservableWrapper} from 'angular2/src/core/facade/async'; -import {PromiseWrapper} from 'angular2/src/core/facade/promise'; -import {StringMapWrapper, ListWrapper} from 'angular2/src/core/facade/collection'; +import {StringWrapper, isPresent, isBlank, normalizeBool} from 'angular2/src/facade/lang'; +import {Observable, EventEmitter, ObservableWrapper} from 'angular2/src/facade/async'; +import {PromiseWrapper} from 'angular2/src/facade/promise'; +import {StringMapWrapper, ListWrapper} from 'angular2/src/facade/collection'; /** * Indicates that a Control is valid, i.e. that no errors exist in the input value. diff --git a/modules/angular2/src/common/forms/validators.ts b/modules/angular2/src/common/forms/validators.ts index 32d09cc136..5026244eb9 100644 --- a/modules/angular2/src/common/forms/validators.ts +++ b/modules/angular2/src/common/forms/validators.ts @@ -1,7 +1,7 @@ -import {isBlank, isPresent, CONST_EXPR} from 'angular2/src/core/facade/lang'; -import {PromiseWrapper} from 'angular2/src/core/facade/promise'; -import {ObservableWrapper} from 'angular2/src/core/facade/async'; -import {ListWrapper, StringMapWrapper} from 'angular2/src/core/facade/collection'; +import {isBlank, isPresent, CONST_EXPR} from 'angular2/src/facade/lang'; +import {PromiseWrapper} from 'angular2/src/facade/promise'; +import {ObservableWrapper} from 'angular2/src/facade/async'; +import {ListWrapper, StringMapWrapper} from 'angular2/src/facade/collection'; import {OpaqueToken} from 'angular2/src/core/di'; import * as modelModule from './model'; diff --git a/modules/angular2/src/common/pipes.ts b/modules/angular2/src/common/pipes.ts index a1dea1f563..93950e9a9d 100644 --- a/modules/angular2/src/common/pipes.ts +++ b/modules/angular2/src/common/pipes.ts @@ -10,7 +10,7 @@ import {JsonPipe} from './pipes/json_pipe'; import {SlicePipe} from './pipes/slice_pipe'; import {DatePipe} from './pipes/date_pipe'; import {DecimalPipe, PercentPipe, CurrencyPipe} from './pipes/number_pipe'; -import {CONST_EXPR} from 'angular2/src/core/facade/lang'; +import {CONST_EXPR} from 'angular2/src/facade/lang'; export {AsyncPipe} from './pipes/async_pipe'; export {DatePipe} from './pipes/date_pipe'; diff --git a/modules/angular2/src/common/pipes/async_pipe.ts b/modules/angular2/src/common/pipes/async_pipe.ts index cf38f43b32..7a934e8992 100644 --- a/modules/angular2/src/common/pipes/async_pipe.ts +++ b/modules/angular2/src/common/pipes/async_pipe.ts @@ -1,5 +1,5 @@ -import {isBlank, isPresent, isPromise, CONST} from 'angular2/src/core/facade/lang'; -import {Promise, ObservableWrapper, Observable, EventEmitter} from 'angular2/src/core/facade/async'; +import {isBlank, isPresent, isPromise, CONST} from 'angular2/src/facade/lang'; +import {Promise, ObservableWrapper, Observable, EventEmitter} from 'angular2/src/facade/async'; import {Pipe} from 'angular2/src/core/metadata'; import {Injectable} from 'angular2/src/core/di'; import { diff --git a/modules/angular2/src/common/pipes/common_pipes.ts b/modules/angular2/src/common/pipes/common_pipes.ts index 3dd8c6605e..7773c9332f 100644 --- a/modules/angular2/src/common/pipes/common_pipes.ts +++ b/modules/angular2/src/common/pipes/common_pipes.ts @@ -10,7 +10,7 @@ import {JsonPipe} from './json_pipe'; import {SlicePipe} from './slice_pipe'; import {DatePipe} from './date_pipe'; import {DecimalPipe, PercentPipe, CurrencyPipe} from './number_pipe'; -import {CONST_EXPR} from 'angular2/src/core/facade/lang'; +import {CONST_EXPR} from 'angular2/src/facade/lang'; export const COMMON_PIPES = CONST_EXPR([ AsyncPipe, diff --git a/modules/angular2/src/common/pipes/date_pipe.ts b/modules/angular2/src/common/pipes/date_pipe.ts index aabf0988db..92af07a59f 100644 --- a/modules/angular2/src/common/pipes/date_pipe.ts +++ b/modules/angular2/src/common/pipes/date_pipe.ts @@ -7,12 +7,12 @@ import { CONST, isBlank, FunctionWrapper -} from 'angular2/src/core/facade/lang'; -import {DateFormatter} from 'angular2/src/core/facade/intl'; +} from 'angular2/src/facade/lang'; +import {DateFormatter} from 'angular2/src/facade/intl'; import {Injectable} from 'angular2/src/core/di'; import {Pipe} from 'angular2/src/core/metadata'; import {PipeTransform, WrappedValue} from 'angular2/src/core/change_detection'; -import {StringMapWrapper, ListWrapper} from 'angular2/src/core/facade/collection'; +import {StringMapWrapper, ListWrapper} from 'angular2/src/facade/collection'; import {InvalidPipeArgumentException} from './invalid_pipe_argument_exception'; diff --git a/modules/angular2/src/common/pipes/invalid_pipe_argument_exception.ts b/modules/angular2/src/common/pipes/invalid_pipe_argument_exception.ts index e756b996c2..9e414607bd 100644 --- a/modules/angular2/src/common/pipes/invalid_pipe_argument_exception.ts +++ b/modules/angular2/src/common/pipes/invalid_pipe_argument_exception.ts @@ -1,5 +1,5 @@ -import {CONST, Type} from 'angular2/src/core/facade/lang'; -import {BaseException, WrappedException} from 'angular2/src/core/facade/exceptions'; +import {CONST, Type} from 'angular2/src/facade/lang'; +import {BaseException, WrappedException} from 'angular2/src/facade/exceptions'; export class InvalidPipeArgumentException extends BaseException { constructor(type: Type, value: Object) { diff --git a/modules/angular2/src/common/pipes/json_pipe.ts b/modules/angular2/src/common/pipes/json_pipe.ts index b752ab7329..d6b94cbe52 100644 --- a/modules/angular2/src/common/pipes/json_pipe.ts +++ b/modules/angular2/src/common/pipes/json_pipe.ts @@ -1,4 +1,4 @@ -import {isBlank, isPresent, Json, CONST} from 'angular2/src/core/facade/lang'; +import {isBlank, isPresent, Json, CONST} from 'angular2/src/facade/lang'; import {Injectable} from 'angular2/src/core/di'; import {PipeTransform, WrappedValue} from 'angular2/src/core/change_detection'; import {Pipe} from 'angular2/src/core/metadata'; diff --git a/modules/angular2/src/common/pipes/lowercase_pipe.ts b/modules/angular2/src/common/pipes/lowercase_pipe.ts index 9af7d7f034..f1b24548af 100644 --- a/modules/angular2/src/common/pipes/lowercase_pipe.ts +++ b/modules/angular2/src/common/pipes/lowercase_pipe.ts @@ -1,4 +1,4 @@ -import {isString, CONST, isBlank} from 'angular2/src/core/facade/lang'; +import {isString, CONST, isBlank} from 'angular2/src/facade/lang'; import {Injectable} from 'angular2/src/core/di'; import {PipeTransform, WrappedValue} from 'angular2/src/core/change_detection'; import {Pipe} from 'angular2/src/core/metadata'; diff --git a/modules/angular2/src/common/pipes/number_pipe.ts b/modules/angular2/src/common/pipes/number_pipe.ts index c5cc7b9a69..868db96616 100644 --- a/modules/angular2/src/common/pipes/number_pipe.ts +++ b/modules/angular2/src/common/pipes/number_pipe.ts @@ -7,13 +7,13 @@ import { RegExpWrapper, CONST, FunctionWrapper -} from 'angular2/src/core/facade/lang'; -import {BaseException, WrappedException} from 'angular2/src/core/facade/exceptions'; -import {NumberFormatter, NumberFormatStyle} from 'angular2/src/core/facade/intl'; +} from 'angular2/src/facade/lang'; +import {BaseException, WrappedException} from 'angular2/src/facade/exceptions'; +import {NumberFormatter, NumberFormatStyle} from 'angular2/src/facade/intl'; import {Injectable} from 'angular2/src/core/di'; import {PipeTransform, WrappedValue} from 'angular2/src/core/change_detection'; import {Pipe} from 'angular2/src/core/metadata'; -import {ListWrapper} from 'angular2/src/core/facade/collection'; +import {ListWrapper} from 'angular2/src/facade/collection'; import {InvalidPipeArgumentException} from './invalid_pipe_argument_exception'; diff --git a/modules/angular2/src/common/pipes/slice_pipe.ts b/modules/angular2/src/common/pipes/slice_pipe.ts index f636f762f3..a2347909ec 100644 --- a/modules/angular2/src/common/pipes/slice_pipe.ts +++ b/modules/angular2/src/common/pipes/slice_pipe.ts @@ -1,6 +1,6 @@ -import {isBlank, isString, isArray, StringWrapper, CONST} from 'angular2/src/core/facade/lang'; -import {BaseException} from 'angular2/src/core/facade/exceptions'; -import {ListWrapper} from 'angular2/src/core/facade/collection'; +import {isBlank, isString, isArray, StringWrapper, CONST} from 'angular2/src/facade/lang'; +import {BaseException} from 'angular2/src/facade/exceptions'; +import {ListWrapper} from 'angular2/src/facade/collection'; import {Injectable} from 'angular2/src/core/di'; import {PipeTransform, WrappedValue} from 'angular2/src/core/change_detection'; diff --git a/modules/angular2/src/common/pipes/uppercase_pipe.ts b/modules/angular2/src/common/pipes/uppercase_pipe.ts index b438cd1505..c2b733566f 100644 --- a/modules/angular2/src/common/pipes/uppercase_pipe.ts +++ b/modules/angular2/src/common/pipes/uppercase_pipe.ts @@ -1,4 +1,4 @@ -import {isString, CONST, isBlank} from 'angular2/src/core/facade/lang'; +import {isString, CONST, isBlank} from 'angular2/src/facade/lang'; import {Pipe} from 'angular2/src/core/metadata'; import {Injectable} from 'angular2/src/core/di'; import {PipeTransform, WrappedValue} from 'angular2/src/core/change_detection'; diff --git a/modules/angular2/src/compiler/app_root_url.ts b/modules/angular2/src/compiler/app_root_url.ts index 3cb06d6fd0..6c88be7045 100644 --- a/modules/angular2/src/compiler/app_root_url.ts +++ b/modules/angular2/src/compiler/app_root_url.ts @@ -1,5 +1,5 @@ import {Injectable} from 'angular2/src/core/di'; -import {isBlank} from 'angular2/src/core/facade/lang'; +import {isBlank} from 'angular2/src/facade/lang'; /** * Specifies app root url for the application. diff --git a/modules/angular2/src/compiler/change_definition_factory.ts b/modules/angular2/src/compiler/change_definition_factory.ts index d8a2dede10..ce7c940aa9 100644 --- a/modules/angular2/src/compiler/change_definition_factory.ts +++ b/modules/angular2/src/compiler/change_definition_factory.ts @@ -1,5 +1,5 @@ -import {ListWrapper} from 'angular2/src/core/facade/collection'; -import {isPresent, isBlank} from 'angular2/src/core/facade/lang'; +import {ListWrapper} from 'angular2/src/facade/collection'; +import {isPresent, isBlank} from 'angular2/src/facade/lang'; import {reflector} from 'angular2/src/core/reflection/reflection'; import { diff --git a/modules/angular2/src/compiler/change_detector_compiler.ts b/modules/angular2/src/compiler/change_detector_compiler.ts index 30583e7297..4fb90a59cf 100644 --- a/modules/angular2/src/compiler/change_detector_compiler.ts +++ b/modules/angular2/src/compiler/change_detector_compiler.ts @@ -5,7 +5,7 @@ import { } from 'angular2/src/core/change_detection/change_detection_jit_generator'; import {createChangeDetectorDefinitions} from './change_definition_factory'; -import {IS_DART, isJsObject, CONST_EXPR} from 'angular2/src/core/facade/lang'; +import {IS_DART, isJsObject, CONST_EXPR} from 'angular2/src/facade/lang'; import { ChangeDetectorGenConfig, diff --git a/modules/angular2/src/compiler/command_compiler.ts b/modules/angular2/src/compiler/command_compiler.ts index f4f0d56cad..92f4f74733 100644 --- a/modules/angular2/src/compiler/command_compiler.ts +++ b/modules/angular2/src/compiler/command_compiler.ts @@ -1,5 +1,5 @@ -import {isPresent, isBlank, Type, isString, StringWrapper} from 'angular2/src/core/facade/lang'; -import {SetWrapper, StringMapWrapper, ListWrapper} from 'angular2/src/core/facade/collection'; +import {isPresent, isBlank, Type, isString, StringWrapper} from 'angular2/src/facade/lang'; +import {SetWrapper, StringMapWrapper, ListWrapper} from 'angular2/src/facade/collection'; import { TemplateCmd, text, diff --git a/modules/angular2/src/compiler/compiler.ts b/modules/angular2/src/compiler/compiler.ts index 9df2131143..bf70b6d0a6 100644 --- a/modules/angular2/src/compiler/compiler.ts +++ b/modules/angular2/src/compiler/compiler.ts @@ -8,7 +8,7 @@ export { export {SourceModule, SourceWithImports} from './source_module'; export {AMBIENT_DIRECTIVES, AMBIENT_PIPES} from 'angular2/src/core/ambient'; -import {assertionsEnabled, Type} from 'angular2/src/core/facade/lang'; +import {assertionsEnabled, Type} from 'angular2/src/facade/lang'; import {provide, Provider} from 'angular2/src/core/di'; import {TemplateParser} from 'angular2/src/compiler/template_parser'; import {HtmlParser} from 'angular2/src/compiler/html_parser'; diff --git a/modules/angular2/src/compiler/directive_metadata.ts b/modules/angular2/src/compiler/directive_metadata.ts index 48fe545c2d..5033a183cb 100644 --- a/modules/angular2/src/compiler/directive_metadata.ts +++ b/modules/angular2/src/compiler/directive_metadata.ts @@ -6,8 +6,8 @@ import { Type, RegExpWrapper, StringWrapper -} from 'angular2/src/core/facade/lang'; -import {StringMapWrapper} from 'angular2/src/core/facade/collection'; +} from 'angular2/src/facade/lang'; +import {StringMapWrapper} from 'angular2/src/facade/collection'; import { ChangeDetectionStrategy, CHANGE_DETECTION_STRATEGY_VALUES diff --git a/modules/angular2/src/compiler/html_ast.ts b/modules/angular2/src/compiler/html_ast.ts index 067e6fa6ea..6f93932c31 100644 --- a/modules/angular2/src/compiler/html_ast.ts +++ b/modules/angular2/src/compiler/html_ast.ts @@ -1,4 +1,4 @@ -import {isPresent} from 'angular2/src/core/facade/lang'; +import {isPresent} from 'angular2/src/facade/lang'; export interface HtmlAst { sourceInfo: string; diff --git a/modules/angular2/src/compiler/html_parser.ts b/modules/angular2/src/compiler/html_parser.ts index 9d8767707d..3e30b790e9 100644 --- a/modules/angular2/src/compiler/html_parser.ts +++ b/modules/angular2/src/compiler/html_parser.ts @@ -4,7 +4,7 @@ import { stringify, assertionsEnabled, StringJoiner -} from 'angular2/src/core/facade/lang'; +} from 'angular2/src/facade/lang'; import {DOM} from 'angular2/src/core/dom/dom_adapter'; import { diff --git a/modules/angular2/src/compiler/runtime_compiler.ts b/modules/angular2/src/compiler/runtime_compiler.ts index 4891f6b76e..54ae61b31d 100644 --- a/modules/angular2/src/compiler/runtime_compiler.ts +++ b/modules/angular2/src/compiler/runtime_compiler.ts @@ -4,8 +4,8 @@ import {ProtoViewFactory} from 'angular2/src/core/linker/proto_view_factory'; import {TemplateCompiler} from './template_compiler'; import {Injectable} from 'angular2/src/core/di'; -import {Type} from 'angular2/src/core/facade/lang'; -import {Promise, PromiseWrapper} from 'angular2/src/core/facade/async'; +import {Type} from 'angular2/src/facade/lang'; +import {Promise, PromiseWrapper} from 'angular2/src/facade/async'; export abstract class RuntimeCompiler extends Compiler {} diff --git a/modules/angular2/src/compiler/runtime_metadata.ts b/modules/angular2/src/compiler/runtime_metadata.ts index 074c78cf63..b262207df3 100644 --- a/modules/angular2/src/compiler/runtime_metadata.ts +++ b/modules/angular2/src/compiler/runtime_metadata.ts @@ -6,9 +6,9 @@ import { isArray, stringify, RegExpWrapper -} from 'angular2/src/core/facade/lang'; -import {BaseException} from 'angular2/src/core/facade/exceptions'; -import {MapWrapper, StringMapWrapper, ListWrapper} from 'angular2/src/core/facade/collection'; +} from 'angular2/src/facade/lang'; +import {BaseException} from 'angular2/src/facade/exceptions'; +import {MapWrapper, StringMapWrapper, ListWrapper} from 'angular2/src/facade/collection'; import * as cpl from './directive_metadata'; import * as md from 'angular2/src/core/metadata/directives'; import {DirectiveResolver} from 'angular2/src/core/linker/directive_resolver'; diff --git a/modules/angular2/src/compiler/schema/dom_element_schema_registry.ts b/modules/angular2/src/compiler/schema/dom_element_schema_registry.ts index c63686b88c..f2c3d48720 100644 --- a/modules/angular2/src/compiler/schema/dom_element_schema_registry.ts +++ b/modules/angular2/src/compiler/schema/dom_element_schema_registry.ts @@ -1,6 +1,6 @@ import {Injectable} from 'angular2/src/core/di'; -import {isPresent, isBlank} from 'angular2/src/core/facade/lang'; -import {StringMapWrapper} from 'angular2/src/core/facade/collection'; +import {isPresent, isBlank} from 'angular2/src/facade/lang'; +import {StringMapWrapper} from 'angular2/src/facade/collection'; import {DOM} from 'angular2/src/core/dom/dom_adapter'; import {ElementSchemaRegistry} from './element_schema_registry'; diff --git a/modules/angular2/src/compiler/selector.ts b/modules/angular2/src/compiler/selector.ts index 18bc01358e..33aef6fdeb 100644 --- a/modules/angular2/src/compiler/selector.ts +++ b/modules/angular2/src/compiler/selector.ts @@ -1,12 +1,12 @@ -import {Map, ListWrapper, MapWrapper} from 'angular2/src/core/facade/collection'; +import {Map, ListWrapper, MapWrapper} from 'angular2/src/facade/collection'; import { isPresent, isBlank, RegExpWrapper, RegExpMatcherWrapper, StringWrapper -} from 'angular2/src/core/facade/lang'; -import {BaseException, WrappedException} from 'angular2/src/core/facade/exceptions'; +} from 'angular2/src/facade/lang'; +import {BaseException, WrappedException} from 'angular2/src/facade/exceptions'; const _EMPTY_ATTR_VALUE = ''; diff --git a/modules/angular2/src/compiler/shadow_css.ts b/modules/angular2/src/compiler/shadow_css.ts index 6706ab48fa..f85c4f169c 100644 --- a/modules/angular2/src/compiler/shadow_css.ts +++ b/modules/angular2/src/compiler/shadow_css.ts @@ -1,4 +1,4 @@ -import {ListWrapper} from 'angular2/src/core/facade/collection'; +import {ListWrapper} from 'angular2/src/facade/collection'; import { StringWrapper, RegExp, @@ -6,7 +6,7 @@ import { RegExpMatcherWrapper, isPresent, isBlank -} from 'angular2/src/core/facade/lang'; +} from 'angular2/src/facade/lang'; /** * This file is a port of shadowCSS from webcomponents.js to TypeScript. diff --git a/modules/angular2/src/compiler/source_module.ts b/modules/angular2/src/compiler/source_module.ts index e620987806..4a5c8be44d 100644 --- a/modules/angular2/src/compiler/source_module.ts +++ b/modules/angular2/src/compiler/source_module.ts @@ -1,4 +1,4 @@ -import {StringWrapper, isBlank} from 'angular2/src/core/facade/lang'; +import {StringWrapper, isBlank} from 'angular2/src/facade/lang'; var MODULE_REGEXP = /#MODULE\[([^\]]*)\]/g; diff --git a/modules/angular2/src/compiler/style_compiler.ts b/modules/angular2/src/compiler/style_compiler.ts index c71e64a0d2..504c52f125 100644 --- a/modules/angular2/src/compiler/style_compiler.ts +++ b/modules/angular2/src/compiler/style_compiler.ts @@ -2,8 +2,8 @@ import {CompileTypeMetadata, CompileTemplateMetadata} from './directive_metadata import {SourceModule, SourceExpression, moduleRef} from './source_module'; import {ViewEncapsulation} from 'angular2/src/core/metadata/view'; import {XHR} from 'angular2/src/compiler/xhr'; -import {IS_DART, StringWrapper, isBlank} from 'angular2/src/core/facade/lang'; -import {PromiseWrapper, Promise} from 'angular2/src/core/facade/async'; +import {IS_DART, StringWrapper, isBlank} from 'angular2/src/facade/lang'; +import {PromiseWrapper, Promise} from 'angular2/src/facade/async'; import {ShadowCss} from 'angular2/src/compiler/shadow_css'; import {UrlResolver} from 'angular2/src/compiler/url_resolver'; import {extractStyleUrls} from './style_url_resolver'; diff --git a/modules/angular2/src/compiler/style_url_resolver.ts b/modules/angular2/src/compiler/style_url_resolver.ts index 674d7d0b38..bdd229e254 100644 --- a/modules/angular2/src/compiler/style_url_resolver.ts +++ b/modules/angular2/src/compiler/style_url_resolver.ts @@ -1,13 +1,7 @@ // Some of the code comes from WebComponents.JS // https://github.com/webcomponents/webcomponentsjs/blob/master/src/HTMLImports/path.js -import { - RegExp, - RegExpWrapper, - StringWrapper, - isPresent, - isBlank -} from 'angular2/src/core/facade/lang'; +import {RegExp, RegExpWrapper, StringWrapper, isPresent, isBlank} from 'angular2/src/facade/lang'; import {UrlResolver} from 'angular2/src/compiler/url_resolver'; export class StyleWithImports { diff --git a/modules/angular2/src/compiler/template_ast.ts b/modules/angular2/src/compiler/template_ast.ts index cbe80268cb..10a92a6d36 100644 --- a/modules/angular2/src/compiler/template_ast.ts +++ b/modules/angular2/src/compiler/template_ast.ts @@ -1,5 +1,5 @@ import {AST} from 'angular2/src/core/change_detection/change_detection'; -import {isPresent} from 'angular2/src/core/facade/lang'; +import {isPresent} from 'angular2/src/facade/lang'; import {CompileDirectiveMetadata} from './directive_metadata'; export interface TemplateAst { diff --git a/modules/angular2/src/compiler/template_compiler.ts b/modules/angular2/src/compiler/template_compiler.ts index 46a4c8bb89..24f3eb4a53 100644 --- a/modules/angular2/src/compiler/template_compiler.ts +++ b/modules/angular2/src/compiler/template_compiler.ts @@ -1,7 +1,7 @@ -import {IS_DART, Type, Json, isBlank, stringify} from 'angular2/src/core/facade/lang'; -import {BaseException} from 'angular2/src/core/facade/exceptions'; -import {ListWrapper, SetWrapper} from 'angular2/src/core/facade/collection'; -import {PromiseWrapper, Promise} from 'angular2/src/core/facade/async'; +import {IS_DART, Type, Json, isBlank, stringify} from 'angular2/src/facade/lang'; +import {BaseException} from 'angular2/src/facade/exceptions'; +import {ListWrapper, SetWrapper} from 'angular2/src/facade/collection'; +import {PromiseWrapper, Promise} from 'angular2/src/facade/async'; import { CompiledTemplate, TemplateCmd, diff --git a/modules/angular2/src/compiler/template_normalizer.ts b/modules/angular2/src/compiler/template_normalizer.ts index 93b8f42bea..15f976e0b7 100644 --- a/modules/angular2/src/compiler/template_normalizer.ts +++ b/modules/angular2/src/compiler/template_normalizer.ts @@ -3,10 +3,10 @@ import { CompileDirectiveMetadata, CompileTemplateMetadata } from './directive_metadata'; -import {isPresent, isBlank} from 'angular2/src/core/facade/lang'; -import {ListWrapper} from 'angular2/src/core/facade/collection'; -import {BaseException} from 'angular2/src/core/facade/exceptions'; -import {Promise, PromiseWrapper} from 'angular2/src/core/facade/async'; +import {isPresent, isBlank} from 'angular2/src/facade/lang'; +import {ListWrapper} from 'angular2/src/facade/collection'; +import {BaseException} from 'angular2/src/facade/exceptions'; +import {Promise, PromiseWrapper} from 'angular2/src/facade/async'; import {XHR} from 'angular2/src/compiler/xhr'; import {UrlResolver} from 'angular2/src/compiler/url_resolver'; diff --git a/modules/angular2/src/compiler/template_parser.ts b/modules/angular2/src/compiler/template_parser.ts index a4d0c66388..f14d029348 100644 --- a/modules/angular2/src/compiler/template_parser.ts +++ b/modules/angular2/src/compiler/template_parser.ts @@ -3,7 +3,7 @@ import { ListWrapper, StringMapWrapper, SetWrapper -} from 'angular2/src/core/facade/collection'; +} from 'angular2/src/facade/collection'; import { RegExpWrapper, isPresent, @@ -12,9 +12,9 @@ import { stringify, assertionsEnabled, isBlank -} from 'angular2/src/core/facade/lang'; +} from 'angular2/src/facade/lang'; import {Injectable} from 'angular2/src/core/di'; -import {BaseException} from 'angular2/src/core/facade/exceptions'; +import {BaseException} from 'angular2/src/facade/exceptions'; import {Parser, AST, ASTWithSource} from 'angular2/src/core/change_detection/change_detection'; import {TemplateBinding} from 'angular2/src/core/change_detection/parser/ast'; import {CompileDirectiveMetadata} from './directive_metadata'; diff --git a/modules/angular2/src/compiler/template_preparser.ts b/modules/angular2/src/compiler/template_preparser.ts index 90d6d83a2a..28640b9fe0 100644 --- a/modules/angular2/src/compiler/template_preparser.ts +++ b/modules/angular2/src/compiler/template_preparser.ts @@ -1,5 +1,5 @@ import {HtmlElementAst} from './html_ast'; -import {isBlank, isPresent} from 'angular2/src/core/facade/lang'; +import {isBlank, isPresent} from 'angular2/src/facade/lang'; const NG_CONTENT_SELECT_ATTR = 'select'; const NG_CONTENT_ELEMENT = 'ng-content'; diff --git a/modules/angular2/src/compiler/url_resolver.ts b/modules/angular2/src/compiler/url_resolver.ts index 6609faba6c..93cf9e5a66 100644 --- a/modules/angular2/src/compiler/url_resolver.ts +++ b/modules/angular2/src/compiler/url_resolver.ts @@ -1,7 +1,7 @@ import {Injectable} from 'angular2/src/core/di'; -import {isPresent, isBlank, RegExpWrapper, normalizeBlank} from 'angular2/src/core/facade/lang'; -import {BaseException, WrappedException} from 'angular2/src/core/facade/exceptions'; -import {ListWrapper} from 'angular2/src/core/facade/collection'; +import {isPresent, isBlank, RegExpWrapper, normalizeBlank} from 'angular2/src/facade/lang'; +import {BaseException, WrappedException} from 'angular2/src/facade/exceptions'; +import {ListWrapper} from 'angular2/src/facade/collection'; export function createWithoutPackagePrefix(): UrlResolver { return new UrlResolver(); diff --git a/modules/angular2/src/compiler/util.ts b/modules/angular2/src/compiler/util.ts index 427035296c..6ef100c90b 100644 --- a/modules/angular2/src/compiler/util.ts +++ b/modules/angular2/src/compiler/util.ts @@ -1,4 +1,4 @@ -import {IS_DART, StringWrapper, isBlank} from 'angular2/src/core/facade/lang'; +import {IS_DART, StringWrapper, isBlank} from 'angular2/src/facade/lang'; var CAMEL_CASE_REGEXP = /([A-Z])/g; var DASH_CASE_REGEXP = /-([a-z])/g; diff --git a/modules/angular2/src/compiler/xhr.ts b/modules/angular2/src/compiler/xhr.ts index 5963a9e35a..1f500e2c6c 100644 --- a/modules/angular2/src/compiler/xhr.ts +++ b/modules/angular2/src/compiler/xhr.ts @@ -1,4 +1,4 @@ -import {Promise} from 'angular2/src/core/facade/async'; +import {Promise} from 'angular2/src/facade/async'; // TODO: vsavkin rename it into TemplateLoader and do not reexport it via DomAdapter export class XHR { diff --git a/modules/angular2/src/compiler/xhr_impl.ts b/modules/angular2/src/compiler/xhr_impl.ts index 0462392115..f6f2c576f5 100644 --- a/modules/angular2/src/compiler/xhr_impl.ts +++ b/modules/angular2/src/compiler/xhr_impl.ts @@ -1,5 +1,5 @@ -import {Promise, PromiseWrapper, PromiseCompleter} from 'angular2/src/core/facade/promise'; -import {isPresent} from 'angular2/src/core/facade/lang'; +import {Promise, PromiseWrapper, PromiseCompleter} from 'angular2/src/facade/promise'; +import {isPresent} from 'angular2/src/facade/lang'; import {XHR} from './xhr'; export class XHRImpl extends XHR { diff --git a/modules/angular2/src/compiler/xhr_mock.ts b/modules/angular2/src/compiler/xhr_mock.ts index 0089fb6068..569eea873d 100644 --- a/modules/angular2/src/compiler/xhr_mock.ts +++ b/modules/angular2/src/compiler/xhr_mock.ts @@ -1,8 +1,8 @@ import {XHR} from 'angular2/src/compiler/xhr'; -import {ListWrapper, Map, MapWrapper} from 'angular2/src/core/facade/collection'; -import {isBlank, isPresent, normalizeBlank} from 'angular2/src/core/facade/lang'; -import {BaseException, WrappedException} from 'angular2/src/core/facade/exceptions'; -import {PromiseCompleter, PromiseWrapper, Promise} from 'angular2/src/core/facade/async'; +import {ListWrapper, Map, MapWrapper} from 'angular2/src/facade/collection'; +import {isBlank, isPresent, normalizeBlank} from 'angular2/src/facade/lang'; +import {BaseException, WrappedException} from 'angular2/src/facade/exceptions'; +import {PromiseCompleter, PromiseWrapper, Promise} from 'angular2/src/facade/async'; export class MockXHR extends XHR { private _expectations: _Expectation[] = []; diff --git a/modules/angular2/src/core/ambient.ts b/modules/angular2/src/core/ambient.ts index d0a1de4ebf..269647b373 100644 --- a/modules/angular2/src/core/ambient.ts +++ b/modules/angular2/src/core/ambient.ts @@ -1,5 +1,5 @@ import {OpaqueToken} from "angular2/src/core/di"; -import {CONST_EXPR} from "angular2/src/core/facade/lang"; +import {CONST_EXPR} from "angular2/src/facade/lang"; /** * A token that can be provided when bootstraping an application to make an array of directives diff --git a/modules/angular2/src/core/application.ts b/modules/angular2/src/core/application.ts index 62ef38d746..b275f2210b 100644 --- a/modules/angular2/src/core/application.ts +++ b/modules/angular2/src/core/application.ts @@ -1,7 +1,7 @@ // Public API for Application import {Provider} from './di'; -import {Type, isPresent} from 'angular2/src/core/facade/lang'; -import {Promise} from 'angular2/src/core/facade/async'; +import {Type, isPresent} from 'angular2/src/facade/lang'; +import {Promise} from 'angular2/src/facade/async'; import {compilerProviders} from 'angular2/src/compiler/compiler'; import {commonBootstrap} from './application_common'; import {ComponentRef} from './linker/dynamic_component_loader'; diff --git a/modules/angular2/src/core/application_common.ts b/modules/angular2/src/core/application_common.ts index 83d44f0bb6..8552ed5dfc 100644 --- a/modules/angular2/src/core/application_common.ts +++ b/modules/angular2/src/core/application_common.ts @@ -1,10 +1,10 @@ import {FORM_PROVIDERS} from 'angular2/src/common/forms'; import {provide, Provider} from 'angular2/src/core/di'; -import {Type, isBlank, isPresent, stringify} from 'angular2/src/core/facade/lang'; +import {Type, isBlank, isPresent, stringify} from 'angular2/src/facade/lang'; import {BrowserDomAdapter} from 'angular2/src/core/dom/browser_adapter'; import {BrowserGetTestability} from 'angular2/src/core/testability/browser_testability'; import {DOM} from 'angular2/src/core/dom/dom_adapter'; -import {Promise} from 'angular2/src/core/facade/async'; +import {Promise} from 'angular2/src/facade/async'; import {XHR} from 'angular2/src/compiler/xhr'; import {XHRImpl} from 'angular2/src/compiler/xhr_impl'; diff --git a/modules/angular2/src/core/application_ref.ts b/modules/angular2/src/core/application_ref.ts index bde6c2d533..7aae84de5d 100644 --- a/modules/angular2/src/core/application_ref.ts +++ b/modules/angular2/src/core/application_ref.ts @@ -1,5 +1,5 @@ import {NgZone} from 'angular2/src/core/zone/ng_zone'; -import {Type, isBlank, isPresent, assertionsEnabled} from 'angular2/src/core/facade/lang'; +import {Type, isBlank, isPresent, assertionsEnabled} from 'angular2/src/facade/lang'; import {provide, Provider, Injector, OpaqueToken} from 'angular2/src/core/di'; import { APP_COMPONENT_REF_PROMISE, @@ -11,8 +11,8 @@ import { PromiseWrapper, PromiseCompleter, ObservableWrapper -} from 'angular2/src/core/facade/async'; -import {ListWrapper} from 'angular2/src/core/facade/collection'; +} from 'angular2/src/facade/async'; +import {ListWrapper} from 'angular2/src/facade/collection'; import {Reflector, reflector} from 'angular2/src/core/reflection/reflection'; import {TestabilityRegistry, Testability} from 'angular2/src/core/testability/testability'; import { @@ -24,7 +24,7 @@ import { WrappedException, ExceptionHandler, unimplemented -} from 'angular2/src/core/facade/exceptions'; +} from 'angular2/src/facade/exceptions'; import {DOM} from 'angular2/src/core/dom/dom_adapter'; import {internalView} from 'angular2/src/core/linker/view_ref'; import { @@ -48,7 +48,7 @@ import {Compiler_} from "./linker/compiler"; import {wtfLeave, wtfCreateScope, WtfScopeFn} from './profile/profile'; import {ChangeDetectorRef} from 'angular2/src/core/change_detection/change_detector_ref'; import {AMBIENT_DIRECTIVES, AMBIENT_PIPES} from "angular2/src/core/ambient"; -import {lockDevMode} from 'angular2/src/core/facade/lang'; +import {lockDevMode} from 'angular2/src/facade/lang'; import {COMMON_DIRECTIVES, COMMON_PIPES} from "angular2/common"; /** diff --git a/modules/angular2/src/core/application_tokens.ts b/modules/angular2/src/core/application_tokens.ts index 226e915307..809087cfbb 100644 --- a/modules/angular2/src/core/application_tokens.ts +++ b/modules/angular2/src/core/application_tokens.ts @@ -1,5 +1,5 @@ import {OpaqueToken, Provider} from 'angular2/src/core/di'; -import {CONST_EXPR, Math, StringWrapper} from 'angular2/src/core/facade/lang'; +import {CONST_EXPR, Math, StringWrapper} from 'angular2/src/facade/lang'; /** * @internal diff --git a/modules/angular2/src/core/change_detection/abstract_change_detector.ts b/modules/angular2/src/core/change_detection/abstract_change_detector.ts index f98dab129c..dbbf8507cb 100644 --- a/modules/angular2/src/core/change_detection/abstract_change_detector.ts +++ b/modules/angular2/src/core/change_detection/abstract_change_detector.ts @@ -1,5 +1,5 @@ -import {assertionsEnabled, isPresent, isBlank, StringWrapper} from 'angular2/src/core/facade/lang'; -import {ListWrapper} from 'angular2/src/core/facade/collection'; +import {assertionsEnabled, isPresent, isBlank, StringWrapper} from 'angular2/src/facade/lang'; +import {ListWrapper} from 'angular2/src/facade/collection'; import {ChangeDetectionUtil} from './change_detection_util'; import {ChangeDetectorRef, ChangeDetectorRef_} from './change_detector_ref'; import {DirectiveIndex} from './directive_record'; diff --git a/modules/angular2/src/core/change_detection/binding_record.ts b/modules/angular2/src/core/change_detection/binding_record.ts index 24282b208d..b6e3ce9b29 100644 --- a/modules/angular2/src/core/change_detection/binding_record.ts +++ b/modules/angular2/src/core/change_detection/binding_record.ts @@ -1,4 +1,4 @@ -import {isPresent, isBlank} from 'angular2/src/core/facade/lang'; +import {isPresent, isBlank} from 'angular2/src/facade/lang'; import {SetterFn} from 'angular2/src/core/reflection/types'; import {AST} from './parser/ast'; import {DirectiveIndex, DirectiveRecord} from './directive_record'; diff --git a/modules/angular2/src/core/change_detection/change_detection.ts b/modules/angular2/src/core/change_detection/change_detection.ts index 9d5d2c9438..25284eb53d 100644 --- a/modules/angular2/src/core/change_detection/change_detection.ts +++ b/modules/angular2/src/core/change_detection/change_detection.ts @@ -2,7 +2,7 @@ import {IterableDiffers, IterableDifferFactory} from './differs/iterable_differs import {DefaultIterableDifferFactory} from './differs/default_iterable_differ'; import {KeyValueDiffers, KeyValueDifferFactory} from './differs/keyvalue_differs'; import {DefaultKeyValueDifferFactory} from './differs/default_keyvalue_differ'; -import {CONST, CONST_EXPR, isPresent} from 'angular2/src/core/facade/lang'; +import {CONST, CONST_EXPR, isPresent} from 'angular2/src/facade/lang'; export { ASTWithSource, diff --git a/modules/angular2/src/core/change_detection/change_detection_jit_generator.ts b/modules/angular2/src/core/change_detection/change_detection_jit_generator.ts index de4a7e00c3..44ecca9c3d 100644 --- a/modules/angular2/src/core/change_detection/change_detection_jit_generator.ts +++ b/modules/angular2/src/core/change_detection/change_detection_jit_generator.ts @@ -1,12 +1,6 @@ -import { - Type, - assertionsEnabled, - isBlank, - isPresent, - StringWrapper -} from 'angular2/src/core/facade/lang'; -import {BaseException} from 'angular2/src/core/facade/exceptions'; -import {ListWrapper, MapWrapper, StringMapWrapper} from 'angular2/src/core/facade/collection'; +import {Type, assertionsEnabled, isBlank, isPresent, StringWrapper} from 'angular2/src/facade/lang'; +import {BaseException} from 'angular2/src/facade/exceptions'; +import {ListWrapper, MapWrapper, StringMapWrapper} from 'angular2/src/facade/collection'; import {AbstractChangeDetector} from './abstract_change_detector'; import {ChangeDetectionUtil} from './change_detection_util'; diff --git a/modules/angular2/src/core/change_detection/change_detection_util.ts b/modules/angular2/src/core/change_detection/change_detection_util.ts index 386788b21a..f80750b2f3 100644 --- a/modules/angular2/src/core/change_detection/change_detection_util.ts +++ b/modules/angular2/src/core/change_detection/change_detection_util.ts @@ -5,9 +5,9 @@ import { Type, StringWrapper, looseIdentical -} from 'angular2/src/core/facade/lang'; -import {BaseException} from 'angular2/src/core/facade/exceptions'; -import {ListWrapper, MapWrapper, StringMapWrapper} from 'angular2/src/core/facade/collection'; +} from 'angular2/src/facade/lang'; +import {BaseException} from 'angular2/src/facade/exceptions'; +import {ListWrapper, MapWrapper, StringMapWrapper} from 'angular2/src/facade/collection'; import {ProtoRecord} from './proto_record'; import {ChangeDetectionStrategy, isDefaultChangeDetectionStrategy} from './constants'; import {implementsOnDestroy} from './pipe_lifecycle_reflector'; diff --git a/modules/angular2/src/core/change_detection/coalesce.ts b/modules/angular2/src/core/change_detection/coalesce.ts index 19ef48380f..6f9004e35c 100644 --- a/modules/angular2/src/core/change_detection/coalesce.ts +++ b/modules/angular2/src/core/change_detection/coalesce.ts @@ -1,5 +1,5 @@ -import {isPresent, isBlank, looseIdentical} from 'angular2/src/core/facade/lang'; -import {ListWrapper, Map} from 'angular2/src/core/facade/collection'; +import {isPresent, isBlank, looseIdentical} from 'angular2/src/facade/lang'; +import {ListWrapper, Map} from 'angular2/src/facade/collection'; import {RecordType, ProtoRecord} from './proto_record'; /** diff --git a/modules/angular2/src/core/change_detection/codegen_logic_util.ts b/modules/angular2/src/core/change_detection/codegen_logic_util.ts index f2359c8cdd..b837f70c85 100644 --- a/modules/angular2/src/core/change_detection/codegen_logic_util.ts +++ b/modules/angular2/src/core/change_detection/codegen_logic_util.ts @@ -1,11 +1,11 @@ -import {IS_DART, Json, StringWrapper, isPresent, isBlank} from 'angular2/src/core/facade/lang'; +import {IS_DART, Json, StringWrapper, isPresent, isBlank} from 'angular2/src/facade/lang'; import {CodegenNameUtil} from './codegen_name_util'; import {codify, combineGeneratedStrings, rawString} from './codegen_facade'; import {ProtoRecord, RecordType} from './proto_record'; import {BindingTarget} from './binding_record'; import {DirectiveRecord} from './directive_record'; import {ChangeDetectionStrategy} from './constants'; -import {BaseException} from 'angular2/src/core/facade/exceptions'; +import {BaseException} from 'angular2/src/facade/exceptions'; /** * Class responsible for providing change detection logic for change detector classes. diff --git a/modules/angular2/src/core/change_detection/codegen_name_util.ts b/modules/angular2/src/core/change_detection/codegen_name_util.ts index c95b76c9e2..dbeb4a5b9c 100644 --- a/modules/angular2/src/core/change_detection/codegen_name_util.ts +++ b/modules/angular2/src/core/change_detection/codegen_name_util.ts @@ -1,5 +1,5 @@ -import {RegExpWrapper, StringWrapper} from 'angular2/src/core/facade/lang'; -import {ListWrapper, MapWrapper, Map} from 'angular2/src/core/facade/collection'; +import {RegExpWrapper, StringWrapper} from 'angular2/src/facade/lang'; +import {ListWrapper, MapWrapper, Map} from 'angular2/src/facade/collection'; import {DirectiveIndex} from './directive_record'; diff --git a/modules/angular2/src/core/change_detection/constants.ts b/modules/angular2/src/core/change_detection/constants.ts index 5c77005bca..de23c92667 100644 --- a/modules/angular2/src/core/change_detection/constants.ts +++ b/modules/angular2/src/core/change_detection/constants.ts @@ -1,4 +1,4 @@ -import {StringWrapper, normalizeBool, isBlank} from 'angular2/src/core/facade/lang'; +import {StringWrapper, normalizeBool, isBlank} from 'angular2/src/facade/lang'; export enum ChangeDetectorState { /** diff --git a/modules/angular2/src/core/change_detection/differs/default_iterable_differ.ts b/modules/angular2/src/core/change_detection/differs/default_iterable_differ.ts index fcefa53157..424577ea52 100644 --- a/modules/angular2/src/core/change_detection/differs/default_iterable_differ.ts +++ b/modules/angular2/src/core/change_detection/differs/default_iterable_differ.ts @@ -1,11 +1,11 @@ -import {CONST} from 'angular2/src/core/facade/lang'; -import {BaseException} from 'angular2/src/core/facade/exceptions'; +import {CONST} from 'angular2/src/facade/lang'; +import {BaseException} from 'angular2/src/facade/exceptions'; import { isListLikeIterable, iterateListLike, ListWrapper, MapWrapper -} from 'angular2/src/core/facade/collection'; +} from 'angular2/src/facade/collection'; import { isBlank, @@ -14,7 +14,7 @@ import { getMapKey, looseIdentical, isArray -} from 'angular2/src/core/facade/lang'; +} from 'angular2/src/facade/lang'; import {ChangeDetectorRef} from '../change_detector_ref'; import {IterableDiffer, IterableDifferFactory} from '../differs/iterable_differs'; diff --git a/modules/angular2/src/core/change_detection/differs/default_keyvalue_differ.ts b/modules/angular2/src/core/change_detection/differs/default_keyvalue_differ.ts index 1c30b56857..1593421164 100644 --- a/modules/angular2/src/core/change_detection/differs/default_keyvalue_differ.ts +++ b/modules/angular2/src/core/change_detection/differs/default_keyvalue_differ.ts @@ -1,6 +1,6 @@ -import {MapWrapper, StringMapWrapper} from 'angular2/src/core/facade/collection'; -import {stringify, looseIdentical, isJsObject, CONST, isBlank} from 'angular2/src/core/facade/lang'; -import {BaseException} from 'angular2/src/core/facade/exceptions'; +import {MapWrapper, StringMapWrapper} from 'angular2/src/facade/collection'; +import {stringify, looseIdentical, isJsObject, CONST, isBlank} from 'angular2/src/facade/lang'; +import {BaseException} from 'angular2/src/facade/exceptions'; import {ChangeDetectorRef} from '../change_detector_ref'; import {KeyValueDiffer, KeyValueDifferFactory} from '../differs/keyvalue_differs'; diff --git a/modules/angular2/src/core/change_detection/differs/iterable_differs.ts b/modules/angular2/src/core/change_detection/differs/iterable_differs.ts index 4b69e414d1..613fbfbb74 100644 --- a/modules/angular2/src/core/change_detection/differs/iterable_differs.ts +++ b/modules/angular2/src/core/change_detection/differs/iterable_differs.ts @@ -1,6 +1,6 @@ -import {isBlank, isPresent, CONST} from 'angular2/src/core/facade/lang'; -import {BaseException} from 'angular2/src/core/facade/exceptions'; -import {ListWrapper} from 'angular2/src/core/facade/collection'; +import {isBlank, isPresent, CONST} from 'angular2/src/facade/lang'; +import {BaseException} from 'angular2/src/facade/exceptions'; +import {ListWrapper} from 'angular2/src/facade/collection'; import {ChangeDetectorRef} from '../change_detector_ref'; import {Provider, SkipSelfMetadata, OptionalMetadata, Injectable} from 'angular2/src/core/di'; diff --git a/modules/angular2/src/core/change_detection/differs/keyvalue_differs.ts b/modules/angular2/src/core/change_detection/differs/keyvalue_differs.ts index e1f6c28275..c5a173af9d 100644 --- a/modules/angular2/src/core/change_detection/differs/keyvalue_differs.ts +++ b/modules/angular2/src/core/change_detection/differs/keyvalue_differs.ts @@ -1,6 +1,6 @@ -import {isBlank, isPresent, CONST} from 'angular2/src/core/facade/lang'; -import {BaseException} from 'angular2/src/core/facade/exceptions'; -import {ListWrapper} from 'angular2/src/core/facade/collection'; +import {isBlank, isPresent, CONST} from 'angular2/src/facade/lang'; +import {BaseException} from 'angular2/src/facade/exceptions'; +import {ListWrapper} from 'angular2/src/facade/collection'; import {ChangeDetectorRef} from '../change_detector_ref'; import {Provider, SkipSelfMetadata, OptionalMetadata, Injectable} from 'angular2/src/core/di'; diff --git a/modules/angular2/src/core/change_detection/directive_record.ts b/modules/angular2/src/core/change_detection/directive_record.ts index 3d0768c99b..967034f07e 100644 --- a/modules/angular2/src/core/change_detection/directive_record.ts +++ b/modules/angular2/src/core/change_detection/directive_record.ts @@ -1,4 +1,4 @@ -import {StringWrapper, normalizeBool, isBlank} from 'angular2/src/core/facade/lang'; +import {StringWrapper, normalizeBool, isBlank} from 'angular2/src/facade/lang'; import {isDefaultChangeDetectionStrategy, ChangeDetectionStrategy} from './constants'; export class DirectiveIndex { diff --git a/modules/angular2/src/core/change_detection/dynamic_change_detector.ts b/modules/angular2/src/core/change_detection/dynamic_change_detector.ts index 41ee49e149..a6f562ae2c 100644 --- a/modules/angular2/src/core/change_detection/dynamic_change_detector.ts +++ b/modules/angular2/src/core/change_detection/dynamic_change_detector.ts @@ -1,6 +1,6 @@ -import {isPresent, isBlank, FunctionWrapper, StringWrapper} from 'angular2/src/core/facade/lang'; -import {BaseException} from 'angular2/src/core/facade/exceptions'; -import {ListWrapper, MapWrapper, StringMapWrapper} from 'angular2/src/core/facade/collection'; +import {isPresent, isBlank, FunctionWrapper, StringWrapper} from 'angular2/src/facade/lang'; +import {BaseException} from 'angular2/src/facade/exceptions'; +import {ListWrapper, MapWrapper, StringMapWrapper} from 'angular2/src/facade/collection'; import {AbstractChangeDetector} from './abstract_change_detector'; import {EventBinding} from './event_binding'; diff --git a/modules/angular2/src/core/change_detection/exceptions.ts b/modules/angular2/src/core/change_detection/exceptions.ts index 7bb1a2d7d7..b8c7454447 100644 --- a/modules/angular2/src/core/change_detection/exceptions.ts +++ b/modules/angular2/src/core/change_detection/exceptions.ts @@ -1,4 +1,4 @@ -import {BaseException, WrappedException} from "angular2/src/core/facade/exceptions"; +import {BaseException, WrappedException} from "angular2/src/facade/exceptions"; /** * An error thrown if application changes model breaking the top-down data flow. diff --git a/modules/angular2/src/core/change_detection/jit_proto_change_detector.ts b/modules/angular2/src/core/change_detection/jit_proto_change_detector.ts index add231e80d..3d4636e7e3 100644 --- a/modules/angular2/src/core/change_detection/jit_proto_change_detector.ts +++ b/modules/angular2/src/core/change_detection/jit_proto_change_detector.ts @@ -1,5 +1,5 @@ -import {ListWrapper} from 'angular2/src/core/facade/collection'; -import {isPresent} from 'angular2/src/core/facade/lang'; +import {ListWrapper} from 'angular2/src/facade/collection'; +import {isPresent} from 'angular2/src/facade/lang'; import {ProtoChangeDetector, ChangeDetector, ChangeDetectorDefinition} from './interfaces'; import {ChangeDetectorJITGenerator} from './change_detection_jit_generator'; diff --git a/modules/angular2/src/core/change_detection/parser/ast.ts b/modules/angular2/src/core/change_detection/parser/ast.ts index b3bea7e967..fc0ed2e6e4 100644 --- a/modules/angular2/src/core/change_detection/parser/ast.ts +++ b/modules/angular2/src/core/change_detection/parser/ast.ts @@ -1,4 +1,4 @@ -import {ListWrapper} from "angular2/src/core/facade/collection"; +import {ListWrapper} from "angular2/src/facade/collection"; export class AST { visit(visitor: AstVisitor): any { return null; } diff --git a/modules/angular2/src/core/change_detection/parser/lexer.ts b/modules/angular2/src/core/change_detection/parser/lexer.ts index 7013d16393..aa9cf852b2 100644 --- a/modules/angular2/src/core/change_detection/parser/lexer.ts +++ b/modules/angular2/src/core/change_detection/parser/lexer.ts @@ -1,7 +1,7 @@ import {Injectable} from 'angular2/src/core/di/decorators'; -import {ListWrapper, SetWrapper} from "angular2/src/core/facade/collection"; -import {NumberWrapper, StringJoiner, StringWrapper, isPresent} from "angular2/src/core/facade/lang"; -import {BaseException} from 'angular2/src/core/facade/exceptions'; +import {ListWrapper, SetWrapper} from "angular2/src/facade/collection"; +import {NumberWrapper, StringJoiner, StringWrapper, isPresent} from "angular2/src/facade/lang"; +import {BaseException} from 'angular2/src/facade/exceptions'; export enum TokenType { Character, diff --git a/modules/angular2/src/core/change_detection/parser/locals.ts b/modules/angular2/src/core/change_detection/parser/locals.ts index b6212c6182..92b1aaa862 100644 --- a/modules/angular2/src/core/change_detection/parser/locals.ts +++ b/modules/angular2/src/core/change_detection/parser/locals.ts @@ -1,6 +1,6 @@ -import {isPresent} from 'angular2/src/core/facade/lang'; -import {BaseException} from 'angular2/src/core/facade/exceptions'; -import {ListWrapper, MapWrapper} from 'angular2/src/core/facade/collection'; +import {isPresent} from 'angular2/src/facade/lang'; +import {BaseException} from 'angular2/src/facade/exceptions'; +import {ListWrapper, MapWrapper} from 'angular2/src/facade/collection'; export class Locals { constructor(public parent: Locals, public current: Map) {} diff --git a/modules/angular2/src/core/change_detection/parser/parser.ts b/modules/angular2/src/core/change_detection/parser/parser.ts index fe7550e168..f82015e6b7 100644 --- a/modules/angular2/src/core/change_detection/parser/parser.ts +++ b/modules/angular2/src/core/change_detection/parser/parser.ts @@ -1,7 +1,7 @@ import {Injectable} from 'angular2/src/core/di/decorators'; -import {isBlank, isPresent, StringWrapper} from 'angular2/src/core/facade/lang'; -import {BaseException, WrappedException} from 'angular2/src/core/facade/exceptions'; -import {ListWrapper} from 'angular2/src/core/facade/collection'; +import {isBlank, isPresent, StringWrapper} from 'angular2/src/facade/lang'; +import {BaseException, WrappedException} from 'angular2/src/facade/exceptions'; +import {ListWrapper} from 'angular2/src/facade/collection'; import { Lexer, EOF, diff --git a/modules/angular2/src/core/change_detection/pregen_proto_change_detector.dart b/modules/angular2/src/core/change_detection/pregen_proto_change_detector.dart index dc305f8da1..bf95c75e1d 100644 --- a/modules/angular2/src/core/change_detection/pregen_proto_change_detector.dart +++ b/modules/angular2/src/core/change_detection/pregen_proto_change_detector.dart @@ -1,7 +1,7 @@ library angular2.src.change_detection.pregen_proto_change_detector; import 'package:angular2/src/core/change_detection/interfaces.dart'; -import 'package:angular2/src/core/facade/lang.dart' show looseIdentical; +import 'package:angular2/src/facade/lang.dart' show looseIdentical; export 'dart:core' show List; export 'package:angular2/src/core/change_detection/abstract_change_detector.dart' @@ -19,7 +19,7 @@ export 'package:angular2/src/core/change_detection/proto_record.dart' show ProtoRecord; export 'package:angular2/src/core/change_detection/change_detection_util.dart' show ChangeDetectionUtil; -export 'package:angular2/src/core/facade/lang.dart' show assertionsEnabled, looseIdentical; +export 'package:angular2/src/facade/lang.dart' show assertionsEnabled, looseIdentical; typedef ProtoChangeDetector PregenProtoChangeDetectorFactory( ChangeDetectorDefinition definition); diff --git a/modules/angular2/src/core/change_detection/pregen_proto_change_detector.ts b/modules/angular2/src/core/change_detection/pregen_proto_change_detector.ts index a3340bae24..5ef1eadb5b 100644 --- a/modules/angular2/src/core/change_detection/pregen_proto_change_detector.ts +++ b/modules/angular2/src/core/change_detection/pregen_proto_change_detector.ts @@ -1,4 +1,4 @@ -import {BaseException} from 'angular2/src/core/facade/exceptions'; +import {BaseException} from 'angular2/src/facade/exceptions'; import {ProtoChangeDetector, ChangeDetector} from './interfaces'; import {coalesce} from './coalesce'; diff --git a/modules/angular2/src/core/change_detection/proto_change_detector.ts b/modules/angular2/src/core/change_detection/proto_change_detector.ts index d3f489e289..e535317272 100644 --- a/modules/angular2/src/core/change_detection/proto_change_detector.ts +++ b/modules/angular2/src/core/change_detection/proto_change_detector.ts @@ -1,6 +1,6 @@ -import {Type, isBlank, isPresent, isString} from 'angular2/src/core/facade/lang'; -import {BaseException} from 'angular2/src/core/facade/exceptions'; -import {ListWrapper, MapWrapper, StringMapWrapper} from 'angular2/src/core/facade/collection'; +import {Type, isBlank, isPresent, isString} from 'angular2/src/facade/lang'; +import {BaseException} from 'angular2/src/facade/exceptions'; +import {ListWrapper, MapWrapper, StringMapWrapper} from 'angular2/src/facade/collection'; import { PropertyRead, diff --git a/modules/angular2/src/core/debug/debug_element.ts b/modules/angular2/src/core/debug/debug_element.ts index 34e716f23f..0dc691c8e2 100644 --- a/modules/angular2/src/core/debug/debug_element.ts +++ b/modules/angular2/src/core/debug/debug_element.ts @@ -1,6 +1,6 @@ -import {Type, isPresent, isBlank} from 'angular2/src/core/facade/lang'; -import {ListWrapper, MapWrapper, Predicate} from 'angular2/src/core/facade/collection'; -import {unimplemented} from 'angular2/src/core/facade/exceptions'; +import {Type, isPresent, isBlank} from 'angular2/src/facade/lang'; +import {ListWrapper, MapWrapper, Predicate} from 'angular2/src/facade/collection'; +import {unimplemented} from 'angular2/src/facade/exceptions'; import {DOM} from 'angular2/src/core/dom/dom_adapter'; diff --git a/modules/angular2/src/core/debug/debug_element_view_listener.ts b/modules/angular2/src/core/debug/debug_element_view_listener.ts index 761a2f7cb9..1e5ee4cc7a 100644 --- a/modules/angular2/src/core/debug/debug_element_view_listener.ts +++ b/modules/angular2/src/core/debug/debug_element_view_listener.ts @@ -1,5 +1,5 @@ -import {CONST_EXPR, isPresent, NumberWrapper, StringWrapper} from 'angular2/src/core/facade/lang'; -import {MapWrapper, Map, ListWrapper} from 'angular2/src/core/facade/collection'; +import {CONST_EXPR, isPresent, NumberWrapper, StringWrapper} from 'angular2/src/facade/lang'; +import {MapWrapper, Map, ListWrapper} from 'angular2/src/facade/collection'; import {Injectable, provide, Provider} from 'angular2/src/core/di'; import {AppViewListener} from 'angular2/src/core/linker/view_listener'; import {AppView} from 'angular2/src/core/linker/view'; diff --git a/modules/angular2/src/core/dev_mode.ts b/modules/angular2/src/core/dev_mode.ts index b3fa5ea65d..925ced89b6 100644 --- a/modules/angular2/src/core/dev_mode.ts +++ b/modules/angular2/src/core/dev_mode.ts @@ -1 +1 @@ -export {enableDevMode} from 'angular2/src/core/facade/lang'; \ No newline at end of file +export {enableDevMode} from 'angular2/src/facade/lang'; \ No newline at end of file diff --git a/modules/angular2/src/core/di/exceptions.ts b/modules/angular2/src/core/di/exceptions.ts index c6ed6c6752..6e18ccf36b 100644 --- a/modules/angular2/src/core/di/exceptions.ts +++ b/modules/angular2/src/core/di/exceptions.ts @@ -1,6 +1,6 @@ -import {ListWrapper} from 'angular2/src/core/facade/collection'; -import {stringify, isBlank} from 'angular2/src/core/facade/lang'; -import {BaseException, WrappedException, unimplemented} from 'angular2/src/core/facade/exceptions'; +import {ListWrapper} from 'angular2/src/facade/collection'; +import {stringify, isBlank} from 'angular2/src/facade/lang'; +import {BaseException, WrappedException, unimplemented} from 'angular2/src/facade/exceptions'; import {Key} from './key'; import {Injector} from './injector'; diff --git a/modules/angular2/src/core/di/forward_ref.ts b/modules/angular2/src/core/di/forward_ref.ts index f7965b9ac9..c5cd38ac7b 100644 --- a/modules/angular2/src/core/di/forward_ref.ts +++ b/modules/angular2/src/core/di/forward_ref.ts @@ -1,4 +1,4 @@ -import {Type, stringify, isFunction} from 'angular2/src/core/facade/lang'; +import {Type, stringify, isFunction} from 'angular2/src/facade/lang'; /** * An interface that a function passed into {@link forwardRef} has to implement. diff --git a/modules/angular2/src/core/di/injector.ts b/modules/angular2/src/core/di/injector.ts index b6a7cb85bb..c32977d194 100644 --- a/modules/angular2/src/core/di/injector.ts +++ b/modules/angular2/src/core/di/injector.ts @@ -1,4 +1,4 @@ -import {Map, MapWrapper, ListWrapper} from 'angular2/src/core/facade/collection'; +import {Map, MapWrapper, ListWrapper} from 'angular2/src/facade/collection'; import { ResolvedProvider, Provider, @@ -16,7 +16,7 @@ import { InvalidProviderError, OutOfBoundsError } from './exceptions'; -import {FunctionWrapper, Type, isPresent, isBlank, CONST_EXPR} from 'angular2/src/core/facade/lang'; +import {FunctionWrapper, Type, isPresent, isBlank, CONST_EXPR} from 'angular2/src/facade/lang'; import {Key} from './key'; import {SelfMetadata, HostMetadata, SkipSelfMetadata} from './metadata'; diff --git a/modules/angular2/src/core/di/key.ts b/modules/angular2/src/core/di/key.ts index 5518a2ac32..7c148b0367 100644 --- a/modules/angular2/src/core/di/key.ts +++ b/modules/angular2/src/core/di/key.ts @@ -1,5 +1,5 @@ -import {stringify, CONST, Type, isBlank} from 'angular2/src/core/facade/lang'; -import {BaseException, WrappedException} from 'angular2/src/core/facade/exceptions'; +import {stringify, CONST, Type, isBlank} from 'angular2/src/facade/lang'; +import {BaseException, WrappedException} from 'angular2/src/facade/exceptions'; import {TypeLiteral} from './type_literal'; import {resolveForwardRef} from './forward_ref'; diff --git a/modules/angular2/src/core/di/metadata.ts b/modules/angular2/src/core/di/metadata.ts index 4cc58164ea..693e16d78e 100644 --- a/modules/angular2/src/core/di/metadata.ts +++ b/modules/angular2/src/core/di/metadata.ts @@ -1,4 +1,4 @@ -import {CONST, CONST_EXPR, stringify, isBlank, isPresent} from "angular2/src/core/facade/lang"; +import {CONST, CONST_EXPR, stringify, isBlank, isPresent} from "angular2/src/facade/lang"; /** * A parameter metadata that specifies a dependency. diff --git a/modules/angular2/src/core/di/opaque_token.ts b/modules/angular2/src/core/di/opaque_token.ts index da4834a437..2dafaf729c 100644 --- a/modules/angular2/src/core/di/opaque_token.ts +++ b/modules/angular2/src/core/di/opaque_token.ts @@ -1,4 +1,4 @@ -import {CONST} from 'angular2/src/core/facade/lang'; +import {CONST} from 'angular2/src/facade/lang'; /** * Creates a token that can be used in a DI Provider. diff --git a/modules/angular2/src/core/di/provider.ts b/modules/angular2/src/core/di/provider.ts index b01ba83872..b23f74e602 100644 --- a/modules/angular2/src/core/di/provider.ts +++ b/modules/angular2/src/core/di/provider.ts @@ -9,9 +9,9 @@ import { isType, isFunction, normalizeBool -} from 'angular2/src/core/facade/lang'; -import {BaseException, WrappedException} from 'angular2/src/core/facade/exceptions'; -import {MapWrapper, ListWrapper} from 'angular2/src/core/facade/collection'; +} from 'angular2/src/facade/lang'; +import {BaseException, WrappedException} from 'angular2/src/facade/exceptions'; +import {MapWrapper, ListWrapper} from 'angular2/src/facade/collection'; import {reflector} from 'angular2/src/core/reflection/reflection'; import {Key} from './key'; import { diff --git a/modules/angular2/src/core/dom/browser_adapter.dart b/modules/angular2/src/core/dom/browser_adapter.dart index 94db4fcaa2..5cc33b98bb 100644 --- a/modules/angular2/src/core/dom/browser_adapter.dart +++ b/modules/angular2/src/core/dom/browser_adapter.dart @@ -3,7 +3,7 @@ library angular.core.facade.dom; import 'dart:html'; import 'dom_adapter.dart' show setRootDomAdapter; import 'generic_browser_adapter.dart' show GenericBrowserDomAdapter; -import '../facade/browser.dart'; +import 'package:angular2/src/facade/browser.dart'; import 'dart:js' as js; // WARNING: Do not expose outside this class. Parsing HTML using this diff --git a/modules/angular2/src/core/dom/browser_adapter.ts b/modules/angular2/src/core/dom/browser_adapter.ts index 52cc6b7384..6b745d343f 100644 --- a/modules/angular2/src/core/dom/browser_adapter.ts +++ b/modules/angular2/src/core/dom/browser_adapter.ts @@ -1,11 +1,5 @@ -import {MapWrapper, ListWrapper} from 'angular2/src/core/facade/collection'; -import { - isBlank, - isPresent, - global, - setValueOnPath, - DateWrapper -} from 'angular2/src/core/facade/lang'; +import {MapWrapper, ListWrapper} from 'angular2/src/facade/collection'; +import {isBlank, isPresent, global, setValueOnPath, DateWrapper} from 'angular2/src/facade/lang'; import {setRootDomAdapter} from './dom_adapter'; import {GenericBrowserDomAdapter} from './generic_browser_adapter'; diff --git a/modules/angular2/src/core/dom/dom_adapter.ts b/modules/angular2/src/core/dom/dom_adapter.ts index 6c5e39e74a..6bbcbee887 100644 --- a/modules/angular2/src/core/dom/dom_adapter.ts +++ b/modules/angular2/src/core/dom/dom_adapter.ts @@ -1,4 +1,4 @@ -import {isBlank, Type} from 'angular2/src/core/facade/lang'; +import {isBlank, Type} from 'angular2/src/facade/lang'; export var DOM: DomAdapter; diff --git a/modules/angular2/src/core/dom/generic_browser_adapter.ts b/modules/angular2/src/core/dom/generic_browser_adapter.ts index 3bb84aaa91..9460390b7f 100644 --- a/modules/angular2/src/core/dom/generic_browser_adapter.ts +++ b/modules/angular2/src/core/dom/generic_browser_adapter.ts @@ -1,5 +1,5 @@ -import {ListWrapper, StringMapWrapper} from 'angular2/src/core/facade/collection'; -import {isPresent, isFunction, Type} from 'angular2/src/core/facade/lang'; +import {ListWrapper, StringMapWrapper} from 'angular2/src/facade/collection'; +import {isPresent, isFunction, Type} from 'angular2/src/facade/lang'; import {DomAdapter} from './dom_adapter'; import {XHRImpl} from 'angular2/src/compiler/xhr_impl'; diff --git a/modules/angular2/src/core/dom/parse5_adapter.ts b/modules/angular2/src/core/dom/parse5_adapter.ts index 341617a109..6c9141ada5 100644 --- a/modules/angular2/src/core/dom/parse5_adapter.ts +++ b/modules/angular2/src/core/dom/parse5_adapter.ts @@ -3,7 +3,7 @@ var parser = new parse5.Parser(parse5.TreeAdapters.htmlparser2); var serializer = new parse5.Serializer(parse5.TreeAdapters.htmlparser2); var treeAdapter = parser.treeAdapter; -import {MapWrapper, ListWrapper, StringMapWrapper} from 'angular2/src/core/facade/collection'; +import {MapWrapper, ListWrapper, StringMapWrapper} from 'angular2/src/facade/collection'; import {DomAdapter, setRootDomAdapter} from './dom_adapter'; import { isPresent, @@ -12,8 +12,8 @@ import { Type, setValueOnPath, DateWrapper -} from 'angular2/src/core/facade/lang'; -import {BaseException, WrappedException} from 'angular2/src/core/facade/exceptions'; +} from 'angular2/src/facade/lang'; +import {BaseException, WrappedException} from 'angular2/src/facade/exceptions'; import {SelectorMatcher, CssSelector} from 'angular2/src/compiler/selector'; import {XHR} from 'angular2/src/compiler/xhr'; diff --git a/modules/angular2/src/core/facade.ts b/modules/angular2/src/core/facade.ts deleted file mode 100644 index cf04c74f7d..0000000000 --- a/modules/angular2/src/core/facade.ts +++ /dev/null @@ -1,5 +0,0 @@ -// Public API for Facade -export {ConcreteType, Type} from './facade/lang'; -export {Observable, EventEmitter, Subject} from './facade/async'; -export {Predicate} from './facade/collection'; -export {WrappedException} from './facade/exceptions'; diff --git a/modules/angular2/src/core/linker/compiler.ts b/modules/angular2/src/core/linker/compiler.ts index 0eb478df36..6be9566228 100644 --- a/modules/angular2/src/core/linker/compiler.ts +++ b/modules/angular2/src/core/linker/compiler.ts @@ -2,10 +2,10 @@ import {ProtoViewRef} from 'angular2/src/core/linker/view_ref'; import {ProtoViewFactory} from 'angular2/src/core/linker/proto_view_factory'; import {Injectable} from 'angular2/src/core/di'; -import {Type, isBlank, stringify} from 'angular2/src/core/facade/lang'; -import {BaseException} from 'angular2/src/core/facade/exceptions'; -import {Promise, PromiseWrapper} from 'angular2/src/core/facade/async'; -import {ListWrapper} from 'angular2/src/core/facade/collection'; +import {Type, isBlank, stringify} from 'angular2/src/facade/lang'; +import {BaseException} from 'angular2/src/facade/exceptions'; +import {Promise, PromiseWrapper} from 'angular2/src/facade/async'; +import {ListWrapper} from 'angular2/src/facade/collection'; import {reflector} from 'angular2/src/core/reflection/reflection'; import {CompiledHostTemplate} from 'angular2/src/core/linker/template_commands'; diff --git a/modules/angular2/src/core/linker/component_url_mapper.ts b/modules/angular2/src/core/linker/component_url_mapper.ts index a8c2cb4745..97200294ee 100644 --- a/modules/angular2/src/core/linker/component_url_mapper.ts +++ b/modules/angular2/src/core/linker/component_url_mapper.ts @@ -1,6 +1,6 @@ import {Injectable} from 'angular2/src/core/di'; -import {Type, isPresent} from 'angular2/src/core/facade/lang'; -import {Map, MapWrapper} from 'angular2/src/core/facade/collection'; +import {Type, isPresent} from 'angular2/src/facade/lang'; +import {Map, MapWrapper} from 'angular2/src/facade/collection'; import {reflector} from 'angular2/src/core/reflection/reflection'; /** diff --git a/modules/angular2/src/core/linker/directive_lifecycle_reflector.ts b/modules/angular2/src/core/linker/directive_lifecycle_reflector.ts index 4dbd1800bd..b72ca4a3f2 100644 --- a/modules/angular2/src/core/linker/directive_lifecycle_reflector.ts +++ b/modules/angular2/src/core/linker/directive_lifecycle_reflector.ts @@ -1,4 +1,4 @@ -import {Type} from 'angular2/src/core/facade/lang'; +import {Type} from 'angular2/src/facade/lang'; import {LifecycleHooks} from './interfaces'; export function hasLifecycleHook(lcInterface: LifecycleHooks, token): boolean { diff --git a/modules/angular2/src/core/linker/directive_resolver.ts b/modules/angular2/src/core/linker/directive_resolver.ts index 41019030e5..d4895327c3 100644 --- a/modules/angular2/src/core/linker/directive_resolver.ts +++ b/modules/angular2/src/core/linker/directive_resolver.ts @@ -1,7 +1,7 @@ import {resolveForwardRef, Injectable} from 'angular2/src/core/di'; -import {Type, isPresent, isBlank, stringify} from 'angular2/src/core/facade/lang'; -import {BaseException} from 'angular2/src/core/facade/exceptions'; -import {ListWrapper, StringMapWrapper} from 'angular2/src/core/facade/collection'; +import {Type, isPresent, isBlank, stringify} from 'angular2/src/facade/lang'; +import {BaseException} from 'angular2/src/facade/exceptions'; +import {ListWrapper, StringMapWrapper} from 'angular2/src/facade/collection'; import { DirectiveMetadata, ComponentMetadata, diff --git a/modules/angular2/src/core/linker/dynamic_component_loader.ts b/modules/angular2/src/core/linker/dynamic_component_loader.ts index dd08b919b9..e9bf175abe 100644 --- a/modules/angular2/src/core/linker/dynamic_component_loader.ts +++ b/modules/angular2/src/core/linker/dynamic_component_loader.ts @@ -1,7 +1,7 @@ import {Key, Injector, ResolvedProvider, Provider, provide, Injectable} from 'angular2/src/core/di'; import {Compiler} from './compiler'; -import {isType, Type, stringify, isPresent} from 'angular2/src/core/facade/lang'; -import {Promise} from 'angular2/src/core/facade/async'; +import {isType, Type, stringify, isPresent} from 'angular2/src/facade/lang'; +import {Promise} from 'angular2/src/facade/async'; import {AppViewManager} from 'angular2/src/core/linker/view_manager'; import {ElementRef} from './element_ref'; import {ViewRef, HostViewRef} from './view_ref'; diff --git a/modules/angular2/src/core/linker/element_binder.ts b/modules/angular2/src/core/linker/element_binder.ts index aef6e5d632..00da679b67 100644 --- a/modules/angular2/src/core/linker/element_binder.ts +++ b/modules/angular2/src/core/linker/element_binder.ts @@ -1,5 +1,5 @@ -import {isBlank} from 'angular2/src/core/facade/lang'; -import {BaseException} from 'angular2/src/core/facade/exceptions'; +import {isBlank} from 'angular2/src/facade/lang'; +import {BaseException} from 'angular2/src/facade/exceptions'; import * as eiModule from './element_injector'; import {DirectiveProvider} from './element_injector'; import * as viewModule from './view'; diff --git a/modules/angular2/src/core/linker/element_injector.ts b/modules/angular2/src/core/linker/element_injector.ts index 67ebf9da2f..fcc73146ed 100644 --- a/modules/angular2/src/core/linker/element_injector.ts +++ b/modules/angular2/src/core/linker/element_injector.ts @@ -5,10 +5,10 @@ import { stringify, CONST_EXPR, StringWrapper -} from 'angular2/src/core/facade/lang'; -import {BaseException} from 'angular2/src/core/facade/exceptions'; -import {EventEmitter, ObservableWrapper} from 'angular2/src/core/facade/async'; -import {ListWrapper, MapWrapper, StringMapWrapper} from 'angular2/src/core/facade/collection'; +} from 'angular2/src/facade/lang'; +import {BaseException} from 'angular2/src/facade/exceptions'; +import {EventEmitter, ObservableWrapper} from 'angular2/src/facade/async'; +import {ListWrapper, MapWrapper, StringMapWrapper} from 'angular2/src/facade/collection'; import { Injector, Key, diff --git a/modules/angular2/src/core/linker/element_ref.ts b/modules/angular2/src/core/linker/element_ref.ts index 0bc3f113cd..810fce84cb 100644 --- a/modules/angular2/src/core/linker/element_ref.ts +++ b/modules/angular2/src/core/linker/element_ref.ts @@ -1,4 +1,4 @@ -import {BaseException, unimplemented} from 'angular2/src/core/facade/exceptions'; +import {BaseException, unimplemented} from 'angular2/src/facade/exceptions'; import {ViewRef, ViewRef_} from './view_ref'; import {RenderViewRef, RenderElementRef, Renderer} from 'angular2/src/core/render/api'; diff --git a/modules/angular2/src/core/linker/interfaces.ts b/modules/angular2/src/core/linker/interfaces.ts index 232c90df59..cf513d39c6 100644 --- a/modules/angular2/src/core/linker/interfaces.ts +++ b/modules/angular2/src/core/linker/interfaces.ts @@ -1,4 +1,4 @@ -import {MapWrapper} from 'angular2/src/core/facade/collection'; +import {MapWrapper} from 'angular2/src/facade/collection'; import {SimpleChange} from 'angular2/src/core/change_detection/change_detection_util'; export enum LifecycleHooks { diff --git a/modules/angular2/src/core/linker/pipe_resolver.ts b/modules/angular2/src/core/linker/pipe_resolver.ts index 7372a5cd9f..af7708146e 100644 --- a/modules/angular2/src/core/linker/pipe_resolver.ts +++ b/modules/angular2/src/core/linker/pipe_resolver.ts @@ -1,7 +1,7 @@ import {resolveForwardRef, Injectable} from 'angular2/src/core/di'; -import {Type, isPresent, stringify} from 'angular2/src/core/facade/lang'; -import {ListWrapper} from 'angular2/src/core/facade/collection'; -import {BaseException} from 'angular2/src/core/facade/exceptions'; +import {Type, isPresent, stringify} from 'angular2/src/facade/lang'; +import {ListWrapper} from 'angular2/src/facade/collection'; +import {BaseException} from 'angular2/src/facade/exceptions'; import {PipeMetadata} from 'angular2/src/core/metadata'; import {reflector} from 'angular2/src/core/reflection/reflection'; diff --git a/modules/angular2/src/core/linker/proto_view_factory.ts b/modules/angular2/src/core/linker/proto_view_factory.ts index 286f5106ba..6e594f722a 100644 --- a/modules/angular2/src/core/linker/proto_view_factory.ts +++ b/modules/angular2/src/core/linker/proto_view_factory.ts @@ -1,4 +1,4 @@ -import {isPresent, isBlank, Type, isArray, isNumber} from 'angular2/src/core/facade/lang'; +import {isPresent, isBlank, Type, isArray, isNumber} from 'angular2/src/facade/lang'; import {RenderProtoViewRef} from 'angular2/src/core/render/api'; diff --git a/modules/angular2/src/core/linker/query_list.dart b/modules/angular2/src/core/linker/query_list.dart index 6d1d3d62c7..7d0a35401e 100644 --- a/modules/angular2/src/core/linker/query_list.dart +++ b/modules/angular2/src/core/linker/query_list.dart @@ -1,7 +1,7 @@ library angular2.src.core.compiler.query_list; import 'dart:collection'; -import 'package:angular2/src/core/facade/async.dart'; +import 'package:angular2/src/facade/async.dart'; /** * See query_list.ts diff --git a/modules/angular2/src/core/linker/query_list.ts b/modules/angular2/src/core/linker/query_list.ts index 710930d6d1..706cdde81d 100644 --- a/modules/angular2/src/core/linker/query_list.ts +++ b/modules/angular2/src/core/linker/query_list.ts @@ -1,6 +1,6 @@ -import {ListWrapper, MapWrapper} from 'angular2/src/core/facade/collection'; -import {getSymbolIterator} from 'angular2/src/core/facade/lang'; -import {Observable, EventEmitter} from 'angular2/src/core/facade/async'; +import {ListWrapper, MapWrapper} from 'angular2/src/facade/collection'; +import {getSymbolIterator} from 'angular2/src/facade/lang'; +import {Observable, EventEmitter} from 'angular2/src/facade/async'; /** diff --git a/modules/angular2/src/core/linker/template_commands.ts b/modules/angular2/src/core/linker/template_commands.ts index 612e73496e..2ad8a9d8ee 100644 --- a/modules/angular2/src/core/linker/template_commands.ts +++ b/modules/angular2/src/core/linker/template_commands.ts @@ -1,4 +1,4 @@ -import {Type, CONST_EXPR, CONST, isPresent, isBlank} from 'angular2/src/core/facade/lang'; +import {Type, CONST_EXPR, CONST, isPresent, isBlank} from 'angular2/src/facade/lang'; import { RenderTemplateCmd, RenderCommandVisitor, diff --git a/modules/angular2/src/core/linker/view.ts b/modules/angular2/src/core/linker/view.ts index e0e1569de3..279670d573 100644 --- a/modules/angular2/src/core/linker/view.ts +++ b/modules/angular2/src/core/linker/view.ts @@ -3,7 +3,7 @@ import { MapWrapper, Map, StringMapWrapper, -} from 'angular2/src/core/facade/collection'; +} from 'angular2/src/facade/collection'; import { ChangeDetector, ChangeDispatcher, @@ -21,8 +21,8 @@ import { DirectiveProvider } from './element_injector'; import {ElementBinder} from './element_binder'; -import {isPresent} from 'angular2/src/core/facade/lang'; -import {BaseException, WrappedException} from 'angular2/src/core/facade/exceptions'; +import {isPresent} from 'angular2/src/facade/lang'; +import {BaseException, WrappedException} from 'angular2/src/facade/exceptions'; import * as renderApi from 'angular2/src/core/render/api'; import {RenderEventDispatcher} from 'angular2/src/core/render/api'; import {ViewRef, ProtoViewRef, internalView} from './view_ref'; diff --git a/modules/angular2/src/core/linker/view_container_ref.ts b/modules/angular2/src/core/linker/view_container_ref.ts index 6fbdd4cc00..45f2fd008a 100644 --- a/modules/angular2/src/core/linker/view_container_ref.ts +++ b/modules/angular2/src/core/linker/view_container_ref.ts @@ -1,7 +1,7 @@ -import {ListWrapper} from 'angular2/src/core/facade/collection'; -import {unimplemented} from 'angular2/src/core/facade/exceptions'; +import {ListWrapper} from 'angular2/src/facade/collection'; +import {unimplemented} from 'angular2/src/facade/exceptions'; import {ResolvedProvider} from 'angular2/src/core/di'; -import {isPresent, isBlank} from 'angular2/src/core/facade/lang'; +import {isPresent, isBlank} from 'angular2/src/facade/lang'; import * as avmModule from './view_manager'; import * as viewModule from './view'; diff --git a/modules/angular2/src/core/linker/view_manager.ts b/modules/angular2/src/core/linker/view_manager.ts index 7dd3e264c9..150feaa97d 100644 --- a/modules/angular2/src/core/linker/view_manager.ts +++ b/modules/angular2/src/core/linker/view_manager.ts @@ -6,8 +6,8 @@ import { ResolvedProvider, forwardRef } from 'angular2/src/core/di'; -import {isPresent, isBlank} from 'angular2/src/core/facade/lang'; -import {BaseException} from 'angular2/src/core/facade/exceptions'; +import {isPresent, isBlank} from 'angular2/src/facade/lang'; +import {BaseException} from 'angular2/src/facade/exceptions'; import * as viewModule from './view'; import {ElementRef, ElementRef_} from './element_ref'; import {ProtoViewRef, ViewRef, HostViewRef, internalView, internalProtoView} from './view_ref'; diff --git a/modules/angular2/src/core/linker/view_manager_utils.ts b/modules/angular2/src/core/linker/view_manager_utils.ts index 7cb03cf163..821f1b31dd 100644 --- a/modules/angular2/src/core/linker/view_manager_utils.ts +++ b/modules/angular2/src/core/linker/view_manager_utils.ts @@ -1,7 +1,7 @@ import {Injector, Provider, Injectable, ResolvedProvider} from 'angular2/src/core/di'; -import {ListWrapper, MapWrapper, Map, StringMapWrapper} from 'angular2/src/core/facade/collection'; +import {ListWrapper, MapWrapper, Map, StringMapWrapper} from 'angular2/src/facade/collection'; import * as eli from './element_injector'; -import {isPresent, isBlank} from 'angular2/src/core/facade/lang'; +import {isPresent, isBlank} from 'angular2/src/facade/lang'; import * as viewModule from './view'; import * as avmModule from './view_manager'; import {ElementRef, ElementRef_} from './element_ref'; diff --git a/modules/angular2/src/core/linker/view_pool.ts b/modules/angular2/src/core/linker/view_pool.ts index b2a0bb1073..17598fddf5 100644 --- a/modules/angular2/src/core/linker/view_pool.ts +++ b/modules/angular2/src/core/linker/view_pool.ts @@ -1,7 +1,7 @@ import {Inject, Injectable, OpaqueToken} from 'angular2/src/core/di'; -import {isPresent, isBlank, CONST_EXPR} from 'angular2/src/core/facade/lang'; -import {MapWrapper, Map} from 'angular2/src/core/facade/collection'; +import {isPresent, isBlank, CONST_EXPR} from 'angular2/src/facade/lang'; +import {MapWrapper, Map} from 'angular2/src/facade/collection'; import * as viewModule from './view'; diff --git a/modules/angular2/src/core/linker/view_ref.ts b/modules/angular2/src/core/linker/view_ref.ts index 465a027ee0..f1e1b26aef 100644 --- a/modules/angular2/src/core/linker/view_ref.ts +++ b/modules/angular2/src/core/linker/view_ref.ts @@ -1,5 +1,5 @@ -import {isPresent} from 'angular2/src/core/facade/lang'; -import {unimplemented} from 'angular2/src/core/facade/exceptions'; +import {isPresent} from 'angular2/src/facade/lang'; +import {unimplemented} from 'angular2/src/facade/exceptions'; import * as viewModule from './view'; import {ChangeDetectorRef} from '../change_detection/change_detector_ref'; import {RenderViewRef, RenderFragmentRef} from 'angular2/src/core/render/api'; diff --git a/modules/angular2/src/core/linker/view_resolver.ts b/modules/angular2/src/core/linker/view_resolver.ts index ea7ced87ca..49285b8510 100644 --- a/modules/angular2/src/core/linker/view_resolver.ts +++ b/modules/angular2/src/core/linker/view_resolver.ts @@ -2,9 +2,9 @@ import {Injectable} from 'angular2/src/core/di'; import {ViewMetadata} from '../metadata/view'; import {ComponentMetadata} from '../metadata/directives'; -import {Type, stringify, isBlank, isPresent} from 'angular2/src/core/facade/lang'; -import {BaseException} from 'angular2/src/core/facade/exceptions'; -import {Map} from 'angular2/src/core/facade/collection'; +import {Type, stringify, isBlank, isPresent} from 'angular2/src/facade/lang'; +import {BaseException} from 'angular2/src/facade/exceptions'; +import {Map} from 'angular2/src/facade/collection'; import {reflector} from 'angular2/src/core/reflection/reflection'; diff --git a/modules/angular2/src/core/metadata.dart b/modules/angular2/src/core/metadata.dart index b3d97e699f..e47ed69c34 100644 --- a/modules/angular2/src/core/metadata.dart +++ b/modules/angular2/src/core/metadata.dart @@ -1,6 +1,6 @@ library angular2.src.core.metadata; -import 'package:angular2/src/core/facade/collection.dart' show List; +import 'package:angular2/src/facade/collection.dart' show List; import 'package:angular2/src/core/change_detection/change_detection.dart'; import './metadata/di.dart'; import './metadata/directives.dart'; diff --git a/modules/angular2/src/core/metadata.ts b/modules/angular2/src/core/metadata.ts index e8cf8577f2..9582d45ef8 100644 --- a/modules/angular2/src/core/metadata.ts +++ b/modules/angular2/src/core/metadata.ts @@ -55,7 +55,7 @@ import { TypeDecorator, Class } from './util/decorators'; -import {Type} from 'angular2/src/core/facade/lang'; +import {Type} from 'angular2/src/facade/lang'; /** * Interface for the {@link DirectiveMetadata} decorator function. diff --git a/modules/angular2/src/core/metadata/di.ts b/modules/angular2/src/core/metadata/di.ts index 4474c15cf0..fb0db7fa21 100644 --- a/modules/angular2/src/core/metadata/di.ts +++ b/modules/angular2/src/core/metadata/di.ts @@ -1,4 +1,4 @@ -import {CONST, Type, stringify, isPresent, isString} from 'angular2/src/core/facade/lang'; +import {CONST, Type, stringify, isPresent, isString} from 'angular2/src/facade/lang'; import {resolveForwardRef} from 'angular2/src/core/di'; import {DependencyMetadata} from 'angular2/src/core/di/metadata'; diff --git a/modules/angular2/src/core/metadata/directives.ts b/modules/angular2/src/core/metadata/directives.ts index 7a0a860eab..a1ee3c2cc2 100644 --- a/modules/angular2/src/core/metadata/directives.ts +++ b/modules/angular2/src/core/metadata/directives.ts @@ -1,4 +1,4 @@ -import {isPresent, CONST, CONST_EXPR, Type} from 'angular2/src/core/facade/lang'; +import {isPresent, CONST, CONST_EXPR, Type} from 'angular2/src/facade/lang'; import {InjectableMetadata} from 'angular2/src/core/di/metadata'; import {ChangeDetectionStrategy} from 'angular2/src/core/change_detection'; import {ViewEncapsulation} from 'angular2/src/core/metadata/view'; diff --git a/modules/angular2/src/core/metadata/view.ts b/modules/angular2/src/core/metadata/view.ts index e186661df3..331d0e2917 100644 --- a/modules/angular2/src/core/metadata/view.ts +++ b/modules/angular2/src/core/metadata/view.ts @@ -1,4 +1,4 @@ -import {CONST, Type} from 'angular2/src/core/facade/lang'; +import {CONST, Type} from 'angular2/src/facade/lang'; /** * Defines template and style encapsulation options available for Component's {@link View}. diff --git a/modules/angular2/src/core/pipes/pipe_provider.ts b/modules/angular2/src/core/pipes/pipe_provider.ts index 61550b7b1a..9090c50208 100644 --- a/modules/angular2/src/core/pipes/pipe_provider.ts +++ b/modules/angular2/src/core/pipes/pipe_provider.ts @@ -1,4 +1,4 @@ -import {Type} from 'angular2/src/core/facade/lang'; +import {Type} from 'angular2/src/facade/lang'; import {ResolvedFactory, resolveProvider, ResolvedProvider_} from 'angular2/src/core/di/provider'; import {Key, ResolvedProvider, Provider} from 'angular2/src/core/di'; import {PipeMetadata} from '../metadata/directives'; diff --git a/modules/angular2/src/core/pipes/pipes.ts b/modules/angular2/src/core/pipes/pipes.ts index b3a28707ef..52f2482621 100644 --- a/modules/angular2/src/core/pipes/pipes.ts +++ b/modules/angular2/src/core/pipes/pipes.ts @@ -1,6 +1,6 @@ -import {isBlank, isPresent, CONST, Type} from 'angular2/src/core/facade/lang'; -import {BaseException, WrappedException} from 'angular2/src/core/facade/exceptions'; -import {StringMapWrapper} from 'angular2/src/core/facade/collection'; +import {isBlank, isPresent, CONST, Type} from 'angular2/src/facade/lang'; +import {BaseException, WrappedException} from 'angular2/src/facade/exceptions'; +import {StringMapWrapper} from 'angular2/src/facade/collection'; import { Injectable, OptionalMetadata, diff --git a/modules/angular2/src/core/platform_bindings.dart b/modules/angular2/src/core/platform_bindings.dart index a386b20a66..ff33b34fad 100644 --- a/modules/angular2/src/core/platform_bindings.dart +++ b/modules/angular2/src/core/platform_bindings.dart @@ -1,7 +1,7 @@ library angular2.src.core.platform_bindings; import 'package:angular2/core.dart'; -import 'package:angular2/src/core/facade/exceptions.dart'; +import 'package:angular2/src/facade/exceptions.dart'; import 'package:angular2/src/core/dom/dom_adapter.dart'; exceptionFactory() => new ExceptionHandler(DOM, true); diff --git a/modules/angular2/src/core/platform_bindings.ts b/modules/angular2/src/core/platform_bindings.ts index 4b5347e3be..059df5a2bb 100644 --- a/modules/angular2/src/core/platform_bindings.ts +++ b/modules/angular2/src/core/platform_bindings.ts @@ -1,5 +1,5 @@ import {provide} from 'angular2/src/core/di'; -import {ExceptionHandler} from 'angular2/src/core/facade/exceptions'; +import {ExceptionHandler} from 'angular2/src/facade/exceptions'; import {DOM} from 'angular2/src/core/dom/dom_adapter'; export const EXCEPTION_PROVIDER = diff --git a/modules/angular2/src/core/profile/wtf_impl.ts b/modules/angular2/src/core/profile/wtf_impl.ts index b524cf79d8..133e1a59a5 100644 --- a/modules/angular2/src/core/profile/wtf_impl.ts +++ b/modules/angular2/src/core/profile/wtf_impl.ts @@ -1,4 +1,4 @@ -import {global} from '../facade/lang'; +import {global} from 'angular2/src/facade/lang'; export interface WtfScopeFn { (arg0?: any, arg1?: any): any; } diff --git a/modules/angular2/src/core/reflection/platform_reflection_capabilities.ts b/modules/angular2/src/core/reflection/platform_reflection_capabilities.ts index 83f87fec84..96d04a3d8a 100644 --- a/modules/angular2/src/core/reflection/platform_reflection_capabilities.ts +++ b/modules/angular2/src/core/reflection/platform_reflection_capabilities.ts @@ -1,4 +1,4 @@ -import {Type} from 'angular2/src/core/facade/lang'; +import {Type} from 'angular2/src/facade/lang'; import {GetterFn, SetterFn, MethodFn} from './types'; export interface PlatformReflectionCapabilities { diff --git a/modules/angular2/src/core/reflection/reflection.dart b/modules/angular2/src/core/reflection/reflection.dart index 5f9da3e5fe..a67420b391 100644 --- a/modules/angular2/src/core/reflection/reflection.dart +++ b/modules/angular2/src/core/reflection/reflection.dart @@ -4,7 +4,7 @@ import 'reflector.dart'; import 'types.dart'; export 'reflector.dart'; import 'platform_reflection_capabilities.dart'; -import 'package:angular2/src/core/facade/lang.dart'; +import 'package:angular2/src/facade/lang.dart'; class NoReflectionCapabilities implements PlatformReflectionCapabilities { bool isReflectionEnabled() { diff --git a/modules/angular2/src/core/reflection/reflection.ts b/modules/angular2/src/core/reflection/reflection.ts index c1a2b85d54..a22b118771 100644 --- a/modules/angular2/src/core/reflection/reflection.ts +++ b/modules/angular2/src/core/reflection/reflection.ts @@ -1,5 +1,5 @@ -import {Type, isPresent} from 'angular2/src/core/facade/lang'; -import {ListWrapper} from 'angular2/src/core/facade/collection'; +import {Type, isPresent} from 'angular2/src/facade/lang'; +import {ListWrapper} from 'angular2/src/facade/collection'; import {Reflector} from './reflector'; export {Reflector, ReflectionInfo} from './reflector'; import {ReflectionCapabilities} from './reflection_capabilities'; diff --git a/modules/angular2/src/core/reflection/reflection_capabilities.dart b/modules/angular2/src/core/reflection/reflection_capabilities.dart index 533922d4a7..e390aa6ac8 100644 --- a/modules/angular2/src/core/reflection/reflection_capabilities.dart +++ b/modules/angular2/src/core/reflection/reflection_capabilities.dart @@ -1,6 +1,6 @@ library reflection.reflection_capabilities; -import 'package:angular2/src/core/facade/lang.dart'; +import 'package:angular2/src/facade/lang.dart'; import 'types.dart'; import 'dart:mirrors'; import 'platform_reflection_capabilities.dart'; diff --git a/modules/angular2/src/core/reflection/reflection_capabilities.ts b/modules/angular2/src/core/reflection/reflection_capabilities.ts index 9f12f22bde..085bdd58d7 100644 --- a/modules/angular2/src/core/reflection/reflection_capabilities.ts +++ b/modules/angular2/src/core/reflection/reflection_capabilities.ts @@ -5,9 +5,9 @@ import { global, stringify, ConcreteType -} from 'angular2/src/core/facade/lang'; -import {BaseException} from 'angular2/src/core/facade/exceptions'; -import {ListWrapper} from 'angular2/src/core/facade/collection'; +} from 'angular2/src/facade/lang'; +import {BaseException} from 'angular2/src/facade/exceptions'; +import {ListWrapper} from 'angular2/src/facade/collection'; import {GetterFn, SetterFn, MethodFn} from './types'; import {PlatformReflectionCapabilities} from './platform_reflection_capabilities'; diff --git a/modules/angular2/src/core/reflection/reflector.ts b/modules/angular2/src/core/reflection/reflector.ts index 9d3b30e720..6f4a7063a0 100644 --- a/modules/angular2/src/core/reflection/reflector.ts +++ b/modules/angular2/src/core/reflection/reflector.ts @@ -1,5 +1,5 @@ -import {Type, isPresent, stringify} from 'angular2/src/core/facade/lang'; -import {BaseException, WrappedException} from 'angular2/src/core/facade/exceptions'; +import {Type, isPresent, stringify} from 'angular2/src/facade/lang'; +import {BaseException, WrappedException} from 'angular2/src/facade/exceptions'; import { ListWrapper, Map, @@ -7,7 +7,7 @@ import { Set, SetWrapper, StringMapWrapper -} from 'angular2/src/core/facade/collection'; +} from 'angular2/src/facade/collection'; import {SetterFn, GetterFn, MethodFn} from './types'; import {PlatformReflectionCapabilities} from './platform_reflection_capabilities'; export {SetterFn, GetterFn, MethodFn} from './types'; diff --git a/modules/angular2/src/core/reflection/types.ts b/modules/angular2/src/core/reflection/types.ts index 36931562c3..f7695de8ec 100644 --- a/modules/angular2/src/core/reflection/types.ts +++ b/modules/angular2/src/core/reflection/types.ts @@ -1,4 +1,4 @@ -import {Type} from 'angular2/src/core/facade/lang'; +import {Type} from 'angular2/src/facade/lang'; export type SetterFn = (obj: any, value: any) => void; export type GetterFn = (obj: any) => any; diff --git a/modules/angular2/src/core/render/api.ts b/modules/angular2/src/core/render/api.ts index 744c7377c7..25916fe133 100644 --- a/modules/angular2/src/core/render/api.ts +++ b/modules/angular2/src/core/render/api.ts @@ -1,4 +1,4 @@ -import {Map} from 'angular2/src/core/facade/collection'; +import {Map} from 'angular2/src/facade/collection'; /** * Represents an Angular ProtoView in the Rendering Context. diff --git a/modules/angular2/src/core/render/dom/dom_renderer.ts b/modules/angular2/src/core/render/dom/dom_renderer.ts index 4f3c0ae442..e1368c6239 100644 --- a/modules/angular2/src/core/render/dom/dom_renderer.ts +++ b/modules/angular2/src/core/render/dom/dom_renderer.ts @@ -1,13 +1,7 @@ import {Inject, Injectable, OpaqueToken} from 'angular2/src/core/di'; import {AnimationBuilder} from 'angular2/src/animate/animation_builder'; -import { - isPresent, - isBlank, - RegExpWrapper, - CONST_EXPR, - stringify -} from 'angular2/src/core/facade/lang'; -import {BaseException, WrappedException} from 'angular2/src/core/facade/exceptions'; +import {isPresent, isBlank, RegExpWrapper, CONST_EXPR, stringify} from 'angular2/src/facade/lang'; +import {BaseException, WrappedException} from 'angular2/src/facade/exceptions'; import {DOM} from 'angular2/src/core/dom/dom_adapter'; diff --git a/modules/angular2/src/core/render/dom/dom_tokens.ts b/modules/angular2/src/core/render/dom/dom_tokens.ts index 3d94558998..21a08c0815 100644 --- a/modules/angular2/src/core/render/dom/dom_tokens.ts +++ b/modules/angular2/src/core/render/dom/dom_tokens.ts @@ -1,5 +1,5 @@ import {OpaqueToken} from 'angular2/src/core/di'; -import {CONST_EXPR} from 'angular2/src/core/facade/lang'; +import {CONST_EXPR} from 'angular2/src/facade/lang'; /** * A DI Token representing the main rendering context. In a browser this is the DOM Document. diff --git a/modules/angular2/src/core/render/dom/events/event_manager.ts b/modules/angular2/src/core/render/dom/events/event_manager.ts index 03eba69ddd..5cb7f7a351 100644 --- a/modules/angular2/src/core/render/dom/events/event_manager.ts +++ b/modules/angular2/src/core/render/dom/events/event_manager.ts @@ -1,6 +1,6 @@ -import {CONST_EXPR} from 'angular2/src/core/facade/lang'; -import {BaseException, WrappedException} from 'angular2/src/core/facade/exceptions'; -import {ListWrapper} from 'angular2/src/core/facade/collection'; +import {CONST_EXPR} from 'angular2/src/facade/lang'; +import {BaseException, WrappedException} from 'angular2/src/facade/exceptions'; +import {ListWrapper} from 'angular2/src/facade/collection'; import {DOM} from 'angular2/src/core/dom/dom_adapter'; import {NgZone} from 'angular2/src/core/zone/ng_zone'; import {Injectable, Inject, OpaqueToken} from 'angular2/src/core/di'; diff --git a/modules/angular2/src/core/render/dom/events/hammer_common.ts b/modules/angular2/src/core/render/dom/events/hammer_common.ts index 5c156be153..6b8630e6b4 100644 --- a/modules/angular2/src/core/render/dom/events/hammer_common.ts +++ b/modules/angular2/src/core/render/dom/events/hammer_common.ts @@ -1,5 +1,5 @@ import {EventManagerPlugin} from './event_manager'; -import {StringMapWrapper} from 'angular2/src/core/facade/collection'; +import {StringMapWrapper} from 'angular2/src/facade/collection'; var _eventNames = { // pan diff --git a/modules/angular2/src/core/render/dom/events/hammer_gestures.dart b/modules/angular2/src/core/render/dom/events/hammer_gestures.dart index 632b4831fe..247f34cd56 100644 --- a/modules/angular2/src/core/render/dom/events/hammer_gestures.dart +++ b/modules/angular2/src/core/render/dom/events/hammer_gestures.dart @@ -2,7 +2,7 @@ library angular.events; import 'dart:html'; import './hammer_common.dart'; -import 'package:angular2/src/core/facade/exceptions.dart' show BaseException; +import 'package:angular2/src/facade/exceptions.dart' show BaseException; import "package:angular2/src/core/di.dart" show Injectable; import 'dart:js' as js; diff --git a/modules/angular2/src/core/render/dom/events/hammer_gestures.ts b/modules/angular2/src/core/render/dom/events/hammer_gestures.ts index 2e6d6fcb08..77db2893a8 100644 --- a/modules/angular2/src/core/render/dom/events/hammer_gestures.ts +++ b/modules/angular2/src/core/render/dom/events/hammer_gestures.ts @@ -1,6 +1,6 @@ import {HammerGesturesPluginCommon} from './hammer_common'; -import {isPresent} from 'angular2/src/core/facade/lang'; -import {BaseException, WrappedException} from 'angular2/src/core/facade/exceptions'; +import {isPresent} from 'angular2/src/facade/lang'; +import {BaseException, WrappedException} from 'angular2/src/facade/exceptions'; import {Injectable} from 'angular2/src/core/di'; @Injectable() diff --git a/modules/angular2/src/core/render/dom/events/key_events.ts b/modules/angular2/src/core/render/dom/events/key_events.ts index ebd3a4051d..54c74db418 100644 --- a/modules/angular2/src/core/render/dom/events/key_events.ts +++ b/modules/angular2/src/core/render/dom/events/key_events.ts @@ -5,8 +5,8 @@ import { StringWrapper, RegExpWrapper, NumberWrapper -} from 'angular2/src/core/facade/lang'; -import {StringMapWrapper, ListWrapper} from 'angular2/src/core/facade/collection'; +} from 'angular2/src/facade/lang'; +import {StringMapWrapper, ListWrapper} from 'angular2/src/facade/collection'; import {EventManagerPlugin} from './event_manager'; import {NgZone} from 'angular2/src/core/zone/ng_zone'; import {Injectable} from 'angular2/src/core/di'; diff --git a/modules/angular2/src/core/render/dom/shared_styles_host.ts b/modules/angular2/src/core/render/dom/shared_styles_host.ts index b4c4d68297..290bfd3a36 100644 --- a/modules/angular2/src/core/render/dom/shared_styles_host.ts +++ b/modules/angular2/src/core/render/dom/shared_styles_host.ts @@ -1,6 +1,6 @@ import {DOM} from 'angular2/src/core/dom/dom_adapter'; import {Inject, Injectable} from 'angular2/src/core/di'; -import {SetWrapper} from 'angular2/src/core/facade/collection'; +import {SetWrapper} from 'angular2/src/facade/collection'; import {DOCUMENT} from './dom_tokens'; @Injectable() diff --git a/modules/angular2/src/core/render/dom/util.ts b/modules/angular2/src/core/render/dom/util.ts index 1ba3c4fdad..7f074e0f62 100644 --- a/modules/angular2/src/core/render/dom/util.ts +++ b/modules/angular2/src/core/render/dom/util.ts @@ -1,4 +1,4 @@ -import {StringWrapper} from 'angular2/src/core/facade/lang'; +import {StringWrapper} from 'angular2/src/facade/lang'; var CAMEL_CASE_REGEXP = /([A-Z])/g; var DASH_CASE_REGEXP = /-([a-z])/g; diff --git a/modules/angular2/src/core/render/view.ts b/modules/angular2/src/core/render/view.ts index 3cd64f7c1c..f04e4417f8 100644 --- a/modules/angular2/src/core/render/view.ts +++ b/modules/angular2/src/core/render/view.ts @@ -1,6 +1,6 @@ -import {BaseException} from 'angular2/src/core/facade/exceptions'; -import {ListWrapper, MapWrapper, Map, StringMapWrapper} from 'angular2/src/core/facade/collection'; -import {isPresent, isBlank, stringify} from 'angular2/src/core/facade/lang'; +import {BaseException} from 'angular2/src/facade/exceptions'; +import {ListWrapper, MapWrapper, Map, StringMapWrapper} from 'angular2/src/facade/collection'; +import {isPresent, isBlank, stringify} from 'angular2/src/facade/lang'; import { RenderViewRef, diff --git a/modules/angular2/src/core/render/view_factory.ts b/modules/angular2/src/core/render/view_factory.ts index b60b951f0b..f166858b76 100644 --- a/modules/angular2/src/core/render/view_factory.ts +++ b/modules/angular2/src/core/render/view_factory.ts @@ -1,4 +1,4 @@ -import {isBlank, isPresent} from 'angular2/src/core/facade/lang'; +import {isBlank, isPresent} from 'angular2/src/facade/lang'; import { RenderEventDispatcher, RenderTemplateCmd, diff --git a/modules/angular2/src/core/services/ruler.ts b/modules/angular2/src/core/services/ruler.ts index d6395755cb..379298d16f 100644 --- a/modules/angular2/src/core/services/ruler.ts +++ b/modules/angular2/src/core/services/ruler.ts @@ -1,4 +1,4 @@ -import {Promise, PromiseWrapper} from 'angular2/src/core/facade/async'; +import {Promise, PromiseWrapper} from 'angular2/src/facade/async'; import {DomAdapter} from 'angular2/src/core/dom/dom_adapter'; import {ElementRef} from 'angular2/src/core/linker/element_ref'; diff --git a/modules/angular2/src/core/testability/browser_testability.ts b/modules/angular2/src/core/testability/browser_testability.ts index 805d848e41..7045f990dd 100644 --- a/modules/angular2/src/core/testability/browser_testability.ts +++ b/modules/angular2/src/core/testability/browser_testability.ts @@ -4,7 +4,7 @@ import { GetTestability, setTestabilityGetter } from 'angular2/src/core/testability/testability'; -import {global} from 'angular2/src/core/facade/lang'; +import {global} from 'angular2/src/facade/lang'; class PublicTestability { /** @internal */ diff --git a/modules/angular2/src/core/testability/testability.ts b/modules/angular2/src/core/testability/testability.ts index 66c2894685..8d36b8e505 100644 --- a/modules/angular2/src/core/testability/testability.ts +++ b/modules/angular2/src/core/testability/testability.ts @@ -1,10 +1,10 @@ import {Injectable} from 'angular2/src/core/di'; import {DOM} from 'angular2/src/core/dom/dom_adapter'; -import {Map, MapWrapper, ListWrapper} from 'angular2/src/core/facade/collection'; -import {CONST, CONST_EXPR} from 'angular2/src/core/facade/lang'; -import {BaseException, WrappedException} from 'angular2/src/core/facade/exceptions'; +import {Map, MapWrapper, ListWrapper} from 'angular2/src/facade/collection'; +import {CONST, CONST_EXPR} from 'angular2/src/facade/lang'; +import {BaseException, WrappedException} from 'angular2/src/facade/exceptions'; import {NgZone} from '../zone/ng_zone'; -import {PromiseWrapper, ObservableWrapper} from 'angular2/src/core/facade/async'; +import {PromiseWrapper, ObservableWrapper} from 'angular2/src/facade/async'; /** diff --git a/modules/angular2/src/core/util/decorators.ts b/modules/angular2/src/core/util/decorators.ts index ad66e5ea8b..5944745240 100644 --- a/modules/angular2/src/core/util/decorators.ts +++ b/modules/angular2/src/core/util/decorators.ts @@ -1,4 +1,4 @@ -import {ConcreteType, global, Type, isFunction, stringify} from 'angular2/src/core/facade/lang'; +import {ConcreteType, global, Type, isFunction, stringify} from 'angular2/src/facade/lang'; /** * Declares the interface to be used with {@link Class}. diff --git a/modules/angular2/src/core/zone/ng_zone.ts b/modules/angular2/src/core/zone/ng_zone.ts index b75026f3f6..f64289be23 100644 --- a/modules/angular2/src/core/zone/ng_zone.ts +++ b/modules/angular2/src/core/zone/ng_zone.ts @@ -1,6 +1,6 @@ -import {ListWrapper, StringMapWrapper} from 'angular2/src/core/facade/collection'; -import {normalizeBlank, isPresent, global} from 'angular2/src/core/facade/lang'; -import {ObservableWrapper, EventEmitter} from 'angular2/src/core/facade/async'; +import {ListWrapper, StringMapWrapper} from 'angular2/src/facade/collection'; +import {normalizeBlank, isPresent, global} from 'angular2/src/facade/lang'; +import {ObservableWrapper, EventEmitter} from 'angular2/src/facade/async'; import {wtfLeave, wtfCreateScope, WtfScopeFn} from '../profile/profile'; export interface NgZoneZone extends Zone { diff --git a/modules/angular2/src/core/facade/async.dart b/modules/angular2/src/facade/async.dart similarity index 100% rename from modules/angular2/src/core/facade/async.dart rename to modules/angular2/src/facade/async.dart diff --git a/modules/angular2/src/core/facade/async.ts b/modules/angular2/src/facade/async.ts similarity index 97% rename from modules/angular2/src/core/facade/async.ts rename to modules/angular2/src/facade/async.ts index 249f30b19f..32192635ed 100644 --- a/modules/angular2/src/core/facade/async.ts +++ b/modules/angular2/src/facade/async.ts @@ -1,8 +1,8 @@ -import {global, isPresent} from 'angular2/src/core/facade/lang'; +import {global, isPresent} from 'angular2/src/facade/lang'; // We make sure promises are in a separate file so that we can use promises // without depending on rxjs. -import {PromiseWrapper, Promise, PromiseCompleter} from 'angular2/src/core/facade/promise'; -export {PromiseWrapper, Promise, PromiseCompleter} from 'angular2/src/core/facade/promise'; +import {PromiseWrapper, Promise, PromiseCompleter} from 'angular2/src/facade/promise'; +export {PromiseWrapper, Promise, PromiseCompleter} from 'angular2/src/facade/promise'; import {Subject, Subscription, Observable as RxObservable} from '@reactivex/rxjs/dist/cjs/Rx'; export {Subject} from '@reactivex/rxjs/dist/cjs/Rx'; import Operator from '@reactivex/rxjs/dist/cjs/Operator'; diff --git a/modules/angular2/src/core/facade/browser.dart b/modules/angular2/src/facade/browser.dart similarity index 100% rename from modules/angular2/src/core/facade/browser.dart rename to modules/angular2/src/facade/browser.dart diff --git a/modules/angular2/src/core/facade/browser.ts b/modules/angular2/src/facade/browser.ts similarity index 100% rename from modules/angular2/src/core/facade/browser.ts rename to modules/angular2/src/facade/browser.ts diff --git a/modules/angular2/src/core/facade/collection.dart b/modules/angular2/src/facade/collection.dart similarity index 100% rename from modules/angular2/src/core/facade/collection.dart rename to modules/angular2/src/facade/collection.dart diff --git a/modules/angular2/src/core/facade/collection.ts b/modules/angular2/src/facade/collection.ts similarity index 99% rename from modules/angular2/src/core/facade/collection.ts rename to modules/angular2/src/facade/collection.ts index d653b345be..9d67d308a3 100644 --- a/modules/angular2/src/core/facade/collection.ts +++ b/modules/angular2/src/facade/collection.ts @@ -5,7 +5,7 @@ import { isBlank, isArray, getSymbolIterator -} from 'angular2/src/core/facade/lang'; +} from 'angular2/src/facade/lang'; export var Map = global.Map; export var Set = global.Set; diff --git a/modules/angular2/src/core/facade/exception_handler.ts b/modules/angular2/src/facade/exception_handler.ts similarity index 94% rename from modules/angular2/src/core/facade/exception_handler.ts rename to modules/angular2/src/facade/exception_handler.ts index e45fa81c8c..e670494f20 100644 --- a/modules/angular2/src/core/facade/exception_handler.ts +++ b/modules/angular2/src/facade/exception_handler.ts @@ -1,6 +1,6 @@ -import {isPresent, isBlank, print} from 'angular2/src/core/facade/lang'; -import {BaseException, WrappedException} from 'angular2/src/core/facade/exceptions'; -import {ListWrapper, isListLikeIterable} from 'angular2/src/core/facade/collection'; +import {isPresent, isBlank, print} from 'angular2/src/facade/lang'; +import {BaseException, WrappedException} from 'angular2/src/facade/exceptions'; +import {ListWrapper, isListLikeIterable} from 'angular2/src/facade/collection'; class _ArrayLogger { res: any[] = []; diff --git a/modules/angular2/src/core/facade/exceptions.dart b/modules/angular2/src/facade/exceptions.dart similarity index 100% rename from modules/angular2/src/core/facade/exceptions.dart rename to modules/angular2/src/facade/exceptions.dart diff --git a/modules/angular2/src/core/facade/exceptions.ts b/modules/angular2/src/facade/exceptions.ts similarity index 100% rename from modules/angular2/src/core/facade/exceptions.ts rename to modules/angular2/src/facade/exceptions.ts diff --git a/modules/angular2/src/facade/facade.ts b/modules/angular2/src/facade/facade.ts new file mode 100644 index 0000000000..9c30535850 --- /dev/null +++ b/modules/angular2/src/facade/facade.ts @@ -0,0 +1,5 @@ +// Public API for Facade +export {ConcreteType, Type} from './lang'; +export {Observable, EventEmitter} from './async'; +export {WrappedException} from './exceptions'; +export {ExceptionHandler} from './exception_handler'; diff --git a/modules/angular2/src/core/facade/intl.dart b/modules/angular2/src/facade/intl.dart similarity index 100% rename from modules/angular2/src/core/facade/intl.dart rename to modules/angular2/src/facade/intl.dart diff --git a/modules/angular2/src/core/facade/intl.ts b/modules/angular2/src/facade/intl.ts similarity index 100% rename from modules/angular2/src/core/facade/intl.ts rename to modules/angular2/src/facade/intl.ts diff --git a/modules/angular2/src/core/facade/lang.dart b/modules/angular2/src/facade/lang.dart similarity index 100% rename from modules/angular2/src/core/facade/lang.dart rename to modules/angular2/src/facade/lang.dart diff --git a/modules/angular2/src/core/facade/lang.ts b/modules/angular2/src/facade/lang.ts similarity index 100% rename from modules/angular2/src/core/facade/lang.ts rename to modules/angular2/src/facade/lang.ts diff --git a/modules/angular2/src/core/facade/math.dart b/modules/angular2/src/facade/math.dart similarity index 100% rename from modules/angular2/src/core/facade/math.dart rename to modules/angular2/src/facade/math.dart diff --git a/modules/angular2/src/core/facade/math.ts b/modules/angular2/src/facade/math.ts similarity index 53% rename from modules/angular2/src/core/facade/math.ts rename to modules/angular2/src/facade/math.ts index 435525f02b..2a6a9eab8e 100644 --- a/modules/angular2/src/core/facade/math.ts +++ b/modules/angular2/src/facade/math.ts @@ -1,4 +1,4 @@ -import {global} from 'angular2/src/core/facade/lang'; +import {global} from 'angular2/src/facade/lang'; export var Math = global.Math; export var NaN = typeof NaN; diff --git a/modules/angular2/src/core/facade/promise.dart b/modules/angular2/src/facade/promise.dart similarity index 100% rename from modules/angular2/src/core/facade/promise.dart rename to modules/angular2/src/facade/promise.dart diff --git a/modules/angular2/src/core/facade/promise.ts b/modules/angular2/src/facade/promise.ts similarity index 100% rename from modules/angular2/src/core/facade/promise.ts rename to modules/angular2/src/facade/promise.ts diff --git a/modules/angular2/src/http/backends/browser_jsonp.ts b/modules/angular2/src/http/backends/browser_jsonp.ts index 67b6b60762..1600b0db50 100644 --- a/modules/angular2/src/http/backends/browser_jsonp.ts +++ b/modules/angular2/src/http/backends/browser_jsonp.ts @@ -1,5 +1,5 @@ import {Injectable} from 'angular2/angular2'; -import {global} from 'angular2/src/core/facade/lang'; +import {global} from 'angular2/src/facade/lang'; let _nextRequestId = 0; export const JSONP_HOME = '__ng_jsonp__'; diff --git a/modules/angular2/src/http/backends/jsonp_backend.ts b/modules/angular2/src/http/backends/jsonp_backend.ts index 1a91366e89..12bad4c0eb 100644 --- a/modules/angular2/src/http/backends/jsonp_backend.ts +++ b/modules/angular2/src/http/backends/jsonp_backend.ts @@ -5,8 +5,8 @@ import {Response} from '../static_response'; import {ResponseOptions, BaseResponseOptions} from '../base_response_options'; import {Injectable} from 'angular2/angular2'; import {BrowserJsonp} from './browser_jsonp'; -import {makeTypeError} from 'angular2/src/core/facade/exceptions'; -import {StringWrapper, isPresent} from 'angular2/src/core/facade/lang'; +import {makeTypeError} from 'angular2/src/facade/exceptions'; +import {StringWrapper, isPresent} from 'angular2/src/facade/lang'; import {Observable} from 'angular2/angular2'; const JSONP_ERR_NO_CALLBACK = 'JSONP injected script did not invoke callback.'; diff --git a/modules/angular2/src/http/backends/mock_backend.ts b/modules/angular2/src/http/backends/mock_backend.ts index 8b4257408f..2c888ba1a6 100644 --- a/modules/angular2/src/http/backends/mock_backend.ts +++ b/modules/angular2/src/http/backends/mock_backend.ts @@ -3,8 +3,8 @@ import {Request} from '../static_request'; import {Response} from '../static_response'; import {ReadyStates} from '../enums'; import {Connection, ConnectionBackend} from '../interfaces'; -import {isPresent} from 'angular2/src/core/facade/lang'; -import {BaseException, WrappedException} from 'angular2/src/core/facade/exceptions'; +import {isPresent} from 'angular2/src/facade/lang'; +import {BaseException, WrappedException} from 'angular2/src/facade/exceptions'; var Rx = require('@reactivex/rxjs/dist/cjs/Rx'); let {Subject, ReplaySubject} = Rx; diff --git a/modules/angular2/src/http/backends/xhr_backend.ts b/modules/angular2/src/http/backends/xhr_backend.ts index 19f5cb8c5a..7de04161a8 100644 --- a/modules/angular2/src/http/backends/xhr_backend.ts +++ b/modules/angular2/src/http/backends/xhr_backend.ts @@ -5,7 +5,7 @@ import {Response} from '../static_response'; import {ResponseOptions, BaseResponseOptions} from '../base_response_options'; import {Injectable} from 'angular2/angular2'; import {BrowserXhr} from './browser_xhr'; -import {isPresent} from 'angular2/src/core/facade/lang'; +import {isPresent} from 'angular2/src/facade/lang'; import {Observable} from 'angular2/angular2'; /** * Creates connections using `XMLHttpRequest`. Given a fully-qualified diff --git a/modules/angular2/src/http/base_request_options.ts b/modules/angular2/src/http/base_request_options.ts index 7c1dd06537..e528478060 100644 --- a/modules/angular2/src/http/base_request_options.ts +++ b/modules/angular2/src/http/base_request_options.ts @@ -1,4 +1,4 @@ -import {isPresent, isString} from 'angular2/src/core/facade/lang'; +import {isPresent, isString} from 'angular2/src/facade/lang'; import {Headers} from './headers'; import {RequestMethods} from './enums'; import {RequestOptionsArgs} from './interfaces'; diff --git a/modules/angular2/src/http/base_response_options.ts b/modules/angular2/src/http/base_response_options.ts index d02e9cad8f..0168dcfb0a 100644 --- a/modules/angular2/src/http/base_response_options.ts +++ b/modules/angular2/src/http/base_response_options.ts @@ -1,5 +1,5 @@ import {Injectable} from 'angular2/angular2'; -import {isPresent, isJsObject} from 'angular2/src/core/facade/lang'; +import {isPresent, isJsObject} from 'angular2/src/facade/lang'; import {Headers} from './headers'; import {ResponseTypes} from './enums'; import {ResponseOptionsArgs} from './interfaces'; diff --git a/modules/angular2/src/http/enums.ts b/modules/angular2/src/http/enums.ts index 5bb048272a..8eee925535 100644 --- a/modules/angular2/src/http/enums.ts +++ b/modules/angular2/src/http/enums.ts @@ -1,4 +1,4 @@ -import {StringMapWrapper} from 'angular2/src/core/facade/collection'; +import {StringMapWrapper} from 'angular2/src/facade/collection'; /** * Supported http methods. diff --git a/modules/angular2/src/http/headers.ts b/modules/angular2/src/http/headers.ts index fa7e25f684..03c45aae6e 100644 --- a/modules/angular2/src/http/headers.ts +++ b/modules/angular2/src/http/headers.ts @@ -1,12 +1,12 @@ -import {isPresent, isBlank, isJsObject, isType, StringWrapper} from 'angular2/src/core/facade/lang'; -import {BaseException, WrappedException} from 'angular2/src/core/facade/exceptions'; +import {isPresent, isBlank, isJsObject, isType, StringWrapper} from 'angular2/src/facade/lang'; +import {BaseException, WrappedException} from 'angular2/src/facade/exceptions'; import { isListLikeIterable, Map, MapWrapper, StringMapWrapper, ListWrapper, -} from 'angular2/src/core/facade/collection'; +} from 'angular2/src/facade/collection'; /** * Polyfill for [Headers](https://developer.mozilla.org/en-US/docs/Web/API/Headers/Headers), as diff --git a/modules/angular2/src/http/http.ts b/modules/angular2/src/http/http.ts index bccbf3f660..bba1d73e3d 100644 --- a/modules/angular2/src/http/http.ts +++ b/modules/angular2/src/http/http.ts @@ -1,5 +1,5 @@ -import {isString, isPresent, isBlank} from 'angular2/src/core/facade/lang'; -import {makeTypeError} from 'angular2/src/core/facade/exceptions'; +import {isString, isPresent, isBlank} from 'angular2/src/facade/lang'; +import {makeTypeError} from 'angular2/src/facade/exceptions'; import {Injectable} from 'angular2/angular2'; import {RequestOptionsArgs, Connection, ConnectionBackend} from './interfaces'; import {Request} from './static_request'; diff --git a/modules/angular2/src/http/http_utils.ts b/modules/angular2/src/http/http_utils.ts index 1fcc3d222d..77bb16978c 100644 --- a/modules/angular2/src/http/http_utils.ts +++ b/modules/angular2/src/http/http_utils.ts @@ -1,6 +1,6 @@ -import {isString} from 'angular2/src/core/facade/lang'; +import {isString} from 'angular2/src/facade/lang'; import {RequestMethods} from './enums'; -import {makeTypeError} from 'angular2/src/core/facade/exceptions'; +import {makeTypeError} from 'angular2/src/facade/exceptions'; export function normalizeMethodName(method): RequestMethods { if (isString(method)) { @@ -14,4 +14,4 @@ export function normalizeMethodName(method): RequestMethods { return method; } -export {isJsObject} from 'angular2/src/core/facade/lang'; +export {isJsObject} from 'angular2/src/facade/lang'; diff --git a/modules/angular2/src/http/interfaces.ts b/modules/angular2/src/http/interfaces.ts index fb362b3642..7d31b7bdc1 100644 --- a/modules/angular2/src/http/interfaces.ts +++ b/modules/angular2/src/http/interfaces.ts @@ -1,7 +1,7 @@ import {ReadyStates, RequestMethods, ResponseTypes} from './enums'; import {Headers} from './headers'; -import {BaseException, WrappedException} from 'angular2/src/core/facade/exceptions'; -import {EventEmitter} from 'angular2/src/core/facade/async'; +import {BaseException, WrappedException} from 'angular2/src/facade/exceptions'; +import {EventEmitter} from 'angular2/src/facade/async'; import {Request} from './static_request'; import {URLSearchParams} from './url_search_params'; diff --git a/modules/angular2/src/http/static_request.ts b/modules/angular2/src/http/static_request.ts index 3b09fe93f7..de4c298db1 100644 --- a/modules/angular2/src/http/static_request.ts +++ b/modules/angular2/src/http/static_request.ts @@ -8,7 +8,7 @@ import { isPresent, isJsObject, StringWrapper -} from 'angular2/src/core/facade/lang'; +} from 'angular2/src/facade/lang'; // TODO(jeffbcross): properly implement body accessors /** diff --git a/modules/angular2/src/http/static_response.ts b/modules/angular2/src/http/static_response.ts index 894d88678d..4bbd93fdb2 100644 --- a/modules/angular2/src/http/static_response.ts +++ b/modules/angular2/src/http/static_response.ts @@ -1,6 +1,6 @@ import {ResponseTypes} from './enums'; -import {CONST_EXPR, isString, isPresent, Json} from 'angular2/src/core/facade/lang'; -import {BaseException, WrappedException} from 'angular2/src/core/facade/exceptions'; +import {CONST_EXPR, isString, isPresent, Json} from 'angular2/src/facade/lang'; +import {BaseException, WrappedException} from 'angular2/src/facade/exceptions'; import {Headers} from './headers'; import {ResponseOptions} from './base_response_options'; import {isJsObject} from './http_utils'; diff --git a/modules/angular2/src/http/url_search_params.ts b/modules/angular2/src/http/url_search_params.ts index 253674973d..c86f1d17b7 100644 --- a/modules/angular2/src/http/url_search_params.ts +++ b/modules/angular2/src/http/url_search_params.ts @@ -1,10 +1,5 @@ -import {CONST_EXPR, isPresent, isBlank} from 'angular2/src/core/facade/lang'; -import { - Map, - MapWrapper, - ListWrapper, - isListLikeIterable -} from 'angular2/src/core/facade/collection'; +import {CONST_EXPR, isPresent, isBlank} from 'angular2/src/facade/lang'; +import {Map, MapWrapper, ListWrapper, isListLikeIterable} from 'angular2/src/facade/collection'; function paramParser(rawParams: string = ''): Map { var map = new Map(); diff --git a/modules/angular2/src/mock/directive_resolver_mock.ts b/modules/angular2/src/mock/directive_resolver_mock.ts index 3567b40ed0..294a7839e6 100644 --- a/modules/angular2/src/mock/directive_resolver_mock.ts +++ b/modules/angular2/src/mock/directive_resolver_mock.ts @@ -1,5 +1,5 @@ -import {Map, MapWrapper, ListWrapper} from 'angular2/src/core/facade/collection'; -import {Type, isPresent, stringify, isBlank, print} from 'angular2/src/core/facade/lang'; +import {Map, MapWrapper, ListWrapper} from 'angular2/src/facade/collection'; +import {Type, isPresent, stringify, isBlank, print} from 'angular2/src/facade/lang'; import {DirectiveMetadata, ComponentMetadata} from '../core/metadata'; import {DirectiveResolver} from 'angular2/src/core/linker/directive_resolver'; diff --git a/modules/angular2/src/mock/location_mock.ts b/modules/angular2/src/mock/location_mock.ts index 28defeebbe..af73012851 100644 --- a/modules/angular2/src/mock/location_mock.ts +++ b/modules/angular2/src/mock/location_mock.ts @@ -1,5 +1,5 @@ -import {EventEmitter, ObservableWrapper} from 'angular2/src/core/facade/async'; -import {ListWrapper} from 'angular2/src/core/facade/collection'; +import {EventEmitter, ObservableWrapper} from 'angular2/src/facade/async'; +import {ListWrapper} from 'angular2/src/facade/collection'; import {Location} from 'angular2/src/router/location'; export class SpyLocation implements Location { diff --git a/modules/angular2/src/mock/mock_application_ref.ts b/modules/angular2/src/mock/mock_application_ref.ts index 6a1b3a6c23..1c6b93b002 100644 --- a/modules/angular2/src/mock/mock_application_ref.ts +++ b/modules/angular2/src/mock/mock_application_ref.ts @@ -1,9 +1,9 @@ import {ApplicationRef} from 'angular2/src/core/application_ref'; -import {Type} from 'angular2/src/core/facade/lang'; +import {Type} from 'angular2/src/facade/lang'; import {ComponentRef} from 'angular2/src/core/linker/dynamic_component_loader'; import {Provider, Injector} from 'angular2/src/core/di'; import {NgZone} from 'angular2/src/core/zone/ng_zone'; -import {Promise} from 'angular2/src/core/facade/async'; +import {Promise} from 'angular2/src/facade/async'; export class MockApplicationRef extends ApplicationRef { registerBootstrapListener(listener: (ref: ComponentRef) => void): void {} diff --git a/modules/angular2/src/mock/mock_location_strategy.ts b/modules/angular2/src/mock/mock_location_strategy.ts index b52c99ff21..b20b58c08f 100644 --- a/modules/angular2/src/mock/mock_location_strategy.ts +++ b/modules/angular2/src/mock/mock_location_strategy.ts @@ -1,4 +1,4 @@ -import {EventEmitter, ObservableWrapper} from 'angular2/src/core/facade/async'; +import {EventEmitter, ObservableWrapper} from 'angular2/src/facade/async'; import {LocationStrategy} from 'angular2/src/router/location_strategy'; diff --git a/modules/angular2/src/mock/view_resolver_mock.ts b/modules/angular2/src/mock/view_resolver_mock.ts index 2c72f42c1a..110d7019b1 100644 --- a/modules/angular2/src/mock/view_resolver_mock.ts +++ b/modules/angular2/src/mock/view_resolver_mock.ts @@ -1,6 +1,6 @@ -import {Map, MapWrapper, ListWrapper} from 'angular2/src/core/facade/collection'; -import {Type, isPresent, stringify, isBlank} from 'angular2/src/core/facade/lang'; -import {BaseException, WrappedException} from 'angular2/src/core/facade/exceptions'; +import {Map, MapWrapper, ListWrapper} from 'angular2/src/facade/collection'; +import {Type, isPresent, stringify, isBlank} from 'angular2/src/facade/lang'; +import {BaseException, WrappedException} from 'angular2/src/facade/exceptions'; import {ViewMetadata} from '../core/metadata'; import {ViewResolver} from 'angular2/src/core/linker/view_resolver'; diff --git a/modules/angular2/src/router/async_route_handler.ts b/modules/angular2/src/router/async_route_handler.ts index bbc041b031..6e22218344 100644 --- a/modules/angular2/src/router/async_route_handler.ts +++ b/modules/angular2/src/router/async_route_handler.ts @@ -1,6 +1,6 @@ import {RouteHandler} from './route_handler'; -import {Promise, PromiseWrapper} from 'angular2/src/core/facade/async'; -import {isPresent, Type} from 'angular2/src/core/facade/lang'; +import {Promise, PromiseWrapper} from 'angular2/src/facade/async'; +import {isPresent, Type} from 'angular2/src/facade/lang'; export class AsyncRouteHandler implements RouteHandler { /** @internal */ diff --git a/modules/angular2/src/router/hash_location_strategy.ts b/modules/angular2/src/router/hash_location_strategy.ts index f698312834..e54b6f31ab 100644 --- a/modules/angular2/src/router/hash_location_strategy.ts +++ b/modules/angular2/src/router/hash_location_strategy.ts @@ -1,7 +1,7 @@ import {DOM} from 'angular2/src/core/dom/dom_adapter'; import {Injectable} from 'angular2/angular2'; import {LocationStrategy, normalizeQueryParams} from './location_strategy'; -import {EventListener, History, Location} from 'angular2/src/core/facade/browser'; +import {EventListener, History, Location} from 'angular2/src/facade/browser'; /** * `HashLocationStrategy` is a {@link LocationStrategy} used to configure the diff --git a/modules/angular2/src/router/instruction.ts b/modules/angular2/src/router/instruction.ts index 492b22bfe5..7f93ad4098 100644 --- a/modules/angular2/src/router/instruction.ts +++ b/modules/angular2/src/router/instruction.ts @@ -1,7 +1,7 @@ -import {Map, MapWrapper, StringMapWrapper, ListWrapper} from 'angular2/src/core/facade/collection'; -import {unimplemented} from 'angular2/src/core/facade/exceptions'; -import {isPresent, isBlank, normalizeBlank, Type, CONST_EXPR} from 'angular2/src/core/facade/lang'; -import {Promise} from 'angular2/src/core/facade/async'; +import {Map, MapWrapper, StringMapWrapper, ListWrapper} from 'angular2/src/facade/collection'; +import {unimplemented} from 'angular2/src/facade/exceptions'; +import {isPresent, isBlank, normalizeBlank, Type, CONST_EXPR} from 'angular2/src/facade/lang'; +import {Promise} from 'angular2/src/facade/async'; import {PathRecognizer} from './path_recognizer'; import {Url} from './url_parser'; diff --git a/modules/angular2/src/router/interfaces.ts b/modules/angular2/src/router/interfaces.ts index 7879a240e1..e6bc7ec6b5 100644 --- a/modules/angular2/src/router/interfaces.ts +++ b/modules/angular2/src/router/interfaces.ts @@ -1,5 +1,5 @@ import {ComponentInstruction} from './instruction'; -import {global} from 'angular2/src/core/facade/lang'; +import {global} from 'angular2/src/facade/lang'; // This is here only so that after TS transpilation the file is not empty. // TODO(rado): find a better way to fix this, or remove if likely culprit diff --git a/modules/angular2/src/router/lifecycle_annotations.ts b/modules/angular2/src/router/lifecycle_annotations.ts index e827aa67a3..4f3c8e234c 100644 --- a/modules/angular2/src/router/lifecycle_annotations.ts +++ b/modules/angular2/src/router/lifecycle_annotations.ts @@ -5,7 +5,7 @@ import {makeDecorator} from 'angular2/src/core/util/decorators'; import {CanActivate as CanActivateAnnotation} from './lifecycle_annotations_impl'; -import {Promise} from 'angular2/src/core/facade/async'; +import {Promise} from 'angular2/src/facade/async'; import {ComponentInstruction} from './instruction'; export { diff --git a/modules/angular2/src/router/lifecycle_annotations_impl.ts b/modules/angular2/src/router/lifecycle_annotations_impl.ts index 357f22c7f1..db3367bc8b 100644 --- a/modules/angular2/src/router/lifecycle_annotations_impl.ts +++ b/modules/angular2/src/router/lifecycle_annotations_impl.ts @@ -1,4 +1,4 @@ -import {CONST, CONST_EXPR} from 'angular2/src/core/facade/lang'; +import {CONST, CONST_EXPR} from 'angular2/src/facade/lang'; @CONST() export class RouteLifecycleHook { diff --git a/modules/angular2/src/router/location.ts b/modules/angular2/src/router/location.ts index 00860f2217..fb37309cb1 100644 --- a/modules/angular2/src/router/location.ts +++ b/modules/angular2/src/router/location.ts @@ -1,8 +1,8 @@ import {LocationStrategy} from './location_strategy'; -import {StringWrapper, isPresent, CONST_EXPR} from 'angular2/src/core/facade/lang'; -import {EventEmitter, ObservableWrapper} from 'angular2/src/core/facade/async'; -import {isBlank} from 'angular2/src/core/facade/lang'; -import {BaseException, WrappedException} from 'angular2/src/core/facade/exceptions'; +import {StringWrapper, isPresent, CONST_EXPR} from 'angular2/src/facade/lang'; +import {EventEmitter, ObservableWrapper} from 'angular2/src/facade/async'; +import {isBlank} from 'angular2/src/facade/lang'; +import {BaseException, WrappedException} from 'angular2/src/facade/exceptions'; import {OpaqueToken, Injectable, Optional, Inject} from 'angular2/angular2'; /** diff --git a/modules/angular2/src/router/path_location_strategy.ts b/modules/angular2/src/router/path_location_strategy.ts index 0e7827fd3a..0032f8f3dc 100644 --- a/modules/angular2/src/router/path_location_strategy.ts +++ b/modules/angular2/src/router/path_location_strategy.ts @@ -1,6 +1,6 @@ import {DOM} from 'angular2/src/core/dom/dom_adapter'; import {Injectable} from 'angular2/angular2'; -import {EventListener, History, Location} from 'angular2/src/core/facade/browser'; +import {EventListener, History, Location} from 'angular2/src/facade/browser'; import {LocationStrategy, normalizeQueryParams} from './location_strategy'; /** diff --git a/modules/angular2/src/router/path_recognizer.ts b/modules/angular2/src/router/path_recognizer.ts index 54d0961ad7..01e84e0cc0 100644 --- a/modules/angular2/src/router/path_recognizer.ts +++ b/modules/angular2/src/router/path_recognizer.ts @@ -5,10 +5,10 @@ import { StringWrapper, isPresent, isBlank -} from 'angular2/src/core/facade/lang'; -import {BaseException, WrappedException} from 'angular2/src/core/facade/exceptions'; +} from 'angular2/src/facade/lang'; +import {BaseException, WrappedException} from 'angular2/src/facade/exceptions'; -import {Map, MapWrapper, StringMapWrapper} from 'angular2/src/core/facade/collection'; +import {Map, MapWrapper, StringMapWrapper} from 'angular2/src/facade/collection'; import {RouteHandler} from './route_handler'; import {Url, RootUrl, serializeParams} from './url_parser'; diff --git a/modules/angular2/src/router/route_config_impl.ts b/modules/angular2/src/router/route_config_impl.ts index a9085df0c5..b56fb0103f 100644 --- a/modules/angular2/src/router/route_config_impl.ts +++ b/modules/angular2/src/router/route_config_impl.ts @@ -1,4 +1,4 @@ -import {CONST, Type, isPresent} from 'angular2/src/core/facade/lang'; +import {CONST, Type, isPresent} from 'angular2/src/facade/lang'; import {RouteDefinition} from './route_definition'; export {RouteDefinition} from './route_definition'; diff --git a/modules/angular2/src/router/route_config_nomalizer.dart b/modules/angular2/src/router/route_config_nomalizer.dart index f063eaa051..2d3005295b 100644 --- a/modules/angular2/src/router/route_config_nomalizer.dart +++ b/modules/angular2/src/router/route_config_nomalizer.dart @@ -1,7 +1,7 @@ library angular2.src.router.route_config_normalizer; import "route_config_decorator.dart"; -import "package:angular2/src/core/facade/exceptions.dart" show BaseException; +import "package:angular2/src/facade/exceptions.dart" show BaseException; RouteDefinition normalizeRouteConfig(RouteDefinition config) { return config; diff --git a/modules/angular2/src/router/route_config_nomalizer.ts b/modules/angular2/src/router/route_config_nomalizer.ts index 85fc709dcd..8d0725dbab 100644 --- a/modules/angular2/src/router/route_config_nomalizer.ts +++ b/modules/angular2/src/router/route_config_nomalizer.ts @@ -1,7 +1,7 @@ import {AsyncRoute, AuxRoute, Route, Redirect, RouteDefinition} from './route_config_decorator'; import {ComponentDefinition} from './route_definition'; -import {isType, Type} from 'angular2/src/core/facade/lang'; -import {BaseException, WrappedException} from 'angular2/src/core/facade/exceptions'; +import {isType, Type} from 'angular2/src/facade/lang'; +import {BaseException, WrappedException} from 'angular2/src/facade/exceptions'; /** diff --git a/modules/angular2/src/router/route_definition.ts b/modules/angular2/src/router/route_definition.ts index 96fa033e19..ee1266143d 100644 --- a/modules/angular2/src/router/route_definition.ts +++ b/modules/angular2/src/router/route_definition.ts @@ -1,4 +1,4 @@ -import {CONST, Type} from 'angular2/src/core/facade/lang'; +import {CONST, Type} from 'angular2/src/facade/lang'; /** * `RouteDefinition` defines a route within a {@link RouteConfig} decorator. diff --git a/modules/angular2/src/router/route_handler.ts b/modules/angular2/src/router/route_handler.ts index 5ccc34bb19..54ca3b2ef0 100644 --- a/modules/angular2/src/router/route_handler.ts +++ b/modules/angular2/src/router/route_handler.ts @@ -1,5 +1,5 @@ -import {Promise, PromiseWrapper} from 'angular2/src/core/facade/async'; -import {Type} from 'angular2/src/core/facade/lang'; +import {Promise, PromiseWrapper} from 'angular2/src/facade/async'; +import {Type} from 'angular2/src/facade/lang'; export interface RouteHandler { componentType: Type; diff --git a/modules/angular2/src/router/route_lifecycle_reflector.ts b/modules/angular2/src/router/route_lifecycle_reflector.ts index 767c9454cb..d8345dedfc 100644 --- a/modules/angular2/src/router/route_lifecycle_reflector.ts +++ b/modules/angular2/src/router/route_lifecycle_reflector.ts @@ -1,4 +1,4 @@ -import {Type, isPresent} from 'angular2/src/core/facade/lang'; +import {Type, isPresent} from 'angular2/src/facade/lang'; import {RouteLifecycleHook, CanActivate} from './lifecycle_annotations_impl'; import {reflector} from 'angular2/src/core/reflection/reflection'; diff --git a/modules/angular2/src/router/route_recognizer.ts b/modules/angular2/src/router/route_recognizer.ts index 5bd9e0b0a5..7c7dd8a69a 100644 --- a/modules/angular2/src/router/route_recognizer.ts +++ b/modules/angular2/src/router/route_recognizer.ts @@ -6,9 +6,9 @@ import { isType, isStringMap, Type -} from 'angular2/src/core/facade/lang'; -import {BaseException, WrappedException} from 'angular2/src/core/facade/exceptions'; -import {Map, MapWrapper, ListWrapper, StringMapWrapper} from 'angular2/src/core/facade/collection'; +} from 'angular2/src/facade/lang'; +import {BaseException, WrappedException} from 'angular2/src/facade/exceptions'; +import {Map, MapWrapper, ListWrapper, StringMapWrapper} from 'angular2/src/facade/collection'; import {PathRecognizer, PathMatch} from './path_recognizer'; import {Route, AsyncRoute, AuxRoute, Redirect, RouteDefinition} from './route_config_impl'; diff --git a/modules/angular2/src/router/route_registry.ts b/modules/angular2/src/router/route_registry.ts index 2f77ce9b8f..7dba2eea81 100644 --- a/modules/angular2/src/router/route_registry.ts +++ b/modules/angular2/src/router/route_registry.ts @@ -1,8 +1,8 @@ import {PathMatch} from './path_recognizer'; import {RouteRecognizer} from './route_recognizer'; import {Instruction, ComponentInstruction, PrimaryInstruction} from './instruction'; -import {ListWrapper, Map, MapWrapper, StringMapWrapper} from 'angular2/src/core/facade/collection'; -import {Promise, PromiseWrapper} from 'angular2/src/core/facade/async'; +import {ListWrapper, Map, MapWrapper, StringMapWrapper} from 'angular2/src/facade/collection'; +import {Promise, PromiseWrapper} from 'angular2/src/facade/async'; import { isPresent, isBlank, @@ -13,8 +13,8 @@ import { StringWrapper, Type, getTypeNameForDebugging -} from 'angular2/src/core/facade/lang'; -import {BaseException, WrappedException} from 'angular2/src/core/facade/exceptions'; +} from 'angular2/src/facade/lang'; +import {BaseException, WrappedException} from 'angular2/src/facade/exceptions'; import { RouteConfig, AsyncRoute, diff --git a/modules/angular2/src/router/router.ts b/modules/angular2/src/router/router.ts index 1bf7ce5069..d7c12ef8ba 100644 --- a/modules/angular2/src/router/router.ts +++ b/modules/angular2/src/router/router.ts @@ -1,12 +1,7 @@ -import { - Promise, - PromiseWrapper, - EventEmitter, - ObservableWrapper -} from 'angular2/src/core/facade/async'; -import {Map, StringMapWrapper, MapWrapper, ListWrapper} from 'angular2/src/core/facade/collection'; -import {isBlank, isString, isPresent, Type, isArray} from 'angular2/src/core/facade/lang'; -import {BaseException, WrappedException} from 'angular2/src/core/facade/exceptions'; +import {Promise, PromiseWrapper, EventEmitter, ObservableWrapper} from 'angular2/src/facade/async'; +import {Map, StringMapWrapper, MapWrapper, ListWrapper} from 'angular2/src/facade/collection'; +import {isBlank, isString, isPresent, Type, isArray} from 'angular2/src/facade/lang'; +import {BaseException, WrappedException} from 'angular2/src/facade/exceptions'; import {RouteRegistry} from './route_registry'; import { ComponentInstruction, diff --git a/modules/angular2/src/router/router_link.ts b/modules/angular2/src/router/router_link.ts index 2329a62a22..cf96551b00 100644 --- a/modules/angular2/src/router/router_link.ts +++ b/modules/angular2/src/router/router_link.ts @@ -1,5 +1,5 @@ import {Directive} from 'angular2/angular2'; -import {isString} from 'angular2/src/core/facade/lang'; +import {isString} from 'angular2/src/facade/lang'; import {Router} from './router'; import {Location} from './location'; diff --git a/modules/angular2/src/router/router_outlet.ts b/modules/angular2/src/router/router_outlet.ts index 787ed2c675..871da01f9c 100644 --- a/modules/angular2/src/router/router_outlet.ts +++ b/modules/angular2/src/router/router_outlet.ts @@ -1,7 +1,7 @@ -import {Promise, PromiseWrapper} from 'angular2/src/core/facade/async'; -import {StringMapWrapper} from 'angular2/src/core/facade/collection'; -import {isBlank, isPresent} from 'angular2/src/core/facade/lang'; -import {BaseException, WrappedException} from 'angular2/src/core/facade/exceptions'; +import {Promise, PromiseWrapper} from 'angular2/src/facade/async'; +import {StringMapWrapper} from 'angular2/src/facade/collection'; +import {isBlank, isPresent} from 'angular2/src/facade/lang'; +import {BaseException, WrappedException} from 'angular2/src/facade/exceptions'; import { Directive, diff --git a/modules/angular2/src/router/sync_route_handler.ts b/modules/angular2/src/router/sync_route_handler.ts index 75cdff1bba..5ad7f0aa8d 100644 --- a/modules/angular2/src/router/sync_route_handler.ts +++ b/modules/angular2/src/router/sync_route_handler.ts @@ -1,6 +1,6 @@ import {RouteHandler} from './route_handler'; -import {Promise, PromiseWrapper} from 'angular2/src/core/facade/async'; -import {Type} from 'angular2/src/core/facade/lang'; +import {Promise, PromiseWrapper} from 'angular2/src/facade/async'; +import {Type} from 'angular2/src/facade/lang'; export class SyncRouteHandler implements RouteHandler { /** @internal */ diff --git a/modules/angular2/src/router/url_parser.ts b/modules/angular2/src/router/url_parser.ts index 541021fbf0..64ba1c8b3d 100644 --- a/modules/angular2/src/router/url_parser.ts +++ b/modules/angular2/src/router/url_parser.ts @@ -1,6 +1,6 @@ -import {StringMapWrapper} from 'angular2/src/core/facade/collection'; -import {isPresent, isBlank, RegExpWrapper, CONST_EXPR} from 'angular2/src/core/facade/lang'; -import {BaseException, WrappedException} from 'angular2/src/core/facade/exceptions'; +import {StringMapWrapper} from 'angular2/src/facade/collection'; +import {isPresent, isBlank, RegExpWrapper, CONST_EXPR} from 'angular2/src/facade/lang'; +import {BaseException, WrappedException} from 'angular2/src/facade/exceptions'; /** * This class represents a parsed URL diff --git a/modules/angular2/src/testing/benchmark_util.ts b/modules/angular2/src/testing/benchmark_util.ts index 6402fa5ce0..635d6fedbb 100644 --- a/modules/angular2/src/testing/benchmark_util.ts +++ b/modules/angular2/src/testing/benchmark_util.ts @@ -1,7 +1,7 @@ import {BrowserDomAdapter} from 'angular2/src/core/dom/browser_adapter'; -import {document, window} from 'angular2/src/core/facade/browser'; -import {NumberWrapper, isBlank} from 'angular2/src/core/facade/lang'; -import {BaseException, WrappedException} from 'angular2/src/core/facade/exceptions'; +import {document, window} from 'angular2/src/facade/browser'; +import {NumberWrapper, isBlank} from 'angular2/src/facade/lang'; +import {BaseException, WrappedException} from 'angular2/src/facade/exceptions'; var DOM = new BrowserDomAdapter(); diff --git a/modules/angular2/src/testing/fake_async.dart b/modules/angular2/src/testing/fake_async.dart index 20bb11d490..2f9fe925a2 100644 --- a/modules/angular2/src/testing/fake_async.dart +++ b/modules/angular2/src/testing/fake_async.dart @@ -2,7 +2,7 @@ library testing.fake_async; import 'dart:async' show runZoned, ZoneSpecification; import 'package:quiver/testing/async.dart' as quiver; -import 'package:angular2/src/core/facade/exceptions.dart' show BaseException; +import 'package:angular2/src/facade/exceptions.dart' show BaseException; const _u = const Object(); diff --git a/modules/angular2/src/testing/fake_async.ts b/modules/angular2/src/testing/fake_async.ts index 67989f2648..832ed5f1d4 100644 --- a/modules/angular2/src/testing/fake_async.ts +++ b/modules/angular2/src/testing/fake_async.ts @@ -1,6 +1,6 @@ -import {global} from 'angular2/src/core/facade/lang'; -import {BaseException, WrappedException} from 'angular2/src/core/facade/exceptions'; -import {ListWrapper} from 'angular2/src/core/facade/collection'; +import {global} from 'angular2/src/facade/lang'; +import {BaseException, WrappedException} from 'angular2/src/facade/exceptions'; +import {ListWrapper} from 'angular2/src/facade/collection'; import {NgZoneZone} from 'angular2/src/core/zone/ng_zone'; var _scheduler; diff --git a/modules/angular2/src/testing/matchers.ts b/modules/angular2/src/testing/matchers.ts index 0ddcfc8885..fe2f84d704 100644 --- a/modules/angular2/src/testing/matchers.ts +++ b/modules/angular2/src/testing/matchers.ts @@ -1,5 +1,5 @@ import {DOM} from 'angular2/src/core/dom/dom_adapter'; -import {global} from 'angular2/src/core/facade/lang'; +import {global} from 'angular2/src/facade/lang'; export interface NgMatchers extends jasmine.Matchers { diff --git a/modules/angular2/src/testing/test_component_builder.ts b/modules/angular2/src/testing/test_component_builder.ts index ea6d0aceaa..72ff6abd37 100644 --- a/modules/angular2/src/testing/test_component_builder.ts +++ b/modules/angular2/src/testing/test_component_builder.ts @@ -1,8 +1,8 @@ import {Injector, provide, Injectable} from 'angular2/src/core/di'; -import {Type, isPresent, isBlank} from 'angular2/src/core/facade/lang'; -import {Promise} from 'angular2/src/core/facade/async'; -import {ListWrapper, MapWrapper} from 'angular2/src/core/facade/collection'; +import {Type, isPresent, isBlank} from 'angular2/src/facade/lang'; +import {Promise} from 'angular2/src/facade/async'; +import {ListWrapper, MapWrapper} from 'angular2/src/facade/collection'; import {ViewMetadata} from '../core/metadata'; diff --git a/modules/angular2/src/testing/test_injector.ts b/modules/angular2/src/testing/test_injector.ts index 02aec4b93e..2362cab53a 100644 --- a/modules/angular2/src/testing/test_injector.ts +++ b/modules/angular2/src/testing/test_injector.ts @@ -11,7 +11,7 @@ import { defaultKeyValueDiffers, ChangeDetectorGenConfig } from 'angular2/src/core/change_detection/change_detection'; -import {ExceptionHandler} from 'angular2/src/core/facade/exceptions'; +import {ExceptionHandler} from 'angular2/src/facade/exceptions'; import {ViewResolver} from 'angular2/src/core/linker/view_resolver'; import {DirectiveResolver} from 'angular2/src/core/linker/directive_resolver'; import {PipeResolver} from 'angular2/src/core/linker/pipe_resolver'; @@ -38,8 +38,8 @@ import {TestComponentBuilder} from './test_component_builder'; import {Injector} from 'angular2/src/core/di'; import {ELEMENT_PROBE_PROVIDERS} from 'angular2/src/core/debug'; -import {ListWrapper} from 'angular2/src/core/facade/collection'; -import {FunctionWrapper, Type} from 'angular2/src/core/facade/lang'; +import {ListWrapper} from 'angular2/src/facade/collection'; +import {FunctionWrapper, Type} from 'angular2/src/facade/lang'; import {AppViewPool, APP_VIEW_POOL_CAPACITY} from 'angular2/src/core/linker/view_pool'; import {AppViewManager} from 'angular2/src/core/linker/view_manager'; diff --git a/modules/angular2/src/testing/testing.ts b/modules/angular2/src/testing/testing.ts index ce30acd8dd..3aa571bf88 100644 --- a/modules/angular2/src/testing/testing.ts +++ b/modules/angular2/src/testing/testing.ts @@ -2,7 +2,7 @@ * Public Test Library for unit testing Angular2 Applications. Uses the * Jasmine framework. */ -import {global} from 'angular2/src/core/facade/lang'; +import {global} from 'angular2/src/facade/lang'; import {bind} from 'angular2/src/core/di'; diff --git a/modules/angular2/src/testing/testing_internal.dart b/modules/angular2/src/testing/testing_internal.dart index e2c896250d..a88aa0d691 100644 --- a/modules/angular2/src/testing/testing_internal.dart +++ b/modules/angular2/src/testing/testing_internal.dart @@ -22,7 +22,7 @@ import 'package:angular2/src/core/reflection/reflection_capabilities.dart'; import 'package:angular2/src/core/di/provider.dart' show bind; import 'package:angular2/src/core/di/injector.dart' show Injector; -import 'package:angular2/src/core/facade/collection.dart' show StringMapWrapper; +import 'package:angular2/src/facade/collection.dart' show StringMapWrapper; import 'test_injector.dart'; export 'test_injector.dart' show inject; diff --git a/modules/angular2/src/testing/testing_internal.ts b/modules/angular2/src/testing/testing_internal.ts index 630d8c53fb..9323715dc8 100644 --- a/modules/angular2/src/testing/testing_internal.ts +++ b/modules/angular2/src/testing/testing_internal.ts @@ -1,6 +1,6 @@ import {DOM} from 'angular2/src/core/dom/dom_adapter'; -import {StringMapWrapper} from 'angular2/src/core/facade/collection'; -import {global, isFunction, Math} from 'angular2/src/core/facade/lang'; +import {StringMapWrapper} from 'angular2/src/facade/collection'; +import {global, isFunction, Math} from 'angular2/src/facade/lang'; import {NgZoneZone} from 'angular2/src/core/zone/ng_zone'; import {provide} from 'angular2/src/core/di'; diff --git a/modules/angular2/src/testing/utils.ts b/modules/angular2/src/testing/utils.ts index e6811d4718..26cc665bb7 100644 --- a/modules/angular2/src/testing/utils.ts +++ b/modules/angular2/src/testing/utils.ts @@ -1,12 +1,6 @@ -import {ListWrapper, MapWrapper} from 'angular2/src/core/facade/collection'; +import {ListWrapper, MapWrapper} from 'angular2/src/facade/collection'; import {DOM} from 'angular2/src/core/dom/dom_adapter'; -import { - isPresent, - isString, - RegExpWrapper, - StringWrapper, - RegExp -} from 'angular2/src/core/facade/lang'; +import {isPresent, isString, RegExpWrapper, StringWrapper, RegExp} from 'angular2/src/facade/lang'; export class Log { /** @internal */ diff --git a/modules/angular2/src/tools/common_tools.ts b/modules/angular2/src/tools/common_tools.ts index 24054bf543..f57f8fe093 100644 --- a/modules/angular2/src/tools/common_tools.ts +++ b/modules/angular2/src/tools/common_tools.ts @@ -1,7 +1,7 @@ import {ApplicationRef} from 'angular2/src/core/application_ref'; import {ComponentRef, ComponentRef_} from 'angular2/src/core/linker/dynamic_component_loader'; -import {isPresent, NumberWrapper} from 'angular2/src/core/facade/lang'; -import {performance, window} from 'angular2/src/core/facade/browser'; +import {isPresent, NumberWrapper} from 'angular2/src/facade/lang'; +import {performance, window} from 'angular2/src/facade/browser'; import {DOM} from 'angular2/src/core/dom/dom_adapter'; /** diff --git a/modules/angular2/src/tools/tools.ts b/modules/angular2/src/tools/tools.ts index 566df4e171..a3b607df19 100644 --- a/modules/angular2/src/tools/tools.ts +++ b/modules/angular2/src/tools/tools.ts @@ -1,4 +1,4 @@ -import {global} from 'angular2/src/core/facade/lang'; +import {global} from 'angular2/src/facade/lang'; import {ComponentRef} from 'angular2/src/core/linker/dynamic_component_loader'; import {AngularTools} from './common_tools'; diff --git a/modules/angular2/src/upgrade/upgrade_adapter.ts b/modules/angular2/src/upgrade/upgrade_adapter.ts index cc812d536a..ba20e1a35f 100644 --- a/modules/angular2/src/upgrade/upgrade_adapter.ts +++ b/modules/angular2/src/upgrade/upgrade_adapter.ts @@ -16,7 +16,7 @@ import { import {applicationDomProviders} from 'angular2/src/core/application_common'; import {applicationCommonProviders} from 'angular2/src/core/application_ref'; import {compilerProviders} from 'angular2/src/compiler/compiler'; -import {ObservableWrapper} from 'angular2/src/core/facade/async'; +import {ObservableWrapper} from 'angular2/src/facade/async'; import {getComponentInfo, ComponentInfo} from './metadata'; import {onError, controllerKey} from './util'; diff --git a/modules/angular2/src/web_workers/shared/api.ts b/modules/angular2/src/web_workers/shared/api.ts index f916e5d6e9..a5d6ffa34f 100644 --- a/modules/angular2/src/web_workers/shared/api.ts +++ b/modules/angular2/src/web_workers/shared/api.ts @@ -1,4 +1,4 @@ -import {CONST_EXPR} from "angular2/src/core/facade/lang"; +import {CONST_EXPR} from "angular2/src/facade/lang"; import {OpaqueToken} from "angular2/src/core/di"; import { RenderElementRef, diff --git a/modules/angular2/src/web_workers/shared/client_message_broker.ts b/modules/angular2/src/web_workers/shared/client_message_broker.ts index d014ba303a..2affaf9fe5 100644 --- a/modules/angular2/src/web_workers/shared/client_message_broker.ts +++ b/modules/angular2/src/web_workers/shared/client_message_broker.ts @@ -1,17 +1,17 @@ import {MessageBus} from "angular2/src/web_workers/shared/message_bus"; -import {print, isPresent, DateWrapper, stringify} from "angular2/src/core/facade/lang"; +import {print, isPresent, DateWrapper, stringify} from "angular2/src/facade/lang"; import { Promise, PromiseCompleter, PromiseWrapper, ObservableWrapper, EventEmitter -} from "angular2/src/core/facade/async"; -import {StringMapWrapper, MapWrapper} from "angular2/src/core/facade/collection"; +} from "angular2/src/facade/async"; +import {StringMapWrapper, MapWrapper} from "angular2/src/facade/collection"; import {Serializer} from "angular2/src/web_workers/shared/serializer"; import {Injectable} from "angular2/src/core/di"; -import {Type, StringWrapper} from "angular2/src/core/facade/lang"; -export {Type} from "angular2/src/core/facade/lang"; +import {Type, StringWrapper} from "angular2/src/facade/lang"; +export {Type} from "angular2/src/facade/lang"; export abstract class ClientMessageBrokerFactory { /** diff --git a/modules/angular2/src/web_workers/shared/generic_message_bus.dart b/modules/angular2/src/web_workers/shared/generic_message_bus.dart index 3584f4407e..2bda2c1410 100644 --- a/modules/angular2/src/web_workers/shared/generic_message_bus.dart +++ b/modules/angular2/src/web_workers/shared/generic_message_bus.dart @@ -1,12 +1,12 @@ library angular2.src.web_workers.shared.generic_message_bus; import 'dart:async'; -import 'package:angular2/src/core/facade/async.dart' show EventEmitter; +import 'package:angular2/src/facade/async.dart' show EventEmitter; import 'package:angular2/src/web_workers/shared/message_bus.dart' show MessageBus, MessageBusSink, MessageBusSource; import 'package:angular2/src/core/zone/ng_zone.dart'; -import 'package:angular2/src/core/facade/lang.dart'; -import 'package:angular2/src/core/facade/exceptions.dart'; +import 'package:angular2/src/facade/lang.dart'; +import 'package:angular2/src/facade/exceptions.dart'; class GenericMessageBus implements MessageBus { final MessageBusSink _sink; diff --git a/modules/angular2/src/web_workers/shared/message_bus.ts b/modules/angular2/src/web_workers/shared/message_bus.ts index 2843e6a45d..649f0e454f 100644 --- a/modules/angular2/src/web_workers/shared/message_bus.ts +++ b/modules/angular2/src/web_workers/shared/message_bus.ts @@ -1,6 +1,6 @@ -import {EventEmitter} from 'angular2/src/core/facade/async'; +import {EventEmitter} from 'angular2/src/facade/async'; import {NgZone} from 'angular2/src/core/zone/ng_zone'; -export {EventEmitter, Observable} from 'angular2/src/core/facade/async'; +export {EventEmitter, Observable} from 'angular2/src/facade/async'; /** * Message Bus is a low level API used to communicate between the UI and the background. diff --git a/modules/angular2/src/web_workers/shared/post_message_bus.ts b/modules/angular2/src/web_workers/shared/post_message_bus.ts index 448d87a7a7..52ef4361df 100644 --- a/modules/angular2/src/web_workers/shared/post_message_bus.ts +++ b/modules/angular2/src/web_workers/shared/post_message_bus.ts @@ -3,9 +3,9 @@ import { MessageBusSource, MessageBusSink } from "angular2/src/web_workers/shared/message_bus"; -import {BaseException, WrappedException} from 'angular2/src/core/facade/exceptions'; -import {EventEmitter} from 'angular2/src/core/facade/async'; -import {StringMapWrapper} from 'angular2/src/core/facade/collection'; +import {BaseException, WrappedException} from 'angular2/src/facade/exceptions'; +import {EventEmitter} from 'angular2/src/facade/async'; +import {StringMapWrapper} from 'angular2/src/facade/collection'; import {Injectable} from "angular2/src/core/di"; import {NgZone} from 'angular2/src/core/zone/ng_zone'; diff --git a/modules/angular2/src/web_workers/shared/render_view_with_fragments_store.ts b/modules/angular2/src/web_workers/shared/render_view_with_fragments_store.ts index 5acf0ece69..99efb73925 100644 --- a/modules/angular2/src/web_workers/shared/render_view_with_fragments_store.ts +++ b/modules/angular2/src/web_workers/shared/render_view_with_fragments_store.ts @@ -5,7 +5,7 @@ import { RenderViewWithFragments } from "angular2/src/core/render/api"; import {ON_WEB_WORKER} from "angular2/src/web_workers/shared/api"; -import {MapWrapper, ListWrapper} from "angular2/src/core/facade/collection"; +import {MapWrapper, ListWrapper} from "angular2/src/facade/collection"; @Injectable() export class RenderViewWithFragmentsStore { diff --git a/modules/angular2/src/web_workers/shared/serializer.ts b/modules/angular2/src/web_workers/shared/serializer.ts index ce6f190897..03d63ebf3a 100644 --- a/modules/angular2/src/web_workers/shared/serializer.ts +++ b/modules/angular2/src/web_workers/shared/serializer.ts @@ -1,13 +1,7 @@ -import { - Type, - isArray, - isPresent, - serializeEnum, - deserializeEnum -} from "angular2/src/core/facade/lang"; -import {BaseException, WrappedException} from 'angular2/src/core/facade/exceptions'; +import {Type, isArray, isPresent, serializeEnum, deserializeEnum} from "angular2/src/facade/lang"; +import {BaseException, WrappedException} from 'angular2/src/facade/exceptions'; -import {Map, StringMapWrapper, MapWrapper} from "angular2/src/core/facade/collection"; +import {Map, StringMapWrapper, MapWrapper} from "angular2/src/facade/collection"; import { RenderProtoViewRef, RenderViewRef, diff --git a/modules/angular2/src/web_workers/shared/service_message_broker.ts b/modules/angular2/src/web_workers/shared/service_message_broker.ts index a54f15cde8..8cfffec446 100644 --- a/modules/angular2/src/web_workers/shared/service_message_broker.ts +++ b/modules/angular2/src/web_workers/shared/service_message_broker.ts @@ -1,14 +1,9 @@ import {Injectable} from 'angular2/src/core/di'; -import {ListWrapper, Map, MapWrapper} from 'angular2/src/core/facade/collection'; +import {ListWrapper, Map, MapWrapper} from 'angular2/src/facade/collection'; import {Serializer} from "angular2/src/web_workers/shared/serializer"; -import {isPresent, Type, FunctionWrapper} from "angular2/src/core/facade/lang"; +import {isPresent, Type, FunctionWrapper} from "angular2/src/facade/lang"; import {MessageBus} from "angular2/src/web_workers/shared/message_bus"; -import { - EventEmitter, - Promise, - PromiseWrapper, - ObservableWrapper -} from 'angular2/src/core/facade/async'; +import {EventEmitter, Promise, PromiseWrapper, ObservableWrapper} from 'angular2/src/facade/async'; export abstract class ServiceMessageBrokerFactory { /** diff --git a/modules/angular2/src/web_workers/ui/application.ts b/modules/angular2/src/web_workers/ui/application.ts index ab3f077da1..0910057652 100644 --- a/modules/angular2/src/web_workers/ui/application.ts +++ b/modules/angular2/src/web_workers/ui/application.ts @@ -4,7 +4,7 @@ import { PostMessageBusSource } from 'angular2/src/web_workers/shared/post_message_bus'; import {MessageBus} from 'angular2/src/web_workers/shared/message_bus'; -import {BaseException, WrappedException} from 'angular2/src/core/facade/exceptions'; +import {BaseException, WrappedException} from 'angular2/src/facade/exceptions'; import {bootstrapUICommon, WebWorkerApplication} from 'angular2/src/web_workers/ui/impl'; export {WebWorkerApplication} from 'angular2/src/web_workers/ui/impl'; export * from 'angular2/src/web_workers/shared/message_bus'; diff --git a/modules/angular2/src/web_workers/ui/di_bindings.ts b/modules/angular2/src/web_workers/ui/di_bindings.ts index 382a5ae46b..2ad3272bab 100644 --- a/modules/angular2/src/web_workers/ui/di_bindings.ts +++ b/modules/angular2/src/web_workers/ui/di_bindings.ts @@ -32,7 +32,7 @@ import {AppViewManagerUtils} from 'angular2/src/core/linker/view_manager_utils'; import {AppViewListener} from 'angular2/src/core/linker/view_listener'; import {ViewResolver} from 'angular2/src/core/linker/view_resolver'; import {DirectiveResolver} from 'angular2/src/core/linker/directive_resolver'; -import {ExceptionHandler} from 'angular2/src/core/facade/exceptions'; +import {ExceptionHandler} from 'angular2/src/facade/exceptions'; import { DynamicComponentLoader, DynamicComponentLoader_ diff --git a/modules/angular2/src/web_workers/ui/event_dispatcher.ts b/modules/angular2/src/web_workers/ui/event_dispatcher.ts index 3c66de7b21..b205b6eb68 100644 --- a/modules/angular2/src/web_workers/ui/event_dispatcher.ts +++ b/modules/angular2/src/web_workers/ui/event_dispatcher.ts @@ -9,9 +9,9 @@ import { serializeGenericEvent, serializeEventWithTarget } from 'angular2/src/web_workers/ui/event_serializer'; -import {BaseException, WrappedException} from 'angular2/src/core/facade/exceptions'; -import {StringMapWrapper} from 'angular2/src/core/facade/collection'; -import {EventEmitter, ObservableWrapper} from 'angular2/src/core/facade/async'; +import {BaseException, WrappedException} from 'angular2/src/facade/exceptions'; +import {StringMapWrapper} from 'angular2/src/facade/collection'; +import {EventEmitter, ObservableWrapper} from 'angular2/src/facade/async'; export class EventDispatcher implements RenderEventDispatcher { constructor(private _viewRef: RenderViewRef, private _sink: EventEmitter, diff --git a/modules/angular2/src/web_workers/ui/event_serializer.ts b/modules/angular2/src/web_workers/ui/event_serializer.ts index 453bd0af1a..13beac3162 100644 --- a/modules/angular2/src/web_workers/ui/event_serializer.ts +++ b/modules/angular2/src/web_workers/ui/event_serializer.ts @@ -1,5 +1,5 @@ -import {Set} from 'angular2/src/core/facade/collection'; -import {isPresent} from 'angular2/src/core/facade/lang'; +import {Set} from 'angular2/src/facade/collection'; +import {isPresent} from 'angular2/src/facade/lang'; const MOUSE_EVENT_PROPERTIES = [ "altKey", diff --git a/modules/angular2/src/web_workers/ui/renderer.ts b/modules/angular2/src/web_workers/ui/renderer.ts index 7a149cfa38..ba9feca6a9 100644 --- a/modules/angular2/src/web_workers/ui/renderer.ts +++ b/modules/angular2/src/web_workers/ui/renderer.ts @@ -10,7 +10,7 @@ import { } from 'angular2/src/core/render/api'; import {WebWorkerElementRef, WebWorkerTemplateCmd} from 'angular2/src/web_workers/shared/api'; import {EVENT_CHANNEL, RENDERER_CHANNEL} from 'angular2/src/web_workers/shared/messaging_api'; -import {Type} from 'angular2/src/core/facade/lang'; +import {Type} from 'angular2/src/facade/lang'; import {bind} from './bind'; import {EventDispatcher} from 'angular2/src/web_workers/ui/event_dispatcher'; import {RenderProtoViewRefStore} from 'angular2/src/web_workers/shared/render_proto_view_ref_store'; diff --git a/modules/angular2/src/web_workers/ui/setup.ts b/modules/angular2/src/web_workers/ui/setup.ts index 6e7535055c..5af6fbaa04 100644 --- a/modules/angular2/src/web_workers/ui/setup.ts +++ b/modules/angular2/src/web_workers/ui/setup.ts @@ -1,8 +1,8 @@ import {SETUP_CHANNEL} from 'angular2/src/web_workers/shared/messaging_api'; -import {EventEmitter, ObservableWrapper} from 'angular2/src/core/facade/async'; +import {EventEmitter, ObservableWrapper} from 'angular2/src/facade/async'; import {MessageBus} from 'angular2/src/web_workers/shared/message_bus'; import {AnchorBasedAppRootUrl} from 'angular2/src/compiler/anchor_based_app_root_url'; -import {StringWrapper} from 'angular2/src/core/facade/lang'; +import {StringWrapper} from 'angular2/src/facade/lang'; import {Injectable} from 'angular2/src/core/di'; @Injectable() diff --git a/modules/angular2/src/web_workers/worker/application.dart b/modules/angular2/src/web_workers/worker/application.dart index 5b3f057af9..18b753d805 100644 --- a/modules/angular2/src/web_workers/worker/application.dart +++ b/modules/angular2/src/web_workers/worker/application.dart @@ -3,8 +3,8 @@ library angular2.src.web_workers.worker; import "package:angular2/src/web_workers/shared/isolate_message_bus.dart"; import "package:angular2/src/web_workers/worker/application_common.dart" show bootstrapWebWorkerCommon; -import "package:angular2/src/core/facade/async.dart" show Future; -import "package:angular2/src/core/facade/lang.dart" show Type, BaseException; +import "package:angular2/src/facade/async.dart" show Future; +import "package:angular2/src/facade/lang.dart" show Type, BaseException; import "package:angular2/src/core/linker/dynamic_component_loader.dart" show ComponentRef; import "dart:isolate"; diff --git a/modules/angular2/src/web_workers/worker/application.ts b/modules/angular2/src/web_workers/worker/application.ts index e836a97957..b3c29ca74c 100644 --- a/modules/angular2/src/web_workers/worker/application.ts +++ b/modules/angular2/src/web_workers/worker/application.ts @@ -3,10 +3,10 @@ import { PostMessageBusSink, PostMessageBusSource } from 'angular2/src/web_workers/shared/post_message_bus'; -import {Type} from "angular2/src/core/facade/lang"; +import {Type} from "angular2/src/facade/lang"; import {Provider, Injectable} from "angular2/src/core/di"; -import {Map} from 'angular2/src/core/facade/collection'; -import {Promise} from 'angular2/src/core/facade/async'; +import {Map} from 'angular2/src/facade/collection'; +import {Promise} from 'angular2/src/facade/async'; import {bootstrapWebWorkerCommon} from "angular2/src/web_workers/worker/application_common"; import {ComponentRef} from "angular2/src/core/linker/dynamic_component_loader"; export * from "angular2/src/web_workers/shared/message_bus"; diff --git a/modules/angular2/src/web_workers/worker/application_common.ts b/modules/angular2/src/web_workers/worker/application_common.ts index 85919df216..30b15f1ec9 100644 --- a/modules/angular2/src/web_workers/worker/application_common.ts +++ b/modules/angular2/src/web_workers/worker/application_common.ts @@ -8,9 +8,9 @@ import { assertionsEnabled, print, stringify -} from 'angular2/src/core/facade/lang'; -import {ExceptionHandler} from 'angular2/src/core/facade/exceptions'; -import {Promise, PromiseWrapper, PromiseCompleter} from 'angular2/src/core/facade/async'; +} from 'angular2/src/facade/lang'; +import {ExceptionHandler} from 'angular2/src/facade/exceptions'; +import {Promise, PromiseWrapper, PromiseCompleter} from 'angular2/src/facade/async'; import {XHR} from 'angular2/src/compiler/xhr'; import {WebWorkerXHRImpl} from 'angular2/src/web_workers/worker/xhr_impl'; import {AppRootUrl} from 'angular2/src/compiler/app_root_url'; @@ -37,7 +37,7 @@ import {RenderProtoViewRefStore} from 'angular2/src/web_workers/shared/render_pr import { RenderViewWithFragmentsStore } from 'angular2/src/web_workers/shared/render_view_with_fragments_store'; -import {ObservableWrapper} from 'angular2/src/core/facade/async'; +import {ObservableWrapper} from 'angular2/src/facade/async'; import {SETUP_CHANNEL} from 'angular2/src/web_workers/shared/messaging_api'; import {WebWorkerEventDispatcher} from 'angular2/src/web_workers/worker/event_dispatcher'; import {ComponentRef} from 'angular2/src/core/linker/dynamic_component_loader'; diff --git a/modules/angular2/src/web_workers/worker/event_dispatcher.ts b/modules/angular2/src/web_workers/worker/event_dispatcher.ts index 4048aa7eb9..287995baca 100644 --- a/modules/angular2/src/web_workers/worker/event_dispatcher.ts +++ b/modules/angular2/src/web_workers/worker/event_dispatcher.ts @@ -1,10 +1,10 @@ import {Injectable} from 'angular2/src/core/di'; -import {Map, MapWrapper} from 'angular2/src/core/facade/collection'; +import {Map, MapWrapper} from 'angular2/src/facade/collection'; import {RenderViewRef, RenderEventDispatcher} from 'angular2/src/core/render/api'; import {Serializer} from 'angular2/src/web_workers/shared/serializer'; import {EVENT_CHANNEL} from 'angular2/src/web_workers/shared/messaging_api'; import {MessageBus} from 'angular2/src/web_workers/shared/message_bus'; -import {EventEmitter, ObservableWrapper} from 'angular2/src/core/facade/async'; +import {EventEmitter, ObservableWrapper} from 'angular2/src/facade/async'; import {deserializeGenericEvent} from './event_deserializer'; @Injectable() diff --git a/modules/angular2/src/web_workers/worker/renderer.ts b/modules/angular2/src/web_workers/worker/renderer.ts index 86a050fc42..b17cea00ca 100644 --- a/modules/angular2/src/web_workers/worker/renderer.ts +++ b/modules/angular2/src/web_workers/worker/renderer.ts @@ -14,7 +14,7 @@ import { FnArg, UiArguments } from "angular2/src/web_workers/shared/client_message_broker"; -import {isPresent, print} from "angular2/src/core/facade/lang"; +import {isPresent, print} from "angular2/src/facade/lang"; import {Injectable} from "angular2/src/core/di"; import {RenderProtoViewRefStore} from 'angular2/src/web_workers/shared/render_proto_view_ref_store'; import { diff --git a/modules/angular2/src/web_workers/worker/xhr_impl.ts b/modules/angular2/src/web_workers/worker/xhr_impl.ts index 5f1b5ababc..077654807c 100644 --- a/modules/angular2/src/web_workers/worker/xhr_impl.ts +++ b/modules/angular2/src/web_workers/worker/xhr_impl.ts @@ -1,5 +1,5 @@ import {Injectable} from 'angular2/src/core/di'; -import {Promise} from 'angular2/src/core/facade/async'; +import {Promise} from 'angular2/src/facade/async'; import {XHR} from 'angular2/src/compiler/xhr'; import { FnArg, diff --git a/modules/angular2/test/common/directives/ng_class_spec.ts b/modules/angular2/test/common/directives/ng_class_spec.ts index f9350c3744..7ef9073ae1 100644 --- a/modules/angular2/test/common/directives/ng_class_spec.ts +++ b/modules/angular2/test/common/directives/ng_class_spec.ts @@ -14,7 +14,7 @@ import { it, xit, } from 'angular2/testing_internal'; -import {ListWrapper, StringMapWrapper, SetWrapper} from 'angular2/src/core/facade/collection'; +import {ListWrapper, StringMapWrapper, SetWrapper} from 'angular2/src/facade/collection'; import {Component, View, NgFor, provide} from 'angular2/angular2'; import {NgClass} from 'angular2/src/common/directives/ng_class'; import {APP_VIEW_POOL_CAPACITY} from 'angular2/src/core/linker/view_pool'; diff --git a/modules/angular2/test/common/directives/ng_for_spec.ts b/modules/angular2/test/common/directives/ng_for_spec.ts index 51be2f62c8..e66fcba0ec 100644 --- a/modules/angular2/test/common/directives/ng_for_spec.ts +++ b/modules/angular2/test/common/directives/ng_for_spec.ts @@ -13,7 +13,7 @@ import { xit, } from 'angular2/testing_internal'; -import {ListWrapper} from 'angular2/src/core/facade/collection'; +import {ListWrapper} from 'angular2/src/facade/collection'; import {Component, View, TemplateRef, ContentChild} from 'angular2/angular2'; diff --git a/modules/angular2/test/common/directives/ng_if_spec.ts b/modules/angular2/test/common/directives/ng_if_spec.ts index 26bb967e31..0b8080b098 100644 --- a/modules/angular2/test/common/directives/ng_if_spec.ts +++ b/modules/angular2/test/common/directives/ng_if_spec.ts @@ -16,7 +16,7 @@ import {DOM} from 'angular2/src/core/dom/dom_adapter'; import {Component, View, NgIf} from 'angular2/core'; -import {IS_DART} from 'angular2/src/core/facade/lang'; +import {IS_DART} from 'angular2/src/facade/lang'; export function main() { describe('ng-if directive', () => { diff --git a/modules/angular2/test/common/directives/ng_style_spec.ts b/modules/angular2/test/common/directives/ng_style_spec.ts index 1c07e8d551..1bcf1dd6d2 100644 --- a/modules/angular2/test/common/directives/ng_style_spec.ts +++ b/modules/angular2/test/common/directives/ng_style_spec.ts @@ -14,7 +14,7 @@ import { xit, } from 'angular2/testing_internal'; -import {StringMapWrapper} from 'angular2/src/core/facade/collection'; +import {StringMapWrapper} from 'angular2/src/facade/collection'; import {Component, View} from 'angular2/angular2'; diff --git a/modules/angular2/test/common/forms/directives_spec.ts b/modules/angular2/test/common/forms/directives_spec.ts index 63edab382e..2346456a1b 100644 --- a/modules/angular2/test/common/forms/directives_spec.ts +++ b/modules/angular2/test/common/forms/directives_spec.ts @@ -38,8 +38,8 @@ import { import {selectValueAccessor, composeValidators} from 'angular2/src/common/forms/directives/shared'; -import {TimerWrapper} from 'angular2/src/core/facade/async'; -import {PromiseWrapper} from 'angular2/src/core/facade/promise'; +import {TimerWrapper} from 'angular2/src/facade/async'; +import {PromiseWrapper} from 'angular2/src/facade/promise'; import {SimpleChange} from 'angular2/src/core/change_detection'; class DummyControlValueAccessor implements ControlValueAccessor { @@ -135,7 +135,7 @@ export function main() { describe("NgFormModel", () => { var form; - var formModel; + var formModel: ControlGroup; var loginControlDir; beforeEach(() => { @@ -188,7 +188,7 @@ export function main() { expect(formModel.hasError("required", ["login"])).toBe(true); expect(formModel.hasError("async", ["login"])).toBe(false); - formModel.find(["login"]).updateValue("invalid value"); + (formModel.find(["login"])).updateValue("invalid value"); // sync validator passes, running async validators expect(formModel.pending).toBe(true); @@ -200,7 +200,7 @@ export function main() { })); it("should write value to the DOM", () => { - formModel.find(["login"]).updateValue("initValue"); + (formModel.find(["login"])).updateValue("initValue"); form.addControl(loginControlDir); @@ -228,13 +228,15 @@ export function main() { group.name = "passwords"; form.addControlGroup(group); - formModel.find(["passwords", "password"]).updateValue("somePassword"); - formModel.find(["passwords", "passwordConfirm"]).updateValue("someOtherPassword"); + (formModel.find(["passwords", "password"])).updateValue("somePassword"); + (formModel.find(["passwords", "passwordConfirm"])) + .updateValue("someOtherPassword"); // sync validators are set expect(formModel.hasError("differentPasswords", ["passwords"])).toEqual(true); - formModel.find(["passwords", "passwordConfirm"]).updateValue("somePassword"); + (formModel.find(["passwords", "passwordConfirm"])) + .updateValue("somePassword"); // sync validators pass, running async validators expect(formModel.pending).toBe(true); @@ -257,7 +259,7 @@ export function main() { it("should update dom values of all the directives", () => { form.addControl(loginControlDir); - formModel.find(["login"]).updateValue("new value"); + (formModel.find(["login"])).updateValue("new value"); form.onChanges({}); @@ -268,7 +270,7 @@ export function main() { var formValidator = (c) => ({"custom": true}); var f = new NgFormModel([formValidator], []); f.form = formModel; - f.onChanges({"form": formModel}); + f.onChanges({"form":formModel}); expect(formModel.errors).toEqual({"custom": true}); }); @@ -276,7 +278,7 @@ export function main() { it("should set up an async validator", fakeAsync(() => { var f = new NgFormModel([], [asyncValidator("expected")]); f.form = formModel; - f.onChanges({"form": formModel}); + f.onChanges({"form":formModel}); tick(); @@ -287,7 +289,7 @@ export function main() { describe("NgForm", () => { var form; - var formModel; + var formModel: ControlGroup; var loginControlDir; var personControlGroupDir; diff --git a/modules/angular2/test/common/forms/form_builder_spec.ts b/modules/angular2/test/common/forms/form_builder_spec.ts index 6f0492184a..d84bda4639 100644 --- a/modules/angular2/test/common/forms/form_builder_spec.ts +++ b/modules/angular2/test/common/forms/form_builder_spec.ts @@ -10,7 +10,7 @@ import { el } from 'angular2/testing_internal'; import {Control, FormBuilder} from 'angular2/core'; -import {PromiseWrapper} from 'angular2/src/core/facade/promise'; +import {PromiseWrapper} from 'angular2/src/facade/promise'; export function main() { function syncValidator(_) { return null; } diff --git a/modules/angular2/test/common/forms/integration_spec.ts b/modules/angular2/test/common/forms/integration_spec.ts index 490348b7ea..677c9b11f9 100644 --- a/modules/angular2/test/common/forms/integration_spec.ts +++ b/modules/angular2/test/common/forms/integration_spec.ts @@ -37,10 +37,10 @@ import { Validator } from 'angular2/core'; import {By} from 'angular2/src/core/debug'; -import {ListWrapper} from 'angular2/src/core/facade/collection'; -import {ObservableWrapper} from 'angular2/src/core/facade/async'; -import {CONST_EXPR} from 'angular2/src/core/facade/lang'; -import {PromiseWrapper} from "angular2/src/core/facade/promise"; +import {ListWrapper} from 'angular2/src/facade/collection'; +import {ObservableWrapper} from 'angular2/src/facade/async'; +import {CONST_EXPR} from 'angular2/src/facade/lang'; +import {PromiseWrapper} from "angular2/src/facade/promise"; export function main() { describe("integration tests", () => { diff --git a/modules/angular2/test/common/forms/model_spec.ts b/modules/angular2/test/common/forms/model_spec.ts index eddf9a7a69..e49b51a85a 100644 --- a/modules/angular2/test/common/forms/model_spec.ts +++ b/modules/angular2/test/common/forms/model_spec.ts @@ -14,9 +14,9 @@ import { inject } from 'angular2/testing_internal'; import {ControlGroup, Control, ControlArray, Validators} from 'angular2/core'; -import {IS_DART, isPresent, CONST_EXPR} from 'angular2/src/core/facade/lang'; -import {PromiseWrapper} from 'angular2/src/core/facade/promise'; -import {TimerWrapper, ObservableWrapper, EventEmitter} from 'angular2/src/core/facade/async'; +import {IS_DART, isPresent, CONST_EXPR} from 'angular2/src/facade/lang'; +import {PromiseWrapper} from 'angular2/src/facade/promise'; +import {TimerWrapper, ObservableWrapper, EventEmitter} from 'angular2/src/facade/async'; export function main() { function asyncValidator(expected, timeouts = CONST_EXPR({})) { diff --git a/modules/angular2/test/common/forms/validators_spec.ts b/modules/angular2/test/common/forms/validators_spec.ts index d20903b18b..a2f2d1b86f 100644 --- a/modules/angular2/test/common/forms/validators_spec.ts +++ b/modules/angular2/test/common/forms/validators_spec.ts @@ -12,9 +12,9 @@ import { el } from 'angular2/testing_internal'; import {ControlGroup, Control, Validators, AbstractControl, ControlArray} from 'angular2/core'; -import {PromiseWrapper} from 'angular2/src/core/facade/promise'; -import {EventEmitter, ObservableWrapper, TimerWrapper} from 'angular2/src/core/facade/async'; -import {CONST_EXPR} from 'angular2/src/core/facade/lang'; +import {PromiseWrapper} from 'angular2/src/facade/promise'; +import {EventEmitter, ObservableWrapper, TimerWrapper} from 'angular2/src/facade/async'; +import {CONST_EXPR} from 'angular2/src/facade/lang'; export function main() { function validator(key: string, error: any) { diff --git a/modules/angular2/test/common/pipes/async_pipe_spec.ts b/modules/angular2/test/common/pipes/async_pipe_spec.ts index 3f7a20c9b2..ac18102c10 100644 --- a/modules/angular2/test/common/pipes/async_pipe_spec.ts +++ b/modules/angular2/test/common/pipes/async_pipe_spec.ts @@ -13,14 +13,14 @@ import { } from 'angular2/testing_internal'; import {SpyChangeDetectorRef} from '../spies'; -import {isBlank} from 'angular2/src/core/facade/lang'; +import {isBlank} from 'angular2/src/facade/lang'; import {AsyncPipe, WrappedValue} from 'angular2/core'; import { EventEmitter, ObservableWrapper, PromiseWrapper, TimerWrapper -} from 'angular2/src/core/facade/async'; +} from 'angular2/src/facade/async'; import {DOM} from 'angular2/src/core/dom/dom_adapter'; export function main() { diff --git a/modules/angular2/test/common/pipes/date_pipe_spec.ts b/modules/angular2/test/common/pipes/date_pipe_spec.ts index 7e2ca2e5d5..c901077250 100644 --- a/modules/angular2/test/common/pipes/date_pipe_spec.ts +++ b/modules/angular2/test/common/pipes/date_pipe_spec.ts @@ -11,7 +11,7 @@ import { } from 'angular2/testing_internal'; import {DatePipe} from 'angular2/core'; -import {DateWrapper} from 'angular2/src/core/facade/lang'; +import {DateWrapper} from 'angular2/src/facade/lang'; import {PipeResolver} from 'angular2/src/core/linker/pipe_resolver'; export function main() { diff --git a/modules/angular2/test/common/pipes/json_pipe_spec.ts b/modules/angular2/test/common/pipes/json_pipe_spec.ts index cf94ca62ef..bb81a00251 100644 --- a/modules/angular2/test/common/pipes/json_pipe_spec.ts +++ b/modules/angular2/test/common/pipes/json_pipe_spec.ts @@ -12,7 +12,7 @@ import { proxy, TestComponentBuilder } from 'angular2/testing_internal'; -import {Json, RegExp, NumberWrapper, StringWrapper} from 'angular2/src/core/facade/lang'; +import {Json, RegExp, NumberWrapper, StringWrapper} from 'angular2/src/facade/lang'; import {JsonPipe, Component} from 'angular2/core'; diff --git a/modules/angular2/test/compiler/change_definition_factory_spec.ts b/modules/angular2/test/compiler/change_definition_factory_spec.ts index 16aa0c9be5..f20b9e9184 100644 --- a/modules/angular2/test/compiler/change_definition_factory_spec.ts +++ b/modules/angular2/test/compiler/change_definition_factory_spec.ts @@ -12,7 +12,7 @@ import { TestComponentBuilder, beforeEachBindings } from 'angular2/testing_internal'; -import {MapWrapper} from 'angular2/src/core/facade/collection'; +import {MapWrapper} from 'angular2/src/facade/collection'; import { CompileDirectiveMetadata, CompileTypeMetadata diff --git a/modules/angular2/test/compiler/change_detector_compiler_spec.ts b/modules/angular2/test/compiler/change_detector_compiler_spec.ts index 2c9a9b5eb7..086f4515bd 100644 --- a/modules/angular2/test/compiler/change_detector_compiler_spec.ts +++ b/modules/angular2/test/compiler/change_detector_compiler_spec.ts @@ -14,9 +14,9 @@ import { } from 'angular2/testing_internal'; import {provide} from 'angular2/src/core/di'; -import {CONST_EXPR, stringify} from 'angular2/src/core/facade/lang'; -import {MapWrapper} from 'angular2/src/core/facade/collection'; -import {Promise} from 'angular2/src/core/facade/async'; +import {CONST_EXPR, stringify} from 'angular2/src/facade/lang'; +import {MapWrapper} from 'angular2/src/facade/collection'; +import {Promise} from 'angular2/src/facade/async'; import {ChangeDetectionCompiler} from 'angular2/src/compiler/change_detector_compiler'; diff --git a/modules/angular2/test/compiler/change_detector_mocks.ts b/modules/angular2/test/compiler/change_detector_mocks.ts index 1008a25477..97e32c95f9 100644 --- a/modules/angular2/test/compiler/change_detector_mocks.ts +++ b/modules/angular2/test/compiler/change_detector_mocks.ts @@ -1,4 +1,4 @@ -import {isBlank} from 'angular2/src/core/facade/lang'; +import {isBlank} from 'angular2/src/facade/lang'; import {Pipes} from 'angular2/src/core/change_detection/pipes'; import { ProtoChangeDetector, diff --git a/modules/angular2/test/compiler/command_compiler_spec.ts b/modules/angular2/test/compiler/command_compiler_spec.ts index 8575af1e6f..cd034eebb5 100644 --- a/modules/angular2/test/compiler/command_compiler_spec.ts +++ b/modules/angular2/test/compiler/command_compiler_spec.ts @@ -13,9 +13,9 @@ import { beforeEachBindings } from 'angular2/testing_internal'; -import {CONST_EXPR, stringify, isType, Type, isBlank} from 'angular2/src/core/facade/lang'; -import {MapWrapper} from 'angular2/src/core/facade/collection'; -import {PromiseWrapper, Promise} from 'angular2/src/core/facade/async'; +import {CONST_EXPR, stringify, isType, Type, isBlank} from 'angular2/src/facade/lang'; +import {MapWrapper} from 'angular2/src/facade/collection'; +import {PromiseWrapper, Promise} from 'angular2/src/facade/async'; import {TemplateParser} from 'angular2/src/compiler/template_parser'; import { CommandVisitor, diff --git a/modules/angular2/test/compiler/eval_module.ts b/modules/angular2/test/compiler/eval_module.ts index 6b7123f5f2..0e5f890631 100644 --- a/modules/angular2/test/compiler/eval_module.ts +++ b/modules/angular2/test/compiler/eval_module.ts @@ -1,5 +1,5 @@ -import {Promise, PromiseWrapper} from 'angular2/src/core/facade/async'; -import {isPresent, global, StringWrapper} from 'angular2/src/core/facade/lang'; +import {Promise, PromiseWrapper} from 'angular2/src/facade/async'; +import {isPresent, global, StringWrapper} from 'angular2/src/facade/lang'; var evalCounter = 0; var MODULE_URL_REGEX = /^package:(.*)\.js/; diff --git a/modules/angular2/test/compiler/eval_module_spec.ts b/modules/angular2/test/compiler/eval_module_spec.ts index 13752a9784..2209f4a4ca 100644 --- a/modules/angular2/test/compiler/eval_module_spec.ts +++ b/modules/angular2/test/compiler/eval_module_spec.ts @@ -11,7 +11,7 @@ import { AsyncTestCompleter, inject } from 'angular2/testing_internal'; -import {IS_DART} from 'angular2/src/core/facade/lang'; +import {IS_DART} from 'angular2/src/facade/lang'; import {evalModule} from './eval_module'; diff --git a/modules/angular2/test/compiler/runtime_compiler_spec.ts b/modules/angular2/test/compiler/runtime_compiler_spec.ts index d0a012cf04..908f5567f9 100644 --- a/modules/angular2/test/compiler/runtime_compiler_spec.ts +++ b/modules/angular2/test/compiler/runtime_compiler_spec.ts @@ -14,7 +14,7 @@ import { } from 'angular2/testing_internal'; import {Component, View, provide} from 'angular2/core'; -import {PromiseWrapper} from 'angular2/src/core/facade/async'; +import {PromiseWrapper} from 'angular2/src/facade/async'; import {SpyProtoViewFactory} from '../core/spies'; import { CompiledHostTemplate, diff --git a/modules/angular2/test/compiler/runtime_metadata_spec.ts b/modules/angular2/test/compiler/runtime_metadata_spec.ts index a9060674be..d42296708e 100644 --- a/modules/angular2/test/compiler/runtime_metadata_spec.ts +++ b/modules/angular2/test/compiler/runtime_metadata_spec.ts @@ -13,7 +13,7 @@ import { beforeEachProviders } from 'angular2/testing_internal'; -import {stringify} from 'angular2/src/core/facade/lang'; +import {stringify} from 'angular2/src/facade/lang'; import {RuntimeMetadataResolver} from 'angular2/src/compiler/runtime_metadata'; import {LifecycleHooks, LIFECYCLE_HOOKS_VALUES} from 'angular2/src/core/linker/interfaces'; import { @@ -36,7 +36,7 @@ import { import {TEST_PROVIDERS} from './test_bindings'; import {MODULE_SUFFIX} from 'angular2/src/compiler/util'; -import {IS_DART} from 'angular2/src/core/facade/lang'; +import {IS_DART} from 'angular2/src/facade/lang'; import {AMBIENT_DIRECTIVES} from 'angular2/src/core/ambient'; export function main() { diff --git a/modules/angular2/test/compiler/schema/dom_element_schema_registry_spec.ts b/modules/angular2/test/compiler/schema/dom_element_schema_registry_spec.ts index 3ef4ea8ce0..722d523b96 100644 --- a/modules/angular2/test/compiler/schema/dom_element_schema_registry_spec.ts +++ b/modules/angular2/test/compiler/schema/dom_element_schema_registry_spec.ts @@ -9,7 +9,7 @@ import { it, xit } from 'angular2/testing_internal'; -import {IS_DART} from 'angular2/src/core/facade/lang'; +import {IS_DART} from 'angular2/src/facade/lang'; import {DomElementSchemaRegistry} from 'angular2/src/compiler/schema/dom_element_schema_registry'; diff --git a/modules/angular2/test/compiler/schema_registry_mock.ts b/modules/angular2/test/compiler/schema_registry_mock.ts index e0acab67b9..57618e856c 100644 --- a/modules/angular2/test/compiler/schema_registry_mock.ts +++ b/modules/angular2/test/compiler/schema_registry_mock.ts @@ -1,5 +1,5 @@ import {ElementSchemaRegistry} from 'angular2/src/compiler/schema/element_schema_registry'; -import {isPresent} from 'angular2/src/core/facade/lang'; +import {isPresent} from 'angular2/src/facade/lang'; export class MockSchemaRegistry implements ElementSchemaRegistry { constructor(public existingProperties: {[key: string]: boolean}, diff --git a/modules/angular2/test/compiler/selector_spec.ts b/modules/angular2/test/compiler/selector_spec.ts index e442566b7c..a9b4fa5a44 100644 --- a/modules/angular2/test/compiler/selector_spec.ts +++ b/modules/angular2/test/compiler/selector_spec.ts @@ -2,7 +2,7 @@ import {describe, it, expect, beforeEach, ddescribe, iit, xit, el} from 'angular import {DOM} from 'angular2/src/core/dom/dom_adapter'; import {SelectorMatcher} from 'angular2/src/compiler/selector'; import {CssSelector} from 'angular2/src/compiler/selector'; -import {ListWrapper, MapWrapper} from 'angular2/src/core/facade/collection'; +import {ListWrapper, MapWrapper} from 'angular2/src/facade/collection'; export function main() { describe('SelectorMatcher', () => { diff --git a/modules/angular2/test/compiler/shadow_css_spec.ts b/modules/angular2/test/compiler/shadow_css_spec.ts index f3fb35a355..810f81088e 100644 --- a/modules/angular2/test/compiler/shadow_css_spec.ts +++ b/modules/angular2/test/compiler/shadow_css_spec.ts @@ -11,7 +11,7 @@ import { } from 'angular2/testing_internal'; import {ShadowCss, processRules, CssRule} from 'angular2/src/compiler/shadow_css'; -import {RegExpWrapper, StringWrapper, isPresent} from 'angular2/src/core/facade/lang'; +import {RegExpWrapper, StringWrapper, isPresent} from 'angular2/src/facade/lang'; export function main() { describe('ShadowCss', function() { diff --git a/modules/angular2/test/compiler/style_compiler_spec.ts b/modules/angular2/test/compiler/style_compiler_spec.ts index 70ca28e6d5..69bb734a28 100644 --- a/modules/angular2/test/compiler/style_compiler_spec.ts +++ b/modules/angular2/test/compiler/style_compiler_spec.ts @@ -15,10 +15,10 @@ import { import {provide} from 'angular2/src/core/di'; import {SpyXHR} from './spies'; import {XHR} from 'angular2/src/compiler/xhr'; -import {BaseException, WrappedException} from 'angular2/src/core/facade/exceptions'; +import {BaseException, WrappedException} from 'angular2/src/facade/exceptions'; -import {CONST_EXPR, isPresent, isBlank, StringWrapper} from 'angular2/src/core/facade/lang'; -import {PromiseWrapper, Promise} from 'angular2/src/core/facade/async'; +import {CONST_EXPR, isPresent, isBlank, StringWrapper} from 'angular2/src/facade/lang'; +import {PromiseWrapper, Promise} from 'angular2/src/facade/async'; import {evalModule} from './eval_module'; import {StyleCompiler} from 'angular2/src/compiler/style_compiler'; import { diff --git a/modules/angular2/test/compiler/template_compiler_spec.ts b/modules/angular2/test/compiler/template_compiler_spec.ts index b47ac923d0..036c1a734d 100644 --- a/modules/angular2/test/compiler/template_compiler_spec.ts +++ b/modules/angular2/test/compiler/template_compiler_spec.ts @@ -13,9 +13,9 @@ import { beforeEachBindings } from 'angular2/testing_internal'; -import {Promise, PromiseWrapper} from 'angular2/src/core/facade/async'; -import {Type, isPresent, isBlank, stringify, isString} from 'angular2/src/core/facade/lang'; -import {MapWrapper, SetWrapper, ListWrapper} from 'angular2/src/core/facade/collection'; +import {Promise, PromiseWrapper} from 'angular2/src/facade/async'; +import {Type, isPresent, isBlank, stringify, isString} from 'angular2/src/facade/lang'; +import {MapWrapper, SetWrapper, ListWrapper} from 'angular2/src/facade/collection'; import {RuntimeMetadataResolver} from 'angular2/src/compiler/runtime_metadata'; import { TemplateCompiler, diff --git a/modules/angular2/test/compiler/template_parser_spec.ts b/modules/angular2/test/compiler/template_parser_spec.ts index b4451b5b7a..e87bd31cef 100644 --- a/modules/angular2/test/compiler/template_parser_spec.ts +++ b/modules/angular2/test/compiler/template_parser_spec.ts @@ -13,7 +13,7 @@ import { import {provide} from 'angular2/src/core/di'; import {TEST_PROVIDERS} from './test_bindings'; -import {isPresent} from 'angular2/src/core/facade/lang'; +import {isPresent} from 'angular2/src/facade/lang'; import {TemplateParser, splitClasses} from 'angular2/src/compiler/template_parser'; import { CompileDirectiveMetadata, diff --git a/modules/angular2/test/compiler/util_spec.ts b/modules/angular2/test/compiler/util_spec.ts index 51f47db52e..f1b3a1e060 100644 --- a/modules/angular2/test/compiler/util_spec.ts +++ b/modules/angular2/test/compiler/util_spec.ts @@ -12,7 +12,7 @@ import { TestComponentBuilder } from 'angular2/testing_internal'; -import {IS_DART} from 'angular2/src/core/facade/lang'; +import {IS_DART} from 'angular2/src/facade/lang'; import {escapeSingleQuoteString, escapeDoubleQuoteString} from 'angular2/src/compiler/util'; export function main() { diff --git a/modules/angular2/test/compiler/xhr_impl_spec.ts b/modules/angular2/test/compiler/xhr_impl_spec.ts index ee05dcb0f4..3ac4283645 100644 --- a/modules/angular2/test/compiler/xhr_impl_spec.ts +++ b/modules/angular2/test/compiler/xhr_impl_spec.ts @@ -11,7 +11,7 @@ import { } from 'angular2/testing_internal'; import {XHRImpl} from 'angular2/src/compiler/xhr_impl'; -import {PromiseWrapper} from 'angular2/src/core/facade/async'; +import {PromiseWrapper} from 'angular2/src/facade/async'; export function main() { describe('XHRImpl', () => { diff --git a/modules/angular2/test/compiler/xhr_mock_spec.ts b/modules/angular2/test/compiler/xhr_mock_spec.ts index 590b0aea66..e502e9edfa 100644 --- a/modules/angular2/test/compiler/xhr_mock_spec.ts +++ b/modules/angular2/test/compiler/xhr_mock_spec.ts @@ -10,8 +10,8 @@ import { it, } from 'angular2/testing_internal'; import {MockXHR} from 'angular2/src/compiler/xhr_mock'; -import {PromiseWrapper, Promise} from 'angular2/src/core/facade/async'; -import {isPresent} from 'angular2/src/core/facade/lang'; +import {PromiseWrapper, Promise} from 'angular2/src/facade/async'; +import {isPresent} from 'angular2/src/facade/lang'; export function main() { describe('MockXHR', () => { diff --git a/modules/angular2/test/core/application_spec.ts b/modules/angular2/test/core/application_spec.ts index 57ec5cede5..af3ecd1a4c 100644 --- a/modules/angular2/test/core/application_spec.ts +++ b/modules/angular2/test/core/application_spec.ts @@ -10,15 +10,15 @@ import { xdescribe, xit } from 'angular2/testing_internal'; -import {IS_DART, isPresent, stringify} from 'angular2/src/core/facade/lang'; +import {IS_DART, isPresent, stringify} from 'angular2/src/facade/lang'; import {bootstrap} from 'angular2/bootstrap'; import {ApplicationRef} from 'angular2/src/core/application_ref'; import {Component, Directive, View} from 'angular2/core'; import {DOM} from 'angular2/src/core/dom/dom_adapter'; import {DOCUMENT} from 'angular2/render'; -import {PromiseWrapper} from 'angular2/src/core/facade/async'; +import {PromiseWrapper} from 'angular2/src/facade/async'; import {provide, Inject, Injector} from 'angular2/core'; -import {ExceptionHandler} from 'angular2/src/core/facade/exceptions'; +import {ExceptionHandler} from 'angular2/src/facade/exceptions'; import {Testability, TestabilityRegistry} from 'angular2/src/core/testability/testability'; import {ComponentRef_} from "angular2/src/core/linker/dynamic_component_loader"; diff --git a/modules/angular2/test/core/change_detection/change_detector_config.ts b/modules/angular2/test/core/change_detection/change_detector_config.ts index 7be94e8893..ed74933064 100644 --- a/modules/angular2/test/core/change_detection/change_detector_config.ts +++ b/modules/angular2/test/core/change_detection/change_detector_config.ts @@ -1,5 +1,5 @@ -import {ListWrapper, MapWrapper, StringMapWrapper} from 'angular2/src/core/facade/collection'; -import {isBlank, isPresent} from 'angular2/src/core/facade/lang'; +import {ListWrapper, MapWrapper, StringMapWrapper} from 'angular2/src/facade/collection'; +import {isBlank, isPresent} from 'angular2/src/facade/lang'; import { ChangeDetectionStrategy, BindingRecord, diff --git a/modules/angular2/test/core/change_detection/change_detector_spec.ts b/modules/angular2/test/core/change_detection/change_detector_spec.ts index 56bc4c2ca0..b0111197db 100644 --- a/modules/angular2/test/core/change_detection/change_detector_spec.ts +++ b/modules/angular2/test/core/change_detection/change_detector_spec.ts @@ -22,9 +22,9 @@ import { FunctionWrapper, NumberWrapper, normalizeBool -} from 'angular2/src/core/facade/lang'; -import {BaseException, WrappedException} from 'angular2/src/core/facade/exceptions'; -import {MapWrapper, StringMapWrapper} from 'angular2/src/core/facade/collection'; +} from 'angular2/src/facade/lang'; +import {BaseException, WrappedException} from 'angular2/src/facade/exceptions'; +import {MapWrapper, StringMapWrapper} from 'angular2/src/facade/collection'; import { ChangeDispatcher, @@ -52,7 +52,7 @@ import {JitProtoChangeDetector} from 'angular2/src/core/change_detection/jit_pro import {getDefinition} from './change_detector_config'; import {createObservableModel} from './change_detector_spec_util'; import {getFactoryById} from './generated/change_detector_classes'; -import {IS_DART} from 'angular2/src/core/facade/lang'; +import {IS_DART} from 'angular2/src/facade/lang'; const _DEFAULT_CONTEXT = CONST_EXPR(new Object()); diff --git a/modules/angular2/test/core/change_detection/coalesce_spec.ts b/modules/angular2/test/core/change_detection/coalesce_spec.ts index 9bfd24db77..1f862dddf4 100644 --- a/modules/angular2/test/core/change_detection/coalesce_spec.ts +++ b/modules/angular2/test/core/change_detection/coalesce_spec.ts @@ -8,7 +8,7 @@ import { beforeEach, afterEach } from 'angular2/testing_internal'; -import {isBlank} from 'angular2/src/core/facade/lang'; +import {isBlank} from 'angular2/src/facade/lang'; import {coalesce} from 'angular2/src/core/change_detection/coalesce'; import {RecordType, ProtoRecord} from 'angular2/src/core/change_detection/proto_record'; diff --git a/modules/angular2/test/core/change_detection/differs/default_iterable_differ_spec.ts b/modules/angular2/test/core/change_detection/differs/default_iterable_differ_spec.ts index e5a5e59ac4..f21f7a29cc 100644 --- a/modules/angular2/test/core/change_detection/differs/default_iterable_differ_spec.ts +++ b/modules/angular2/test/core/change_detection/differs/default_iterable_differ_spec.ts @@ -13,8 +13,8 @@ import { DefaultIterableDifferFactory } from 'angular2/src/core/change_detection/differs/default_iterable_differ'; -import {NumberWrapper} from 'angular2/src/core/facade/lang'; -import {ListWrapper, MapWrapper} from 'angular2/src/core/facade/collection'; +import {NumberWrapper} from 'angular2/src/facade/lang'; +import {ListWrapper, MapWrapper} from 'angular2/src/facade/collection'; import {TestIterable} from '../../../core/change_detection/iterable'; import {iterableChangesAsString} from '../../../core/change_detection/util'; diff --git a/modules/angular2/test/core/change_detection/differs/default_keyvalue_differ_spec.ts b/modules/angular2/test/core/change_detection/differs/default_keyvalue_differ_spec.ts index 831a3f3205..e44c399190 100644 --- a/modules/angular2/test/core/change_detection/differs/default_keyvalue_differ_spec.ts +++ b/modules/angular2/test/core/change_detection/differs/default_keyvalue_differ_spec.ts @@ -12,7 +12,7 @@ import { DefaultKeyValueDiffer, DefaultKeyValueDifferFactory } from 'angular2/src/core/change_detection/differs/default_keyvalue_differ'; -import {NumberWrapper, isJsObject} from 'angular2/src/core/facade/lang'; +import {NumberWrapper, isJsObject} from 'angular2/src/facade/lang'; import {kvChangesAsString} from '../../../core/change_detection/util'; // todo(vicb): Update the code & tests for object equality diff --git a/modules/angular2/test/core/change_detection/iterable.ts b/modules/angular2/test/core/change_detection/iterable.ts index 59014795a3..95ab9ca7c1 100644 --- a/modules/angular2/test/core/change_detection/iterable.ts +++ b/modules/angular2/test/core/change_detection/iterable.ts @@ -1,4 +1,4 @@ -import {getSymbolIterator} from 'angular2/src/core/facade/lang'; +import {getSymbolIterator} from 'angular2/src/facade/lang'; export class TestIterable { list: number[]; diff --git a/modules/angular2/test/core/change_detection/parser/lexer_spec.ts b/modules/angular2/test/core/change_detection/parser/lexer_spec.ts index 87865efe86..bd197e3213 100644 --- a/modules/angular2/test/core/change_detection/parser/lexer_spec.ts +++ b/modules/angular2/test/core/change_detection/parser/lexer_spec.ts @@ -2,7 +2,7 @@ import {ddescribe, describe, it, expect} from 'angular2/testing_internal'; import {Lexer, Token} from 'angular2/src/core/change_detection/parser/lexer'; -import {StringWrapper} from "angular2/src/core/facade/lang"; +import {StringWrapper} from "angular2/src/facade/lang"; function lex(text: string): any[] { return new Lexer().tokenize(text); diff --git a/modules/angular2/test/core/change_detection/parser/locals_spec.ts b/modules/angular2/test/core/change_detection/parser/locals_spec.ts index 5b6f3f941f..603b660f92 100644 --- a/modules/angular2/test/core/change_detection/parser/locals_spec.ts +++ b/modules/angular2/test/core/change_detection/parser/locals_spec.ts @@ -2,7 +2,7 @@ import {ddescribe, describe, it, xit, iit, expect, beforeEach} from 'angular2/te import {Locals} from 'angular2/src/core/change_detection/parser/locals'; -import {MapWrapper} from 'angular2/src/core/facade/collection'; +import {MapWrapper} from 'angular2/src/facade/collection'; export function main() { describe('Locals', () => { diff --git a/modules/angular2/test/core/change_detection/parser/parser_spec.ts b/modules/angular2/test/core/change_detection/parser/parser_spec.ts index dd4577aa59..2893d45458 100644 --- a/modules/angular2/test/core/change_detection/parser/parser_spec.ts +++ b/modules/angular2/test/core/change_detection/parser/parser_spec.ts @@ -1,5 +1,5 @@ import {ddescribe, describe, it, xit, iit, expect, beforeEach} from 'angular2/testing_internal'; -import {isBlank, isPresent} from 'angular2/src/core/facade/lang'; +import {isBlank, isPresent} from 'angular2/src/facade/lang'; import {reflector} from 'angular2/src/core/reflection/reflection'; import {Parser} from 'angular2/src/core/change_detection/parser/parser'; import {Unparser} from './unparser'; diff --git a/modules/angular2/test/core/change_detection/parser/unparser.ts b/modules/angular2/test/core/change_detection/parser/unparser.ts index 70983a6282..0260eedbaa 100644 --- a/modules/angular2/test/core/change_detection/parser/unparser.ts +++ b/modules/angular2/test/core/change_detection/parser/unparser.ts @@ -23,7 +23,7 @@ import { } from 'angular2/src/core/change_detection/parser/ast'; -import {StringWrapper, isPresent, isString} from 'angular2/src/core/facade/lang'; +import {StringWrapper, isPresent, isString} from 'angular2/src/facade/lang'; export class Unparser implements AstVisitor { private static _quoteRegExp = /"/g; diff --git a/modules/angular2/test/core/change_detection/proto_record_spec.ts b/modules/angular2/test/core/change_detection/proto_record_spec.ts index 39cbc86bd4..3da57243a9 100644 --- a/modules/angular2/test/core/change_detection/proto_record_spec.ts +++ b/modules/angular2/test/core/change_detection/proto_record_spec.ts @@ -8,7 +8,7 @@ import { beforeEach, afterEach } from 'angular2/testing_internal'; -import {isBlank} from 'angular2/src/core/facade/lang'; +import {isBlank} from 'angular2/src/facade/lang'; import {RecordType, ProtoRecord} from 'angular2/src/core/change_detection/proto_record'; diff --git a/modules/angular2/test/core/change_detection/util.ts b/modules/angular2/test/core/change_detection/util.ts index b252a3124c..0f4ab88b83 100644 --- a/modules/angular2/test/core/change_detection/util.ts +++ b/modules/angular2/test/core/change_detection/util.ts @@ -1,4 +1,4 @@ -import {isBlank, CONST_EXPR} from 'angular2/src/core/facade/lang'; +import {isBlank, CONST_EXPR} from 'angular2/src/facade/lang'; export function iterableChangesAsString({collection = CONST_EXPR([]), previous = CONST_EXPR([]), additions = CONST_EXPR([]), moves = CONST_EXPR([]), diff --git a/modules/angular2/test/core/debug/debug_element_spec.ts b/modules/angular2/test/core/debug/debug_element_spec.ts index e20f928fe3..0550a8b010 100644 --- a/modules/angular2/test/core/debug/debug_element_spec.ts +++ b/modules/angular2/test/core/debug/debug_element_spec.ts @@ -16,7 +16,7 @@ import { import {DOM} from 'angular2/src/core/dom/dom_adapter'; -import {PromiseWrapper, EventEmitter, ObservableWrapper} from 'angular2/src/core/facade/async'; +import {PromiseWrapper, EventEmitter, ObservableWrapper} from 'angular2/src/facade/async'; import {Injectable, NgFor, NgIf} from 'angular2/core'; import {By, Scope} from 'angular2/src/core/debug'; diff --git a/modules/angular2/test/core/debug/debug_element_view_listener_spec.ts b/modules/angular2/test/core/debug/debug_element_view_listener_spec.ts index de4303e533..bc538e3ea1 100644 --- a/modules/angular2/test/core/debug/debug_element_view_listener_spec.ts +++ b/modules/angular2/test/core/debug/debug_element_view_listener_spec.ts @@ -13,11 +13,11 @@ import { xit, TestComponentBuilder, } from 'angular2/testing_internal'; -import {global} from 'angular2/src/core/facade/lang'; +import {global} from 'angular2/src/facade/lang'; import {APP_VIEW_POOL_CAPACITY} from 'angular2/src/core/linker/view_pool'; import {provide, Component, Directive, Injectable, View} from 'angular2/core'; import {inspectNativeElement} from 'angular2/src/core/debug'; -import {IS_DART} from 'angular2/src/core/facade/lang'; +import {IS_DART} from 'angular2/src/facade/lang'; @Component({selector: 'my-comp'}) @View({directives: []}) diff --git a/modules/angular2/test/core/di/forward_ref_spec.ts b/modules/angular2/test/core/di/forward_ref_spec.ts index b0fd64f984..9d584ca267 100644 --- a/modules/angular2/test/core/di/forward_ref_spec.ts +++ b/modules/angular2/test/core/di/forward_ref_spec.ts @@ -10,7 +10,7 @@ import { xit, } from 'angular2/testing_internal'; import {forwardRef, resolveForwardRef} from 'angular2/core'; -import {Type} from 'angular2/src/core/facade/lang'; +import {Type} from 'angular2/src/facade/lang'; export function main() { describe("forwardRef", function() { diff --git a/modules/angular2/test/core/di/injector_spec.ts b/modules/angular2/test/core/di/injector_spec.ts index bf4d4e55cd..eed196dfe9 100644 --- a/modules/angular2/test/core/di/injector_spec.ts +++ b/modules/angular2/test/core/di/injector_spec.ts @@ -1,5 +1,5 @@ -import {isBlank, stringify} from 'angular2/src/core/facade/lang'; -import {BaseException, WrappedException} from 'angular2/src/core/facade/exceptions'; +import {isBlank, stringify} from 'angular2/src/facade/lang'; +import {BaseException, WrappedException} from 'angular2/src/facade/exceptions'; import {describe, ddescribe, it, iit, expect, beforeEach} from 'angular2/testing_internal'; import {SpyDependencyProvider} from '../spies'; import { diff --git a/modules/angular2/test/core/facade/async_dart_spec.dart b/modules/angular2/test/core/facade/async_dart_spec.dart index 224f5013e0..6b6728db98 100644 --- a/modules/angular2/test/core/facade/async_dart_spec.dart +++ b/modules/angular2/test/core/facade/async_dart_spec.dart @@ -2,7 +2,7 @@ library angular2.test.facade.async_dart_spec; import 'package:angular2/testing_internal.dart'; -import 'package:angular2/src/core/facade/async.dart'; +import 'package:angular2/src/facade/async.dart'; class MockException implements Error { var message; diff --git a/modules/angular2/test/core/facade/async_spec.ts b/modules/angular2/test/core/facade/async_spec.ts index 926ec74b96..d8b417c9ff 100644 --- a/modules/angular2/test/core/facade/async_spec.ts +++ b/modules/angular2/test/core/facade/async_spec.ts @@ -18,7 +18,7 @@ import { Subject, EventEmitter, PromiseWrapper -} from 'angular2/src/core/facade/async'; +} from 'angular2/src/facade/async'; export function main() { describe('EventEmitter', () => { diff --git a/modules/angular2/test/core/facade/collection_spec.ts b/modules/angular2/test/core/facade/collection_spec.ts index 4e76002f92..0123e38f79 100644 --- a/modules/angular2/test/core/facade/collection_spec.ts +++ b/modules/angular2/test/core/facade/collection_spec.ts @@ -1,6 +1,6 @@ import {describe, it, expect, beforeEach, ddescribe, iit, xit} from 'angular2/testing_internal'; -import {ListWrapper, StringMapWrapper, MapWrapper} from 'angular2/src/core/facade/collection'; +import {ListWrapper, StringMapWrapper, MapWrapper} from 'angular2/src/facade/collection'; export function main() { describe('ListWrapper', () => { diff --git a/modules/angular2/test/core/facade/exception_handler_spec.ts b/modules/angular2/test/core/facade/exception_handler_spec.ts index 35edb6ece9..753c974333 100644 --- a/modules/angular2/test/core/facade/exception_handler_spec.ts +++ b/modules/angular2/test/core/facade/exception_handler_spec.ts @@ -11,11 +11,7 @@ import { xit, Log } from 'angular2/testing_internal'; -import { - BaseException, - WrappedException, - ExceptionHandler -} from 'angular2/src/core/facade/exceptions'; +import {BaseException, WrappedException, ExceptionHandler} from 'angular2/src/facade/exceptions'; class _CustomException { context = "some context"; diff --git a/modules/angular2/test/core/facade/lang_spec.ts b/modules/angular2/test/core/facade/lang_spec.ts index 4a1a7b8f65..70295fff5c 100644 --- a/modules/angular2/test/core/facade/lang_spec.ts +++ b/modules/angular2/test/core/facade/lang_spec.ts @@ -5,7 +5,7 @@ import { RegExpMatcherWrapper, StringWrapper, CONST_EXPR -} from 'angular2/src/core/facade/lang'; +} from 'angular2/src/facade/lang'; export function main() { describe('RegExp', () => { diff --git a/modules/angular2/test/core/forward_ref_integration_spec.ts b/modules/angular2/test/core/forward_ref_integration_spec.ts index a11f3eee4c..0e898f5fe4 100644 --- a/modules/angular2/test/core/forward_ref_integration_spec.ts +++ b/modules/angular2/test/core/forward_ref_integration_spec.ts @@ -23,7 +23,7 @@ import { QueryList, View } from 'angular2/core'; -import {Type} from 'angular2/src/core/facade/lang'; +import {Type} from 'angular2/src/facade/lang'; import {asNativeElements} from 'angular2/src/core/debug'; export function main() { diff --git a/modules/angular2/test/core/linker/element_injector_spec.ts b/modules/angular2/test/core/linker/element_injector_spec.ts index f729c0ea97..fbd2b4fd8b 100644 --- a/modules/angular2/test/core/linker/element_injector_spec.ts +++ b/modules/angular2/test/core/linker/element_injector_spec.ts @@ -16,13 +16,13 @@ import { containsRegexp } from 'angular2/testing_internal'; import {SpyView, SpyElementRef} from '../spies'; -import {isBlank, isPresent, stringify} from 'angular2/src/core/facade/lang'; +import {isBlank, isPresent, stringify} from 'angular2/src/facade/lang'; import { ListWrapper, MapWrapper, StringMapWrapper, iterateListLike -} from 'angular2/src/core/facade/collection'; +} from 'angular2/src/facade/collection'; import { ProtoElementInjector, ElementInjector, diff --git a/modules/angular2/test/core/linker/integration_spec.ts b/modules/angular2/test/core/linker/integration_spec.ts index 5d245597bc..f12b41d07f 100644 --- a/modules/angular2/test/core/linker/integration_spec.ts +++ b/modules/angular2/test/core/linker/integration_spec.ts @@ -33,15 +33,15 @@ import { isBlank, CONST, CONST_EXPR -} from 'angular2/src/core/facade/lang'; -import {BaseException, WrappedException} from 'angular2/src/core/facade/exceptions'; +} from 'angular2/src/facade/lang'; +import {BaseException, WrappedException} from 'angular2/src/facade/exceptions'; import { PromiseWrapper, EventEmitter, ObservableWrapper, PromiseCompleter, Promise -} from 'angular2/src/core/facade/async'; +} from 'angular2/src/facade/async'; import { Injector, @@ -92,7 +92,7 @@ import {ElementRef} from 'angular2/src/core/linker/element_ref'; import {TemplateRef} from 'angular2/src/core/linker/template_ref'; import {DomRenderer} from 'angular2/src/core/render/dom/dom_renderer'; -import {IS_DART} from 'angular2/src/core/facade/lang'; +import {IS_DART} from 'angular2/src/facade/lang'; const ANCHOR_ELEMENT = CONST_EXPR(new OpaqueToken('AnchorElement')); diff --git a/modules/angular2/test/core/linker/query_integration_spec.ts b/modules/angular2/test/core/linker/query_integration_spec.ts index 1cc4e27451..bab6fd1763 100644 --- a/modules/angular2/test/core/linker/query_integration_spec.ts +++ b/modules/angular2/test/core/linker/query_integration_spec.ts @@ -12,8 +12,8 @@ import { TestComponentBuilder, } from 'angular2/testing_internal'; -import {isPresent} from 'angular2/src/core/facade/lang'; -import {ObservableWrapper} from 'angular2/src/core/facade/async'; +import {isPresent} from 'angular2/src/facade/lang'; +import {ObservableWrapper} from 'angular2/src/facade/async'; import { Component, diff --git a/modules/angular2/test/core/linker/query_list_spec.ts b/modules/angular2/test/core/linker/query_list_spec.ts index f1de91ae27..4a5f5a34f3 100644 --- a/modules/angular2/test/core/linker/query_list_spec.ts +++ b/modules/angular2/test/core/linker/query_list_spec.ts @@ -10,12 +10,17 @@ import { fakeAsync, tick } from 'angular2/testing_internal'; -import {MapWrapper, ListWrapper, iterateListLike} from 'angular2/src/core/facade/collection'; -import {IS_DART, StringWrapper} from 'angular2/src/core/facade/lang'; -import {ObservableWrapper} from 'angular2/src/core/facade/async'; +import {MapWrapper, ListWrapper, iterateListLike} from 'angular2/src/facade/collection'; +import {IS_DART, StringWrapper} from 'angular2/src/facade/lang'; +import {ObservableWrapper} from 'angular2/src/facade/async'; import {QueryList} from 'angular2/src/core/linker/query_list'; import {DOM} from 'angular2/src/core/dom/dom_adapter'; +interface _JsQueryList { + filter(c: any): any; + reduce(a: any, b: any): any; + toArray(): any; +} export function main() { describe('QueryList', () => { @@ -48,22 +53,22 @@ export function main() { if (!IS_DART) { it('should support filter', () => { queryList.reset(['one', 'two']); - expect((queryList).filter((x) => x == "one")).toEqual(['one']); + expect((<_JsQueryList>queryList).filter((x) => x == "one")).toEqual(['one']); }); it('should support reduce', () => { queryList.reset(["one", "two"]); - expect((queryList).reduce((a, x) => a + x, "start:")).toEqual("start:onetwo"); + expect((<_JsQueryList>queryList).reduce((a, x) => a + x, "start:")).toEqual("start:onetwo"); }); it('should support toArray', () => { queryList.reset(["one", "two"]); - expect((queryList).reduce((a, x) => a + x, "start:")).toEqual("start:onetwo"); + expect((<_JsQueryList>queryList).reduce((a, x) => a + x, "start:")).toEqual("start:onetwo"); }); it('should support toArray', () => { queryList.reset(["one", "two"]); - expect((queryList).toArray()).toEqual(["one", "two"]); + expect((<_JsQueryList>queryList).toArray()).toEqual(["one", "two"]); }); } diff --git a/modules/angular2/test/core/linker/view_manager_utils_spec.ts b/modules/angular2/test/core/linker/view_manager_utils_spec.ts index 83b0225299..447c491999 100644 --- a/modules/angular2/test/core/linker/view_manager_utils_spec.ts +++ b/modules/angular2/test/core/linker/view_manager_utils_spec.ts @@ -24,7 +24,7 @@ import { } from '../spies'; import {Injector, provide} from 'angular2/core'; -import {isBlank, isPresent} from 'angular2/src/core/facade/lang'; +import {isBlank, isPresent} from 'angular2/src/facade/lang'; import { AppProtoView, diff --git a/modules/angular2/test/core/linker/view_pool_spec.ts b/modules/angular2/test/core/linker/view_pool_spec.ts index 917233ac06..5917a4e167 100644 --- a/modules/angular2/test/core/linker/view_pool_spec.ts +++ b/modules/angular2/test/core/linker/view_pool_spec.ts @@ -17,7 +17,7 @@ import { } from 'angular2/testing_internal'; import {AppViewPool} from 'angular2/src/core/linker/view_pool'; import {AppProtoView, AppView} from 'angular2/src/core/linker/view'; -import {MapWrapper, Map} from 'angular2/src/core/facade/collection'; +import {MapWrapper, Map} from 'angular2/src/facade/collection'; export function main() { describe('AppViewPool', () => { diff --git a/modules/angular2/test/core/reflection/reflector_spec.ts b/modules/angular2/test/core/reflection/reflector_spec.ts index 89125c10c4..de865d6ba9 100644 --- a/modules/angular2/test/core/reflection/reflector_spec.ts +++ b/modules/angular2/test/core/reflection/reflector_spec.ts @@ -18,7 +18,7 @@ import { propDecorator, HasGetterAndSetterDecorators } from './reflector_common'; -import {IS_DART} from 'angular2/src/core/facade/lang'; +import {IS_DART} from 'angular2/src/facade/lang'; class AType { value; diff --git a/modules/angular2/test/core/render/dom/dom_renderer_integration_spec.ts b/modules/angular2/test/core/render/dom/dom_renderer_integration_spec.ts index 534d33e386..2262f55ec0 100644 --- a/modules/angular2/test/core/render/dom/dom_renderer_integration_spec.ts +++ b/modules/angular2/test/core/render/dom/dom_renderer_integration_spec.ts @@ -13,7 +13,7 @@ import { SpyObject, } from 'angular2/testing_internal'; -// import {MapWrapper} from 'angular2/src/core/facade/collection'; +// import {MapWrapper} from 'angular2/src/facade/collection'; // import {DOM} from 'angular2/src/core/dom/dom_adapter'; // import {DomTestbed, TestRootView, elRef} from './dom_testbed'; diff --git a/modules/angular2/test/core/render/dom/events/event_manager_spec.ts b/modules/angular2/test/core/render/dom/events/event_manager_spec.ts index 98e3c279b6..9835780170 100644 --- a/modules/angular2/test/core/render/dom/events/event_manager_spec.ts +++ b/modules/angular2/test/core/render/dom/events/event_manager_spec.ts @@ -15,7 +15,7 @@ import { DomEventsPlugin } from 'angular2/src/core/render/dom/events/event_manager'; import {NgZone} from 'angular2/src/core/zone/ng_zone'; -import {ListWrapper, Map, MapWrapper} from 'angular2/src/core/facade/collection'; +import {ListWrapper, Map, MapWrapper} from 'angular2/src/facade/collection'; import {DOM} from 'angular2/src/core/dom/dom_adapter'; export function main() { diff --git a/modules/angular2/test/core/render/view_factory_spec.ts b/modules/angular2/test/core/render/view_factory_spec.ts index 9c6e00a629..b7c79df134 100644 --- a/modules/angular2/test/core/render/view_factory_spec.ts +++ b/modules/angular2/test/core/render/view_factory_spec.ts @@ -11,8 +11,8 @@ import { stringifyElement } from 'angular2/testing_internal'; -import {isPresent} from 'angular2/src/core/facade/lang'; -import {MapWrapper, ListWrapper} from 'angular2/src/core/facade/collection'; +import {isPresent} from 'angular2/src/facade/lang'; +import {MapWrapper, ListWrapper} from 'angular2/src/facade/collection'; import * as appCmds from 'angular2/src/core/linker/template_commands'; import {createRenderView, NodeFactory} from 'angular2/src/core/render/view_factory'; import {RenderTemplateCmd, RenderBeginElementCmd} from 'angular2/src/core/render/api'; diff --git a/modules/angular2/test/core/testability/testability_spec.ts b/modules/angular2/test/core/testability/testability_spec.ts index 6f16ad464e..19cfdf29b7 100644 --- a/modules/angular2/test/core/testability/testability_spec.ts +++ b/modules/angular2/test/core/testability/testability_spec.ts @@ -13,8 +13,8 @@ import { } from 'angular2/testing_internal'; import {Testability} from 'angular2/src/core/testability/testability'; import {NgZone} from 'angular2/src/core/zone/ng_zone'; -import {normalizeBlank} from 'angular2/src/core/facade/lang'; -import {PromiseWrapper, EventEmitter, ObservableWrapper} from 'angular2/src/core/facade/async'; +import {normalizeBlank} from 'angular2/src/facade/lang'; +import {PromiseWrapper, EventEmitter, ObservableWrapper} from 'angular2/src/facade/async'; // Schedules a microtasks (using a resolved promise .then()) function microTask(fn: Function): void { diff --git a/modules/angular2/test/core/util/decorators_spec.ts b/modules/angular2/test/core/util/decorators_spec.ts index a12001dfae..ea44bdf5bd 100644 --- a/modules/angular2/test/core/util/decorators_spec.ts +++ b/modules/angular2/test/core/util/decorators_spec.ts @@ -11,7 +11,7 @@ import { } from 'angular2/testing_internal'; import {makeDecorator, makeParamDecorator, Class} from 'angular2/src/core/util/decorators'; -import {global} from 'angular2/src/core/facade/lang'; +import {global} from 'angular2/src/facade/lang'; import {Inject} from 'angular2/angular2'; import {reflector} from 'angular2/src/core/reflection/reflection'; diff --git a/modules/angular2/test/core/zone/ng_zone_DEPRECATED_spec.ts b/modules/angular2/test/core/zone/ng_zone_DEPRECATED_spec.ts index e1fe860305..f88cd447b4 100644 --- a/modules/angular2/test/core/zone/ng_zone_DEPRECATED_spec.ts +++ b/modules/angular2/test/core/zone/ng_zone_DEPRECATED_spec.ts @@ -16,8 +16,8 @@ import { browserDetection } from 'angular2/test_lib'; -import {PromiseCompleter, PromiseWrapper, TimerWrapper} from 'angular2/src/core/facade/async'; -import {BaseException} from 'angular2/src/core/facade/exceptions'; +import {PromiseCompleter, PromiseWrapper, TimerWrapper} from 'angular2/src/facade/async'; +import {BaseException} from 'angular2/src/facade/exceptions'; import {NgZone} from 'angular2/src/core/zone/ng_zone'; diff --git a/modules/angular2/test/core/zone/ng_zone_spec.ts b/modules/angular2/test/core/zone/ng_zone_spec.ts index ab93bdc255..671cc1684b 100644 --- a/modules/angular2/test/core/zone/ng_zone_spec.ts +++ b/modules/angular2/test/core/zone/ng_zone_spec.ts @@ -20,8 +20,8 @@ import { TimerWrapper, ObservableWrapper, EventEmitter -} from 'angular2/src/core/facade/async'; -import {BaseException} from 'angular2/src/core/facade/exceptions'; +} from 'angular2/src/facade/async'; +import {BaseException} from 'angular2/src/facade/exceptions'; import {NgZone, NgZoneError} from 'angular2/src/core/zone/ng_zone'; diff --git a/modules/angular2/test/dev_mode_spec.ts b/modules/angular2/test/dev_mode_spec.ts index e241e76bd8..e8828d2862 100644 --- a/modules/angular2/test/dev_mode_spec.ts +++ b/modules/angular2/test/dev_mode_spec.ts @@ -11,7 +11,7 @@ import { xit } from 'angular2/testing_internal'; -import {assertionsEnabled} from 'angular2/src/core/facade/lang'; +import {assertionsEnabled} from 'angular2/src/facade/lang'; export function main() { describe('dev mode', () => { diff --git a/modules/angular2/test/http/backends/jsonp_backend_spec.ts b/modules/angular2/test/http/backends/jsonp_backend_spec.ts index 9476d8c403..a6820474a4 100644 --- a/modules/angular2/test/http/backends/jsonp_backend_spec.ts +++ b/modules/angular2/test/http/backends/jsonp_backend_spec.ts @@ -11,7 +11,7 @@ import { xit, SpyObject } from 'angular2/testing_internal'; -import {ObservableWrapper} from 'angular2/src/core/facade/async'; +import {ObservableWrapper} from 'angular2/src/facade/async'; import {BrowserJsonp} from 'angular2/src/http/backends/browser_jsonp'; import { JSONPConnection, @@ -20,11 +20,11 @@ import { JSONPBackend_ } from 'angular2/src/http/backends/jsonp_backend'; import {provide, Injector} from 'angular2/core'; -import {isPresent, StringWrapper} from 'angular2/src/core/facade/lang'; -import {TimerWrapper} from 'angular2/src/core/facade/async'; +import {isPresent, StringWrapper} from 'angular2/src/facade/lang'; +import {TimerWrapper} from 'angular2/src/facade/async'; import {Request} from 'angular2/src/http/static_request'; import {Response} from 'angular2/src/http/static_response'; -import {Map} from 'angular2/src/core/facade/collection'; +import {Map} from 'angular2/src/facade/collection'; import {RequestOptions, BaseRequestOptions} from 'angular2/src/http/base_request_options'; import {BaseResponseOptions, ResponseOptions} from 'angular2/src/http/base_response_options'; import {ResponseTypes, ReadyStates, RequestMethods} from 'angular2/src/http/enums'; diff --git a/modules/angular2/test/http/backends/mock_backend_spec.ts b/modules/angular2/test/http/backends/mock_backend_spec.ts index a602663adb..5a72e7e897 100644 --- a/modules/angular2/test/http/backends/mock_backend_spec.ts +++ b/modules/angular2/test/http/backends/mock_backend_spec.ts @@ -11,14 +11,14 @@ import { xit, SpyObject } from 'angular2/testing_internal'; -import {ObservableWrapper} from 'angular2/src/core/facade/async'; +import {ObservableWrapper} from 'angular2/src/facade/async'; import {BrowserXhr} from 'angular2/src/http/backends/browser_xhr'; import {MockConnection, MockBackend} from 'angular2/src/http/backends/mock_backend'; import {provide, Injector} from 'angular2/core'; import {Request} from 'angular2/src/http/static_request'; import {Response} from 'angular2/src/http/static_response'; import {Headers} from 'angular2/src/http/headers'; -import {Map} from 'angular2/src/core/facade/collection'; +import {Map} from 'angular2/src/facade/collection'; import {RequestOptions, BaseRequestOptions} from 'angular2/src/http/base_request_options'; import {BaseResponseOptions, ResponseOptions} from 'angular2/src/http/base_response_options'; import {ResponseTypes} from 'angular2/src/http/enums'; diff --git a/modules/angular2/test/http/backends/xhr_backend_spec.ts b/modules/angular2/test/http/backends/xhr_backend_spec.ts index 4ff6a44408..f1db60ad84 100644 --- a/modules/angular2/test/http/backends/xhr_backend_spec.ts +++ b/modules/angular2/test/http/backends/xhr_backend_spec.ts @@ -11,14 +11,14 @@ import { xit, SpyObject } from 'angular2/testing_internal'; -import {ObservableWrapper} from 'angular2/src/core/facade/async'; +import {ObservableWrapper} from 'angular2/src/facade/async'; import {BrowserXhr} from 'angular2/src/http/backends/browser_xhr'; import {XHRConnection, XHRBackend} from 'angular2/src/http/backends/xhr_backend'; import {provide, Injector} from 'angular2/core'; import {Request} from 'angular2/src/http/static_request'; import {Response} from 'angular2/src/http/static_response'; import {Headers} from 'angular2/src/http/headers'; -import {Map} from 'angular2/src/core/facade/collection'; +import {Map} from 'angular2/src/facade/collection'; import {RequestOptions, BaseRequestOptions} from 'angular2/src/http/base_request_options'; import {BaseResponseOptions, ResponseOptions} from 'angular2/src/http/base_response_options'; import {ResponseTypes} from 'angular2/src/http/enums'; diff --git a/modules/angular2/test/http/headers_spec.ts b/modules/angular2/test/http/headers_spec.ts index d558cf3f08..156ab65b30 100644 --- a/modules/angular2/test/http/headers_spec.ts +++ b/modules/angular2/test/http/headers_spec.ts @@ -1,5 +1,5 @@ import {Headers} from 'angular2/src/http/headers'; -import {Map, StringMapWrapper} from 'angular2/src/core/facade/collection'; +import {Map, StringMapWrapper} from 'angular2/src/facade/collection'; import { AsyncTestCompleter, beforeEach, diff --git a/modules/angular2/test/mock/view_resolver_mock_spec.ts b/modules/angular2/test/mock/view_resolver_mock_spec.ts index c371bc2d0b..9325ee6008 100644 --- a/modules/angular2/test/mock/view_resolver_mock_spec.ts +++ b/modules/angular2/test/mock/view_resolver_mock_spec.ts @@ -8,13 +8,13 @@ import { it, } from 'angular2/testing_internal'; -import {stringify} from 'angular2/src/core/facade/lang'; +import {stringify} from 'angular2/src/facade/lang'; import {MockViewResolver} from 'angular2/src/mock/view_resolver_mock'; import {Component, View, ViewMetadata} from 'angular2/src/core/metadata'; -import {isBlank} from 'angular2/src/core/facade/lang'; +import {isBlank} from 'angular2/src/facade/lang'; export function main() { describe('MockViewResolver', () => { diff --git a/modules/angular2/test/public_api_spec.ts b/modules/angular2/test/public_api_spec.ts index 472220d19a..3986a4ff3c 100644 --- a/modules/angular2/test/public_api_spec.ts +++ b/modules/angular2/test/public_api_spec.ts @@ -540,6 +540,10 @@ var NG_ALL = [ 'EventEmitter.transform():dart', 'EventEmitter.where():dart', + 'ExceptionHandler', + 'ExceptionHandler#exceptionToString()', + 'ExceptionHandler.call()', + /* RxJS API - may need to maintain as RxJS evolves */ @@ -629,113 +633,6 @@ var NG_ALL = [ 'Observable.multicast():js', 'Observable.observeOn():js', - 'Subject', - 'Subject#combineLatest():js', - 'Subject#concat():js', - 'Subject#create():js', - 'Subject#defer():js', - 'Subject#empty():js', - 'Subject#forkJoin():js', - 'Subject#from():js', - 'Subject#fromArray():js', - 'Subject#fromEvent():js', - 'Subject#fromEventPattern():js', - 'Subject#fromPromise():js', - 'Subject#interval():js', - 'Subject#merge():js', - 'Subject#never():js', - 'Subject#of():js', - 'Subject#range():js', - 'Subject#throw():js', - 'Subject#timer():js', - 'Subject#zip():js', - 'Subject.add():js', - 'Subject.buffer():js', - 'Subject.bufferCount():js', - 'Subject.bufferTime():js', - 'Subject.bufferToggle():js', - 'Subject.bufferWhen():js', - 'Subject.catch():js', - 'Subject.combineAll():js', - 'Subject.combineLatest():js', - 'Subject.complete():js', - 'Subject.concat():js', - 'Subject.concatAll():js', - 'Subject.concatMap():js', - 'Subject.concatMapTo():js', - 'Subject.count():js', - 'Subject.debounce():js', - 'Subject.debounceTime():js', - 'Subject.defaultIfEmpty():js', - 'Subject.delay():js', - 'Subject.dematerialize():js', - 'Subject.distinctUntilChanged():js', - 'Subject.do():js', - 'Subject.error():js', - 'Subject.every():js', - 'Subject.expand():js', - 'Subject.filter():js', - 'Subject.finally():js', - 'Subject.first():js', - 'Subject.flatMap():js', - 'Subject.flatMapTo():js', - 'Subject.forEach():js', - 'Subject.groupBy():js', - 'Subject.ignoreElements():js', - 'Subject.last():js', - 'Subject.lift():js', - 'Subject.map():js', - 'Subject.mapTo():js', - 'Subject.materialize():js', - 'Subject.merge():js', - 'Subject.mergeAll():js', - 'Subject.mergeMap():js', - 'Subject.mergeMapTo():js', - 'Subject.multicast():js', - 'Subject.next():js', - 'Subject.observeOn():js', - 'Subject.partition():js', - 'Subject.publish():js', - 'Subject.publishBehavior():js', - 'Subject.publishReplay():js', - 'Subject.reduce():js', - 'Subject.remove():js', - 'Subject.repeat():js', - 'Subject.retry():js', - 'Subject.retryWhen():js', - 'Subject.sample():js', - 'Subject.sampleTime():js', - 'Subject.scan():js', - 'Subject.share():js', - 'Subject.shareBehavior():js', - 'Subject.shareReplay():js', - 'Subject.single():js', - 'Subject.skip():js', - 'Subject.skipUntil():js', - 'Subject.startWith():js', - 'Subject.subscribe():js', - 'Subject.subscribeOn():js', - 'Subject.switch():js', - 'Subject.switchMap():js', - 'Subject.switchMapTo():js', - 'Subject.take():js', - 'Subject.takeUntil():js', - 'Subject.throttle():js', - 'Subject.timeout():js', - 'Subject.timeoutWith():js', - 'Subject.toArray():js', - 'Subject.toPromise():js', - 'Subject.unsubscribe():js', - 'Subject.window():js', - 'Subject.windowCount():js', - 'Subject.windowTime():js', - 'Subject.windowToggle():js', - 'Subject.windowWhen():js', - 'Subject.withLatestFrom():js', - 'Subject.zip():js', - 'Subject.zipAll():js', - - 'OutputMetadata', 'OutputMetadata.bindingPropertyName', 'enableDevMode():js', @@ -1083,7 +980,6 @@ var NG_ALL = [ 'PlatformRef.registerDisposeListener()', */ 'PlatformRef.injector', - 'Predicate:dart', 'Input', 'Input.bindingPropertyName', 'InputMetadata', diff --git a/modules/angular2/test/router/integration/lifecycle_hook_spec.ts b/modules/angular2/test/router/integration/lifecycle_hook_spec.ts index 747cc7a2a8..20647ef107 100644 --- a/modules/angular2/test/router/integration/lifecycle_hook_spec.ts +++ b/modules/angular2/test/router/integration/lifecycle_hook_spec.ts @@ -16,14 +16,14 @@ import { } from 'angular2/testing_internal'; import {provide, Component, Injector, Inject, View} from 'angular2/core'; -import {isPresent} from 'angular2/src/core/facade/lang'; +import {isPresent} from 'angular2/src/facade/lang'; import { Promise, PromiseWrapper, PromiseCompleter, EventEmitter, ObservableWrapper -} from 'angular2/src/core/facade/async'; +} from 'angular2/src/facade/async'; import {RootRouter} from 'angular2/src/router/router'; import {Router, RouterOutlet, RouterLink, RouteParams} from 'angular2/router'; diff --git a/modules/angular2/test/router/integration/navigation_spec.ts b/modules/angular2/test/router/integration/navigation_spec.ts index fee5445665..cb420974e6 100644 --- a/modules/angular2/test/router/integration/navigation_spec.ts +++ b/modules/angular2/test/router/integration/navigation_spec.ts @@ -16,7 +16,7 @@ import { } from 'angular2/testing_internal'; import {provide, Component, View, Injector, Inject} from 'angular2/core'; -import {Promise, PromiseWrapper} from 'angular2/src/core/facade/async'; +import {Promise, PromiseWrapper} from 'angular2/src/facade/async'; import {RootRouter} from 'angular2/src/router/router'; import {Router, RouterOutlet, RouterLink, RouteParams, RouteData} from 'angular2/router'; diff --git a/modules/angular2/test/router/integration/router_integration_spec.ts b/modules/angular2/test/router/integration/router_integration_spec.ts index 47ea76408d..4e85d2c06d 100644 --- a/modules/angular2/test/router/integration/router_integration_spec.ts +++ b/modules/angular2/test/router/integration/router_integration_spec.ts @@ -20,8 +20,8 @@ import {DOM} from 'angular2/src/core/dom/dom_adapter'; import {provide} from 'angular2/core'; import {DOCUMENT} from 'angular2/src/core/render/render'; import {RouteConfig, Route, Redirect} from 'angular2/src/router/route_config_decorator'; -import {PromiseWrapper} from 'angular2/src/core/facade/async'; -import {BaseException, WrappedException} from 'angular2/src/core/facade/exceptions'; +import {PromiseWrapper} from 'angular2/src/facade/async'; +import {BaseException, WrappedException} from 'angular2/src/facade/exceptions'; import { ROUTER_PROVIDERS, ROUTER_PRIMARY_COMPONENT, diff --git a/modules/angular2/test/router/integration/router_link_spec.ts b/modules/angular2/test/router/integration/router_link_spec.ts index d7dcf27c63..30a4a3887a 100644 --- a/modules/angular2/test/router/integration/router_link_spec.ts +++ b/modules/angular2/test/router/integration/router_link_spec.ts @@ -17,9 +17,9 @@ import { SpyObject } from 'angular2/testing_internal'; -import {NumberWrapper} from 'angular2/src/core/facade/lang'; -import {PromiseWrapper} from 'angular2/src/core/facade/async'; -import {ListWrapper} from 'angular2/src/core/facade/collection'; +import {NumberWrapper} from 'angular2/src/facade/lang'; +import {PromiseWrapper} from 'angular2/src/facade/async'; +import {ListWrapper} from 'angular2/src/facade/collection'; import {provide, Component, DirectiveResolver, View} from 'angular2/core'; diff --git a/modules/angular2/test/router/location_spec.ts b/modules/angular2/test/router/location_spec.ts index 6de9d06cd5..bb9c3d4499 100644 --- a/modules/angular2/test/router/location_spec.ts +++ b/modules/angular2/test/router/location_spec.ts @@ -13,7 +13,7 @@ import { } from 'angular2/testing_internal'; import {Injector, provide} from 'angular2/core'; -import {CONST_EXPR} from 'angular2/src/core/facade/lang'; +import {CONST_EXPR} from 'angular2/src/facade/lang'; import {Location, APP_BASE_HREF} from 'angular2/src/router/location'; import {LocationStrategy} from 'angular2/src/router/location_strategy'; import {MockLocationStrategy} from 'angular2/src/mock/mock_location_strategy'; diff --git a/modules/angular2/test/router/route_config_spec.ts b/modules/angular2/test/router/route_config_spec.ts index 41bc778b1c..4876f62a73 100644 --- a/modules/angular2/test/router/route_config_spec.ts +++ b/modules/angular2/test/router/route_config_spec.ts @@ -16,7 +16,7 @@ import {Component, Directive, View} from 'angular2/src/core/metadata'; import {DOM} from 'angular2/src/core/dom/dom_adapter'; import {provide} from 'angular2/core'; import {DOCUMENT} from 'angular2/src/core/render/render'; -import {Type} from 'angular2/src/core/facade/lang'; +import {Type} from 'angular2/src/facade/lang'; import { ROUTER_PROVIDERS, @@ -26,7 +26,7 @@ import { ROUTER_DIRECTIVES } from 'angular2/router'; -import {ExceptionHandler} from 'angular2/src/core/facade/exceptions'; +import {ExceptionHandler} from 'angular2/src/facade/exceptions'; import {LocationStrategy} from 'angular2/src/router/location_strategy'; import {MockLocationStrategy} from 'angular2/src/mock/mock_location_strategy'; diff --git a/modules/angular2/test/router/route_recognizer_spec.ts b/modules/angular2/test/router/route_recognizer_spec.ts index 6f4369d9dd..99426fd461 100644 --- a/modules/angular2/test/router/route_recognizer_spec.ts +++ b/modules/angular2/test/router/route_recognizer_spec.ts @@ -10,7 +10,7 @@ import { SpyObject } from 'angular2/testing_internal'; -import {Map, StringMapWrapper} from 'angular2/src/core/facade/collection'; +import {Map, StringMapWrapper} from 'angular2/src/facade/collection'; import {RouteRecognizer} from 'angular2/src/router/route_recognizer'; import {ComponentInstruction} from 'angular2/src/router/instruction'; diff --git a/modules/angular2/test/router/route_registry_spec.ts b/modules/angular2/test/router/route_registry_spec.ts index 3a764c51fa..5487dd61ed 100644 --- a/modules/angular2/test/router/route_registry_spec.ts +++ b/modules/angular2/test/router/route_registry_spec.ts @@ -10,8 +10,8 @@ import { SpyObject } from 'angular2/testing_internal'; -import {Promise, PromiseWrapper} from 'angular2/src/core/facade/async'; -import {Type} from 'angular2/src/core/facade/lang'; +import {Promise, PromiseWrapper} from 'angular2/src/facade/async'; +import {Type} from 'angular2/src/facade/lang'; import {RouteRegistry} from 'angular2/src/router/route_registry'; import { @@ -22,7 +22,7 @@ import { AsyncRoute } from 'angular2/src/router/route_config_decorator'; import {stringifyInstruction} from 'angular2/src/router/instruction'; -import {IS_DART} from 'angular2/src/core/facade/lang'; +import {IS_DART} from 'angular2/src/facade/lang'; export function main() { describe('RouteRegistry', () => { diff --git a/modules/angular2/test/router/router_spec.ts b/modules/angular2/test/router/router_spec.ts index bae43bcf97..1fb2a3fb11 100644 --- a/modules/angular2/test/router/router_spec.ts +++ b/modules/angular2/test/router/router_spec.ts @@ -11,9 +11,9 @@ import { beforeEachBindings } from 'angular2/testing_internal'; import {SpyRouterOutlet} from './spies'; -import {Type} from 'angular2/src/core/facade/lang'; -import {Promise, PromiseWrapper, ObservableWrapper} from 'angular2/src/core/facade/async'; -import {ListWrapper} from 'angular2/src/core/facade/collection'; +import {Type} from 'angular2/src/facade/lang'; +import {Promise, PromiseWrapper, ObservableWrapper} from 'angular2/src/facade/async'; +import {ListWrapper} from 'angular2/src/facade/collection'; import {Router, RootRouter} from 'angular2/src/router/router'; import {SpyLocation} from 'angular2/src/mock/location_mock'; diff --git a/modules/angular2/test/symbol_inspector/symbol_differ.ts b/modules/angular2/test/symbol_inspector/symbol_differ.ts index 9f021704df..91c5ef672c 100644 --- a/modules/angular2/test/symbol_inspector/symbol_differ.ts +++ b/modules/angular2/test/symbol_inspector/symbol_differ.ts @@ -1,4 +1,4 @@ -import {StringWrapper, RegExpWrapper, isJsObject} from 'angular2/src/core/facade/lang'; +import {StringWrapper, RegExpWrapper, isJsObject} from 'angular2/src/facade/lang'; var IS_FIELD = RegExpWrapper.create('^\\w+[\\.|\\#]\\w+=?$'); var IS_INTERFACE = RegExpWrapper.create('^\\{.+\\}'); diff --git a/modules/angular2/test/testing/fake_async_spec.ts b/modules/angular2/test/testing/fake_async_spec.ts index cd71681e34..ccf5a69770 100644 --- a/modules/angular2/test/testing/fake_async_spec.ts +++ b/modules/angular2/test/testing/fake_async_spec.ts @@ -13,8 +13,8 @@ import { tick, xit } from 'angular2/testing_internal'; -import {TimerWrapper, PromiseWrapper} from 'angular2/src/core/facade/async'; -import {BaseException} from 'angular2/src/core/facade/exceptions'; +import {TimerWrapper, PromiseWrapper} from 'angular2/src/facade/async'; +import {BaseException} from 'angular2/src/facade/exceptions'; import {Parser} from 'angular2/src/core/change_detection/change_detection'; export function main() { diff --git a/modules/angular2/test/testing/testing_internal_spec.ts b/modules/angular2/test/testing/testing_internal_spec.ts index ebb8c6c886..31adb29c31 100644 --- a/modules/angular2/test/testing/testing_internal_spec.ts +++ b/modules/angular2/test/testing/testing_internal_spec.ts @@ -12,8 +12,8 @@ import { } from 'angular2/testing_internal'; import {DOM} from 'angular2/src/core/dom/dom_adapter'; -import {MapWrapper} from 'angular2/src/core/facade/collection'; -import {RegExpWrapper} from 'angular2/src/core/facade/lang'; +import {MapWrapper} from 'angular2/src/facade/collection'; +import {RegExpWrapper} from 'angular2/src/facade/lang'; class TestObj { prop; diff --git a/modules/angular2/test/testing/utils_spec.ts b/modules/angular2/test/testing/utils_spec.ts index 013efdb442..0a202567aa 100644 --- a/modules/angular2/test/testing/utils_spec.ts +++ b/modules/angular2/test/testing/utils_spec.ts @@ -1,5 +1,5 @@ import {describe, it, iit, ddescribe, expect, BrowserDetection} from 'angular2/testing_internal'; -import {StringMapWrapper} from 'angular2/src/core/facade/collection'; +import {StringMapWrapper} from 'angular2/src/facade/collection'; export function main() { describe('BrowserDetection', () => { diff --git a/modules/angular2/test/tools/spies.ts b/modules/angular2/test/tools/spies.ts index 31c662b9ea..a1769fc9a9 100644 --- a/modules/angular2/test/tools/spies.ts +++ b/modules/angular2/test/tools/spies.ts @@ -1,7 +1,7 @@ import {SpyObject} from 'angular2/testing_internal'; import {Injector, provide} from 'angular2/angular2'; import {ComponentRef} from 'angular2/src/core/linker/dynamic_component_loader'; -import {global} from 'angular2/src/core/facade/lang'; +import {global} from 'angular2/src/facade/lang'; import {ApplicationRef, ApplicationRef_} from 'angular2/src/core/application_ref'; export class SpyApplicationRef extends SpyObject { diff --git a/modules/angular2/test/web_workers/shared/message_bus_spec.ts b/modules/angular2/test/web_workers/shared/message_bus_spec.ts index 37f4f0a209..e04024b979 100644 --- a/modules/angular2/test/web_workers/shared/message_bus_spec.ts +++ b/modules/angular2/test/web_workers/shared/message_bus_spec.ts @@ -10,7 +10,7 @@ import { SpyObject, proxy } from 'angular2/testing_internal'; -import {ObservableWrapper, TimerWrapper} from 'angular2/src/core/facade/async'; +import {ObservableWrapper, TimerWrapper} from 'angular2/src/facade/async'; import {MessageBus} from 'angular2/src/web_workers/shared/message_bus'; import {createConnectedMessageBus} from './message_bus_util'; import {MockNgZone} from 'angular2/src/mock/ng_zone_mock'; diff --git a/modules/angular2/test/web_workers/shared/mock_event_emitter.dart b/modules/angular2/test/web_workers/shared/mock_event_emitter.dart index 2a55d5e8d9..7d4f678e41 100644 --- a/modules/angular2/test/web_workers/shared/mock_event_emitter.dart +++ b/modules/angular2/test/web_workers/shared/mock_event_emitter.dart @@ -2,7 +2,7 @@ library angular2.test.web_workers.worker.mock_event_emitter; import 'dart:core'; import 'dart:async'; -import "package:angular2/src/core/facade/async.dart"; +import "package:angular2/src/facade/async.dart"; class MockEventEmitter extends EventEmitter { final controller = new StreamController.broadcast(sync: true); diff --git a/modules/angular2/test/web_workers/shared/mock_event_emitter.ts b/modules/angular2/test/web_workers/shared/mock_event_emitter.ts index 7cbd243556..302f67eb82 100644 --- a/modules/angular2/test/web_workers/shared/mock_event_emitter.ts +++ b/modules/angular2/test/web_workers/shared/mock_event_emitter.ts @@ -1,4 +1,4 @@ -import {EventEmitter} from 'angular2/src/core/facade/async'; +import {EventEmitter} from 'angular2/src/facade/async'; export class MockEventEmitter extends EventEmitter { private _nextFns: Function[] = []; diff --git a/modules/angular2/test/web_workers/shared/render_view_with_fragments_store_spec.ts b/modules/angular2/test/web_workers/shared/render_view_with_fragments_store_spec.ts index 4811d76065..3f42c33187 100644 --- a/modules/angular2/test/web_workers/shared/render_view_with_fragments_store_spec.ts +++ b/modules/angular2/test/web_workers/shared/render_view_with_fragments_store_spec.ts @@ -16,7 +16,7 @@ import { WebWorkerRenderViewRef, WebWorkerRenderFragmentRef } from "angular2/src/web_workers/shared/render_view_with_fragments_store"; -import {ListWrapper} from "angular2/src/core/facade/collection"; +import {ListWrapper} from "angular2/src/facade/collection"; export function main() { describe("RenderViewWithFragmentsStore", () => { diff --git a/modules/angular2/test/web_workers/shared/service_message_broker_spec.ts b/modules/angular2/test/web_workers/shared/service_message_broker_spec.ts index c4127a5b9a..89c3135e74 100644 --- a/modules/angular2/test/web_workers/shared/service_message_broker_spec.ts +++ b/modules/angular2/test/web_workers/shared/service_message_broker_spec.ts @@ -16,7 +16,7 @@ import { ServiceMessageBroker, ServiceMessageBroker_ } from 'angular2/src/web_workers/shared/service_message_broker'; -import {ObservableWrapper, PromiseWrapper} from 'angular2/src/core/facade/async'; +import {ObservableWrapper, PromiseWrapper} from 'angular2/src/facade/async'; import {provide} from 'angular2/core'; import {ON_WEB_WORKER} from 'angular2/src/web_workers/shared/api'; import {RenderProtoViewRefStore} from 'angular2/src/web_workers/shared/render_proto_view_ref_store'; diff --git a/modules/angular2/test/web_workers/shared/web_worker_test_util.ts b/modules/angular2/test/web_workers/shared/web_worker_test_util.ts index 7dae3f3eae..55d68c5b3e 100644 --- a/modules/angular2/test/web_workers/shared/web_worker_test_util.ts +++ b/modules/angular2/test/web_workers/shared/web_worker_test_util.ts @@ -1,11 +1,11 @@ -import {StringMapWrapper, ListWrapper} from 'angular2/src/core/facade/collection'; +import {StringMapWrapper, ListWrapper} from 'angular2/src/facade/collection'; import { MessageBusSink, MessageBusSource, MessageBus } from 'angular2/src/web_workers/shared/message_bus'; import {MockEventEmitter} from './mock_event_emitter'; -import {BaseException, WrappedException} from 'angular2/src/core/facade/exceptions'; +import {BaseException, WrappedException} from 'angular2/src/facade/exceptions'; import {NgZone} from 'angular2/src/core/zone/ng_zone'; /** diff --git a/modules/angular2/test/web_workers/worker/event_dispatcher_spec.ts b/modules/angular2/test/web_workers/worker/event_dispatcher_spec.ts index 7d1be4a8db..bb1c376658 100644 --- a/modules/angular2/test/web_workers/worker/event_dispatcher_spec.ts +++ b/modules/angular2/test/web_workers/worker/event_dispatcher_spec.ts @@ -21,7 +21,7 @@ import { import {RenderEventDispatcher, RenderViewRef} from 'angular2/src/core/render/api'; import {createPairedMessageBuses} from '../shared/web_worker_test_util'; import {WebWorkerEventDispatcher} from 'angular2/src/web_workers/worker/event_dispatcher'; -import {ObservableWrapper} from 'angular2/src/core/facade/async'; +import {ObservableWrapper} from 'angular2/src/facade/async'; import {EVENT_CHANNEL} from 'angular2/src/web_workers/shared/messaging_api'; export function main() { diff --git a/modules/angular2/test/web_workers/worker/xhr_impl_spec.ts b/modules/angular2/test/web_workers/worker/xhr_impl_spec.ts index a7122c9e21..813ab3bc79 100644 --- a/modules/angular2/test/web_workers/worker/xhr_impl_spec.ts +++ b/modules/angular2/test/web_workers/worker/xhr_impl_spec.ts @@ -9,7 +9,7 @@ import { beforeEachBindings } from 'angular2/testing_internal'; import {SpyMessageBroker} from './spies'; -import {Type} from 'angular2/src/core/facade/lang'; +import {Type} from 'angular2/src/facade/lang'; import { ClientMessageBroker, UiArguments, @@ -17,7 +17,7 @@ import { ClientMessageBrokerFactory_ } from 'angular2/src/web_workers/shared/client_message_broker'; import {WebWorkerXHRImpl} from "angular2/src/web_workers/worker/xhr_impl"; -import {PromiseWrapper} from "angular2/src/core/facade/async"; +import {PromiseWrapper} from "angular2/src/facade/async"; export function main() { describe("WebWorkerXHRImpl", () => { diff --git a/modules/angular2/web_worker/ui.ts b/modules/angular2/web_worker/ui.ts index d6058940fe..0d31f11206 100644 --- a/modules/angular2/web_worker/ui.ts +++ b/modules/angular2/web_worker/ui.ts @@ -1,4 +1,4 @@ -export * from '../src/core/facade'; +export * from 'angular2/src/facade/facade'; export * from '../src/core/zone'; export * from "../src/web_workers/ui/application"; export { diff --git a/modules/angular2/web_worker/worker.ts b/modules/angular2/web_worker/worker.ts index 60ba396191..884a9ceca0 100644 --- a/modules/angular2/web_worker/worker.ts +++ b/modules/angular2/web_worker/worker.ts @@ -3,7 +3,7 @@ export * from '../src/core/metadata'; export * from '../src/core/util'; export * from '../src/core/di'; export * from '../src/common/pipes'; -export * from '../src/core/facade'; +export * from 'angular2/src/facade/facade'; // Do not export application in web_worker, // web_worker exports its own // export * from '../src/core/application'; diff --git a/modules/angular2_material/src/components/button/button.ts b/modules/angular2_material/src/components/button/button.ts index b46ebf5c78..acd8786303 100644 --- a/modules/angular2_material/src/components/button/button.ts +++ b/modules/angular2_material/src/components/button/button.ts @@ -1,7 +1,7 @@ import {Component, View, ViewEncapsulation, OnChanges} from 'angular2/angular2'; -import {TimerWrapper} from 'angular2/src/core/facade/async'; -import {isPresent} from 'angular2/src/core/facade/lang'; +import {TimerWrapper} from 'angular2/src/facade/async'; +import {isPresent} from 'angular2/src/facade/lang'; // TODO(jelbourn): Ink ripples. diff --git a/modules/angular2_material/src/components/checkbox/checkbox.ts b/modules/angular2_material/src/components/checkbox/checkbox.ts index 3a11caafb5..8b08bd0ce8 100644 --- a/modules/angular2_material/src/components/checkbox/checkbox.ts +++ b/modules/angular2_material/src/components/checkbox/checkbox.ts @@ -1,8 +1,8 @@ import {Component, View, Attribute, ViewEncapsulation} from 'angular2/angular2'; -import {isPresent} from 'angular2/src/core/facade/lang'; +import {isPresent} from 'angular2/src/facade/lang'; import {KeyCodes} from 'angular2_material/src/core/key_codes'; -import {KeyboardEvent} from 'angular2/src/core/facade/browser'; -import {NumberWrapper} from 'angular2/src/core/facade/lang'; +import {KeyboardEvent} from 'angular2/src/facade/browser'; +import {NumberWrapper} from 'angular2/src/facade/lang'; @Component({ selector: 'md-checkbox', diff --git a/modules/angular2_material/src/components/dialog/dialog.ts b/modules/angular2_material/src/components/dialog/dialog.ts index 3ff212c624..0e39809ab4 100644 --- a/modules/angular2_material/src/components/dialog/dialog.ts +++ b/modules/angular2_material/src/components/dialog/dialog.ts @@ -16,10 +16,10 @@ import { ViewEncapsulation } from 'angular2/core'; -import {ObservableWrapper, Promise, PromiseWrapper} from 'angular2/src/core/facade/async'; -import {isPresent, Type} from 'angular2/src/core/facade/lang'; +import {ObservableWrapper, Promise, PromiseWrapper} from 'angular2/src/facade/async'; +import {isPresent, Type} from 'angular2/src/facade/lang'; import {DOM} from 'angular2/src/core/dom/dom_adapter'; -import {MouseEvent, KeyboardEvent} from 'angular2/src/core/facade/browser'; +import {MouseEvent, KeyboardEvent} from 'angular2/src/facade/browser'; import {KeyCodes} from 'angular2_material/src/core/key_codes'; // TODO(jelbourn): Opener of dialog can control where it is rendered. diff --git a/modules/angular2_material/src/components/grid_list/grid_list.ts b/modules/angular2_material/src/components/grid_list/grid_list.ts index 17a1da0f31..1f7b57b89d 100644 --- a/modules/angular2_material/src/components/grid_list/grid_list.ts +++ b/modules/angular2_material/src/components/grid_list/grid_list.ts @@ -9,9 +9,9 @@ import { AfterContentChecked } from 'angular2/angular2'; -import {ListWrapper} from 'angular2/src/core/facade/collection'; -import {StringWrapper, isPresent, isString, NumberWrapper} from 'angular2/src/core/facade/lang'; -import {Math} from 'angular2/src/core/facade/math'; +import {ListWrapper} from 'angular2/src/facade/collection'; +import {StringWrapper, isPresent, isString, NumberWrapper} from 'angular2/src/facade/lang'; +import {Math} from 'angular2/src/facade/math'; // TODO(jelbourn): Set appropriate aria attributes for grid list elements. // TODO(jelbourn): Animations. diff --git a/modules/angular2_material/src/components/input/input.ts b/modules/angular2_material/src/components/input/input.ts index 4541d8c40d..90158d810d 100644 --- a/modules/angular2_material/src/components/input/input.ts +++ b/modules/angular2_material/src/components/input/input.ts @@ -1,6 +1,6 @@ import {Directive, Attribute, Host, SkipSelf, AfterContentChecked} from 'angular2/angular2'; -import {ObservableWrapper, EventEmitter} from 'angular2/src/core/facade/async'; +import {ObservableWrapper, EventEmitter} from 'angular2/src/facade/async'; // TODO(jelbourn): validation (will depend on Forms API). // TODO(jelbourn): textarea resizing diff --git a/modules/angular2_material/src/components/progress-linear/progress_linear.ts b/modules/angular2_material/src/components/progress-linear/progress_linear.ts index a4ac6b035f..dfbf4bb729 100644 --- a/modules/angular2_material/src/components/progress-linear/progress_linear.ts +++ b/modules/angular2_material/src/components/progress-linear/progress_linear.ts @@ -1,7 +1,7 @@ import {Component, View, ViewEncapsulation, Attribute, OnChanges} from 'angular2/angular2'; -import {CONST} from 'angular2/src/core/facade/lang'; -import {isPresent, isBlank} from 'angular2/src/core/facade/lang'; -import {Math} from 'angular2/src/core/facade/math'; +import {CONST} from 'angular2/src/facade/lang'; +import {isPresent, isBlank} from 'angular2/src/facade/lang'; +import {Math} from 'angular2/src/facade/math'; /** Different display / behavior modes for progress-linear. */ @CONST() diff --git a/modules/angular2_material/src/components/radio/radio_button.ts b/modules/angular2_material/src/components/radio/radio_button.ts index fbdc5499b6..5c740e22e7 100644 --- a/modules/angular2_material/src/components/radio/radio_button.ts +++ b/modules/angular2_material/src/components/radio/radio_button.ts @@ -10,9 +10,9 @@ import { OnInit } from 'angular2/angular2'; -import {isPresent, StringWrapper, NumberWrapper} from 'angular2/src/core/facade/lang'; -import {ObservableWrapper, EventEmitter} from 'angular2/src/core/facade/async'; -import {Event, KeyboardEvent} from 'angular2/src/core/facade/browser'; +import {isPresent, StringWrapper, NumberWrapper} from 'angular2/src/facade/lang'; +import {ObservableWrapper, EventEmitter} from 'angular2/src/facade/async'; +import {Event, KeyboardEvent} from 'angular2/src/facade/browser'; import {MdRadioDispatcher} from 'angular2_material/src/components/radio/radio_dispatcher'; import {KeyCodes} from 'angular2_material/src/core/key_codes'; diff --git a/modules/angular2_material/src/core/key_codes.ts b/modules/angular2_material/src/core/key_codes.ts index 82d8597c7f..ae7f080c96 100644 --- a/modules/angular2_material/src/core/key_codes.ts +++ b/modules/angular2_material/src/core/key_codes.ts @@ -1,4 +1,4 @@ -import {CONST} from 'angular2/src/core/facade/lang'; +import {CONST} from 'angular2/src/facade/lang'; // Can't use an enum because Dart doesn't support enum initializers. @CONST() diff --git a/modules/benchmarks/src/change_detection/change_detection_benchmark.ts b/modules/benchmarks/src/change_detection/change_detection_benchmark.ts index 9fd8bdbe06..4a3c437915 100644 --- a/modules/benchmarks/src/change_detection/change_detection_benchmark.ts +++ b/modules/benchmarks/src/change_detection/change_detection_benchmark.ts @@ -1,5 +1,5 @@ import {reflector} from 'angular2/src/core/reflection/reflection'; -import {isPresent} from 'angular2/src/core/facade/lang'; +import {isPresent} from 'angular2/src/facade/lang'; import {getIntParameter, bindAction, microBenchmark} from 'angular2/src/testing/benchmark_util'; import {BrowserDomAdapter} from 'angular2/src/core/dom/browser_adapter'; diff --git a/modules/benchmarks/src/compiler/compiler_benchmark.ts b/modules/benchmarks/src/compiler/compiler_benchmark.ts index 840226297f..7fc8b433d4 100644 --- a/modules/benchmarks/src/compiler/compiler_benchmark.ts +++ b/modules/benchmarks/src/compiler/compiler_benchmark.ts @@ -1,9 +1,9 @@ import {bootstrap} from 'angular2/bootstrap'; import {BrowserDomAdapter} from 'angular2/src/core/dom/browser_adapter'; import {DOM} from 'angular2/src/core/dom/dom_adapter'; -import {PromiseWrapper} from 'angular2/src/core/facade/async'; -import {ListWrapper, Map, MapWrapper} from 'angular2/src/core/facade/collection'; -import {DateWrapper, Type, print, isPresent} from 'angular2/src/core/facade/lang'; +import {PromiseWrapper} from 'angular2/src/facade/async'; +import {ListWrapper, Map, MapWrapper} from 'angular2/src/facade/collection'; +import {DateWrapper, Type, print, isPresent} from 'angular2/src/facade/lang'; import { Compiler, diff --git a/modules/benchmarks/src/compiler/selector_benchmark.ts b/modules/benchmarks/src/compiler/selector_benchmark.ts index f0b42f1dea..b197c7c9e1 100644 --- a/modules/benchmarks/src/compiler/selector_benchmark.ts +++ b/modules/benchmarks/src/compiler/selector_benchmark.ts @@ -1,6 +1,6 @@ import {SelectorMatcher} from "angular2/src/compiler/selector"; import {CssSelector} from "angular2/src/compiler/selector"; -import {StringWrapper, Math} from 'angular2/src/core/facade/lang'; +import {StringWrapper, Math} from 'angular2/src/facade/lang'; import {getIntParameter, bindAction} from 'angular2/src/testing/benchmark_util'; import {BrowserDomAdapter} from 'angular2/src/core/dom/browser_adapter'; diff --git a/modules/benchmarks/src/costs/index.ts b/modules/benchmarks/src/costs/index.ts index de6bfc0ad0..2f6d440915 100644 --- a/modules/benchmarks/src/costs/index.ts +++ b/modules/benchmarks/src/costs/index.ts @@ -9,7 +9,7 @@ import { NgFor } from 'angular2/core'; import {ApplicationRef} from 'angular2/src/core/application_ref'; -import {ListWrapper} from 'angular2/src/core/facade/collection'; +import {ListWrapper} from 'angular2/src/facade/collection'; import {getIntParameter, bindAction} from 'angular2/src/testing/benchmark_util'; var testList = null; diff --git a/modules/benchmarks/src/largetable/largetable_benchmark.ts b/modules/benchmarks/src/largetable/largetable_benchmark.ts index 5fb16c0941..417b2703d3 100644 --- a/modules/benchmarks/src/largetable/largetable_benchmark.ts +++ b/modules/benchmarks/src/largetable/largetable_benchmark.ts @@ -1,5 +1,5 @@ import {DOM} from 'angular2/src/core/dom/dom_adapter'; -import {window, document, gc} from 'angular2/src/core/facade/browser'; +import {window, document, gc} from 'angular2/src/facade/browser'; import { getIntParameter, getStringParameter, @@ -23,7 +23,7 @@ import {ApplicationRef} from 'angular2/src/core/application_ref'; import {BrowserDomAdapter} from 'angular2/src/core/dom/browser_adapter'; import {APP_VIEW_POOL_CAPACITY} from 'angular2/src/core/linker/view_pool'; -import {ListWrapper} from 'angular2/src/core/facade/collection'; +import {ListWrapper} from 'angular2/src/facade/collection'; import {Inject} from 'angular2/src/core/di/decorators'; import {reflector} from 'angular2/src/core/reflection/reflection'; diff --git a/modules/benchmarks/src/naive_infinite_scroll/app.ts b/modules/benchmarks/src/naive_infinite_scroll/app.ts index 23c717b46a..d3079de971 100644 --- a/modules/benchmarks/src/naive_infinite_scroll/app.ts +++ b/modules/benchmarks/src/naive_infinite_scroll/app.ts @@ -1,10 +1,10 @@ -import {isPresent} from 'angular2/src/core/facade/lang'; +import {isPresent} from 'angular2/src/facade/lang'; import {getIntParameter, bindAction} from 'angular2/src/testing/benchmark_util'; -import {TimerWrapper} from 'angular2/src/core/facade/async'; +import {TimerWrapper} from 'angular2/src/facade/async'; import {ScrollAreaComponent} from './scroll_area'; import {NgIf, NgFor} from 'angular2/core'; import {DOM} from 'angular2/src/core/dom/dom_adapter'; -import {document} from 'angular2/src/core/facade/browser'; +import {document} from 'angular2/src/facade/browser'; import {Component, Directive, View} from 'angular2/angular2'; diff --git a/modules/benchmarks/src/naive_infinite_scroll/cells.ts b/modules/benchmarks/src/naive_infinite_scroll/cells.ts index e60c228880..3fa8f72ee8 100644 --- a/modules/benchmarks/src/naive_infinite_scroll/cells.ts +++ b/modules/benchmarks/src/naive_infinite_scroll/cells.ts @@ -1,4 +1,4 @@ -import {ListWrapper, Map} from 'angular2/src/core/facade/collection'; +import {ListWrapper, Map} from 'angular2/src/facade/collection'; import {Company, Opportunity, Offering, Account, CustomDate, STATUS_LIST} from './common'; import {NgFor} from 'angular2/core'; diff --git a/modules/benchmarks/src/naive_infinite_scroll/common.ts b/modules/benchmarks/src/naive_infinite_scroll/common.ts index 6ad86841c6..12797f6fc7 100644 --- a/modules/benchmarks/src/naive_infinite_scroll/common.ts +++ b/modules/benchmarks/src/naive_infinite_scroll/common.ts @@ -1,6 +1,6 @@ -import {Math} from 'angular2/src/core/facade/math'; -import {StringWrapper} from 'angular2/src/core/facade/lang'; -import {ListWrapper, Map, MapWrapper} from 'angular2/src/core/facade/collection'; +import {Math} from 'angular2/src/facade/math'; +import {StringWrapper} from 'angular2/src/facade/lang'; +import {ListWrapper, Map, MapWrapper} from 'angular2/src/facade/collection'; export var ITEMS = 1000; export var ITEM_HEIGHT = 40; diff --git a/modules/benchmarks/src/naive_infinite_scroll/random_data.ts b/modules/benchmarks/src/naive_infinite_scroll/random_data.ts index cf23095a52..6bae372b45 100644 --- a/modules/benchmarks/src/naive_infinite_scroll/random_data.ts +++ b/modules/benchmarks/src/naive_infinite_scroll/random_data.ts @@ -1,4 +1,4 @@ -import {StringWrapper} from 'angular2/src/core/facade/lang'; +import {StringWrapper} from 'angular2/src/facade/lang'; import { CustomDate, Offering, diff --git a/modules/benchmarks/src/naive_infinite_scroll/scroll_area.ts b/modules/benchmarks/src/naive_infinite_scroll/scroll_area.ts index a616d5db31..a8f50d0d15 100644 --- a/modules/benchmarks/src/naive_infinite_scroll/scroll_area.ts +++ b/modules/benchmarks/src/naive_infinite_scroll/scroll_area.ts @@ -1,5 +1,5 @@ -import {ListWrapper} from 'angular2/src/core/facade/collection'; -import {Math} from 'angular2/src/core/facade/math'; +import {ListWrapper} from 'angular2/src/facade/collection'; +import {Math} from 'angular2/src/facade/math'; import {Component, Directive, View} from 'angular2/angular2'; diff --git a/modules/benchmarks/src/static_tree/tree_benchmark.ts b/modules/benchmarks/src/static_tree/tree_benchmark.ts index a5be3fda44..581f50692e 100644 --- a/modules/benchmarks/src/static_tree/tree_benchmark.ts +++ b/modules/benchmarks/src/static_tree/tree_benchmark.ts @@ -15,7 +15,7 @@ import {ApplicationRef} from 'angular2/src/core/application_ref'; import {reflector} from 'angular2/src/core/reflection/reflection'; import {ReflectionCapabilities} from 'angular2/src/core/reflection/reflection_capabilities'; import {DOM} from 'angular2/src/core/dom/dom_adapter'; -import {window, document, gc} from 'angular2/src/core/facade/browser'; +import {window, document, gc} from 'angular2/src/facade/browser'; import { getIntParameter, getStringParameter, diff --git a/modules/benchmarks/src/tree/tree_benchmark.ts b/modules/benchmarks/src/tree/tree_benchmark.ts index ddb32365d3..80ca59a83f 100644 --- a/modules/benchmarks/src/tree/tree_benchmark.ts +++ b/modules/benchmarks/src/tree/tree_benchmark.ts @@ -13,8 +13,8 @@ import { import {ApplicationRef} from 'angular2/src/core/application_ref'; import {DOM} from 'angular2/src/core/dom/dom_adapter'; -import {isPresent} from 'angular2/src/core/facade/lang'; -import {window, document, gc} from 'angular2/src/core/facade/browser'; +import {isPresent} from 'angular2/src/facade/lang'; +import {window, document, gc} from 'angular2/src/facade/browser'; import { getIntParameter, getStringParameter, diff --git a/modules/benchpress/src/common_options.ts b/modules/benchpress/src/common_options.ts index 18b6e66c00..bb4f8c23c5 100644 --- a/modules/benchpress/src/common_options.ts +++ b/modules/benchpress/src/common_options.ts @@ -1,5 +1,5 @@ import {bind, provide, Provider, OpaqueToken} from 'angular2/src/core/di'; -import {DateWrapper} from 'angular2/src/core/facade/lang'; +import {DateWrapper} from 'angular2/src/facade/lang'; export class Options { static get DEFAULT_PROVIDERS(): Provider[] { return _DEFAULT_PROVIDERS; } diff --git a/modules/benchpress/src/measure_values.ts b/modules/benchpress/src/measure_values.ts index 28c67c9e57..0aaf7f582b 100644 --- a/modules/benchpress/src/measure_values.ts +++ b/modules/benchpress/src/measure_values.ts @@ -1,5 +1,5 @@ -import {Date, DateWrapper} from 'angular2/src/core/facade/lang'; -import {Map} from 'angular2/src/core/facade/collection'; +import {Date, DateWrapper} from 'angular2/src/facade/lang'; +import {Map} from 'angular2/src/facade/collection'; export class MeasureValues { constructor(public runIndex: number, public timeStamp: Date, diff --git a/modules/benchpress/src/metric.ts b/modules/benchpress/src/metric.ts index 6a84529628..6c8233b16b 100644 --- a/modules/benchpress/src/metric.ts +++ b/modules/benchpress/src/metric.ts @@ -1,6 +1,6 @@ import {bind, provide, Provider} from 'angular2/src/core/di'; -import {Promise, PromiseWrapper} from 'angular2/src/core/facade/async'; -import {BaseException, WrappedException} from 'angular2/src/core/facade/exceptions'; +import {Promise, PromiseWrapper} from 'angular2/src/facade/async'; +import {BaseException, WrappedException} from 'angular2/src/facade/exceptions'; /** * A metric is measures values diff --git a/modules/benchpress/src/metric/multi_metric.ts b/modules/benchpress/src/metric/multi_metric.ts index a7b3e769d0..c82c7109e4 100644 --- a/modules/benchpress/src/metric/multi_metric.ts +++ b/modules/benchpress/src/metric/multi_metric.ts @@ -1,6 +1,6 @@ import {bind, provide, Binding, Provider, Injector, OpaqueToken} from 'angular2/src/core/di'; -import {StringMapWrapper} from 'angular2/src/core/facade/collection'; -import {Promise, PromiseWrapper} from 'angular2/src/core/facade/async'; +import {StringMapWrapper} from 'angular2/src/facade/collection'; +import {Promise, PromiseWrapper} from 'angular2/src/facade/async'; import {Metric} from '../metric'; diff --git a/modules/benchpress/src/metric/perflog_metric.ts b/modules/benchpress/src/metric/perflog_metric.ts index 9584f7031d..228e7884f0 100644 --- a/modules/benchpress/src/metric/perflog_metric.ts +++ b/modules/benchpress/src/metric/perflog_metric.ts @@ -1,4 +1,4 @@ -import {PromiseWrapper, Promise, TimerWrapper} from 'angular2/src/core/facade/async'; +import {PromiseWrapper, Promise, TimerWrapper} from 'angular2/src/facade/async'; import { isPresent, isBlank, @@ -6,9 +6,9 @@ import { Math, RegExpWrapper, NumberWrapper -} from 'angular2/src/core/facade/lang'; -import {BaseException, WrappedException} from 'angular2/src/core/facade/exceptions'; -import {ListWrapper, StringMapWrapper} from 'angular2/src/core/facade/collection'; +} from 'angular2/src/facade/lang'; +import {BaseException, WrappedException} from 'angular2/src/facade/exceptions'; +import {ListWrapper, StringMapWrapper} from 'angular2/src/facade/collection'; import {bind, provide, Provider, OpaqueToken} from 'angular2/src/core/di'; import {WebDriverExtension, PerfLogFeatures} from '../web_driver_extension'; diff --git a/modules/benchpress/src/reporter.ts b/modules/benchpress/src/reporter.ts index 8579f8b2f0..498ceb5dfb 100644 --- a/modules/benchpress/src/reporter.ts +++ b/modules/benchpress/src/reporter.ts @@ -1,6 +1,6 @@ import {bind, provide, Provider} from 'angular2/src/core/di'; -import {Promise, PromiseWrapper} from 'angular2/src/core/facade/async'; -import {BaseException, WrappedException} from 'angular2/src/core/facade/exceptions'; +import {Promise, PromiseWrapper} from 'angular2/src/facade/async'; +import {BaseException, WrappedException} from 'angular2/src/facade/exceptions'; import {MeasureValues} from './measure_values'; /** diff --git a/modules/benchpress/src/reporter/console_reporter.ts b/modules/benchpress/src/reporter/console_reporter.ts index 7668896d1e..dd1076c44c 100644 --- a/modules/benchpress/src/reporter/console_reporter.ts +++ b/modules/benchpress/src/reporter/console_reporter.ts @@ -1,7 +1,7 @@ -import {print, isPresent, isBlank, NumberWrapper} from 'angular2/src/core/facade/lang'; -import {StringMapWrapper, ListWrapper} from 'angular2/src/core/facade/collection'; -import {Promise, PromiseWrapper} from 'angular2/src/core/facade/async'; -import {Math} from 'angular2/src/core/facade/math'; +import {print, isPresent, isBlank, NumberWrapper} from 'angular2/src/facade/lang'; +import {StringMapWrapper, ListWrapper} from 'angular2/src/facade/collection'; +import {Promise, PromiseWrapper} from 'angular2/src/facade/async'; +import {Math} from 'angular2/src/facade/math'; import {bind, provide, Provider, OpaqueToken} from 'angular2/src/core/di'; import {Statistic} from '../statistic'; diff --git a/modules/benchpress/src/reporter/json_file_reporter.ts b/modules/benchpress/src/reporter/json_file_reporter.ts index 90c20bed35..32ec9a6286 100644 --- a/modules/benchpress/src/reporter/json_file_reporter.ts +++ b/modules/benchpress/src/reporter/json_file_reporter.ts @@ -1,5 +1,5 @@ -import {DateWrapper, isPresent, isBlank, Json} from 'angular2/src/core/facade/lang'; -import {Promise, PromiseWrapper} from 'angular2/src/core/facade/async'; +import {DateWrapper, isPresent, isBlank, Json} from 'angular2/src/facade/lang'; +import {Promise, PromiseWrapper} from 'angular2/src/facade/async'; import {bind, provide, Provider, OpaqueToken} from 'angular2/src/core/di'; diff --git a/modules/benchpress/src/reporter/multi_reporter.ts b/modules/benchpress/src/reporter/multi_reporter.ts index 84e70c2159..6117d3d81f 100644 --- a/modules/benchpress/src/reporter/multi_reporter.ts +++ b/modules/benchpress/src/reporter/multi_reporter.ts @@ -1,5 +1,5 @@ import {bind, provide, Provider, Injector, OpaqueToken} from 'angular2/src/core/di'; -import {Promise, PromiseWrapper} from 'angular2/src/core/facade/async'; +import {Promise, PromiseWrapper} from 'angular2/src/facade/async'; import {MeasureValues} from '../measure_values'; import {Reporter} from '../reporter'; diff --git a/modules/benchpress/src/runner.ts b/modules/benchpress/src/runner.ts index 596d482583..27180058d6 100644 --- a/modules/benchpress/src/runner.ts +++ b/modules/benchpress/src/runner.ts @@ -1,6 +1,6 @@ import {Injector, bind, provide, Provider} from 'angular2/src/core/di'; -import {isPresent, isBlank} from 'angular2/src/core/facade/lang'; -import {Promise, PromiseWrapper} from 'angular2/src/core/facade/async'; +import {isPresent, isBlank} from 'angular2/src/facade/lang'; +import {Promise, PromiseWrapper} from 'angular2/src/facade/async'; import {Sampler, SampleState} from './sampler'; import {ConsoleReporter} from './reporter/console_reporter'; diff --git a/modules/benchpress/src/sample_description.ts b/modules/benchpress/src/sample_description.ts index 1635fa0825..4b2af6478c 100644 --- a/modules/benchpress/src/sample_description.ts +++ b/modules/benchpress/src/sample_description.ts @@ -1,4 +1,4 @@ -import {StringMapWrapper} from 'angular2/src/core/facade/collection'; +import {StringMapWrapper} from 'angular2/src/facade/collection'; import {bind, provide, Provider, OpaqueToken} from 'angular2/src/core/di'; import {Validator} from './validator'; import {Metric} from './metric'; diff --git a/modules/benchpress/src/sampler.ts b/modules/benchpress/src/sampler.ts index 574d35e5d7..9953676add 100644 --- a/modules/benchpress/src/sampler.ts +++ b/modules/benchpress/src/sampler.ts @@ -1,5 +1,5 @@ -import {isPresent, isBlank, Date, DateWrapper} from 'angular2/src/core/facade/lang'; -import {Promise, PromiseWrapper} from 'angular2/src/core/facade/async'; +import {isPresent, isBlank, Date, DateWrapper} from 'angular2/src/facade/lang'; +import {Promise, PromiseWrapper} from 'angular2/src/facade/async'; import {bind, provide, Provider, OpaqueToken} from 'angular2/src/core/di'; import {Metric} from './metric'; diff --git a/modules/benchpress/src/statistic.ts b/modules/benchpress/src/statistic.ts index 10245e1ba5..95f3267213 100644 --- a/modules/benchpress/src/statistic.ts +++ b/modules/benchpress/src/statistic.ts @@ -1,4 +1,4 @@ -import {Math} from 'angular2/src/core/facade/math'; +import {Math} from 'angular2/src/facade/math'; export class Statistic { static calculateCoefficientOfVariation(sample, mean) { diff --git a/modules/benchpress/src/validator.ts b/modules/benchpress/src/validator.ts index f03e7ff703..ec3f7ae34f 100644 --- a/modules/benchpress/src/validator.ts +++ b/modules/benchpress/src/validator.ts @@ -1,5 +1,5 @@ import {bind, provide, Provider} from 'angular2/src/core/di'; -import {BaseException, WrappedException} from 'angular2/src/core/facade/exceptions'; +import {BaseException, WrappedException} from 'angular2/src/facade/exceptions'; import {MeasureValues} from './measure_values'; diff --git a/modules/benchpress/src/validator/regression_slope_validator.ts b/modules/benchpress/src/validator/regression_slope_validator.ts index 1c57d47b31..0fcd18913c 100644 --- a/modules/benchpress/src/validator/regression_slope_validator.ts +++ b/modules/benchpress/src/validator/regression_slope_validator.ts @@ -1,4 +1,4 @@ -import {ListWrapper} from 'angular2/src/core/facade/collection'; +import {ListWrapper} from 'angular2/src/facade/collection'; import {bind, provide, Provider, OpaqueToken} from 'angular2/src/core/di'; import {Validator} from '../validator'; diff --git a/modules/benchpress/src/validator/size_validator.ts b/modules/benchpress/src/validator/size_validator.ts index cda673a51a..d6ba3d037a 100644 --- a/modules/benchpress/src/validator/size_validator.ts +++ b/modules/benchpress/src/validator/size_validator.ts @@ -1,4 +1,4 @@ -import {ListWrapper} from 'angular2/src/core/facade/collection'; +import {ListWrapper} from 'angular2/src/facade/collection'; import {bind, provide, Provider, OpaqueToken} from 'angular2/src/core/di'; import {Validator} from '../validator'; diff --git a/modules/benchpress/src/web_driver_adapter.ts b/modules/benchpress/src/web_driver_adapter.ts index bba516012b..2bed818336 100644 --- a/modules/benchpress/src/web_driver_adapter.ts +++ b/modules/benchpress/src/web_driver_adapter.ts @@ -1,7 +1,7 @@ import {bind, provide, Provider} from 'angular2/src/core/di'; -import {Promise} from 'angular2/src/core/facade/async'; -import {BaseException, WrappedException} from 'angular2/src/core/facade/exceptions'; -import {Map} from 'angular2/src/core/facade/collection'; +import {Promise} from 'angular2/src/facade/async'; +import {BaseException, WrappedException} from 'angular2/src/facade/exceptions'; +import {Map} from 'angular2/src/facade/collection'; /** * A WebDriverAdapter bridges API differences between different WebDriver clients, diff --git a/modules/benchpress/src/web_driver_extension.ts b/modules/benchpress/src/web_driver_extension.ts index db2a5c195f..ae90763ba4 100644 --- a/modules/benchpress/src/web_driver_extension.ts +++ b/modules/benchpress/src/web_driver_extension.ts @@ -1,8 +1,8 @@ import {bind, provide, Provider, Injector, OpaqueToken} from 'angular2/src/core/di'; -import {isBlank, isPresent} from 'angular2/src/core/facade/lang'; -import {BaseException, WrappedException} from 'angular2/src/core/facade/exceptions'; -import {Promise, PromiseWrapper} from 'angular2/src/core/facade/async'; +import {isBlank, isPresent} from 'angular2/src/facade/lang'; +import {BaseException, WrappedException} from 'angular2/src/facade/exceptions'; +import {Promise, PromiseWrapper} from 'angular2/src/facade/async'; import {Options} from './common_options'; diff --git a/modules/benchpress/src/webdriver/async_webdriver_adapter.dart b/modules/benchpress/src/webdriver/async_webdriver_adapter.dart index bd97c7b520..6826930d08 100644 --- a/modules/benchpress/src/webdriver/async_webdriver_adapter.dart +++ b/modules/benchpress/src/webdriver/async_webdriver_adapter.dart @@ -1,7 +1,7 @@ library benchpress.src.webdriver.async_webdriver_adapter_dart; import 'package:webdriver/webdriver.dart' show WebDriver, LogEntry; -import 'package:angular2/src/core/facade/async.dart' show Future; +import 'package:angular2/src/facade/async.dart' show Future; import '../web_driver_adapter.dart' show WebDriverAdapter; class AsyncWebDriverAdapter extends WebDriverAdapter { diff --git a/modules/benchpress/src/webdriver/chrome_driver_extension.ts b/modules/benchpress/src/webdriver/chrome_driver_extension.ts index 6c13e27f0a..d5db3c18f1 100644 --- a/modules/benchpress/src/webdriver/chrome_driver_extension.ts +++ b/modules/benchpress/src/webdriver/chrome_driver_extension.ts @@ -1,5 +1,5 @@ import {bind, provide, Provider} from 'angular2/src/core/di'; -import {ListWrapper, StringMapWrapper} from 'angular2/src/core/facade/collection'; +import {ListWrapper, StringMapWrapper} from 'angular2/src/facade/collection'; import { Json, isPresent, @@ -7,12 +7,12 @@ import { RegExpWrapper, StringWrapper, NumberWrapper -} from 'angular2/src/core/facade/lang'; -import {BaseException, WrappedException} from 'angular2/src/core/facade/exceptions'; +} from 'angular2/src/facade/lang'; +import {BaseException, WrappedException} from 'angular2/src/facade/exceptions'; import {WebDriverExtension, PerfLogFeatures} from '../web_driver_extension'; import {WebDriverAdapter} from '../web_driver_adapter'; -import {Promise} from 'angular2/src/core/facade/async'; +import {Promise} from 'angular2/src/facade/async'; import {Options} from '../common_options'; /** diff --git a/modules/benchpress/src/webdriver/firefox_driver_extension.ts b/modules/benchpress/src/webdriver/firefox_driver_extension.ts index c8d99e5d9b..1100976add 100644 --- a/modules/benchpress/src/webdriver/firefox_driver_extension.ts +++ b/modules/benchpress/src/webdriver/firefox_driver_extension.ts @@ -1,8 +1,8 @@ import {bind, provide, Provider} from 'angular2/src/core/di'; -import {isPresent, StringWrapper} from 'angular2/src/core/facade/lang'; +import {isPresent, StringWrapper} from 'angular2/src/facade/lang'; import {WebDriverExtension, PerfLogFeatures} from '../web_driver_extension'; import {WebDriverAdapter} from '../web_driver_adapter'; -import {Promise} from 'angular2/src/core/facade/async'; +import {Promise} from 'angular2/src/facade/async'; export class FirefoxDriverExtension extends WebDriverExtension { static get BINDINGS(): Provider[] { return _PROVIDERS; } diff --git a/modules/benchpress/src/webdriver/ios_driver_extension.ts b/modules/benchpress/src/webdriver/ios_driver_extension.ts index 27c590ea76..160f9d9f77 100644 --- a/modules/benchpress/src/webdriver/ios_driver_extension.ts +++ b/modules/benchpress/src/webdriver/ios_driver_extension.ts @@ -1,16 +1,10 @@ import {bind, provide, Provider} from 'angular2/src/core/di'; -import { - Json, - isPresent, - isBlank, - RegExpWrapper, - StringWrapper -} from 'angular2/src/core/facade/lang'; -import {BaseException, WrappedException} from 'angular2/src/core/facade/exceptions'; +import {Json, isPresent, isBlank, RegExpWrapper, StringWrapper} from 'angular2/src/facade/lang'; +import {BaseException, WrappedException} from 'angular2/src/facade/exceptions'; import {WebDriverExtension, PerfLogFeatures} from '../web_driver_extension'; import {WebDriverAdapter} from '../web_driver_adapter'; -import {Promise} from 'angular2/src/core/facade/async'; +import {Promise} from 'angular2/src/facade/async'; export class IOsDriverExtension extends WebDriverExtension { // TODO(tbosch): use static values when our transpiler supports them diff --git a/modules/benchpress/src/webdriver/selenium_webdriver_adapter.ts b/modules/benchpress/src/webdriver/selenium_webdriver_adapter.ts index 1e9beccc08..667915af02 100644 --- a/modules/benchpress/src/webdriver/selenium_webdriver_adapter.ts +++ b/modules/benchpress/src/webdriver/selenium_webdriver_adapter.ts @@ -1,4 +1,4 @@ -import {Promise, PromiseWrapper} from 'angular2/src/core/facade/async'; +import {Promise, PromiseWrapper} from 'angular2/src/facade/async'; import {bind, provide, Provider} from 'angular2/src/core/di'; import {WebDriverAdapter} from '../web_driver_adapter'; diff --git a/modules/benchpress/test/metric/multi_metric_spec.ts b/modules/benchpress/test/metric/multi_metric_spec.ts index f3d1582dc3..7165ff60db 100644 --- a/modules/benchpress/test/metric/multi_metric_spec.ts +++ b/modules/benchpress/test/metric/multi_metric_spec.ts @@ -11,8 +11,8 @@ import { xit, } from 'angular2/testing_internal'; -import {ListWrapper} from 'angular2/src/core/facade/collection'; -import {PromiseWrapper, Promise} from 'angular2/src/core/facade/async'; +import {ListWrapper} from 'angular2/src/facade/collection'; +import {PromiseWrapper, Promise} from 'angular2/src/facade/async'; import {Metric, MultiMetric, bind, provide, Injector} from 'benchpress/common'; diff --git a/modules/benchpress/test/metric/perflog_metric_spec.ts b/modules/benchpress/test/metric/perflog_metric_spec.ts index 7166223859..83f51fd587 100644 --- a/modules/benchpress/test/metric/perflog_metric_spec.ts +++ b/modules/benchpress/test/metric/perflog_metric_spec.ts @@ -11,9 +11,9 @@ import { xit, } from 'angular2/testing_internal'; -import {StringMapWrapper} from 'angular2/src/core/facade/collection'; -import {PromiseWrapper, Promise} from 'angular2/src/core/facade/async'; -import {isPresent, isBlank} from 'angular2/src/core/facade/lang'; +import {StringMapWrapper} from 'angular2/src/facade/collection'; +import {PromiseWrapper, Promise} from 'angular2/src/facade/async'; +import {isPresent, isBlank} from 'angular2/src/facade/lang'; import { Metric, diff --git a/modules/benchpress/test/reporter/console_reporter_spec.ts b/modules/benchpress/test/reporter/console_reporter_spec.ts index ab175ae4e1..fa55fb6ea2 100644 --- a/modules/benchpress/test/reporter/console_reporter_spec.ts +++ b/modules/benchpress/test/reporter/console_reporter_spec.ts @@ -9,7 +9,7 @@ import { afterEach } from 'angular2/testing_internal'; -import {isBlank, isPresent, Date, DateWrapper} from 'angular2/src/core/facade/lang'; +import {isBlank, isPresent, Date, DateWrapper} from 'angular2/src/facade/lang'; import { SampleState, diff --git a/modules/benchpress/test/reporter/json_file_reporter_spec.ts b/modules/benchpress/test/reporter/json_file_reporter_spec.ts index 58e96bbdda..d65b3bbc56 100644 --- a/modules/benchpress/test/reporter/json_file_reporter_spec.ts +++ b/modules/benchpress/test/reporter/json_file_reporter_spec.ts @@ -11,8 +11,8 @@ import { xit, } from 'angular2/testing_internal'; -import {DateWrapper, Json, RegExpWrapper, isPresent} from 'angular2/src/core/facade/lang'; -import {PromiseWrapper} from 'angular2/src/core/facade/async'; +import {DateWrapper, Json, RegExpWrapper, isPresent} from 'angular2/src/facade/lang'; +import {PromiseWrapper} from 'angular2/src/facade/async'; import { bind, diff --git a/modules/benchpress/test/reporter/multi_reporter_spec.ts b/modules/benchpress/test/reporter/multi_reporter_spec.ts index d30f64357e..e5fa8c12cd 100644 --- a/modules/benchpress/test/reporter/multi_reporter_spec.ts +++ b/modules/benchpress/test/reporter/multi_reporter_spec.ts @@ -11,8 +11,8 @@ import { xit, } from 'angular2/testing_internal'; -import {PromiseWrapper, Promise} from 'angular2/src/core/facade/async'; -import {DateWrapper} from 'angular2/src/core/facade/lang'; +import {PromiseWrapper, Promise} from 'angular2/src/facade/async'; +import {DateWrapper} from 'angular2/src/facade/lang'; import {Reporter, MultiReporter, bind, provide, Injector, MeasureValues} from 'benchpress/common'; diff --git a/modules/benchpress/test/runner_spec.ts b/modules/benchpress/test/runner_spec.ts index 79b0734c0d..fef2549118 100644 --- a/modules/benchpress/test/runner_spec.ts +++ b/modules/benchpress/test/runner_spec.ts @@ -23,8 +23,8 @@ import { WebDriverAdapter, SampleState } from 'benchpress/common'; -import {isBlank} from 'angular2/src/core/facade/lang'; -import {Promise, PromiseWrapper} from 'angular2/src/core/facade/async'; +import {isBlank} from 'angular2/src/facade/lang'; +import {Promise, PromiseWrapper} from 'angular2/src/facade/async'; export function main() { describe('runner', () => { diff --git a/modules/benchpress/test/sampler_spec.ts b/modules/benchpress/test/sampler_spec.ts index 2b18f3bd2d..1a49059ef5 100644 --- a/modules/benchpress/test/sampler_spec.ts +++ b/modules/benchpress/test/sampler_spec.ts @@ -11,8 +11,8 @@ import { xit, } from 'angular2/testing_internal'; -import {isBlank, isPresent, stringify, Date, DateWrapper} from 'angular2/src/core/facade/lang'; -import {PromiseWrapper, Promise} from 'angular2/src/core/facade/async'; +import {isBlank, isPresent, stringify, Date, DateWrapper} from 'angular2/src/facade/lang'; +import {PromiseWrapper, Promise} from 'angular2/src/facade/async'; import { Sampler, diff --git a/modules/benchpress/test/statistic_spec.ts b/modules/benchpress/test/statistic_spec.ts index 780ad1d041..122b69b15f 100644 --- a/modules/benchpress/test/statistic_spec.ts +++ b/modules/benchpress/test/statistic_spec.ts @@ -11,7 +11,7 @@ import { import {Statistic} from 'benchpress/src/statistic'; -import {NaN} from 'angular2/src/core/facade/math'; +import {NaN} from 'angular2/src/facade/math'; export function main() { describe('statistic', () => { diff --git a/modules/benchpress/test/trace_event_factory.ts b/modules/benchpress/test/trace_event_factory.ts index 9dcd3705fd..c7d074e558 100644 --- a/modules/benchpress/test/trace_event_factory.ts +++ b/modules/benchpress/test/trace_event_factory.ts @@ -1,4 +1,4 @@ -import {isPresent} from 'angular2/src/core/facade/lang'; +import {isPresent} from 'angular2/src/facade/lang'; export class TraceEventFactory { private _cat: string; diff --git a/modules/benchpress/test/validator/regression_slope_validator_spec.ts b/modules/benchpress/test/validator/regression_slope_validator_spec.ts index 7bac9dc4fb..25abb2d7d7 100644 --- a/modules/benchpress/test/validator/regression_slope_validator_spec.ts +++ b/modules/benchpress/test/validator/regression_slope_validator_spec.ts @@ -8,8 +8,8 @@ import { beforeEach, afterEach } from 'angular2/testing_internal'; -import {Date, DateWrapper} from 'angular2/src/core/facade/lang'; -import {ListWrapper} from 'angular2/src/core/facade/collection'; +import {Date, DateWrapper} from 'angular2/src/facade/lang'; +import {ListWrapper} from 'angular2/src/facade/collection'; import { Validator, diff --git a/modules/benchpress/test/validator/size_validator_spec.ts b/modules/benchpress/test/validator/size_validator_spec.ts index 1f8e814655..064140c682 100644 --- a/modules/benchpress/test/validator/size_validator_spec.ts +++ b/modules/benchpress/test/validator/size_validator_spec.ts @@ -8,8 +8,8 @@ import { beforeEach, afterEach } from 'angular2/testing_internal'; -import {Date, DateWrapper} from 'angular2/src/core/facade/lang'; -import {ListWrapper} from 'angular2/src/core/facade/collection'; +import {Date, DateWrapper} from 'angular2/src/facade/lang'; +import {ListWrapper} from 'angular2/src/facade/collection'; import {Validator, SizeValidator, Injector, bind, provide, MeasureValues} from 'benchpress/common'; diff --git a/modules/benchpress/test/web_driver_extension_spec.ts b/modules/benchpress/test/web_driver_extension_spec.ts index 404cfe56ea..2bfc96b5ee 100644 --- a/modules/benchpress/test/web_driver_extension_spec.ts +++ b/modules/benchpress/test/web_driver_extension_spec.ts @@ -11,8 +11,8 @@ import { xit, } from 'angular2/testing_internal'; -import {isPresent, StringWrapper} from 'angular2/src/core/facade/lang'; -import {PromiseWrapper} from 'angular2/src/core/facade/async'; +import {isPresent, StringWrapper} from 'angular2/src/facade/lang'; +import {PromiseWrapper} from 'angular2/src/facade/async'; import {WebDriverExtension, bind, provide, Injector, Options} from 'benchpress/common'; diff --git a/modules/benchpress/test/webdriver/chrome_driver_extension_spec.ts b/modules/benchpress/test/webdriver/chrome_driver_extension_spec.ts index 9fe076af86..ea67872fbf 100644 --- a/modules/benchpress/test/webdriver/chrome_driver_extension_spec.ts +++ b/modules/benchpress/test/webdriver/chrome_driver_extension_spec.ts @@ -11,8 +11,8 @@ import { xit, } from 'angular2/testing_internal'; -import {PromiseWrapper} from 'angular2/src/core/facade/async'; -import {Json, isBlank} from 'angular2/src/core/facade/lang'; +import {PromiseWrapper} from 'angular2/src/facade/async'; +import {Json, isBlank} from 'angular2/src/facade/lang'; import { WebDriverExtension, diff --git a/modules/benchpress/test/webdriver/ios_driver_extension_spec.ts b/modules/benchpress/test/webdriver/ios_driver_extension_spec.ts index a22fa4b92b..c12c156034 100644 --- a/modules/benchpress/test/webdriver/ios_driver_extension_spec.ts +++ b/modules/benchpress/test/webdriver/ios_driver_extension_spec.ts @@ -11,8 +11,8 @@ import { xit, } from 'angular2/testing_internal'; -import {PromiseWrapper} from 'angular2/src/core/facade/async'; -import {Json, isBlank, isPresent} from 'angular2/src/core/facade/lang'; +import {PromiseWrapper} from 'angular2/src/facade/async'; +import {Json, isBlank, isPresent} from 'angular2/src/facade/lang'; import { WebDriverExtension, diff --git a/modules/playground/e2e_test/hash_routing/hash_location_spec.ts b/modules/playground/e2e_test/hash_routing/hash_location_spec.ts index b9a78e2e71..856e367f67 100644 --- a/modules/playground/e2e_test/hash_routing/hash_location_spec.ts +++ b/modules/playground/e2e_test/hash_routing/hash_location_spec.ts @@ -1,5 +1,5 @@ import {verifyNoBrowserErrors} from 'angular2/src/testing/e2e_util'; -import {Promise} from 'angular2/src/core/facade/async'; +import {Promise} from 'angular2/src/facade/async'; function waitForElement(selector) { var EC = (protractor).ExpectedConditions; diff --git a/modules/playground/e2e_test/routing/routing_spec.ts b/modules/playground/e2e_test/routing/routing_spec.ts index 21a6550e43..cd303f144a 100644 --- a/modules/playground/e2e_test/routing/routing_spec.ts +++ b/modules/playground/e2e_test/routing/routing_spec.ts @@ -1,5 +1,5 @@ import {verifyNoBrowserErrors} from 'angular2/src/testing/e2e_util'; -import {Promise} from 'angular2/src/core/facade/async'; +import {Promise} from 'angular2/src/facade/async'; function waitForElement(selector) { var EC = (protractor).ExpectedConditions; diff --git a/modules/playground/e2e_test/web_workers/kitchen_sink/kitchen_sink_spec.ts b/modules/playground/e2e_test/web_workers/kitchen_sink/kitchen_sink_spec.ts index 51e7be0534..d4564fc8b4 100644 --- a/modules/playground/e2e_test/web_workers/kitchen_sink/kitchen_sink_spec.ts +++ b/modules/playground/e2e_test/web_workers/kitchen_sink/kitchen_sink_spec.ts @@ -1,5 +1,5 @@ import {verifyNoBrowserErrors} from 'angular2/src/testing/e2e_util'; -import {Promise} from 'angular2/src/core/facade/async'; +import {Promise} from 'angular2/src/facade/async'; describe('WebWorkers Kitchen Sink', function() { afterEach(() => { diff --git a/modules/playground/e2e_test/web_workers/message_broker/message_broker_spec.ts b/modules/playground/e2e_test/web_workers/message_broker/message_broker_spec.ts index a582cb3a19..3300852d8a 100644 --- a/modules/playground/e2e_test/web_workers/message_broker/message_broker_spec.ts +++ b/modules/playground/e2e_test/web_workers/message_broker/message_broker_spec.ts @@ -1,5 +1,5 @@ import {verifyNoBrowserErrors} from "angular2/src/testing/e2e_util"; -import {PromiseWrapper} from "angular2/src/core/facade/async"; +import {PromiseWrapper} from "angular2/src/facade/async"; var URL = 'playground/src/web_workers/message_broker/index.html'; diff --git a/modules/playground/e2e_test/web_workers/todo/todo_spec.ts b/modules/playground/e2e_test/web_workers/todo/todo_spec.ts index 74be363c0f..3e9fe5370f 100644 --- a/modules/playground/e2e_test/web_workers/todo/todo_spec.ts +++ b/modules/playground/e2e_test/web_workers/todo/todo_spec.ts @@ -1,5 +1,5 @@ import {verifyNoBrowserErrors} from 'angular2/src/testing/e2e_util'; -import {Promise} from 'angular2/src/core/facade/async'; +import {Promise} from 'angular2/src/facade/async'; describe('WebWorkers Todo', function() { afterEach(() => { diff --git a/modules/playground/src/async/index.ts b/modules/playground/src/async/index.ts index 15cc6b2315..6f673dd2bc 100644 --- a/modules/playground/src/async/index.ts +++ b/modules/playground/src/async/index.ts @@ -1,6 +1,6 @@ import {bootstrap} from 'angular2/bootstrap'; import {NgIf, Component, View} from 'angular2/core'; -import {TimerWrapper} from 'angular2/src/core/facade/async'; +import {TimerWrapper} from 'angular2/src/facade/async'; @Component({selector: 'async-app'}) @View({ diff --git a/modules/playground/src/jsonp/jsonp_comp.ts b/modules/playground/src/jsonp/jsonp_comp.ts index 9bc3e45f50..f1250dedcc 100644 --- a/modules/playground/src/jsonp/jsonp_comp.ts +++ b/modules/playground/src/jsonp/jsonp_comp.ts @@ -1,6 +1,6 @@ import {Component, View, NgFor} from 'angular2/angular2'; import {Jsonp, Response} from 'angular2/http'; -import {ObservableWrapper} from 'angular2/src/core/facade/async'; +import {ObservableWrapper} from 'angular2/src/facade/async'; @Component({selector: 'jsonp-app'}) @View({ diff --git a/modules/playground/src/material/demo_common.ts b/modules/playground/src/material/demo_common.ts index cade834674..8ccbd2a0bd 100644 --- a/modules/playground/src/material/demo_common.ts +++ b/modules/playground/src/material/demo_common.ts @@ -1,6 +1,6 @@ -import {print} from 'angular2/src/core/facade/lang'; +import {print} from 'angular2/src/facade/lang'; import {UrlResolver} from 'angular2/src/compiler/url_resolver'; -import {isPresent, isBlank, RegExpWrapper, StringWrapper} from 'angular2/src/core/facade/lang'; +import {isPresent, isBlank, RegExpWrapper, StringWrapper} from 'angular2/src/facade/lang'; import {DOM} from 'angular2/src/core/dom/dom_adapter'; import {Injectable} from 'angular2/core'; import {BrowserDomAdapter} from 'angular2/src/core/dom/browser_adapter'; diff --git a/modules/playground/src/material/dialog/index.ts b/modules/playground/src/material/dialog/index.ts index d7af6538c7..65f8aaeb42 100644 --- a/modules/playground/src/material/dialog/index.ts +++ b/modules/playground/src/material/dialog/index.ts @@ -15,7 +15,7 @@ import { MdDialogConfig } from 'angular2_material/src/components/dialog/dialog'; import {commonDemoSetup, DemoUrlResolver} from '../demo_common'; -import {isPresent} from 'angular2/src/core/facade/lang'; +import {isPresent} from 'angular2/src/facade/lang'; @Component({ diff --git a/modules/playground/src/model_driven_forms/index.ts b/modules/playground/src/model_driven_forms/index.ts index 4ae72a8544..62fb37e3bc 100644 --- a/modules/playground/src/model_driven_forms/index.ts +++ b/modules/playground/src/model_driven_forms/index.ts @@ -5,6 +5,7 @@ import { Validators, NgFormModel, FormBuilder, + ControlGroup, NgIf, NgFor, Component, @@ -13,7 +14,7 @@ import { Host } from 'angular2/core'; -import {RegExpWrapper, print, isPresent} from 'angular2/src/core/facade/lang'; +import {RegExpWrapper, print, isPresent} from 'angular2/src/facade/lang'; /** * Custom validator. @@ -56,7 +57,7 @@ class ShowError { constructor(@Host() formDir: NgFormModel) { this.formDir = formDir; } get errorMessage(): string { - var control = this.formDir.form.find(this.controlPath); + var control = (this.formDir.form).find(this.controlPath); if (isPresent(control) && control.touched) { for (var i = 0; i < this.errorTypes.length; ++i) { if (control.hasError(this.errorTypes[i])) { diff --git a/modules/playground/src/observable_models/app.dart b/modules/playground/src/observable_models/app.dart index 992ddf5a6d..f0e2eee078 100644 --- a/modules/playground/src/observable_models/app.dart +++ b/modules/playground/src/observable_models/app.dart @@ -1,6 +1,6 @@ library benchmarks.src.naive_infinite_scroll.app; -import "package:angular2/src/core/facade/collection.dart" show List, ListWrapper; +import "package:angular2/src/facade/collection.dart" show List, ListWrapper; import "scroll_area.dart" show ScrollAreaComponent; import "package:angular2/angular2.dart" show Component, Directive, View, IterableDiffers, SkipSelf, Binding; import "package:angular2/core.dart" show ObservableListDiffFactory, NgIf, NgFor; diff --git a/modules/playground/src/observable_models/cells.dart b/modules/playground/src/observable_models/cells.dart index 4fff636467..54fdbe752b 100644 --- a/modules/playground/src/observable_models/cells.dart +++ b/modules/playground/src/observable_models/cells.dart @@ -1,6 +1,6 @@ library benchmarks.src.naive_infinite_scroll.cells; -import "package:angular2/src/core/facade/collection.dart" +import "package:angular2/src/facade/collection.dart" show List, ListWrapper, Map; import "common.dart" show Company, Opportunity, Offering, Account, CustomDate, STATUS_LIST; diff --git a/modules/playground/src/observable_models/common.dart b/modules/playground/src/observable_models/common.dart index 718bd16d81..2da81ed071 100644 --- a/modules/playground/src/observable_models/common.dart +++ b/modules/playground/src/observable_models/common.dart @@ -1,7 +1,7 @@ library benchmarks.src.naive_infinite_scroll.common; -import "package:angular2/src/core/facade/math.dart" show Math; -import "package:angular2/src/core/facade/collection.dart"; +import "package:angular2/src/facade/math.dart" show Math; +import "package:angular2/src/facade/collection.dart"; import 'package:observe/observe.dart'; import 'dart:collection'; import 'dart:async'; diff --git a/modules/playground/src/observable_models/random_data.dart b/modules/playground/src/observable_models/random_data.dart index 1fe4707e81..5c74edaa56 100644 --- a/modules/playground/src/observable_models/random_data.dart +++ b/modules/playground/src/observable_models/random_data.dart @@ -1,7 +1,7 @@ library benchmarks.src.naive_infinite_scroll.random_data; -import "package:angular2/src/core/facade/lang.dart" show StringWrapper; -import "package:angular2/src/core/facade/collection.dart" show List, ListWrapper; +import "package:angular2/src/facade/lang.dart" show StringWrapper; +import "package:angular2/src/facade/collection.dart" show List, ListWrapper; import "common.dart" show CustomDate, diff --git a/modules/playground/src/observable_models/scroll_area.dart b/modules/playground/src/observable_models/scroll_area.dart index 58e0e7158e..7ad9eb7209 100644 --- a/modules/playground/src/observable_models/scroll_area.dart +++ b/modules/playground/src/observable_models/scroll_area.dart @@ -1,7 +1,7 @@ library benchmarks.src.naive_infinite_scroll.scroll_area; -import "package:angular2/src/core/facade/collection.dart" show ListWrapper; -import "package:angular2/src/core/facade/math.dart" show Math; +import "package:angular2/src/facade/collection.dart" show ListWrapper; +import "package:angular2/src/facade/math.dart" show Math; import "package:angular2/angular2.dart" show Component, Directive, View, ChangeDetectionStrategy; import "common.dart" show diff --git a/modules/playground/src/order_management/index.ts b/modules/playground/src/order_management/index.ts index bd9ab3e5c1..9b08e754c6 100644 --- a/modules/playground/src/order_management/index.ts +++ b/modules/playground/src/order_management/index.ts @@ -14,7 +14,7 @@ import { Output } from 'angular2/core'; -import {ListWrapper} from 'angular2/src/core/facade/collection'; +import {ListWrapper} from 'angular2/src/facade/collection'; /** * You can find the Angular 1 implementation of this example here: @@ -35,7 +35,7 @@ class Order { private _dataService: DataService) {} get items(): OrderItem[] { return this._dataService.itemsFor(this); } - get total(): number { return this.items.map(i => i.total).reduce((a, b) => a + b); } + get total(): number { return this.items.map(i => i.total).reduce((a, b) => a + b, 0); } } diff --git a/modules/playground/src/person_management/index.ts b/modules/playground/src/person_management/index.ts index ba7472d40a..ac1fb4fc09 100644 --- a/modules/playground/src/person_management/index.ts +++ b/modules/playground/src/person_management/index.ts @@ -12,7 +12,7 @@ import { Injectable } from 'angular2/core'; -import {CONST_EXPR} from 'angular2/src/core/facade/lang'; +import {CONST_EXPR} from 'angular2/src/facade/lang'; /** diff --git a/modules/playground/src/routing/inbox-app.ts b/modules/playground/src/routing/inbox-app.ts index aa41d8875b..0468410c9b 100644 --- a/modules/playground/src/routing/inbox-app.ts +++ b/modules/playground/src/routing/inbox-app.ts @@ -9,9 +9,9 @@ import { RouteParams } from 'angular2/router'; import * as db from './data'; -import {ObservableWrapper, PromiseWrapper, Promise} from 'angular2/src/core/facade/async'; -import {ListWrapper} from 'angular2/src/core/facade/collection'; -import {isPresent, DateWrapper} from 'angular2/src/core/facade/lang'; +import {ObservableWrapper, PromiseWrapper, Promise} from 'angular2/src/facade/async'; +import {ListWrapper} from 'angular2/src/facade/collection'; +import {isPresent, DateWrapper} from 'angular2/src/facade/lang'; class InboxRecord { id: string = ''; diff --git a/modules/playground/src/sourcemap/index.ts b/modules/playground/src/sourcemap/index.ts index 487f3c4710..efd63749a9 100644 --- a/modules/playground/src/sourcemap/index.ts +++ b/modules/playground/src/sourcemap/index.ts @@ -1,4 +1,4 @@ -import {BaseException, WrappedException} from 'angular2/src/core/facade/exceptions'; +import {BaseException, WrappedException} from 'angular2/src/facade/exceptions'; import {bootstrap} from 'angular2/bootstrap'; import {Component, View} from 'angular2/core'; diff --git a/modules/playground/src/template_driven_forms/index.ts b/modules/playground/src/template_driven_forms/index.ts index e43b71a5d4..7e6c6f1514 100644 --- a/modules/playground/src/template_driven_forms/index.ts +++ b/modules/playground/src/template_driven_forms/index.ts @@ -11,11 +11,12 @@ import { Provider, FORM_DIRECTIVES, NgControl, + ControlGroup, Validators, NgForm } from 'angular2/core'; -import {RegExpWrapper, print, isPresent, CONST_EXPR} from 'angular2/src/core/facade/lang'; +import {RegExpWrapper, print, isPresent, CONST_EXPR} from 'angular2/src/facade/lang'; /** * A domain model we are binding the form controls to. @@ -80,7 +81,7 @@ class ShowError { constructor(@Host() formDir: NgForm) { this.formDir = formDir; } get errorMessage(): string { - var control = this.formDir.form.find(this.controlPath); + var control = (this.formDir.form).find(this.controlPath); if (isPresent(control) && control.touched) { for (var i = 0; i < this.errorTypes.length; ++i) { if (control.hasError(this.errorTypes[i])) { diff --git a/modules/playground/src/todo/services/TodoStore.ts b/modules/playground/src/todo/services/TodoStore.ts index 1ea60d3ab8..77a4cebd3b 100644 --- a/modules/playground/src/todo/services/TodoStore.ts +++ b/modules/playground/src/todo/services/TodoStore.ts @@ -1,5 +1,5 @@ import {Injectable} from 'angular2/angular2'; -import {ListWrapper, Predicate} from 'angular2/src/core/facade/collection'; +import {ListWrapper, Predicate} from 'angular2/src/facade/collection'; // base model for RecordStore export class KeyModel { diff --git a/modules/playground/src/web_workers/images/index_common.ts b/modules/playground/src/web_workers/images/index_common.ts index bb7f4c5934..bae3045b42 100644 --- a/modules/playground/src/web_workers/images/index_common.ts +++ b/modules/playground/src/web_workers/images/index_common.ts @@ -1,8 +1,8 @@ import {NgZone, NgFor, Component, View, NgIf, FORM_DIRECTIVES} from 'angular2/angular2'; import {BitmapService} from './services/bitmap'; -import {EventListener} from 'angular2/src/core/facade/browser'; +import {EventListener} from 'angular2/src/facade/browser'; import {FileReader, Uint8ArrayWrapper} from './file_api'; -import {TimerWrapper} from 'angular2/src/core/facade/async'; +import {TimerWrapper} from 'angular2/src/facade/async'; @Component({selector: 'image-demo', viewProviders: [BitmapService]}) @View({templateUrl: 'image_demo.html', directives: [NgFor, NgIf, FORM_DIRECTIVES]}) diff --git a/modules/playground/src/web_workers/kitchen_sink/index_common.ts b/modules/playground/src/web_workers/kitchen_sink/index_common.ts index 45bd40c1c1..9a91ca70fa 100644 --- a/modules/playground/src/web_workers/kitchen_sink/index_common.ts +++ b/modules/playground/src/web_workers/kitchen_sink/index_common.ts @@ -1,6 +1,6 @@ import {ElementRef, Component, Directive, View, Injectable} from 'angular2/core'; import {Renderer} from 'angular2/render'; -import {StringWrapper} from 'angular2/src/core/facade/lang'; +import {StringWrapper} from 'angular2/src/facade/lang'; // A service available to the Injector, used by the HelloCmp component. @Injectable() diff --git a/modules/playground/src/web_workers/message_broker/index_common.ts b/modules/playground/src/web_workers/message_broker/index_common.ts index 174f474d44..19ab7a3063 100644 --- a/modules/playground/src/web_workers/message_broker/index_common.ts +++ b/modules/playground/src/web_workers/message_broker/index_common.ts @@ -1,4 +1,4 @@ -import {PromiseWrapper} from "angular2/src/core/facade/async"; +import {PromiseWrapper} from "angular2/src/facade/async"; import {Component, View, ServiceMessageBrokerFactory, PRIMITIVE} from "angular2/web_worker/worker"; const ECHO_CHANNEL = "ECHO"; diff --git a/modules/playground/src/web_workers/todo/services/TodoStore.ts b/modules/playground/src/web_workers/todo/services/TodoStore.ts index 2281822f84..6624a0f969 100644 --- a/modules/playground/src/web_workers/todo/services/TodoStore.ts +++ b/modules/playground/src/web_workers/todo/services/TodoStore.ts @@ -1,5 +1,5 @@ import {Injectable} from 'angular2/web_worker/worker'; -import {ListWrapper, Predicate} from 'angular2/src/core/facade/collection'; +import {ListWrapper, Predicate} from 'angular2/src/facade/collection'; // base model for RecordStore export class KeyModel { diff --git a/modules/playground/src/zippy_component/zippy.ts b/modules/playground/src/zippy_component/zippy.ts index cd79ee08a5..56b1826d6f 100644 --- a/modules/playground/src/zippy_component/zippy.ts +++ b/modules/playground/src/zippy_component/zippy.ts @@ -1,5 +1,5 @@ import {Component, EventEmitter, Input, Output} from 'angular2/angular2'; -import {ObservableWrapper} from 'angular2/src/core/facade/async'; +import {ObservableWrapper} from 'angular2/src/facade/async'; @Component({selector: 'zippy', templateUrl: 'zippy.html'}) export class Zippy { diff --git a/modules_dart/transform/lib/src/transform/template_compiler/change_detector_codegen.dart b/modules_dart/transform/lib/src/transform/template_compiler/change_detector_codegen.dart index da90524062..c08dc222ac 100644 --- a/modules_dart/transform/lib/src/transform/template_compiler/change_detector_codegen.dart +++ b/modules_dart/transform/lib/src/transform/template_compiler/change_detector_codegen.dart @@ -13,8 +13,8 @@ import 'package:angular2/src/core/change_detection/event_binding.dart'; import 'package:angular2/src/core/change_detection/binding_record.dart'; import 'package:angular2/src/core/change_detection/codegen_facade.dart' show codify; -import 'package:angular2/src/core/facade/exceptions.dart' show BaseException; -import 'package:angular2/src/core/facade/collection.dart' show ListWrapper; +import 'package:angular2/src/facade/exceptions.dart' show BaseException; +import 'package:angular2/src/facade/collection.dart' show ListWrapper; /// Responsible for generating change detector classes for Angular 2. /// diff --git a/modules_dart/transform/lib/src/transform/template_compiler/generator.dart b/modules_dart/transform/lib/src/transform/template_compiler/generator.dart index 932857d104..e9a76072c0 100644 --- a/modules_dart/transform/lib/src/transform/template_compiler/generator.dart +++ b/modules_dart/transform/lib/src/transform/template_compiler/generator.dart @@ -6,7 +6,7 @@ import 'package:barback/barback.dart'; import 'package:path/path.dart' as path; import 'package:angular2/src/core/change_detection/interfaces.dart'; -import 'package:angular2/src/core/facade/lang.dart'; +import 'package:angular2/src/facade/lang.dart'; import 'package:angular2/src/core/reflection/reflection.dart'; import 'package:angular2/src/transform/common/asset_reader.dart'; import 'package:angular2/src/transform/common/code/source_module.dart'; diff --git a/tools/broccoli/html-replace/SCRIPTS.html b/tools/broccoli/html-replace/SCRIPTS.html index 38bd5efe0e..6434c63eca 100644 --- a/tools/broccoli/html-replace/SCRIPTS.html +++ b/tools/broccoli/html-replace/SCRIPTS.html @@ -10,7 +10,7 @@ // TODO(rado): These helpers don't end up in the bundle, thus they should // not even be in src/*. Move them! 'angular2/src/testing/benchmark_util': {defaultExtension: 'js'}, - 'angular2/src/core/facade/browser': {defaultExtension: 'js'}, + 'angular2/src/facade/browser': {defaultExtension: 'js'}, } }); diff --git a/tools/broccoli/html-replace/SCRIPTS_benchmarks.html b/tools/broccoli/html-replace/SCRIPTS_benchmarks.html index c43dcb2d64..66c7ebdd28 100644 --- a/tools/broccoli/html-replace/SCRIPTS_benchmarks.html +++ b/tools/broccoli/html-replace/SCRIPTS_benchmarks.html @@ -11,7 +11,7 @@ // TODO(rado): These helpers don't end up in the bundle, thus they should // not even be in src/*. Move them! 'angular2/src/testing/benchmark_util': {defaultExtension: 'js'}, - 'angular2/src/core/facade/browser': {defaultExtension: 'js'}, + 'angular2/src/facade/browser': {defaultExtension: 'js'}, } });