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

Yahoo, Reddit etc now works correctly

Browse source
This commit is contained in:
Vladyslav Stelmakhovskyi 2017-04-07 15:45:33 +02:00
parent 700c319953
commit f88ba7bc57
2 changed files with 14 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
interface/resources/qml/TabletBrowser.qml
View file

@ -104,6 +104,7 @@ Item {
// Required to support clicking on "hifi://" links // Required to support clicking on "hifi://" links
if (WebEngineView.LoadStartedStatus == loadRequest.status) { if (WebEngineView.LoadStartedStatus == loadRequest.status) {
urlAppend(loadRequest.url.toString())
var url = loadRequest.url.toString(); var url = loadRequest.url.toString();
if (urlHandler.canHandleUrl(url)) { if (urlHandler.canHandleUrl(url)) {
if (urlHandler.handleUrl(url)) { if (urlHandler.handleUrl(url)) {
@ -113,12 +114,6 @@ Item {
} }
} }
onNavigationRequested: {
if (request.navigationType == WebEngineNavigationRequest.LinkClickedNavigation) {
pagesModel.append({webUrl: request.url.toString()})
}
}
onNewViewRequested: { onNewViewRequested: {
request.openIn(webView); request.openIn(webView);
} }

14
interface/resources/qml/controls/TabletWebView.qml
View file

@ -117,7 +117,7 @@ Item {
} }
function gotoPage(url) { function gotoPage(url) {
pagesModel.append({webUrl: url}) urlAppend(url)
} }
function reloadPage() { function reloadPage() {
@ -126,9 +126,20 @@ Item {
view.setEnabled(true); view.setEnabled(true);
} }
function urlAppend(url) {
var _url = decodeURIComponent(url)
if (_url[_url.length - 1] !== "/")
_url = _url + "/"
if (currentPage === -1 || pagesModel.get(currentPage).webUrl !== _url) {
pagesModel.append({webUrl: _url})
}
}
onCurrentPageChanged: { onCurrentPageChanged: {
if (currentPage >= 0 && currentPage < pagesModel.count && loader.item !== null) { if (currentPage >= 0 && currentPage < pagesModel.count && loader.item !== null) {
loader.item.url = pagesModel.get(currentPage).webUrl loader.item.url = pagesModel.get(currentPage).webUrl
web.url = loader.item.url
web.address = loader.item.url
} }
} }
@ -160,6 +171,7 @@ Item {
if (currentPage >= 0) { if (currentPage >= 0) {
//we got something to load already //we got something to load already
item.url = pagesModel.get(currentPage).webUrl item.url = pagesModel.get(currentPage).webUrl
web.address = loader.item.url
} }
} }
} }