Skip to content

Commit

Permalink
Merge branch 'master' into unused-type-param-ErrorObservable
Browse files Browse the repository at this point in the history
  • Loading branch information
Tetsuharu OHZEKI authored Oct 26, 2016
2 parents 3a5770e + 0271fab commit 62d0364
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion src/observable/ConnectableObservable.ts
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@ class RefCountSubscriber<T> extends Subscriber<T> {
// Compare the local RefCountSubscriber's connection Subscription to the
// connection Subscription on the shared ConnectableObservable. In cases
// where the ConnectableObservable source synchronously emits values, and
// the RefCountSubscriber's dowstream Observers synchronously unsubscribe,
// the RefCountSubscriber's downstream Observers synchronously unsubscribe,
// execution continues to here before the RefCountOperator has a chance to
// supply the RefCountSubscriber with the shared connection Subscription.
// For example:
Expand Down
2 changes: 1 addition & 1 deletion src/observable/FromEventObservable.ts
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ export class FromEventObservable<T, R> extends Observable<T> {
* EventEmitter, NodeList or HTMLCollection to attach the event handler to.
* @param {string} eventName The event name of interest, being emitted by the
* `target`.
* @parm {EventListenerOptions} [options] Options to pass through to addEventListener
* @param {EventListenerOptions} [options] Options to pass through to addEventListener
* @param {SelectorMethodSignature<T>} [selector] An optional function to
* post-process results. It takes the arguments from the event handler and
* should return a single value.
Expand Down
6 changes: 3 additions & 3 deletions src/observable/GenerateObservable.ts
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ interface SchedulerState<T, S> {

export interface GenerateBaseOptions<S> {
/**
* Inital state.
* Initial state.
*/
initialState: S;
/**
Expand Down Expand Up @@ -124,7 +124,7 @@ export class GenerateObservable<T, S> extends Observable<T> {
* Generates an observable sequence by running a state-driven loop
* producing the sequence's elements, using the specified scheduler
* to send out observer messages.
* The overload accepts options object that might contain inital state, iterate,
* The overload accepts options object that might contain initial state, iterate,
* condition and scheduler.
*
* <img src="./img/generate.png" width="100%">
Expand All @@ -148,7 +148,7 @@ export class GenerateObservable<T, S> extends Observable<T> {
* Generates an observable sequence by running a state-driven loop
* producing the sequence's elements, using the specified scheduler
* to send out observer messages.
* The overload accepts options object that might contain inital state, iterate,
* The overload accepts options object that might contain initial state, iterate,
* condition, result selector and scheduler.
*
* <img src="./img/generate.png" width="100%">
Expand Down

0 comments on commit 62d0364

Please sign in to comment.