From: vincent@cubedesigners.com <vincent@cubedesigners.com@f5622870-0f3c-0410-866d-9cb505b7a8ef>
Date: Tue, 6 Sep 2016 16:07:07 +0000 (+0000)
Subject: fix #674 @1:05
X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=148011bc89f89b249215d3307a7d5dc6bd0aeba7;p=fluidbook-v3.git

fix #674 @1:05
---

diff --git a/js/101-header.js b/js/101-header.js
index 0a3c7ff..36c359a 100644
--- a/js/101-header.js
+++ b/js/101-header.js
@@ -6,6 +6,7 @@ var headerPos = 0;
 var htl;
 var home = false;
 var fullPages = false;
+var htlLock = false;
 
 registerLoader(load_header, true);
 
@@ -30,33 +31,33 @@ function resizeHeader() {
 
     setHeaderAnimation();
     setTimeout(function () {
-        headerScroll();
+        headerScroll(true);
     }, 100);
 }
 
 function setHeaderAnimation() {
     var h = $('#h');
     home = $('body').hasClass('home');
-    fullPages = $('body').hasClass('fullpages'); // Are we in full page mode?
-
-    var bgcolor = "#fff";
-    var boxshadow = '0 0 120px rgba(0,0,0,0.3)';
-    if (fullPages && !isMobile()) {
-        bgcolor = 'transparent';
-        boxshadow = '0 0 0 rgba(0,0,0,0)';
-    }
+    var fullPages = $('body').hasClass('fullpages'); // Are we in full page mode?
 
     if (htl !== undefined) {
-        htl.remove();
+        htl.clear();
+    } else {
+        htl = new TimelineMax();
     }
 
-    htl = new TimelineMax();
     // Background-color & height
     htl.add(TweenMax.fromTo(h, 1.5, {height: 90}, {height: 75}), 0);
-    htl.add(TweenMax.fromTo(h, 0.75, {backgroundColor: 'transparent', boxShadow: '0 0 0 rgba(0,0,0,0)'}, {backgroundColor: bgcolor, boxShadow: boxshadow}), 0);
+
     if (home && (isMobile() || !fullPages)) {
         htl.add(TweenMax.fromTo($("#h,#nav-icon"), 1, {className: $("main section:first").data('headerstyle')}, {className: "-=light"}), 1);
     }
+    if (fullPages && !isMobile()) {
+        htl.add(TweenMax.fromTo(h, 0.75, {backgroundColor: 'transparent', boxShadow: '0 0 0 rgba(0,0,0,0)'}, {backgroundColor: 'transparent', boxShadow: '0 0 0 rgba(0,0,0,0)'}), 0);
+    } else {
+        htl.add(TweenMax.fromTo(h, 0.75, {backgroundColor: 'transparent', boxShadow: '0 0 0 rgba(0,0,0,0)'}, {backgroundColor: '#fff', boxShadow: '0 0 120px rgba(0,0,0,0.3)'}), 0);
+    }
+
     htl.add(TweenMax.fromTo($(h).find('#header'), 1.5, {height: 90}, {height: 56}), 0);
 
     // Logo
@@ -74,9 +75,7 @@ function setHeaderAnimation() {
     }
     // Menu position
     htl.add(TweenMax.fromTo(nav, 1, {left: '43.5%'}, {left: 312}), 2);
-
     htl.stop();
-
     headerScroll(true);
 }
 
@@ -85,7 +84,7 @@ function headerScroll(force) {
     if (force === undefined) {
         force = false;
     }
-    var s = $(window).scrollTop();
+    var s = Math.max(0, $(window).scrollTop() - 7);
     var h = $('#h');
 
     // If no move since last call, nothing to do
@@ -130,7 +129,7 @@ function headerScroll(force) {
     }
     // Normalize top value
     var top = Math.max(-headerHeight, Math.min(adminHeight, htop + adminHeight));
-    if (home && !isMobile() && fullPages) {
+    if (home && ((!isMobile() && fullPages) || Modernizr.ios)) {
         top = adminHeight;
     }
     $(h).css('top', top);
@@ -147,7 +146,6 @@ function headerScroll(force) {
 }
 
 function changeHeaderStyle() {
-
     var scrollTop = $(window).scrollTop();
     var wh = $(window).height();
     var section;
diff --git a/js/210-home.js b/js/210-home.js
index 6b0c0dc..b595046 100644
--- a/js/210-home.js
+++ b/js/210-home.js
@@ -49,9 +49,9 @@ function resizeHome() {
     // Recalculate zoom value but don't apply scaling yet
     calculateZoom();
 
-    var homezoom=zoom;
-    if(Modernizr.ie10 || Modernizr.ie11){
-        homezoom=1;
+    var homezoom = zoom;
+    if (Modernizr.ie10 || Modernizr.ie11) {
+        homezoom = 1;
     }
 
     // Resize sections, allowing for scale factor that will be applied to parent element
@@ -63,6 +63,10 @@ function resizeHome() {
 
     if (isMobile()) {
         sections.css('height', 'auto');
+        var h=[];
+        $(sections).each(function(){
+            h.push($(this).outerHeight());
+        })
         disableScrollify();
     } else if (!isTallEnough()) {
         // Size each section according to its content and background image ratio