valvin
/
ttrss
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

remove model.getNextUnreadFeed; unify code with feedTree.getNextFeed

This commit is contained in:
Andrew Dolgov 2021-03-19 14:06:23 +03:00
parent 43ea36d030
commit 718c9f07fa
3 changed files with 9 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
js/FeedStoreModel.js
View File

@ -54,45 +54,6 @@ define(["dojo/_base/declare", "dijit/tree/ForestStoreModel"], function (declare)
if (treeItem) if (treeItem)
return this.store.setValue(treeItem, key, value); return this.store.setValue(treeItem, key, value);
}, },
getNextUnreadFeed: function (feed, is_cat) {
if (!this.store._itemsByIdentity)
return null;
let treeItem;
if (is_cat) {
treeItem = this.store._itemsByIdentity['CAT:' + feed];
} else {
treeItem = this.store._itemsByIdentity['FEED:' + feed];
}
const items = this.store._arrayOfAllItems;
for (let i = 0; i < items.length; i++) {
if (items[i] == treeItem) {
for (let j = i + 1; j < items.length; j++) {
const unread = this.store.getValue(items[j], 'unread');
const id = this.store.getValue(items[j], 'id');
if (unread > 0 && ((is_cat && id.match("CAT:")) || (!is_cat && id.match("FEED:")))) {
if (!is_cat || !(this.store.hasAttribute(items[j], 'parent_id') && this.store.getValue(items[j], 'parent_id') == feed)) return items[j];
}
}
for (let j = 0; j < i; j++) {
const unread = this.store.getValue(items[j], 'unread');
const id = this.store.getValue(items[j], 'id');
if (unread > 0 && ((is_cat && id.match("CAT:")) || (!is_cat && id.match("FEED:")))) {
if (!is_cat || !(this.store.hasAttribute(items[j], 'parent_id') && this.store.getValue(items[j], 'parent_id') == feed)) return items[j];
}
}
}
}
return null;
},
hasCats: function () { hasCats: function () {
if (this.store && this.store._itemsByIdentity) if (this.store && this.store._itemsByIdentity)
return this.store._itemsByIdentity['CAT:-1'] != undefined; return this.store._itemsByIdentity['CAT:-1'] != undefined;

8
js/FeedTree.js
View File

@ -381,7 +381,10 @@ define(["dojo/_base/declare", "dojo/dom-construct", "dojo/_base/array", "dojo/co
} }
}, },
getNextFeed: function (feed, is_cat) { getNextUnread: function(feed, is_cat) {
return this.getNextFeed(feed, is_cat, true);
},
getNextFeed: function (feed, is_cat, unread_only = false) {
let treeItem; let treeItem;
if (is_cat) { if (is_cat) {
@ -399,8 +402,9 @@ define(["dojo/_base/declare", "dojo/dom-construct", "dojo/_base/array", "dojo/co
for (let j = i+1; j < items.length; j++) { for (let j = i+1; j < items.length; j++) {
const id = String(items[j].id); const id = String(items[j].id);
const box = this._itemNodesMap[id]; const box = this._itemNodesMap[id];
const unread = parseInt(items[j].unread);
if (box) { if (box && (!unread_only || unread > 0)) {
const row = box[0].rowNode; const row = box[0].rowNode;
const cat = box[0].rowNode.parentNode.parentNode; const cat = box[0].rowNode.parentNode.parentNode;

6
js/Feeds.js
View File

@ -584,10 +584,10 @@ const Feeds = {
}, },
getNextUnread: function(feed, is_cat) { getNextUnread: function(feed, is_cat) {
const tree = dijit.byId("feedTree"); const tree = dijit.byId("feedTree");
const nuf = tree.model.getNextUnreadFeed(feed, is_cat);
if (nuf) if (tree) return tree.getNextUnread(feed, is_cat);
return tree.model.store.getValue(nuf, 'bare_id');
return false;
}, },
search: function() { search: function() {
xhr.json("backend.php", xhr.json("backend.php",