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

Merge pull request #10160 from vladest/tabletwebview-yahoo-fix

Browse source 
Yahoo, Reddit etc now works correctly
This commit is contained in:
Seth Alves 2017-04-08 20:25:18 -07:00 committed by GitHub
commit aa89903a9f
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
if (WebEngineView.LoadStartedStatus == loadRequest.status) {
urlAppend(loadRequest.url.toString())
var url = loadRequest.url.toString();
if (urlHandler.canHandleUrl(url)) {
if (urlHandler.handleUrl(url)) {
@ -113,12 +114,6 @@ Item {
}
}
onNavigationRequested: {
if (request.navigationType == WebEngineNavigationRequest.LinkClickedNavigation) {
pagesModel.append({webUrl: request.url.toString()})
}
}
onNewViewRequested: {
request.openIn(webView);
}

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

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