Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

refactor(http): use shared code from public 'angular2/angular2' names… #4648

Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions modules/angular2/http.ts
Expand Up @@ -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';
Expand Down Expand Up @@ -291,4 +291,4 @@ export const JSONP_PROVIDERS: any[] = [
/**
* @deprecated
*/
export const JSON_BINDINGS = JSONP_PROVIDERS;
export const JSON_BINDINGS = JSONP_PROVIDERS;
2 changes: 1 addition & 1 deletion 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;
Expand Down
2 changes: 1 addition & 1 deletion 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()
Expand Down
2 changes: 1 addition & 1 deletion modules/angular2/src/http/backends/jsonp_backend.ts
Expand Up @@ -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';
Expand Down
2 changes: 1 addition & 1 deletion 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';
Expand Down
2 changes: 1 addition & 1 deletion modules/angular2/src/http/backends/xhr_backend.ts
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion modules/angular2/src/http/base_request_options.ts
Expand Up @@ -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';

Expand Down
2 changes: 1 addition & 1 deletion 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';
Expand Down
2 changes: 1 addition & 1 deletion 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';
Expand Down