Mirrors/overte-thingvellir
3
0
Fork 0
mirror of https://thingvellir.net/git/overte synced 2025-03-27 23:52:03 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Follow naming convention

Browse source
This commit is contained in:
vladest 2017-09-12 19:17:49 +02:00
parent 08deba35ae
commit 92a83328c0
1 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
interface/resources/qml/controls/FlickableWebViewCore.qml
View file

@ -9,10 +9,10 @@ import "../styles-uit" as StylesUIt
Item { Item {
id: flick id: flick
property alias url: _webview.url property alias url: webViewCore.url
property alias canGoBack: _webview.canGoBack property alias canGoBack: webViewCore.canGoBack
property alias webViewCore: _webview property alias webViewCore: webViewCore
property alias webViewCoreProfile: _webview.profile property alias webViewCoreProfile: webViewCore.profile
property string webViewCoreUserAgent property string webViewCoreUserAgent
property string userScriptUrl: "" property string userScriptUrl: ""
@ -35,7 +35,7 @@ Item {
url = (url.indexOf("?") >= 0) ? url + urlTag : url + "?" + urlTag; url = (url.indexOf("?") >= 0) ? url + urlTag : url + "?" + urlTag;
if (urlHandler.canHandleUrl(url)) { if (urlHandler.canHandleUrl(url)) {
if (urlHandler.handleUrl(url)) { if (urlHandler.handleUrl(url)) {
_webview.stop(); webViewCore.stop();
} }
} }
} }
@ -50,7 +50,7 @@ Item {
} }
WebEngineView { WebEngineView {
id: _webview id: webViewCore
anchors.fill: parent anchors.fill: parent
@ -91,13 +91,13 @@ Item {
webChannel.registerObject("eventBridge", eventBridge); webChannel.registerObject("eventBridge", eventBridge);
webChannel.registerObject("eventBridgeWrapper", eventBridgeWrapper); webChannel.registerObject("eventBridgeWrapper", eventBridgeWrapper);
// Ensure the JS from the web-engine makes it to our logging // Ensure the JS from the web-engine makes it to our logging
_webview.javaScriptConsoleMessage.connect(function(level, message, lineNumber, sourceID) { webViewCore.javaScriptConsoleMessage.connect(function(level, message, lineNumber, sourceID) {
console.log("Web Entity JS message: " + sourceID + " " + lineNumber + " " + message); console.log("Web Entity JS message: " + sourceID + " " + lineNumber + " " + message);
}); });
if (webViewCoreUserAgent !== undefined) { if (webViewCoreUserAgent !== undefined) {
_webview.profile.httpUserAgent = webViewCoreUserAgent webViewCore.profile.httpUserAgent = webViewCoreUserAgent
} else { } else {
_webview.profile.httpUserAgent += " (HighFidelityInterface)"; webViewCore.profile.httpUserAgent += " (HighFidelityInterface)";
} }
} }
@ -125,7 +125,7 @@ Item {
x: flick.width/2 - width/2 x: flick.width/2 - width/2
y: flick.height/2 - height/2 y: flick.height/2 - height/2
source: "../../icons/loader-snake-64-w.gif" source: "../../icons/loader-snake-64-w.gif"
visible: _webview.loading && /^(http.*|)$/i.test(_webview.url.toString()) visible: webViewCore.loading && /^(http.*|)$/i.test(webViewCore.url.toString())
playing: visible playing: visible
z: 10000 z: 10000
} }