From 2bf7b12c7dc13682424d00ad6cf7dbb9d92ee4be Mon Sep 17 00:00:00 2001
From: druiz17 <danteruiz11@yahoo.com>
Date: Sun, 30 Apr 2017 15:27:34 -0700
Subject: [PATCH] open webview from tabletwebscreen

---
 interface/resources/qml/controls/TabletWebView.qml       | 5 -----
 interface/resources/qml/hifi/tablet/TabletRoot.qml       | 8 +++++---
 interface/resources/qml/hifi/tablet/WindowRoot.qml       | 5 +++++
 libraries/script-engine/src/TabletScriptingInterface.cpp | 2 +-
 4 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/interface/resources/qml/controls/TabletWebView.qml b/interface/resources/qml/controls/TabletWebView.qml
index e43441045f..e202d89060 100644
--- a/interface/resources/qml/controls/TabletWebView.qml
+++ b/interface/resources/qml/controls/TabletWebView.qml
@@ -270,13 +270,8 @@ Item {
         }
 
         onNewViewRequested: {
-            console.log("--------------> new window opened <-------------");
             request.openIn(webview);
         }
-
-        onWindowCloseRequested: {
-            console.log("-------------> requested to cloes window <---------------");
-        }
     }
 
     HiFiControls.Keyboard {
diff --git a/interface/resources/qml/hifi/tablet/TabletRoot.qml b/interface/resources/qml/hifi/tablet/TabletRoot.qml
index b19525d21a..e78cc74b7b 100644
--- a/interface/resources/qml/hifi/tablet/TabletRoot.qml
+++ b/interface/resources/qml/hifi/tablet/TabletRoot.qml
@@ -24,7 +24,6 @@ Item {
         option = value;
     }
 
-    Component { id: profileCreator; HFTabletWebEngineProfile {} }
     Component { id: inputDialogBuilder; TabletQueryDialog { } }
     function inputDialog(properties) {
         openModal = inputDialogBuilder.createObject(tabletRoot, properties);
@@ -91,6 +90,11 @@ Item {
             loader.item.gotoPreviousApp = true;
         }
     }
+
+    function loadWebBase() {
+	loader.source = "";
+	loader.source = "TabletWebView.qml";
+    }
         
     function returnToPreviousApp() {
         tabletApps.remove(currentApp);
@@ -117,8 +121,6 @@ Item {
 
     function loadWebUrl(url, injectedJavaScriptUrl) {
         tabletApps.clear();
-        var newProfile = profileCreator.createObject();
-        loader.item.viewProfile = newProfile;
         loader.item.url = url;
         loader.item.scriptURL = injectedJavaScriptUrl;
         tabletApps.append({"appUrl": "TabletWebView.qml", "isWebUrl": true, "scriptUrl": injectedJavaScriptUrl, "appWebUrl": url});
diff --git a/interface/resources/qml/hifi/tablet/WindowRoot.qml b/interface/resources/qml/hifi/tablet/WindowRoot.qml
index 5f842df7b7..72dcdf0cbd 100644
--- a/interface/resources/qml/hifi/tablet/WindowRoot.qml
+++ b/interface/resources/qml/hifi/tablet/WindowRoot.qml
@@ -38,6 +38,11 @@ Windows.ScrollingWindow {
         loader.source = url;
     }
 
+    function loadWebBase() {
+	loader.source = "";
+	loader.source = "WindowWebView.qml";
+    }
+
     function loadWebUrl(url, injectedJavaScriptUrl) {
         loader.item.url = url;
         loader.item.scriptURL = injectedJavaScriptUrl;
diff --git a/libraries/script-engine/src/TabletScriptingInterface.cpp b/libraries/script-engine/src/TabletScriptingInterface.cpp
index bffe318c11..d4eeecc82e 100644
--- a/libraries/script-engine/src/TabletScriptingInterface.cpp
+++ b/libraries/script-engine/src/TabletScriptingInterface.cpp
@@ -508,7 +508,7 @@ void TabletProxy::gotoWebScreen(const QString& url, const QString& injectedJavaS
 
     if (root) {
         removeButtonsFromHomeScreen();
-        QMetaObject::invokeMethod(root, "loadSource", Q_ARG(const QVariant&, QVariant(WEB_VIEW_SOURCE_URL)));
+        QMetaObject::invokeMethod(root, "loadWebBase");
         QMetaObject::invokeMethod(root, "setShown", Q_ARG(const QVariant&, QVariant(true)));
         QMetaObject::invokeMethod(root, "loadWebUrl", Q_ARG(const QVariant&, QVariant(url)), Q_ARG(const QVariant&, QVariant(injectedJavaScriptUrl)));
     }