Addressing Issue #658

Author: mattpodwysocki

dist/rx.aggregates.js

@@ -269,6 +269,7 @@
     //deprecate('contains', 'includes');
     observableProto.includes(searchElement, fromIndex);
   };
+
   /**
    * Returns an observable sequence containing a value that represents how many elements in the specified observable sequence satisfy a condition if provided, else the count of items.
    * @example

dist/rx.aggregates.map

@@ -971,10 +971,17 @@
     if (disposable.isDisposed) { throw new ObjectDisposedError(); }
   };
 
-  var SingleAssignmentDisposable = Rx.SingleAssignmentDisposable = (function () {
-    function BooleanDisposable () {
+  var BooleanDisposable = (function () {
+    var trueInstance = (function () {
+      var d = new BooleanDisposable();
+      d.isDisposed = true;
+      return d;
+    }());
+
+    function BooleanDisposable (isSingle) {
       this.isDisposed = false;
       this.current = null;
+      this.isSingle = isSingle;
     }
 
     var booleanDisposablePrototype = BooleanDisposable.prototype;
@@ -984,15 +991,15 @@
      * @return The underlying disposable.
      */
     booleanDisposablePrototype.getDisposable = function () {
-      return this.current;
+      return this.current === trueInstance ? disposableEmpty : this.current;
     };
 
     /**
      * Sets the underlying disposable.
      * @param {Disposable} value The new underlying disposable.
      */
     booleanDisposablePrototype.setDisposable = function (value) {
-      var shouldDispose = this.isDisposed;
+      var shouldDispose = this.current === trueInstance;
       if (!shouldDispose) {
         var old = this.current;
         this.current = value;
@@ -1006,16 +1013,21 @@
      */
     booleanDisposablePrototype.dispose = function () {
       if (!this.isDisposed) {
-        this.isDisposed = true;
         var old = this.current;
-        this.current = null;
+        this.current = trueInstance;
+        this.isDisposed = trueInstance.isDisposed;
       }
       old && old.dispose();
     };
 
     return BooleanDisposable;
   }());
-  var SerialDisposable = Rx.SerialDisposable = SingleAssignmentDisposable;
+  var SingleAssignmentDisposable = Rx.SingleAssignmentDisposable = function () {
+    return new BooleanDisposable(true);
+  };
+  var SerialDisposable = Rx.SerialDisposable = function () {
+    return new BooleanDisposable();
+  };
 
   /**
    * Represents a disposable resource that only disposes its underlying disposable resource when all dependent disposable objects have been disposed.
@@ -5442,6 +5454,7 @@
     //deprecate('contains', 'includes');
     observableProto.includes(searchElement, fromIndex);
   };
+
   /**
    * Returns an observable sequence containing a value that represents how many elements in the specified observable sequence satisfy a condition if provided, else the count of items.
    * @example

dist/rx.all.compat.js

@@ -780,10 +780,17 @@
     if (disposable.isDisposed) { throw new ObjectDisposedError(); }
   };
 
-  var SingleAssignmentDisposable = Rx.SingleAssignmentDisposable = (function () {
-    function BooleanDisposable () {
+  var BooleanDisposable = (function () {
+    var trueInstance = (function () {
+      var d = new BooleanDisposable();
+      d.isDisposed = true;
+      return d;
+    }());
+
+    function BooleanDisposable (isSingle) {
       this.isDisposed = false;
       this.current = null;
+      this.isSingle = isSingle;
     }
 
     var booleanDisposablePrototype = BooleanDisposable.prototype;
@@ -793,15 +800,15 @@
      * @return The underlying disposable.
      */
     booleanDisposablePrototype.getDisposable = function () {
-      return this.current;
+      return this.current === trueInstance ? disposableEmpty : this.current;
     };
 
     /**
      * Sets the underlying disposable.
      * @param {Disposable} value The new underlying disposable.
      */
     booleanDisposablePrototype.setDisposable = function (value) {
-      var shouldDispose = this.isDisposed;
+      var shouldDispose = this.current === trueInstance;
       if (!shouldDispose) {
         var old = this.current;
         this.current = value;
@@ -815,16 +822,21 @@
      */
     booleanDisposablePrototype.dispose = function () {
       if (!this.isDisposed) {
-        this.isDisposed = true;
         var old = this.current;
-        this.current = null;
+        this.current = trueInstance;
+        this.isDisposed = trueInstance.isDisposed;
       }
       old && old.dispose();
     };
 
     return BooleanDisposable;
   }());
-  var SerialDisposable = Rx.SerialDisposable = SingleAssignmentDisposable;
+  var SingleAssignmentDisposable = Rx.SingleAssignmentDisposable = function () {
+    return new BooleanDisposable(true);
+  };
+  var SerialDisposable = Rx.SerialDisposable = function () {
+    return new BooleanDisposable();
+  };
 
   /**
    * Represents a disposable resource that only disposes its underlying disposable resource when all dependent disposable objects have been disposed.
@@ -5297,6 +5309,7 @@
     //deprecate('contains', 'includes');
     observableProto.includes(searchElement, fromIndex);
   };
+
   /**
    * Returns an observable sequence containing a value that represents how many elements in the specified observable sequence satisfy a condition if provided, else the count of items.
    * @example

dist/rx.all.compat.map

@@ -971,10 +971,17 @@
     if (disposable.isDisposed) { throw new ObjectDisposedError(); }
   };
 
-  var SingleAssignmentDisposable = Rx.SingleAssignmentDisposable = (function () {
-    function BooleanDisposable () {
+  var BooleanDisposable = (function () {
+    var trueInstance = (function () {
+      var d = new BooleanDisposable();
+      d.isDisposed = true;
+      return d;
+    }());
+
+    function BooleanDisposable (isSingle) {
       this.isDisposed = false;
       this.current = null;
+      this.isSingle = isSingle;
     }
 
     var booleanDisposablePrototype = BooleanDisposable.prototype;
@@ -984,15 +991,15 @@
      * @return The underlying disposable.
      */
     booleanDisposablePrototype.getDisposable = function () {
-      return this.current;
+      return this.current === trueInstance ? disposableEmpty : this.current;
     };
 
     /**
      * Sets the underlying disposable.
      * @param {Disposable} value The new underlying disposable.
      */
     booleanDisposablePrototype.setDisposable = function (value) {
-      var shouldDispose = this.isDisposed;
+      var shouldDispose = this.current === trueInstance;
       if (!shouldDispose) {
         var old = this.current;
         this.current = value;
@@ -1006,16 +1013,21 @@
      */
     booleanDisposablePrototype.dispose = function () {
       if (!this.isDisposed) {
-        this.isDisposed = true;
         var old = this.current;
-        this.current = null;
+        this.current = trueInstance;
+        this.isDisposed = trueInstance.isDisposed;
       }
       old && old.dispose();
     };
 
     return BooleanDisposable;
   }());
-  var SerialDisposable = Rx.SerialDisposable = SingleAssignmentDisposable;
+  var SingleAssignmentDisposable = Rx.SingleAssignmentDisposable = function () {
+    return new BooleanDisposable(true);
+  };
+  var SerialDisposable = Rx.SerialDisposable = function () {
+    return new BooleanDisposable();
+  };
 
   /**
    * Represents a disposable resource that only disposes its underlying disposable resource when all dependent disposable objects have been disposed.