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

Fix desktop mode script URL injection

Browse source
This commit is contained in:
Brad Davis 2017-11-08 14:55:34 -08:00
parent 1a58aee385
commit 25df649b44
2 changed files with 16 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -68,8 +68,8 @@ Item {
function loadSource(url) {
tabletApps.clear();
loader.load(url)
tabletApps.append({"appUrl": url, "isWebUrl": false, "scriptUrl": "", "appWebUrl": ""});
tabletApps.append({"appUrl": url, "isWebUrl": false, "scriptUrl": "", "appWebUrl": ""});
loader.load(url)
}
function loadQMLOnTop(url) {
@ -84,8 +84,8 @@ Item {
function loadWebContent(source, url, injectJavaScriptUrl) {
tabletApps.append({"appUrl": source, "isWebUrl": true, "scriptUrl": injectJavaScriptUrl, "appWebUrl": url});
loader.load(source, function() {
loader.item.url = tabletApps.get(currentApp).appWebUrl;
loader.item.scriptUrl = tabletApps.get(currentApp).scriptUrl;
loader.item.scriptURL = injectJavaScriptUrl;
loader.item.url = url;
if (loader.item.hasOwnProperty("gotoPreviousApp")) {
loader.item.gotoPreviousApp = true;
}

22
interface/resources/qml/hifi/tablet/WindowRoot.qml
View file

@ -62,20 +62,22 @@ Windows.ScrollingWindow {
loader.load(url)
}
function loadWebBase() {
loader.load("hifi/tablet/TabletWebView.qml");
function loadWebContent(source, url, injectJavaScriptUrl) {
loader.load(source, function() {
loader.item.url = url
loader.item.scriptURL = injectJavaScriptUrl;
if (loader.item.hasOwnProperty("closeButtonVisible")) {
loader.item.closeButtonVisible = false;
}
});
}
function loadTabletWebBase() {
loader.load("hifi/tablet/BlocksWebView.qml");
function loadWebBase(url, injectJavaScriptUrl) {
loadWebContent("hifi/tablet/TabletWebView.qml", url, injectJavaScriptUrl);
}
function loadWebUrl(url, injectedJavaScriptUrl) {
loader.item.url = url;
loader.item.scriptURL = injectedJavaScriptUrl;
if (loader.item.hasOwnProperty("closeButtonVisible")) {
loader.item.closeButtonVisible = false;
}
function loadTabletWebBase(url, injectJavaScriptUrl) {
loadWebContent("hifi/tablet/BlocksWebView.qml", url, injectJavaScriptUrl);
}
// used to send a message from qml to interface script.