rxjs-rails 2.3.10 → 2.3.11

data/vendor/assets/javascripts/rx.lite.js

@@ -1,4 +1,4 @@
-// Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. See License.txt in the project root for license information.
+// Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. See License.txt in the project root for license information.
 
 ;(function (undefined) {
 
@@ -16,26 +16,26 @@
     freeModule = objectTypes[typeof module] && module && !module.nodeType && module,
     moduleExports = freeModule && freeModule.exports === freeExports && freeExports,
     freeGlobal = objectTypes[typeof global] && global;
-  
+
   if (freeGlobal && (freeGlobal.global === freeGlobal || freeGlobal.window === freeGlobal)) {
     root = freeGlobal;
   }
 
-  var Rx = { 
-      internals: {}, 
+  var Rx = {
+      internals: {},
       config: {
         Promise: root.Promise // Detect if promise exists
       },
       helpers: { }
   };
-    
+
   // Defaults
   var noop = Rx.helpers.noop = function () { },
     notDefined = Rx.helpers.notDefined = function (x) { return typeof x === 'undefined'; },
     isScheduler = Rx.helpers.isScheduler = function (x) { return x instanceof Rx.Scheduler; },
     identity = Rx.helpers.identity = function (x) { return x; },
     pluck = Rx.helpers.pluck = function (property) { return function (x) { return x[property]; }; },
-    just = Rx.helpers.just = function (value) { return function () { return value; }; },    
+    just = Rx.helpers.just = function (value) { return function () { return value; }; },
     defaultNow = Rx.helpers.defaultNow = Date.now,
     defaultComparer = Rx.helpers.defaultComparer = function (x, y) { return isEqual(x, y); },
     defaultSubComparer = Rx.helpers.defaultSubComparer = function (x, y) { return x > y ? 1 : (x < y ? -1 : 0); },
@@ -55,7 +55,7 @@
         isFn = function(value) {
           return typeof value == 'function' && toString.call(value) == '[object Function]';
         };
-      }    
+      }
 
       return isFn;
     }());
@@ -73,8 +73,10 @@
   if (root.Set && typeof new root.Set()['@@iterator'] === 'function') {
     $iterator$ = '@@iterator';
   }
-  
-  var doneEnumerator = { done: true, value: undefined };
+
+  var doneEnumerator = Rx.doneEnumerator = { done: true, value: undefined };
+
+  Rx.iterator = $iterator$;
 
   /** `Object#toString` result shortcuts */
   var argsClass = '[object Arguments]',
@@ -89,7 +91,7 @@
     stringClass = '[object String]';
 
   var toString = Object.prototype.toString,
-    hasOwnProperty = Object.prototype.hasOwnProperty,  
+    hasOwnProperty = Object.prototype.hasOwnProperty,
     supportsArgsClass = toString.call(arguments) == argsClass, // For less <IE9 && FF<4
     suportNodeClass,
     errorProto = Error.prototype,
@@ -118,7 +120,7 @@
       props = [];
 
     ctor.prototype = { 'valueOf': 1, 'y': 1 };
-    for (var key in new ctor) { props.push(key); }      
+    for (var key in new ctor) { props.push(key); }
     for (key in arguments) { }
 
     // Detect if `name` or `message` properties of `Error.prototype` are enumerable by default.
@@ -192,7 +194,7 @@
       }
     }
     return object;
-  }   
+  }
 
   function internalForIn(object, callback) {
     return internalFor(object, callback, keysIn);
@@ -213,10 +215,10 @@
     isArguments = function(value) {
       return (value && typeof value == 'object') ? hasOwnProperty.call(value, 'callee') : false;
     };
-  }     
+  }
 
   var isEqual = Rx.internals.isEqual = function (x, y) {
-    return deepEquals(x, y, [], []); 
+    return deepEquals(x, y, [], []);
   };
 
   /** @private
@@ -357,133 +359,132 @@
 
     return result;
   }
-    var slice = Array.prototype.slice;
-    function argsOrArray(args, idx) {
-        return args.length === 1 && Array.isArray(args[idx]) ?
-            args[idx] :
-            slice.call(args);
+
+  var slice = Array.prototype.slice;
+  function argsOrArray(args, idx) {
+    return args.length === 1 && Array.isArray(args[idx]) ?
+      args[idx] :
+      slice.call(args);
+  }
+  var hasProp = {}.hasOwnProperty;
+
+  var inherits = this.inherits = Rx.internals.inherits = function (child, parent) {
+    function __() { this.constructor = child; }
+    __.prototype = parent.prototype;
+    child.prototype = new __();
+  };
+
+  var addProperties = Rx.internals.addProperties = function (obj) {
+    var sources = slice.call(arguments, 1);
+    for (var i = 0, len = sources.length; i < len; i++) {
+      var source = sources[i];
+      for (var prop in source) {
+        obj[prop] = source[prop];
+      }
     }
-    var hasProp = {}.hasOwnProperty;
+  };
 
-    /** @private */
-    var inherits = this.inherits = Rx.internals.inherits = function (child, parent) {
-        function __() { this.constructor = child; }
-        __.prototype = parent.prototype;
-        child.prototype = new __();
-    };
+  // Rx Utils
+  var addRef = Rx.internals.addRef = function (xs, r) {
+    return new AnonymousObservable(function (observer) {
+      return new CompositeDisposable(r.getDisposable(), xs.subscribe(observer));
+    });
+  };
 
-    /** @private */    
-    var addProperties = Rx.internals.addProperties = function (obj) {
-        var sources = slice.call(arguments, 1);
-        for (var i = 0, len = sources.length; i < len; i++) {
-            var source = sources[i];
-            for (var prop in source) {
-                obj[prop] = source[prop];
-            }
-        }
-    };
+  function arrayInitialize(count, factory) {
+    var a = new Array(count);
+    for (var i = 0; i < count; i++) {
+      a[i] = factory();
+    }
+    return a;
+  }
 
-    // Rx Utils
-    var addRef = Rx.internals.addRef = function (xs, r) {
-        return new AnonymousObservable(function (observer) {
-            return new CompositeDisposable(r.getDisposable(), xs.subscribe(observer));
-        });
-    };
+  // Collections
+  function IndexedItem(id, value) {
+    this.id = id;
+    this.value = value;
+  }
 
-    // Collection polyfills
-    function arrayInitialize(count, factory) {
-        var a = new Array(count);
-        for (var i = 0; i < count; i++) {
-            a[i] = factory();
-        }
-        return a;
+  IndexedItem.prototype.compareTo = function (other) {
+    var c = this.value.compareTo(other.value);
+    c === 0 && (c = this.id - other.id);
+    return c;
+  };
+
+  // Priority Queue for Scheduling
+  var PriorityQueue = Rx.internals.PriorityQueue = function (capacity) {
+    this.items = new Array(capacity);
+    this.length = 0;
+  };
+
+  var priorityProto = PriorityQueue.prototype;
+  priorityProto.isHigherPriority = function (left, right) {
+    return this.items[left].compareTo(this.items[right]) < 0;
+  };
+
+  priorityProto.percolate = function (index) {
+    if (index >= this.length || index < 0) { return; }
+    var parent = index - 1 >> 1;
+    if (parent < 0 || parent === index) { return; }
+    if (this.isHigherPriority(index, parent)) {
+      var temp = this.items[index];
+      this.items[index] = this.items[parent];
+      this.items[parent] = temp;
+      this.percolate(parent);
     }
+  };
+
+  priorityProto.heapify = function (index) {
+    +index || (index = 0);
+    if (index >= this.length || index < 0) { return; }
+    var left = 2 * index + 1,
+        right = 2 * index + 2,
+        first = index;
+    if (left < this.length && this.isHigherPriority(left, first)) {
+      first = left;
+    }
+    if (right < this.length && this.isHigherPriority(right, first)) {
+      first = right;
+    }
+    if (first !== index) {
+      var temp = this.items[index];
+      this.items[index] = this.items[first];
+      this.items[first] = temp;
+      this.heapify(first);
+    }
+  };
+
+  priorityProto.peek = function () { return this.items[0].value; };
 
-  // Collections
-  function IndexedItem(id, value) {
-    this.id = id;
-    this.value = value;
-  }
-
-  IndexedItem.prototype.compareTo = function (other) {
-    var c = this.value.compareTo(other.value);
-    c === 0 && (c = this.id - other.id);
-    return c;
-  };
-
-  // Priority Queue for Scheduling
-  var PriorityQueue = Rx.internals.PriorityQueue = function (capacity) {
-    this.items = new Array(capacity);
-    this.length = 0;
-  };
-
-  var priorityProto = PriorityQueue.prototype;
-  priorityProto.isHigherPriority = function (left, right) {
-    return this.items[left].compareTo(this.items[right]) < 0;
-  };
-
-  priorityProto.percolate = function (index) {
-    if (index >= this.length || index < 0) { return; }
-    var parent = index - 1 >> 1;
-    if (parent < 0 || parent === index) { return; }
-    if (this.isHigherPriority(index, parent)) {
-      var temp = this.items[index];
-      this.items[index] = this.items[parent];
-      this.items[parent] = temp;
-      this.percolate(parent);
-    }
-  };
-
-  priorityProto.heapify = function (index) {
-    +index || (index = 0);
-    if (index >= this.length || index < 0) { return; }
-    var left = 2 * index + 1,
-        right = 2 * index + 2,
-        first = index;
-    if (left < this.length && this.isHigherPriority(left, first)) {
-      first = left;
-    }
-    if (right < this.length && this.isHigherPriority(right, first)) {
-      first = right;
-    }
-    if (first !== index) {
-      var temp = this.items[index];
-      this.items[index] = this.items[first];
-      this.items[first] = temp;
-      this.heapify(first);
-    }
-  };
-  
-  priorityProto.peek = function () { return this.items[0].value; };
-
-  priorityProto.removeAt = function (index) {
-    this.items[index] = this.items[--this.length];
-    delete this.items[this.length];
-    this.heapify();
-  };
-
-  priorityProto.dequeue = function () {
-    var result = this.peek();
-    this.removeAt(0);
-    return result;
-  };
-
-  priorityProto.enqueue = function (item) {
-    var index = this.length++;
-    this.items[index] = new IndexedItem(PriorityQueue.count++, item);
-    this.percolate(index);
-  };
-
-  priorityProto.remove = function (item) {
-    for (var i = 0; i < this.length; i++) {
-      if (this.items[i].value === item) {
-        this.removeAt(i);
-        return true;
-      }
-    }
-    return false;
-  };
+  priorityProto.removeAt = function (index) {
+    this.items[index] = this.items[--this.length];
+    delete this.items[this.length];
+    this.heapify();
+  };
+
+  priorityProto.dequeue = function () {
+    var result = this.peek();
+    this.removeAt(0);
+    return result;
+  };
+
+  priorityProto.enqueue = function (item) {
+    var index = this.length++;
+    this.items[index] = new IndexedItem(PriorityQueue.count++, item);
+    this.percolate(index);
+  };
+
+  priorityProto.remove = function (item) {
+    for (var i = 0; i < this.length; i++) {
+      if (this.items[i].value === item) {
+        this.removeAt(i);
+        return true;
+      }
+    }
+    return false;
+  };
   PriorityQueue.count = 0;
+
   /**
    * Represents a group of disposable resources that are disposed together.
    * @constructor
@@ -499,7 +500,7 @@
   /**
    * Adds a disposable to the CompositeDisposable or disposes the disposable if the CompositeDisposable is disposed.
    * @param {Mixed} item Disposable to add.
-   */    
+   */
   CompositeDisposablePrototype.add = function (item) {
     if (this.isDisposed) {
       item.dispose();
@@ -529,7 +530,7 @@
   };
 
   /**
-   *  Disposes all disposables in the group and removes them from the group.  
+   *  Disposes all disposables in the group and removes them from the group.
    */
   CompositeDisposablePrototype.dispose = function () {
     if (!this.isDisposed) {
@@ -547,15 +548,15 @@
   /**
    * Converts the existing CompositeDisposable to an array of disposables
    * @returns {Array} An array of disposable objects.
-   */  
+   */
   CompositeDisposablePrototype.toArray = function () {
     return this.disposables.slice(0);
   };
-  
+
   /**
    * Provides a set of static methods for creating Disposables.
    *
-   * @constructor 
+   * @constructor
    * @param {Function} dispose Action to run during the first call to dispose. The action is guaranteed to be run at most once.
    */
   var Disposable = Rx.Disposable = function (action) {
@@ -563,7 +564,7 @@
     this.action = action || noop;
   };
 
-  /** Performs the task of cleaning up resources. */     
+  /** Performs the task of cleaning up resources. */
   Disposable.prototype.dispose = function () {
     if (!this.isDisposed) {
       this.action();
@@ -578,8 +579,8 @@
    */
   var disposableCreate = Disposable.create = function (action) { return new Disposable(action); };
 
-  /** 
-   * Gets the disposable that does nothing when disposed. 
+  /**
+   * Gets the disposable that does nothing when disposed.
    */
   var disposableEmpty = Disposable.empty = { dispose: noop };
 
@@ -602,7 +603,7 @@
     /**
      * Sets the underlying disposable.
      * @param {Disposable} value The new underlying disposable.
-     */  
+     */
     booleanDisposablePrototype.setDisposable = function (value) {
       var shouldDispose = this.isDisposed, old;
       if (!shouldDispose) {
@@ -613,7 +614,7 @@
       shouldDispose && value && value.dispose();
     };
 
-    /** 
+    /**
      * Disposes the underlying disposable as well as all future replacements.
      */
     booleanDisposablePrototype.dispose = function () {
@@ -629,9 +630,10 @@
     return BooleanDisposable;
   }());
   var SerialDisposable = Rx.SerialDisposable = SingleAssignmentDisposable;
+
     /**
      * Represents a disposable resource that only disposes its underlying disposable resource when all dependent disposable objects have been disposed.
-     */  
+     */
     var RefCountDisposable = Rx.RefCountDisposable = (function () {
 
         function InnerDisposable(disposable) {
@@ -665,8 +667,8 @@
             this.count = 0;
         }
 
-        /** 
-         * Disposes the underlying disposable only when all dependent disposables have been disposed 
+        /**
+         * Disposes the underlying disposable only when all dependent disposables have been disposed
          */
         RefCountDisposable.prototype.dispose = function () {
             if (!this.isDisposed) {
@@ -681,9 +683,9 @@
         };
 
         /**
-         * Returns a dependent disposable that when disposed decreases the refcount on the underlying disposable.      
+         * Returns a dependent disposable that when disposed decreases the refcount on the underlying disposable.
          * @returns {Disposable} A dependent disposable contributing to the reference count that manages the underlying disposable's lifetime.
-         */        
+         */
         RefCountDisposable.prototype.getDisposable = function () {
             return this.isDisposed ? disposableEmpty : new InnerDisposable(this);
         };
@@ -691,30 +693,30 @@
         return RefCountDisposable;
     })();
 
-    var ScheduledItem = Rx.internals.ScheduledItem = function (scheduler, state, action, dueTime, comparer) {
-        this.scheduler = scheduler;
-        this.state = state;
-        this.action = action;
-        this.dueTime = dueTime;
-        this.comparer = comparer || defaultSubComparer;
-        this.disposable = new SingleAssignmentDisposable();
-    }
-
-    ScheduledItem.prototype.invoke = function () {
-        this.disposable.setDisposable(this.invokeCore());
-    };
-
-    ScheduledItem.prototype.compareTo = function (other) {
-        return this.comparer(this.dueTime, other.dueTime);
-    };
-
-    ScheduledItem.prototype.isCancelled = function () {
-        return this.disposable.isDisposed;
-    };
-
-    ScheduledItem.prototype.invokeCore = function () {
-        return this.action(this.scheduler, this.state);
-    };
+    var ScheduledItem = Rx.internals.ScheduledItem = function (scheduler, state, action, dueTime, comparer) {
+        this.scheduler = scheduler;
+        this.state = state;
+        this.action = action;
+        this.dueTime = dueTime;
+        this.comparer = comparer || defaultSubComparer;
+        this.disposable = new SingleAssignmentDisposable();
+    }
+
+    ScheduledItem.prototype.invoke = function () {
+        this.disposable.setDisposable(this.invokeCore());
+    };
+
+    ScheduledItem.prototype.compareTo = function (other) {
+        return this.comparer(this.dueTime, other.dueTime);
+    };
+
+    ScheduledItem.prototype.isCancelled = function () {
+        return this.disposable.isDisposed;
+    };
+
+    ScheduledItem.prototype.invokeCore = function () {
+        return this.action(this.scheduler, this.state);
+    };
 
   /** Provides a set of static properties to access commonly used schedulers. */
   var Scheduler = Rx.Scheduler = (function () {
@@ -782,7 +784,7 @@
     var schedulerProto = Scheduler.prototype;
 
     /**
-     * Schedules an action to be executed.        
+     * Schedules an action to be executed.
      * @param {Function} action Action to execute.
      * @returns {Disposable} The disposable object used to cancel the scheduled action (best effort).
      */
@@ -791,7 +793,7 @@
     };
 
     /**
-     * Schedules an action to be executed.    
+     * Schedules an action to be executed.
      * @param state State passed to the action to be executed.
      * @param {Function} action Action to be executed.
      * @returns {Disposable} The disposable object used to cancel the scheduled action (best effort).
@@ -801,7 +803,7 @@
     };
 
     /**
-     * Schedules an action to be executed after the specified relative due time.       
+     * Schedules an action to be executed after the specified relative due time.
      * @param {Function} action Action to execute.
      * @param {Number} dueTime Relative time after which to execute the action.
      * @returns {Disposable} The disposable object used to cancel the scheduled action (best effort).
@@ -811,7 +813,7 @@
     };
 
     /**
-     * Schedules an action to be executed after dueTime.     
+     * Schedules an action to be executed after dueTime.
      * @param state State passed to the action to be executed.
      * @param {Function} action Action to be executed.
      * @param {Number} dueTime Relative time after which to execute the action.
@@ -822,7 +824,7 @@
     };
 
     /**
-     * Schedules an action to be executed at the specified absolute due time.    
+     * Schedules an action to be executed at the specified absolute due time.
      * @param {Function} action Action to execute.
      * @param {Number} dueTime Absolute time at which to execute the action.
      * @returns {Disposable} The disposable object used to cancel the scheduled action (best effort).
@@ -832,7 +834,7 @@
     };
 
     /**
-     * Schedules an action to be executed at dueTime.     
+     * Schedules an action to be executed at dueTime.
      * @param {Mixed} state State passed to the action to be executed.
      * @param {Function} action Action to be executed.
      * @param {Number}dueTime Absolute time at which to execute the action.
@@ -849,7 +851,7 @@
      * Normalizes the specified TimeSpan value to a positive value.
      * @param {Number} timeSpan The time span value to normalize.
      * @returns {Number} The specified TimeSpan value if it is zero or positive; otherwise, 0
-     */   
+     */
     Scheduler.normalize = function (timeSpan) {
       timeSpan < 0 && (timeSpan = 0);
       return timeSpan;
@@ -859,7 +861,7 @@
   }());
 
   var normalizeTime = Scheduler.normalize;
-  
+
   (function (schedulerProto) {
     function invokeRecImmediate(scheduler, pair) {
       var state = pair.first, action = pair.second, group = new CompositeDisposable(),
@@ -924,7 +926,7 @@
     };
 
     /**
-     * Schedules an action to be executed recursively.     
+     * Schedules an action to be executed recursively.
      * @param {Mixed} state State passed to the action to be executed.
      * @param {Function} action Action to execute recursively. The last parameter passed to the action is used to trigger recursive scheduling of the action, passing in recursive invocation state.
      * @returns {Disposable} The disposable object used to cancel the scheduled action (best effort).
@@ -934,7 +936,7 @@
     };
 
     /**
-     * Schedules an action to be executed recursively after a specified relative due time.     
+     * Schedules an action to be executed recursively after a specified relative due time.
      * @param {Function} action Action to execute recursively. The parameter passed to the action is used to trigger recursive scheduling of the action at the specified relative time.
      * @param {Number}dueTime Relative time after which to execute the action for the first time.
      * @returns {Disposable} The disposable object used to cancel the scheduled action (best effort).
@@ -944,7 +946,7 @@
     };
 
     /**
-     * Schedules an action to be executed recursively after a specified relative due time.  
+     * Schedules an action to be executed recursively after a specified relative due time.
      * @param {Mixed} state State passed to the action to be executed.
      * @param {Function} action Action to execute recursively. The last parameter passed to the action is used to trigger recursive scheduling of the action, passing in the recursive due time and invocation state.
      * @param {Number}dueTime Relative time after which to execute the action for the first time.
@@ -957,7 +959,7 @@
     };
 
     /**
-     * Schedules an action to be executed recursively at a specified absolute due time.    
+     * Schedules an action to be executed recursively at a specified absolute due time.
      * @param {Function} action Action to execute recursively. The parameter passed to the action is used to trigger recursive scheduling of the action at the specified absolute time.
      * @param {Number}dueTime Absolute time at which to execute the action for the first time.
      * @returns {Disposable} The disposable object used to cancel the scheduled action (best effort).
@@ -967,7 +969,7 @@
     };
 
     /**
-     * Schedules an action to be executed recursively at a specified absolute due time.     
+     * Schedules an action to be executed recursively at a specified absolute due time.
      * @param {Mixed} state State passed to the action to be executed.
      * @param {Function} action Action to execute recursively. The last parameter passed to the action is used to trigger recursive scheduling of the action, passing in the recursive due time and invocation state.
      * @param {Number}dueTime Absolute time at which to execute the action for the first time.
@@ -977,23 +979,23 @@
       return this._scheduleAbsolute({ first: state, second: action }, dueTime, function (s, p) {
         return invokeRecDate(s, p, 'scheduleWithAbsoluteAndState');
       });
-    };  
+    };
   }(Scheduler.prototype));
 
   (function (schedulerProto) {
 
     /**
-     * Schedules a periodic piece of work by dynamically discovering the scheduler's capabilities. The periodic task will be scheduled using window.setInterval for the base implementation.       
+     * Schedules a periodic piece of work by dynamically discovering the scheduler's capabilities. The periodic task will be scheduled using window.setInterval for the base implementation.
      * @param {Number} period Period for running the work periodically.
      * @param {Function} action Action to be executed.
      * @returns {Disposable} The disposable object used to cancel the scheduled recurring action (best effort).
-     */        
+     */
     Scheduler.prototype.schedulePeriodic = function (period, action) {
       return this.schedulePeriodicWithState(null, period, action);
     };
 
     /**
-     * Schedules a periodic piece of work by dynamically discovering the scheduler's capabilities. The periodic task will be scheduled using window.setInterval for the base implementation.       
+     * Schedules a periodic piece of work by dynamically discovering the scheduler's capabilities. The periodic task will be scheduled using window.setInterval for the base implementation.
      * @param {Mixed} state Initial state passed to the action upon the first iteration.
      * @param {Number} period Period for running the work periodically.
      * @param {Function} action Action to be executed, potentially updating the state.
@@ -1002,7 +1004,7 @@
     Scheduler.prototype.schedulePeriodicWithState = function(state, period, action) {
       if (typeof root.setInterval === 'undefined') { throw new Error('Periodic scheduling not supported.'); }
       var s = state;
-  
+
       var id = root.setInterval(function () {
         s = action(s);
       }, period);
@@ -1013,28 +1015,28 @@
     };
 
   }(Scheduler.prototype));
-  
-  /**
-   * Gets a scheduler that schedules work immediately on the current thread.
-   */    
-  var immediateScheduler = Scheduler.immediate = (function () {
-
-    function scheduleNow(state, action) { return action(this, state); }
-
-    function scheduleRelative(state, dueTime, action) {
-      var dt = normalizeTime(dt);
-      while (dt - this.now() > 0) { }
-      return action(this, state);
-    }
-
-    function scheduleAbsolute(state, dueTime, action) {
-      return this.scheduleWithRelativeAndState(state, dueTime - this.now(), action);
-    }
-
-    return new Scheduler(defaultNow, scheduleNow, scheduleRelative, scheduleAbsolute);
-  }());
-
-  /** 
+
+  /**
+   * Gets a scheduler that schedules work immediately on the current thread.
+   */
+  var immediateScheduler = Scheduler.immediate = (function () {
+
+    function scheduleNow(state, action) { return action(this, state); }
+
+    function scheduleRelative(state, dueTime, action) {
+      var dt = normalizeTime(dt);
+      while (dt - this.now() > 0) { }
+      return action(this, state);
+    }
+
+    function scheduleAbsolute(state, dueTime, action) {
+      return this.scheduleWithRelativeAndState(state, dueTime - this.now(), action);
+    }
+
+    return new Scheduler(defaultNow, scheduleNow, scheduleRelative, scheduleAbsolute);
+  }());
+
+  /**
    * Gets a scheduler that schedules work as soon as possible on the current thread.
    */
   var currentThreadScheduler = Scheduler.currentThread = (function () {
@@ -1068,7 +1070,7 @@
         queue.enqueue(si);
         try {
           runTrampoline(queue);
-        } catch (e) { 
+        } catch (e) {
           throw e;
         } finally {
           queue = null;
@@ -1084,7 +1086,7 @@
     }
 
     var currentScheduler = new Scheduler(defaultNow, scheduleNow, scheduleRelative, scheduleAbsolute);
-    
+
     currentScheduler.scheduleRequired = function () { return !queue; };
     currentScheduler.ensureTrampoline = function (action) {
       if (!queue) { this.schedule(action); } else { action(); }
@@ -1093,34 +1095,34 @@
     return currentScheduler;
   }());
 
-    var SchedulePeriodicRecursive = Rx.internals.SchedulePeriodicRecursive = (function () {
-        function tick(command, recurse) {
-            recurse(0, this._period);
-            try {
-                this._state = this._action(this._state);
-            } catch (e) {
-                this._cancel.dispose();
-                throw e;
-            }
-        }
-
-        function SchedulePeriodicRecursive(scheduler, state, period, action) {
-            this._scheduler = scheduler;
-            this._state = state;
-            this._period = period;
-            this._action = action;
-        }
-
-        SchedulePeriodicRecursive.prototype.start = function () {
-            var d = new SingleAssignmentDisposable();
-            this._cancel = d;
-            d.setDisposable(this._scheduler.scheduleRecursiveWithRelativeAndState(0, this._period, tick.bind(this)));
-
-            return d;
-        };
-
-        return SchedulePeriodicRecursive;
-    }());
+    var SchedulePeriodicRecursive = Rx.internals.SchedulePeriodicRecursive = (function () {
+        function tick(command, recurse) {
+            recurse(0, this._period);
+            try {
+                this._state = this._action(this._state);
+            } catch (e) {
+                this._cancel.dispose();
+                throw e;
+            }
+        }
+
+        function SchedulePeriodicRecursive(scheduler, state, period, action) {
+            this._scheduler = scheduler;
+            this._state = state;
+            this._period = period;
+            this._action = action;
+        }
+
+        SchedulePeriodicRecursive.prototype.start = function () {
+            var d = new SingleAssignmentDisposable();
+            this._cancel = d;
+            d.setDisposable(this._scheduler.scheduleRecursiveWithRelativeAndState(0, this._period, tick.bind(this)));
+
+            return d;
+        };
+
+        return SchedulePeriodicRecursive;
+    }());
 
   var scheduleMethod, clearMethod = noop;
   var localTimer = (function () {
@@ -1141,11 +1143,11 @@
       setTimeout: localSetTimeout,
       clearTimeout: localClearTimeout
     };
-  }());   
+  }());
   var localSetTimeout = localTimer.setTimeout,
     localClearTimeout = localTimer.clearTimeout;
 
-  (function () {   
+  (function () {
 
     var reNative = RegExp('^' +
       String(toString)
@@ -1161,7 +1163,7 @@
     function postMessageSupported () {
       // Ensure not in a worker
       if (!root.postMessage || root.importScripts) { return false; }
-      var isAsync = false, 
+      var isAsync = false,
           oldHandler = root.onmessage;
       // Test for async
       root.onmessage = function () { isAsync = true; };
@@ -1218,19 +1220,19 @@
       scheduleMethod = function (action) {
         var id = channelTaskId++;
         channelTasks[id] = action;
-        channel.port2.postMessage(id);     
+        channel.port2.postMessage(id);
       };
     } else if ('document' in root && 'onreadystatechange' in root.document.createElement('script')) {
-        
+
       scheduleMethod = function (action) {
         var scriptElement = root.document.createElement('script');
-        scriptElement.onreadystatechange = function () { 
+        scriptElement.onreadystatechange = function () {
           action();
           scriptElement.onreadystatechange = null;
           scriptElement.parentNode.removeChild(scriptElement);
-          scriptElement = null;  
+          scriptElement = null;
         };
-        root.document.documentElement.appendChild(scriptElement);  
+        root.document.documentElement.appendChild(scriptElement);
       };
 
     } else {
@@ -1239,7 +1241,7 @@
     }
   }());
 
-  /** 
+  /**
    * Gets a scheduler that schedules work via a timed callback based upon platform.
    */
   var timeoutScheduler = Scheduler.timeout = (function () {
@@ -1285,14 +1287,14 @@
    *  Represents a notification to an observer.
    */
   var Notification = Rx.Notification = (function () {
-    function Notification(kind, hasValue) { 
+    function Notification(kind, hasValue) {
       this.hasValue = hasValue == null ? false : hasValue;
       this.kind = kind;
     }
 
     /**
      * Invokes the delegate corresponding to the notification or the observer's method corresponding to the notification and returns the produced result.
-     * 
+     *
      * @memberOf Notification
      * @param {Any} observerOrOnNext Delegate to invoke for an OnNext notification or Observer to invoke the notification on..
      * @param {Function} onError Delegate to invoke for an OnError notification.
@@ -1307,7 +1309,7 @@
 
     /**
      * Returns an observable sequence with a single notification.
-     * 
+     *
      * @memberOf Notifications
      * @param {Scheduler} [scheduler] Scheduler to send out the notification calls on.
      * @returns {Observable} The observable sequence that surfaces the behavior of the notification upon subscription.
@@ -1387,299 +1389,280 @@
       };
   }());
 
-  var Enumerator = Rx.internals.Enumerator = function (next) {
-    this._next = next;
-  };
-
-  Enumerator.prototype.next = function () {
-    return this._next();
-  };
-
-  Enumerator.prototype[$iterator$] = function () { return this; }
-
-  var Enumerable = Rx.internals.Enumerable = function (iterator) {
-    this._iterator = iterator;
-  };
-
-  Enumerable.prototype[$iterator$] = function () {
-    return this._iterator();
-  };
-
-  Enumerable.prototype.concat = function () {
-    var sources = this;
-    return new AnonymousObservable(function (observer) {
-      var e;
-      try {
-        e = sources[$iterator$]();
-      } catch(err) {
-        observer.onError();
-        return;
-      }
-
-      var isDisposed, 
-        subscription = new SerialDisposable();
-      var cancelable = immediateScheduler.scheduleRecursive(function (self) {
-        var currentItem;
-        if (isDisposed) { return; }
-
-        try {
-          currentItem = e.next();
-        } catch (ex) {
-          observer.onError(ex);
-          return;
-        }
-
-        if (currentItem.done) {
-          observer.onCompleted();
-          return;
-        }
-
-        // Check if promise
-        var currentValue = currentItem.value;
-        isPromise(currentValue) && (currentValue = observableFromPromise(currentValue));
-
-        var d = new SingleAssignmentDisposable();
-        subscription.setDisposable(d);
-        d.setDisposable(currentValue.subscribe(
-          observer.onNext.bind(observer),
-          observer.onError.bind(observer),
-          function () { self(); })
-        );
-      });
-
-      return new CompositeDisposable(subscription, cancelable, disposableCreate(function () {
-        isDisposed = true;
-      }));
-    });
-  };
-
-  Enumerable.prototype.catchException = function () {
-    var sources = this;
-    return new AnonymousObservable(function (observer) {
-      var e;
-      try {
-        e = sources[$iterator$]();
-      } catch(err) {
-        observer.onError();
-        return;
-      }
-
-      var isDisposed, 
-        lastException,
-        subscription = new SerialDisposable();
-      var cancelable = immediateScheduler.scheduleRecursive(function (self) {
-        if (isDisposed) { return; }
-
-        var currentItem;
-        try {
-          currentItem = e.next();
-        } catch (ex) {
-          observer.onError(ex);
-          return;
-        }
-
-        if (currentItem.done) {
-          if (lastException) {
-            observer.onError(lastException);
-          } else {
-            observer.onCompleted();
-          }
-          return;
-        }
-
-        // Check if promise
-        var currentValue = currentItem.value;
-        isPromise(currentValue) && (currentValue = observableFromPromise(currentValue));        
-
-        var d = new SingleAssignmentDisposable();
-        subscription.setDisposable(d);
-        d.setDisposable(currentValue.subscribe(
-          observer.onNext.bind(observer),
-          function (exn) {
-            lastException = exn;
-            self();
-          },
-          observer.onCompleted.bind(observer)));
-      });
-      return new CompositeDisposable(subscription, cancelable, disposableCreate(function () {
-        isDisposed = true;
-      }));
-    });
-  };
-
-  var enumerableRepeat = Enumerable.repeat = function (value, repeatCount) {
-    if (repeatCount == null) { repeatCount = -1; }
-    return new Enumerable(function () {
-      var left = repeatCount;
-      return new Enumerator(function () {
-        if (left === 0) { return doneEnumerator; }
-        if (left > 0) { left--; }
-        return { done: false, value: value };
-      });
-    });
-  };
-
-  var enumerableFor = Enumerable.forEach = function (source, selector, thisArg) {
-    selector || (selector = identity);
-    return new Enumerable(function () {
-      var index = -1;
-      return new Enumerator(
-        function () {
-          return ++index < source.length ?
-            { done: false, value: selector.call(thisArg, source[index], index, source) } :
-            doneEnumerator;
-        });
-    });
-  };
+  var Enumerator = Rx.internals.Enumerator = function (next) {
+    this._next = next;
+  };
+
+  Enumerator.prototype.next = function () {
+    return this._next();
+  };
+
+  Enumerator.prototype[$iterator$] = function () { return this; }
+
+  var Enumerable = Rx.internals.Enumerable = function (iterator) {
+    this._iterator = iterator;
+  };
+
+  Enumerable.prototype[$iterator$] = function () {
+    return this._iterator();
+  };
+
+  Enumerable.prototype.concat = function () {
+    var sources = this;
+    return new AnonymousObservable(function (observer) {
+      var e;
+      try {
+        e = sources[$iterator$]();
+      } catch(err) {
+        observer.onError();
+        return;
+      }
+
+      var isDisposed,
+        subscription = new SerialDisposable();
+      var cancelable = immediateScheduler.scheduleRecursive(function (self) {
+        var currentItem;
+        if (isDisposed) { return; }
+
+        try {
+          currentItem = e.next();
+        } catch (ex) {
+          observer.onError(ex);
+          return;
+        }
+
+        if (currentItem.done) {
+          observer.onCompleted();
+          return;
+        }
+
+        // Check if promise
+        var currentValue = currentItem.value;
+        isPromise(currentValue) && (currentValue = observableFromPromise(currentValue));
+
+        var d = new SingleAssignmentDisposable();
+        subscription.setDisposable(d);
+        d.setDisposable(currentValue.subscribe(
+          observer.onNext.bind(observer),
+          observer.onError.bind(observer),
+          function () { self(); })
+        );
+      });
+
+      return new CompositeDisposable(subscription, cancelable, disposableCreate(function () {
+        isDisposed = true;
+      }));
+    });
+  };
+
+  Enumerable.prototype.catchException = function () {
+    var sources = this;
+    return new AnonymousObservable(function (observer) {
+      var e;
+      try {
+        e = sources[$iterator$]();
+      } catch(err) {
+        observer.onError();
+        return;
+      }
+
+      var isDisposed,
+        lastException,
+        subscription = new SerialDisposable();
+      var cancelable = immediateScheduler.scheduleRecursive(function (self) {
+        if (isDisposed) { return; }
+
+        var currentItem;
+        try {
+          currentItem = e.next();
+        } catch (ex) {
+          observer.onError(ex);
+          return;
+        }
+
+        if (currentItem.done) {
+          if (lastException) {
+            observer.onError(lastException);
+          } else {
+            observer.onCompleted();
+          }
+          return;
+        }
+
+        // Check if promise
+        var currentValue = currentItem.value;
+        isPromise(currentValue) && (currentValue = observableFromPromise(currentValue));
+
+        var d = new SingleAssignmentDisposable();
+        subscription.setDisposable(d);
+        d.setDisposable(currentValue.subscribe(
+          observer.onNext.bind(observer),
+          function (exn) {
+            lastException = exn;
+            self();
+          },
+          observer.onCompleted.bind(observer)));
+      });
+      return new CompositeDisposable(subscription, cancelable, disposableCreate(function () {
+        isDisposed = true;
+      }));
+    });
+  };
+
+  var enumerableRepeat = Enumerable.repeat = function (value, repeatCount) {
+    if (repeatCount == null) { repeatCount = -1; }
+    return new Enumerable(function () {
+      var left = repeatCount;
+      return new Enumerator(function () {
+        if (left === 0) { return doneEnumerator; }
+        if (left > 0) { left--; }
+        return { done: false, value: value };
+      });
+    });
+  };
+
+  var enumerableOf = Enumerable.of = function (source, selector, thisArg) {
+    selector || (selector = identity);
+    return new Enumerable(function () {
+      var index = -1;
+      return new Enumerator(
+        function () {
+          return ++index < source.length ?
+            { done: false, value: selector.call(thisArg, source[index], index, source) } :
+            doneEnumerator;
+        });
+    });
+  };
+
+  /**
+   * Supports push-style iteration over an observable sequence.
+   */
+  var Observer = Rx.Observer = function () { };
+
+  /**
+   *  Creates a notification callback from an observer.
+   * @returns The action that forwards its input notification to the underlying observer.
+   */
+  Observer.prototype.toNotifier = function () {
+    var observer = this;
+    return function (n) { return n.accept(observer); };
+  };
+
+  /**
+   *  Hides the identity of an observer.
+   * @returns An observer that hides the identity of the specified observer.
+   */
+  Observer.prototype.asObserver = function () {
+      return new AnonymousObserver(this.onNext.bind(this), this.onError.bind(this), this.onCompleted.bind(this));
+  };
+
+  /**
+   *  Creates an observer from the specified OnNext, along with optional OnError, and OnCompleted actions.
+   * @param {Function} [onNext] Observer's OnNext action implementation.
+   * @param {Function} [onError] Observer's OnError action implementation.
+   * @param {Function} [onCompleted] Observer's OnCompleted action implementation.
+   * @returns {Observer} The observer object implemented using the given actions.
+   */
+  var observerCreate = Observer.create = function (onNext, onError, onCompleted) {
+    onNext || (onNext = noop);
+    onError || (onError = defaultError);
+    onCompleted || (onCompleted = noop);
+    return new AnonymousObserver(onNext, onError, onCompleted);
+  };
+
+  /**
+   *  Creates an observer from a notification callback.
+   * @param {Function} handler Action that handles a notification.
+   * @returns The observer object that invokes the specified handler using a notification corresponding to each message it receives.
+   */
+  Observer.fromNotifier = function (handler, thisArg) {
+    return new AnonymousObserver(function (x) {
+      return handler.call(thisArg, notificationCreateOnNext(x));
+    }, function (e) {
+      return handler.call(thisArg, notificationCreateOnError(e));
+    }, function () {
+      return handler.call(thisArg, notificationCreateOnCompleted());
+    });
+  };
+
+  /**
+   * Abstract base class for implementations of the Observer class.
+   * This base class enforces the grammar of observers where OnError and OnCompleted are terminal messages.
+   */
+  var AbstractObserver = Rx.internals.AbstractObserver = (function (__super__) {
+    inherits(AbstractObserver, __super__);
 
     /**
-     * Supports push-style iteration over an observable sequence.
+     * Creates a new observer in a non-stopped state.
      */
-    var Observer = Rx.Observer = function () { };
+    function AbstractObserver() {
+      this.isStopped = false;
+      __super__.call(this);
+    }
 
     /**
-     *  Creates a notification callback from an observer.
-     *  
-     * @param observer Observer object.
-     * @returns The action that forwards its input notification to the underlying observer.
+     * Notifies the observer of a new element in the sequence.
+     * @param {Any} value Next element in the sequence.
      */
-    Observer.prototype.toNotifier = function () {
-        var observer = this;
-        return function (n) {
-            return n.accept(observer);
-        };
+    AbstractObserver.prototype.onNext = function (value) {
+      if (!this.isStopped) { this.next(value); }
     };
 
     /**
-     *  Hides the identity of an observer.
-
-     * @returns An observer that hides the identity of the specified observer. 
-     */   
-    Observer.prototype.asObserver = function () {
-        return new AnonymousObserver(this.onNext.bind(this), this.onError.bind(this), this.onCompleted.bind(this));
+     * Notifies the observer that an exception has occurred.
+     * @param {Any} error The error that has occurred.
+     */
+    AbstractObserver.prototype.onError = function (error) {
+      if (!this.isStopped) {
+        this.isStopped = true;
+        this.error(error);
+      }
     };
 
     /**
-     *  Creates an observer from the specified OnNext, along with optional OnError, and OnCompleted actions.
-     *  
-     * @static
-     * @memberOf Observer
-     * @param {Function} [onNext] Observer's OnNext action implementation.
-     * @param {Function} [onError] Observer's OnError action implementation.
-     * @param {Function} [onCompleted] Observer's OnCompleted action implementation.
-     * @returns {Observer} The observer object implemented using the given actions.
+     * Notifies the observer of the end of the sequence.
      */
-    var observerCreate = Observer.create = function (onNext, onError, onCompleted) {
-        onNext || (onNext = noop);
-        onError || (onError = defaultError);
-        onCompleted || (onCompleted = noop);
-        return new AnonymousObserver(onNext, onError, onCompleted);
+    AbstractObserver.prototype.onCompleted = function () {
+      if (!this.isStopped) {
+        this.isStopped = true;
+        this.completed();
+      }
     };
 
     /**
-     *  Creates an observer from a notification callback.
-     *  
-     * @static
-     * @memberOf Observer
-     * @param {Function} handler Action that handles a notification.
-     * @returns The observer object that invokes the specified handler using a notification corresponding to each message it receives.
+     * Disposes the observer, causing it to transition to the stopped state.
      */
-    Observer.fromNotifier = function (handler) {
-        return new AnonymousObserver(function (x) {
-            return handler(notificationCreateOnNext(x));
-        }, function (exception) {
-            return handler(notificationCreateOnError(exception));
-        }, function () {
-            return handler(notificationCreateOnCompleted());
-        });
+    AbstractObserver.prototype.dispose = function () {
+      this.isStopped = true;
     };
-    
-    /**
-     * Abstract base class for implementations of the Observer class.
-     * This base class enforces the grammar of observers where OnError and OnCompleted are terminal messages. 
-     */
-    var AbstractObserver = Rx.internals.AbstractObserver = (function (_super) {
-        inherits(AbstractObserver, _super);
-
-        /**
-         * Creates a new observer in a non-stopped state.
-         *
-         * @constructor
-         */
-        function AbstractObserver() {
-            this.isStopped = false;
-            _super.call(this);
-        }
-
-        /**
-         * Notifies the observer of a new element in the sequence.
-         *  
-         * @memberOf AbstractObserver
-         * @param {Any} value Next element in the sequence. 
-         */
-        AbstractObserver.prototype.onNext = function (value) {
-            if (!this.isStopped) {
-                this.next(value);
-            }
-        };
-
-        /**
-         * Notifies the observer that an exception has occurred.
-         * 
-         * @memberOf AbstractObserver
-         * @param {Any} error The error that has occurred.     
-         */    
-        AbstractObserver.prototype.onError = function (error) {
-            if (!this.isStopped) {
-                this.isStopped = true;
-                this.error(error);
-            }
-        };
-
-        /**
-         * Notifies the observer of the end of the sequence.
-         */    
-        AbstractObserver.prototype.onCompleted = function () {
-            if (!this.isStopped) {
-                this.isStopped = true;
-                this.completed();
-            }
-        };
-
-        /**
-         * Disposes the observer, causing it to transition to the stopped state.
-         */
-        AbstractObserver.prototype.dispose = function () {
-            this.isStopped = true;
-        };
 
-        AbstractObserver.prototype.fail = function (e) {
-            if (!this.isStopped) {
-                this.isStopped = true;
-                this.error(e);
-                return true;
-            }
+    AbstractObserver.prototype.fail = function (e) {
+      if (!this.isStopped) {
+        this.isStopped = true;
+        this.error(e);
+        return true;
+      }
 
-            return false;
-        };
+      return false;
+    };
 
-        return AbstractObserver;
-    }(Observer));
+    return AbstractObserver;
+  }(Observer));
 
   /**
    * Class to create an Observer instance from delegate-based implementations of the on* methods.
    */
-  var AnonymousObserver = Rx.AnonymousObserver = (function (_super) {
-    inherits(AnonymousObserver, _super);
+  var AnonymousObserver = Rx.AnonymousObserver = (function (__super__) {
+    inherits(AnonymousObserver, __super__);
 
     /**
      * Creates an observer from the specified OnNext, OnError, and OnCompleted actions.
      * @param {Any} onNext Observer's OnNext action implementation.
      * @param {Any} onError Observer's OnError action implementation.
-     * @param {Any} onCompleted Observer's OnCompleted action implementation.  
-     */      
+     * @param {Any} onCompleted Observer's OnCompleted action implementation.
+     */
     function AnonymousObserver(onNext, onError, onCompleted) {
-      _super.call(this);
+      __super__.call(this);
       this._onNext = onNext;
       this._onError = onError;
       this._onCompleted = onCompleted;
@@ -1687,23 +1670,23 @@
 
     /**
      * Calls the onNext action.
-     * @param {Any} value Next element in the sequence.   
-     */     
+     * @param {Any} value Next element in the sequence.
+     */
     AnonymousObserver.prototype.next = function (value) {
       this._onNext(value);
     };
 
     /**
      * Calls the onError action.
-     * @param {Any} error The error that has occurred.   
-     */     
-    AnonymousObserver.prototype.error = function (exception) {
-      this._onError(exception);
+     * @param {Any} error The error that has occurred.
+     */
+    AnonymousObserver.prototype.error = function (error) {
+      this._onError(error);
     };
 
     /**
      *  Calls the onCompleted action.
-     */        
+     */
     AnonymousObserver.prototype.completed = function () {
       this._onCompleted();
     };
@@ -1726,24 +1709,45 @@
 
     /**
      *  Subscribes an observer to the observable sequence.
-     *  
-     * @example
-     *  1 - source.subscribe();
-     *  2 - source.subscribe(observer);
-     *  3 - source.subscribe(function (x) { console.log(x); });
-     *  4 - source.subscribe(function (x) { console.log(x); }, function (err) { console.log(err); });
-     *  5 - source.subscribe(function (x) { console.log(x); }, function (err) { console.log(err); }, function () { console.log('done'); });
      *  @param {Mixed} [observerOrOnNext] The object that is to receive notifications or an action to invoke for each element in the observable sequence.
      *  @param {Function} [onError] Action to invoke upon exceptional termination of the observable sequence.
      *  @param {Function} [onCompleted] Action to invoke upon graceful termination of the observable sequence.
-     *  @returns {Diposable} The source sequence whose subscriptions and unsubscriptions happen on the specified scheduler. 
+     *  @returns {Diposable} A disposable handling the subscriptions and unsubscriptions.
      */
     observableProto.subscribe = observableProto.forEach = function (observerOrOnNext, onError, onCompleted) {
-      var subscriber = typeof observerOrOnNext === 'object' ?
+      return this._subscribe(typeof observerOrOnNext === 'object' ?
         observerOrOnNext :
-        observerCreate(observerOrOnNext, onError, onCompleted);
+        observerCreate(observerOrOnNext, onError, onCompleted));
+    };
 
-      return this._subscribe(subscriber);
+    /**
+     * Subscribes to the next value in the sequence with an optional "this" argument.
+     * @param {Function} onNext The function to invoke on each element in the observable sequence.
+     * @param {Any} [thisArg] Object to use as this when executing callback.
+     * @returns {Disposable} A disposable handling the subscriptions and unsubscriptions.
+     */
+    observableProto.subscribeOnNext = function (onNext, thisArg) {
+      return this._subscribe(observerCreate(arguments.length === 2 ? function(x) { onNext.call(thisArg, x); } : onNext));
+    };
+
+    /**
+     * Subscribes to an exceptional condition in the sequence with an optional "this" argument.
+     * @param {Function} onError The function to invoke upon exceptional termination of the observable sequence.
+     * @param {Any} [thisArg] Object to use as this when executing callback.
+     * @returns {Disposable} A disposable handling the subscriptions and unsubscriptions.
+     */
+    observableProto.subscribeOnError = function (onError, thisArg) {
+      return this._subscribe(observerCreate(null, arguments.length === 2 ? function(e) { onError.call(thisArg, e); } : onError));
+    };
+
+    /**
+     * Subscribes to the next value in the sequence with an optional "this" argument.
+     * @param {Function} onCompleted The function to invoke upon graceful termination of the observable sequence.
+     * @param {Any} [thisArg] Object to use as this when executing callback.
+     * @returns {Disposable} A disposable handling the subscriptions and unsubscriptions.
+     */
+    observableProto.subscribeOnCompleted = function (onCompleted, thisArg) {
+      return this._subscribe(observerCreate(null, null, arguments.length === 2 ? function() { onCompleted.call(thisArg); } : onCompleted));
     };
 
     return Observable;
@@ -1820,7 +1824,7 @@
 
   /**
    * Creates a list from an observable sequence.
-   * @returns An observable sequence containing a single element with a list containing all the elements of the source sequence.  
+   * @returns An observable sequence containing a single element with a list containing all the elements of the source sequence.
    */
   observableProto.toArray = function () {
     var self = this;
@@ -1838,12 +1842,12 @@
 
   /**
    *  Creates an observable sequence from a specified subscribe method implementation.
-   *  
+   *
    * @example
    *  var res = Rx.Observable.create(function (observer) { return function () { } );
-   *  var res = Rx.Observable.create(function (observer) { return Rx.Disposable.empty; } ); 
-   *  var res = Rx.Observable.create(function (observer) { } ); 
-   *  
+   *  var res = Rx.Observable.create(function (observer) { return Rx.Disposable.empty; } );
+   *  var res = Rx.Observable.create(function (observer) { } );
+   *
    * @param {Function} subscribe Implementation of the resulting observable sequence's subscribe method, returning a function that will be wrapped in a Disposable.
    * @returns {Observable} The observable sequence with the specified implementation for the Subscribe method.
    */
@@ -1853,9 +1857,9 @@
 
   /**
    *  Returns an observable sequence that invokes the specified factory function whenever a new observer subscribes.
-   *  
+   *
    * @example
-   *  var res = Rx.Observable.defer(function () { return Rx.Observable.fromArray([1,2,3]); });    
+   *  var res = Rx.Observable.defer(function () { return Rx.Observable.fromArray([1,2,3]); });
    * @param {Function} observableFactory Observable factory function to invoke for each observer that subscribes to the resulting sequence or Promise.
    * @returns {Observable} An observable sequence whose observers trigger an invocation of the given observable factory function.
    */
@@ -1874,10 +1878,10 @@
 
   /**
    *  Returns an empty observable sequence, using the specified scheduler to send out the single OnCompleted message.
-   *  
+   *
    * @example
-   *  var res = Rx.Observable.empty();  
-   *  var res = Rx.Observable.empty(Rx.Scheduler.timeout);  
+   *  var res = Rx.Observable.empty();
+   *  var res = Rx.Observable.empty(Rx.Scheduler.timeout);
    * @param {Scheduler} [scheduler] Scheduler to send the termination call on.
    * @returns {Observable} An observable sequence with no elements.
    */
@@ -1915,7 +1919,7 @@
     var len = +o.length;
     if (isNaN(len)) { return 0; }
     if (len === 0 || !numberIsFinite(len)) { return len; }
-    len = sign(len) * Math.floor(Math.abs(len));        
+    len = sign(len) * Math.floor(Math.abs(len));
     if (len <= 0) { return 0; }
     if (len > maxSafeInteger) { return maxSafeInteger; }
     return len;
@@ -1967,7 +1971,7 @@
             } catch (e) {
               observer.onError(e);
               return;
-            }            
+            }
           }
 
           observer.onNext(result);
@@ -1979,9 +1983,10 @@
       });
     });
   };
+
   /**
    *  Converts an array to an observable sequence, using an optional scheduler to enumerate the array.
-   *  
+   *
    * @example
    *  var res = Rx.Observable.fromArray([1,2,3]);
    *  var res = Rx.Observable.fromArray([1,2,3], Rx.Scheduler.timeout);
@@ -2026,7 +2031,7 @@
   };
 
   /**
-   *  This method creates a new Observable instance with a variable number of arguments, regardless of number or type of the arguments. 
+   *  This method creates a new Observable instance with a variable number of arguments, regardless of number or type of the arguments.
    * @example
    *  var res = Rx.Observable.of(1,2,3);
    * @param {Scheduler} scheduler A scheduler to use for scheduling the arguments.
@@ -2040,7 +2045,7 @@
 
   /**
    *  Generates an observable sequence of integral numbers within a specified range, using the specified scheduler to send out observer messages.
-   *  
+   *
    * @example
    *  var res = Rx.Observable.range(0, 10);
    *  var res = Rx.Observable.range(0, 10, Rx.Scheduler.timeout);
@@ -2065,7 +2070,7 @@
 
   /**
    *  Generates an observable sequence that repeats the given element the specified number of times, using the specified scheduler to send out observer messages.
-   *  
+   *
    * @example
    *  var res = Rx.Observable.repeat(42);
    *  var res = Rx.Observable.repeat(42, 4);
@@ -2084,7 +2089,7 @@
   /**
    *  Returns an observable sequence that contains a single element, using the specified scheduler to send out observer messages.
    *  There is an alias called 'just', and 'returnValue' for browsers <IE9.
-   *  
+   *
    * @example
    *  var res = Rx.Observable.return(42);
    *  var res = Rx.Observable.return(42, Rx.Scheduler.timeout);
@@ -2136,7 +2141,7 @@
         subscription.setDisposable(d);
         d.setDisposable(result.subscribe(observer));
       }, observer.onCompleted.bind(observer)));
-      
+
       return subscription;
     });
   }
@@ -2148,25 +2153,21 @@
    * 2 - xs.catchException(function (ex) { return ys(ex); })
    * @param {Mixed} handlerOrSecond Exception handler function that returns an observable sequence given the error that occurred in the first sequence, or a second observable sequence used to produce results when an error occurred in the first sequence.
    * @returns {Observable} An observable sequence containing the first sequence's elements, followed by the elements of the handler sequence in case an exception occurred.
-   */      
-  observableProto['catch'] = observableProto.catchException = function (handlerOrSecond) {
+   */
+  observableProto['catch'] = observableProto.catchError = observableProto.catchException = function (handlerOrSecond) {
     return typeof handlerOrSecond === 'function' ?
       observableCatchHandler(this, handlerOrSecond) :
       observableCatch([this, handlerOrSecond]);
   };
 
-    /**
-     * Continues an observable sequence that is terminated by an exception with the next observable sequence.
-     * 
-     * @example
-     * 1 - res = Rx.Observable.catchException(xs, ys, zs);
-     * 2 - res = Rx.Observable.catchException([xs, ys, zs]);
-     * @returns {Observable} An observable sequence containing elements from consecutive source sequences until a source sequence terminates successfully.
-     */
-    var observableCatch = Observable.catchException = Observable['catch'] = function () {
-        var items = argsOrArray(arguments, 0);
-        return enumerableFor(items).catchException();
-    };
+  /**
+   * Continues an observable sequence that is terminated by an exception with the next observable sequence.
+   * @param {Array | Arguments} args Arguments or an array to use as the next sequence if an error occurs.
+   * @returns {Observable} An observable sequence containing elements from consecutive source sequences until a source sequence terminates successfully.
+   */
+  var observableCatch = Observable.catchException = Observable.catchError = Observable['catch'] = function () {
+    return enumerableOf(argsOrArray(arguments, 0)).catchException();
+  };
 
   /**
    * Merges the specified observable sequences into one observable sequence by using the selector function whenever any of the observable sequences or Promises produces an element.
@@ -2175,7 +2176,7 @@
    * @example
    * 1 - obs = observable.combineLatest(obs1, obs2, obs3, function (o1, o2, o3) { return o1 + o2 + o3; });
    * 2 - obs = observable.combineLatest([obs1, obs2, obs3], function (o1, o2, o3) { return o1 + o2 + o3; });
-   * @returns {Observable} An observable sequence containing the result of combining elements of the sources using the specified result selector function. 
+   * @returns {Observable} An observable sequence containing the result of combining elements of the sources using the specified result selector function.
    */
   observableProto.combineLatest = function () {
     var args = slice.call(arguments);
@@ -2189,15 +2190,15 @@
 
   /**
    * Merges the specified observable sequences into one observable sequence by using the selector function whenever any of the observable sequences or Promises produces an element.
-   * 
+   *
    * @example
    * 1 - obs = Rx.Observable.combineLatest(obs1, obs2, obs3, function (o1, o2, o3) { return o1 + o2 + o3; });
-   * 2 - obs = Rx.Observable.combineLatest([obs1, obs2, obs3], function (o1, o2, o3) { return o1 + o2 + o3; });     
+   * 2 - obs = Rx.Observable.combineLatest([obs1, obs2, obs3], function (o1, o2, o3) { return o1 + o2 + o3; });
    * @returns {Observable} An observable sequence containing the result of combining elements of the sources using the specified result selector function.
    */
   var combineLatest = Observable.combineLatest = function () {
     var args = slice.call(arguments), resultSelector = args.pop();
-    
+
     if (Array.isArray(args[0])) {
       args = args[0];
     }
@@ -2254,35 +2255,31 @@
 
     /**
      * Concatenates all the observable sequences.  This takes in either an array or variable arguments to concatenate.
-     * 
+     *
      * @example
      * 1 - concatenated = xs.concat(ys, zs);
      * 2 - concatenated = xs.concat([ys, zs]);
-     * @returns {Observable} An observable sequence that contains the elements of each given sequence, in sequential order. 
-     */ 
+     * @returns {Observable} An observable sequence that contains the elements of each given sequence, in sequential order.
+     */
     observableProto.concat = function () {
         var items = slice.call(arguments, 0);
         items.unshift(this);
         return observableConcat.apply(this, items);
     };
 
-    /**
-     * Concatenates all the observable sequences.
-     * 
-     * @example
-     * 1 - res = Rx.Observable.concat(xs, ys, zs);
-     * 2 - res = Rx.Observable.concat([xs, ys, zs]);
-     * @returns {Observable} An observable sequence that contains the elements of each given sequence, in sequential order. 
-     */
-    var observableConcat = Observable.concat = function () {
-        var sources = argsOrArray(arguments, 0);
-        return enumerableFor(sources).concat();
-    };  
+  /**
+   * Concatenates all the observable sequences.
+   * @param {Array | Arguments} args Arguments or an array to concat to the observable sequence.
+   * @returns {Observable} An observable sequence that contains the elements of each given sequence, in sequential order.
+   */
+  var observableConcat = Observable.concat = function () {
+    return enumerableOf(argsOrArray(arguments, 0)).concat();
+  };
 
     /**
      * Concatenates an observable sequence of observable sequences.
-     * @returns {Observable} An observable sequence that contains the elements of each observed inner sequence, in sequential order. 
-     */ 
+     * @returns {Observable} An observable sequence that contains the elements of each observed inner sequence, in sequential order.
+     */
     observableProto.concatObservable = observableProto.concatAll =function () {
         return this.merge(1);
     };
@@ -2290,13 +2287,13 @@
   /**
    * Merges an observable sequence of observable sequences into an observable sequence, limiting the number of concurrent subscriptions to inner sequences.
    * Or merges two observable sequences into a single observable sequence.
-   * 
+   *
    * @example
    * 1 - merged = sources.merge(1);
-   * 2 - merged = source.merge(otherSource);  
+   * 2 - merged = source.merge(otherSource);
    * @param {Mixed} [maxConcurrentOrOther] Maximum number of inner observable sequences being subscribed to concurrently or the second observable sequence.
-   * @returns {Observable} The observable sequence that merges the elements of the inner sequences. 
-   */ 
+   * @returns {Observable} The observable sequence that merges the elements of the inner sequences.
+   */
   observableProto.merge = function (maxConcurrentOrOther) {
     if (typeof maxConcurrentOrOther !== 'number') { return observableMerge(this, maxConcurrentOrOther); }
     var sources = this;
@@ -2336,16 +2333,16 @@
   };
 
     /**
-     * Merges all the observable sequences into a single observable sequence.  
+     * Merges all the observable sequences into a single observable sequence.
      * The scheduler is optional and if not specified, the immediate scheduler is used.
-     * 
+     *
      * @example
      * 1 - merged = Rx.Observable.merge(xs, ys, zs);
      * 2 - merged = Rx.Observable.merge([xs, ys, zs]);
      * 3 - merged = Rx.Observable.merge(scheduler, xs, ys, zs);
-     * 4 - merged = Rx.Observable.merge(scheduler, [xs, ys, zs]);    
-     * @returns {Observable} The observable sequence that merges the elements of the observable sequences. 
-     */  
+     * 4 - merged = Rx.Observable.merge(scheduler, [xs, ys, zs]);
+     * @returns {Observable} The observable sequence that merges the elements of the observable sequences.
+     */
     var observableMerge = Observable.merge = function () {
         var scheduler, sources;
         if (!arguments[0]) {
@@ -2362,13 +2359,13 @@
             sources = sources[0];
         }
         return observableFromArray(sources, scheduler).mergeObservable();
-    };   
+    };
 
   /**
    * Merges an observable sequence of observable sequences into an observable sequence.
-   * @returns {Observable} The observable sequence that merges the elements of the inner sequences.   
-   */  
-  observableProto.mergeObservable = observableProto.mergeAll =function () {
+   * @returns {Observable} The observable sequence that merges the elements of the inner sequences.
+   */
+  observableProto.mergeObservable = observableProto.mergeAll = function () {
     var sources = this;
     return new AnonymousObservable(function (observer) {
       var group = new CompositeDisposable(),
@@ -2398,7 +2395,7 @@
   /**
    * Returns the values from the source observable sequence only after the other observable sequence produces a value.
    * @param {Observable | Promise} other The observable sequence or Promise that triggers propagation of elements of the source sequence.
-   * @returns {Observable} An observable sequence containing the elements of the source sequence starting from the point the other sequence triggered propagation.    
+   * @returns {Observable} An observable sequence containing the elements of the source sequence starting from the point the other sequence triggered propagation.
    */
   observableProto.skipUntil = function (other) {
     var source = this;
@@ -2427,7 +2424,7 @@
 
   /**
    * Transforms an observable sequence of observable sequences into an observable sequence producing values only from the most recent observable sequence.
-   * @returns {Observable} The observable sequence that at any point in time produces the elements of the most recent inner observable sequence that has been received.  
+   * @returns {Observable} The observable sequence that at any point in time produces the elements of the most recent inner observable sequence that has been received.
    */
   observableProto['switch'] = observableProto.switchLatest = function () {
     var sources = this;
@@ -2446,16 +2443,16 @@
             isPromise(innerSource) && (innerSource = observableFromPromise(innerSource));
 
             d.setDisposable(innerSource.subscribe(
-              function (x) { latest === id && observer.onNext(x); }, 
-              function (e) { latest === id && observer.onError(e); }, 
+              function (x) { latest === id && observer.onNext(x); },
+              function (e) { latest === id && observer.onError(e); },
               function () {
                 if (latest === id) {
                   hasLatest = false;
                   isStopped && observer.onCompleted();
                 }
               }));
-          }, 
-          observer.onError.bind(observer), 
+          },
+          observer.onError.bind(observer),
           function () {
             isStopped = true;
             !hasLatest && observer.onCompleted();
@@ -2467,7 +2464,7 @@
   /**
    * Returns the values from the source observable sequence until the other observable sequence produces a value.
    * @param {Observable | Promise} other Observable sequence or Promise that terminates propagation of elements of the source sequence.
-   * @returns {Observable} An observable sequence containing the elements of the source sequence up to the point the other sequence interrupted further propagation.   
+   * @returns {Observable} An observable sequence containing the elements of the source sequence up to the point the other sequence interrupted further propagation.
    */
   observableProto.takeUntil = function (other) {
     var source = this;
@@ -2499,7 +2496,7 @@
         }
       }, observer.onError.bind(observer), observer.onCompleted.bind(observer));
     });
-  }    
+  }
 
   /**
    * Merges the specified observable sequences into one observable sequence by using the selector function whenever all of the observable sequences or an array have produced an element at a corresponding index.
@@ -2507,9 +2504,9 @@
    *
    * @example
    * 1 - res = obs1.zip(obs2, fn);
-   * 1 - res = x1.zip([1,2,3], fn);  
-   * @returns {Observable} An observable sequence containing the result of combining elements of the sources using the specified result selector function. 
-   */   
+   * 1 - res = x1.zip([1,2,3], fn);
+   * @returns {Observable} An observable sequence containing the result of combining elements of the sources using the specified result selector function.
+   */
   observableProto.zip = function () {
     if (Array.isArray(arguments[0])) {
       return zipArray.apply(this, arguments);
@@ -2520,7 +2517,7 @@
       var n = sources.length,
         queues = arrayInitialize(n, function () { return []; }),
         isDone = arrayInitialize(n, function () { return false; });
-        
+
       function next(i) {
         var res, queuedValues;
         if (queues.every(function (x) { return x.length > 0; })) {
@@ -2562,74 +2559,72 @@
       return new CompositeDisposable(subscriptions);
     });
   };
-    /**
-     * Merges the specified observable sequences into one observable sequence by using the selector function whenever all of the observable sequences have produced an element at a corresponding index.
-     * @param arguments Observable sources.
-     * @param {Function} resultSelector Function to invoke for each series of elements at corresponding indexes in the sources.
-     * @returns {Observable} An observable sequence containing the result of combining elements of the sources using the specified result selector function.
-     */
-    Observable.zip = function () {
-        var args = slice.call(arguments, 0),
-            first = args.shift();
-        return first.zip.apply(first, args);
-    };
 
-    /**
-     * Merges the specified observable sequences into one observable sequence by emitting a list with the elements of the observable sequences at corresponding indexes.
-     * @param arguments Observable sources.
-     * @returns {Observable} An observable sequence containing lists of elements at corresponding indexes.
-     */
-    Observable.zipArray = function () {
-        var sources = argsOrArray(arguments, 0);
-        return new AnonymousObservable(function (observer) {
-            var n = sources.length,
-              queues = arrayInitialize(n, function () { return []; }),
-              isDone = arrayInitialize(n, function () { return false; });
-
-            function next(i) {
-                if (queues.every(function (x) { return x.length > 0; })) {
-                    var res = queues.map(function (x) { return x.shift(); });
-                    observer.onNext(res);
-                } else if (isDone.filter(function (x, j) { return j !== i; }).every(identity)) {
-                    observer.onCompleted();
-                    return;
-                }
-            };
+  /**
+   * Merges the specified observable sequences into one observable sequence by using the selector function whenever all of the observable sequences have produced an element at a corresponding index.
+   * @param arguments Observable sources.
+   * @param {Function} resultSelector Function to invoke for each series of elements at corresponding indexes in the sources.
+   * @returns {Observable} An observable sequence containing the result of combining elements of the sources using the specified result selector function.
+   */
+  Observable.zip = function () {
+    var args = slice.call(arguments, 0), first = args.shift();
+    return first.zip.apply(first, args);
+  };
 
-            function done(i) {
-                isDone[i] = true;
-                if (isDone.every(identity)) {
-                    observer.onCompleted();
-                    return;
-                }
-            }
+  /**
+   * Merges the specified observable sequences into one observable sequence by emitting a list with the elements of the observable sequences at corresponding indexes.
+   * @param arguments Observable sources.
+   * @returns {Observable} An observable sequence containing lists of elements at corresponding indexes.
+   */
+  Observable.zipArray = function () {
+    var sources = argsOrArray(arguments, 0);
+    return new AnonymousObservable(function (observer) {
+      var n = sources.length,
+        queues = arrayInitialize(n, function () { return []; }),
+        isDone = arrayInitialize(n, function () { return false; });
 
-            var subscriptions = new Array(n);
-            for (var idx = 0; idx < n; idx++) {
-                (function (i) {
-                    subscriptions[i] = new SingleAssignmentDisposable();
-                    subscriptions[i].setDisposable(sources[i].subscribe(function (x) {
-                        queues[i].push(x);
-                        next(i);
-                    }, observer.onError.bind(observer), function () {
-                        done(i);
-                    }));
-                })(idx);
-            }
+      function next(i) {
+        if (queues.every(function (x) { return x.length > 0; })) {
+          var res = queues.map(function (x) { return x.shift(); });
+          observer.onNext(res);
+        } else if (isDone.filter(function (x, j) { return j !== i; }).every(identity)) {
+          observer.onCompleted();
+          return;
+        }
+      };
 
-            var compositeDisposable = new CompositeDisposable(subscriptions);
-            compositeDisposable.add(disposableCreate(function () {
-                for (var qIdx = 0, qLen = queues.length; qIdx < qLen; qIdx++) {
-                    queues[qIdx] = [];
-                }
-            }));
-            return compositeDisposable;
-        });
-    };
+      function done(i) {
+        isDone[i] = true;
+        if (isDone.every(identity)) {
+          observer.onCompleted();
+          return;
+        }
+      }
+
+      var subscriptions = new Array(n);
+      for (var idx = 0; idx < n; idx++) {
+        (function (i) {
+          subscriptions[i] = new SingleAssignmentDisposable();
+          subscriptions[i].setDisposable(sources[i].subscribe(function (x) {
+            queues[i].push(x);
+            next(i);
+          }, observer.onError.bind(observer), function () {
+            done(i);
+          }));
+        })(idx);
+      }
+
+      var compositeDisposable = new CompositeDisposable(subscriptions);
+      compositeDisposable.add(disposableCreate(function () {
+        for (var qIdx = 0, qLen = queues.length; qIdx < qLen; qIdx++) { queues[qIdx] = []; }
+      }));
+      return compositeDisposable;
+    });
+  };
 
   /**
    *  Hides the identity of an observable sequence.
-   * @returns {Observable} An observable sequence that hides the identity of the source sequence.    
+   * @returns {Observable} An observable sequence that hides the identity of the source sequence.
    */
   observableProto.asObservable = function () {
     return new AnonymousObservable(this.subscribe.bind(this));
@@ -2638,7 +2633,7 @@
     /**
      * Dematerializes the explicit notification values of an observable sequence as implicit notifications.
      * @returns {Observable} An observable sequence exhibiting the behavior corresponding to the source sequence's notification values.
-     */ 
+     */
     observableProto.dematerialize = function () {
         var source = this;
         return new AnonymousObservable(function (observer) {
@@ -2650,14 +2645,14 @@
 
     /**
      *  Returns an observable sequence that contains only distinct contiguous elements according to the keySelector and the comparer.
-     *  
+     *
      *  var obs = observable.distinctUntilChanged();
      *  var obs = observable.distinctUntilChanged(function (x) { return x.id; });
      *  var obs = observable.distinctUntilChanged(function (x) { return x.id; }, function (x, y) { return x === y; });
      *
      * @param {Function} [keySelector] A function to compute the comparison key for each element. If not provided, it projects the value.
      * @param {Function} [comparer] Equality comparer for computed key values. If not provided, defaults to an equality comparer function.
-     * @returns {Observable} An observable sequence only containing the distinct contiguous elements, based on a computed key value, from the source sequence.   
+     * @returns {Observable} An observable sequence only containing the distinct contiguous elements, based on a computed key value, from the source sequence.
      */
     observableProto.distinctUntilChanged = function (keySelector, comparer) {
         var source = this;
@@ -2693,16 +2688,10 @@
   /**
    *  Invokes an action for each element in the observable sequence and invokes an action upon graceful or exceptional termination of the observable sequence.
    *  This method can be used for debugging, logging, etc. of query behavior by intercepting the message stream to run arbitrary actions for messages on the pipeline.
-   *  
-   * @example
-   *  var res = observable.do(observer);
-   *  var res = observable.do(onNext);
-   *  var res = observable.do(onNext, onError);
-   *  var res = observable.do(onNext, onError, onCompleted);
    * @param {Function | Observer} observerOrOnNext Action to invoke for each element in the observable sequence or an observer.
    * @param {Function} [onError]  Action to invoke upon exceptional termination of the observable sequence. Used if only the observerOrOnNext parameter is also a function.
    * @param {Function} [onCompleted]  Action to invoke upon graceful termination of the observable sequence. Used if only the observerOrOnNext parameter is also a function.
-   * @returns {Observable} The source sequence with the side-effecting behavior applied.   
+   * @returns {Observable} The source sequence with the side-effecting behavior applied.
    */
   observableProto['do'] = observableProto.doAction = observableProto.tap = function (observerOrOnNext, onError, onCompleted) {
     var source = this, onNextFunc;
@@ -2722,39 +2711,68 @@
         }
         observer.onNext(x);
       }, function (err) {
-        if (!onError) {
-          observer.onError(err);
-        } else {
+        if (onError) {
           try {
             onError(err);
           } catch (e) {
             observer.onError(e);
           }
-          observer.onError(err);
         }
+        observer.onError(err);
       }, function () {
-        if (!onCompleted) {
-          observer.onCompleted();
-        } else {
+        if (onCompleted) {
           try {
             onCompleted();
           } catch (e) {
             observer.onError(e);
           }
-          observer.onCompleted();
         }
+        observer.onCompleted();
       });
     });
   };
 
+  /**
+   *  Invokes an action for each element in the observable sequence.
+   *  This method can be used for debugging, logging, etc. of query behavior by intercepting the message stream to run arbitrary actions for messages on the pipeline.
+   * @param {Function} onNext Action to invoke for each element in the observable sequence.
+   * @param {Any} [thisArg] Object to use as this when executing callback.
+   * @returns {Observable} The source sequence with the side-effecting behavior applied.
+   */
+  observableProto.doOnNext = observableProto.tapOnNext = function (onNext, thisArg) {
+    return this.tap(arguments.length === 2 ? function (x) { onNext.call(thisArg, x); } : onNext);
+  };
+
+  /**
+   *  Invokes an action upon exceptional termination of the observable sequence.
+   *  This method can be used for debugging, logging, etc. of query behavior by intercepting the message stream to run arbitrary actions for messages on the pipeline.
+   * @param {Function} onError Action to invoke upon exceptional termination of the observable sequence.
+   * @param {Any} [thisArg] Object to use as this when executing callback.
+   * @returns {Observable} The source sequence with the side-effecting behavior applied.
+   */
+  observableProto.doOnError = observableProto.tapOnError = function (onError, thisArg) {
+    return this.tap(noop, arguments.length === 2 ? function (e) { onError.call(thisArg, e); } : onError);
+  };
+
+  /**
+   *  Invokes an action upon graceful termination of the observable sequence.
+   *  This method can be used for debugging, logging, etc. of query behavior by intercepting the message stream to run arbitrary actions for messages on the pipeline.
+   * @param {Function} onCompleted Action to invoke upon graceful termination of the observable sequence.
+   * @param {Any} [thisArg] Object to use as this when executing callback.
+   * @returns {Observable} The source sequence with the side-effecting behavior applied.
+   */
+  observableProto.doOnCompleted = observableProto.tapOnCompleted = function (onCompleted, thisArg) {
+    return this.tap(noop, null, arguments.length === 2 ? function () { onCompleted.call(thisArg); } : onCompleted);
+  };
+
   /**
    *  Invokes a specified action after the source observable sequence terminates gracefully or exceptionally.
-   *  
+   *
    * @example
    *  var res = observable.finallyAction(function () { console.log('sequence ended'; });
    * @param {Function} finallyAction Action to invoke after the source observable sequence terminates.
-   * @returns {Observable} Source sequence with the action-invoking termination behavior applied. 
-   */  
+   * @returns {Observable} Source sequence with the action-invoking termination behavior applied.
+   */
   observableProto['finally'] = observableProto.finallyAction = function (action) {
     var source = this;
     return new AnonymousObservable(function (observer) {
@@ -2768,8 +2786,8 @@
       return disposableCreate(function () {
         try {
           subscription.dispose();
-        } catch (e) { 
-          throw e;                    
+        } catch (e) {
+          throw e;
         } finally {
           action();
         }
@@ -2779,7 +2797,7 @@
 
   /**
    *  Ignores all elements in an observable sequence leaving only the termination messages.
-   * @returns {Observable} An empty observable sequence that signals termination, successful or exceptional, of the source sequence.    
+   * @returns {Observable} An empty observable sequence that signals termination, successful or exceptional, of the source sequence.
    */
   observableProto.ignoreElements = function () {
     var source = this;
@@ -2791,7 +2809,7 @@
   /**
    *  Materializes the implicit notifications of an observable sequence as explicit notification values.
    * @returns {Observable} An observable sequence containing the materialized notification values from the source sequence.
-   */    
+   */
   observableProto.materialize = function () {
     var source = this;
     return new AnonymousObservable(function (observer) {
@@ -2809,12 +2827,12 @@
 
     /**
      *  Repeats the observable sequence a specified number of times. If the repeat count is not specified, the sequence repeats indefinitely.
-     *  
+     *
      * @example
      *  var res = repeated = source.repeat();
      *  var res = repeated = source.repeat(42);
      * @param {Number} [repeatCount]  Number of times to repeat the sequence. If not provided, repeats the sequence indefinitely.
-     * @returns {Observable} The observable sequence producing the elements of the given sequence repeatedly.   
+     * @returns {Observable} The observable sequence producing the elements of the given sequence repeatedly.
      */
     observableProto.repeat = function (repeatCount) {
         return enumerableRepeat(this, repeatCount).concat();
@@ -2823,12 +2841,12 @@
   /**
    *  Repeats the source observable sequence the specified number of times or until it successfully terminates. If the retry count is not specified, it retries indefinitely.
    *  Note if you encounter an error and want it to retry once, then you must use .retry(2);
-   *  
+   *
    * @example
    *  var res = retried = retry.repeat();
    *  var res = retried = retry.repeat(2);
    * @param {Number} [retryCount]  Number of times to retry the sequence. If not provided, retry the sequence indefinitely.
-   * @returns {Observable} An observable sequence producing the elements of the given sequence repeatedly until it terminates successfully. 
+   * @returns {Observable} An observable sequence producing the elements of the given sequence repeatedly until it terminates successfully.
    */
   observableProto.retry = function (retryCount) {
     return enumerableRepeat(this, retryCount).catchException();
@@ -2849,7 +2867,7 @@
     if (arguments.length === 2) {
       hasSeed = true;
       seed = arguments[0];
-      accumulator = arguments[1];        
+      accumulator = arguments[1];
     } else {
       accumulator = arguments[0];
     }
@@ -2864,7 +2882,7 @@
             } else {
               accumulation = hasSeed ? accumulator(seed, x) : x;
               hasAccumulation = true;
-            }                    
+            }
           } catch (e) {
             observer.onError(e);
             return;
@@ -2885,9 +2903,9 @@
    *  Bypasses a specified number of elements at the end of an observable sequence.
    * @description
    *  This operator accumulates a queue with a length enough to store the first `count` elements. As more elements are
-   *  received, elements are taken from the front of the queue and produced on the result sequence. This causes elements to be delayed.     
+   *  received, elements are taken from the front of the queue and produced on the result sequence. This causes elements to be delayed.
    * @param count Number of elements to bypass at the end of the source sequence.
-   * @returns {Observable} An observable sequence containing the source sequence elements except for the bypassed ones at the end.   
+   * @returns {Observable} An observable sequence containing the source sequence elements except for the bypassed ones at the end.
    */
   observableProto.skipLast = function (count) {
     var source = this;
@@ -2906,7 +2924,7 @@
    *  var res = source.startWith(1, 2, 3);
    *  var res = source.startWith(Rx.Scheduler.timeout, 1, 2, 3);
    * @param {Arguments} args The specified values to prepend to the observable sequence
-   * @returns {Observable} The source sequence prepended with the specified values.  
+   * @returns {Observable} The source sequence prepended with the specified values.
    */
   observableProto.startWith = function () {
     var values, scheduler, start = 0;
@@ -2917,7 +2935,7 @@
       scheduler = immediateScheduler;
     }
     values = slice.call(arguments, start);
-    return enumerableFor([observableFromArray(values, scheduler), this]).concat();
+    return enumerableOf([observableFromArray(values, scheduler), this]).concat();
   };
 
   /**
@@ -2927,7 +2945,7 @@
    *  the source sequence, this buffer is drained on the result sequence. This causes the elements to be delayed.
    * @param {Number} count Number of elements to take from the end of the source sequence.
    * @returns {Observable} An observable sequence containing the specified number of elements from the end of the source sequence.
-   */   
+   */
   observableProto.takeLast = function (count) {
     var source = this;
     return new AnonymousObservable(function (observer) {
@@ -2952,21 +2970,21 @@
     /**
      *  One of the Following:
      *  Projects each element of an observable sequence to an observable sequence and merges the resulting observable sequences into one observable sequence.
-     *  
+     *
      * @example
      *  var res = source.concatMap(function (x) { return Rx.Observable.range(0, x); });
      *  Or:
      *  Projects each element of an observable sequence to an observable sequence, invokes the result selector for the source element and each of the corresponding inner sequence's elements, and merges the results into one observable sequence.
-     *  
+     *
      *  var res = source.concatMap(function (x) { return Rx.Observable.range(0, x); }, function (x, y) { return x + y; });
      *  Or:
      *  Projects each element of the source observable sequence to the other observable sequence and merges the resulting observable sequences into one observable sequence.
-     *  
+     *
      *  var res = source.concatMap(Rx.Observable.fromArray([1,2,3]));
-     * @param selector A transform function to apply to each element or an observable sequence to project each element from the 
+     * @param selector A transform function to apply to each element or an observable sequence to project each element from the
      * source sequence onto which could be either an observable or Promise.
      * @param {Function} [resultSelector]  A transform function to apply to each element of the intermediate sequence.
-     * @returns {Observable} An observable sequence whose elements are the result of invoking the one-to-many transform function collectionSelector on each element of the input sequence and then mapping each of those sequence elements and their corresponding source element to a result element.   
+     * @returns {Observable} An observable sequence whose elements are the result of invoking the one-to-many transform function collectionSelector on each element of the input sequence and then mapping each of those sequence elements and their corresponding source element to a result element.
      */
     observableProto.selectConcat = observableProto.concatMap = function (selector, resultSelector, thisArg) {
       if (resultSelector) {
@@ -2974,39 +2992,39 @@
             var selectorResult = selector(x, i),
               result = isPromise(selectorResult) ? observableFromPromise(selectorResult) : selectorResult;
 
-            return result.map(function (y) {
-              return resultSelector(x, y, i);
-            });
-          });
-      }
-      return typeof selector === 'function' ?
-        concatMap(this, selector, thisArg) :
-        concatMap(this, function () { return selector; });
-    };
-
-    /**
-     *  Projects each element of an observable sequence into a new form by incorporating the element's index.
-     * @param {Function} selector A transform function to apply to each source element; the second parameter of the function represents the index of the source element.
-     * @param {Any} [thisArg] Object to use as this when executing callback.
-     * @returns {Observable} An observable sequence whose elements are the result of invoking the transform function on each element of source. 
-     */
-    observableProto.select = observableProto.map = function (selector, thisArg) {
-        var parent = this;
-        return new AnonymousObservable(function (observer) {
-            var count = 0;
-            return parent.subscribe(function (value) {
-                var result;
-                try {
-                    result = selector.call(thisArg, value, count++, parent);
-                } catch (exception) {
-                    observer.onError(exception);
-                    return;
-                }
-                observer.onNext(result);
-            }, observer.onError.bind(observer), observer.onCompleted.bind(observer));
-        });
+            return result.map(function (y) {
+              return resultSelector(x, y, i);
+            });
+          });
+      }
+      return typeof selector === 'function' ?
+        concatMap(this, selector, thisArg) :
+        concatMap(this, function () { return selector; });
     };
 
+  /**
+   *  Projects each element of an observable sequence into a new form by incorporating the element's index.
+   * @param {Function} selector A transform function to apply to each source element; the second parameter of the function represents the index of the source element.
+   * @param {Any} [thisArg] Object to use as this when executing callback.
+   * @returns {Observable} An observable sequence whose elements are the result of invoking the transform function on each element of source.
+   */
+  observableProto.select = observableProto.map = function (selector, thisArg) {
+    var parent = this;
+    return new AnonymousObservable(function (observer) {
+      var count = 0;
+      return parent.subscribe(function (value) {
+        var result;
+        try {
+          result = selector.call(thisArg, value, count++, parent);
+        } catch (e) {
+          observer.onError(e);
+          return;
+        }
+        observer.onNext(result);
+      }, observer.onError.bind(observer), observer.onCompleted.bind(observer));
+    });
+  };
+
   /**
    * Retrieves the value of a specified property from all elements in the Observable sequence.
    * @param {String} prop The property to pluck.
@@ -3026,22 +3044,22 @@
     /**
      *  One of the Following:
      *  Projects each element of an observable sequence to an observable sequence and merges the resulting observable sequences into one observable sequence.
-     *  
+     *
      * @example
      *  var res = source.selectMany(function (x) { return Rx.Observable.range(0, x); });
      *  Or:
      *  Projects each element of an observable sequence to an observable sequence, invokes the result selector for the source element and each of the corresponding inner sequence's elements, and merges the results into one observable sequence.
-     *  
+     *
      *  var res = source.selectMany(function (x) { return Rx.Observable.range(0, x); }, function (x, y) { return x + y; });
      *  Or:
      *  Projects each element of the source observable sequence to the other observable sequence and merges the resulting observable sequences into one observable sequence.
-     *  
+     *
      *  var res = source.selectMany(Rx.Observable.fromArray([1,2,3]));
-     * @param selector A transform function to apply to each element or an observable sequence to project each element from the 
+     * @param selector A transform function to apply to each element or an observable sequence to project each element from the
      * source sequence onto which could be either an observable or Promise.
      * @param {Function} [resultSelector]  A transform function to apply to each element of the intermediate sequence.
      * @param {Any} [thisArg] Object to use as this when executing callback.
-     * @returns {Observable} An observable sequence whose elements are the result of invoking the one-to-many transform function collectionSelector on each element of the input sequence and then mapping each of those sequence elements and their corresponding source element to a result element.   
+     * @returns {Observable} An observable sequence whose elements are the result of invoking the one-to-many transform function collectionSelector on each element of the input sequence and then mapping each of those sequence elements and their corresponding source element to a result element.
      */
     observableProto.selectMany = observableProto.flatMap = function (selector, resultSelector, thisArg) {
       if (resultSelector) {
@@ -3060,11 +3078,11 @@
     };
 
   /**
-   *  Projects each element of an observable sequence into a new sequence of observable sequences by incorporating the element's index and then 
+   *  Projects each element of an observable sequence into a new sequence of observable sequences by incorporating the element's index and then
    *  transforms an observable sequence of observable sequences into an observable sequence producing values only from the most recent observable sequence.
    * @param {Function} selector A transform function to apply to each source element; the second parameter of the function represents the index of the source element.
    * @param {Any} [thisArg] Object to use as this when executing callback.
-   * @returns {Observable} An observable sequence whose elements are the result of invoking the transform function on each element of source producing an Observable of Observable sequences 
+   * @returns {Observable} An observable sequence whose elements are the result of invoking the transform function on each element of source producing an Observable of Observable sequences
    *  and that at any point in time produces the elements of the most recent inner observable sequence that has been received.
    */
   observableProto.selectSwitch = observableProto.flatMapLatest = observableProto.switchMap = function (selector, thisArg) {
@@ -3074,7 +3092,7 @@
   /**
    * Bypasses a specified number of elements in an observable sequence and then returns the remaining elements.
    * @param {Number} count The number of elements to skip before returning the remaining elements.
-   * @returns {Observable} An observable sequence that contains the elements that occur after the specified index in the input sequence.   
+   * @returns {Observable} An observable sequence that contains the elements that occur after the specified index in the input sequence.
    */
   observableProto.skip = function (count) {
       if (count < 0) { throw new Error(argumentOutOfRange); }
@@ -3094,12 +3112,12 @@
   /**
    *  Bypasses elements in an observable sequence as long as a specified condition is true and then returns the remaining elements.
    *  The element's index is used in the logic of the predicate function.
-   *  
+   *
    *  var res = source.skipWhile(function (value) { return value < 10; });
    *  var res = source.skipWhile(function (value, index) { return value < 10 || index < 10; });
    * @param {Function} predicate A function to test each element for a condition; the second parameter of the function represents the index of the source element.
-   * @param {Any} [thisArg] Object to use as this when executing callback.     
-   * @returns {Observable} An observable sequence that contains the elements from the input sequence starting at the first element in the linear series that does not pass the test specified by predicate.   
+   * @param {Any} [thisArg] Object to use as this when executing callback.
+   * @returns {Observable} An observable sequence that contains the elements from the input sequence starting at the first element in the linear series that does not pass the test specified by predicate.
    */
   observableProto.skipWhile = function (predicate, thisArg) {
     var source = this;
@@ -3121,12 +3139,12 @@
 
   /**
    *  Returns a specified number of contiguous elements from the start of an observable sequence, using the specified scheduler for the edge case of take(0).
-   *  
+   *
    *  var res = source.take(5);
    *  var res = source.take(0, Rx.Scheduler.timeout);
    * @param {Number} count The number of elements to return.
    * @param {Scheduler} [scheduler] Scheduler used to produce an OnCompleted message in case <paramref name="count count</paramref> is set to 0.
-   * @returns {Observable} An observable sequence that contains the specified number of elements from the start of the input sequence.  
+   * @returns {Observable} An observable sequence that contains the specified number of elements from the start of the input sequence.
    */
   observableProto.take = function (count, scheduler) {
       if (count < 0) { throw new RangeError(argumentOutOfRange); }
@@ -3147,8 +3165,8 @@
    *  Returns elements from an observable sequence as long as a specified condition is true.
    *  The element's index is used in the logic of the predicate function.
    * @param {Function} predicate A function to test each element for a condition; the second parameter of the function represents the index of the source element.
-   * @param {Any} [thisArg] Object to use as this when executing callback.     
-   * @returns {Observable} An observable sequence that contains the elements from the input sequence that occur before the element at which the test no longer passes.  
+   * @param {Any} [thisArg] Object to use as this when executing callback.
+   * @returns {Observable} An observable sequence that contains the elements from the input sequence that occur before the element at which the test no longer passes.
    */
   observableProto.takeWhile = function (predicate, thisArg) {
     var observable = this;
@@ -3172,38 +3190,36 @@
     });
   };
 
-    /**
-     *  Filters the elements of an observable sequence based on a predicate by incorporating the element's index.
-     *  
-     * @example
-     *  var res = source.where(function (value) { return value < 10; });
-     *  var res = source.where(function (value, index) { return value < 10 || index < 10; });
-     * @param {Function} predicate A function to test each source element for a condition; the second parameter of the function represents the index of the source element.
-     * @param {Any} [thisArg] Object to use as this when executing callback.
-     * @returns {Observable} An observable sequence that contains elements from the input sequence that satisfy the condition.   
-     */
-    observableProto.where = observableProto.filter = function (predicate, thisArg) {
-        var parent = this;
-        return new AnonymousObservable(function (observer) {
-            var count = 0;
-            return parent.subscribe(function (value) {
-                var shouldRun;
-                try {
-                    shouldRun = predicate.call(thisArg, value, count++, parent);
-                } catch (exception) {
-                    observer.onError(exception);
-                    return;
-                }
-                if (shouldRun) {
-                    observer.onNext(value);
-                }
-            }, observer.onError.bind(observer), observer.onCompleted.bind(observer));
-        });
-    };
+  /**
+   *  Filters the elements of an observable sequence based on a predicate by incorporating the element's index.
+   *
+   * @example
+   *  var res = source.where(function (value) { return value < 10; });
+   *  var res = source.where(function (value, index) { return value < 10 || index < 10; });
+   * @param {Function} predicate A function to test each source element for a condition; the second parameter of the function represents the index of the source element.
+   * @param {Any} [thisArg] Object to use as this when executing callback.
+   * @returns {Observable} An observable sequence that contains elements from the input sequence that satisfy the condition.
+   */
+  observableProto.where = observableProto.filter = function (predicate, thisArg) {
+      var parent = this;
+      return new AnonymousObservable(function (observer) {
+        var count = 0;
+        return parent.subscribe(function (value) {
+          var shouldRun;
+          try {
+            shouldRun = predicate.call(thisArg, value, count++, parent);
+          } catch (e) {
+            observer.onError(e);
+            return;
+          }
+          shouldRun && observer.onNext(value);
+        }, observer.onError.bind(observer), observer.onCompleted.bind(observer));
+      });
+  };
 
   /**
-   * Converts a callback function to an observable sequence. 
-   * 
+   * Converts a callback function to an observable sequence.
+   *
    * @param {Function} function Function with a callback as the last parameter to convert to an Observable sequence.
    * @param {Mixed} [context] The context for the func parameter to be executed.  If not specified, defaults to undefined.
    * @param {Function} [selector] A selector which takes the arguments from the callback to produce a single item to yield on next.
@@ -3216,7 +3232,7 @@
       return new AnonymousObservable(function (observer) {
         function handler(e) {
           var results = e;
-          
+
           if (selector) {
             try {
               results = selector(arguments);
@@ -3227,13 +3243,13 @@
 
             observer.onNext(results);
           } else {
-            if (results.length <= 1) { 
+            if (results.length <= 1) {
               observer.onNext.apply(observer, results);
             } else {
               observer.onNext(results);
             }
           }
-          
+
           observer.onCompleted();
         }
 
@@ -3247,7 +3263,7 @@
    * Converts a Node.js callback style function to an observable sequence.  This must be in function (err, ...) format.
    * @param {Function} func The function to call
    * @param {Mixed} [context] The context for the func parameter to be executed.  If not specified, defaults to undefined.
-   * @param {Function} [selector] A selector which takes the arguments from the callback minus the error to produce a single item to yield on next.     
+   * @param {Function} [selector] A selector which takes the arguments from the callback minus the error to produce a single item to yield on next.
    * @returns {Function} An async function which when applied, returns an observable sequence with the callback arguments as an array.
    */
   Observable.fromNodeCallback = function (func, context, selector) {
@@ -3262,7 +3278,7 @@
           }
 
           var results = slice.call(arguments, 1);
-          
+
           if (selector) {
             try {
               results = selector(results);
@@ -3272,7 +3288,7 @@
             }
             observer.onNext(results);
           } else {
-            if (results.length <= 1) { 
+            if (results.length <= 1) {
               observer.onNext.apply(observer, results);
             } else {
               observer.onNext(results);
@@ -3314,7 +3330,7 @@
   }
 
   /**
-   * Configuration option to determine whether to use native events only 
+   * Configuration option to determine whether to use native events only
    */
   Rx.config.useNativeEvents = false;
 
@@ -3326,7 +3342,7 @@
 
   // Check for ember
   var ember = !!root.Ember && typeof root.Ember.addListener === 'function';
-  
+
   // Check for Backbone.Marionette. Note if using AMD add Marionette as a dependency of rxjs
   // for proper loading order!
   var marionette = !!root.Backbone && !!root.Backbone.Marionette;
@@ -3336,10 +3352,10 @@
    *
    * @example
    *   var source = Rx.Observable.fromEvent(element, 'mouseup');
-   * 
+   *
    * @param {Object} element The DOMElement or NodeList to attach a listener.
    * @param {String} eventName The event name to attach the observable sequence.
-   * @param {Function} [selector] A selector which takes the arguments from the event handler to produce a single item to yield on next.     
+   * @param {Function} [selector] A selector which takes the arguments from the event handler to produce a single item to yield on next.
    * @returns {Observable} An observable sequence of events from the specified element and the specified event.
    */
   Observable.fromEvent = function (element, eventName, selector) {
@@ -3349,8 +3365,8 @@
         function (h) { element.addListener(eventName, h); },
         function (h) { element.removeListener(eventName, h); },
         selector);
-    } 
-    
+    }
+
     // Use only if non-native events are allowed
     if (!Rx.config.useNativeEvents) {
       if (marionette) {
@@ -3364,7 +3380,7 @@
           function (h) { Ember.addListener(element, eventName, h); },
           function (h) { Ember.removeListener(element, eventName, h); },
           selector);
-      }    
+      }
       if (jq) {
         var $elem = jq(element);
         return fromEventPattern(
@@ -3375,9 +3391,9 @@
     }
     return new AnonymousObservable(function (observer) {
       return createEventListener(
-        element, 
-        eventName, 
-        function handler (e) { 
+        element,
+        eventName,
+        function handler (e) {
           var results = e;
 
           if (selector) {
@@ -3389,7 +3405,7 @@
             }
           }
 
-          observer.onNext(results); 
+          observer.onNext(results);
         });
     }).publish().refCount();
   };
@@ -3446,11 +3462,12 @@
       return subject;
     });
   };
+
   /*
    * Converts an existing observable sequence to an ES6 Compatible Promise
    * @example
    * var promise = Rx.Observable.return(42).toPromise(RSVP.Promise);
-   * 
+   *
    * // With config
    * Rx.config.Promise = RSVP.Promise;
    * var promise = Rx.Observable.return(42).toPromise();
@@ -3472,6 +3489,7 @@
       });
     });
   };
+
   /**
    * Invokes the asynchronous function, surfacing the result through an observable sequence.
    * @param {Function} functionAsync Asynchronous function which returns a Promise to run.
@@ -3491,16 +3509,16 @@
    * Multicasts the source sequence notifications through an instantiated subject into all uses of the sequence within a selector function. Each
    * subscription to the resulting sequence causes a separate multicast invocation, exposing the sequence resulting from the selector function's
    * invocation. For specializations with fixed subject types, see Publish, PublishLast, and Replay.
-   * 
+   *
    * @example
    * 1 - res = source.multicast(observable);
    * 2 - res = source.multicast(function () { return new Subject(); }, function (x) { return x; });
-   * 
-   * @param {Function|Subject} subjectOrSubjectSelector 
+   *
+   * @param {Function|Subject} subjectOrSubjectSelector
    * Factory function to create an intermediate subject through which the source sequence's elements will be multicast to the selector function.
    * Or:
    * Subject to push source elements into.
-   * 
+   *
    * @param {Function} [selector] Optional selector function which can use the multicasted source sequence subject to the policies enforced by the created subject. Specified only if <paramref name="subjectOrSubjectSelector" is a factory function.
    * @returns {Observable} An observable sequence that contains the elements of a sequence produced by multicasting the source sequence within a selector function.
    */
@@ -3517,11 +3535,11 @@
   /**
    * Returns an observable sequence that is the result of invoking the selector on a connectable observable sequence that shares a single subscription to the underlying sequence.
    * This operator is a specialization of Multicast using a regular Subject.
-   * 
+   *
    * @example
    * var resres = source.publish();
    * var res = source.publish(function (x) { return x; });
-   * 
+   *
    * @param {Function} [selector] Selector function which can use the multicasted source sequence as many times as needed, without causing multiple subscriptions to the source sequence. Subscribers to the given source will receive all notifications of the source from the time of the subscription on.
    * @returns {Observable} An observable sequence that contains the elements of a sequence produced by multicasting the source sequence within a selector function.
    */
@@ -3534,10 +3552,10 @@
   /**
    * Returns an observable sequence that shares a single subscription to the underlying sequence.
    * This operator is a specialization of publish which creates a subscription when the number of observers goes from zero to one, then shares that subscription with all subsequent observers until the number of observers returns to zero, at which point the subscription is disposed.
-   * 
+   *
    * @example
    * var res = source.share();
-   * 
+   *
    * @returns {Observable} An observable sequence that contains the elements of a sequence produced by multicasting the source sequence.
    */
   observableProto.share = function () {
@@ -3547,11 +3565,11 @@
   /**
    * Returns an observable sequence that is the result of invoking the selector on a connectable observable sequence that shares a single subscription to the underlying sequence containing only the last notification.
    * This operator is a specialization of Multicast using a AsyncSubject.
-   * 
+   *
    * @example
    * var res = source.publishLast();
    * var res = source.publishLast(function (x) { return x; });
-   * 
+   *
    * @param selector [Optional] Selector function which can use the multicasted source sequence as many times as needed, without causing multiple subscriptions to the source sequence. Subscribers to the given source will only receive the last notification of the source.
    * @returns {Observable} An observable sequence that contains the elements of a sequence produced by multicasting the source sequence within a selector function.
    */
@@ -3564,11 +3582,11 @@
   /**
    * Returns an observable sequence that is the result of invoking the selector on a connectable observable sequence that shares a single subscription to the underlying sequence and starts with initialValue.
    * This operator is a specialization of Multicast using a BehaviorSubject.
-   * 
+   *
    * @example
    * var res = source.publishValue(42);
    * var res = source.publishValue(function (x) { return x.select(function (y) { return y * y; }) }, 42);
-   * 
+   *
    * @param {Function} [selector] Optional selector function which can use the multicasted source sequence as many times as needed, without causing multiple subscriptions to the source sequence. Subscribers to the given source will receive immediately receive the initial value, followed by all notifications of the source from the time of the subscription on.
    * @param {Mixed} initialValue Initial value received by observers upon subscription.
    * @returns {Observable} An observable sequence that contains the elements of a sequence produced by multicasting the source sequence within a selector function.
@@ -3584,10 +3602,10 @@
   /**
    * Returns an observable sequence that shares a single subscription to the underlying sequence and starts with an initialValue.
    * This operator is a specialization of publishValue which creates a subscription when the number of observers goes from zero to one, then shares that subscription with all subsequent observers until the number of observers returns to zero, at which point the subscription is disposed.
-   * 
+   *
    * @example
    * var res = source.shareValue(42);
-   * 
+   *
    * @param {Mixed} initialValue Initial value received by observers upon subscription.
    * @returns {Observable} An observable sequence that contains the elements of a sequence produced by multicasting the source sequence.
    */
@@ -3598,13 +3616,13 @@
   /**
    * Returns an observable sequence that is the result of invoking the selector on a connectable observable sequence that shares a single subscription to the underlying sequence replaying notifications subject to a maximum time length for the replay buffer.
    * This operator is a specialization of Multicast using a ReplaySubject.
-   * 
+   *
    * @example
    * var res = source.replay(null, 3);
    * var res = source.replay(null, 3, 500);
    * var res = source.replay(null, 3, 500, scheduler);
    * var res = source.replay(function (x) { return x.take(6).repeat(); }, 3, 500, scheduler);
-   * 
+   *
    * @param selector [Optional] Selector function which can use the multicasted source sequence as many times as needed, without causing multiple subscriptions to the source sequence. Subscribers to the given source will receive all the notifications of the source subject to the specified replay buffer trimming policy.
    * @param bufferSize [Optional] Maximum element count of the replay buffer.
    * @param window [Optional] Maximum time length of the replay buffer.
@@ -3620,12 +3638,12 @@
   /**
    * Returns an observable sequence that shares a single subscription to the underlying sequence replaying notifications subject to a maximum time length for the replay buffer.
    * This operator is a specialization of replay which creates a subscription when the number of observers goes from zero to one, then shares that subscription with all subsequent observers until the number of observers returns to zero, at which point the subscription is disposed.
-   * 
+   *
    * @example
    * var res = source.shareReplay(3);
    * var res = source.shareReplay(3, 500);
    * var res = source.shareReplay(3, 500, scheduler);
-   * 
+   *
 
    * @param bufferSize [Optional] Maximum element count of the replay buffer.
    * @param window [Optional] Maximum time length of the replay buffer.
@@ -3636,42 +3654,43 @@
     return this.replay(null, bufferSize, window, scheduler).refCount();
   };
 
-  var ConnectableObservable = Rx.ConnectableObservable = (function (__super__) {
-    inherits(ConnectableObservable, __super__);
-
-    function ConnectableObservable(source, subject) {
-      var hasSubscription = false, 
-        subscription,
-        sourceObservable = source.asObservable();
-
-      this.connect = function () {
-        if (!hasSubscription) {
-          hasSubscription = true;
-          subscription = new CompositeDisposable(sourceObservable.subscribe(subject), disposableCreate(function () {
-            hasSubscription = false;
-          }));
-        }
-        return subscription;
-      };
-
-      __super__.call(this, subject.subscribe.bind(subject));
-    }
-    
-    ConnectableObservable.prototype.refCount = function () {
-      var connectableSubscription, count = 0, source = this;
-      return new AnonymousObservable(function (observer) {
-          var shouldConnect = ++count === 1,
-            subscription = source.subscribe(observer);
-          shouldConnect && (connectableSubscription = source.connect());
-          return function () {
-            subscription.dispose();
-            --count === 0 && connectableSubscription.dispose();
-          };
-      });
-    };
-
-    return ConnectableObservable;
+  var ConnectableObservable = Rx.ConnectableObservable = (function (__super__) {
+    inherits(ConnectableObservable, __super__);
+
+    function ConnectableObservable(source, subject) {
+      var hasSubscription = false,
+        subscription,
+        sourceObservable = source.asObservable();
+
+      this.connect = function () {
+        if (!hasSubscription) {
+          hasSubscription = true;
+          subscription = new CompositeDisposable(sourceObservable.subscribe(subject), disposableCreate(function () {
+            hasSubscription = false;
+          }));
+        }
+        return subscription;
+      };
+
+      __super__.call(this, subject.subscribe.bind(subject));
+    }
+
+    ConnectableObservable.prototype.refCount = function () {
+      var connectableSubscription, count = 0, source = this;
+      return new AnonymousObservable(function (observer) {
+          var shouldConnect = ++count === 1,
+            subscription = source.subscribe(observer);
+          shouldConnect && (connectableSubscription = source.connect());
+          return function () {
+            subscription.dispose();
+            --count === 0 && connectableSubscription.dispose();
+          };
+      });
+    };
+
+    return ConnectableObservable;
   }(Observable));
+
   function observableTimerDate(dueTime, scheduler) {
     return new AnonymousObservable(function (observer) {
       return scheduler.scheduleWithAbsolute(dueTime, function () {
@@ -3720,11 +3739,11 @@
 
   /**
    *  Returns an observable sequence that produces a value after each period.
-   *  
+   *
    * @example
    *  1 - res = Rx.Observable.interval(1000);
    *  2 - res = Rx.Observable.interval(1000, Rx.Scheduler.timeout);
-   *      
+   *
    * @param {Number} period Period for producing the values in the resulting sequence (specified as an integer denoting milliseconds).
    * @param {Scheduler} [scheduler] Scheduler to run the timer on. If not specified, Rx.Scheduler.timeout is used.
    * @returns {Observable} An observable sequence that produces a value after each period.
@@ -3832,11 +3851,11 @@
 
   /**
    *  Time shifts the observable sequence by dueTime. The relative time intervals between the values are preserved.
-   *  
+   *
    * @example
    *  1 - res = Rx.Observable.delay(new Date());
    *  2 - res = Rx.Observable.delay(new Date(), Rx.Scheduler.timeout);
-   *  
+   *
    *  3 - res = Rx.Observable.delay(5000);
    *  4 - res = Rx.Observable.delay(5000, 1000, Rx.Scheduler.timeout);
    * @memberOf Observable#
@@ -3853,11 +3872,11 @@
 
   /**
    *  Ignores values from an observable sequence which are followed by another value before dueTime.
-   *  
+   *
    * @example
    *  1 - res = source.throttle(5000); // 5 seconds
-   *  2 - res = source.throttle(5000, scheduler);        
-   * 
+   *  2 - res = source.throttle(5000, scheduler);
+   *
    * @param {Number} dueTime Duration of the throttle period for each value (specified as an integer denoting milliseconds).
    * @param {Scheduler} [scheduler]  Scheduler to run the throttle timers on. If not specified, the timeout scheduler is used.
    * @returns {Observable} The throttled sequence.
@@ -3876,16 +3895,16 @@
             d = new SingleAssignmentDisposable();
           cancelable.setDisposable(d);
           d.setDisposable(scheduler.scheduleWithRelative(dueTime, function () {
-            hasValue && id === currentId && observer.onNext(value);
+            hasvalue && id === currentId && observer.onNext(value);
             hasvalue = false;
           }));
-        }, 
+        },
         function (e) {
           cancelable.dispose();
           observer.onError(e);
           hasvalue = false;
           id++;
-        }, 
+        },
         function () {
           cancelable.dispose();
           hasvalue && observer.onNext(value);
@@ -3899,11 +3918,11 @@
 
   /**
    *  Records the timestamp for each value in an observable sequence.
-   *  
+   *
    * @example
    *  1 - res = source.timestamp(); // produces { value: x, timestamp: ts }
    *  2 - res = source.timestamp(Rx.Scheduler.timeout);
-   *      
+   *
    * @param {Scheduler} [scheduler]  Scheduler used to compute timestamps. If not specified, the timeout scheduler is used.
    * @returns {Observable} An observable sequence with timestamp information on values.
    */
@@ -3915,7 +3934,7 @@
   };
 
   function sampleObservable(source, sampler) {
-      
+
     return new AnonymousObservable(function (observer) {
       var atEnd, value, hasValue;
 
@@ -3941,12 +3960,12 @@
 
   /**
    *  Samples the observable sequence at each interval.
-   *  
+   *
    * @example
    *  1 - res = source.sample(sampleObservable); // Sampler tick sequence
    *  2 - res = source.sample(5000); // 5 seconds
    *  2 - res = source.sample(5000, Rx.Scheduler.timeout); // 5 seconds
-   *      
+   *
    * @param {Mixed} intervalOrSampler Interval at which to sample (specified as an integer denoting milliseconds) or Sampler Observable.
    * @param {Scheduler} [scheduler]  Scheduler to run the sampling timer on. If not specified, the timeout scheduler is used.
    * @returns {Observable} Sampled observable sequence.
@@ -3959,7 +3978,7 @@
   };
 
   /**
-   *  Returns the source observable sequence or the other observable sequence if dueTime elapses.  
+   *  Returns the source observable sequence or the other observable sequence if dueTime elapses.
    * @param {Number} dueTime Absolute (specified as a Date object) or relative time (specified as an integer denoting milliseconds) when a timeout occurs.
    * @param {Observable} [other]  Sequence to return in case of a timeout. If not specified, a timeout error throwing sequence will be used.
    * @param {Scheduler} [scheduler]  Scheduler to run the timeout timers on. If not specified, the timeout scheduler is used.
@@ -3968,7 +3987,7 @@
   observableProto.timeout = function (dueTime, other, scheduler) {
     other || (other = observableThrow(new Error('Timeout')));
     isScheduler(scheduler) || (scheduler = timeoutScheduler);
-    
+
     var source = this, schedulerMethod = dueTime instanceof Date ?
       'scheduleWithAbsolute' :
       'scheduleWithRelative';
@@ -3993,7 +4012,7 @@
       }
 
       createTimer();
-      
+
       original.setDisposable(source.subscribe(function (x) {
         if (!switched) {
           id++;
@@ -4015,199 +4034,6 @@
     });
   };
 
-  /**
-   *  Time shifts the observable sequence by delaying the subscription.
-   *  
-   * @example
-   *  1 - res = source.delaySubscription(5000); // 5s
-   *  2 - res = source.delaySubscription(5000, Rx.Scheduler.timeout); // 5 seconds
-   *      
-   * @param {Number} dueTime Absolute or relative time to perform the subscription at.
-   * @param {Scheduler} [scheduler]  Scheduler to run the subscription delay timer on. If not specified, the timeout scheduler is used.
-   * @returns {Observable} Time-shifted sequence.
-   */
-  observableProto.delaySubscription = function (dueTime, scheduler) {
-    return this.delayWithSelector(observableTimer(dueTime, isScheduler(scheduler) ? scheduler : timeoutScheduler), observableEmpty);
-  };
-
-    /**
-     *  Time shifts the observable sequence based on a subscription delay and a delay selector function for each element.
-     *  
-     * @example
-     *  1 - res = source.delayWithSelector(function (x) { return Rx.Scheduler.timer(5000); }); // with selector only
-     *  1 - res = source.delayWithSelector(Rx.Observable.timer(2000), function (x) { return Rx.Observable.timer(x); }); // with delay and selector
-     *
-     * @param {Observable} [subscriptionDelay]  Sequence indicating the delay for the subscription to the source. 
-     * @param {Function} delayDurationSelector Selector function to retrieve a sequence indicating the delay for each given element.
-     * @returns {Observable} Time-shifted sequence.
-     */
-    observableProto.delayWithSelector = function (subscriptionDelay, delayDurationSelector) {
-        var source = this, subDelay, selector;
-        if (typeof subscriptionDelay === 'function') {
-            selector = subscriptionDelay;
-        } else {
-            subDelay = subscriptionDelay;
-            selector = delayDurationSelector;
-        }
-        return new AnonymousObservable(function (observer) {
-            var delays = new CompositeDisposable(), atEnd = false, done = function () {
-                if (atEnd && delays.length === 0) {
-                    observer.onCompleted();
-                }
-            }, subscription = new SerialDisposable(), start = function () {
-                subscription.setDisposable(source.subscribe(function (x) {
-                    var delay;
-                    try {
-                        delay = selector(x);
-                    } catch (error) {
-                        observer.onError(error);
-                        return;
-                    }
-                    var d = new SingleAssignmentDisposable();
-                    delays.add(d);
-                    d.setDisposable(delay.subscribe(function () {
-                        observer.onNext(x);
-                        delays.remove(d);
-                        done();
-                    }, observer.onError.bind(observer), function () {
-                        observer.onNext(x);
-                        delays.remove(d);
-                        done();
-                    }));
-                }, observer.onError.bind(observer), function () {
-                    atEnd = true;
-                    subscription.dispose();
-                    done();
-                }));
-            };
-
-            if (!subDelay) {
-                start();
-            } else {
-                subscription.setDisposable(subDelay.subscribe(function () {
-                    start();
-                }, observer.onError.bind(observer), function () { start(); }));
-            }
-
-            return new CompositeDisposable(subscription, delays);
-        });
-    };
-
-  /**
-   *  Skips elements for the specified duration from the end of the observable source sequence, using the specified scheduler to run timers.
-   *  
-   *  1 - res = source.skipLastWithTime(5000);     
-   *  2 - res = source.skipLastWithTime(5000, scheduler); 
-   *      
-   * @description
-   *  This operator accumulates a queue with a length enough to store elements received during the initial duration window.
-   *  As more elements are received, elements older than the specified duration are taken from the queue and produced on the
-   *  result sequence. This causes elements to be delayed with duration.          
-   * @param {Number} duration Duration for skipping elements from the end of the sequence.
-   * @param {Scheduler} [scheduler]  Scheduler to run the timer on. If not specified, defaults to Rx.Scheduler.timeout
-   * @returns {Observable} An observable sequence with the elements skipped during the specified duration from the end of the source sequence.
-   */
-  observableProto.skipLastWithTime = function (duration, scheduler) {
-    isScheduler(scheduler) || (scheduler = timeoutScheduler);
-    var source = this;
-    return new AnonymousObservable(function (observer) {
-      var q = [];
-      return source.subscribe(function (x) {
-        var now = scheduler.now();
-        q.push({ interval: now, value: x });
-        while (q.length > 0 && now - q[0].interval >= duration) {
-          observer.onNext(q.shift().value);
-        }
-      }, observer.onError.bind(observer), function () {
-        var now = scheduler.now();
-        while (q.length > 0 && now - q[0].interval >= duration) {
-          observer.onNext(q.shift().value);
-        }
-        observer.onCompleted();
-      });
-    });
-  };
-
-  /**
-   *  Returns elements within the specified duration from the end of the observable source sequence, using the specified schedulers to run timers and to drain the collected elements.
-   * @description
-   *  This operator accumulates a queue with a length enough to store elements received during the initial duration window.
-   *  As more elements are received, elements older than the specified duration are taken from the queue and produced on the
-   *  result sequence. This causes elements to be delayed with duration.    
-   * @param {Number} duration Duration for taking elements from the end of the sequence.
-   * @param {Scheduler} [scheduler]  Scheduler to run the timer on. If not specified, defaults to Rx.Scheduler.timeout.
-   * @returns {Observable} An observable sequence with the elements taken during the specified duration from the end of the source sequence.
-   */
-  observableProto.takeLastWithTime = function (duration, scheduler) {
-    var source = this;
-    isScheduler(scheduler) || (scheduler = timeoutScheduler);
-    return new AnonymousObservable(function (observer) {
-      var q = [];
-      return source.subscribe(function (x) {
-        var now = scheduler.now();
-        q.push({ interval: now, value: x });
-        while (q.length > 0 && now - q[0].interval >= duration) {
-          q.shift();
-        }
-      }, observer.onError.bind(observer), function () {
-        var now = scheduler.now();
-        while (q.length > 0) {
-          var next = q.shift();
-          if (now - next.interval <= duration) { observer.onNext(next.value); }
-        }
-        observer.onCompleted();
-      });
-    });    
-  };
-
-  /**
-   *  Takes elements for the specified duration from the start of the observable source sequence, using the specified scheduler to run timers.
-   *  
-   * @example
-   *  1 - res = source.takeWithTime(5000,  [optional scheduler]); 
-   * @description
-   *  This operator accumulates a queue with a length enough to store elements received during the initial duration window.
-   *  As more elements are received, elements older than the specified duration are taken from the queue and produced on the
-   *  result sequence. This causes elements to be delayed with duration.    
-   * @param {Number} duration Duration for taking elements from the start of the sequence.
-   * @param {Scheduler} scheduler Scheduler to run the timer on. If not specified, defaults to Rx.Scheduler.timeout.
-   * @returns {Observable} An observable sequence with the elements taken during the specified duration from the start of the source sequence.
-   */
-  observableProto.takeWithTime = function (duration, scheduler) {
-    var source = this;
-    isScheduler(scheduler) || (scheduler = timeoutScheduler);
-    return new AnonymousObservable(function (observer) {
-      return new CompositeDisposable(scheduler.scheduleWithRelative(duration, observer.onCompleted.bind(observer)), source.subscribe(observer));
-    });
-  };
-
-  /**
-   *  Skips elements for the specified duration from the start of the observable source sequence, using the specified scheduler to run timers.
-   *  
-   * @example
-   *  1 - res = source.skipWithTime(5000, [optional scheduler]); 
-   *  
-   * @description     
-   *  Specifying a zero value for duration doesn't guarantee no elements will be dropped from the start of the source sequence.
-   *  This is a side-effect of the asynchrony introduced by the scheduler, where the action that causes callbacks from the source sequence to be forwarded
-   *  may not execute immediately, despite the zero due time.
-   *  
-   *  Errors produced by the source sequence are always forwarded to the result sequence, even if the error occurs before the duration.      
-   * @param {Number} duration Duration for skipping elements from the start of the sequence.
-   * @param {Scheduler} scheduler Scheduler to run the timer on. If not specified, defaults to Rx.Scheduler.timeout.
-   * @returns {Observable} An observable sequence with the elements skipped during the specified duration from the start of the source sequence.
-   */
-  observableProto.skipWithTime = function (duration, scheduler) {
-    var source = this;
-    isScheduler(scheduler) || (scheduler = timeoutScheduler);
-    return new AnonymousObservable(function (observer) {
-      var open = false;
-      return new CompositeDisposable(
-        scheduler.scheduleWithRelative(duration, function () { open = true; }), 
-        source.subscribe(function (x) { open && observer.onNext(x); }, observer.onError.bind(observer), observer.onCompleted.bind(observer)));
-    });
-  };
-
   var PausableObservable = (function (_super) {
 
     inherits(PausableObservable, _super);
@@ -4265,6 +4091,7 @@
   observableProto.pausable = function (pauser) {
     return new PausableObservable(this, pauser);
   };
+
   function combineLatestSource(source, subject, resultSelector) {
     return new AnonymousObservable(function (observer) {
       var n = 2,
@@ -4315,13 +4142,13 @@
 
     function subscribe(observer) {
       var q = [], previousShouldFire;
-      
-      var subscription =  
+
+      var subscription =
         combineLatestSource(
           this.source,
           this.pauser.distinctUntilChanged().startWith(false),
           function (data, shouldFire) {
-            return { data: data, shouldFire: shouldFire };      
+            return { data: data, shouldFire: shouldFire };
           })
           .subscribe(
             function (results) {
@@ -4355,10 +4182,10 @@
               while (q.length > 0) {
                 observer.onNext(q.shift());
               }
-              observer.onCompleted();              
+              observer.onCompleted();
             }
           );
-      return subscription;      
+      return subscription;
     }
 
     function PausableBufferedObservable(source, pauser) {
@@ -4382,7 +4209,7 @@
       this.controller.onNext(true);
     };
 
-    return PausableBufferedObservable; 
+    return PausableBufferedObservable;
 
   }(Observable));
 
@@ -4394,7 +4221,7 @@
    * var source = Rx.Observable.interval(100).pausableBuffered(pauser);
    * @param {Observable} pauser The observable sequence used to pause the underlying sequence.
    * @returns {Observable} The observable sequence which is paused based upon the pauser.
-   */  
+   */
   observableProto.pausableBuffered = function (subject) {
     return new PausableBufferedObservable(this, subject);
   };
@@ -4406,11 +4233,12 @@
    * source.request(3); // Reads 3 values
    * @param {Observable} pauser The observable sequence used to pause the underlying sequence.
    * @returns {Observable} The observable sequence which is paused based upon the pauser.
-   */ 
+   */
   observableProto.controlled = function (enableQueue) {
     if (enableQueue == null) {  enableQueue = true; }
     return new ControlledObservable(this, enableQueue);
   };
+
   var ControlledObservable = (function (_super) {
 
     inherits(ControlledObservable, _super);
@@ -4475,7 +4303,7 @@
 
                 if (!this.enableQueue || this.queue.length === 0) {
                     this.subject.onError(error);
-                }   
+                }
             },
             onNext: function (value) {
                 checkDisposed.call(this);
@@ -4522,7 +4350,7 @@
                 } else if (this.hasCompleted) {
                     this.subject.onCompleted();
                     this.controlledDisposable.dispose();
-                    this.controlledDisposable = disposableEmpty;                   
+                    this.controlledDisposable = disposableEmpty;
                 }
 
                 return { numberOfItems: numberOfItems, returnValue: false };
@@ -4560,6 +4388,7 @@
 
         return ControlledSubject;
     }(Observable));
+
   /*
    * Performs a exclusive waiting for the first to finish before subscribing to another observable.
    * Observables that come in between subscriptions will be dropped on the floor.
@@ -4579,7 +4408,7 @@
         function (innerSource) {
           if (!hasCurrent) {
             hasCurrent = true;
-            
+
             isPromise(innerSource) && (innerSource = observableFromPromise(innerSource));
 
             var innerSubscription = new SingleAssignmentDisposable();
@@ -4600,7 +4429,7 @@
         observer.onError.bind(observer),
         function () {
           isStopped = true;
-          if (!hasCurrent && g.length === 1) { 
+          if (!hasCurrent && g.length === 1) {
             observer.onCompleted();
           }
         }));
@@ -4608,6 +4437,7 @@
       return g;
     });
   };
+
   /*
    * Performs a exclusive map waiting for the first to finish before subscribing to another observable.
    * Observables that come in between subscriptions will be dropped on the floor.
@@ -4630,12 +4460,12 @@
         function (innerSource) {
 
           if (!hasCurrent) {
-            hasCurrent = true;          
+            hasCurrent = true;
 
             innerSubscription = new SingleAssignmentDisposable();
             g.add(innerSubscription);
 
-            isPromise(innerSource) && (innerSource = observableFromPromise(innerSource));      
+            isPromise(innerSource) && (innerSource = observableFromPromise(innerSource));
 
             innerSubscription.setDisposable(innerSource.subscribe(
               function (x) {
@@ -4659,7 +4489,7 @@
                 }
               }));
           }
-        }, 
+        },
         observer.onError.bind(observer),
         function () {
           isStopped = true;
@@ -4670,6 +4500,7 @@
       return g;
     });
   };
+
   var AnonymousObservable = Rx.AnonymousObservable = (function (__super__) {
     inherits(AnonymousObservable, __super__);
 
@@ -4694,7 +4525,7 @@
           } catch (e) {
             if (!autoDetachObserver.fail(e)) {
               throw e;
-            } 
+            }
           }
         };
 
@@ -4732,8 +4563,8 @@
             try {
                 this.observer.onNext(value);
                 noError = true;
-            } catch (e) { 
-                throw e;                
+            } catch (e) {
+                throw e;
             } finally {
                 if (!noError) {
                     this.dispose();
@@ -4744,8 +4575,8 @@
         AutoDetachObserverPrototype.error = function (exn) {
             try {
                 this.observer.onError(exn);
-            } catch (e) { 
-                throw e;                
+            } catch (e) {
+                throw e;
             } finally {
                 this.dispose();
             }
@@ -4754,8 +4585,8 @@
         AutoDetachObserverPrototype.completed = function () {
             try {
                 this.observer.onCompleted();
-            } catch (e) { 
-                throw e;                
+            } catch (e) {
+                throw e;
             } finally {
                 this.dispose();
             }
@@ -4776,23 +4607,23 @@
         return AutoDetachObserver;
     }(AbstractObserver));
 
-    /** @private */
-    var InnerSubscription = function (subject, observer) {
-        this.subject = subject;
-        this.observer = observer;
-    };
-
-    /**
-     * @private
-     * @memberOf InnerSubscription
-     */
-    InnerSubscription.prototype.dispose = function () {
-        if (!this.subject.isDisposed && this.observer !== null) {
-            var idx = this.subject.observers.indexOf(this.observer);
-            this.subject.observers.splice(idx, 1);
-            this.observer = null;
-        }
-    };
+    /** @private */
+    var InnerSubscription = function (subject, observer) {
+        this.subject = subject;
+        this.observer = observer;
+    };
+
+    /**
+     * @private
+     * @memberOf InnerSubscription
+     */
+    InnerSubscription.prototype.dispose = function () {
+        if (!this.subject.isDisposed && this.observer !== null) {
+            var idx = this.subject.observers.indexOf(this.observer);
+            this.subject.observers.splice(idx, 1);
+            this.observer = null;
+        }
+    };
 
     /**
      *  Represents an object that is both an observable sequence as well as an observer.
@@ -4818,7 +4649,7 @@
         /**
          * Creates a subject.
          * @constructor
-         */      
+         */
         function Subject() {
             _super.call(this, subscribe);
             this.isDisposed = false,
@@ -4830,13 +4661,13 @@
             /**
              * Indicates whether the subject has observers subscribed to it.
              * @returns {Boolean} Indicates whether the subject has observers subscribed to it.
-             */         
+             */
             hasObservers: function () {
                 return this.observers.length > 0;
             },
             /**
              * Notifies all subscribed observers about the end of the sequence.
-             */                          
+             */
             onCompleted: function () {
                 checkDisposed.call(this);
                 if (!this.isStopped) {
@@ -4852,7 +4683,7 @@
             /**
              * Notifies all subscribed observers about the exception.
              * @param {Mixed} error The exception to send to all observers.
-             */               
+             */
             onError: function (exception) {
                 checkDisposed.call(this);
                 if (!this.isStopped) {
@@ -4869,7 +4700,7 @@
             /**
              * Notifies all subscribed observers about the arrival of the specified element in the sequence.
              * @param {Mixed} value The value to send to all observers.
-             */                 
+             */
             onNext: function (value) {
                 checkDisposed.call(this);
                 if (!this.isStopped) {
@@ -4881,7 +4712,7 @@
             },
             /**
              * Unsubscribe all observers and release resources.
-             */                
+             */
             dispose: function () {
                 this.isDisposed = true;
                 this.observers = null;
@@ -4904,12 +4735,12 @@
   /**
    *  Represents the result of an asynchronous operation.
    *  The last value before the OnCompleted notification, or the error received through OnError, is sent to all subscribed observers.
-   */   
+   */
   var AsyncSubject = Rx.AsyncSubject = (function (__super__) {
 
     function subscribe(observer) {
       checkDisposed.call(this);
-      
+
       if (!this.isStopped) {
         this.observers.push(observer);
         return new InnerSubscription(this, observer);
@@ -4936,7 +4767,7 @@
     /**
      * Creates a subject that can only receive one value and that value is cached for all future observations.
      * @constructor
-     */ 
+     */
     function AsyncSubject() {
       __super__.call(this, subscribe);
 
@@ -4952,14 +4783,14 @@
       /**
        * Indicates whether the subject has observers subscribed to it.
        * @returns {Boolean} Indicates whether the subject has observers subscribed to it.
-       */         
+       */
       hasObservers: function () {
         checkDisposed.call(this);
         return this.observers.length > 0;
       },
       /**
        * Notifies all subscribed observers about the end of the sequence, also causing the last received value to be sent out (if any).
-       */ 
+       */
       onCompleted: function () {
         var o, i, len;
         checkDisposed.call(this);
@@ -4987,7 +4818,7 @@
       /**
        * Notifies all subscribed observers about the error.
        * @param {Mixed} error The Error to send to all observers.
-       */ 
+       */
       onError: function (error) {
         checkDisposed.call(this);
         if (!this.isStopped) {
@@ -5005,7 +4836,7 @@
       /**
        * Sends a value to the subject. The last value received before successful termination will be sent to all subscribed and future observers.
        * @param {Mixed} value The value to store in the subject.
-       */             
+       */
       onNext: function (value) {
         checkDisposed.call(this);
         if (this.isStopped) { return; }
@@ -5026,29 +4857,29 @@
     return AsyncSubject;
   }(Observable));
 
-  var AnonymousSubject = Rx.AnonymousSubject = (function (__super__) {
-    inherits(AnonymousSubject, __super__);
-
-    function AnonymousSubject(observer, observable) {
-      this.observer = observer;
-      this.observable = observable;      
-      __super__.call(this, this.observable.subscribe.bind(this.observable));
-    }
-
-    addProperties(AnonymousSubject.prototype, Observer, {
-      onCompleted: function () {
-        this.observer.onCompleted();
-      },            
-      onError: function (exception) {
-        this.observer.onError(exception);
-      },            
-      onNext: function (value) {
-        this.observer.onNext(value);
-      }
-    });
-
-    return AnonymousSubject;
-  }(Observable));
+  var AnonymousSubject = Rx.AnonymousSubject = (function (__super__) {
+    inherits(AnonymousSubject, __super__);
+
+    function AnonymousSubject(observer, observable) {
+      this.observer = observer;
+      this.observable = observable;
+      __super__.call(this, this.observable.subscribe.bind(this.observable));
+    }
+
+    addProperties(AnonymousSubject.prototype, Observer, {
+      onCompleted: function () {
+        this.observer.onCompleted();
+      },
+      onError: function (exception) {
+        this.observer.onError(exception);
+      },
+      onNext: function (value) {
+        this.observer.onNext(value);
+      }
+    });
+
+    return AnonymousSubject;
+  }(Observable));
 
   /**
    *  Represents a value that changes over time.
@@ -5077,7 +4908,7 @@
      * @constructor
      *  Initializes a new instance of the BehaviorSubject class which creates a subject that caches its last value and starts with the specified value.
      *  @param {Mixed} value Initial value sent to observers when no other value has been received by the subject yet.
-     */       
+     */
     function BehaviorSubject(value) {
       __super__.call(this, subscribe);
       this.value = value,
@@ -5091,13 +4922,13 @@
       /**
        * Indicates whether the subject has observers subscribed to it.
        * @returns {Boolean} Indicates whether the subject has observers subscribed to it.
-       */         
+       */
       hasObservers: function () {
         return this.observers.length > 0;
       },
       /**
        * Notifies all subscribed observers about the end of the sequence.
-       */ 
+       */
       onCompleted: function () {
         checkDisposed.call(this);
         if (this.isStopped) { return; }
@@ -5111,7 +4942,7 @@
       /**
        * Notifies all subscribed observers about the exception.
        * @param {Mixed} error The exception to send to all observers.
-       */             
+       */
       onError: function (error) {
         checkDisposed.call(this);
         if (this.isStopped) { return; }
@@ -5127,7 +4958,7 @@
       /**
        * Notifies all subscribed observers about the arrival of the specified element in the sequence.
        * @param {Mixed} value The value to send to all observers.
-       */              
+       */
       onNext: function (value) {
         checkDisposed.call(this);
         if (this.isStopped) { return; }
@@ -5138,7 +4969,7 @@
       },
       /**
        * Unsubscribe all observers and release resources.
-       */            
+       */
       dispose: function () {
         this.isDisposed = true;
         this.observers = null;
@@ -5153,7 +4984,7 @@
   /**
    * Represents an object that is both an observable sequence as well as an observer.
    * Each notification is broadcasted to all subscribed and future observers, subject to buffer trimming policies.
-   */  
+   */
   var ReplaySubject = Rx.ReplaySubject = (function (__super__) {
 
     function createRemovableDisposable(subject, observer) {
@@ -5213,7 +5044,7 @@
       /**
        * Indicates whether the subject has observers subscribed to it.
        * @returns {Boolean} Indicates whether the subject has observers subscribed to it.
-       */         
+       */
       hasObservers: function () {
         return this.observers.length > 0;
       },
@@ -5228,7 +5059,7 @@
       /**
        * Notifies all subscribed observers about the arrival of the specified element in the sequence.
        * @param {Mixed} value The value to send to all observers.
-       */              
+       */
       onNext: function (value) {
         checkDisposed.call(this);
         if (this.isStopped) { return; }
@@ -5246,7 +5077,7 @@
       /**
        * Notifies all subscribed observers about the exception.
        * @param {Mixed} error The exception to send to all observers.
-       */                 
+       */
       onError: function (error) {
         checkDisposed.call(this);
         if (this.isStopped) { return; }
@@ -5265,7 +5096,7 @@
       },
       /**
        * Notifies all subscribed observers about the end of the sequence.
-       */             
+       */
       onCompleted: function () {
         checkDisposed.call(this);
         if (this.isStopped) { return; }
@@ -5282,7 +5113,7 @@
       },
       /**
        * Unsubscribe all observers and release resources.
-       */               
+       */
       dispose: function () {
         this.isDisposed = true;
         this.observers = null;
@@ -5292,21 +5123,22 @@
     return ReplaySubject;
   }(Observable));
 
-    if (typeof define == 'function' && typeof define.amd == 'object' && define.amd) {
-        root.Rx = Rx;
-
-        define(function() {
-            return Rx;
-        });
-    } else if (freeExports && freeModule) {
-        // in Node.js or RingoJS
-        if (moduleExports) {
-            (freeModule.exports = Rx).Rx = Rx;
-        } else {
-          freeExports.Rx = Rx;
-        }
-    } else {
-        // in a browser or Rhino
-        root.Rx = Rx;
+    if (typeof define == 'function' && typeof define.amd == 'object' && define.amd) {
+        root.Rx = Rx;
+
+        define(function() {
+            return Rx;
+        });
+    } else if (freeExports && freeModule) {
+        // in Node.js or RingoJS
+        if (moduleExports) {
+            (freeModule.exports = Rx).Rx = Rx;
+        } else {
+          freeExports.Rx = Rx;
+        }
+    } else {
+        // in a browser or Rhino
+        root.Rx = Rx;
     }
-}.call(this));
+
+}.call(this));