From 9f33af479dd97c7b86d0011a88f0e3a4bdd28ccc Mon Sep 17 00:00:00 2001
From: Dante Ruiz <dante@highfidelity.io>
Date: Mon, 1 May 2017 18:04:22 +0100
Subject: [PATCH] saving work

---
 .../resources/qml/controls/TabletWebView.qml  | 49 ++++++++++++++-----
 1 file changed, 36 insertions(+), 13 deletions(-)

diff --git a/interface/resources/qml/controls/TabletWebView.qml b/interface/resources/qml/controls/TabletWebView.qml
index 67fb724ad0..8fd92a0cb0 100644
--- a/interface/resources/qml/controls/TabletWebView.qml
+++ b/interface/resources/qml/controls/TabletWebView.qml
@@ -23,12 +23,15 @@ Item {
     property bool keyboardRaised: false
     property bool punctuationMode: false
     property bool isDesktop: false
+    property bool startingUp: true
     property bool removingPage: false
-    property bool loadingPage: false
     property alias webView: webview
     property alias profile: webview.profile
     property bool remove: false
-    property bool newPage: false
+    property bool windowClosed: false
+    property bool loadingStarted: false
+    property bool loadingFinished: false
+    property var urlList: []
 
     
     property int currentPage: -1 // used as a model for repeater
@@ -144,10 +147,6 @@ Item {
         view.setActiveFocusOnPress(true);
         view.setEnabled(true);
     }
-
-    function isNewPageOpen() {
-	return (web.newPage && web.currentPage > 0);
-    }
     
     function shouldLoadUrl(url) {
 	switch (url) {
@@ -156,30 +155,41 @@ Item {
 	}
 	return false;
     }
+    
     function urlAppend(url) {
 	console.log(url);
-        if (removingPage || shouldLoadUrl(url) || isNewPageOpen()) {
+        if (removingPage || shouldLoadUrl(url)) {
             removingPage = false;
-	    web.newPage = false;
             return;
         }
         var lurl = decodeURIComponent(url)
         if (lurl[lurl.length - 1] !== "/") {
             lurl = lurl + "/"
         }
-        if (currentPage === -1 || (pagesModel.get(currentPage).webUrl !== lurl && !timer.running)) {
+        console.log("-------> trying to append url <------------");
+        console.log(currentPage);
+        console.log(pagesModel.get(currentPage).webUrl !== lurl);
+        if (currentPage === -1 || (pagesModel.get(currentPage).webUrl !== lurl)) {
             timer.start();
+            console.log("---------> appending url <-------------");
             pagesModel.append({webUrl: lurl});
         };
     }
 
     onCurrentPageChanged: {
-        if (currentPage >= 0 && currentPage < pagesModel.count) {
+        if (currentPage >= 0 && currentPage < pagesModel.count && removingPage) {
             timer.start();
             webview.url = pagesModel.get(currentPage).webUrl;
             web.url = webview.url;
             web.address = webview.url;
+            removingPage = false;
+        } else if (startingUp) {
+            webview.url = pagesModel.get(currentPage).webUrl;
+            web.url = webview.url;
+            web.address = webview.url;
+            startingUp = false;
         }
+            
     }
 
     onUrlChanged: {
@@ -270,8 +280,9 @@ Item {
             // Required to support clicking on "hifi://" links
             if (WebEngineView.LoadStartedStatus == loadRequest.status) {
 		var url = loadRequest.url.toString();
-                urlAppend(url);
-                loadingPage = true;
+                web.urlList.push(url);
+                //urlAppend(url);
+                web.loadingStarted  = true;
                 if (urlHandler.canHandleUrl(url)) {
                     if (urlHandler.handleUrl(url)) {
                         root.stop();
@@ -282,10 +293,22 @@ Item {
             if (WebEngineView.LoadFailedStatus == loadRequest.status) {
                 console.log(" Tablet WebEngineView failed to laod url: " + loadRequest.url.toString());
             }
+
+            if (WebEngineView.LoadSucceededStatus == loadRequest.status) {
+                console.log
+                urlList = [];
+            }
+        }
+
+        onWindowCloseRequested: {
+            console.log("---------->requested to closeWindow <--------------");
         }
 
         onNewViewRequested: {
-	    web.newPage = true;
+            console.log("-----------> newViewRequested <--------------");
+            var currentUrl = webview.url;
+            console.log(currentUrl);
+            urlAppend(currentUrl);
             request.openIn(webview);
         }
     }