fix #674 @1:05

diff --git a/js/101-header.js b/js/101-header.js
index 0a3c7ff5dec8e67f07df3ca1a40dbcdf2e663869..36c359adcb096889290ced2b87ba480c891337f1 100644 (file)
--- a/js/101-header.js
+++ b/js/101-header.js
@@ -6,6 +6,7 @@ var headerPos = 0;
 var htl;\r
 var home = false;\r
 var fullPages = false;\r
+var htlLock = false;\r
 \r
 registerLoader(load_header, true);\r
 \r
@@ -30,33 +31,33 @@ function resizeHeader() {
 \r
     setHeaderAnimation();\r
     setTimeout(function () {\r
-        headerScroll();\r
+        headerScroll(true);\r
     }, 100);\r
 }\r
 \r
 function setHeaderAnimation() {\r
     var h = $('#h');\r
     home = $('body').hasClass('home');\r
-    fullPages = $('body').hasClass('fullpages'); // Are we in full page mode?\r
-\r
-    var bgcolor = "#fff";\r
-    var boxshadow = '0 0 120px rgba(0,0,0,0.3)';\r
-    if (fullPages && !isMobile()) {\r
-        bgcolor = 'transparent';\r
-        boxshadow = '0 0 0 rgba(0,0,0,0)';\r
-    }\r
+    var fullPages = $('body').hasClass('fullpages'); // Are we in full page mode?\r
 \r
     if (htl !== undefined) {\r
-        htl.remove();\r
+        htl.clear();\r
+    } else {\r
+        htl = new TimelineMax();\r
     }\r
 \r
-    htl = new TimelineMax();\r
     // Background-color & height\r
     htl.add(TweenMax.fromTo(h, 1.5, {height: 90}, {height: 75}), 0);\r
-    htl.add(TweenMax.fromTo(h, 0.75, {backgroundColor: 'transparent', boxShadow: '0 0 0 rgba(0,0,0,0)'}, {backgroundColor: bgcolor, boxShadow: boxshadow}), 0);\r
+\r
     if (home && (isMobile() || !fullPages)) {\r
         htl.add(TweenMax.fromTo($("#h,#nav-icon"), 1, {className: $("main section:first").data('headerstyle')}, {className: "-=light"}), 1);\r
     }\r
+    if (fullPages && !isMobile()) {\r
+        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);\r
+    } else {\r
+        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);\r
+    }\r
+\r
     htl.add(TweenMax.fromTo($(h).find('#header'), 1.5, {height: 90}, {height: 56}), 0);\r
 \r
     // Logo\r
@@ -74,9 +75,7 @@ function setHeaderAnimation() {
     }\r
     // Menu position\r
     htl.add(TweenMax.fromTo(nav, 1, {left: '43.5%'}, {left: 312}), 2);\r
-\r
     htl.stop();\r
-\r
     headerScroll(true);\r
 }\r
 \r
@@ -85,7 +84,7 @@ function headerScroll(force) {
     if (force === undefined) {\r
         force = false;\r
     }\r
-    var s = $(window).scrollTop();\r
+    var s = Math.max(0, $(window).scrollTop() - 7);\r
     var h = $('#h');\r
 \r
     // If no move since last call, nothing to do\r
@@ -130,7 +129,7 @@ function headerScroll(force) {
     }\r
     // Normalize top value\r
     var top = Math.max(-headerHeight, Math.min(adminHeight, htop + adminHeight));\r
-    if (home && !isMobile() && fullPages) {\r
+    if (home && ((!isMobile() && fullPages) || Modernizr.ios)) {\r
         top = adminHeight;\r
     }\r
     $(h).css('top', top);\r
@@ -147,7 +146,6 @@ function headerScroll(force) {
 }\r
 \r
 function changeHeaderStyle() {\r
-\r
     var scrollTop = $(window).scrollTop();\r
     var wh = $(window).height();\r
     var section;\r

diff --git a/js/210-home.js b/js/210-home.js
index 6b0c0dc06a1146074d4d77c69f19eb3fcafc1bf7..b595046a88f47b5b06d8b3e0896b927ecd05329d 100644 (file)
--- 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\r
     calculateZoom();\r
 \r
-    var homezoom=zoom;\r
-    if(Modernizr.ie10 || Modernizr.ie11){\r
-        homezoom=1;\r
+    var homezoom = zoom;\r
+    if (Modernizr.ie10 || Modernizr.ie11) {\r
+        homezoom = 1;\r
     }\r
 \r
     // Resize sections, allowing for scale factor that will be applied to parent element\r
@@ -63,6 +63,10 @@ function resizeHome() {
 \r
     if (isMobile()) {\r
         sections.css('height', 'auto');\r
+        var h=[];\r
+        $(sections).each(function(){\r
+            h.push($(this).outerHeight());\r
+        })\r
         disableScrollify();\r
     } else if (!isTallEnough()) {\r
         // Size each section according to its content and background image ratio\r