From 6f507ced5e092425faa15b08ce427a5f01b801a2 Mon Sep 17 00:00:00 2001 From: Sumedha Pramod Date: Tue, 4 Dec 2018 13:02:55 -0800 Subject: [PATCH 1/2] Fix: Get mode button from header element rather than container - This is a fix specifically for Annotations in the ContentPreview element or other cases when the header element is not contained inside box-content-preview --- src/controllers/AnnotationModeController.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/controllers/AnnotationModeController.js b/src/controllers/AnnotationModeController.js index 27cea78ac..e1eea852b 100644 --- a/src/controllers/AnnotationModeController.js +++ b/src/controllers/AnnotationModeController.js @@ -151,7 +151,7 @@ class AnnotationModeController extends EventEmitter { */ getButton(annotatorSelector: string): HTMLElement { // $FlowFixMe - return this.container.querySelector(annotatorSelector); + return this.headerElement.querySelector(annotatorSelector); } /** From 8e5e20062f25c3c78733438978f56f62270c3ceb Mon Sep 17 00:00:00 2001 From: Sumedha Pramod Date: Tue, 4 Dec 2018 13:27:30 -0800 Subject: [PATCH 2/2] Fix: Tests --- .../__tests__/AnnotationModeController-test.js | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/src/controllers/__tests__/AnnotationModeController-test.js b/src/controllers/__tests__/AnnotationModeController-test.js index 9fca01504..aa4becdd0 100644 --- a/src/controllers/__tests__/AnnotationModeController-test.js +++ b/src/controllers/__tests__/AnnotationModeController-test.js @@ -123,15 +123,11 @@ describe('controllers/AnnotationModeController', () => { it('should return the annotation mode button', () => { const buttonEl = document.createElement('button'); buttonEl.classList.add('class'); - controller.container = document.createElement('div'); - controller.container.appendChild(buttonEl); + controller.headerElement = document.createElement('div'); + controller.headerElement.appendChild(buttonEl); expect(controller.getButton('.class')).not.toBeNull(); }); - - it('should return null if no headerElement', () => { - expect(controller.getButton('.class')).toBeNull(); - }); }); describe('showButton()', () => {