Skip to content

Commit

Permalink
Merge branch 'master' into patch-1
Browse files Browse the repository at this point in the history
  • Loading branch information
danmarshall authored Aug 26, 2016
2 parents 0d1d347 + 7b23e88 commit fe61805
Show file tree
Hide file tree
Showing 327 changed files with 1,136 additions and 1,136 deletions.
6 changes: 3 additions & 3 deletions src/AsyncSubject.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import {Subject} from './Subject';
import {Subscriber} from './Subscriber';
import {Subscription} from './Subscription';
import { Subject } from './Subject';
import { Subscriber } from './Subscriber';
import { Subscription } from './Subscription';

/**
* @class AsyncSubject<T>
Expand Down
8 changes: 4 additions & 4 deletions src/BehaviorSubject.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import {Subject} from './Subject';
import {Subscriber} from './Subscriber';
import {Subscription, ISubscription} from './Subscription';
import {ObjectUnsubscribedError} from './util/ObjectUnsubscribedError';
import { Subject } from './Subject';
import { Subscriber } from './Subscriber';
import { Subscription, ISubscription } from './Subscription';
import { ObjectUnsubscribedError } from './util/ObjectUnsubscribedError';

/**
* @class BehaviorSubject<T>
Expand Down
4 changes: 2 additions & 2 deletions src/InnerSubscriber.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import {Subscriber} from './Subscriber';
import {OuterSubscriber} from './OuterSubscriber';
import { Subscriber } from './Subscriber';
import { OuterSubscriber } from './OuterSubscriber';

/**
* We need this JSDoc comment for affecting ESDoc.
Expand Down
6 changes: 3 additions & 3 deletions src/MiscJSDoc.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@
* we need these bogus classes, which are not stripped away. This file on the
* other hand, is not included in the release bundle.
*/
import {Subscriber} from './Subscriber';
import {TeardownLogic} from './Subscription';
import {Observable} from './Observable';
import { Subscriber } from './Subscriber';
import { TeardownLogic } from './Subscription';
import { Observable } from './Observable';
import './scheduler/MiscJSDoc';
import './observable/dom/MiscJSDoc';

Expand Down
4 changes: 2 additions & 2 deletions src/Notification.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import {PartialObserver} from './Observer';
import {Observable} from './Observable';
import { PartialObserver } from './Observer';
import { Observable } from './Observable';

/**
* Represents a push-based event or value that an {@link Observable} can emit.
Expand Down
18 changes: 9 additions & 9 deletions src/Observable.ts
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
import {PartialObserver} from './Observer';
import {Operator} from './Operator';
import {Subscriber} from './Subscriber';
import {Subscription, AnonymousSubscription, TeardownLogic} from './Subscription';
import {root} from './util/root';
import {toSubscriber} from './util/toSubscriber';
import {IfObservable} from './observable/IfObservable';
import {ErrorObservable} from './observable/ErrorObservable';
import {$$observable} from './symbol/observable';
import { PartialObserver } from './Observer';
import { Operator } from './Operator';
import { Subscriber } from './Subscriber';
import { Subscription, AnonymousSubscription, TeardownLogic } from './Subscription';
import { root } from './util/root';
import { toSubscriber } from './util/toSubscriber';
import { IfObservable } from './observable/IfObservable';
import { ErrorObservable } from './observable/ErrorObservable';
import { $$observable } from './symbol/observable';

export interface Subscribable<T> {
subscribe(observerOrNext?: PartialObserver<T> | ((value: T) => void),
Expand Down
4 changes: 2 additions & 2 deletions src/Operator.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import {Subscriber} from './Subscriber';
import {TeardownLogic} from './Subscription';
import { Subscriber } from './Subscriber';
import { TeardownLogic } from './Subscription';

export interface Operator<T, R> {
call(subscriber: Subscriber<R>, source: any): TeardownLogic;
Expand Down
4 changes: 2 additions & 2 deletions src/OuterSubscriber.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import {Subscriber} from './Subscriber';
import {InnerSubscriber} from './InnerSubscriber';
import { Subscriber } from './Subscriber';
import { InnerSubscriber } from './InnerSubscriber';

/**
* We need this JSDoc comment for affecting ESDoc.
Expand Down
12 changes: 6 additions & 6 deletions src/ReplaySubject.ts
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import {Subject} from './Subject';
import {Scheduler} from './Scheduler';
import {queue} from './scheduler/queue';
import {Subscriber} from './Subscriber';
import {Subscription} from './Subscription';
import {ObserveOnSubscriber} from './operator/observeOn';
import { Subject } from './Subject';
import { Scheduler } from './Scheduler';
import { queue } from './scheduler/queue';
import { Subscriber } from './Subscriber';
import { Subscription } from './Subscription';
import { ObserveOnSubscriber } from './operator/observeOn';

/**
* @class ReplaySubject<T>
Expand Down
22 changes: 11 additions & 11 deletions src/Rx.ts
Original file line number Diff line number Diff line change
Expand Up @@ -162,17 +162,17 @@ export {TestScheduler} from './testing/TestScheduler';
export {VirtualTimeScheduler} from './scheduler/VirtualTimeScheduler';
export {AjaxRequest, AjaxResponse, AjaxError, AjaxTimeoutError} from './observable/dom/AjaxObservable';

import {asap} from './scheduler/asap';
import {async} from './scheduler/async';
import {queue} from './scheduler/queue';
import {animationFrame} from './scheduler/animationFrame';
import {AsapScheduler} from './scheduler/AsapScheduler';
import {AsyncScheduler} from './scheduler/AsyncScheduler';
import {QueueScheduler} from './scheduler/QueueScheduler';
import {AnimationFrameScheduler} from './scheduler/AnimationFrameScheduler';
import {$$rxSubscriber as rxSubscriber} from './symbol/rxSubscriber';
import {$$iterator as iterator} from './symbol/iterator';
import {$$observable as observable} from './symbol/observable';
import { asap } from './scheduler/asap';
import { async } from './scheduler/async';
import { queue } from './scheduler/queue';
import { animationFrame } from './scheduler/animationFrame';
import { AsapScheduler } from './scheduler/AsapScheduler';
import { AsyncScheduler } from './scheduler/AsyncScheduler';
import { QueueScheduler } from './scheduler/QueueScheduler';
import { AnimationFrameScheduler } from './scheduler/AnimationFrameScheduler';
import { $$rxSubscriber as rxSubscriber } from './symbol/rxSubscriber';
import { $$iterator as iterator } from './symbol/iterator';
import { $$observable as observable } from './symbol/observable';

/* tslint:enable:no-unused-variable */

Expand Down
4 changes: 2 additions & 2 deletions src/Scheduler.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import {Action} from './scheduler/Action';
import {Subscription} from './Subscription';
import { Action } from './scheduler/Action';
import { Subscription } from './Subscription';

/**
* An execution context and a data structure to order tasks and schedule their
Expand Down
16 changes: 8 additions & 8 deletions src/Subject.ts
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
import {Operator} from './Operator';
import {Observer} from './Observer';
import {Observable} from './Observable';
import {Subscriber} from './Subscriber';
import {ISubscription, Subscription} from './Subscription';
import {ObjectUnsubscribedError} from './util/ObjectUnsubscribedError';
import {SubjectSubscription} from './SubjectSubscription';
import {$$rxSubscriber} from './symbol/rxSubscriber';
import { Operator } from './Operator';
import { Observer } from './Observer';
import { Observable } from './Observable';
import { Subscriber } from './Subscriber';
import { ISubscription, Subscription } from './Subscription';
import { ObjectUnsubscribedError } from './util/ObjectUnsubscribedError';
import { SubjectSubscription } from './SubjectSubscription';
import { $$rxSubscriber } from './symbol/rxSubscriber';

/**
* @class SubjectSubscriber<T>
Expand Down
6 changes: 3 additions & 3 deletions src/SubjectSubscription.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import {Subject} from './Subject';
import {Observer} from './Observer';
import {Subscription} from './Subscription';
import { Subject } from './Subject';
import { Observer } from './Observer';
import { Subscription } from './Subscription';

/**
* We need this JSDoc comment for affecting ESDoc.
Expand Down
10 changes: 5 additions & 5 deletions src/Subscriber.ts
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import {isFunction} from './util/isFunction';
import {Observer, PartialObserver} from './Observer';
import {Subscription} from './Subscription';
import {empty as emptyObserver} from './Observer';
import {$$rxSubscriber} from './symbol/rxSubscriber';
import { isFunction } from './util/isFunction';
import { Observer, PartialObserver } from './Observer';
import { Subscription } from './Subscription';
import { empty as emptyObserver } from './Observer';
import { $$rxSubscriber } from './symbol/rxSubscriber';

/**
* Implements the {@link Observer} interface and extends the
Expand Down
12 changes: 6 additions & 6 deletions src/Subscription.ts
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import {isArray} from './util/isArray';
import {isObject} from './util/isObject';
import {isFunction} from './util/isFunction';
import {tryCatch} from './util/tryCatch';
import {errorObject} from './util/errorObject';
import {UnsubscriptionError} from './util/UnsubscriptionError';
import { isArray } from './util/isArray';
import { isObject } from './util/isObject';
import { isFunction } from './util/isFunction';
import { tryCatch } from './util/tryCatch';
import { errorObject } from './util/errorObject';
import { UnsubscriptionError } from './util/UnsubscriptionError';

export interface AnonymousSubscription {
unsubscribe(): void;
Expand Down
4 changes: 2 additions & 2 deletions src/add/observable/bindCallback.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import {Observable} from '../../Observable';
import {bindCallback as staticBindCallback} from '../../observable/bindCallback';
import { Observable } from '../../Observable';
import { bindCallback as staticBindCallback } from '../../observable/bindCallback';

Observable.bindCallback = staticBindCallback;

Expand Down
4 changes: 2 additions & 2 deletions src/add/observable/bindNodeCallback.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import {Observable} from '../../Observable';
import {bindNodeCallback as staticBindNodeCallback} from '../../observable/bindNodeCallback';
import { Observable } from '../../Observable';
import { bindNodeCallback as staticBindNodeCallback } from '../../observable/bindNodeCallback';

Observable.bindNodeCallback = staticBindNodeCallback;

Expand Down
4 changes: 2 additions & 2 deletions src/add/observable/combineLatest.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import {Observable} from '../../Observable';
import {combineLatest as combineLatestStatic} from '../../observable/combineLatest';
import { Observable } from '../../Observable';
import { combineLatest as combineLatestStatic } from '../../observable/combineLatest';

Observable.combineLatest = combineLatestStatic;

Expand Down
4 changes: 2 additions & 2 deletions src/add/observable/concat.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import {Observable} from '../../Observable';
import {concat as concatStatic} from '../../observable/concat';
import { Observable } from '../../Observable';
import { concat as concatStatic } from '../../observable/concat';

Observable.concat = concatStatic;

Expand Down
4 changes: 2 additions & 2 deletions src/add/observable/defer.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import {Observable} from '../../Observable';
import {defer as staticDefer} from '../../observable/defer';
import { Observable } from '../../Observable';
import { defer as staticDefer } from '../../observable/defer';

Observable.defer = staticDefer;

Expand Down
6 changes: 3 additions & 3 deletions src/add/observable/dom/ajax.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import {Observable} from '../../../Observable';
import {ajax as staticAjax} from '../../../observable/dom/ajax';
import {AjaxCreationMethod} from '../../../observable/dom/AjaxObservable';
import { Observable } from '../../../Observable';
import { ajax as staticAjax } from '../../../observable/dom/ajax';
import { AjaxCreationMethod } from '../../../observable/dom/AjaxObservable';

Observable.ajax = staticAjax;

Expand Down
4 changes: 2 additions & 2 deletions src/add/observable/dom/webSocket.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import {Observable} from '../../../Observable';
import {webSocket as staticWebSocket} from '../../../observable/dom/webSocket';
import { Observable } from '../../../Observable';
import { webSocket as staticWebSocket } from '../../../observable/dom/webSocket';

Observable.webSocket = staticWebSocket;

Expand Down
4 changes: 2 additions & 2 deletions src/add/observable/empty.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import {Observable} from '../../Observable';
import {empty as staticEmpty} from '../../observable/empty';
import { Observable } from '../../Observable';
import { empty as staticEmpty } from '../../observable/empty';

Observable.empty = staticEmpty;

Expand Down
4 changes: 2 additions & 2 deletions src/add/observable/forkJoin.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import {Observable} from '../../Observable';
import {forkJoin as staticForkJoin} from '../../observable/forkJoin';
import { Observable } from '../../Observable';
import { forkJoin as staticForkJoin } from '../../observable/forkJoin';

Observable.forkJoin = staticForkJoin;

Expand Down
4 changes: 2 additions & 2 deletions src/add/observable/from.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import {Observable} from '../../Observable';
import {from as staticFrom} from '../../observable/from';
import { Observable } from '../../Observable';
import { from as staticFrom } from '../../observable/from';

Observable.from = staticFrom;

Expand Down
4 changes: 2 additions & 2 deletions src/add/observable/fromEvent.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import {Observable} from '../../Observable';
import {fromEvent as staticFromEvent} from '../../observable/fromEvent';
import { Observable } from '../../Observable';
import { fromEvent as staticFromEvent } from '../../observable/fromEvent';

Observable.fromEvent = staticFromEvent;

Expand Down
4 changes: 2 additions & 2 deletions src/add/observable/fromEventPattern.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import {Observable} from '../../Observable';
import {fromEventPattern as staticFromEventPattern} from '../../observable/fromEventPattern';
import { Observable } from '../../Observable';
import { fromEventPattern as staticFromEventPattern } from '../../observable/fromEventPattern';

Observable.fromEventPattern = staticFromEventPattern;

Expand Down
4 changes: 2 additions & 2 deletions src/add/observable/fromPromise.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import {Observable} from '../../Observable';
import {fromPromise as staticFromPromise} from '../../observable/fromPromise';
import { Observable } from '../../Observable';
import { fromPromise as staticFromPromise } from '../../observable/fromPromise';

Observable.fromPromise = staticFromPromise;

Expand Down
4 changes: 2 additions & 2 deletions src/add/observable/generate.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import {Observable} from '../../Observable';
import {GenerateObservable} from '../../observable/GenerateObservable';
import { Observable } from '../../Observable';
import { GenerateObservable } from '../../observable/GenerateObservable';

Observable.generate = GenerateObservable.create;

Expand Down
4 changes: 2 additions & 2 deletions src/add/observable/if.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import {Observable} from '../../Observable';
import {_if} from '../../observable/if';
import { Observable } from '../../Observable';
import { _if } from '../../observable/if';

Observable.if = _if;
4 changes: 2 additions & 2 deletions src/add/observable/interval.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import {Observable} from '../../Observable';
import {interval as staticInterval} from '../../observable/interval';
import { Observable } from '../../Observable';
import { interval as staticInterval } from '../../observable/interval';

Observable.interval = staticInterval;

Expand Down
4 changes: 2 additions & 2 deletions src/add/observable/merge.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import {Observable} from '../../Observable';
import {merge as mergeStatic} from '../../observable/merge';
import { Observable } from '../../Observable';
import { merge as mergeStatic } from '../../observable/merge';

Observable.merge = mergeStatic;

Expand Down
4 changes: 2 additions & 2 deletions src/add/observable/never.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import {Observable} from '../../Observable';
import {never as staticNever} from '../../observable/never';
import { Observable } from '../../Observable';
import { never as staticNever } from '../../observable/never';

Observable.never = staticNever;

Expand Down
4 changes: 2 additions & 2 deletions src/add/observable/of.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import {Observable} from '../../Observable';
import {of as staticOf} from '../../observable/of';
import { Observable } from '../../Observable';
import { of as staticOf } from '../../observable/of';

Observable.of = staticOf;

Expand Down
4 changes: 2 additions & 2 deletions src/add/observable/onErrorResumeNext.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import {Observable} from '../../Observable';
import {onErrorResumeNextStatic} from '../../operator/onErrorResumeNext';
import { Observable } from '../../Observable';
import { onErrorResumeNextStatic } from '../../operator/onErrorResumeNext';

Observable.onErrorResumeNext = onErrorResumeNextStatic;

Expand Down
4 changes: 2 additions & 2 deletions src/add/observable/pairs.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import {Observable} from '../../Observable';
import {pairs as staticPairs} from '../../observable/pairs';
import { Observable } from '../../Observable';
import { pairs as staticPairs } from '../../observable/pairs';

Observable.pairs = staticPairs;

Expand Down
4 changes: 2 additions & 2 deletions src/add/observable/race.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import {Observable} from '../../Observable';
import {raceStatic} from '../../operator/race';
import { Observable } from '../../Observable';
import { raceStatic } from '../../operator/race';

Observable.race = raceStatic;

Expand Down
4 changes: 2 additions & 2 deletions src/add/observable/range.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import {Observable} from '../../Observable';
import {range as staticRange} from '../../observable/range';
import { Observable } from '../../Observable';
import { range as staticRange } from '../../observable/range';

Observable.range = staticRange;

Expand Down
4 changes: 2 additions & 2 deletions src/add/observable/throw.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import {Observable} from '../../Observable';
import {_throw} from '../../observable/throw';
import { Observable } from '../../Observable';
import { _throw } from '../../observable/throw';

Observable.throw = _throw;
Loading

0 comments on commit fe61805

Please sign in to comment.