From 950ac3540ab0af9a10b6188e190f8ec9cd16fb1b Mon Sep 17 00:00:00 2001
From: vladest <vladstelmahovsky@gmail.com>
Date: Sun, 29 Oct 2017 14:05:47 +0100
Subject: [PATCH] Fix mute unmute. Scrolling thru suggestions popup now set
 popup's contains into url. Fixed reload timer

---
 interface/resources/qml/hifi/WebBrowser.qml | 30 +++++++++++++--------
 1 file changed, 19 insertions(+), 11 deletions(-)

diff --git a/interface/resources/qml/hifi/WebBrowser.qml b/interface/resources/qml/hifi/WebBrowser.qml
index 79932dbcdd..ec5594e74d 100644
--- a/interface/resources/qml/hifi/WebBrowser.qml
+++ b/interface/resources/qml/hifi/WebBrowser.qml
@@ -85,6 +85,7 @@ Rectangle {
 
         addressBar.model = []
         webStack.currentItem.webEngineView.url = url
+        addressBar.editText = webStack.currentItem.webEngineView.url
         suggestionRequestTimer.stop();
         addressBar.popup.close();
     }
@@ -136,6 +137,12 @@ Rectangle {
                     goTo(textAt(index));
                 }
 
+                onHighlightedIndexChanged: {
+                    if (highlightedIndex >= 0) {
+                        addressBar.editText = textAt(highlightedIndex)
+                    }
+                }
+
                 popup.height: webStack.height
 
                 onFocusChanged: {
@@ -191,7 +198,7 @@ Rectangle {
                             if (webStack.currentItem.webEngineView.loading) {
                                 webStack.currentItem.webEngineView.stop();
                             } else {
-                                webStack.currentItem.webEngineView.reloadTimer.start();
+                                webStack.currentItem.reloadTimer.start();
                             }
                         }
                     }
@@ -228,7 +235,7 @@ Rectangle {
                 anchors.verticalCenter: parent.verticalCenter;
                 width: hifi.dimensions.controlLineHeight
                 onClicked: {
-                    webStack.currentItem.webEngineView.triggerWebAction(WebEngineView.ToggleMediaMute);
+                    webStack.currentItem.webEngineView.audioMuted = !webStack.currentItem.webEngineView.audioMuted
                 }
             }
         }
@@ -261,6 +268,8 @@ Rectangle {
             id: webViewComponent
             Rectangle {
                 property alias webEngineView: webEngineView
+                property alias reloadTimer: reloadTimer
+
                 property WebEngineNewViewRequest request: null
 
                 property bool isDialog: QQControls.StackView.index > 0
@@ -314,7 +323,7 @@ Rectangle {
                     WebEngineScript {
                         id: createGlobalEventBridge
                         sourceCode: eventBridgeJavaScriptToInject
-                        injectionPoint: WebEngineScript.DocumentCreation
+                        injectionPoint: WebEngineScript.Deferred
                         worldId: WebEngineScript.MainWorld
                     }
 
@@ -399,14 +408,13 @@ Rectangle {
                     onWindowCloseRequested: {
                         webStack.pop();
                     }
-
-                    Timer {
-                        id: reloadTimer
-                        interval: 0
-                        running: false
-                        repeat: false
-                        onTriggered: webEngineView.reload()
-                    }
+                }
+                Timer {
+                    id: reloadTimer
+                    interval: 0
+                    running: false
+                    repeat: false
+                    onTriggered: webEngineView.reload()
                 }
             }
         }