Set default displayScrollbar to false

michaelbromley · Aug 29, 2014 · ebf924f · ebf924f
1 parent 7f188bb
commit ebf924f
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 11 deletions.
diff --git a/dist/horizonal.debug.js b/dist/horizonal.debug.js
@@ -129,7 +129,7 @@ function Horizonal() {
         staggerDelay: 0.1,
         stagger: 'random',
         customCssFile: false,
-        displayScrollbar: true,
+        displayScrollbar: false,
         scrollbarShortenRatio: 2, // long scrolling between pages can be a pain, so a higher value here will shorten the scroll distance between pages
         pageMargin: 20,
         displayPageCount: true,
@@ -225,8 +225,8 @@ function Horizonal() {
         $(window).on('touchstart pointerdown MSPointerDown', touchstartHandler);
         $(window).on('touchend pointerup MSPointerUp', touchendHandler);
         $(window).on('touchmove pointermove MSPointerMove', touchmoveHandler);
-        $('a').on('click', linkHandler);
         $(window.document).on('wheel', mousewheelHandler);
+        $('a').on('click', linkHandler);
     }
 
     function unregisterEventHandlers() {
@@ -237,6 +237,7 @@ function Horizonal() {
         $(window).off('touchstart pointerdown MSPointerDown', touchstartHandler);
         $(window).off('touchend pointerup MSPointerUp', touchendHandler);
         $(window).off('touchmove pointermove MSPointerMove', touchmoveHandler);
+        $(window.document).off('wheel', mousewheelHandler);
         $('a').off('click', linkHandler);
     }
 
@@ -303,6 +304,11 @@ function composePage(currentScroll) {
         // a setTimeout is used to force async execution and allow the loadingIndicator to display before the
         // heavy computations of composePage() are begun.
         setTimeout(function() {
+
+            if (!OPTIONS.displayScrollbar) {
+                $('body').css('overflow-y', 'hidden');
+            }
+
             var allNodes = new NodeCollection(OPTIONS.selector);
 
             PAGE_COLLECTION = pageCollectionGenerator.fromNodeCollection(allNodes);
@@ -327,9 +333,6 @@ function composePage(currentScroll) {
 
             var documentHeight = PAGE_COLLECTION.last().bottom / OPTIONS.scrollbarShortenRatio + VIEWPORT_HEIGHT;
             ROOT.height(documentHeight);
-            if (!OPTIONS.displayScrollbar) {
-                $('body').css('overflow-y', 'hidden');
-            }
             renderPageCount();
             removeLoadingIndicator();
             deferred.resolve();

diff --git a/dist/horizonal.min.js b/dist/horizonal.min.js
diff --git a/dist/horizonal.zip b/dist/horizonal.zip
diff --git a/src/common.js b/src/common.js
@@ -20,6 +20,11 @@ function composePage(currentScroll) {
         // a setTimeout is used to force async execution and allow the loadingIndicator to display before the
         // heavy computations of composePage() are begun.
         setTimeout(function() {
+
+            if (!OPTIONS.displayScrollbar) {
+                $('body').css('overflow-y', 'hidden');
+            }
+
             var allNodes = new NodeCollection(OPTIONS.selector);
 
             PAGE_COLLECTION = pageCollectionGenerator.fromNodeCollection(allNodes);
@@ -44,9 +49,6 @@ function composePage(currentScroll) {
 
             var documentHeight = PAGE_COLLECTION.last().bottom / OPTIONS.scrollbarShortenRatio + VIEWPORT_HEIGHT;
             ROOT.height(documentHeight);
-            if (!OPTIONS.displayScrollbar) {
-                $('body').css('overflow-y', 'hidden');
-            }
             renderPageCount();
             removeLoadingIndicator();
             deferred.resolve();

diff --git a/src/horizonal.js b/src/horizonal.js
@@ -16,7 +16,7 @@ function Horizonal() {
         staggerDelay: 0.1,
         stagger: 'random',
         customCssFile: false,
-        displayScrollbar: true,
+        displayScrollbar: false,
         scrollbarShortenRatio: 2, // long scrolling between pages can be a pain, so a higher value here will shorten the scroll distance between pages
         pageMargin: 20,
         displayPageCount: true,
@@ -112,8 +112,8 @@ function Horizonal() {
         $(window).on('touchstart pointerdown MSPointerDown', touchstartHandler);
         $(window).on('touchend pointerup MSPointerUp', touchendHandler);
         $(window).on('touchmove pointermove MSPointerMove', touchmoveHandler);
-        $('a').on('click', linkHandler);
         $(window.document).on('wheel', mousewheelHandler);
+        $('a').on('click', linkHandler);
     }
 
     function unregisterEventHandlers() {
@@ -124,6 +124,7 @@ function Horizonal() {
         $(window).off('touchstart pointerdown MSPointerDown', touchstartHandler);
         $(window).off('touchend pointerup MSPointerUp', touchendHandler);
         $(window).off('touchmove pointermove MSPointerMove', touchmoveHandler);
+        $(window.document).off('wheel', mousewheelHandler);
         $('a').off('click', linkHandler);
     }