medvedych/harbour-tooter
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Sync to upstream

Browse source
This commit is contained in:
molan-git 2020-04-27 17:26:05 +02:00 committed by GitHub
parent a87c27e58e
commit 977f8b2fc0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
qml/pages/Profile.qml
View file

@ -29,6 +29,7 @@ Page {
property bool muting : false; property bool muting : false;
property bool domain_blocking : false; property bool domain_blocking : false;
WorkerScript { WorkerScript {
id: worker id: worker
source: "../lib/Worker.js" source: "../lib/Worker.js"
@ -264,7 +265,6 @@ Page {
console.log(link) console.log(link)
console.log(JSON.stringify(test)) console.log(JSON.stringify(test))
console.log(JSON.stringify(test.length)) console.log(JSON.stringify(test.length))
<<<<<<< HEAD
if (test.length === 5 && (test[3] === "tags" || test[3] === "tag") ) { if (test.length === 5 && (test[3] === "tags" || test[3] === "tag") ) {
pageStack.pop(pageStack.find(function(page) { pageStack.pop(pageStack.find(function(page) {
@ -285,28 +285,6 @@ Page {
} }
} }
=======
if (test.length === 5 && (test[3] === "tags" || test[3] === "tag") ) {
pageStack.pop(pageStack.find(function(page) {
var check = page.isFirstPage === true;
if (check)
page.onLinkActivated(link)
return check;
}));
send(link)
} else if (test.length === 4 && test[3][0] === "@" ) {
tlSearch.search = decodeURIComponent("@"+test[3].substring(1)+"@"+test[2])
slideshow.positionViewAtIndex(4, ListView.SnapToItem)
navigation.navigateTo('search')
} else {
Qt.openUrlExternally(link);
}
}
>>>>>>> 33d54bdda818c7a41c3a8cc8c5f09cb682584d8e
} }
Column { Column {
spacing: Theme.paddingMedium spacing: Theme.paddingMedium