From 7b387c52c37cd0a777e9a408869811c2d6a908bd Mon Sep 17 00:00:00 2001 From: David Rowe Date: Wed, 3 May 2017 14:42:06 +1200 Subject: [PATCH 1/3] Fix reliability of keyboard enabling in tablet Web pages --- interface/resources/qml/controls/TabletWebView.qml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/interface/resources/qml/controls/TabletWebView.qml b/interface/resources/qml/controls/TabletWebView.qml index 04e784e2ba..333a79e509 100644 --- a/interface/resources/qml/controls/TabletWebView.qml +++ b/interface/resources/qml/controls/TabletWebView.qml @@ -19,7 +19,7 @@ Item { property alias address: displayUrl.text //for compatibility property string scriptURL property alias eventBridge: eventBridgeWrapper.eventBridge - property bool keyboardEnabled: HMD.active + property bool keyboardEnabled: false property bool keyboardRaised: false property bool punctuationMode: false property bool isDesktop: false @@ -307,6 +307,7 @@ Item { Component.onCompleted: { web.isDesktop = (typeof desktop !== "undefined"); + keyboardEnabled = HMD.active; address = url; } From 9d92ed2b9bf1e3be72955b6b1aae08b690aceb79 Mon Sep 17 00:00:00 2001 From: David Rowe Date: Thu, 4 May 2017 16:55:10 +1200 Subject: [PATCH 2/3] Fix keyboard not appearing in social media snapshot sharing dialogs --- interface/resources/qml/controls/TabletWebView.qml | 1 + 1 file changed, 1 insertion(+) diff --git a/interface/resources/qml/controls/TabletWebView.qml b/interface/resources/qml/controls/TabletWebView.qml index ee0f73c259..51b6c16a4c 100644 --- a/interface/resources/qml/controls/TabletWebView.qml +++ b/interface/resources/qml/controls/TabletWebView.qml @@ -281,6 +281,7 @@ Item { web.initialPage = webview.url; startingUp = false; } + webview.forceActiveFocus(); } } From 30604ab901d23196820cba121fb75b5af37c95d8 Mon Sep 17 00:00:00 2001 From: David Rowe Date: Thu, 4 May 2017 16:56:18 +1200 Subject: [PATCH 3/3] Fix some typos noticed in passing --- interface/resources/qml/controls/TabletWebView.qml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/interface/resources/qml/controls/TabletWebView.qml b/interface/resources/qml/controls/TabletWebView.qml index 51b6c16a4c..d288872289 100644 --- a/interface/resources/qml/controls/TabletWebView.qml +++ b/interface/resources/qml/controls/TabletWebView.qml @@ -238,7 +238,7 @@ Item { worldId: WebEngineScript.MainWorld } - property string urlTag: "noDownload=false"; + property string urlTag: "noDownload=false"; userScripts: [ createGlobalEventBridge, raiseAndLowerKeyboard, userScript ] property string newUrl: "" @@ -264,7 +264,7 @@ Item { keyboard.resetShiftMode(false); // Required to support clicking on "hifi://" links if (WebEngineView.LoadStartedStatus == loadRequest.status) { - var url = loadRequest.url.toString(); + var url = loadRequest.url.toString(); if (urlHandler.canHandleUrl(url)) { if (urlHandler.handleUrl(url)) { root.stop(); @@ -273,7 +273,7 @@ Item { } if (WebEngineView.LoadFailedStatus == loadRequest.status) { - console.log(" Tablet WebEngineView failed to laod url: " + loadRequest.url.toString()); + console.log(" Tablet WebEngineView failed to load url: " + loadRequest.url.toString()); } if (WebEngineView.LoadSucceededStatus == loadRequest.status) {