diff --git a/lib/features/space-tool/SpaceTool.js b/lib/features/space-tool/SpaceTool.js index 623c523ac..0b3239902 100644 --- a/lib/features/space-tool/SpaceTool.js +++ b/lib/features/space-tool/SpaceTool.js @@ -387,7 +387,11 @@ SpaceTool.prototype.toggle = function() { SpaceTool.prototype.isActive = function() { var context = this._dragging.context(); - return context && /^spaceTool/.test(context.prefix); + if (context) { + return /^spaceTool/.test(context.prefix); + } + + return false; }; // helpers ////////// diff --git a/test/spec/features/space-tool/SpaceToolSpec.js b/test/spec/features/space-tool/SpaceToolSpec.js index 3af37c7a6..157eee467 100644 --- a/test/spec/features/space-tool/SpaceToolSpec.js +++ b/test/spec/features/space-tool/SpaceToolSpec.js @@ -81,7 +81,7 @@ describe('features/space-tool', function() { expect(context).not.to.exist; - expect(spaceTool.isActive()).not.to.exist; + expect(spaceTool.isActive()).to.be.false; }));