Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-08 13:18:38 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of github.com:highfidelity/hifi into yellow

Browse source
This commit is contained in:
Sam Gateau 2019-09-30 09:18:23 -07:00
commit c8663f7fe6
3 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
interface/resources/qml/hifi/tablet/+webengine/BlocksWebView.qml
View file

@ -1,6 +1,6 @@
import QtQuick 2.0 import QtQuick 2.0
import QtWebEngine 1.5 import QtWebEngine 1.5
import "../../controls" as Controls import "../../../controls" as Controls
Controls.TabletWebView { 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"} 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"}

1
libraries/ui/src/ui/TabletScriptingInterface.h
View file

@ -279,6 +279,7 @@ public:
* @param {string} [injectedJavaScriptUrl=""] - The URL of JavaScript to inject into the web page. * @param {string} [injectedJavaScriptUrl=""] - The URL of JavaScript to inject into the web page.
* @param {boolean} [loadOtherBase=false] - If <code>true</code>, the web page or app is displayed in a frame with "back" * @param {boolean} [loadOtherBase=false] - If <code>true</code>, the web page or app is displayed in a frame with "back"
* and "close" buttons. * and "close" buttons.
* <p class="important">Deprecated: This parameter is deprecated and will be removed.</p>
*/ */
Q_INVOKABLE void gotoWebScreen(const QString& url); Q_INVOKABLE void gotoWebScreen(const QString& url);
Q_INVOKABLE void gotoWebScreen(const QString& url, const QString& injectedJavaScriptUrl, bool loadOtherBase = false); Q_INVOKABLE void gotoWebScreen(const QString& url, const QString& injectedJavaScriptUrl, bool loadOtherBase = false);

2
unpublishedScripts/marketplace/blocks/blocksApp.js
View file

@ -35,7 +35,7 @@
function onClicked() { function onClicked() {
if (!shown) { if (!shown) {
tablet.gotoWebScreen(APP_URL, "", true); tablet.gotoWebScreen(APP_URL, "");
} else { } else {
tablet.gotoHomeScreen(); tablet.gotoHomeScreen();
} }