mirror of
https://github.com/overte-org/overte.git
synced 2025-08-09 12:28:02 +02:00
Merge branch 'webview-js' of github.com:druiz17/hifi into tabletwebview-fix-links
This commit is contained in:
commit
62870d85d3
3 changed files with 13 additions and 6 deletions
|
@ -90,6 +90,13 @@ Item {
|
||||||
horizontalCenter: parent.horizontalCenter;
|
horizontalCenter: parent.horizontalCenter;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
MouseArea {
|
||||||
|
anchors.fill: parent
|
||||||
|
preventStealing: true
|
||||||
|
propagateComposedEvents: true
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
ListModel {
|
ListModel {
|
||||||
|
|
|
@ -92,16 +92,16 @@ Item {
|
||||||
}
|
}
|
||||||
|
|
||||||
function loadWebBase() {
|
function loadWebBase() {
|
||||||
loader.source = "";
|
loader.source = "";
|
||||||
loader.source = "TabletWebView.qml";
|
loader.source = "TabletWebView.qml";
|
||||||
}
|
}
|
||||||
|
|
||||||
function returnToPreviousApp() {
|
function returnToPreviousApp() {
|
||||||
tabletApps.remove(currentApp);
|
tabletApps.remove(currentApp);
|
||||||
var isWebPage = tabletApps.get(currentApp).isWebUrl;
|
var isWebPage = tabletApps.get(currentApp).isWebUrl;
|
||||||
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("TabletWebView.qml");
|
loadSource("TabletWebView.qml");
|
||||||
loadWebUrl(webUrl, scriptUrl);
|
loadWebUrl(webUrl, scriptUrl);
|
||||||
} else {
|
} else {
|
||||||
|
|
|
@ -39,8 +39,8 @@ Windows.ScrollingWindow {
|
||||||
}
|
}
|
||||||
|
|
||||||
function loadWebBase() {
|
function loadWebBase() {
|
||||||
loader.source = "";
|
loader.source = "";
|
||||||
loader.source = "WindowWebView.qml";
|
loader.source = "WindowWebView.qml";
|
||||||
}
|
}
|
||||||
|
|
||||||
function loadWebUrl(url, injectedJavaScriptUrl) {
|
function loadWebUrl(url, injectedJavaScriptUrl) {
|
||||||
|
|
Loading…
Reference in a new issue