Skip to content

Commit

Permalink
fix(http): refactor 'require' statements to 'import' declarations for Rx
Browse files Browse the repository at this point in the history
Looks like this is some old leftover code from the times when Rx didn't distribute typings via npm.

Closes #5287
  • Loading branch information
IgorMinar committed Nov 17, 2015
1 parent b22eddf commit bcd926a
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 5 deletions.
3 changes: 1 addition & 2 deletions modules/angular2/src/http/backends/mock_backend.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,7 @@ import {ReadyStates} from '../enums';
import {Connection, ConnectionBackend} from '../interfaces';
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;
import {Subject, ReplaySubject} from '@reactivex/rxjs/dist/cjs/Rx';

/**
*
Expand Down
4 changes: 1 addition & 3 deletions modules/angular2/test/http/http_spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,7 @@ import {
Http,
Jsonp
} from 'angular2/http';

var Rx = require('@reactivex/rxjs/dist/cjs/Rx');
let {Observable, Subject} = Rx;
import {Observable, Subject} from '@reactivex/rxjs/dist/cjs/Rx';

class SpyObserver extends SpyObject {
onNext: Function;
Expand Down

0 comments on commit bcd926a

Please sign in to comment.