Skip to content

Commit 0c1f9da

Browse files
refactor(http): use shared code from public 'angular2/angular2' namespace
Closes angular#4648
1 parent 1eb0162 commit 0c1f9da

File tree

9 files changed

+10
-10
lines changed

9 files changed

+10
-10
lines changed

modules/angular2/http.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
* The http module provides services to perform http requests. To get started, see the {@link Http}
55
* class.
66
*/
7-
import {provide, Provider} from 'angular2/core';
7+
import {provide, Provider} from 'angular2/angular2';
88
import {Http, Jsonp} from './src/http/http';
99
import {XHRBackend, XHRConnection} from './src/http/backends/xhr_backend';
1010
import {JSONPBackend, JSONPBackend_, JSONPConnection} from './src/http/backends/jsonp_backend';
@@ -291,4 +291,4 @@ export const JSONP_PROVIDERS: any[] = [
291291
/**
292292
* @deprecated
293293
*/
294-
export const JSON_BINDINGS = JSONP_PROVIDERS;
294+
export const JSON_BINDINGS = JSONP_PROVIDERS;

modules/angular2/src/http/backends/browser_jsonp.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import {Injectable} from 'angular2/src/core/di';
1+
import {Injectable} from 'angular2/angular2';
22
import {global} from 'angular2/src/core/facade/lang';
33

44
let _nextRequestId = 0;

modules/angular2/src/http/backends/browser_xhr.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import {Injectable} from 'angular2/src/core/di';
1+
import {Injectable} from 'angular2/angular2';
22

33
// Make sure not to evaluate this in a non-browser environment!
44
@Injectable()

modules/angular2/src/http/backends/jsonp_backend.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import {ReadyStates, RequestMethods} from '../enums';
33
import {Request} from '../static_request';
44
import {Response} from '../static_response';
55
import {ResponseOptions, BaseResponseOptions} from '../base_response_options';
6-
import {Injectable} from 'angular2/src/core/di';
6+
import {Injectable} from 'angular2/angular2';
77
import {BrowserJsonp} from './browser_jsonp';
88
import {EventEmitter, ObservableWrapper} from 'angular2/src/core/facade/async';
99
import {makeTypeError} from 'angular2/src/core/facade/exceptions';

modules/angular2/src/http/backends/mock_backend.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import {Injectable} from 'angular2/src/core/di';
1+
import {Injectable} from 'angular2/angular2';
22
import {Request} from '../static_request';
33
import {Response} from '../static_response';
44
import {ReadyStates} from '../enums';

modules/angular2/src/http/backends/xhr_backend.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import {ReadyStates, RequestMethods, ResponseTypes} from '../enums';
33
import {Request} from '../static_request';
44
import {Response} from '../static_response';
55
import {ResponseOptions, BaseResponseOptions} from '../base_response_options';
6-
import {Injectable} from 'angular2/src/core/di';
6+
import {Injectable} from 'angular2/angular2';
77
import {BrowserXhr} from './browser_xhr';
88
import {isPresent} from 'angular2/src/core/facade/lang';
99
// todo(robwormald): temporary until https://github.com/angular/angular/issues/4390 decided

modules/angular2/src/http/base_request_options.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import {isPresent, isString} from 'angular2/src/core/facade/lang';
22
import {Headers} from './headers';
33
import {RequestMethods} from './enums';
44
import {RequestOptionsArgs} from './interfaces';
5-
import {Injectable} from 'angular2/src/core/di';
5+
import {Injectable} from 'angular2/angular2';
66
import {URLSearchParams} from './url_search_params';
77
import {normalizeMethodName} from './http_utils';
88

modules/angular2/src/http/base_response_options.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import {Injectable} from 'angular2/src/core/di';
1+
import {Injectable} from 'angular2/angular2';
22
import {isPresent, isJsObject} from 'angular2/src/core/facade/lang';
33
import {Headers} from './headers';
44
import {ResponseTypes} from './enums';

modules/angular2/src/http/http.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import {isString, isPresent, isBlank} from 'angular2/src/core/facade/lang';
22
import {makeTypeError} from 'angular2/src/core/facade/exceptions';
3-
import {Injectable} from 'angular2/src/core/di/decorators';
3+
import {Injectable} from 'angular2/angular2';
44
import {RequestOptionsArgs, Connection, ConnectionBackend} from './interfaces';
55
import {Request} from './static_request';
66
import {BaseRequestOptions, RequestOptions} from './base_request_options';

0 commit comments

Comments
 (0)