From fe2aa52caf97ec9521de25ead1ada88c03696aab Mon Sep 17 00:00:00 2001 From: Ian Gilman Date: Wed, 14 Jan 2015 15:09:48 -0800 Subject: [PATCH] Proper buffer for page and book modes (m2) --- test/demo/m2/README.md | 4 ++-- test/demo/m2/js/main.js | 11 ++++++----- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/test/demo/m2/README.md b/test/demo/m2/README.md index 827fc02a..9acba890 100644 --- a/test/demo/m2/README.md +++ b/test/demo/m2/README.md @@ -1,8 +1,8 @@ # To Do -* Make sure adjacent pages aren't visible * Thumbs hover and active state (SVG overlay?) * Resize on window resize * When going to thumbs, scroll to the proper part of the page -* Show/hide pages? * Support 400+ page collections +* Show/hide pages? +* Play with constraints while zooming out on corners/edges? diff --git a/test/demo/m2/js/main.js b/test/demo/m2/js/main.js index 3deaddcb..8d6ffba1 100644 --- a/test/demo/m2/js/main.js +++ b/test/demo/m2/js/main.js @@ -330,11 +330,12 @@ layoutConfig.sameWidth = true; } else if (this.mode === 'scroll') { layoutConfig.buffer = this.pageBuffer; - } else if (this.mode === 'book') { - layoutConfig.book = true; - layoutConfig.buffer = this.bigBuffer; - } else if (this.mode === 'page') { - layoutConfig.buffer = 2; + } else if (this.mode === 'book' || this.mode === 'page') { + layoutConfig.book = (this.mode === 'book'); + var height = 1 + (this.pageBuffer * 2); + // Note that using window here is approximate, but that's close enough. + // We can't use viewer, because it may be stretched for the thumbs view. + layoutConfig.buffer = (height * ($(window).width() / $(window).height())) / 2; } var layout = {