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

Merge pull request #14735 from SamGondelman/snap

Browse source 
Case 20724: Fix Snap app settings issue
This commit is contained in:
Jeff Clinton 2019-01-18 13:00:18 -08:00 committed by GitHub
commit 09b16d2d7a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
interface/resources/qml/hifi/tablet/TabletRoot.qml
View file

@ -134,8 +134,7 @@ Item {
if (isWebPage) { if (isWebPage) {
var webUrl = tabletApps.get(currentApp).appWebUrl; var webUrl = tabletApps.get(currentApp).appWebUrl;
var scriptUrl = tabletApps.get(currentApp).scriptUrl; var scriptUrl = tabletApps.get(currentApp).scriptUrl;
loadSource("hifi/tablet/TabletWebView.qml"); loadWebBase(webUrl, scriptUrl);
loadWebUrl(webUrl, scriptUrl);
} else { } else {
loader.load(tabletApps.get(currentApp).appUrl); loader.load(tabletApps.get(currentApp).appUrl);
} }
@ -150,16 +149,6 @@ Item {
tabletRoot.openBrowser = newWindow; tabletRoot.openBrowser = newWindow;
} }
function loadWebUrl(url, injectedJavaScriptUrl) {
tabletApps.clear();
loader.item.url = url;
loader.item.scriptURL = injectedJavaScriptUrl;
tabletApps.append({"appUrl": "TabletWebView.qml", "isWebUrl": true, "scriptUrl": injectedJavaScriptUrl, "appWebUrl": url});
if (loader.item.hasOwnProperty("closeButtonVisible")) {
loader.item.closeButtonVisible = false;
}
}
// used to send a message from qml to interface script. // used to send a message from qml to interface script.
signal sendToScript(var message); signal sendToScript(var message);