Merge pull request #483 from JRegimbal/active-page-fix

Active page fix
DDMAL · Aug 21, 2019 · 4eeb1f5 · 4eeb1f5
2 parents 7e3643f + d0096a8
commit 4eeb1f5
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 5 deletions.
diff --git a/source/js/document-handler.js b/source/js/document-handler.js
@@ -165,10 +165,10 @@ function getCentermostPage (renderedPages, layout, viewport)
     const centerPage = maxBy(renderedPages, pageIndex =>
     {
         const dims = layout.getPageDimensions(pageIndex);
-        const imageOffset = layout.getPageOffset(pageIndex, {includePadding: false});
+        const imageOffset = layout.getPageOffset(pageIndex, {includePadding: true});
 
-        const midX = imageOffset.left + (dims.height / 2);
-        const midY = imageOffset.top + (dims.width / 2);
+        const midX = imageOffset.left + (dims.width / 2);
+        const midY = imageOffset.top + (dims.height / 2);
 
         const dx = Math.max(Math.abs(centerX - midX) - (dims.width / 2), 0);
         const dy = Math.max(Math.abs(centerY - midY) - (dims.height / 2), 0);

diff --git a/source/js/viewer-core.js b/source/js/viewer-core.js
@@ -1366,19 +1366,28 @@ export default class ViewerCore
         if (!arraysEqual(this.viewerState.currentPageIndices, visiblePages))
         {
             this.viewerState.currentPageIndices = visiblePages;
-            this.viewerState.activePageIndex = activePage;
+            if (this.viewerState.activePageIndex !== activePage)
+            {
+                this.viewerState.activePageIndex = activePage;
+                this.publish("ActivePageDidChange", activePage);
+            }
             this.publish("VisiblePageDidChange", visiblePages);
 
             // Publish an event if the page we're switching to has other images.
             if (this.viewerState.manifest.pages[activePage].otherImages.length > 0)
                 this.publish('VisiblePageHasAlternateViews', activePage);
         }
+        else if (this.viewerState.activePageIndex !== activePage)
+        {
+            this.viewerState.activePageIndex = activePage;
+            this.publish("ActivePageDidChange", activePage);
+        }
 
         function arraysEqual (a, b)
         {
             if (a.length !== b.length)
                 return false;
-            
+
             for (let i = 0, len = a.length; i < len; i++)
             {
                 if (a[i] !== b[i])