diff --git a/qml/lib/Worker.js b/qml/lib/Worker.js index 4a162bb..12a225b 100644 --- a/qml/lib/Worker.js +++ b/qml/lib/Worker.js @@ -1,6 +1,6 @@ Qt.include("Mastodon.js") -var debug = true; +var debug = false; var loadImages = true; // used to dedupe on append/insert var knownIds = []; @@ -62,7 +62,9 @@ WorkerScript.onMessage = function(msg) { * this falls through and continues for GET */ - if (msg.action === "bookmarks" || ( msg.action === "timelines/home" && msg.mode === "append") ){ + if (msg.action === "bookmarks" || + ( msg.action === "timelines/home" && msg.mode === "append") || + ( msg.action.indexOf("timelines/tag/") !== -1 ) ){ API.getLink(msg.action, msg.params, function(data) { if (debug) console.log(JSON.stringify(data)) WorkerScript.sendMessage({ 'LinkHeader': data }) diff --git a/qml/pages/MainPage.qml b/qml/pages/MainPage.qml index c155e69..9db752a 100644 --- a/qml/pages/MainPage.qml +++ b/qml/pages/MainPage.qml @@ -158,19 +158,11 @@ Page { delegate: VisualContainer Component.onCompleted: { view.type = "timelines/tag/"+tlSearch.search.substring(1) - var ids = [] - view.params = [] - view.params.push({name: 'limit', data: "20" }); - /* we push the ids via params which we remove in the WorkerScript - * see: MyList:loadData() and should move */ if (mdl.count) { - for(var i = 0 ; i < mdl.count ; i++) { - ids.push(mdl.get(i).id) - //if (debug) console.log(model.get(i).id) - } - view.params.push({name: 'ids', data: ids }); + view.loadData("append") + } else { + view.loadData("prepend") } - view.loadData("append") } } } @@ -241,20 +233,12 @@ Page { delegate: VisualContainer Component.onCompleted: { - var ids = [] - view3.params = [] - view3.params.push({name: 'limit', data: "20" }); - /* we push the ids via params which we remove in the WorkerScript - * see: MyList:loadData() and should move */ - if (mdl.count) { - for(var i = 0 ; i < mdl.count ; i++) { - ids.push(mdl.get(i).id) - //if (debug) console.log(model.get(i).id) - } - view3.params.push({name: 'ids', data: ids }); - } view3.type = "timelines/tag/"+tlSearch.search - view3.loadData("prepend") + if (mdl.count) { + view3.loadData("append") + } else { + view3.loadData("prepend") + } } } } diff --git a/qml/pages/components/MyList.qml b/qml/pages/components/MyList.qml index 4f77ec2..9180729 100644 --- a/qml/pages/components/MyList.qml +++ b/qml/pages/components/MyList.qml @@ -7,7 +7,7 @@ import "." SilicaListView { id: myList - property bool debug: true + property bool debug: false property string type property string title property string description diff --git a/rpm/harbour-tooterb.spec b/rpm/harbour-tooterb.spec index 93a27ea..5f25e30 100644 --- a/rpm/harbour-tooterb.spec +++ b/rpm/harbour-tooterb.spec @@ -13,7 +13,7 @@ Name: harbour-tooterb %{!?qtc_make:%define qtc_make make} %{?qtc_builddir:%define _builddir %qtc_builddir} Summary: Tooter β -Version: 1.1.3 +Version: 1.1.4 Release: 1 Group: Qt/Qt License: GPLv3