From 2306e8aa850e2ead37c7929880c10ad045f26dfa Mon Sep 17 00:00:00 2001
From: stevenhaskell <stevenwhaskell@gmail.com>
Date: Thu, 18 Oct 2018 13:02:21 -0400
Subject: [PATCH] Fixed Scroll adjusting

Included jQuery that restores the scroll after leaving the weight input.
---
 .DS_Store                                     | Bin 6148 -> 6148 bytes
 index.html                                    |   4 +-
 ...ght Calculation Script-Edited-Jquery-V4.js |  51 ++++++------------
 3 files changed, 18 insertions(+), 37 deletions(-)

diff --git a/.DS_Store b/.DS_Store
index ef07dc3810fd09c4b6571c08b51f7e8e5156548e..ddf4d2662ba139a71954431302df313e57011265 100644
GIT binary patch
delta 348
zcmZoMXfc=|#>B!kF;Q%yo+6{r#(>?7i!U%UF$!(wVM<`EPbx1iNXp4iVqjqSnpBXJ
zSzKaZaD$PFnT3^&or9B$lZTU!lQT9rBfmVjB(bEl*eS6nUO*-|GbJ@Cu_!z<r6eOH
zHP1CCwJbHyzsM)CB(*3Sq&Or$KL@A)!cI&I%S<hg7Z7pI&nrpH%u6i-n+GzZKCvh!
zJTosPzuYOmG%uwXtO05|m>rN<k^wY`Q`sR+0q8~s22Kvncmav(Y70wK9R+h^<60es
zYIAb~9R(9(i`rUFP7X<Rx1hMvroLITmn>bj{Lo>rE(S(M2+be}r6CkE1H+NYDa^@}
z>zP@3%7TmXa`N-ifl`bc6V(_uvvcrs0K;zcLFVtwlles)Ie>;Rfi!N85Lv?v0AnO!
A_W%F@

delta 71
zcmZoMXfc=|#>B)qF;Q%yo+6{b#(>?7i~^f^SP~c~m$F4~mf_%LnOI=DnVo~51E_4X
ZAjfy+$^0UY91K9f$iTp|IYML&GXQ#c5DEYQ

diff --git a/index.html b/index.html
index 81ae67c..362dad3 100644
--- a/index.html
+++ b/index.html
@@ -7,14 +7,12 @@
         <meta name="description" content="">
 		<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1,user-scalable=0"/>
         <meta name="apple-mobile-web-app-capable" content="yes">
-        <meta name="apple-mobile-web-app-title" content="Lift It &#x1F4AA">
         <meta name="application-name" content="Lift It &#x1F4AA">
 
         <link rel="manifest" href="site.webmanifest">
         <link rel="apple-touch-icon" sizes="180x180" href="images/apple-touch-icon.png">
         <link rel="icon" type="image/png" sizes="32x32" href="images/favicon-32x32.png">
         <link rel="icon" type="image/png" sizes="16x16" href="images/favicon-16x16.png">
-        <link rel="manifest" href="/site.webmanifest">
         <link rel="mask-icon" href="images/safari-pinned-tab.svg" color="#5bbad5">
         <meta name="msapplication-TileColor" content="#cdff00">
         <meta name="theme-color" content="#ffffff">
@@ -93,7 +91,7 @@
                     <div class="b-calulatorinputs__inputcontainer">
                         <div class="b-calulatorinputs__weightinput">
                         	<label for="Weight">WEIGHT (LBS)</label>
-                        	<input type="number" onfocus="saveScroll()" onblur="restoreScroll()" inputmode="numeric" pattern="[0-9]*" class="b-infoentry__input input-element input-weight" name="Weight" placeholder="What are you lifting? (LBS)" id="Weight">
+                        	<input type="number"  inputmode="numeric" pattern="[0-9]*" class="b-infoentry__input input-element input-weight" name="Weight" placeholder="What are you lifting? (LBS)" id="Weight">
                         	<input type="button" class="b-infoentry__button submit-element input-calculate" name="Calculate" value="LIFT" onclick="startcalc()">
                         </div>
                     	<a href="#options">
diff --git a/js/Weight Calculation Script-Edited-Jquery-V4.js b/js/Weight Calculation Script-Edited-Jquery-V4.js
index 49f43bb..267bfb0 100644
--- a/js/Weight Calculation Script-Edited-Jquery-V4.js	
+++ b/js/Weight Calculation Script-Edited-Jquery-V4.js	
@@ -106,50 +106,33 @@
         // The optional number (800) specifies the number of milliseconds it takes to scroll to the specified area
         $('html, body').animate({
           scrollTop: $(hash).offset().top
-        }, 800, function(){
+        }, 500, function(){
      
           // Add hash (#) to URL when done scrolling (default click behavior)
           window.location.hash = hash;
         });
       } // End if
     });
-  });
 
-  //Saves scroll position on focus and restores
-    var savedScrollTop
+    //Saves scroll position on focus and restores
+    var savedScrollTop;
     function saveScroll() {
-        var savedScrollTop = jQuery(document).scrollTop(); // save scroll position
+        savedScrollTop = jQuery(document).scrollTop();
         console.log(savedScrollTop);
     }
-    function restoreScroll(savedScrollTop){
-        jQuery("html, body").animate({ 
-            scrollTop: savedScrollTop
-        }, 800).offset().top;
-    }
-
-//Failed scroll restore functions
-
-    // jQuery("#Weight").blur(function(event) {
-    //     $("html, body").animate({ 
-    //         scrollTop: savedScrollTop
-    //     }, 800).offset().top;
-    // });
-
-
-    /*function restoreScroll() {
-        $("a").on('click', function(event) {
-
-        jQuery(window).scrollTop(savedScrollTop);*/
-/*        window.scrollTo({
-            top: "savedScrollTop", 
-            behavior: "smooth"
-        }); // restore it*/
     
 
+    function restoreScroll(){
+        jQuery("html, body").animate({ 
+            scrollTop: savedScrollTop
+        }, 250).offset().top;
+    }
 
-
-
-    /*var savedScrollTop = $(document).scrollTop(); // save scroll position
-    <code that changes focus goes here>
-    $(document).scrollTop(savedScrollTop ); // restore it*/
-// });
\ No newline at end of file
+    //jQuery event watching
+    jQuery(".input-weight").on("focus", function(){
+        saveScroll();
+    });
+    jQuery(".input-weight").on('blur', function(){
+        restoreScroll()
+    });
+  });