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

feed tree: do not mark Labels as Special

This commit is contained in:
Andrew Dolgov 2020-02-22 16:44:31 +03:00
parent 4ab3854aed
commit 788ea95fbd
3 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
js/AppBase.js
View File

@ -367,7 +367,7 @@ define(["dojo/_base/declare"], function (declare) {
if (params.hasOwnProperty(k)) { if (params.hasOwnProperty(k)) {
switch (k) { switch (k) {
case "label_base_index": case "label_base_index":
_label_base_index = parseInt(params[k]); LABEL_BASE_INDEX = parseInt(params[k]);
break; break;
case "cdm_auto_catchup": case "cdm_auto_catchup":
if (params[k] == 1) { if (params[k] == 1) {

5
js/FeedTree.js
View File

@ -33,7 +33,7 @@ define(["dojo/_base/declare", "dojo/dom-construct", "dijit/Tree", "dijit/Menu"],
const id = args.item.id[0]; const id = args.item.id[0];
const bare_id = parseInt(id.substr(id.indexOf(':')+1)); const bare_id = parseInt(id.substr(id.indexOf(':')+1));
if (bare_id < _label_base_index) { if (bare_id < LABEL_BASE_INDEX) {
const label = dojo.create('i', { className: "material-icons icon icon-label", innerHTML: "label" }); const label = dojo.create('i', { className: "material-icons icon icon-label", innerHTML: "label" });
//const fg_color = args.item.fg_color[0]; //const fg_color = args.item.fg_color[0];
@ -163,8 +163,9 @@ define(["dojo/_base/declare", "dojo/dom-construct", "dijit/Tree", "dijit/Menu"],
if (item.auxcounter > 0) rc += " Has_Aux"; if (item.auxcounter > 0) rc += " Has_Aux";
if (item.markedcounter > 0) rc += " Has_Marked"; if (item.markedcounter > 0) rc += " Has_Marked";
if (item.updates_disabled > 0) rc += " UpdatesDisabled"; if (item.updates_disabled > 0) rc += " UpdatesDisabled";
if (item.bare_id < 0 && !is_cat || item.bare_id == 0 && !is_cat) rc += " Special"; if (item.bare_id >= LABEL_BASE_INDEX && item.bare_id < 0 && !is_cat || item.bare_id == 0 && !is_cat) rc += " Special";
if (item.bare_id == -1 && is_cat) rc += " AlwaysVisible"; if (item.bare_id == -1 && is_cat) rc += " AlwaysVisible";
if (item.bare_id < LABEL_BASE_INDEX) rc += " Label";
return rc; return rc;
}, },

8
js/common.js
View File

@ -1,7 +1,7 @@
'use strict' 'use strict'
/* global dijit, __ */ /* global dijit, __ */
let _label_base_index = -1024; let LABEL_BASE_INDEX = -1024; /* not const because it's assigned at least once (by backend) */
let loading_progress = 0; let loading_progress = 0;
/* error reporting shim */ /* error reporting shim */
@ -252,12 +252,12 @@ function displayIfChecked(checkbox, elemId) {
// noinspection JSUnusedGlobalSymbols // noinspection JSUnusedGlobalSymbols
function label_to_feed_id(label) { function label_to_feed_id(label) {
return _label_base_index - 1 - Math.abs(label); return LABEL_BASE_INDEX - 1 - Math.abs(label);
} }
// noinspection JSUnusedGlobalSymbols // noinspection JSUnusedGlobalSymbols
function feed_to_label_id(feed) { function feed_to_label_id(feed) {
return _label_base_index - 1 + Math.abs(feed); return LABEL_BASE_INDEX - 1 + Math.abs(feed);
} }
// http://stackoverflow.com/questions/6251937/how-to-get-selecteduser-highlighted-text-in-contenteditable-element-and-replac // http://stackoverflow.com/questions/6251937/how-to-get-selecteduser-highlighted-text-in-contenteditable-element-and-replac
@ -313,4 +313,4 @@ function escapeHtml(text) {
}; };
return text.replace(/[&<>"']/g, function(m) { return map[m]; }); return text.replace(/[&<>"']/g, function(m) { return map[m]; });
} }