Merge pull request #2540 from palantir/hotfix-selectionBoxLayerDest

[hotfix] check if scale exists before offUpdating it
palantir · Aug 3, 2015 · af44c59 · af44c59
2 parents f55ecc5 + 038b831
commit af44c59
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 4 deletions.
diff --git a/plottable.js b/plottable.js
@@ -6114,8 +6114,12 @@ var Plottable;
             };
             SelectionBoxLayer.prototype.destroy = function () {
                 _super.prototype.destroy.call(this);
-                this.xScale().offUpdate(this._adjustBoundsCallback);
-                this.yScale().offUpdate(this._adjustBoundsCallback);
+                if (this.xScale() != null) {
+                    this.xScale().offUpdate(this._adjustBoundsCallback);
+                }
+                if (this.yScale() != null) {
+                    this.yScale().offUpdate(this._adjustBoundsCallback);
+                }
             };
             return SelectionBoxLayer;
         })(Plottable.Component);

diff --git a/src/components/selectionBoxLayer.ts b/src/components/selectionBoxLayer.ts
@@ -207,8 +207,12 @@ export module Components {
 
     public destroy() {
       super.destroy();
-      this.xScale().offUpdate(this._adjustBoundsCallback);
-      this.yScale().offUpdate(this._adjustBoundsCallback);
+      if (this.xScale() != null) {
+        this.xScale().offUpdate(this._adjustBoundsCallback);
+      }
+      if (this.yScale() != null) {
+        this.yScale().offUpdate(this._adjustBoundsCallback);
+      }
     }
   }
 }

diff --git a/test/components/selectionBoxLayerTests.ts b/test/components/selectionBoxLayerTests.ts
@@ -22,6 +22,15 @@ describe("SelectionBoxLayer", () => {
     svg.remove();
   });
 
+  it("destroy() does not error if scales are not inputted", () => {
+    var svg = TestMethods.generateSVG();
+    var sbl = new Plottable.Components.SelectionBoxLayer();
+    sbl.renderTo(svg);
+    assert.doesNotThrow(() => sbl.destroy(), Error, "can destroy even with no scales");
+
+    svg.remove();
+  });
+
   it("bounds()", () => {
     var svg = TestMethods.generateSVG();
     var sbl = new Plottable.Components.SelectionBoxLayer();