From 0c1f9dab548d7298e440ada9718bf9bbace15744 Mon Sep 17 00:00:00 2001 From: Pawel Kozlowski Date: Sat, 10 Oct 2015 14:58:46 +0200 Subject: [PATCH] refactor(http): use shared code from public 'angular2/angular2' namespace Closes #4648 --- modules/angular2/http.ts | 4 ++-- modules/angular2/src/http/backends/browser_jsonp.ts | 2 +- modules/angular2/src/http/backends/browser_xhr.ts | 2 +- modules/angular2/src/http/backends/jsonp_backend.ts | 2 +- modules/angular2/src/http/backends/mock_backend.ts | 2 +- modules/angular2/src/http/backends/xhr_backend.ts | 2 +- modules/angular2/src/http/base_request_options.ts | 2 +- modules/angular2/src/http/base_response_options.ts | 2 +- modules/angular2/src/http/http.ts | 2 +- 9 files changed, 10 insertions(+), 10 deletions(-) diff --git a/modules/angular2/http.ts b/modules/angular2/http.ts index 0f2f8e34e5f..18e67cd7c38 100644 --- a/modules/angular2/http.ts +++ b/modules/angular2/http.ts @@ -4,7 +4,7 @@ * The http module provides services to perform http requests. To get started, see the {@link Http} * class. */ -import {provide, Provider} from 'angular2/core'; +import {provide, Provider} from 'angular2/angular2'; import {Http, Jsonp} from './src/http/http'; import {XHRBackend, XHRConnection} from './src/http/backends/xhr_backend'; import {JSONPBackend, JSONPBackend_, JSONPConnection} from './src/http/backends/jsonp_backend'; @@ -291,4 +291,4 @@ export const JSONP_PROVIDERS: any[] = [ /** * @deprecated */ -export const JSON_BINDINGS = JSONP_PROVIDERS; \ No newline at end of file +export const JSON_BINDINGS = JSONP_PROVIDERS; diff --git a/modules/angular2/src/http/backends/browser_jsonp.ts b/modules/angular2/src/http/backends/browser_jsonp.ts index 5c0114ff928..67b6b60762c 100644 --- a/modules/angular2/src/http/backends/browser_jsonp.ts +++ b/modules/angular2/src/http/backends/browser_jsonp.ts @@ -1,4 +1,4 @@ -import {Injectable} from 'angular2/src/core/di'; +import {Injectable} from 'angular2/angular2'; import {global} from 'angular2/src/core/facade/lang'; let _nextRequestId = 0; diff --git a/modules/angular2/src/http/backends/browser_xhr.ts b/modules/angular2/src/http/backends/browser_xhr.ts index 12b73896681..28dae67c3c1 100644 --- a/modules/angular2/src/http/backends/browser_xhr.ts +++ b/modules/angular2/src/http/backends/browser_xhr.ts @@ -1,4 +1,4 @@ -import {Injectable} from 'angular2/src/core/di'; +import {Injectable} from 'angular2/angular2'; // Make sure not to evaluate this in a non-browser environment! @Injectable() diff --git a/modules/angular2/src/http/backends/jsonp_backend.ts b/modules/angular2/src/http/backends/jsonp_backend.ts index 497a3618868..fb1390bce08 100644 --- a/modules/angular2/src/http/backends/jsonp_backend.ts +++ b/modules/angular2/src/http/backends/jsonp_backend.ts @@ -3,7 +3,7 @@ import {ReadyStates, RequestMethods} from '../enums'; import {Request} from '../static_request'; import {Response} from '../static_response'; import {ResponseOptions, BaseResponseOptions} from '../base_response_options'; -import {Injectable} from 'angular2/src/core/di'; +import {Injectable} from 'angular2/angular2'; import {BrowserJsonp} from './browser_jsonp'; import {EventEmitter, ObservableWrapper} from 'angular2/src/core/facade/async'; import {makeTypeError} from 'angular2/src/core/facade/exceptions'; diff --git a/modules/angular2/src/http/backends/mock_backend.ts b/modules/angular2/src/http/backends/mock_backend.ts index 915ae6d3f6f..61ff239342f 100644 --- a/modules/angular2/src/http/backends/mock_backend.ts +++ b/modules/angular2/src/http/backends/mock_backend.ts @@ -1,4 +1,4 @@ -import {Injectable} from 'angular2/src/core/di'; +import {Injectable} from 'angular2/angular2'; import {Request} from '../static_request'; import {Response} from '../static_response'; import {ReadyStates} from '../enums'; diff --git a/modules/angular2/src/http/backends/xhr_backend.ts b/modules/angular2/src/http/backends/xhr_backend.ts index fcc2e825e46..6cd15b5660a 100644 --- a/modules/angular2/src/http/backends/xhr_backend.ts +++ b/modules/angular2/src/http/backends/xhr_backend.ts @@ -3,7 +3,7 @@ import {ReadyStates, RequestMethods, ResponseTypes} from '../enums'; import {Request} from '../static_request'; import {Response} from '../static_response'; import {ResponseOptions, BaseResponseOptions} from '../base_response_options'; -import {Injectable} from 'angular2/src/core/di'; +import {Injectable} from 'angular2/angular2'; import {BrowserXhr} from './browser_xhr'; import {isPresent} from 'angular2/src/core/facade/lang'; // todo(robwormald): temporary until https://github.com/angular/angular/issues/4390 decided diff --git a/modules/angular2/src/http/base_request_options.ts b/modules/angular2/src/http/base_request_options.ts index fbd84ae59c2..8e4fff2135f 100644 --- a/modules/angular2/src/http/base_request_options.ts +++ b/modules/angular2/src/http/base_request_options.ts @@ -2,7 +2,7 @@ import {isPresent, isString} from 'angular2/src/core/facade/lang'; import {Headers} from './headers'; import {RequestMethods} from './enums'; import {RequestOptionsArgs} from './interfaces'; -import {Injectable} from 'angular2/src/core/di'; +import {Injectable} from 'angular2/angular2'; import {URLSearchParams} from './url_search_params'; import {normalizeMethodName} from './http_utils'; diff --git a/modules/angular2/src/http/base_response_options.ts b/modules/angular2/src/http/base_response_options.ts index 4e57d74fec7..9ea30a38a2a 100644 --- a/modules/angular2/src/http/base_response_options.ts +++ b/modules/angular2/src/http/base_response_options.ts @@ -1,4 +1,4 @@ -import {Injectable} from 'angular2/src/core/di'; +import {Injectable} from 'angular2/angular2'; import {isPresent, isJsObject} from 'angular2/src/core/facade/lang'; import {Headers} from './headers'; import {ResponseTypes} from './enums'; diff --git a/modules/angular2/src/http/http.ts b/modules/angular2/src/http/http.ts index dea84ae7e13..1e201b852dc 100644 --- a/modules/angular2/src/http/http.ts +++ b/modules/angular2/src/http/http.ts @@ -1,6 +1,6 @@ import {isString, isPresent, isBlank} from 'angular2/src/core/facade/lang'; import {makeTypeError} from 'angular2/src/core/facade/exceptions'; -import {Injectable} from 'angular2/src/core/di/decorators'; +import {Injectable} from 'angular2/angular2'; import {RequestOptionsArgs, Connection, ConnectionBackend} from './interfaces'; import {Request} from './static_request'; import {BaseRequestOptions, RequestOptions} from './base_request_options';