Refactor usingScale

autoHeightWebView/utils.js

@@ -14,7 +14,7 @@ const domMutationObserveScript = `
 
 const updateSizeWithMessage = (element, scalesPageToFit) =>
   `
-  var usingScale = 0;
+  var usingScale = ${scalesPageToFit} ? screen.width / window.innerWidth : 1};
   var scaling = false;
   var zoomedin = false;
   var lastHeight = 0;
@@ -40,10 +40,6 @@ const updateSizeWithMessage = (element, scalesPageToFit) =>
     height = ${element}.offsetHeight || document.documentElement.offsetHeight;
     width = ${element}.offsetWidth || document.documentElement.offsetWidth;
 
-    if(!usingScale && window.innerWidth) {
-      usingScale = ${scalesPageToFit ? 'screen.width / window.innerWidth' : '1'};
-    }
-
     window.ReactNativeWebView.postMessage(JSON.stringify({ width: Math.min(width, screen.width), height: height * usingScale }));
 
     // Make additional height checks (required to fix issues wit twitter embeds)
@@ -83,7 +79,7 @@ const detectZoomChanged = `
   var lastScale = 1.0;
   var doubleTapDelay = 400;
   function detectZoomChanged() {
-    var tempZoomedin = (screen.width / window.innerWidth) > (usingScale || 1);
+    var tempZoomedin = (screen.width / window.innerWidth) > usingScale;
     tempZoomedin !== zoomedin && window.ReactNativeWebView.postMessage(JSON.stringify({ zoomedin: tempZoomedin }));
     zoomedin = tempZoomedin;
   }
@@ -242,4 +238,4 @@ export const shouldUpdate = ({ prevProps, nextProps }) => {
     }
   }
   return false;
-};
+};