diff --git a/src/controllers/DrawingModeController.js b/src/controllers/DrawingModeController.js index ecff6d792..c0c504500 100644 --- a/src/controllers/DrawingModeController.js +++ b/src/controllers/DrawingModeController.js @@ -73,33 +73,6 @@ class DrawingModeController extends AnnotationModeController { this.redoButtonEl = this.getButton(SELECTOR_ANNOTATION_BUTTON_DRAW_REDO); } - /** @inheritdoc */ - bindDOMListeners(): void { - // $FlowFixMe - this.handleSelection = this.handleSelection.bind(this); - this.annotatedElement.addEventListener('click', this.handleSelection); - } - - /** @inheritdoc */ - unbindDOMListeners(): void { - this.annotatedElement.removeEventListener('click', this.handleSelection); - } - - /** @inheritdoc */ - bindListeners(): void { - super.bindListeners(); - this.unbindDOMListeners(); - } - - /** @inheritdoc */ - unbindListeners(): void { - super.unbindListeners(); - this.bindDOMListeners(); - - disableElement(this.undoButtonEl); - disableElement(this.redoButtonEl); - } - /** * Prevents click events from triggering other annotation types * diff --git a/src/controllers/__tests__/DrawingModeController-test.js b/src/controllers/__tests__/DrawingModeController-test.js index 07d986a29..60b30542c 100644 --- a/src/controllers/__tests__/DrawingModeController-test.js +++ b/src/controllers/__tests__/DrawingModeController-test.js @@ -87,78 +87,6 @@ describe('controllers/DrawingModeController', () => { }); }); - describe('bindDOMListeners()', () => { - beforeEach(() => { - controller.annotatedElement.addEventListener = jest.fn(); - }); - - it('should bind DOM listeners for desktop devices', () => { - controller.hasTouch = false; - controller.bindDOMListeners(); - expect(controller.annotatedElement.addEventListener).toBeCalledWith('click', expect.any(Function)); - }); - - it('should bind DOM listeners for touch enabled devices', () => { - controller.hasTouch = true; - controller.bindDOMListeners(); - expect(controller.annotatedElement.addEventListener).toBeCalledWith('click', expect.any(Function)); - }); - }); - - describe('unbindDOMListeners()', () => { - beforeEach(() => { - controller.annotatedElement.removeEventListener = jest.fn(); - }); - - it('should unbind DOM listeners for desktop devices', () => { - controller.hasTouch = false; - controller.unbindDOMListeners(); - expect(controller.annotatedElement.removeEventListener).toBeCalledWith('click', expect.any(Function)); - }); - - it('should unbind DOM listeners for touch enabled devices', () => { - controller.hasTouch = true; - controller.unbindDOMListeners(); - expect(controller.annotatedElement.removeEventListener).toBeCalledWith('click', expect.any(Function)); - }); - }); - - describe('bindListeners()', () => { - it('should disable undo and redo buttons', () => { - controller.unbindDOMListeners = jest.fn(); - const handlerObj = { - type: 'event', - func: jest.fn(), - eventObj: { - addEventListener: jest.fn() - } - }; - controller.setupHandlers = jest.fn(() => { - controller.handlers = [handlerObj]; - }); - expect(controller.handlers.length).toEqual(0); - - controller.bindListeners(); - expect(controller.unbindDOMListeners).toBeCalled(); - }); - }); - - describe('unbindListeners()', () => { - it('should disable undo and redo buttons', () => { - util.disableElement = jest.fn(); - controller.bindDOMListeners = jest.fn(); - - controller.annotatedElement = document.createElement('div'); - controller.undoButtonEl = 'test1'; - controller.redoButtonEl = 'test2'; - - controller.unbindListeners(); - expect(util.disableElement).toBeCalledWith(controller.undoButtonEl); - expect(util.disableElement).toBeCalledWith(controller.redoButtonEl); - expect(controller.bindDOMListeners); - }); - }); - describe('setupHandlers()', () => { it('should successfully contain draw mode handlers if undo and redo buttons exist', () => { controller.annotatedElement = {};