Fix: Swapping Object.values() with Object.keys() (#371)

- Object.values() is not supported in any IE browser, so replacing it with Object.keys() when iterating through objects
box · Sep 7, 2017 · 23527a8 · 23527a8
1 parent 05d3662
commit 23527a8
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 13 deletions.
diff --git a/src/lib/annotations/Annotator.js b/src/lib/annotations/Annotator.js
@@ -83,8 +83,11 @@ class Annotator extends EventEmitter {
         this.unbindModeListeners();
 
         if (this.threads) {
-            Object.values(this.threads).forEach((pageThreads) => {
-                Object.values(pageThreads).forEach((thread) => {
+            Object.keys(this.threads).forEach((page) => {
+                const pageThreads = this.getThreadsOnPage(page);
+
+                Object.keys(pageThreads).forEach((threadID) => {
+                    const thread = pageThreads[threadID];
                     this.unbindCustomListenersOnThread(thread);
                 });
             });
@@ -267,7 +270,8 @@ class Annotator extends EventEmitter {
         }
 
         const pageThreads = this.getThreadsOnPage(pageNum);
-        Object.values(pageThreads).forEach((thread) => {
+        Object.keys(pageThreads).forEach((threadID) => {
+            const thread = pageThreads[threadID];
             thread.hide();
         });
     }
@@ -297,7 +301,8 @@ class Annotator extends EventEmitter {
         }
 
         const pageThreads = this.getThreadsOnPage(pageNum);
-        Object.values(pageThreads).forEach((thread) => {
+        Object.keys(pageThreads).forEach((threadID) => {
+            const thread = pageThreads[threadID];
             if (!this.isModeAnnotatable(thread.type)) {
                 return;
             }
@@ -875,8 +880,11 @@ class Annotator extends EventEmitter {
     destroyPendingThreads() {
         let hasPendingThreads = false;
 
-        Object.values(this.threads).forEach((pageThreads) => {
-            Object.values(pageThreads).forEach((thread) => {
+        Object.keys(this.threads).forEach((page) => {
+            const pageThreads = this.getThreadsOnPage(page);
+
+            Object.keys(pageThreads).forEach((threadID) => {
+                const thread = pageThreads[threadID];
                 if (annotatorUtil.isPending(thread.state)) {
                     hasPendingThreads = true;
                     thread.destroy();

diff --git a/src/lib/annotations/doc/DocAnnotator.js b/src/lib/annotations/doc/DocAnnotator.js
@@ -438,7 +438,8 @@ class DocAnnotator extends Annotator {
 
         // TODO (@jholdstock|@spramod) remove this if statement, and make super call, upon refactor.
         const pageThreads = this.getThreadsOnPage(pageNum);
-        Object.values(pageThreads).forEach((thread) => {
+        Object.keys(pageThreads).forEach((threadID) => {
+            const thread = pageThreads[threadID];
             if (!this.isModeAnnotatable(thread.type)) {
                 return;
             }
@@ -551,7 +552,10 @@ class DocAnnotator extends Annotator {
             return;
         }
 
-        Object.values(this.modeControllers).forEach((controller) => controller.removeSelection());
+        Object.keys(this.modeControllers).forEach((mode) => {
+            const controller = this.modeControllers[mode];
+            controller.removeSelection();
+        });
 
         if (this.hasTouch && this.isMobile) {
             document.removeEventListener('selectionchange', this.onSelectionChange);
@@ -631,7 +635,8 @@ class DocAnnotator extends Annotator {
         }
 
         // Set all annotations that are in the 'hover' state to 'inactive'
-        Object.values(this.threads).forEach((pageThreads) => {
+        Object.keys(this.threads).forEach((page) => {
+            const pageThreads = this.getThreadsOnPage(page);
             const highlightThreads = this.getHighlightThreadsOnPage(pageThreads);
             highlightThreads.filter(isThreadInHoverState).forEach((thread) => {
                 thread.reset();
@@ -675,7 +680,8 @@ class DocAnnotator extends Annotator {
         this.mouseX = event.clientX;
         this.mouseY = event.clientY;
 
-        Object.values(this.threads).forEach((pageThreads) => {
+        Object.keys(this.threads).forEach((page) => {
+            const pageThreads = this.getThreadsOnPage(page);
             const highlightThreads = this.getHighlightThreadsOnPage(pageThreads);
             highlightThreads.forEach((thread) => {
                 thread.onMousedown();
@@ -746,7 +752,9 @@ class DocAnnotator extends Annotator {
         let hoverActive = false;
 
         const pageThreads = this.getThreadsOnPage(page);
-        Object.values(pageThreads).forEach((thread) => {
+        Object.keys(pageThreads).forEach((threadID) => {
+            const thread = pageThreads[threadID];
+
             // Determine if any highlight threads on page are pending or active
             // and ignore hover events of any highlights below
             if (!annotatorUtil.isHighlightAnnotation(thread.type) || thread.state === STATES.pending) {
@@ -916,7 +924,9 @@ class DocAnnotator extends Annotator {
         const page = annotatorUtil.getPageInfo(event.target).page;
         const pageThreads = this.getThreadsOnPage(page);
 
-        Object.values(pageThreads).forEach((thread) => {
+        Object.keys(pageThreads).forEach((threadID) => {
+            const thread = pageThreads[threadID];
+
             if (annotatorUtil.isPending(thread.state)) {
                 // Destroy any pending highlights on click outside the highlight
                 if (thread.type === TYPES.point) {
@@ -975,7 +985,8 @@ class DocAnnotator extends Annotator {
         const threads = [];
         const pageThreads = this.getThreadsOnPage(page);
 
-        Object.values(pageThreads).forEach((thread) => {
+        Object.keys(pageThreads).forEach((threadID) => {
+            const thread = pageThreads[threadID];
             if (annotatorUtil.isHighlightAnnotation(thread.type)) {
                 threads.push(thread);
             }