From 93ad1b6cbf8c1f3fe1a979ef21d8419b5a634f08 Mon Sep 17 00:00:00 2001
From: Mohammed Nafees <nafees.technocool@gmail.com>
Date: Thu, 3 Aug 2017 01:53:26 +0530
Subject: [PATCH 01/37] Add link in help page to report a problem

---
 interface/resources/html/tabletHelp.html | 27 +++++++++++++++++++++++-
 1 file changed, 26 insertions(+), 1 deletion(-)

diff --git a/interface/resources/html/tabletHelp.html b/interface/resources/html/tabletHelp.html
index cbd7ffcfe7..a6588be083 100644
--- a/interface/resources/html/tabletHelp.html
+++ b/interface/resources/html/tabletHelp.html
@@ -6,7 +6,14 @@
         <title>Welcome to Interface</title>
 
         <style>
-          body {
+            @font-face {
+                font-family: 'Raleway Light';
+                src: url('../fonts/Raleway-Light.ttf') format('truetype');
+                font-weight: normal;
+                font-style: normal;
+            }
+
+            body {
                 background: black;
                 width: 100%;
                 overflow-x: hidden;
@@ -15,6 +22,14 @@
                 padding: 0;
             }
 
+            a:link {color:inherit}
+            a:active {color:inherit}
+            a:visited {color:inherit}
+            a:hover {
+                color:inherit;
+                cursor: pointer;
+            }
+
             #left_button {
                 position: absolute;
                 left: 70;
@@ -38,6 +53,15 @@
                 position: absolute;
                 top: 0; left: 0; bottom: 0; right: 0;
             }
+
+            #report_problem {
+                position: fixed;
+                top: 10;
+                right: 10;
+                font-family: "Raleway Light", sans-serif;
+                text-decoration: none;
+                color: #ddd;
+            }
         </style>
         <script>
             var handControllerImageURL = null;
@@ -152,6 +176,7 @@
             <a href="#" id="left_button" onmousedown="cycleLeft()"></a>
             <a href="#" id="right_button" onmousedown="cycleRight()"></a>
         </div>
+        <a href="mailto:support@highfidelity.com" id="report_problem">Report Problem</a>
     </body>
 
 </html>

From 2e5e0c94f13ab3cfed9bd1583a17a003de2003d8 Mon Sep 17 00:00:00 2001
From: vladest <vladstelmahovsky@gmail.com>
Date: Fri, 18 Aug 2017 15:34:15 +0200
Subject: [PATCH 02/37] Added login button to Tablet

---
 .../resources/qml/hifi/tablet/Tablet.qml      | 28 ++++++++++++++-----
 .../DialogsManagerScriptingInterface.cpp      |  7 ++++-
 .../DialogsManagerScriptingInterface.h        |  1 +
 3 files changed, 28 insertions(+), 8 deletions(-)

diff --git a/interface/resources/qml/hifi/tablet/Tablet.qml b/interface/resources/qml/hifi/tablet/Tablet.qml
index 43672190dd..521c3b2e14 100644
--- a/interface/resources/qml/hifi/tablet/Tablet.qml
+++ b/interface/resources/qml/hifi/tablet/Tablet.qml
@@ -109,15 +109,29 @@ Item {
             }
         }
 
-        RalewaySemiBold {
-            id: usernameText
-            text: tabletRoot.username
-            anchors.verticalCenter: parent.verticalCenter
+        Item {
+            width: 150
+            height: 50
             anchors.right: parent.right
             anchors.rightMargin: 20
-            horizontalAlignment: Text.AlignRight
-            font.pixelSize: 20
-            color: "#afafaf"
+            anchors.verticalCenter: parent.verticalCenter
+
+            RalewaySemiBold {
+                id: usernameText
+                text: Account.isLoggedIn() ? tabletRoot.username : qsTr("Log in")
+                anchors.verticalCenter: parent.verticalCenter
+                horizontalAlignment: Text.AlignRight
+                anchors.right: parent.right
+                font.pixelSize: 20
+                color: "#afafaf"
+            }
+            MouseArea {
+                anchors.fill: parent
+                enabled: !Account.isLoggedIn()
+                onClicked: {
+                    DialogsManager.showLoginDialog()
+                }
+            }
         }
     }
 
diff --git a/interface/src/scripting/DialogsManagerScriptingInterface.cpp b/interface/src/scripting/DialogsManagerScriptingInterface.cpp
index 0fb6078290..596320eb3c 100644
--- a/interface/src/scripting/DialogsManagerScriptingInterface.cpp
+++ b/interface/src/scripting/DialogsManagerScriptingInterface.cpp
@@ -33,7 +33,12 @@ void DialogsManagerScriptingInterface::showAddressBar() {
 
 void DialogsManagerScriptingInterface::hideAddressBar() {
     QMetaObject::invokeMethod(DependencyManager::get<DialogsManager>().data(),
-        "hideAddressBar", Qt::QueuedConnection);
+                              "hideAddressBar", Qt::QueuedConnection);
+}
+
+void DialogsManagerScriptingInterface::showLoginDialog() {
+    QMetaObject::invokeMethod(DependencyManager::get<DialogsManager>().data(),
+        "showLoginDialog", Qt::QueuedConnection);
 }
 
 void DialogsManagerScriptingInterface::showFeed() {
diff --git a/interface/src/scripting/DialogsManagerScriptingInterface.h b/interface/src/scripting/DialogsManagerScriptingInterface.h
index e4dd18aedf..b223799cfe 100644
--- a/interface/src/scripting/DialogsManagerScriptingInterface.h
+++ b/interface/src/scripting/DialogsManagerScriptingInterface.h
@@ -24,6 +24,7 @@ public:
 public slots:
     void showAddressBar();
     void hideAddressBar();
+    void showLoginDialog();
 
 signals:
     void addressBarShown(bool visible);

From 7da4bc04d3a9eb4db5ffbd9a30a7e20f97dce57a Mon Sep 17 00:00:00 2001
From: Midnight <midnight@midnightrift.com>
Date: Fri, 18 Aug 2017 13:36:07 -0700
Subject: [PATCH 03/37] Add DodgeBall.

---
 .../marketplace/dodgeBall/dodgeBall.js        | 164 ++++++++++++++++++
 1 file changed, 164 insertions(+)
 create mode 100644 unpublishedScripts/marketplace/dodgeBall/dodgeBall.js

diff --git a/unpublishedScripts/marketplace/dodgeBall/dodgeBall.js b/unpublishedScripts/marketplace/dodgeBall/dodgeBall.js
new file mode 100644
index 0000000000..9bd1032821
--- /dev/null
+++ b/unpublishedScripts/marketplace/dodgeBall/dodgeBall.js
@@ -0,0 +1,164 @@
+(function () {
+
+    var FORCE_DROP_CHANNEL = "Hifi-Hand-Drop";
+
+    var proxInterval,
+        proxTimeout;
+
+    var _entityID;
+    this.preload = function (entityID) {
+        _entityID = entityID;
+
+        Entities.editEntity(_entityID, {
+            userData: '{"grabbableKey": {"grabbable": true}'
+        });
+    };
+
+    var particleTrailEntity = null;
+
+    function particleTrail() {
+
+        var props = {
+            type: 'ParticleEffect',
+            name: 'Particle',
+            parentID: _entityID,
+            isEmitting: true,
+            lifespan: 2.0,
+            maxParticles: 100,
+            textures: 'https://content.highfidelity.com/DomainContent/production/Particles/wispy-smoke.png',
+            emitRate: 50,
+            emitSpeed: 0,
+            emitterShouldTrail: true,
+            particleRadius: 0,
+            radiusSpread: 0,
+            radiusStart: .2,
+            radiusFinish: 0.1,
+            color: {
+                red: 201,
+                blue: 201,
+                green: 34
+            },
+
+            accelerationSpread: {
+                x: 0,
+                y: 0,
+                z: 0
+            },
+            alpha: 0,
+            alphaSpread: 0,
+            alphaStart: 1,
+            alphaFinish: 0,
+            polarStart: 0,
+            polarFinish: 0,
+            azimuthStart: -180,
+            azimuthFinish: 180
+        };
+
+        if (particleTrailEntity === null) {
+            particleTrailEntity = Entities.addEntity(props);
+        } else {
+            Entities.editEntity(particleTrailEntity, {})
+        }
+    }
+
+    function particleExplode() {
+        Entities.deleteEntity(particleTrailEntity);
+        particleTrailEntity = null;
+        var entPos = Entities.getEntityProperties(_entityID, 'position').position;
+        var props = {
+            type: 'ParticleEffect',
+            name: 'Particle',
+            parentID: _entityID,
+            isEmitting: true,
+            lifespan: 2,
+            maxParticles: 10,
+            position: entPos,
+            textures: 'https://content.highfidelity.com/DomainContent/production/Particles/wispy-smoke.png',
+            emitRate: 1,
+            emitSpeed: 0,
+
+            emitterShouldTrail: false,
+            particleRadius: 1,
+            radiusSpread: 0,
+            radiusStart: 0,
+            radiusFinish: 1,
+            color: {
+                red: 232,
+                blue: 232,
+                green: 26
+            },
+
+            emitAcceleration: {
+                x: 0,
+                y: 0,
+                z: 0
+            },
+
+            alpha: 0,
+            alphaSpread: 0,
+            alphaStart: 1,
+            alphaFinish: .5,
+            polarStart: 0,
+            polarFinish: 0,
+            azimuthStart: -180,
+            azimuthFinish: 180
+        };
+        var exposionParticles = Entities.addEntity(props);
+        Entities.editEntity(_entityID, {
+            velocity: Vec3.ZERO,
+            dynamic: false
+        });
+        Script.setTimeout(function () {
+            Entities.deleteEntity(exposionParticles);
+            Entities.editEntity(_entityID, {
+                dynamic: true
+            })
+        }, 500);
+    }
+
+
+    function clearProxCheck() {
+        if (proxInterval) Script.clearInterval(proxInterval);
+        if (proxTimeout) Script.clearTimeout(proxTimeout);
+    }
+
+    function proxCheck() {
+        var avList = AvatarList.getAvatarIdentifiers();
+        var ballPos = Entities.getEntityProperties(_entityID, ['position']).position;
+        var isAnyAvatarInRange = AvatarList.isAvatarInRange(ballPos, 1);
+
+        particleTrail();
+        if (isAnyAvatarInRange) {
+            clearProxCheck();
+            particleExplode();
+        }
+    }
+
+    this.startDistanceGrab = function (thisEntityID, triggerHandAndAvatarUUIDArray) {
+        clearProxCheck();
+        var triggerHand = triggerHandAndAvatarUUIDArray[0];
+        var avatarUUID = triggerHandAndAvatarUUIDArray[1];
+
+        var ballPos = Entities.getEntityProperties(_entityID, ['position']).position;
+        if (Vec3.distance(ballPos, AvatarList.getAvatar(avatarUUID).position) > 2) {
+            Messages.sendMessage(FORCE_DROP_CHANNEL, triggerHand, true);
+        }
+
+    };
+    this.startNearGrab = function (thisEntityID, triggerHandAndAvatarUUIDArray) {
+        clearProxCheck();
+    };
+
+    this.releaseGrab = function (thisEntityID) {
+
+        Script.setTimeout(function () {
+            proxInterval = Script.setInterval(proxCheck, 50);
+        }, 150); // Setting a delay to give it time to leave initial avatar without proc.
+
+        proxTimeout = Script.setTimeout(function () {
+            Script.clearInterval(proxInterval);
+            Entities.deleteEntity(particleTrailEntity);
+        }, 10000)
+    }
+
+});

From 397d2a68534cea8d5c5e832571b676148d223fc9 Mon Sep 17 00:00:00 2001
From: Midnight <midnight@midnightrift.com>
Date: Fri, 18 Aug 2017 16:12:56 -0700
Subject: [PATCH 04/37] Minor Code Cleanup.

---
 unpublishedScripts/marketplace/dodgeBall/dodgeBall.js | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/unpublishedScripts/marketplace/dodgeBall/dodgeBall.js b/unpublishedScripts/marketplace/dodgeBall/dodgeBall.js
index 9bd1032821..05d7935757 100644
--- a/unpublishedScripts/marketplace/dodgeBall/dodgeBall.js
+++ b/unpublishedScripts/marketplace/dodgeBall/dodgeBall.js
@@ -38,7 +38,6 @@
                 blue: 201,
                 green: 34
             },
-
             accelerationSpread: {
                 x: 0,
                 y: 0,
@@ -76,7 +75,6 @@
             textures: 'https://content.highfidelity.com/DomainContent/production/Particles/wispy-smoke.png',
             emitRate: 1,
             emitSpeed: 0,
-
             emitterShouldTrail: false,
             particleRadius: 1,
             radiusSpread: 0,
@@ -87,13 +85,11 @@
                 blue: 232,
                 green: 26
             },
-
             emitAcceleration: {
                 x: 0,
                 y: 0,
                 z: 0
             },
-
             alpha: 0,
             alphaSpread: 0,
             alphaStart: 1,
@@ -123,7 +119,6 @@
     }
 
     function proxCheck() {
-        var avList = AvatarList.getAvatarIdentifiers();
         var ballPos = Entities.getEntityProperties(_entityID, ['position']).position;
         var isAnyAvatarInRange = AvatarList.isAvatarInRange(ballPos, 1);
 

From 37ee2a31d4a7dcb0e8b76a4764a53b06b9cba4f9 Mon Sep 17 00:00:00 2001
From: Midnight <midnight@midnightrift.com>
Date: Fri, 18 Aug 2017 18:50:03 -0700
Subject: [PATCH 05/37] Remove particleTrailEntity from every prox check, the
 trail no longer needs to be updated each check.

---
 unpublishedScripts/marketplace/dodgeBall/dodgeBall.js | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/unpublishedScripts/marketplace/dodgeBall/dodgeBall.js b/unpublishedScripts/marketplace/dodgeBall/dodgeBall.js
index 05d7935757..4ccc41b3b7 100644
--- a/unpublishedScripts/marketplace/dodgeBall/dodgeBall.js
+++ b/unpublishedScripts/marketplace/dodgeBall/dodgeBall.js
@@ -53,11 +53,7 @@
             azimuthFinish: 180
         };
 
-        if (particleTrailEntity === null) {
             particleTrailEntity = Entities.addEntity(props);
-        } else {
-            Entities.editEntity(particleTrailEntity, {})
-        }
     }
 
     function particleExplode() {
@@ -122,7 +118,8 @@
         var ballPos = Entities.getEntityProperties(_entityID, ['position']).position;
         var isAnyAvatarInRange = AvatarList.isAvatarInRange(ballPos, 1);
 
-        particleTrail();
+        if (particleTrailEntity) particleTrail();
+
         if (isAnyAvatarInRange) {
             clearProxCheck();
             particleExplode();

From 9ff68ce10c47c2831d8207b58ec1dc4d4cedf7d1 Mon Sep 17 00:00:00 2001
From: Midnight <midnight@midnightrift.com>
Date: Fri, 18 Aug 2017 18:51:44 -0700
Subject: [PATCH 06/37] Remove particleTrailEntity from every prox check, the
 trail no longer needs to be updated each check.

---
 unpublishedScripts/marketplace/dodgeBall/dodgeBall.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/unpublishedScripts/marketplace/dodgeBall/dodgeBall.js b/unpublishedScripts/marketplace/dodgeBall/dodgeBall.js
index 4ccc41b3b7..6330b1c9b5 100644
--- a/unpublishedScripts/marketplace/dodgeBall/dodgeBall.js
+++ b/unpublishedScripts/marketplace/dodgeBall/dodgeBall.js
@@ -118,7 +118,7 @@
         var ballPos = Entities.getEntityProperties(_entityID, ['position']).position;
         var isAnyAvatarInRange = AvatarList.isAvatarInRange(ballPos, 1);
 
-        if (particleTrailEntity) particleTrail();
+        if (particleTrailEntity === null) particleTrail();
 
         if (isAnyAvatarInRange) {
             clearProxCheck();

From 6892cdb57de04c936a73f890119951a5e258c781 Mon Sep 17 00:00:00 2001
From: Midnight <midnight@midnightrift.com>
Date: Fri, 18 Aug 2017 19:20:34 -0700
Subject: [PATCH 07/37] Consolidate Clear Prox Code, Add Clear Prox to
 collisionWithEntity.

---
 .../marketplace/dodgeBall/dodgeBall.js        | 24 ++++++++++++-------
 1 file changed, 15 insertions(+), 9 deletions(-)

diff --git a/unpublishedScripts/marketplace/dodgeBall/dodgeBall.js b/unpublishedScripts/marketplace/dodgeBall/dodgeBall.js
index 6330b1c9b5..737db9770c 100644
--- a/unpublishedScripts/marketplace/dodgeBall/dodgeBall.js
+++ b/unpublishedScripts/marketplace/dodgeBall/dodgeBall.js
@@ -57,8 +57,6 @@
     }
 
     function particleExplode() {
-        Entities.deleteEntity(particleTrailEntity);
-        particleTrailEntity = null;
         var entPos = Entities.getEntityProperties(_entityID, 'position').position;
         var props = {
             type: 'ParticleEffect',
@@ -110,7 +108,12 @@
 
 
     function clearProxCheck() {
-        if (proxInterval) Script.clearInterval(proxInterval);
+        if (proxInterval) {
+            Script.clearInterval(proxInterval);
+            Entities.deleteEntity(particleTrailEntity);
+            particleTrailEntity = null;
+        }
+
         if (proxTimeout) Script.clearTimeout(proxTimeout);
     }
 
@@ -118,8 +121,6 @@
         var ballPos = Entities.getEntityProperties(_entityID, ['position']).position;
         var isAnyAvatarInRange = AvatarList.isAvatarInRange(ballPos, 1);
 
-        if (particleTrailEntity === null) particleTrail();
-
         if (isAnyAvatarInRange) {
             clearProxCheck();
             particleExplode();
@@ -143,14 +144,19 @@
 
     this.releaseGrab = function (thisEntityID) {
 
+        if (particleTrailEntity === null) particleTrail();
+
         Script.setTimeout(function () {
             proxInterval = Script.setInterval(proxCheck, 50);
-        }, 150); // Setting a delay to give it time to leave initial avatar without proc.
+        }, 200); // Setting a delay to give it time to leave initial avatar without proc.
 
         proxTimeout = Script.setTimeout(function () {
-            Script.clearInterval(proxInterval);
-            Entities.deleteEntity(particleTrailEntity);
+            clearProxCheck();
         }, 10000)
-    }
+    };
+
+    this.collisionWithEntity = function(thisEntityID,  collisionEntityID, collisionInfo) {
+        clearProxCheck();
+    };
 
 });

From bad8c39444384aa3853815bc54e011c1d9dc4293 Mon Sep 17 00:00:00 2001
From: vladest <vladstelmahovsky@gmail.com>
Date: Sat, 19 Aug 2017 17:46:52 +0200
Subject: [PATCH 08/37] Align user/login text right border with tablet buttons

---
 interface/resources/qml/hifi/tablet/Tablet.qml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/interface/resources/qml/hifi/tablet/Tablet.qml b/interface/resources/qml/hifi/tablet/Tablet.qml
index 521c3b2e14..a99df632e5 100644
--- a/interface/resources/qml/hifi/tablet/Tablet.qml
+++ b/interface/resources/qml/hifi/tablet/Tablet.qml
@@ -113,7 +113,7 @@ Item {
             width: 150
             height: 50
             anchors.right: parent.right
-            anchors.rightMargin: 20
+            anchors.rightMargin: 30
             anchors.verticalCenter: parent.verticalCenter
 
             RalewaySemiBold {

From 56dedea66cb970ef3aa9fc7a6fd0174003db1b1c Mon Sep 17 00:00:00 2001
From: vladest <vladstelmahovsky@gmail.com>
Date: Sun, 20 Aug 2017 17:57:03 +0200
Subject: [PATCH 09/37] 1st experimental approach

---
 .../qml/controls/TabletWebScreen.qml          | 165 +++++++++++-------
 .../resources/qml/controls/TabletWebView.qml  | 162 +++++++++--------
 interface/resources/qml/controls/WebView.qml  | 160 ++++++++++-------
 3 files changed, 279 insertions(+), 208 deletions(-)

diff --git a/interface/resources/qml/controls/TabletWebScreen.qml b/interface/resources/qml/controls/TabletWebScreen.qml
index 1de31aba41..e1615e1442 100644
--- a/interface/resources/qml/controls/TabletWebScreen.qml
+++ b/interface/resources/qml/controls/TabletWebScreen.qml
@@ -1,5 +1,5 @@
-import QtQuick 2.5
-import QtWebEngine 1.1
+import QtQuick 2.7
+import QtWebEngine 1.5
 import QtWebChannel 1.0
 import "../controls-uit" as HiFiControls
 
@@ -23,91 +23,124 @@ Item {
 
     property alias viewProfile: root.profile
 
-    WebEngineView {
-        id: root
-        objectName: "webEngineView"
+    Flickable {
+        id: flick
         x: 0
         y: 0
         width: parent.width
         height: keyboardEnabled && keyboardRaised ? parent.height - keyboard.height : parent.height
 
-        profile: HFWebEngineProfile;
+        WebEngineView {
+            id: root
+            objectName: "webEngineView"
+            anchors.fill: parent
 
-        property string userScriptUrl: ""
+            profile: HFWebEngineProfile;
 
-        // creates a global EventBridge object.
-        WebEngineScript {
-            id: createGlobalEventBridge
-            sourceCode: eventBridgeJavaScriptToInject
-            injectionPoint: WebEngineScript.DocumentCreation
-            worldId: WebEngineScript.MainWorld
-        }
+            property string userScriptUrl: ""
 
-        // detects when to raise and lower virtual keyboard
-        WebEngineScript {
-            id: raiseAndLowerKeyboard
-            injectionPoint: WebEngineScript.Deferred
-            sourceUrl: resourceDirectoryUrl + "/html/raiseAndLowerKeyboard.js"
-            worldId: WebEngineScript.MainWorld
-        }
+            // creates a global EventBridge object.
+            WebEngineScript {
+                id: createGlobalEventBridge
+                sourceCode: eventBridgeJavaScriptToInject
+                injectionPoint: WebEngineScript.DocumentCreation
+                worldId: WebEngineScript.MainWorld
+            }
 
-        // User script.
-        WebEngineScript {
-            id: userScript
-            sourceUrl: root.userScriptUrl
-            injectionPoint: WebEngineScript.DocumentReady  // DOM ready but page load may not be finished.
-            worldId: WebEngineScript.MainWorld
-        }
-        
-        property string urlTag: "noDownload=false";
+            // detects when to raise and lower virtual keyboard
+            WebEngineScript {
+                id: raiseAndLowerKeyboard
+                injectionPoint: WebEngineScript.Deferred
+                sourceUrl: resourceDirectoryUrl + "/html/raiseAndLowerKeyboard.js"
+                worldId: WebEngineScript.MainWorld
+            }
 
-        userScripts: [ createGlobalEventBridge, raiseAndLowerKeyboard, userScript ]
+            // User script.
+            WebEngineScript {
+                id: userScript
+                sourceUrl: root.userScriptUrl
+                injectionPoint: WebEngineScript.DocumentReady  // DOM ready but page load may not be finished.
+                worldId: WebEngineScript.MainWorld
+            }
 
-        property string newUrl: ""
-        
+            property string urlTag: "noDownload=false";
 
-        Component.onCompleted: {
-            webChannel.registerObject("eventBridge", eventBridge);
-            webChannel.registerObject("eventBridgeWrapper", eventBridgeWrapper);
-            // Ensure the JS from the web-engine makes it to our logging
-            root.javaScriptConsoleMessage.connect(function(level, message, lineNumber, sourceID) {
-                console.log("Web Entity JS message: " + sourceID + " " + lineNumber + " " +  message);
-            });
+            userScripts: [ createGlobalEventBridge, raiseAndLowerKeyboard, userScript ]
 
-            root.profile.httpUserAgent = "Mozilla/5.0 Chrome (HighFidelityInterface)";
-        }
+            property string newUrl: ""
 
-        onFeaturePermissionRequested: {
-            grantFeaturePermission(securityOrigin, feature, true);
-        }
+            onContentsSizeChanged: {
+                console.log("WebView contentsSize", contentsSize)
+                flick.contentWidth = Math.max(contentsSize.width, flick.width)
+                flick.contentHeight = Math.max(contentsSize.height, flick.height)
+            }
 
-        onLoadingChanged: {
-            keyboardRaised = false;
-            punctuationMode = false;
-            keyboard.resetShiftMode(false);
+            Component.onCompleted: {
+                webChannel.registerObject("eventBridge", eventBridge);
+                webChannel.registerObject("eventBridgeWrapper", eventBridgeWrapper);
+                // Ensure the JS from the web-engine makes it to our logging
+                root.javaScriptConsoleMessage.connect(function(level, message, lineNumber, sourceID) {
+                    console.log("Web Entity JS message: " + sourceID + " " + lineNumber + " " +  message);
+                });
 
-            // Required to support clicking on "hifi://" links
-            if (WebEngineView.LoadStartedStatus == loadRequest.status) {
-                var url = loadRequest.url.toString();
-                url = (url.indexOf("?") >= 0) ? url + urlTag : url + "?" + urlTag;
-                if (urlHandler.canHandleUrl(url)) {
-                    if (urlHandler.handleUrl(url)) {
-                        root.stop();
+                root.profile.httpUserAgent = "Mozilla/5.0 Chrome (HighFidelityInterface)";
+            }
+
+            onFeaturePermissionRequested: {
+                grantFeaturePermission(securityOrigin, feature, true);
+            }
+
+            onLoadingChanged: {
+                console.log("loading changed", loadRequest.status)
+                keyboardRaised = false;
+                punctuationMode = false;
+                keyboard.resetShiftMode(false);
+
+                // Required to support clicking on "hifi://" links
+                if (WebEngineView.LoadStartedStatus == loadRequest.status) {
+                    flick.contentWidth = -1
+                    flick.contentHeight = -1
+                    var url = loadRequest.url.toString();
+                    url = (url.indexOf("?") >= 0) ? url + urlTag : url + "?" + urlTag;
+                    if (urlHandler.canHandleUrl(url)) {
+                        if (urlHandler.handleUrl(url)) {
+                            root.stop();
+                        }
                     }
                 }
-            }
-        }
+                if (WebEngineView.LoadSucceededStatus == loadRequest.status) {
+//                    flick.contentWidth = Math.max(contentsSize.width, flick.width)
+//                    flick.contentHeight = Math.max(contentsSize.height, flick.height)
+                    root.runJavaScript(
+                                "document.body.scrollHeight;",
+                                function (i_actualPageHeight) {
+                                    console.log("on reloaded documentElement.scrollHeigh:", i_actualPageHeight)
+//                                    flick.contentHeight = Math.max (
+//                                                i_actualPageHeight, flick.height);
+                                })
+                    root.runJavaScript(
+                                "document.body.scrollWidth;",
+                                function (i_actualPageWidth) {
+                                    console.log("on reloaded documentElement.scrollWidth:", i_actualPageWidth)
 
-        onNewViewRequested:{
-            // desktop is not defined for web-entities or tablet
-            if (typeof desktop !== "undefined") {
-                desktop.openBrowserWindow(request, profile);
-            } else {
-                tabletRoot.openBrowserWindow(request, profile);
+//                                    flick.contentWidth = Math.max (
+//                                                i_actualPageWidth, flick.width);
+                                })
+                    console.log("on reloaded content size:", contentsSize)
+                }
             }
-        }
 
-        HiFiControls.WebSpinner { }
+            onNewViewRequested:{
+                // desktop is not defined for web-entities or tablet
+                if (typeof desktop !== "undefined") {
+                    desktop.openBrowserWindow(request, profile);
+                } else {
+                    tabletRoot.openBrowserWindow(request, profile);
+                }
+            }
+
+            HiFiControls.WebSpinner { }
+        }
     }
 
     HiFiControls.Keyboard {
diff --git a/interface/resources/qml/controls/TabletWebView.qml b/interface/resources/qml/controls/TabletWebView.qml
index 8547f67468..6fafab81a9 100644
--- a/interface/resources/qml/controls/TabletWebView.qml
+++ b/interface/resources/qml/controls/TabletWebView.qml
@@ -1,6 +1,6 @@
-import QtQuick 2.5
+import QtQuick 2.7
 import QtQuick.Controls 1.4
-import QtWebEngine 1.2
+import QtWebEngine 1.5
 import QtWebChannel 1.0
 import "../controls-uit" as HiFiControls
 import "../styles" as HifiStyles
@@ -136,99 +136,107 @@ Item {
         loadUrl(url);
     }
 
-    WebEngineView {
-        id: webview
-        objectName: "webEngineView"
+    Flickable {
+        id: flick
         x: 0
         y: 0
         width: parent.width
         height: keyboardEnabled && keyboardRaised ? parent.height - keyboard.height - web.headerHeight : parent.height - web.headerHeight
         anchors.top: buttons.bottom
-        profile: HFWebEngineProfile;
 
-        property string userScriptUrl: ""
+        WebEngineView {
+            id: webview
+            objectName: "webEngineView"
+            anchors.fill: parent
 
-        // creates a global EventBridge object.
-        WebEngineScript {
-            id: createGlobalEventBridge
-            sourceCode: eventBridgeJavaScriptToInject
-            injectionPoint: WebEngineScript.DocumentCreation
-            worldId: WebEngineScript.MainWorld
-        }
+            profile: HFWebEngineProfile;
 
-        // detects when to raise and lower virtual keyboard
-        WebEngineScript {
-            id: raiseAndLowerKeyboard
-            injectionPoint: WebEngineScript.Deferred
-            sourceUrl: resourceDirectoryUrl + "/html/raiseAndLowerKeyboard.js"
-            worldId: WebEngineScript.MainWorld
-        }
+            property string userScriptUrl: ""
 
-        // User script.
-        WebEngineScript {
-            id: userScript
-            sourceUrl: webview.userScriptUrl
-            injectionPoint: WebEngineScript.DocumentReady  // DOM ready but page load may not be finished.
-            worldId: WebEngineScript.MainWorld
-        }
-
-        property string urlTag: "noDownload=false";
-        userScripts: [ createGlobalEventBridge, raiseAndLowerKeyboard, userScript ]
-
-        property string newUrl: ""
-
-        Component.onCompleted: {
-            webChannel.registerObject("eventBridge", eventBridge);
-            webChannel.registerObject("eventBridgeWrapper", eventBridgeWrapper);
-            // Ensure the JS from the web-engine makes it to our logging
-            webview.javaScriptConsoleMessage.connect(function(level, message, lineNumber, sourceID) {
-                console.log("Web Entity JS message: " + sourceID + " " + lineNumber + " " +  message);
-            });
-        }
-
-        onFeaturePermissionRequested: {
-            grantFeaturePermission(securityOrigin, feature, true);
-        }
-
-        onUrlChanged: {
-            // Record history, skipping null and duplicate items.
-            var urlString = url + "";
-            urlString = urlString.replace(/\//g, "%2F");  // Consistent representation of "/"s to avoid false differences.
-            if (urlString.length > 0 && (historyIndex === -1 || urlString !== history[historyIndex])) {
-                historyIndex++;
-                history = history.slice(0, historyIndex);
-                history.push(urlString);
+            // creates a global EventBridge object.
+            WebEngineScript {
+                id: createGlobalEventBridge
+                sourceCode: eventBridgeJavaScriptToInject
+                injectionPoint: WebEngineScript.DocumentCreation
+                worldId: WebEngineScript.MainWorld
             }
-        }
 
-        onLoadingChanged: {
-            keyboardRaised = false;
-            punctuationMode = false;
-            keyboard.resetShiftMode(false);
-            // Required to support clicking on "hifi://" links
-            if (WebEngineView.LoadStartedStatus == loadRequest.status) {
-                var url = loadRequest.url.toString();
-                if (urlHandler.canHandleUrl(url)) {
-                    if (urlHandler.handleUrl(url)) {
-                        root.stop();
-                    }
+            // detects when to raise and lower virtual keyboard
+            WebEngineScript {
+                id: raiseAndLowerKeyboard
+                injectionPoint: WebEngineScript.Deferred
+                sourceUrl: resourceDirectoryUrl + "/html/raiseAndLowerKeyboard.js"
+                worldId: WebEngineScript.MainWorld
+            }
+
+            // User script.
+            WebEngineScript {
+                id: userScript
+                sourceUrl: webview.userScriptUrl
+                injectionPoint: WebEngineScript.DocumentReady  // DOM ready but page load may not be finished.
+                worldId: WebEngineScript.MainWorld
+            }
+
+            property string urlTag: "noDownload=false";
+            userScripts: [ createGlobalEventBridge, raiseAndLowerKeyboard, userScript ]
+
+            property string newUrl: ""
+
+            Component.onCompleted: {
+                webChannel.registerObject("eventBridge", eventBridge);
+                webChannel.registerObject("eventBridgeWrapper", eventBridgeWrapper);
+                // Ensure the JS from the web-engine makes it to our logging
+                webview.javaScriptConsoleMessage.connect(function(level, message, lineNumber, sourceID) {
+                    console.log("Web Entity JS message: " + sourceID + " " + lineNumber + " " +  message);
+                });
+            }
+
+            onFeaturePermissionRequested: {
+                grantFeaturePermission(securityOrigin, feature, true);
+            }
+
+            onUrlChanged: {
+                // Record history, skipping null and duplicate items.
+                var urlString = url + "";
+                urlString = urlString.replace(/\//g, "%2F");  // Consistent representation of "/"s to avoid false differences.
+                if (urlString.length > 0 && (historyIndex === -1 || urlString !== history[historyIndex])) {
+                    historyIndex++;
+                    history = history.slice(0, historyIndex);
+                    history.push(urlString);
                 }
             }
 
-            if (WebEngineView.LoadFailedStatus == loadRequest.status) {
-                console.log(" Tablet WebEngineView failed to load url: " + loadRequest.url.toString());
+            onLoadingChanged: {
+                keyboardRaised = false;
+                punctuationMode = false;
+                keyboard.resetShiftMode(false);
+                // Required to support clicking on "hifi://" links
+                if (WebEngineView.LoadStartedStatus == loadRequest.status) {
+                    var url = loadRequest.url.toString();
+                    if (urlHandler.canHandleUrl(url)) {
+                        if (urlHandler.handleUrl(url)) {
+                            root.stop();
+                        }
+                    }
+                }
+
+                if (WebEngineView.LoadFailedStatus == loadRequest.status) {
+                    console.log(" Tablet WebEngineView failed to load url: " + loadRequest.url.toString());
+                }
+
+                if (WebEngineView.LoadSucceededStatus == loadRequest.status) {
+                    flick.contentWidth = Math.max(contentsSize.width, flick.width)
+                    flick.contentHeight = Math.max(contentsSize.height, flick.height)
+                    webview.forceActiveFocus();
+                }
             }
 
-            if (WebEngineView.LoadSucceededStatus == loadRequest.status) {
-                webview.forceActiveFocus();
+            onNewViewRequested: {
+                request.openIn(webview);
             }
-        }
-        
-        onNewViewRequested: {
-            request.openIn(webview);
-        }
 
-        HiFiControls.WebSpinner { }
+            HiFiControls.WebSpinner { }
+        }
     }
 
     HiFiControls.Keyboard {
diff --git a/interface/resources/qml/controls/WebView.qml b/interface/resources/qml/controls/WebView.qml
index 3f2ac6363b..2013de4ef9 100644
--- a/interface/resources/qml/controls/WebView.qml
+++ b/interface/resources/qml/controls/WebView.qml
@@ -1,5 +1,5 @@
-import QtQuick 2.5
-import QtWebEngine 1.1
+import QtQuick 2.7
+import QtWebEngine 1.5
 import QtWebChannel 1.0
 import "../controls-uit" as HiFiControls
 
@@ -23,89 +23,119 @@ Item {
 
     property alias viewProfile: root.profile
 
-    WebEngineView {
-        id: root
-        objectName: "webEngineView"
+    Flickable {
+        id: flick
         x: 0
         y: 0
         width: parent.width
         height: keyboardEnabled && keyboardRaised ? parent.height - keyboard.height : parent.height
 
-        profile: HFWebEngineProfile;
 
-        property string userScriptUrl: ""
+        WebEngineView {
+            id: root
+            objectName: "webEngineView"
+            anchors.fill: parent
 
-        // creates a global EventBridge object.
-        WebEngineScript {
-            id: createGlobalEventBridge
-            sourceCode: eventBridgeJavaScriptToInject
-            injectionPoint: WebEngineScript.DocumentCreation
-            worldId: WebEngineScript.MainWorld
-        }
+            profile: HFWebEngineProfile;
 
-        // detects when to raise and lower virtual keyboard
-        WebEngineScript {
-            id: raiseAndLowerKeyboard
-            injectionPoint: WebEngineScript.Deferred
-            sourceUrl: resourceDirectoryUrl + "/html/raiseAndLowerKeyboard.js"
-            worldId: WebEngineScript.MainWorld
-        }
+            property string userScriptUrl: ""
 
-        // User script.
-        WebEngineScript {
-            id: userScript
-            sourceUrl: root.userScriptUrl
-            injectionPoint: WebEngineScript.DocumentReady  // DOM ready but page load may not be finished.
-            worldId: WebEngineScript.MainWorld
-        }
-        
-        property string urlTag: "noDownload=false";
+            // creates a global EventBridge object.
+            WebEngineScript {
+                id: createGlobalEventBridge
+                sourceCode: eventBridgeJavaScriptToInject
+                injectionPoint: WebEngineScript.DocumentCreation
+                worldId: WebEngineScript.MainWorld
+            }
 
-        userScripts: [ createGlobalEventBridge, raiseAndLowerKeyboard, userScript ]
+            // detects when to raise and lower virtual keyboard
+            WebEngineScript {
+                id: raiseAndLowerKeyboard
+                injectionPoint: WebEngineScript.Deferred
+                sourceUrl: resourceDirectoryUrl + "/html/raiseAndLowerKeyboard.js"
+                worldId: WebEngineScript.MainWorld
+            }
 
-        property string newUrl: ""
+            // User script.
+            WebEngineScript {
+                id: userScript
+                sourceUrl: root.userScriptUrl
+                injectionPoint: WebEngineScript.DocumentReady  // DOM ready but page load may not be finished.
+                worldId: WebEngineScript.MainWorld
+            }
 
-        Component.onCompleted: {
-            webChannel.registerObject("eventBridge", eventBridge);
-            webChannel.registerObject("eventBridgeWrapper", eventBridgeWrapper);
-            // Ensure the JS from the web-engine makes it to our logging
-            root.javaScriptConsoleMessage.connect(function(level, message, lineNumber, sourceID) {
-                console.log("Web Entity JS message: " + sourceID + " " + lineNumber + " " +  message);
-            });
+            property string urlTag: "noDownload=false";
 
-        }
+            userScripts: [ createGlobalEventBridge, raiseAndLowerKeyboard, userScript ]
 
-        onFeaturePermissionRequested: {
-            grantFeaturePermission(securityOrigin, feature, true);
-        }
+            property string newUrl: ""
 
-        onLoadingChanged: {
-            keyboardRaised = false;
-            punctuationMode = false;
-            keyboard.resetShiftMode(false);
+            Component.onCompleted: {
+                webChannel.registerObject("eventBridge", eventBridge);
+                webChannel.registerObject("eventBridgeWrapper", eventBridgeWrapper);
+                // Ensure the JS from the web-engine makes it to our logging
+                root.javaScriptConsoleMessage.connect(function(level, message, lineNumber, sourceID) {
+                    console.log("Web Entity JS message: " + sourceID + " " + lineNumber + " " +  message);
+                });
 
-            // Required to support clicking on "hifi://" links
-            if (WebEngineView.LoadStartedStatus == loadRequest.status) {
-                var url = loadRequest.url.toString();
-                url = (url.indexOf("?") >= 0) ? url + urlTag : url + "?" + urlTag;
-                if (urlHandler.canHandleUrl(url)) {
-                    if (urlHandler.handleUrl(url)) {
-                        root.stop();
+            }
+
+            onFeaturePermissionRequested: {
+                grantFeaturePermission(securityOrigin, feature, true);
+            }
+
+            onContentsSizeChanged: {
+                console.log("WebView contentsSize", contentsSize)
+                flick.contentWidth = Math.max(contentsSize.width, flick.width)
+                flick.contentHeight = Math.max(contentsSize.height, flick.height)
+            }
+
+            onLoadingChanged: {
+                keyboardRaised = false;
+                punctuationMode = false;
+                keyboard.resetShiftMode(false);
+
+                // Required to support clicking on "hifi://" links
+                if (WebEngineView.LoadStartedStatus == loadRequest.status) {
+                    var url = loadRequest.url.toString();
+                    url = (url.indexOf("?") >= 0) ? url + urlTag : url + "?" + urlTag;
+                    if (urlHandler.canHandleUrl(url)) {
+                        if (urlHandler.handleUrl(url)) {
+                            root.stop();
+                        }
                     }
                 }
-            }
-        }
+                if (WebEngineView.LoadSucceededStatus == loadRequest.status) {
 
-        onNewViewRequested:{
-            // desktop is not defined for web-entities or tablet
-            if (typeof desktop !== "undefined") {
-                desktop.openBrowserWindow(request, profile);
-            } else {
-                tabletRoot.openBrowserWindow(request, profile);
-            }
-        }
+//                    flick.contentWidth = Math.max(contentsSize.width, flick.width)
+//                    flick.contentHeight = Math.max(contentsSize.height, flick.height)
+                    root.runJavaScript(
+                                   "document.body.scrollHeight;",
+                                   function (i_actualPageHeight) {
+                                       flick.contentHeight = Math.max (
+                                           i_actualPageHeight, flick.height);
+                                   })
+                               root.runJavaScript(
+                                   "document.body.scrollWidth;",
+                                   function (i_actualPageWidth) {
+                                       flick.contentWidth = Math.max (
+                                           i_actualPageWidth, flick.width);
+                                   })
 
-        HiFiControls.WebSpinner { }
+                }
+            }
+
+            onNewViewRequested:{
+                // desktop is not defined for web-entities or tablet
+                if (typeof desktop !== "undefined") {
+                    desktop.openBrowserWindow(request, profile);
+                } else {
+                    tabletRoot.openBrowserWindow(request, profile);
+                }
+            }
+
+            HiFiControls.WebSpinner { }
+        }
     }
 
     HiFiControls.Keyboard {

From 78e9bb6020bf874410f9c59dad5d37f84c128a85 Mon Sep 17 00:00:00 2001
From: vladest <vladstelmahovsky@gmail.com>
Date: Sun, 20 Aug 2017 23:06:23 +0200
Subject: [PATCH 10/37] almost works for marketplace

---
 .../qml/controls/TabletWebScreen.qml          | 22 +++++++------------
 1 file changed, 8 insertions(+), 14 deletions(-)

diff --git a/interface/resources/qml/controls/TabletWebScreen.qml b/interface/resources/qml/controls/TabletWebScreen.qml
index e1615e1442..4ed71282d4 100644
--- a/interface/resources/qml/controls/TabletWebScreen.qml
+++ b/interface/resources/qml/controls/TabletWebScreen.qml
@@ -91,15 +91,16 @@ Item {
             }
 
             onLoadingChanged: {
-                console.log("loading changed", loadRequest.status)
                 keyboardRaised = false;
                 punctuationMode = false;
                 keyboard.resetShiftMode(false);
 
                 // Required to support clicking on "hifi://" links
                 if (WebEngineView.LoadStartedStatus == loadRequest.status) {
-                    flick.contentWidth = -1
-                    flick.contentHeight = -1
+                    flick.contentWidth = 0
+                    flick.contentHeight = 0
+                    flick.contentX = 0
+                    flick.contentY = 0
                     var url = loadRequest.url.toString();
                     url = (url.indexOf("?") >= 0) ? url + urlTag : url + "?" + urlTag;
                     if (urlHandler.canHandleUrl(url)) {
@@ -109,24 +110,17 @@ Item {
                     }
                 }
                 if (WebEngineView.LoadSucceededStatus == loadRequest.status) {
-//                    flick.contentWidth = Math.max(contentsSize.width, flick.width)
-//                    flick.contentHeight = Math.max(contentsSize.height, flick.height)
-                    root.runJavaScript(
-                                "document.body.scrollHeight;",
+                    root.runJavaScript("document.body.scrollHeight;",
                                 function (i_actualPageHeight) {
                                     console.log("on reloaded documentElement.scrollHeigh:", i_actualPageHeight)
-//                                    flick.contentHeight = Math.max (
-//                                                i_actualPageHeight, flick.height);
+                                    flick.contentHeight = Math.max(i_actualPageHeight, flick.height);
                                 })
-                    root.runJavaScript(
-                                "document.body.scrollWidth;",
+                    root.runJavaScript("document.body.scrollWidth;",
                                 function (i_actualPageWidth) {
                                     console.log("on reloaded documentElement.scrollWidth:", i_actualPageWidth)
 
-//                                    flick.contentWidth = Math.max (
-//                                                i_actualPageWidth, flick.width);
+                                    flick.contentWidth = Math.max(i_actualPageWidth, flick.width);
                                 })
-                    console.log("on reloaded content size:", contentsSize)
                 }
             }
 

From 3be684b9732531fd43ce66daf0870d63ad97c50b Mon Sep 17 00:00:00 2001
From: vladest <vladstelmahovsky@gmail.com>
Date: Mon, 21 Aug 2017 16:31:25 +0200
Subject: [PATCH 11/37] Fixed spinner in center. Flicking only vertically

---
 .../resources/qml/controls-uit/WebSpinner.qml |  3 +-
 .../qml/controls/TabletWebScreen.qml          | 60 +++++++++----------
 .../resources/qml/controls/TabletWebView.qml  | 29 +++++++--
 3 files changed, 53 insertions(+), 39 deletions(-)

diff --git a/interface/resources/qml/controls-uit/WebSpinner.qml b/interface/resources/qml/controls-uit/WebSpinner.qml
index 6323bff1a7..3e7ca6ec22 100644
--- a/interface/resources/qml/controls-uit/WebSpinner.qml
+++ b/interface/resources/qml/controls-uit/WebSpinner.qml
@@ -11,8 +11,9 @@
 import QtQuick 2.5
 
 AnimatedImage {
+    property Item webroot: parent
     source: "../../icons/loader-snake-64-w.gif"
-    visible: parent.loading && /^(http.*|)$/i.test(parent.url.toString())
+    visible: webroot.loading && /^(http.*|)$/i.test(webroot.url.toString())
     z: 10000
     anchors {
         horizontalCenter: parent.horizontalCenter
diff --git a/interface/resources/qml/controls/TabletWebScreen.qml b/interface/resources/qml/controls/TabletWebScreen.qml
index 4ed71282d4..eeb211a16d 100644
--- a/interface/resources/qml/controls/TabletWebScreen.qml
+++ b/interface/resources/qml/controls/TabletWebScreen.qml
@@ -4,11 +4,12 @@ import QtWebChannel 1.0
 import "../controls-uit" as HiFiControls
 
 Item {
-    property alias url: root.url
-    property alias scriptURL: root.userScriptUrl
-    property alias canGoBack: root.canGoBack;
-    property var goBack: root.goBack;
-    property alias urlTag: root.urlTag
+    id: root
+    property alias url: webroot.url
+    property alias scriptURL: webroot.userScriptUrl
+    property alias canGoBack: webroot.canGoBack;
+    property var goBack: webroot.goBack;
+    property alias urlTag: webroot.urlTag
     property bool keyboardEnabled: true  // FIXME - Keyboard HMD only: Default to false
     property bool keyboardRaised: false
     property bool punctuationMode: false
@@ -21,17 +22,15 @@ Item {
     }
     */
 
-    property alias viewProfile: root.profile
+    property alias viewProfile: webroot.profile
 
     Flickable {
         id: flick
-        x: 0
-        y: 0
         width: parent.width
         height: keyboardEnabled && keyboardRaised ? parent.height - keyboard.height : parent.height
 
         WebEngineView {
-            id: root
+            id: webroot
             objectName: "webEngineView"
             anchors.fill: parent
 
@@ -58,7 +57,7 @@ Item {
             // User script.
             WebEngineScript {
                 id: userScript
-                sourceUrl: root.userScriptUrl
+                sourceUrl: webroot.userScriptUrl
                 injectionPoint: WebEngineScript.DocumentReady  // DOM ready but page load may not be finished.
                 worldId: WebEngineScript.MainWorld
             }
@@ -69,21 +68,25 @@ Item {
 
             property string newUrl: ""
 
+            //disable popup
+            onContextMenuRequested: {
+                request.accepted = true;
+            }
+
             onContentsSizeChanged: {
-                console.log("WebView contentsSize", contentsSize)
-                flick.contentWidth = Math.max(contentsSize.width, flick.width)
-                flick.contentHeight = Math.max(contentsSize.height, flick.height)
+                flick.contentHeight = Math.max(contentsSize.height, flick.height);
+                flick.contentWidth = flick.width
             }
 
             Component.onCompleted: {
                 webChannel.registerObject("eventBridge", eventBridge);
                 webChannel.registerObject("eventBridgeWrapper", eventBridgeWrapper);
                 // Ensure the JS from the web-engine makes it to our logging
-                root.javaScriptConsoleMessage.connect(function(level, message, lineNumber, sourceID) {
+                webroot.javaScriptConsoleMessage.connect(function(level, message, lineNumber, sourceID) {
                     console.log("Web Entity JS message: " + sourceID + " " + lineNumber + " " +  message);
                 });
 
-                root.profile.httpUserAgent = "Mozilla/5.0 Chrome (HighFidelityInterface)";
+                webroot.profile.httpUserAgent = "Mozilla/5.0 Chrome (HighFidelityInterface)";
             }
 
             onFeaturePermissionRequested: {
@@ -99,28 +102,19 @@ Item {
                 if (WebEngineView.LoadStartedStatus == loadRequest.status) {
                     flick.contentWidth = 0
                     flick.contentHeight = 0
-                    flick.contentX = 0
-                    flick.contentY = 0
                     var url = loadRequest.url.toString();
                     url = (url.indexOf("?") >= 0) ? url + urlTag : url + "?" + urlTag;
                     if (urlHandler.canHandleUrl(url)) {
                         if (urlHandler.handleUrl(url)) {
-                            root.stop();
+                            webroot.stop();
                         }
                     }
                 }
                 if (WebEngineView.LoadSucceededStatus == loadRequest.status) {
-                    root.runJavaScript("document.body.scrollHeight;",
-                                function (i_actualPageHeight) {
-                                    console.log("on reloaded documentElement.scrollHeigh:", i_actualPageHeight)
-                                    flick.contentHeight = Math.max(i_actualPageHeight, flick.height);
-                                })
-                    root.runJavaScript("document.body.scrollWidth;",
-                                function (i_actualPageWidth) {
-                                    console.log("on reloaded documentElement.scrollWidth:", i_actualPageWidth)
-
-                                    flick.contentWidth = Math.max(i_actualPageWidth, flick.width);
-                                })
+                    webroot.runJavaScript("document.body.scrollHeight;", function (i_actualPageHeight) {
+                        flick.contentHeight = Math.max(i_actualPageHeight, flick.height);
+                    })
+                    flick.contentWidth = flick.width
                 }
             }
 
@@ -132,11 +126,14 @@ Item {
                     tabletRoot.openBrowserWindow(request, profile);
                 }
             }
-
-            HiFiControls.WebSpinner { }
         }
     }
 
+    HiFiControls.WebSpinner {
+        anchors.centerIn: parent
+        webroot: webroot
+    }
+
     HiFiControls.Keyboard {
         id: keyboard
         raised: parent.keyboardEnabled && parent.keyboardRaised
@@ -147,5 +144,4 @@ Item {
             bottom: parent.bottom
         }
     }
-
 }
diff --git a/interface/resources/qml/controls/TabletWebView.qml b/interface/resources/qml/controls/TabletWebView.qml
index 6fafab81a9..cf8cdb1773 100644
--- a/interface/resources/qml/controls/TabletWebView.qml
+++ b/interface/resources/qml/controls/TabletWebView.qml
@@ -138,8 +138,6 @@ Item {
 
     Flickable {
         id: flick
-        x: 0
-        y: 0
         width: parent.width
         height: keyboardEnabled && keyboardRaised ? parent.height - keyboard.height - web.headerHeight : parent.height - web.headerHeight
         anchors.top: buttons.bottom
@@ -206,12 +204,23 @@ Item {
                 }
             }
 
+            onContentsSizeChanged: {
+                flick.contentHeight = Math.max(contentsSize.height, flick.height);
+                flick.contentWidth = flick.width//Math.max(contentsSize.width, flick.width);
+            }
+            //disable popup
+            onContextMenuRequested: {
+                request.accepted = true;
+            }
+
             onLoadingChanged: {
                 keyboardRaised = false;
                 punctuationMode = false;
                 keyboard.resetShiftMode(false);
                 // Required to support clicking on "hifi://" links
                 if (WebEngineView.LoadStartedStatus == loadRequest.status) {
+                    flick.contentWidth = 0
+                    flick.contentHeight = 0
                     var url = loadRequest.url.toString();
                     if (urlHandler.canHandleUrl(url)) {
                         if (urlHandler.handleUrl(url)) {
@@ -225,8 +234,13 @@ Item {
                 }
 
                 if (WebEngineView.LoadSucceededStatus == loadRequest.status) {
-                    flick.contentWidth = Math.max(contentsSize.width, flick.width)
-                    flick.contentHeight = Math.max(contentsSize.height, flick.height)
+                    webroot.runJavaScript("document.body.scrollHeight;", function (i_actualPageHeight) {
+                        flick.contentHeight = Math.max(i_actualPageHeight, flick.height);
+                    })
+//                    webroot.runJavaScript("document.body.scrollWidth;", function (i_actualPageWidth) {
+                        flick.contentWidth = flick.width//Math.max(i_actualPageWidth, flick.width);
+//                    })
+
                     webview.forceActiveFocus();
                 }
             }
@@ -234,11 +248,14 @@ Item {
             onNewViewRequested: {
                 request.openIn(webview);
             }
-
-            HiFiControls.WebSpinner { }
         }
     }
 
+    HiFiControls.WebSpinner {
+        webroot: webview
+        anchors.centerIn: parent
+    }
+
     HiFiControls.Keyboard {
         id: keyboard
         raised: parent.keyboardEnabled && parent.keyboardRaised

From 9fd2a742a925d2fb973731b541345a351c23517e Mon Sep 17 00:00:00 2001
From: vladest <vladstelmahovsky@gmail.com>
Date: Mon, 21 Aug 2017 16:45:47 +0200
Subject: [PATCH 12/37] Fix QML warning. Fix AddressBar info scroll

---
 interface/resources/qml/controls/TabletWebView.qml | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/interface/resources/qml/controls/TabletWebView.qml b/interface/resources/qml/controls/TabletWebView.qml
index cf8cdb1773..12e4a87438 100644
--- a/interface/resources/qml/controls/TabletWebView.qml
+++ b/interface/resources/qml/controls/TabletWebView.qml
@@ -11,8 +11,8 @@ import "."
 Item {
     id: web
     HifiConstants { id: hifi }
-    width: parent.width
-    height: parent.height
+    width: parent !== null ? parent.width : undefined
+    height: parent !== null ? parent.height : undefined
     property var parentStackItem: null
     property int headerHeight: 70
     property string url
@@ -206,7 +206,7 @@ Item {
 
             onContentsSizeChanged: {
                 flick.contentHeight = Math.max(contentsSize.height, flick.height);
-                flick.contentWidth = flick.width//Math.max(contentsSize.width, flick.width);
+                flick.contentWidth = flick.width
             }
             //disable popup
             onContextMenuRequested: {
@@ -234,12 +234,10 @@ Item {
                 }
 
                 if (WebEngineView.LoadSucceededStatus == loadRequest.status) {
-                    webroot.runJavaScript("document.body.scrollHeight;", function (i_actualPageHeight) {
+                    webview.runJavaScript("document.body.scrollHeight;", function (i_actualPageHeight) {
                         flick.contentHeight = Math.max(i_actualPageHeight, flick.height);
                     })
-//                    webroot.runJavaScript("document.body.scrollWidth;", function (i_actualPageWidth) {
-                        flick.contentWidth = flick.width//Math.max(i_actualPageWidth, flick.width);
-//                    })
+                    flick.contentWidth = flick.width
 
                     webview.forceActiveFocus();
                 }

From 43d3544a0d6fadabd387dfe8085e8ab5ff26ae45 Mon Sep 17 00:00:00 2001
From: vladest <vladstelmahovsky@gmail.com>
Date: Mon, 21 Aug 2017 17:07:24 +0200
Subject: [PATCH 13/37] Fix width of html pages in Create mode

---
 interface/resources/qml/controls/WebView.qml | 41 +++++++++-----------
 1 file changed, 19 insertions(+), 22 deletions(-)

diff --git a/interface/resources/qml/controls/WebView.qml b/interface/resources/qml/controls/WebView.qml
index 2013de4ef9..91f204bd78 100644
--- a/interface/resources/qml/controls/WebView.qml
+++ b/interface/resources/qml/controls/WebView.qml
@@ -4,6 +4,9 @@ import QtWebChannel 1.0
 import "../controls-uit" as HiFiControls
 
 Item {
+    width: parent !== null ? parent.width : undefined
+    height: parent !== null ? parent.height : undefined
+
     property alias url: root.url
     property alias scriptURL: root.userScriptUrl
     property alias canGoBack: root.canGoBack;
@@ -25,12 +28,9 @@ Item {
 
     Flickable {
         id: flick
-        x: 0
-        y: 0
         width: parent.width
         height: keyboardEnabled && keyboardRaised ? parent.height - keyboard.height : parent.height
 
-
         WebEngineView {
             id: root
             objectName: "webEngineView"
@@ -86,9 +86,13 @@ Item {
 
             onContentsSizeChanged: {
                 console.log("WebView contentsSize", contentsSize)
-                flick.contentWidth = Math.max(contentsSize.width, flick.width)
+                flick.contentWidth = flick.width
                 flick.contentHeight = Math.max(contentsSize.height, flick.height)
             }
+            //disable popup
+            onContextMenuRequested: {
+                request.accepted = true;
+            }
 
             onLoadingChanged: {
                 keyboardRaised = false;
@@ -97,6 +101,8 @@ Item {
 
                 // Required to support clicking on "hifi://" links
                 if (WebEngineView.LoadStartedStatus == loadRequest.status) {
+                    flick.contentWidth = 0
+                    flick.contentHeight = 0
                     var url = loadRequest.url.toString();
                     url = (url.indexOf("?") >= 0) ? url + urlTag : url + "?" + urlTag;
                     if (urlHandler.canHandleUrl(url)) {
@@ -106,22 +112,10 @@ Item {
                     }
                 }
                 if (WebEngineView.LoadSucceededStatus == loadRequest.status) {
-
-//                    flick.contentWidth = Math.max(contentsSize.width, flick.width)
-//                    flick.contentHeight = Math.max(contentsSize.height, flick.height)
-                    root.runJavaScript(
-                                   "document.body.scrollHeight;",
-                                   function (i_actualPageHeight) {
-                                       flick.contentHeight = Math.max (
-                                           i_actualPageHeight, flick.height);
-                                   })
-                               root.runJavaScript(
-                                   "document.body.scrollWidth;",
-                                   function (i_actualPageWidth) {
-                                       flick.contentWidth = Math.max (
-                                           i_actualPageWidth, flick.width);
-                                   })
-
+                    root.runJavaScript("document.body.scrollHeight;", function (i_actualPageHeight) {
+                        flick.contentHeight = Math.max(i_actualPageHeight, flick.height);
+                    })
+                    flick.contentWidth = flick.width
                 }
             }
 
@@ -133,11 +127,14 @@ Item {
                     tabletRoot.openBrowserWindow(request, profile);
                 }
             }
-
-            HiFiControls.WebSpinner { }
         }
     }
 
+    HiFiControls.WebSpinner {
+        anchors.centerIn: parent
+        webroot: root
+    }
+
     HiFiControls.Keyboard {
         id: keyboard
         raised: parent.keyboardEnabled && parent.keyboardRaised

From 9185e1d80d23ea1fe4f0b70ca02df80f837c98b1 Mon Sep 17 00:00:00 2001
From: Midnight <midnight@midnightrift.com>
Date: Mon, 21 Aug 2017 14:48:10 -0700
Subject: [PATCH 14/37] code style.

---
 .../marketplace/dodgeBall/dodgeBall.js        | 20 ++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/unpublishedScripts/marketplace/dodgeBall/dodgeBall.js b/unpublishedScripts/marketplace/dodgeBall/dodgeBall.js
index 737db9770c..6afb82770f 100644
--- a/unpublishedScripts/marketplace/dodgeBall/dodgeBall.js
+++ b/unpublishedScripts/marketplace/dodgeBall/dodgeBall.js
@@ -53,7 +53,7 @@
             azimuthFinish: 180
         };
 
-            particleTrailEntity = Entities.addEntity(props);
+        particleTrailEntity = Entities.addEntity(props);
     }
 
     function particleExplode() {
@@ -93,13 +93,13 @@
             azimuthStart: -180,
             azimuthFinish: 180
         };
-        var exposionParticles = Entities.addEntity(props);
+        var explosionParticles = Entities.addEntity(props);
         Entities.editEntity(_entityID, {
             velocity: Vec3.ZERO,
             dynamic: false
         });
         Script.setTimeout(function () {
-            Entities.deleteEntity(exposionParticles);
+            Entities.deleteEntity(explosionParticles);
             Entities.editEntity(_entityID, {
                 dynamic: true
             })
@@ -114,7 +114,9 @@
             particleTrailEntity = null;
         }
 
-        if (proxTimeout) Script.clearTimeout(proxTimeout);
+        if (proxTimeout) {
+            Script.clearTimeout(proxTimeout);
+        }
     }
 
     function proxCheck() {
@@ -133,7 +135,9 @@
         var avatarUUID = triggerHandAndAvatarUUIDArray[1];
 
         var ballPos = Entities.getEntityProperties(_entityID, ['position']).position;
-        if (Vec3.distance(ballPos, AvatarList.getAvatar(avatarUUID).position) > 2) {
+        var MAX_DISTANCE_GRAB = 2; //meter
+
+        if (Vec3.distance(ballPos, AvatarList.getAvatar(avatarUUID).position) > MAX_DISTANCE_GRAB) {
             Messages.sendMessage(FORCE_DROP_CHANNEL, triggerHand, true);
         }
 
@@ -144,7 +148,9 @@
 
     this.releaseGrab = function (thisEntityID) {
 
-        if (particleTrailEntity === null) particleTrail();
+        if (particleTrailEntity === null) {
+            particleTrail();
+        }
 
         Script.setTimeout(function () {
             proxInterval = Script.setInterval(proxCheck, 50);
@@ -155,7 +161,7 @@
         }, 10000)
     };
 
-    this.collisionWithEntity = function(thisEntityID,  collisionEntityID, collisionInfo) {
+    this.collisionWithEntity = function (thisEntityID, collisionEntityID, collisionInfo) {
         clearProxCheck();
     };
 

From c7fe845403720c3f175b8f1ca4deb6e8f24e328d Mon Sep 17 00:00:00 2001
From: vladest <vladstelmahovsky@gmail.com>
Date: Thu, 24 Aug 2017 21:35:47 +0200
Subject: [PATCH 15/37] Move common webview flickable code to separate core
 file

---
 interface/resources/qml/TabletBrowser.qml     |   4 +-
 .../qml/controls-uit/BaseWebView.qml          |   2 +-
 .../resources/qml/controls-uit/WebSpinner.qml |   6 +-
 .../qml/controls/TabletWebScreen.qml          | 230 ++++++++-------
 .../resources/qml/controls/TabletWebView.qml  | 271 ++++++++++--------
 interface/resources/qml/controls/WebView.qml  | 236 ++++++++-------
 6 files changed, 409 insertions(+), 340 deletions(-)

diff --git a/interface/resources/qml/TabletBrowser.qml b/interface/resources/qml/TabletBrowser.qml
index 0b06a6e2a1..ce74ae8c6e 100644
--- a/interface/resources/qml/TabletBrowser.qml
+++ b/interface/resources/qml/TabletBrowser.qml
@@ -1,7 +1,7 @@
 import QtQuick 2.5
 import QtQuick.Controls 1.4
 import QtWebChannel 1.0
-import QtWebEngine 1.2
+import QtWebEngine 1.5
 
 import "controls"
 import "controls-uit" as HifiControls
@@ -17,7 +17,7 @@ Item {
     height: 600
     property variant permissionsBar: {'securityOrigin':'none','feature':'none'}
     property alias url: webview.url
-    property WebEngineView webView: webview
+    //property WebEngineView webView: webview
     property bool canGoBack: webview.canGoBack
     property bool canGoForward: webview.canGoForward
 
diff --git a/interface/resources/qml/controls-uit/BaseWebView.qml b/interface/resources/qml/controls-uit/BaseWebView.qml
index 3ca57f03bf..660f52d529 100644
--- a/interface/resources/qml/controls-uit/BaseWebView.qml
+++ b/interface/resources/qml/controls-uit/BaseWebView.qml
@@ -9,7 +9,7 @@
 //
 
 import QtQuick 2.5
-import QtWebEngine 1.2
+import QtWebEngine 1.5
 
 WebEngineView {
     id: root
diff --git a/interface/resources/qml/controls-uit/WebSpinner.qml b/interface/resources/qml/controls-uit/WebSpinner.qml
index 3e7ca6ec22..e8e01c4865 100644
--- a/interface/resources/qml/controls-uit/WebSpinner.qml
+++ b/interface/resources/qml/controls-uit/WebSpinner.qml
@@ -9,11 +9,13 @@
 //
 
 import QtQuick 2.5
+import QtWebEngine 1.5
 
 AnimatedImage {
-    property Item webroot: parent
+    property WebEngineView webview: parent
     source: "../../icons/loader-snake-64-w.gif"
-    visible: webroot.loading && /^(http.*|)$/i.test(webroot.url.toString())
+    visible: webview.loading && /^(http.*|)$/i.test(webview.url.toString())
+    playing: visible
     z: 10000
     anchors {
         horizontalCenter: parent.horizontalCenter
diff --git a/interface/resources/qml/controls/TabletWebScreen.qml b/interface/resources/qml/controls/TabletWebScreen.qml
index eeb211a16d..665ce7ea27 100644
--- a/interface/resources/qml/controls/TabletWebScreen.qml
+++ b/interface/resources/qml/controls/TabletWebScreen.qml
@@ -1,6 +1,4 @@
 import QtQuick 2.7
-import QtWebEngine 1.5
-import QtWebChannel 1.0
 import "../controls-uit" as HiFiControls
 
 Item {
@@ -8,7 +6,7 @@ Item {
     property alias url: webroot.url
     property alias scriptURL: webroot.userScriptUrl
     property alias canGoBack: webroot.canGoBack;
-    property var goBack: webroot.goBack;
+    property var goBack: webroot.webViewCore.goBack;
     property alias urlTag: webroot.urlTag
     property bool keyboardEnabled: true  // FIXME - Keyboard HMD only: Default to false
     property bool keyboardRaised: false
@@ -22,117 +20,139 @@ Item {
     }
     */
 
-    property alias viewProfile: webroot.profile
+    property alias viewProfile: webroot.webViewCoreProfile
 
-    Flickable {
-        id: flick
+    FlickableWebViewCore {
+        id: webroot
         width: parent.width
         height: keyboardEnabled && keyboardRaised ? parent.height - keyboard.height : parent.height
 
-        WebEngineView {
-            id: webroot
-            objectName: "webEngineView"
-            anchors.fill: parent
+        onLoadingChangedCallback: {
+            keyboardRaised = false;
+            punctuationMode = false;
+            keyboard.resetShiftMode(false);
+        }
 
-            profile: HFWebEngineProfile;
-
-            property string userScriptUrl: ""
-
-            // creates a global EventBridge object.
-            WebEngineScript {
-                id: createGlobalEventBridge
-                sourceCode: eventBridgeJavaScriptToInject
-                injectionPoint: WebEngineScript.DocumentCreation
-                worldId: WebEngineScript.MainWorld
-            }
-
-            // detects when to raise and lower virtual keyboard
-            WebEngineScript {
-                id: raiseAndLowerKeyboard
-                injectionPoint: WebEngineScript.Deferred
-                sourceUrl: resourceDirectoryUrl + "/html/raiseAndLowerKeyboard.js"
-                worldId: WebEngineScript.MainWorld
-            }
-
-            // User script.
-            WebEngineScript {
-                id: userScript
-                sourceUrl: webroot.userScriptUrl
-                injectionPoint: WebEngineScript.DocumentReady  // DOM ready but page load may not be finished.
-                worldId: WebEngineScript.MainWorld
-            }
-
-            property string urlTag: "noDownload=false";
-
-            userScripts: [ createGlobalEventBridge, raiseAndLowerKeyboard, userScript ]
-
-            property string newUrl: ""
-
-            //disable popup
-            onContextMenuRequested: {
-                request.accepted = true;
-            }
-
-            onContentsSizeChanged: {
-                flick.contentHeight = Math.max(contentsSize.height, flick.height);
-                flick.contentWidth = flick.width
-            }
-
-            Component.onCompleted: {
-                webChannel.registerObject("eventBridge", eventBridge);
-                webChannel.registerObject("eventBridgeWrapper", eventBridgeWrapper);
-                // Ensure the JS from the web-engine makes it to our logging
-                webroot.javaScriptConsoleMessage.connect(function(level, message, lineNumber, sourceID) {
-                    console.log("Web Entity JS message: " + sourceID + " " + lineNumber + " " +  message);
-                });
-
-                webroot.profile.httpUserAgent = "Mozilla/5.0 Chrome (HighFidelityInterface)";
-            }
-
-            onFeaturePermissionRequested: {
-                grantFeaturePermission(securityOrigin, feature, true);
-            }
-
-            onLoadingChanged: {
-                keyboardRaised = false;
-                punctuationMode = false;
-                keyboard.resetShiftMode(false);
-
-                // Required to support clicking on "hifi://" links
-                if (WebEngineView.LoadStartedStatus == loadRequest.status) {
-                    flick.contentWidth = 0
-                    flick.contentHeight = 0
-                    var url = loadRequest.url.toString();
-                    url = (url.indexOf("?") >= 0) ? url + urlTag : url + "?" + urlTag;
-                    if (urlHandler.canHandleUrl(url)) {
-                        if (urlHandler.handleUrl(url)) {
-                            webroot.stop();
-                        }
-                    }
-                }
-                if (WebEngineView.LoadSucceededStatus == loadRequest.status) {
-                    webroot.runJavaScript("document.body.scrollHeight;", function (i_actualPageHeight) {
-                        flick.contentHeight = Math.max(i_actualPageHeight, flick.height);
-                    })
-                    flick.contentWidth = flick.width
-                }
-            }
-
-            onNewViewRequested:{
-                // desktop is not defined for web-entities or tablet
-                if (typeof desktop !== "undefined") {
-                    desktop.openBrowserWindow(request, profile);
-                } else {
-                    tabletRoot.openBrowserWindow(request, profile);
-                }
+        onNewViewRequestedCallback: {
+            // desktop is not defined for web-entities or tablet
+            if (typeof desktop !== "undefined") {
+                desktop.openBrowserWindow(request, profile);
+            } else {
+                tabletRoot.openBrowserWindow(request, profile);
             }
         }
+
     }
 
-    HiFiControls.WebSpinner {
-        anchors.centerIn: parent
-        webroot: webroot
-    }
+//    Flickable {
+//        id: flick
+//        width: parent.width
+//        height: keyboardEnabled && keyboardRaised ? parent.height - keyboard.height : parent.height
+
+//        WebEngineView {
+//            id: webroot
+//            objectName: "webEngineView"
+//            anchors.fill: parent
+
+//            profile: HFWebEngineProfile;
+
+//            property string userScriptUrl: ""
+
+//            // creates a global EventBridge object.
+//            WebEngineScript {
+//                id: createGlobalEventBridge
+//                sourceCode: eventBridgeJavaScriptToInject
+//                injectionPoint: WebEngineScript.DocumentCreation
+//                worldId: WebEngineScript.MainWorld
+//            }
+
+//            // detects when to raise and lower virtual keyboard
+//            WebEngineScript {
+//                id: raiseAndLowerKeyboard
+//                injectionPoint: WebEngineScript.Deferred
+//                sourceUrl: resourceDirectoryUrl + "/html/raiseAndLowerKeyboard.js"
+//                worldId: WebEngineScript.MainWorld
+//            }
+
+//            // User script.
+//            WebEngineScript {
+//                id: userScript
+//                sourceUrl: webroot.userScriptUrl
+//                injectionPoint: WebEngineScript.DocumentReady  // DOM ready but page load may not be finished.
+//                worldId: WebEngineScript.MainWorld
+//            }
+
+//            property string urlTag: "noDownload=false";
+
+//            userScripts: [ createGlobalEventBridge, raiseAndLowerKeyboard, userScript ]
+
+//            property string newUrl: ""
+
+//            //disable popup
+//            onContextMenuRequested: {
+//                request.accepted = true;
+//            }
+
+//            onContentsSizeChanged: {
+//                flick.contentHeight = Math.max(contentsSize.height, flick.height);
+//                flick.contentWidth = flick.width
+//            }
+
+//            Component.onCompleted: {
+//                webChannel.registerObject("eventBridge", eventBridge);
+//                webChannel.registerObject("eventBridgeWrapper", eventBridgeWrapper);
+//                // Ensure the JS from the web-engine makes it to our logging
+//                webroot.javaScriptConsoleMessage.connect(function(level, message, lineNumber, sourceID) {
+//                    console.log("Web Entity JS message: " + sourceID + " " + lineNumber + " " +  message);
+//                });
+
+//                webroot.profile.httpUserAgent = "Mozilla/5.0 Chrome (HighFidelityInterface)";
+//            }
+
+//            onFeaturePermissionRequested: {
+//                grantFeaturePermission(securityOrigin, feature, true);
+//            }
+
+//            onLoadingChanged: {
+//                keyboardRaised = false;
+//                punctuationMode = false;
+//                keyboard.resetShiftMode(false);
+
+//                // Required to support clicking on "hifi://" links
+//                if (WebEngineView.LoadStartedStatus == loadRequest.status) {
+//                    flick.contentWidth = 0
+//                    flick.contentHeight = 0
+//                    var url = loadRequest.url.toString();
+//                    url = (url.indexOf("?") >= 0) ? url + urlTag : url + "?" + urlTag;
+//                    if (urlHandler.canHandleUrl(url)) {
+//                        if (urlHandler.handleUrl(url)) {
+//                            webroot.stop();
+//                        }
+//                    }
+//                }
+//                if (WebEngineView.LoadSucceededStatus == loadRequest.status) {
+//                    webroot.runJavaScript("document.body.scrollHeight;", function (i_actualPageHeight) {
+//                        flick.contentHeight = Math.max(i_actualPageHeight, flick.height);
+//                    })
+//                    flick.contentWidth = flick.width
+//                }
+//            }
+
+//            onNewViewRequested:{
+//                // desktop is not defined for web-entities or tablet
+//                if (typeof desktop !== "undefined") {
+//                    desktop.openBrowserWindow(request, profile);
+//                } else {
+//                    tabletRoot.openBrowserWindow(request, profile);
+//                }
+//            }
+//        }
+//    }
+
+//    HiFiControls.WebSpinner {
+//        anchors.centerIn: parent
+//        webroot: webroot
+//    }
 
     HiFiControls.Keyboard {
         id: keyboard
diff --git a/interface/resources/qml/controls/TabletWebView.qml b/interface/resources/qml/controls/TabletWebView.qml
index 12e4a87438..626773907c 100644
--- a/interface/resources/qml/controls/TabletWebView.qml
+++ b/interface/resources/qml/controls/TabletWebView.qml
@@ -1,15 +1,15 @@
 import QtQuick 2.7
-import QtQuick.Controls 1.4
+//import QtQuick.Controls 1.4
 import QtWebEngine 1.5
-import QtWebChannel 1.0
+//import QtWebChannel 1.0
 import "../controls-uit" as HiFiControls
 import "../styles" as HifiStyles
 import "../styles-uit"
-import "../"
-import "."
+//import "../"
+//import "."
 
 Item {
-    id: web
+    id: root
     HifiConstants { id: hifi }
     width: parent !== null ? parent.width : undefined
     height: parent !== null ? parent.height : undefined
@@ -21,8 +21,8 @@ Item {
     property bool keyboardRaised: false
     property bool punctuationMode: false
     property bool isDesktop: false
-    property alias webView: webview
-    property alias profile: webview.profile
+    property alias webView: web.webViewCore
+    property alias profile: web.webViewCoreProfile
     property bool remove: false
     property bool closeButtonVisible: true
 
@@ -79,7 +79,7 @@ Item {
             color: hifi.colors.baseGray
             font.pixelSize: 12
             verticalAlignment: Text.AlignLeft
-            text: webview.url
+            text: root.url
             anchors {
                 top: nav.bottom
                 horizontalCenter: parent.horizontalCenter;
@@ -104,13 +104,13 @@ Item {
 
     function closeWebEngine() {
         if (remove) {
-            web.destroy();
+            root.destroy();
             return;
         }
         if (parentStackItem) {
             parentStackItem.pop();
         } else {
-            web.visible = false;
+            root.visible = false;
         }
     }
 
@@ -128,131 +128,160 @@ Item {
     }
 
     function loadUrl(url) {
-        webview.url = url
-        web.url = webview.url;
+        web.webViewCore.url = url
+        root.url = web.webViewCore.url;
     }
 
     onUrlChanged: {
         loadUrl(url);
     }
 
-    Flickable {
-        id: flick
+    FlickableWebViewCore {
+        id: web
         width: parent.width
-        height: keyboardEnabled && keyboardRaised ? parent.height - keyboard.height - web.headerHeight : parent.height - web.headerHeight
+        height: keyboardEnabled && keyboardRaised ? parent.height - keyboard.height - root.headerHeight : parent.height - root.headerHeight
         anchors.top: buttons.bottom
 
-        WebEngineView {
-            id: webview
-            objectName: "webEngineView"
-            anchors.fill: parent
-
-            profile: HFWebEngineProfile;
-
-            property string userScriptUrl: ""
-
-            // creates a global EventBridge object.
-            WebEngineScript {
-                id: createGlobalEventBridge
-                sourceCode: eventBridgeJavaScriptToInject
-                injectionPoint: WebEngineScript.DocumentCreation
-                worldId: WebEngineScript.MainWorld
+        onUrlChanged: {
+            // Record history, skipping null and duplicate items.
+            var urlString = url + "";
+            urlString = urlString.replace(/\//g, "%2F");  // Consistent representation of "/"s to avoid false differences.
+            if (urlString.length > 0 && (historyIndex === -1 || urlString !== history[historyIndex])) {
+                historyIndex++;
+                history = history.slice(0, historyIndex);
+                history.push(urlString);
             }
+        }
 
-            // detects when to raise and lower virtual keyboard
-            WebEngineScript {
-                id: raiseAndLowerKeyboard
-                injectionPoint: WebEngineScript.Deferred
-                sourceUrl: resourceDirectoryUrl + "/html/raiseAndLowerKeyboard.js"
-                worldId: WebEngineScript.MainWorld
-            }
+        onLoadingChangedCallback: {
+            keyboardRaised = false;
+            punctuationMode = false;
+            keyboard.resetShiftMode(false);
+            webViewCore.forceActiveFocus();
+        }
 
-            // User script.
-            WebEngineScript {
-                id: userScript
-                sourceUrl: webview.userScriptUrl
-                injectionPoint: WebEngineScript.DocumentReady  // DOM ready but page load may not be finished.
-                worldId: WebEngineScript.MainWorld
-            }
-
-            property string urlTag: "noDownload=false";
-            userScripts: [ createGlobalEventBridge, raiseAndLowerKeyboard, userScript ]
-
-            property string newUrl: ""
-
-            Component.onCompleted: {
-                webChannel.registerObject("eventBridge", eventBridge);
-                webChannel.registerObject("eventBridgeWrapper", eventBridgeWrapper);
-                // Ensure the JS from the web-engine makes it to our logging
-                webview.javaScriptConsoleMessage.connect(function(level, message, lineNumber, sourceID) {
-                    console.log("Web Entity JS message: " + sourceID + " " + lineNumber + " " +  message);
-                });
-            }
-
-            onFeaturePermissionRequested: {
-                grantFeaturePermission(securityOrigin, feature, true);
-            }
-
-            onUrlChanged: {
-                // Record history, skipping null and duplicate items.
-                var urlString = url + "";
-                urlString = urlString.replace(/\//g, "%2F");  // Consistent representation of "/"s to avoid false differences.
-                if (urlString.length > 0 && (historyIndex === -1 || urlString !== history[historyIndex])) {
-                    historyIndex++;
-                    history = history.slice(0, historyIndex);
-                    history.push(urlString);
-                }
-            }
-
-            onContentsSizeChanged: {
-                flick.contentHeight = Math.max(contentsSize.height, flick.height);
-                flick.contentWidth = flick.width
-            }
-            //disable popup
-            onContextMenuRequested: {
-                request.accepted = true;
-            }
-
-            onLoadingChanged: {
-                keyboardRaised = false;
-                punctuationMode = false;
-                keyboard.resetShiftMode(false);
-                // Required to support clicking on "hifi://" links
-                if (WebEngineView.LoadStartedStatus == loadRequest.status) {
-                    flick.contentWidth = 0
-                    flick.contentHeight = 0
-                    var url = loadRequest.url.toString();
-                    if (urlHandler.canHandleUrl(url)) {
-                        if (urlHandler.handleUrl(url)) {
-                            root.stop();
-                        }
-                    }
-                }
-
-                if (WebEngineView.LoadFailedStatus == loadRequest.status) {
-                    console.log(" Tablet WebEngineView failed to load url: " + loadRequest.url.toString());
-                }
-
-                if (WebEngineView.LoadSucceededStatus == loadRequest.status) {
-                    webview.runJavaScript("document.body.scrollHeight;", function (i_actualPageHeight) {
-                        flick.contentHeight = Math.max(i_actualPageHeight, flick.height);
-                    })
-                    flick.contentWidth = flick.width
-
-                    webview.forceActiveFocus();
-                }
-            }
-
-            onNewViewRequested: {
-                request.openIn(webview);
-            }
+        onNewViewRequestedCallback: {
+            request.openIn(webViewCore);
         }
     }
 
-    HiFiControls.WebSpinner {
-        webroot: webview
-        anchors.centerIn: parent
-    }
+//    Flickable {
+//        id: flick
+//        width: parent.width
+//        height: keyboardEnabled && keyboardRaised ? parent.height - keyboard.height - web.headerHeight : parent.height - web.headerHeight
+//        anchors.top: buttons.bottom
+
+//        WebEngineView {
+//            id: webview
+//            objectName: "webEngineView"
+//            anchors.fill: parent
+
+//            profile: HFWebEngineProfile;
+
+//            property string userScriptUrl: ""
+
+//            // creates a global EventBridge object.
+//            WebEngineScript {
+//                id: createGlobalEventBridge
+//                sourceCode: eventBridgeJavaScriptToInject
+//                injectionPoint: WebEngineScript.DocumentCreation
+//                worldId: WebEngineScript.MainWorld
+//            }
+
+//            // detects when to raise and lower virtual keyboard
+//            WebEngineScript {
+//                id: raiseAndLowerKeyboard
+//                injectionPoint: WebEngineScript.Deferred
+//                sourceUrl: resourceDirectoryUrl + "/html/raiseAndLowerKeyboard.js"
+//                worldId: WebEngineScript.MainWorld
+//            }
+
+//            // User script.
+//            WebEngineScript {
+//                id: userScript
+//                sourceUrl: webview.userScriptUrl
+//                injectionPoint: WebEngineScript.DocumentReady  // DOM ready but page load may not be finished.
+//                worldId: WebEngineScript.MainWorld
+//            }
+
+//            property string urlTag: "noDownload=false";
+//            userScripts: [ createGlobalEventBridge, raiseAndLowerKeyboard, userScript ]
+
+//            property string newUrl: ""
+
+//            Component.onCompleted: {
+//                webChannel.registerObject("eventBridge", eventBridge);
+//                webChannel.registerObject("eventBridgeWrapper", eventBridgeWrapper);
+//                // Ensure the JS from the web-engine makes it to our logging
+//                webview.javaScriptConsoleMessage.connect(function(level, message, lineNumber, sourceID) {
+//                    console.log("Web Entity JS message: " + sourceID + " " + lineNumber + " " +  message);
+//                });
+//            }
+
+//            onFeaturePermissionRequested: {
+//                grantFeaturePermission(securityOrigin, feature, true);
+//            }
+
+//            onUrlChanged: {
+//                // Record history, skipping null and duplicate items.
+//                var urlString = url + "";
+//                urlString = urlString.replace(/\//g, "%2F");  // Consistent representation of "/"s to avoid false differences.
+//                if (urlString.length > 0 && (historyIndex === -1 || urlString !== history[historyIndex])) {
+//                    historyIndex++;
+//                    history = history.slice(0, historyIndex);
+//                    history.push(urlString);
+//                }
+//            }
+
+//            onContentsSizeChanged: {
+//                flick.contentHeight = Math.max(contentsSize.height, flick.height);
+//                flick.contentWidth = flick.width
+//            }
+//            //disable popup
+//            onContextMenuRequested: {
+//                request.accepted = true;
+//            }
+
+//            onLoadingChanged: {
+//                keyboardRaised = false;
+//                punctuationMode = false;
+//                keyboard.resetShiftMode(false);
+//                // Required to support clicking on "hifi://" links
+//                if (WebEngineView.LoadStartedStatus == loadRequest.status) {
+//                    flick.contentWidth = 0
+//                    flick.contentHeight = 0
+//                    var url = loadRequest.url.toString();
+//                    if (urlHandler.canHandleUrl(url)) {
+//                        if (urlHandler.handleUrl(url)) {
+//                            root.stop();
+//                        }
+//                    }
+//                }
+
+//                if (WebEngineView.LoadFailedStatus == loadRequest.status) {
+//                    console.log(" Tablet WebEngineView failed to load url: " + loadRequest.url.toString());
+//                }
+
+//                if (WebEngineView.LoadSucceededStatus == loadRequest.status) {
+//                    webview.runJavaScript("document.body.scrollHeight;", function (i_actualPageHeight) {
+//                        flick.contentHeight = Math.max(i_actualPageHeight, flick.height);
+//                    })
+//                    flick.contentWidth = flick.width
+
+//                    webview.forceActiveFocus();
+//                }
+//            }
+
+//            onNewViewRequested: {
+//                request.openIn(webview);
+//            }
+//        }
+//    }
+
+//    HiFiControls.WebSpinner {
+//        webview: webview
+//        anchors.centerIn: parent
+//    }
 
     HiFiControls.Keyboard {
         id: keyboard
@@ -267,7 +296,7 @@ Item {
     }
     
     Component.onCompleted: {
-        web.isDesktop = (typeof desktop !== "undefined");
+        root.isDesktop = (typeof desktop !== "undefined");
         keyboardEnabled = HMD.active;
     }
 
diff --git a/interface/resources/qml/controls/WebView.qml b/interface/resources/qml/controls/WebView.qml
index 91f204bd78..b4ec41ec9c 100644
--- a/interface/resources/qml/controls/WebView.qml
+++ b/interface/resources/qml/controls/WebView.qml
@@ -1,17 +1,15 @@
 import QtQuick 2.7
-import QtWebEngine 1.5
-import QtWebChannel 1.0
 import "../controls-uit" as HiFiControls
 
 Item {
     width: parent !== null ? parent.width : undefined
     height: parent !== null ? parent.height : undefined
 
-    property alias url: root.url
-    property alias scriptURL: root.userScriptUrl
-    property alias canGoBack: root.canGoBack;
-    property var goBack: root.goBack;
-    property alias urlTag: root.urlTag
+    property alias url: webroot.url
+    property alias scriptURL: webroot.userScriptUrl
+    property alias canGoBack: webroot.canGoBack;
+    property var goBack: webroot.webViewCore.goBack;
+    property alias urlTag: webroot.urlTag
     property bool keyboardEnabled: true  // FIXME - Keyboard HMD only: Default to false
     property bool keyboardRaised: false
     property bool punctuationMode: false
@@ -24,116 +22,137 @@ Item {
     }
     */
 
-    property alias viewProfile: root.profile
+    property alias viewProfile: webroot.webViewCoreProfile
 
-    Flickable {
-        id: flick
+    FlickableWebViewCore {
+        id: webroot
         width: parent.width
         height: keyboardEnabled && keyboardRaised ? parent.height - keyboard.height : parent.height
 
-        WebEngineView {
-            id: root
-            objectName: "webEngineView"
-            anchors.fill: parent
+        onLoadingChangedCallback: {
+            keyboardRaised = false;
+            punctuationMode = false;
+            keyboard.resetShiftMode(false);
+        }
 
-            profile: HFWebEngineProfile;
-
-            property string userScriptUrl: ""
-
-            // creates a global EventBridge object.
-            WebEngineScript {
-                id: createGlobalEventBridge
-                sourceCode: eventBridgeJavaScriptToInject
-                injectionPoint: WebEngineScript.DocumentCreation
-                worldId: WebEngineScript.MainWorld
-            }
-
-            // detects when to raise and lower virtual keyboard
-            WebEngineScript {
-                id: raiseAndLowerKeyboard
-                injectionPoint: WebEngineScript.Deferred
-                sourceUrl: resourceDirectoryUrl + "/html/raiseAndLowerKeyboard.js"
-                worldId: WebEngineScript.MainWorld
-            }
-
-            // User script.
-            WebEngineScript {
-                id: userScript
-                sourceUrl: root.userScriptUrl
-                injectionPoint: WebEngineScript.DocumentReady  // DOM ready but page load may not be finished.
-                worldId: WebEngineScript.MainWorld
-            }
-
-            property string urlTag: "noDownload=false";
-
-            userScripts: [ createGlobalEventBridge, raiseAndLowerKeyboard, userScript ]
-
-            property string newUrl: ""
-
-            Component.onCompleted: {
-                webChannel.registerObject("eventBridge", eventBridge);
-                webChannel.registerObject("eventBridgeWrapper", eventBridgeWrapper);
-                // Ensure the JS from the web-engine makes it to our logging
-                root.javaScriptConsoleMessage.connect(function(level, message, lineNumber, sourceID) {
-                    console.log("Web Entity JS message: " + sourceID + " " + lineNumber + " " +  message);
-                });
-
-            }
-
-            onFeaturePermissionRequested: {
-                grantFeaturePermission(securityOrigin, feature, true);
-            }
-
-            onContentsSizeChanged: {
-                console.log("WebView contentsSize", contentsSize)
-                flick.contentWidth = flick.width
-                flick.contentHeight = Math.max(contentsSize.height, flick.height)
-            }
-            //disable popup
-            onContextMenuRequested: {
-                request.accepted = true;
-            }
-
-            onLoadingChanged: {
-                keyboardRaised = false;
-                punctuationMode = false;
-                keyboard.resetShiftMode(false);
-
-                // Required to support clicking on "hifi://" links
-                if (WebEngineView.LoadStartedStatus == loadRequest.status) {
-                    flick.contentWidth = 0
-                    flick.contentHeight = 0
-                    var url = loadRequest.url.toString();
-                    url = (url.indexOf("?") >= 0) ? url + urlTag : url + "?" + urlTag;
-                    if (urlHandler.canHandleUrl(url)) {
-                        if (urlHandler.handleUrl(url)) {
-                            root.stop();
-                        }
-                    }
-                }
-                if (WebEngineView.LoadSucceededStatus == loadRequest.status) {
-                    root.runJavaScript("document.body.scrollHeight;", function (i_actualPageHeight) {
-                        flick.contentHeight = Math.max(i_actualPageHeight, flick.height);
-                    })
-                    flick.contentWidth = flick.width
-                }
-            }
-
-            onNewViewRequested:{
-                // desktop is not defined for web-entities or tablet
-                if (typeof desktop !== "undefined") {
-                    desktop.openBrowserWindow(request, profile);
-                } else {
-                    tabletRoot.openBrowserWindow(request, profile);
-                }
+        onNewViewRequestedCallback: {
+            // desktop is not defined for web-entities or tablet
+            if (typeof desktop !== "undefined") {
+                desktop.openBrowserWindow(request, profile);
+            } else {
+                tabletRoot.openBrowserWindow(request, profile);
             }
         }
     }
 
-    HiFiControls.WebSpinner {
-        anchors.centerIn: parent
-        webroot: root
-    }
+//    Flickable {
+//        id: flick
+//        width: parent.width
+//        height: keyboardEnabled && keyboardRaised ? parent.height - keyboard.height : parent.height
+
+//        WebEngineView {
+//            id: root
+//            objectName: "webEngineView"
+//            anchors.fill: parent
+
+//            profile: HFWebEngineProfile;
+
+//            property string userScriptUrl: ""
+
+//            // creates a global EventBridge object.
+//            WebEngineScript {
+//                id: createGlobalEventBridge
+//                sourceCode: eventBridgeJavaScriptToInject
+//                injectionPoint: WebEngineScript.DocumentCreation
+//                worldId: WebEngineScript.MainWorld
+//            }
+
+//            // detects when to raise and lower virtual keyboard
+//            WebEngineScript {
+//                id: raiseAndLowerKeyboard
+//                injectionPoint: WebEngineScript.Deferred
+//                sourceUrl: resourceDirectoryUrl + "/html/raiseAndLowerKeyboard.js"
+//                worldId: WebEngineScript.MainWorld
+//            }
+
+//            // User script.
+//            WebEngineScript {
+//                id: userScript
+//                sourceUrl: root.userScriptUrl
+//                injectionPoint: WebEngineScript.DocumentReady  // DOM ready but page load may not be finished.
+//                worldId: WebEngineScript.MainWorld
+//            }
+
+//            property string urlTag: "noDownload=false";
+
+//            userScripts: [ createGlobalEventBridge, raiseAndLowerKeyboard, userScript ]
+
+//            property string newUrl: ""
+
+//            Component.onCompleted: {
+//                webChannel.registerObject("eventBridge", eventBridge);
+//                webChannel.registerObject("eventBridgeWrapper", eventBridgeWrapper);
+//                // Ensure the JS from the web-engine makes it to our logging
+//                root.javaScriptConsoleMessage.connect(function(level, message, lineNumber, sourceID) {
+//                    console.log("Web Entity JS message: " + sourceID + " " + lineNumber + " " +  message);
+//                });
+
+//            }
+
+//            onFeaturePermissionRequested: {
+//                grantFeaturePermission(securityOrigin, feature, true);
+//            }
+
+//            onContentsSizeChanged: {
+//                console.log("WebView contentsSize", contentsSize)
+//                flick.contentWidth = flick.width
+//                flick.contentHeight = Math.max(contentsSize.height, flick.height)
+//            }
+//            //disable popup
+//            onContextMenuRequested: {
+//                request.accepted = true;
+//            }
+
+//            onLoadingChanged: {
+//                keyboardRaised = false;
+//                punctuationMode = false;
+//                keyboard.resetShiftMode(false);
+
+//                // Required to support clicking on "hifi://" links
+//                if (WebEngineView.LoadStartedStatus == loadRequest.status) {
+//                    flick.contentWidth = 0
+//                    flick.contentHeight = 0
+//                    var url = loadRequest.url.toString();
+//                    url = (url.indexOf("?") >= 0) ? url + urlTag : url + "?" + urlTag;
+//                    if (urlHandler.canHandleUrl(url)) {
+//                        if (urlHandler.handleUrl(url)) {
+//                            root.stop();
+//                        }
+//                    }
+//                }
+//                if (WebEngineView.LoadSucceededStatus == loadRequest.status) {
+//                    root.runJavaScript("document.body.scrollHeight;", function (i_actualPageHeight) {
+//                        flick.contentHeight = Math.max(i_actualPageHeight, flick.height);
+//                    })
+//                    flick.contentWidth = flick.width
+//                }
+//            }
+
+//            onNewViewRequested:{
+//                // desktop is not defined for web-entities or tablet
+//                if (typeof desktop !== "undefined") {
+//                    desktop.openBrowserWindow(request, profile);
+//                } else {
+//                    tabletRoot.openBrowserWindow(request, profile);
+//                }
+//            }
+//        }
+//    }
+
+//    HiFiControls.WebSpinner {
+//        anchors.centerIn: parent
+//        webroot: root
+//    }
 
     HiFiControls.Keyboard {
         id: keyboard
@@ -145,5 +164,4 @@ Item {
             bottom: parent.bottom
         }
     }
-
 }

From d6079e70fbcd4a1a708cbb624a94199ad7fb1a00 Mon Sep 17 00:00:00 2001
From: vladest <vladstelmahovsky@gmail.com>
Date: Thu, 24 Aug 2017 23:44:53 +0200
Subject: [PATCH 16/37] Binding to width to make sure it will follow Tablet
 with when rotating

---
 .../qml/controls/FlickableWebViewCore.qml     | 124 ++++++++++++++++++
 1 file changed, 124 insertions(+)
 create mode 100644 interface/resources/qml/controls/FlickableWebViewCore.qml

diff --git a/interface/resources/qml/controls/FlickableWebViewCore.qml b/interface/resources/qml/controls/FlickableWebViewCore.qml
new file mode 100644
index 0000000000..7706eb1102
--- /dev/null
+++ b/interface/resources/qml/controls/FlickableWebViewCore.qml
@@ -0,0 +1,124 @@
+import QtQuick 2.7
+import QtWebEngine 1.5
+import QtWebChannel 1.0
+
+Flickable {
+    id: flick
+
+    property alias url: _webview.url
+    property alias canGoBack: _webview.canGoBack
+    property alias webViewCore: _webview
+    property alias webViewCoreProfile: _webview.profile
+
+    property string userScriptUrl: ""
+    property string urlTag: "noDownload=false";
+
+    signal newViewRequestedCallback(var request)
+    signal loadingChangedCallback(var loadRequest)
+
+    function onLoadingChanged(loadRequest) {
+        // Required to support clicking on "hifi://" links
+        if (WebEngineView.LoadStartedStatus === loadRequest.status) {
+            flick.contentWidth = 0
+            flick.contentHeight = 0
+            var url = loadRequest.url.toString();
+            if (urlHandler.canHandleUrl(url)) {
+                if (urlHandler.handleUrl(url)) {
+                    _webview.stop();
+                }
+            }
+        }
+
+        if (WebEngineView.LoadFailedStatus === loadRequest.status) {
+            console.log(" Tablet WebEngineView failed to load url: " + loadRequest.url.toString());
+        }
+
+        if (WebEngineView.LoadSucceededStatus === loadRequest.status) {
+            _webview.runJavaScript("document.body.scrollHeight;", function (i_actualPageHeight) {
+                flick.contentHeight = Math.max(i_actualPageHeight, flick.height);
+            })
+            flick.contentWidth = flick.width
+        }
+    }
+
+    WebEngineView {
+        id: _webview
+
+        height: parent.height
+
+        profile: HFWebEngineProfile;
+
+        // creates a global EventBridge object.
+        WebEngineScript {
+            id: createGlobalEventBridge
+            sourceCode: eventBridgeJavaScriptToInject
+            injectionPoint: WebEngineScript.DocumentCreation
+            worldId: WebEngineScript.MainWorld
+        }
+
+        // detects when to raise and lower virtual keyboard
+        WebEngineScript {
+            id: raiseAndLowerKeyboard
+            injectionPoint: WebEngineScript.Deferred
+            sourceUrl: resourceDirectoryUrl + "/html/raiseAndLowerKeyboard.js"
+            worldId: WebEngineScript.MainWorld
+        }
+
+        // User script.
+        WebEngineScript {
+            id: userScript
+            sourceUrl: flick.userScriptUrl
+            injectionPoint: WebEngineScript.DocumentReady  // DOM ready but page load may not be finished.
+            worldId: WebEngineScript.MainWorld
+        }
+
+        userScripts: [ createGlobalEventBridge, raiseAndLowerKeyboard, userScript ]
+
+        property string newUrl: ""
+
+        Component.onCompleted: {
+            width = Qt.binding(function() { return flick.width; });
+
+            webChannel.registerObject("eventBridge", eventBridge);
+            webChannel.registerObject("eventBridgeWrapper", eventBridgeWrapper);
+            // Ensure the JS from the web-engine makes it to our logging
+            _webview.javaScriptConsoleMessage.connect(function(level, message, lineNumber, sourceID) {
+                console.log("Web Entity JS message: " + sourceID + " " + lineNumber + " " +  message);
+            });
+            _webview.profile.httpUserAgent = "Mozilla/5.0 Chrome (HighFidelityInterface)";
+
+        }
+
+        onFeaturePermissionRequested: {
+            grantFeaturePermission(securityOrigin, feature, true);
+        }
+
+        onContentsSizeChanged: {
+            flick.contentHeight = Math.max(contentsSize.height, flick.height);
+            flick.contentWidth = flick.width
+        }
+        //disable popup
+        onContextMenuRequested: {
+            request.accepted = true;
+        }
+
+        onNewViewRequested: {
+            newViewRequestedCallback(request)
+        }
+
+        onLoadingChanged: {
+            flick.onLoadingChanged(loadRequest)
+            loadingChangedCallback(loadRequest)
+        }
+    }
+
+    AnimatedImage {
+        //anchoring doesnt works here when changing content size
+        x: flick.width/2 - width/2
+        y: flick.height/2 - height/2
+        source: "../../icons/loader-snake-64-w.gif"
+        visible: _webview.loading && /^(http.*|)$/i.test(_webview.url.toString())
+        playing: visible
+        z: 10000
+    }
+}

From 36879f83eb6df2a0337a6d45f0f0e5ef8d3334a7 Mon Sep 17 00:00:00 2001
From: vladest <vladstelmahovsky@gmail.com>
Date: Fri, 25 Aug 2017 15:44:07 +0200
Subject: [PATCH 17/37] Added scroll bar. Cleanup

---
 .../qml/controls/FlickableWebViewCore.qml     |  19 +++
 .../qml/controls/TabletWebScreen.qml          | 110 ----------------
 .../resources/qml/controls/TabletWebView.qml  | 118 ------------------
 interface/resources/qml/controls/WebView.qml  | 109 ----------------
 4 files changed, 19 insertions(+), 337 deletions(-)

diff --git a/interface/resources/qml/controls/FlickableWebViewCore.qml b/interface/resources/qml/controls/FlickableWebViewCore.qml
index 7706eb1102..91e3f2482c 100644
--- a/interface/resources/qml/controls/FlickableWebViewCore.qml
+++ b/interface/resources/qml/controls/FlickableWebViewCore.qml
@@ -2,6 +2,10 @@ import QtQuick 2.7
 import QtWebEngine 1.5
 import QtWebChannel 1.0
 
+import QtQuick.Controls 2.2
+
+import "../styles-uit" as StylesUIt
+
 Flickable {
     id: flick
 
@@ -16,6 +20,21 @@ Flickable {
     signal newViewRequestedCallback(var request)
     signal loadingChangedCallback(var loadRequest)
 
+    StylesUIt.HifiConstants {
+        id: hifi
+    }
+
+    ScrollBar.vertical: ScrollBar {
+        id: scrollBar
+
+        contentItem: Rectangle {
+            opacity: 0.75
+            implicitWidth: hifi.dimensions.scrollbarHandleWidth
+            radius: height / 2
+            color: hifi.colors.tableScrollHandleDark
+        }
+    }
+
     function onLoadingChanged(loadRequest) {
         // Required to support clicking on "hifi://" links
         if (WebEngineView.LoadStartedStatus === loadRequest.status) {
diff --git a/interface/resources/qml/controls/TabletWebScreen.qml b/interface/resources/qml/controls/TabletWebScreen.qml
index 665ce7ea27..e06ff51569 100644
--- a/interface/resources/qml/controls/TabletWebScreen.qml
+++ b/interface/resources/qml/controls/TabletWebScreen.qml
@@ -44,116 +44,6 @@ Item {
 
     }
 
-//    Flickable {
-//        id: flick
-//        width: parent.width
-//        height: keyboardEnabled && keyboardRaised ? parent.height - keyboard.height : parent.height
-
-//        WebEngineView {
-//            id: webroot
-//            objectName: "webEngineView"
-//            anchors.fill: parent
-
-//            profile: HFWebEngineProfile;
-
-//            property string userScriptUrl: ""
-
-//            // creates a global EventBridge object.
-//            WebEngineScript {
-//                id: createGlobalEventBridge
-//                sourceCode: eventBridgeJavaScriptToInject
-//                injectionPoint: WebEngineScript.DocumentCreation
-//                worldId: WebEngineScript.MainWorld
-//            }
-
-//            // detects when to raise and lower virtual keyboard
-//            WebEngineScript {
-//                id: raiseAndLowerKeyboard
-//                injectionPoint: WebEngineScript.Deferred
-//                sourceUrl: resourceDirectoryUrl + "/html/raiseAndLowerKeyboard.js"
-//                worldId: WebEngineScript.MainWorld
-//            }
-
-//            // User script.
-//            WebEngineScript {
-//                id: userScript
-//                sourceUrl: webroot.userScriptUrl
-//                injectionPoint: WebEngineScript.DocumentReady  // DOM ready but page load may not be finished.
-//                worldId: WebEngineScript.MainWorld
-//            }
-
-//            property string urlTag: "noDownload=false";
-
-//            userScripts: [ createGlobalEventBridge, raiseAndLowerKeyboard, userScript ]
-
-//            property string newUrl: ""
-
-//            //disable popup
-//            onContextMenuRequested: {
-//                request.accepted = true;
-//            }
-
-//            onContentsSizeChanged: {
-//                flick.contentHeight = Math.max(contentsSize.height, flick.height);
-//                flick.contentWidth = flick.width
-//            }
-
-//            Component.onCompleted: {
-//                webChannel.registerObject("eventBridge", eventBridge);
-//                webChannel.registerObject("eventBridgeWrapper", eventBridgeWrapper);
-//                // Ensure the JS from the web-engine makes it to our logging
-//                webroot.javaScriptConsoleMessage.connect(function(level, message, lineNumber, sourceID) {
-//                    console.log("Web Entity JS message: " + sourceID + " " + lineNumber + " " +  message);
-//                });
-
-//                webroot.profile.httpUserAgent = "Mozilla/5.0 Chrome (HighFidelityInterface)";
-//            }
-
-//            onFeaturePermissionRequested: {
-//                grantFeaturePermission(securityOrigin, feature, true);
-//            }
-
-//            onLoadingChanged: {
-//                keyboardRaised = false;
-//                punctuationMode = false;
-//                keyboard.resetShiftMode(false);
-
-//                // Required to support clicking on "hifi://" links
-//                if (WebEngineView.LoadStartedStatus == loadRequest.status) {
-//                    flick.contentWidth = 0
-//                    flick.contentHeight = 0
-//                    var url = loadRequest.url.toString();
-//                    url = (url.indexOf("?") >= 0) ? url + urlTag : url + "?" + urlTag;
-//                    if (urlHandler.canHandleUrl(url)) {
-//                        if (urlHandler.handleUrl(url)) {
-//                            webroot.stop();
-//                        }
-//                    }
-//                }
-//                if (WebEngineView.LoadSucceededStatus == loadRequest.status) {
-//                    webroot.runJavaScript("document.body.scrollHeight;", function (i_actualPageHeight) {
-//                        flick.contentHeight = Math.max(i_actualPageHeight, flick.height);
-//                    })
-//                    flick.contentWidth = flick.width
-//                }
-//            }
-
-//            onNewViewRequested:{
-//                // desktop is not defined for web-entities or tablet
-//                if (typeof desktop !== "undefined") {
-//                    desktop.openBrowserWindow(request, profile);
-//                } else {
-//                    tabletRoot.openBrowserWindow(request, profile);
-//                }
-//            }
-//        }
-//    }
-
-//    HiFiControls.WebSpinner {
-//        anchors.centerIn: parent
-//        webroot: webroot
-//    }
-
     HiFiControls.Keyboard {
         id: keyboard
         raised: parent.keyboardEnabled && parent.keyboardRaised
diff --git a/interface/resources/qml/controls/TabletWebView.qml b/interface/resources/qml/controls/TabletWebView.qml
index 626773907c..9bb5000d7e 100644
--- a/interface/resources/qml/controls/TabletWebView.qml
+++ b/interface/resources/qml/controls/TabletWebView.qml
@@ -165,124 +165,6 @@ Item {
         }
     }
 
-//    Flickable {
-//        id: flick
-//        width: parent.width
-//        height: keyboardEnabled && keyboardRaised ? parent.height - keyboard.height - web.headerHeight : parent.height - web.headerHeight
-//        anchors.top: buttons.bottom
-
-//        WebEngineView {
-//            id: webview
-//            objectName: "webEngineView"
-//            anchors.fill: parent
-
-//            profile: HFWebEngineProfile;
-
-//            property string userScriptUrl: ""
-
-//            // creates a global EventBridge object.
-//            WebEngineScript {
-//                id: createGlobalEventBridge
-//                sourceCode: eventBridgeJavaScriptToInject
-//                injectionPoint: WebEngineScript.DocumentCreation
-//                worldId: WebEngineScript.MainWorld
-//            }
-
-//            // detects when to raise and lower virtual keyboard
-//            WebEngineScript {
-//                id: raiseAndLowerKeyboard
-//                injectionPoint: WebEngineScript.Deferred
-//                sourceUrl: resourceDirectoryUrl + "/html/raiseAndLowerKeyboard.js"
-//                worldId: WebEngineScript.MainWorld
-//            }
-
-//            // User script.
-//            WebEngineScript {
-//                id: userScript
-//                sourceUrl: webview.userScriptUrl
-//                injectionPoint: WebEngineScript.DocumentReady  // DOM ready but page load may not be finished.
-//                worldId: WebEngineScript.MainWorld
-//            }
-
-//            property string urlTag: "noDownload=false";
-//            userScripts: [ createGlobalEventBridge, raiseAndLowerKeyboard, userScript ]
-
-//            property string newUrl: ""
-
-//            Component.onCompleted: {
-//                webChannel.registerObject("eventBridge", eventBridge);
-//                webChannel.registerObject("eventBridgeWrapper", eventBridgeWrapper);
-//                // Ensure the JS from the web-engine makes it to our logging
-//                webview.javaScriptConsoleMessage.connect(function(level, message, lineNumber, sourceID) {
-//                    console.log("Web Entity JS message: " + sourceID + " " + lineNumber + " " +  message);
-//                });
-//            }
-
-//            onFeaturePermissionRequested: {
-//                grantFeaturePermission(securityOrigin, feature, true);
-//            }
-
-//            onUrlChanged: {
-//                // Record history, skipping null and duplicate items.
-//                var urlString = url + "";
-//                urlString = urlString.replace(/\//g, "%2F");  // Consistent representation of "/"s to avoid false differences.
-//                if (urlString.length > 0 && (historyIndex === -1 || urlString !== history[historyIndex])) {
-//                    historyIndex++;
-//                    history = history.slice(0, historyIndex);
-//                    history.push(urlString);
-//                }
-//            }
-
-//            onContentsSizeChanged: {
-//                flick.contentHeight = Math.max(contentsSize.height, flick.height);
-//                flick.contentWidth = flick.width
-//            }
-//            //disable popup
-//            onContextMenuRequested: {
-//                request.accepted = true;
-//            }
-
-//            onLoadingChanged: {
-//                keyboardRaised = false;
-//                punctuationMode = false;
-//                keyboard.resetShiftMode(false);
-//                // Required to support clicking on "hifi://" links
-//                if (WebEngineView.LoadStartedStatus == loadRequest.status) {
-//                    flick.contentWidth = 0
-//                    flick.contentHeight = 0
-//                    var url = loadRequest.url.toString();
-//                    if (urlHandler.canHandleUrl(url)) {
-//                        if (urlHandler.handleUrl(url)) {
-//                            root.stop();
-//                        }
-//                    }
-//                }
-
-//                if (WebEngineView.LoadFailedStatus == loadRequest.status) {
-//                    console.log(" Tablet WebEngineView failed to load url: " + loadRequest.url.toString());
-//                }
-
-//                if (WebEngineView.LoadSucceededStatus == loadRequest.status) {
-//                    webview.runJavaScript("document.body.scrollHeight;", function (i_actualPageHeight) {
-//                        flick.contentHeight = Math.max(i_actualPageHeight, flick.height);
-//                    })
-//                    flick.contentWidth = flick.width
-
-//                    webview.forceActiveFocus();
-//                }
-//            }
-
-//            onNewViewRequested: {
-//                request.openIn(webview);
-//            }
-//        }
-//    }
-
-//    HiFiControls.WebSpinner {
-//        webview: webview
-//        anchors.centerIn: parent
-//    }
-
     HiFiControls.Keyboard {
         id: keyboard
         raised: parent.keyboardEnabled && parent.keyboardRaised
diff --git a/interface/resources/qml/controls/WebView.qml b/interface/resources/qml/controls/WebView.qml
index b4ec41ec9c..bf4b40e7c5 100644
--- a/interface/resources/qml/controls/WebView.qml
+++ b/interface/resources/qml/controls/WebView.qml
@@ -45,115 +45,6 @@ Item {
         }
     }
 
-//    Flickable {
-//        id: flick
-//        width: parent.width
-//        height: keyboardEnabled && keyboardRaised ? parent.height - keyboard.height : parent.height
-
-//        WebEngineView {
-//            id: root
-//            objectName: "webEngineView"
-//            anchors.fill: parent
-
-//            profile: HFWebEngineProfile;
-
-//            property string userScriptUrl: ""
-
-//            // creates a global EventBridge object.
-//            WebEngineScript {
-//                id: createGlobalEventBridge
-//                sourceCode: eventBridgeJavaScriptToInject
-//                injectionPoint: WebEngineScript.DocumentCreation
-//                worldId: WebEngineScript.MainWorld
-//            }
-
-//            // detects when to raise and lower virtual keyboard
-//            WebEngineScript {
-//                id: raiseAndLowerKeyboard
-//                injectionPoint: WebEngineScript.Deferred
-//                sourceUrl: resourceDirectoryUrl + "/html/raiseAndLowerKeyboard.js"
-//                worldId: WebEngineScript.MainWorld
-//            }
-
-//            // User script.
-//            WebEngineScript {
-//                id: userScript
-//                sourceUrl: root.userScriptUrl
-//                injectionPoint: WebEngineScript.DocumentReady  // DOM ready but page load may not be finished.
-//                worldId: WebEngineScript.MainWorld
-//            }
-
-//            property string urlTag: "noDownload=false";
-
-//            userScripts: [ createGlobalEventBridge, raiseAndLowerKeyboard, userScript ]
-
-//            property string newUrl: ""
-
-//            Component.onCompleted: {
-//                webChannel.registerObject("eventBridge", eventBridge);
-//                webChannel.registerObject("eventBridgeWrapper", eventBridgeWrapper);
-//                // Ensure the JS from the web-engine makes it to our logging
-//                root.javaScriptConsoleMessage.connect(function(level, message, lineNumber, sourceID) {
-//                    console.log("Web Entity JS message: " + sourceID + " " + lineNumber + " " +  message);
-//                });
-
-//            }
-
-//            onFeaturePermissionRequested: {
-//                grantFeaturePermission(securityOrigin, feature, true);
-//            }
-
-//            onContentsSizeChanged: {
-//                console.log("WebView contentsSize", contentsSize)
-//                flick.contentWidth = flick.width
-//                flick.contentHeight = Math.max(contentsSize.height, flick.height)
-//            }
-//            //disable popup
-//            onContextMenuRequested: {
-//                request.accepted = true;
-//            }
-
-//            onLoadingChanged: {
-//                keyboardRaised = false;
-//                punctuationMode = false;
-//                keyboard.resetShiftMode(false);
-
-//                // Required to support clicking on "hifi://" links
-//                if (WebEngineView.LoadStartedStatus == loadRequest.status) {
-//                    flick.contentWidth = 0
-//                    flick.contentHeight = 0
-//                    var url = loadRequest.url.toString();
-//                    url = (url.indexOf("?") >= 0) ? url + urlTag : url + "?" + urlTag;
-//                    if (urlHandler.canHandleUrl(url)) {
-//                        if (urlHandler.handleUrl(url)) {
-//                            root.stop();
-//                        }
-//                    }
-//                }
-//                if (WebEngineView.LoadSucceededStatus == loadRequest.status) {
-//                    root.runJavaScript("document.body.scrollHeight;", function (i_actualPageHeight) {
-//                        flick.contentHeight = Math.max(i_actualPageHeight, flick.height);
-//                    })
-//                    flick.contentWidth = flick.width
-//                }
-//            }
-
-//            onNewViewRequested:{
-//                // desktop is not defined for web-entities or tablet
-//                if (typeof desktop !== "undefined") {
-//                    desktop.openBrowserWindow(request, profile);
-//                } else {
-//                    tabletRoot.openBrowserWindow(request, profile);
-//                }
-//            }
-//        }
-//    }
-
-//    HiFiControls.WebSpinner {
-//        anchors.centerIn: parent
-//        webroot: root
-//    }
-
     HiFiControls.Keyboard {
         id: keyboard
         raised: parent.keyboardEnabled && parent.keyboardRaised

From b30562b9ce1f63bcf89dc56fa11a8fd3028cdb84 Mon Sep 17 00:00:00 2001
From: Armads <kurt_john@hotmail.com>
Date: Thu, 24 Aug 2017 14:25:07 -0400
Subject: [PATCH 18/37] Adding checks to hide avatar attachments to other head
 and facial joints

---
 interface/src/avatar/MyAvatar.cpp | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/interface/src/avatar/MyAvatar.cpp b/interface/src/avatar/MyAvatar.cpp
index 76535930bc..983d0b252a 100755
--- a/interface/src/avatar/MyAvatar.cpp
+++ b/interface/src/avatar/MyAvatar.cpp
@@ -1893,6 +1893,17 @@ void MyAvatar::preDisplaySide(RenderArgs* renderArgs) {
     const bool shouldDrawHead = shouldRenderHead(renderArgs);
     if (shouldDrawHead != _prevShouldDrawHead) {
         _skeletonModel->setEnableCauterization(!shouldDrawHead);
+
+        for (int i = 0; i < _attachmentData.size(); i++) {
+            if (_attachmentData[i].jointName.compare("Head", Qt::CaseInsensitive) == 0 ||
+                _attachmentData[i].jointName.compare("Neck", Qt::CaseInsensitive) == 0 ||
+                _attachmentData[i].jointName.compare("LeftEye", Qt::CaseInsensitive) == 0 ||
+                _attachmentData[i].jointName.compare("RightEye", Qt::CaseInsensitive) == 0 ||
+                _attachmentData[i].jointName.compare("HeadTop_End", Qt::CaseInsensitive) == 0 ||
+                _attachmentData[i].jointName.compare("Face", Qt::CaseInsensitive) == 0) {
+                _attachmentModels[i]->setVisibleInScene(shouldDrawHead, qApp->getMain3DScene());
+            }
+        }
     }
     _prevShouldDrawHead = shouldDrawHead;
 }

From 26026cb2b578e5394a6d80522749e64746168935 Mon Sep 17 00:00:00 2001
From: vladest <vladstelmahovsky@gmail.com>
Date: Fri, 25 Aug 2017 17:37:10 +0200
Subject: [PATCH 19/37] Added logout. Truncate username to 8 characters

---
 .../resources/qml/hifi/tablet/Tablet.qml      | 37 ++++++++++++++-----
 .../resources/qml/hifi/tablet/TabletRoot.qml  |  6 +++
 .../scripting/AccountScriptingInterface.cpp   |  5 +++
 .../src/scripting/AccountScriptingInterface.h |  1 +
 4 files changed, 39 insertions(+), 10 deletions(-)

diff --git a/interface/resources/qml/hifi/tablet/Tablet.qml b/interface/resources/qml/hifi/tablet/Tablet.qml
index a99df632e5..3005fee4dd 100644
--- a/interface/resources/qml/hifi/tablet/Tablet.qml
+++ b/interface/resources/qml/hifi/tablet/Tablet.qml
@@ -1,5 +1,6 @@
 import QtQuick 2.5
 import QtGraphicalEffects 1.0
+import QtQuick.Layouts 1.3
 
 import "../../styles-uit"
 import "../audio" as HifiAudio
@@ -116,20 +117,36 @@ Item {
             anchors.rightMargin: 30
             anchors.verticalCenter: parent.verticalCenter
 
-            RalewaySemiBold {
-                id: usernameText
-                text: Account.isLoggedIn() ? tabletRoot.username : qsTr("Log in")
-                anchors.verticalCenter: parent.verticalCenter
-                horizontalAlignment: Text.AlignRight
-                anchors.right: parent.right
-                font.pixelSize: 20
-                color: "#afafaf"
+            ColumnLayout {
+                anchors.fill: parent
+
+                RalewaySemiBold {
+                    text: Account.isLoggedIn() ? qsTr("Log out") : qsTr("Log in")
+                    horizontalAlignment: Text.AlignRight
+                    anchors.right: parent.right
+                    font.pixelSize: 20
+                    color: "#afafaf"
+                }
+
+                RalewaySemiBold {
+                    visible: Account.isLoggedIn()
+                    height: Account.isLoggedIn() ? parent.height/2 - parent.spacing/2 : 0
+                    text: Account.isLoggedIn() ? "[" + tabletRoot.usernameShort + "]" : ""
+                    horizontalAlignment: Text.AlignRight
+                    anchors.right: parent.right
+                    font.pixelSize: 20
+                    color: "#afafaf"
+                }
             }
+
             MouseArea {
                 anchors.fill: parent
-                enabled: !Account.isLoggedIn()
                 onClicked: {
-                    DialogsManager.showLoginDialog()
+                    if (!Account.isLoggedIn()) {
+                        DialogsManager.showLoginDialog()
+                    } else {
+                        Account.logOut()
+                    }
                 }
             }
         }
diff --git a/interface/resources/qml/hifi/tablet/TabletRoot.qml b/interface/resources/qml/hifi/tablet/TabletRoot.qml
index bbf56c7827..683b181422 100644
--- a/interface/resources/qml/hifi/tablet/TabletRoot.qml
+++ b/interface/resources/qml/hifi/tablet/TabletRoot.qml
@@ -8,6 +8,7 @@ Item {
     id: tabletRoot
     objectName: "tabletRoot"
     property string username: "Unknown user"
+    property string usernameShort: "Unknown user"
     property var rootMenu;
     property var openModal: null;
     property var openMessage: null;
@@ -157,6 +158,11 @@ Item {
 
     function setUsername(newUsername) {
         username = newUsername;
+        usernameShort = newUsername.substring(0, 8);
+
+        if (newUsername.length > 8) {
+            usernameShort = usernameShort + "..."
+        }
     }
 
     ListModel {
diff --git a/interface/src/scripting/AccountScriptingInterface.cpp b/interface/src/scripting/AccountScriptingInterface.cpp
index d8533bb769..4587d74893 100644
--- a/interface/src/scripting/AccountScriptingInterface.cpp
+++ b/interface/src/scripting/AccountScriptingInterface.cpp
@@ -31,6 +31,11 @@ bool AccountScriptingInterface::checkAndSignalForAccessToken() {
     return accountManager->checkAndSignalForAccessToken();
 }
 
+void AccountScriptingInterface::logOut() {
+    auto accountManager = DependencyManager::get<AccountManager>();
+    return accountManager->logout();
+}
+
 QString AccountScriptingInterface::getUsername() {
     auto accountManager = DependencyManager::get<AccountManager>();
     if (accountManager->isLoggedIn()) {
diff --git a/interface/src/scripting/AccountScriptingInterface.h b/interface/src/scripting/AccountScriptingInterface.h
index 748f110356..098d2c8ad9 100644
--- a/interface/src/scripting/AccountScriptingInterface.h
+++ b/interface/src/scripting/AccountScriptingInterface.h
@@ -50,6 +50,7 @@ public slots:
      */
     bool isLoggedIn();
     bool checkAndSignalForAccessToken();
+    void logOut();
 };
 
 #endif // hifi_AccountScriptingInterface_h

From 59fe5ffdc12acb2d2f7fee14c16344ca5f0f9ce1 Mon Sep 17 00:00:00 2001
From: Liv <liv@highfidelity.io>
Date: Fri, 25 Aug 2017 17:48:35 -0700
Subject: [PATCH 20/37] Initial attempt at changing first run behavior

---
 interface/src/Application.cpp | 50 +++--------------------------------
 1 file changed, 3 insertions(+), 47 deletions(-)

diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp
index affbf83081..20d7509ea5 100644
--- a/interface/src/Application.cpp
+++ b/interface/src/Application.cpp
@@ -2755,26 +2755,18 @@ void Application::handleSandboxStatus(QNetworkReply* reply) {
         handControllerType = Oculus;
     }
 
-    // Check tutorial content versioning
-    bool hasTutorialContent = contentVersion >= MIN_CONTENT_VERSION.at(handControllerType);
-
     // Check HMD use (may be technically available without being in use)
     bool hasHMD = PluginUtils::isHMDAvailable();
     bool isUsingHMD = _displayPlugin->isHmd();
     bool isUsingHMDAndHandControllers = hasHMD && hasHandControllers && isUsingHMD;
 
-    Setting::Handle<bool> tutorialComplete{ "tutorialComplete", false };
     Setting::Handle<bool> firstRun{ Settings::firstRun, true };
 
     const QString HIFI_SKIP_TUTORIAL_COMMAND_LINE_KEY = "--skipTutorial";
     // Skips tutorial/help behavior, and does NOT clear firstRun setting.
     bool skipTutorial = arguments().contains(HIFI_SKIP_TUTORIAL_COMMAND_LINE_KEY);
-    bool isTutorialComplete = tutorialComplete.get();
-    bool shouldGoToTutorial = isUsingHMDAndHandControllers && hasTutorialContent && !isTutorialComplete && !skipTutorial;
 
     qCDebug(interfaceapp) << "HMD:" << hasHMD << ", Hand Controllers: " << hasHandControllers << ", Using HMD: " << isUsingHMDAndHandControllers;
-    qCDebug(interfaceapp) << "Tutorial version:" << contentVersion << ", sufficient:" << hasTutorialContent <<
-        ", complete:" << isTutorialComplete << ", should go:" << shouldGoToTutorial;
 
     // when --url in command line, teleport to location
     const QString HIFI_URL_COMMAND_LINE_KEY = "--url";
@@ -2784,39 +2776,15 @@ void Application::handleSandboxStatus(QNetworkReply* reply) {
         addressLookupString = arguments().value(urlIndex + 1);
     }
 
-    const QString TUTORIAL_PATH = "/tutorial_begin";
-
-    static const QString SENT_TO_TUTORIAL = "tutorial";
     static const QString SENT_TO_PREVIOUS_LOCATION = "previous_location";
     static const QString SENT_TO_ENTRY = "entry";
     static const QString SENT_TO_SANDBOX = "sandbox";
 
     QString sentTo;
 
-    if (shouldGoToTutorial) {
-        if (sandboxIsRunning) {
-            qCDebug(interfaceapp) << "Home sandbox appears to be running, going to Home.";
-            DependencyManager::get<AddressManager>()->goToLocalSandbox(TUTORIAL_PATH);
-            sentTo = SENT_TO_TUTORIAL;
-        } else {
-            qCDebug(interfaceapp) << "Home sandbox does not appear to be running, going to Entry.";
-            if (firstRun.get()) {
-                showHelp();
-            }
-            if (addressLookupString.isEmpty()) {
-                DependencyManager::get<AddressManager>()->goToEntry();
-                sentTo = SENT_TO_ENTRY;
-            } else {
-                DependencyManager::get<AddressManager>()->loadSettings(addressLookupString);
-                sentTo = SENT_TO_PREVIOUS_LOCATION;
-            }
-        }
-    } else {
-
         // If this is a first run we short-circuit the address passed in
-        if (firstRun.get() && !skipTutorial) {
+        if (firstRun.get()) {
             showHelp();
-            if (isUsingHMDAndHandControllers) {
                 if (sandboxIsRunning) {
                     qCDebug(interfaceapp) << "Home sandbox appears to be running, going to Home.";
                     DependencyManager::get<AddressManager>()->goToLocalSandbox();
@@ -2826,16 +2794,12 @@ void Application::handleSandboxStatus(QNetworkReply* reply) {
                     DependencyManager::get<AddressManager>()->goToEntry();
                     sentTo = SENT_TO_ENTRY;
                 }
-            } else {
-                DependencyManager::get<AddressManager>()->goToEntry();
-                sentTo = SENT_TO_ENTRY;
-            }
+
         } else {
             qCDebug(interfaceapp) << "Not first run... going to" << qPrintable(addressLookupString.isEmpty() ? QString("previous location") : addressLookupString);
             DependencyManager::get<AddressManager>()->loadSettings(addressLookupString);
             sentTo = SENT_TO_PREVIOUS_LOCATION;
         }
-    }
 
     UserActivityLogger::getInstance().logAction("startup_sent_to", {
         { "sent_to", sentTo },
@@ -2844,18 +2808,10 @@ void Application::handleSandboxStatus(QNetworkReply* reply) {
         { "has_hand_controllers", hasHandControllers },
         { "is_using_hmd", isUsingHMD },
         { "is_using_hmd_and_hand_controllers", isUsingHMDAndHandControllers },
-        { "content_version", contentVersion },
-        { "is_tutorial_complete", isTutorialComplete },
-        { "has_tutorial_content", hasTutorialContent },
-        { "should_go_to_tutorial", shouldGoToTutorial }
+        { "content_version", contentVersion }
     });
 
     _connectionMonitor.init();
-
-    // After all of the constructor is completed, then set firstRun to false.
-    if (!skipTutorial) {
-        firstRun.set(false);
-    }
 }
 
 bool Application::importJSONFromURL(const QString& urlString) {

From e38075f7bad8e708a06b4d778411ac6d5c639240 Mon Sep 17 00:00:00 2001
From: vladest <vladstelmahovsky@gmail.com>
Date: Mon, 28 Aug 2017 16:27:33 +0200
Subject: [PATCH 21/37] Disable web engine scrollbars

---
 interface/resources/qml/controls/FlickableWebViewCore.qml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/interface/resources/qml/controls/FlickableWebViewCore.qml b/interface/resources/qml/controls/FlickableWebViewCore.qml
index 91e3f2482c..24d9cb9184 100644
--- a/interface/resources/qml/controls/FlickableWebViewCore.qml
+++ b/interface/resources/qml/controls/FlickableWebViewCore.qml
@@ -53,6 +53,9 @@ Flickable {
         }
 
         if (WebEngineView.LoadSucceededStatus === loadRequest.status) {
+            //disable Chromium's scroll bars
+            _webview.runJavaScript("document.body.style.overflow = 'hidden';");
+            //calculate page height
             _webview.runJavaScript("document.body.scrollHeight;", function (i_actualPageHeight) {
                 flick.contentHeight = Math.max(i_actualPageHeight, flick.height);
             })

From 59deccaeb5db0479b44c5f83e1687dc2b809bb7e Mon Sep 17 00:00:00 2001
From: Liv <liv@highfidelity.io>
Date: Tue, 29 Aug 2017 14:55:59 -0700
Subject: [PATCH 22/37] Remove unused skipTutorial code

---
 interface/src/Application.cpp | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp
index 20d7509ea5..db28516cb0 100644
--- a/interface/src/Application.cpp
+++ b/interface/src/Application.cpp
@@ -2762,10 +2762,6 @@ void Application::handleSandboxStatus(QNetworkReply* reply) {
 
     Setting::Handle<bool> firstRun{ Settings::firstRun, true };
 
-    const QString HIFI_SKIP_TUTORIAL_COMMAND_LINE_KEY = "--skipTutorial";
-    // Skips tutorial/help behavior, and does NOT clear firstRun setting.
-    bool skipTutorial = arguments().contains(HIFI_SKIP_TUTORIAL_COMMAND_LINE_KEY);
-
     qCDebug(interfaceapp) << "HMD:" << hasHMD << ", Hand Controllers: " << hasHandControllers << ", Using HMD: " << isUsingHMDAndHandControllers;
 
     // when --url in command line, teleport to location

From 2f2b406047cf34aef208bf2a0e07b6a4e840eaa6 Mon Sep 17 00:00:00 2001
From: Liv <liv@highfidelity.io>
Date: Wed, 30 Aug 2017 09:23:33 -0700
Subject: [PATCH 23/37] Remove unneeded handcontrollertype code from handle
 first run checks

---
 interface/src/Application.cpp | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp
index db28516cb0..233aa4fe81 100644
--- a/interface/src/Application.cpp
+++ b/interface/src/Application.cpp
@@ -2746,13 +2746,8 @@ void Application::handleSandboxStatus(QNetworkReply* reply) {
 
     // Get controller availability
     bool hasHandControllers = false;
-    HandControllerType handControllerType = Vive;
-    if (PluginUtils::isViveControllerAvailable()) {
+    if (PluginUtils::isViveControllerAvailable() || PluginUtils::isOculusTouchControllerAvailable()) {
         hasHandControllers = true;
-        handControllerType = Vive;
-    } else if (PluginUtils::isOculusTouchControllerAvailable()) {
-        hasHandControllers = true;
-        handControllerType = Oculus;
     }
 
     // Check HMD use (may be technically available without being in use)

From 88b045e3a97b71e8703807498b246898fafc88cb Mon Sep 17 00:00:00 2001
From: vladest <vladstelmahovsky@gmail.com>
Date: Wed, 30 Aug 2017 20:17:11 +0200
Subject: [PATCH 24/37] Switched off overboundings. More accurate calculate
 height

---
 .../qml/controls/FlickableWebViewCore.qml     | 34 ++++++++++++++++---
 1 file changed, 29 insertions(+), 5 deletions(-)

diff --git a/interface/resources/qml/controls/FlickableWebViewCore.qml b/interface/resources/qml/controls/FlickableWebViewCore.qml
index 24d9cb9184..0460b5b16a 100644
--- a/interface/resources/qml/controls/FlickableWebViewCore.qml
+++ b/interface/resources/qml/controls/FlickableWebViewCore.qml
@@ -20,12 +20,23 @@ Flickable {
     signal newViewRequestedCallback(var request)
     signal loadingChangedCallback(var loadRequest)
 
+    boundsBehavior: Flickable.StopAtBounds
+
     StylesUIt.HifiConstants {
         id: hifi
     }
 
+    onHeightChanged: {
+        if (height > 0) {
+            //reload page since window dimentions changed,
+            //so web engine should recalculate page render dimentions
+            reloadTimer.start()
+        }
+    }
+
     ScrollBar.vertical: ScrollBar {
         id: scrollBar
+        visible: flick.contentHeight > flick.height
 
         contentItem: Rectangle {
             opacity: 0.75
@@ -36,10 +47,11 @@ Flickable {
     }
 
     function onLoadingChanged(loadRequest) {
-        // Required to support clicking on "hifi://" links
         if (WebEngineView.LoadStartedStatus === loadRequest.status) {
-            flick.contentWidth = 0
-            flick.contentHeight = 0
+            flick.contentWidth = flick.width
+            flick.contentHeight = flick.height
+
+            // Required to support clicking on "hifi://" links
             var url = loadRequest.url.toString();
             if (urlHandler.canHandleUrl(url)) {
                 if (urlHandler.handleUrl(url)) {
@@ -57,12 +69,25 @@ Flickable {
             _webview.runJavaScript("document.body.style.overflow = 'hidden';");
             //calculate page height
             _webview.runJavaScript("document.body.scrollHeight;", function (i_actualPageHeight) {
-                flick.contentHeight = Math.max(i_actualPageHeight, flick.height);
+                if (i_actualPageHeight !== undefined) {
+                    flick.contentHeight = i_actualPageHeight
+                } else {
+                    flick.contentHeight = flick.height;
+                }
             })
             flick.contentWidth = flick.width
         }
     }
 
+    Timer {
+        id: reloadTimer
+        interval: 100
+        repeat: false
+        onTriggered: {
+            _webview.reload()
+        }
+    }
+
     WebEngineView {
         id: _webview
 
@@ -100,7 +125,6 @@ Flickable {
 
         Component.onCompleted: {
             width = Qt.binding(function() { return flick.width; });
-
             webChannel.registerObject("eventBridge", eventBridge);
             webChannel.registerObject("eventBridgeWrapper", eventBridgeWrapper);
             // Ensure the JS from the web-engine makes it to our logging

From b547b2573e16b26b6d90bf6cab54be0b78f73238 Mon Sep 17 00:00:00 2001
From: vladest <vladstelmahovsky@gmail.com>
Date: Wed, 30 Aug 2017 23:15:39 +0200
Subject: [PATCH 25/37] Added logged in property

---
 interface/resources/qml/hifi/tablet/Tablet.qml    | 10 +++++-----
 .../src/scripting/AccountScriptingInterface.cpp   | 12 ++++++++++++
 .../src/scripting/AccountScriptingInterface.h     | 15 +++++++++++++++
 3 files changed, 32 insertions(+), 5 deletions(-)

diff --git a/interface/resources/qml/hifi/tablet/Tablet.qml b/interface/resources/qml/hifi/tablet/Tablet.qml
index 3005fee4dd..66e3dfdbbb 100644
--- a/interface/resources/qml/hifi/tablet/Tablet.qml
+++ b/interface/resources/qml/hifi/tablet/Tablet.qml
@@ -121,7 +121,7 @@ Item {
                 anchors.fill: parent
 
                 RalewaySemiBold {
-                    text: Account.isLoggedIn() ? qsTr("Log out") : qsTr("Log in")
+                    text: Account.loggedIn ? qsTr("Log out") : qsTr("Log in")
                     horizontalAlignment: Text.AlignRight
                     anchors.right: parent.right
                     font.pixelSize: 20
@@ -129,9 +129,9 @@ Item {
                 }
 
                 RalewaySemiBold {
-                    visible: Account.isLoggedIn()
-                    height: Account.isLoggedIn() ? parent.height/2 - parent.spacing/2 : 0
-                    text: Account.isLoggedIn() ? "[" + tabletRoot.usernameShort + "]" : ""
+                    visible: Account.loggedIn
+                    height: Account.loggedIn ? parent.height/2 - parent.spacing/2 : 0
+                    text: Account.loggedIn ? "[" + tabletRoot.usernameShort + "]" : ""
                     horizontalAlignment: Text.AlignRight
                     anchors.right: parent.right
                     font.pixelSize: 20
@@ -142,7 +142,7 @@ Item {
             MouseArea {
                 anchors.fill: parent
                 onClicked: {
-                    if (!Account.isLoggedIn()) {
+                    if (!Account.loggedIn) {
                         DialogsManager.showLoginDialog()
                     } else {
                         Account.logOut()
diff --git a/interface/src/scripting/AccountScriptingInterface.cpp b/interface/src/scripting/AccountScriptingInterface.cpp
index 4587d74893..068cccdc50 100644
--- a/interface/src/scripting/AccountScriptingInterface.cpp
+++ b/interface/src/scripting/AccountScriptingInterface.cpp
@@ -18,6 +18,8 @@ AccountScriptingInterface* AccountScriptingInterface::getInstance() {
     auto accountManager = DependencyManager::get<AccountManager>();
     QObject::connect(accountManager.data(), &AccountManager::profileChanged,
                      &sharedInstance, &AccountScriptingInterface::usernameChanged);
+    QObject::connect(accountManager.data(), &AccountManager::usernameChanged,
+                     &sharedInstance, &AccountScriptingInterface::onUsernameChanged);
     return &sharedInstance;
 }
 
@@ -36,6 +38,16 @@ void AccountScriptingInterface::logOut() {
     return accountManager->logout();
 }
 
+AccountScriptingInterface::AccountScriptingInterface(QObject *parent): QObject(parent) {
+    m_loggedIn = isLoggedIn();
+    emit loggedInChanged(m_loggedIn);
+}
+
+void AccountScriptingInterface::onUsernameChanged(QString username) {
+    m_loggedIn = (username != QString());
+    emit loggedInChanged(m_loggedIn);
+}
+
 QString AccountScriptingInterface::getUsername() {
     auto accountManager = DependencyManager::get<AccountManager>();
     if (accountManager->isLoggedIn()) {
diff --git a/interface/src/scripting/AccountScriptingInterface.h b/interface/src/scripting/AccountScriptingInterface.h
index 098d2c8ad9..4f87e02dce 100644
--- a/interface/src/scripting/AccountScriptingInterface.h
+++ b/interface/src/scripting/AccountScriptingInterface.h
@@ -18,6 +18,7 @@ class AccountScriptingInterface : public QObject {
     Q_OBJECT
 
     Q_PROPERTY(QString username READ getUsername NOTIFY usernameChanged)
+    Q_PROPERTY(bool loggedIn READ loggedIn NOTIFY loggedInChanged)
 
     /**jsdoc
      * @namespace Account
@@ -32,6 +33,7 @@ signals:
      * @return {Signal}
      */
     void usernameChanged();
+    void loggedInChanged(bool loggedIn);
 
 public slots:
     static AccountScriptingInterface* getInstance();
@@ -51,6 +53,19 @@ public slots:
     bool isLoggedIn();
     bool checkAndSignalForAccessToken();
     void logOut();
+
+public:
+    AccountScriptingInterface(QObject* parent = nullptr);
+    bool loggedIn() const {
+        return m_loggedIn;
+    }
+
+private slots:
+    void onUsernameChanged(QString username);
+
+private:
+    bool m_loggedIn { false };
+
 };
 
 #endif // hifi_AccountScriptingInterface_h

From ca86ce59c27e5753de58907f430f06eb9bc2ce48 Mon Sep 17 00:00:00 2001
From: Seth Alves <seth.alves@gmail.com>
Date: Wed, 30 Aug 2017 17:44:42 -0700
Subject: [PATCH 26/37] fix a bug that cuased dynamic children to wink in and
 out and then vanish

---
 libraries/physics/src/EntityMotionState.cpp | 26 ++++++++++++---------
 libraries/physics/src/EntityMotionState.h   |  1 +
 libraries/shared/src/SpatiallyNestable.cpp  |  2 +-
 libraries/shared/src/SpatiallyNestable.h    |  2 +-
 4 files changed, 18 insertions(+), 13 deletions(-)

diff --git a/libraries/physics/src/EntityMotionState.cpp b/libraries/physics/src/EntityMotionState.cpp
index f02dcee8f6..d370398ff2 100644
--- a/libraries/physics/src/EntityMotionState.cpp
+++ b/libraries/physics/src/EntityMotionState.cpp
@@ -92,6 +92,7 @@ void EntityMotionState::updateServerPhysicsVariables() {
 
     Transform localTransform;
     _entity->getLocalTransformAndVelocities(localTransform, _serverVelocity, _serverAngularVelocity);
+    _serverVariablesSet = true;
     _serverPosition = localTransform.getTranslation();
     _serverRotation = localTransform.getRotation();
     _serverAcceleration = _entity->getAcceleration();
@@ -100,17 +101,19 @@ void EntityMotionState::updateServerPhysicsVariables() {
 
 void EntityMotionState::handleDeactivation() {
     // copy _server data to entity
-    bool success;
-    _entity->setPosition(_serverPosition, success, false);
-    _entity->setOrientation(_serverRotation, success, false);
-    _entity->setVelocity(ENTITY_ITEM_ZERO_VEC3);
-    _entity->setAngularVelocity(ENTITY_ITEM_ZERO_VEC3);
-    // and also to RigidBody
-    btTransform worldTrans;
-    worldTrans.setOrigin(glmToBullet(_serverPosition));
-    worldTrans.setRotation(glmToBullet(_serverRotation));
-    _body->setWorldTransform(worldTrans);
-    // no need to update velocities... should already be zero
+    if (_serverVariablesSet) {
+        bool success;
+        Transform localTransform = _entity->getLocalTransform();
+        localTransform.setTranslation(_serverPosition);
+        localTransform.setRotation(_serverRotation);
+        _entity->setLocalTransformAndVelocities(localTransform, ENTITY_ITEM_ZERO_VEC3, ENTITY_ITEM_ZERO_VEC3);
+        // and also to RigidBody
+        btTransform worldTrans;
+        worldTrans.setOrigin(glmToBullet(_entity->getPosition()));
+        worldTrans.setRotation(glmToBullet(_entity->getRotation()));
+        _body->setWorldTransform(worldTrans);
+        // no need to update velocities... should already be zero
+    }
 }
 
 // virtual
@@ -339,6 +342,7 @@ bool EntityMotionState::remoteSimulationOutOfSync(uint32_t simulationStep) {
     // if we've never checked before, our _lastStep will be 0, and we need to initialize our state
     if (_lastStep == 0) {
         btTransform xform = _body->getWorldTransform();
+        _serverVariablesSet = true;
         _serverPosition = worldToLocal.transform(bulletToGLM(xform.getOrigin()));
         _serverRotation = worldToLocal.getRotation() * bulletToGLM(xform.getRotation());
         _serverVelocity = worldVelocityToLocal.transform(getBodyLinearVelocityGTSigma());
diff --git a/libraries/physics/src/EntityMotionState.h b/libraries/physics/src/EntityMotionState.h
index 541ad7c93c..968f53700c 100644
--- a/libraries/physics/src/EntityMotionState.h
+++ b/libraries/physics/src/EntityMotionState.h
@@ -107,6 +107,7 @@ protected:
     // Meanwhile we also keep a raw EntityItem* for internal stuff where the pointer is guaranteed valid.
     EntityItem* _entity;
 
+    bool _serverVariablesSet { false };
     glm::vec3 _serverPosition;    // in simulation-frame (not world-frame)
     glm::quat _serverRotation;
     glm::vec3 _serverVelocity;
diff --git a/libraries/shared/src/SpatiallyNestable.cpp b/libraries/shared/src/SpatiallyNestable.cpp
index 0545fd6ffd..5b0095078a 100644
--- a/libraries/shared/src/SpatiallyNestable.cpp
+++ b/libraries/shared/src/SpatiallyNestable.cpp
@@ -731,7 +731,7 @@ void SpatiallyNestable::setScale(float value) {
     }
 }
 
-const Transform SpatiallyNestable::getLocalTransform() const {
+Transform SpatiallyNestable::getLocalTransform() const {
     Transform result;
     _transformLock.withReadLock([&] {
         result =_transform;
diff --git a/libraries/shared/src/SpatiallyNestable.h b/libraries/shared/src/SpatiallyNestable.h
index cf63f96a31..a1b31d555f 100644
--- a/libraries/shared/src/SpatiallyNestable.h
+++ b/libraries/shared/src/SpatiallyNestable.h
@@ -121,7 +121,7 @@ public:
     virtual glm::vec3 getScale(int jointIndex) const;
 
     // object's parent's frame
-    virtual const Transform getLocalTransform() const;
+    virtual Transform getLocalTransform() const;
     virtual void setLocalTransform(const Transform& transform);
 
     virtual glm::vec3 getLocalPosition() const;

From 3f0a95d8db2ceb08185a987c797a4862f2e08205 Mon Sep 17 00:00:00 2001
From: Seth Alves <seth.alves@gmail.com>
Date: Wed, 30 Aug 2017 17:53:20 -0700
Subject: [PATCH 27/37] remove unneeded line

---
 libraries/physics/src/EntityMotionState.cpp | 1 -
 1 file changed, 1 deletion(-)

diff --git a/libraries/physics/src/EntityMotionState.cpp b/libraries/physics/src/EntityMotionState.cpp
index d370398ff2..33de98b158 100644
--- a/libraries/physics/src/EntityMotionState.cpp
+++ b/libraries/physics/src/EntityMotionState.cpp
@@ -102,7 +102,6 @@ void EntityMotionState::updateServerPhysicsVariables() {
 void EntityMotionState::handleDeactivation() {
     // copy _server data to entity
     if (_serverVariablesSet) {
-        bool success;
         Transform localTransform = _entity->getLocalTransform();
         localTransform.setTranslation(_serverPosition);
         localTransform.setRotation(_serverRotation);

From 41b51804dc3cad47de9bfe8d1e406272ca96a964 Mon Sep 17 00:00:00 2001
From: Seth Alves <seth.alves@gmail.com>
Date: Wed, 30 Aug 2017 17:53:55 -0700
Subject: [PATCH 28/37] fix comment

---
 libraries/physics/src/EntityMotionState.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libraries/physics/src/EntityMotionState.cpp b/libraries/physics/src/EntityMotionState.cpp
index 33de98b158..7c84017758 100644
--- a/libraries/physics/src/EntityMotionState.cpp
+++ b/libraries/physics/src/EntityMotionState.cpp
@@ -100,8 +100,8 @@ void EntityMotionState::updateServerPhysicsVariables() {
 }
 
 void EntityMotionState::handleDeactivation() {
-    // copy _server data to entity
     if (_serverVariablesSet) {
+        // copy _server data to entity
         Transform localTransform = _entity->getLocalTransform();
         localTransform.setTranslation(_serverPosition);
         localTransform.setRotation(_serverRotation);

From a80d9a22df59ad1692713f3214f3c0f90811967f Mon Sep 17 00:00:00 2001
From: vladest <vladstelmahovsky@gmail.com>
Date: Thu, 31 Aug 2017 12:20:20 +0200
Subject: [PATCH 29/37] Added option to disable flickable for web view

---
 interface/resources/qml/controls/WebView.qml        | 1 +
 interface/resources/qml/hifi/tablet/EditTabView.qml | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/interface/resources/qml/controls/WebView.qml b/interface/resources/qml/controls/WebView.qml
index bf4b40e7c5..c38c5df9cf 100644
--- a/interface/resources/qml/controls/WebView.qml
+++ b/interface/resources/qml/controls/WebView.qml
@@ -13,6 +13,7 @@ Item {
     property bool keyboardEnabled: true  // FIXME - Keyboard HMD only: Default to false
     property bool keyboardRaised: false
     property bool punctuationMode: false
+    property alias flickable: webroot.interactive
 
     // FIXME - Keyboard HMD only: Make Interface either set keyboardRaised property directly in OffscreenQmlSurface
     // or provide HMDinfo object to QML in RenderableWebEntityItem and do the following.
diff --git a/interface/resources/qml/hifi/tablet/EditTabView.qml b/interface/resources/qml/hifi/tablet/EditTabView.qml
index e94325f399..5379e88f8d 100644
--- a/interface/resources/qml/hifi/tablet/EditTabView.qml
+++ b/interface/resources/qml/hifi/tablet/EditTabView.qml
@@ -181,6 +181,7 @@ TabView {
         WebView {
             id: entityListToolWebView
             url: Paths.defaultScripts + "/system/html/entityList.html"
+            flickable: false
             anchors.fill: parent
             enabled: true
         }
@@ -209,6 +210,7 @@ TabView {
         WebView {
             id: gridControlsWebView
             url: Paths.defaultScripts + "/system/html/gridControls.html"
+            flickable: false
             anchors.fill: parent
             enabled: true
         }

From 6faab9fb1c8360dec61d76d24dd43efe466a5c07 Mon Sep 17 00:00:00 2001
From: vladest <vladstelmahovsky@gmail.com>
Date: Thu, 31 Aug 2017 19:21:38 +0200
Subject: [PATCH 30/37] Switch flickable on by default for list and grid tabs

---
 interface/resources/qml/hifi/tablet/EditTabView.qml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/interface/resources/qml/hifi/tablet/EditTabView.qml b/interface/resources/qml/hifi/tablet/EditTabView.qml
index 5379e88f8d..e94325f399 100644
--- a/interface/resources/qml/hifi/tablet/EditTabView.qml
+++ b/interface/resources/qml/hifi/tablet/EditTabView.qml
@@ -181,7 +181,6 @@ TabView {
         WebView {
             id: entityListToolWebView
             url: Paths.defaultScripts + "/system/html/entityList.html"
-            flickable: false
             anchors.fill: parent
             enabled: true
         }
@@ -210,7 +209,6 @@ TabView {
         WebView {
             id: gridControlsWebView
             url: Paths.defaultScripts + "/system/html/gridControls.html"
-            flickable: false
             anchors.fill: parent
             enabled: true
         }

From 8d21b286b45f294beaab3300683f753b4383adf6 Mon Sep 17 00:00:00 2001
From: Liv <liv@highfidelity.io>
Date: Thu, 31 Aug 2017 19:34:01 -0700
Subject: [PATCH 31/37] string fix

---
 interface/src/Application.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp
index 88003bb10f..c67ad991d0 100644
--- a/interface/src/Application.cpp
+++ b/interface/src/Application.cpp
@@ -6360,7 +6360,7 @@ bool Application::askToReplaceDomainContent(const QString& url) {
         }
     } else {
             methodDetails = "UserDoesNotHavePermissionToReplaceContent";
-            OffscreenUi::warning("Unable to replace content", "You do not have permissions to replace domain content",
+            OffscreenUi::warning("You do not have permissions to replace domain content", "Enable 'Replace Content' in the domain server settings to continue.",
                                  QMessageBox::Ok, QMessageBox::Ok);
     }
     QJsonObject messageProperties = {

From 7eab80e49467e7ced186e75611c5cd7e4ca7004d Mon Sep 17 00:00:00 2001
From: Liv <liv@highfidelity.io>
Date: Fri, 1 Sep 2017 13:17:37 -0700
Subject: [PATCH 32/37] change message when permissions to replace domain
 content are not present

---
 interface/src/Application.cpp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp
index c67ad991d0..ceb4a75133 100644
--- a/interface/src/Application.cpp
+++ b/interface/src/Application.cpp
@@ -6320,11 +6320,11 @@ bool Application::askToWearAvatarAttachmentUrl(const QString& url) {
 
 bool Application::askToReplaceDomainContent(const QString& url) {
     QString methodDetails;
+    const int MAX_CHARACTERS_PER_LINE = 90;
     if (DependencyManager::get<NodeList>()->getThisNodeCanReplaceContent()) {
         QUrl originURL { url };
         if (originURL.host().endsWith(MARKETPLACE_CDN_HOSTNAME)) {
             // Create a confirmation dialog when this call is made
-            const int MAX_CHARACTERS_PER_LINE = 90;
             static const QString infoText = simpleWordWrap("Your domain's content will be replaced with a new content set. "
                 "If you want to save what you have now, create a backup before proceeding. For more information about backing up "
                 "and restoring content, visit the documentation page at: ", MAX_CHARACTERS_PER_LINE) +
@@ -6360,7 +6360,9 @@ bool Application::askToReplaceDomainContent(const QString& url) {
         }
     } else {
             methodDetails = "UserDoesNotHavePermissionToReplaceContent";
-            OffscreenUi::warning("You do not have permissions to replace domain content", "Enable 'Replace Content' in the domain server settings to continue.",
+            static const QString warningMessage = simpleWordWrap("The domain owner must enable 'Replace Content' "
+                "permissions for you in this domain's server settings before you can continue.", MAX_CHARACTERS_PER_LINE);
+            OffscreenUi::warning("You do not have permissions to replace domain content", warningMessage,
                                  QMessageBox::Ok, QMessageBox::Ok);
     }
     QJsonObject messageProperties = {

From c62f9007e9571ac0d164c5a8d5427542aed616cd Mon Sep 17 00:00:00 2001
From: beholder <elderorb@gmail.com>
Date: Sun, 3 Sep 2017 15:20:59 +0300
Subject: [PATCH 33/37] 7196 Mouse pointer no longer visible in HMD mode

The issue was caused by creation of additional instances of 'Cursor::Manager' in plugins, which happened because
Cursor::Manager's code is inside static library so every module was getting its own copy of it. As the result cursor-related settings from Application never reached plugins.

The fix is based on converting 'Cursor::Manager' into 'Dependency' to avoid additional instances creation in plugins
---
 interface/src/Application.cpp      |  1 +
 libraries/ui/src/CursorManager.cpp | 14 +++-----------
 libraries/ui/src/CursorManager.h   | 14 ++++++++++++--
 3 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp
index 88003bb10f..7e1348e172 100644
--- a/interface/src/Application.cpp
+++ b/interface/src/Application.cpp
@@ -604,6 +604,7 @@ bool setupEssentials(int& argc, char** argv, bool runningMarkerExisted) {
     DependencyManager::registerInheritance<SpatialParentFinder, InterfaceParentFinder>();
 
     // Set dependencies
+    DependencyManager::set<Cursor::Manager>();
     DependencyManager::set<AccountManager>(std::bind(&Application::getUserAgent, qApp));
     DependencyManager::set<StatTracker>();
     DependencyManager::set<ScriptEngines>(ScriptEngine::CLIENT_SCRIPT);
diff --git a/libraries/ui/src/CursorManager.cpp b/libraries/ui/src/CursorManager.cpp
index 106574ff4f..8eb4989ab6 100644
--- a/libraries/ui/src/CursorManager.cpp
+++ b/libraries/ui/src/CursorManager.cpp
@@ -24,13 +24,6 @@ namespace Cursor {
         return _icon;
     }
 
-
-    class MouseInstance : public Instance {
-        Source getType() const override {
-            return Source::MOUSE;
-        }
-    };
-
     QMap<uint16_t, QString> Manager::ICON_NAMES {
         { Icon::SYSTEM, "SYSTEM", },
         { Icon::DEFAULT, "DEFAULT", },
@@ -38,7 +31,7 @@ namespace Cursor {
         { Icon::ARROW, "ARROW", },
         { Icon::RETICLE, "RETICLE", },
     };
-    QMap<uint16_t, QString> Manager::ICONS;
+
     static uint16_t _customIconId = Icon::USER_BASE;
 
     Manager::Manager() {
@@ -62,8 +55,8 @@ namespace Cursor {
     }
 
     Manager& Manager::instance() {
-        static Manager instance;
-        return instance;
+        static QSharedPointer<Manager> instance = DependencyManager::get<Cursor::Manager>();
+        return *instance;
     }
 
     QList<uint16_t> Manager::registeredIcons() const {
@@ -76,7 +69,6 @@ namespace Cursor {
 
     Instance* Manager::getCursor(uint8_t index) {
         Q_ASSERT(index < getCount());
-        static MouseInstance mouseInstance;
         if (index == 0) {
             return &mouseInstance;
         }
diff --git a/libraries/ui/src/CursorManager.h b/libraries/ui/src/CursorManager.h
index 2a92cc7f45..02ab99ee4b 100644
--- a/libraries/ui/src/CursorManager.h
+++ b/libraries/ui/src/CursorManager.h
@@ -8,6 +8,7 @@
 
 #pragma once
 #include <stdint.h>
+#include <DependencyManager.h>
 
 #include <GLMHelpers.h>
 
@@ -39,7 +40,15 @@ namespace Cursor {
         uint16_t _icon;
     };
 
-    class Manager {
+    class MouseInstance : public Instance {
+        Source getType() const override {
+            return Source::MOUSE;
+        }
+    };
+
+    class Manager : public QObject, public Dependency {
+        SINGLETON_DEPENDENCY
+
         Manager();
         Manager(const Manager& other) = delete;
     public:
@@ -52,12 +61,13 @@ namespace Cursor {
         QList<uint16_t> registeredIcons() const;
         const QString& getIconImage(uint16_t icon);
 
-        static QMap<uint16_t, QString> ICONS;
         static QMap<uint16_t, QString> ICON_NAMES;
         static Icon lookupIcon(const QString& name);
         static const QString& getIconName(const Icon& icon);
     private:
+        MouseInstance mouseInstance;
         float _scale{ 1.0f };
+        QMap<uint16_t, QString> ICONS;
     };
 }
 

From 3bc45aefb1bc68aaf33ef31dadb54e72038cbab3 Mon Sep 17 00:00:00 2001
From: David Kelly <david@highfidelity.io>
Date: Tue, 5 Sep 2017 10:04:16 -0700
Subject: [PATCH 34/37] Reset passphrase fix

---
 .../qml/hifi/commerce/wallet/Wallet.qml        |  2 +-
 interface/src/commerce/Wallet.cpp              | 18 ++++++++++++++++++
 2 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/interface/resources/qml/hifi/commerce/wallet/Wallet.qml b/interface/resources/qml/hifi/commerce/wallet/Wallet.qml
index 5695d47a68..4fcfc0c93b 100644
--- a/interface/resources/qml/hifi/commerce/wallet/Wallet.qml
+++ b/interface/resources/qml/hifi/commerce/wallet/Wallet.qml
@@ -59,7 +59,7 @@ Rectangle {
         }
 
         onWalletAuthenticatedStatusResult: {
-            if (!isAuthenticated && !passphraseModal.visible) {
+            if (!isAuthenticated && passphraseModal && !passphraseModal.visible) {
                 passphraseModal.visible = true;
             } else if (isAuthenticated) {
                 root.activeView = "walletHome";
diff --git a/interface/src/commerce/Wallet.cpp b/interface/src/commerce/Wallet.cpp
index 1f56ae32c4..69327b09a6 100644
--- a/interface/src/commerce/Wallet.cpp
+++ b/interface/src/commerce/Wallet.cpp
@@ -272,6 +272,10 @@ void Wallet::setPassphrase(const QString& passphrase) {
         delete _passphrase;
     }
     _passphrase = new QString(passphrase);
+
+    // no matter what, we now need to clear the keys as they
+    // need to be read using this passphrase
+    _publicKeys.clear();
 }
 
 // encrypt some stuff
@@ -383,11 +387,25 @@ bool Wallet::walletIsAuthenticatedWithPassphrase() {
     // FIXME: initialize OpenSSL elsewhere soon
     initialize();
 
+    // this should always be false if we don't have a passphrase
+    // cached yet
+    if (!_passphrase || _passphrase->isEmpty()) {
+        return false;
+    }
+    if (_publicKeys.count() > 0) {
+        // we _must_ be authenticated if the publicKeys are there
+        return true;
+    }
+
+    // otherwise, we have a passphrase but no keys, so we have to check
     auto publicKey = readPublicKey(keyFilePath().toStdString().c_str());
 
     if (publicKey.size() > 0) {
         if (auto key = readPrivateKey(keyFilePath().toStdString().c_str())) {
             RSA_free(key);
+
+            // be sure to add the public key so we don't do this over and over
+            _publicKeys.push_back(publicKey.toBase64());
             return true;
         }
     }

From 4bdfe092cfe8a35c0f181696831fe3f3901500f2 Mon Sep 17 00:00:00 2001
From: David Kelly <david@highfidelity.io>
Date: Tue, 5 Sep 2017 12:28:31 -0700
Subject: [PATCH 35/37] Regression in injection script

---
 scripts/system/html/js/marketplacesInject.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/system/html/js/marketplacesInject.js b/scripts/system/html/js/marketplacesInject.js
index 50ed642529..84c26d482b 100644
--- a/scripts/system/html/js/marketplacesInject.js
+++ b/scripts/system/html/js/marketplacesInject.js
@@ -134,7 +134,7 @@
             if (parseInt(cost) > 0) {
                 var priceElement = $(this).find('.price')
                 priceElement.css({ "width": "auto", "padding": "3px 5px", "height": "26px" });
-                priceElement.text(parseFloat(cost / 100).toFixed(2) + ' HFC');
+                priceElement.text(cost + ' HFC');
                 priceElement.css({ "min-width": priceElement.width() + 10 });
             }
         });

From 85a3771a98ff790717c2c6d5139e3f472b85b98c Mon Sep 17 00:00:00 2001
From: vladest <vladstelmahovsky@gmail.com>
Date: Tue, 5 Sep 2017 22:19:38 +0200
Subject: [PATCH 36/37] Remove commented out code

---
 interface/resources/qml/TabletBrowser.qml          | 5 ++---
 interface/resources/qml/controls/TabletWebView.qml | 4 ----
 2 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/interface/resources/qml/TabletBrowser.qml b/interface/resources/qml/TabletBrowser.qml
index ce74ae8c6e..8dbcc8f4f8 100644
--- a/interface/resources/qml/TabletBrowser.qml
+++ b/interface/resources/qml/TabletBrowser.qml
@@ -13,11 +13,11 @@ Item {
     id: root
     HifiConstants { id: hifi }
     HifiStyles.HifiConstants { id: hifistyles }
-    //width: parent.width
+
     height: 600
     property variant permissionsBar: {'securityOrigin':'none','feature':'none'}
     property alias url: webview.url
-    //property WebEngineView webView: webview
+
     property bool canGoBack: webview.canGoBack
     property bool canGoForward: webview.canGoForward
 
@@ -123,5 +123,4 @@ Item {
             break;
         }
     }
-    
 }
diff --git a/interface/resources/qml/controls/TabletWebView.qml b/interface/resources/qml/controls/TabletWebView.qml
index 9bb5000d7e..23143db3ba 100644
--- a/interface/resources/qml/controls/TabletWebView.qml
+++ b/interface/resources/qml/controls/TabletWebView.qml
@@ -1,12 +1,8 @@
 import QtQuick 2.7
-//import QtQuick.Controls 1.4
 import QtWebEngine 1.5
-//import QtWebChannel 1.0
 import "../controls-uit" as HiFiControls
 import "../styles" as HifiStyles
 import "../styles-uit"
-//import "../"
-//import "."
 
 Item {
     id: root

From 930243539cd01d1f6d3c210fdca95a309793c7a4 Mon Sep 17 00:00:00 2001
From: Liv <liv@highfidelity.io>
Date: Tue, 5 Sep 2017 17:50:25 -0700
Subject: [PATCH 37/37] add back first run to false and fix formatting

---
 interface/src/Application.cpp | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp
index 233aa4fe81..79fb2a9061 100644
--- a/interface/src/Application.cpp
+++ b/interface/src/Application.cpp
@@ -2776,15 +2776,16 @@ void Application::handleSandboxStatus(QNetworkReply* reply) {
         // If this is a first run we short-circuit the address passed in
         if (firstRun.get()) {
             showHelp();
-                if (sandboxIsRunning) {
-                    qCDebug(interfaceapp) << "Home sandbox appears to be running, going to Home.";
-                    DependencyManager::get<AddressManager>()->goToLocalSandbox();
-                    sentTo = SENT_TO_SANDBOX;
-                } else {
-                    qCDebug(interfaceapp) << "Home sandbox does not appear to be running, going to Entry.";
-                    DependencyManager::get<AddressManager>()->goToEntry();
-                    sentTo = SENT_TO_ENTRY;
-                }
+            if (sandboxIsRunning) {
+                qCDebug(interfaceapp) << "Home sandbox appears to be running, going to Home.";
+                DependencyManager::get<AddressManager>()->goToLocalSandbox();
+                sentTo = SENT_TO_SANDBOX;
+            } else {
+                qCDebug(interfaceapp) << "Home sandbox does not appear to be running, going to Entry.";
+                DependencyManager::get<AddressManager>()->goToEntry();
+                sentTo = SENT_TO_ENTRY;
+            }
+            firstRun.set(false);
 
         } else {
             qCDebug(interfaceapp) << "Not first run... going to" << qPrintable(addressLookupString.isEmpty() ? QString("previous location") : addressLookupString);