Merge pull request #10343 from druiz17/tabletwebview-fix-links

fix Tablet webview issues of not loading correct url.

interface/resources/qml/controls/TabletWebView.qml

@@ -23,11 +23,13 @@ Item {
     property bool keyboardRaised: false
     property bool punctuationMode: false
     property bool isDesktop: false
-    property bool removingPage: false
+    property string initialPage: ""
-    property bool loadingPage: false
+    property bool startingUp: true
     property alias webView: webview
     property alias profile: webview.profile
     property bool remove: false
+    property var urlList: []
+    property var forwardList: []
 
     
     property int currentPage: -1 // used as a model for repeater
@@ -79,9 +81,12 @@ Item {
             id: displayUrl
             color: hifi.colors.baseGray
             font.pixelSize: 12
+            verticalAlignment: Text.AlignLeft
             anchors {
                 top: nav.bottom
                 horizontalCenter: parent.horizontalCenter;
+                left: parent.left
+                leftMargin: 20
             }
         }
 
@@ -106,19 +111,19 @@ Item {
     }
         
     function goBack() {
-        if (webview.canGoBack && !isUrlLoaded(webview.url)) {
+        if (webview.canGoBack) {
-            if (currentPage > 0) {
+            forwardList.push(webview.url);
-                removingPage = true;
-                pagesModel.remove(currentPage);
-            }
             webview.goBack();
-        } else if (currentPage > 0) {
+        } else if (web.urlList.length > 0) {
-            removingPage = true;
+            var url = web.urlList.pop();
-            pagesModel.remove(currentPage);
+            loadUrl(url);
+        } else if (web.forwardList.length > 0) {
+            var url = web.forwardList.pop();
+            loadUrl(url);
+            web.forwardList = [];
         }
     }
 
-
     function closeWebEngine() {
         if (remove) {
             web.destroy();
@@ -151,32 +156,42 @@ Item {
         view.setEnabled(true);
     }
 
-    function urlAppend(url) {
+    function loadUrl(url) {
-        if (removingPage) {
+        webview.url = url
-            removingPage = false;
+        web.url = webview.url;
-            return;
+        web.address = webview.url;
     }
+
+    function onInitialPage(url) {
+        return (url === webview.url);
+    }
+        
+    
+    function urlAppend(url) {
         var lurl = decodeURIComponent(url)
         if (lurl[lurl.length - 1] !== "/") {
             lurl = lurl + "/"
         }
-        if (currentPage === -1 || (pagesModel.get(currentPage).webUrl !== lurl && !timer.running)) {
+        web.urlList.push(url);
-            timer.start();
+        setBackButtonStatus();
-            pagesModel.append({webUrl: lurl});
-        }
     }
 
-    onCurrentPageChanged: {
+    function setBackButtonStatus() {
-        if (currentPage >= 0 && currentPage < pagesModel.count) {
+        if (web.urlList.length > 0 || webview.canGoBack) {
-            timer.start();
+            back.enabledColor = hifi.colors.darkGray;
-            webview.url = pagesModel.get(currentPage).webUrl;
+            back.enabled = true;
-            web.url = webview.url;
+        } else {
-            web.address = webview.url;
+            back.enabledColor = hifi.colors.baseGray;
+            back.enabled = false;
         }
     }
 
     onUrlChanged: {
-        gotoPage(url)
+        loadUrl(url);
+        if (startingUp) {
+            web.initialPage = webview.url;
+            startingUp = false;
+        }
     }
 
     QtObject {
@@ -185,17 +200,6 @@ Item {
         property var eventBridge;
     }
     
-    Timer {
-        id: timer
-        interval: 200
-        running: false
-        repeat: false
-        onTriggered: timer.stop();
-    }
-
-        
-
-
     WebEngineView {
         id: webview
         objectName: "webEngineView"
@@ -235,6 +239,7 @@ Item {
             worldId: WebEngineScript.MainWorld
         }
 
+	property string urlTag: "noDownload=false";
         userScripts: [ createGlobalEventBridge, raiseAndLowerKeyboard, userScript ]
 
         property string newUrl: ""
@@ -261,8 +266,6 @@ Item {
             keyboard.resetShiftMode(false);
             // Required to support clicking on "hifi://" links
             if (WebEngineView.LoadStartedStatus == loadRequest.status) {
-                urlAppend(loadRequest.url.toString());
-                loadingPage = true;
 		var url = loadRequest.url.toString();
                 if (urlHandler.canHandleUrl(url)) {
                     if (urlHandler.handleUrl(url)) {
@@ -274,9 +277,19 @@ Item {
             if (WebEngineView.LoadFailedStatus == loadRequest.status) {
                 console.log(" Tablet WebEngineView failed to laod url: " + loadRequest.url.toString());
             }
+
+            if (WebEngineView.LoadSucceededStatus == loadRequest.status) {
+                web.address = webview.url;
+                if (startingUp) {
+                    web.initialPage = webview.url;
+                    startingUp = false;
+                }
+            }
         }
         
         onNewViewRequested: {
+            var currentUrl = webview.url;
+            urlAppend(currentUrl);
             request.openIn(webview);
         }
     }