From cd6d9b57c47181bc361c8ceca5ed7f1a2f795b96 Mon Sep 17 00:00:00 2001 From: David Rowe Date: Sat, 28 Sep 2019 11:26:38 +1200 Subject: [PATCH 1/3] Fix Blocks script displaying a blank page --- .../resources/qml/hifi/tablet/+webengine/BlocksWebView.qml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/interface/resources/qml/hifi/tablet/+webengine/BlocksWebView.qml b/interface/resources/qml/hifi/tablet/+webengine/BlocksWebView.qml index 050515da37..e600924b42 100644 --- a/interface/resources/qml/hifi/tablet/+webengine/BlocksWebView.qml +++ b/interface/resources/qml/hifi/tablet/+webengine/BlocksWebView.qml @@ -1,6 +1,6 @@ import QtQuick 2.0 import QtWebEngine 1.5 -import "../../controls" as Controls +import "../../../controls" as Controls Controls.TabletWebView { profile: WebEngineProfile { httpUserAgent: "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/60.0.3112.90 Safari/537.36"} From 07d8013e21893af1bf656eac7812d30f73daa69e Mon Sep 17 00:00:00 2001 From: David Rowe Date: Sat, 28 Sep 2019 11:27:20 +1200 Subject: [PATCH 2/3] Don't display "CLOSE" and "BACK" buttons at top of Blocks screen --- unpublishedScripts/marketplace/blocks/blocksApp.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/unpublishedScripts/marketplace/blocks/blocksApp.js b/unpublishedScripts/marketplace/blocks/blocksApp.js index 813a77c74a..9c10ba8197 100644 --- a/unpublishedScripts/marketplace/blocks/blocksApp.js +++ b/unpublishedScripts/marketplace/blocks/blocksApp.js @@ -35,7 +35,7 @@ function onClicked() { if (!shown) { - tablet.gotoWebScreen(APP_URL, "", true); + tablet.gotoWebScreen(APP_URL, ""); } else { tablet.gotoHomeScreen(); } From 3d667b4a21ec926f6982aaefe8af8781e579c32b Mon Sep 17 00:00:00 2001 From: David Rowe Date: Sat, 28 Sep 2019 11:27:31 +1200 Subject: [PATCH 3/3] Deprecate tablet.gotoWebScreen()'s loadOtherBase parameter --- libraries/ui/src/ui/TabletScriptingInterface.h | 1 + 1 file changed, 1 insertion(+) diff --git a/libraries/ui/src/ui/TabletScriptingInterface.h b/libraries/ui/src/ui/TabletScriptingInterface.h index bae5eda29e..58596d6d92 100644 --- a/libraries/ui/src/ui/TabletScriptingInterface.h +++ b/libraries/ui/src/ui/TabletScriptingInterface.h @@ -279,6 +279,7 @@ public: * @param {string} [injectedJavaScriptUrl=""] - The URL of JavaScript to inject into the web page. * @param {boolean} [loadOtherBase=false] - If true, the web page or app is displayed in a frame with "back" * and "close" buttons. + *

Deprecated: This parameter is deprecated and will be removed.

*/ Q_INVOKABLE void gotoWebScreen(const QString& url); Q_INVOKABLE void gotoWebScreen(const QString& url, const QString& injectedJavaScriptUrl, bool loadOtherBase = false);