Chore: Removing initAnnotations() from DocBaseViewer (#259)

box · Jul 29, 2017 · b7cde84 · b7cde84
1 parent fc25534
commit b7cde84
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 31 deletions.
diff --git a/src/lib/viewers/doc/DocBaseViewer.js b/src/lib/viewers/doc/DocBaseViewer.js
@@ -651,18 +651,7 @@ class DocBaseViewer extends BaseViewer {
     }
 
     /**
-     * Initializes annotations.
-     *
-     * @protected
-     * @return {void}
-     */
-    initAnnotations() {
-        super.initAnnotations();
-        this.setupPageIds();
-    }
-
-    /**
-     * Add page IDs to each page since annotations explicitly needs IDs per page (rangy).
+     * Add page IDs to each page
      *
      * @private
      * @return {void}
@@ -1001,6 +990,9 @@ class DocBaseViewer extends BaseViewer {
                 endProgress: false, // Indicate that viewer will end progress later
                 scale: this.pdfViewer.currentScale
             });
+
+            // Add page IDs to each page after page structure is available
+            this.setupPageIds();
         }
     }
 

diff --git a/src/lib/viewers/doc/__tests__/DocBaseViewer-test.js b/src/lib/viewers/doc/__tests__/DocBaseViewer-test.js
@@ -1083,25 +1083,6 @@ describe('src/lib/viewers/doc/DocBaseViewer', () => {
         });
     });
 
-    describe('initAnnotations()', () => {
-        const initFunc = BaseViewer.prototype.initAnnotations;
-
-        afterEach(() => {
-            Object.defineProperty(BaseViewer.prototype, 'initAnnotations', { value: initFunc });
-        });
-
-        it('should set up page IDs and initialize the annotator', () => {
-            docBase.pdfViewer = {
-                currentScale: 1
-            };
-            sandbox.stub(docBase, 'setupPageIds');
-            Object.defineProperty(BaseViewer.prototype, 'initAnnotations', { value: sandbox.mock() });
-
-            docBase.initAnnotations();
-            expect(docBase.setupPageIds).to.be.called;
-        });
-    });
-
     describe('setupPageIds()', () => {
         it('should add page IDs', () => {
             const pageEl = document.createElement('div');
@@ -1412,6 +1393,7 @@ describe('src/lib/viewers/doc/DocBaseViewer', () => {
             stubs.setPage = sandbox.stub(docBase, 'setPage');
             stubs.getCachedPage = sandbox.stub(docBase, 'getCachedPage');
             stubs.emit = sandbox.stub(docBase, 'emit');
+            stubs.setupPages = sandbox.stub(docBase, 'setupPageIds');
         });
 
         it('should load UI, check the pagination buttons, set the page, and make document scrollable', () => {
@@ -1424,6 +1406,7 @@ describe('src/lib/viewers/doc/DocBaseViewer', () => {
             expect(stubs.checkPaginationButtons).to.be.called;
             expect(stubs.setPage).to.be.called;
             expect(docBase.docEl).to.have.class('bp-is-scrollable');
+            expect(stubs.setupPages).to.be.called;
         });
 
         it('should broadcast that the preview is loaded if it hasn\'t already', () => {