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

clip max displayed counter value to 9999 because of container node width

This commit is contained in:
Andrew Dolgov 2021-03-23 10:47:06 +03:00
parent 0f6644880a
commit c34a4c85bd
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
classes/pref/feeds.php
View File

@ -140,7 +140,7 @@ class Pref_Feeds extends Handler_Protected {
}
foreach (array(-4, -3, -1, -2, 0, -6) as $i) {
array_push($cat['items'], $this->feedlist_init_feed($i));
array_push($cat['items'], $this->feedlist_init_feed($i, false, 0));
}
/* Plugin feeds for -1 */

9
js/Feeds.js
View File

@ -3,6 +3,7 @@
/* global __, App, Headlines, xhr, dojo, dijit, fox, PluginHost, Notify, fox */
const Feeds = {
_max_counter_value: 9999,
_default_feed_id: -3,
counters_last_request: 0,
_active_feed_id: undefined,
@ -69,7 +70,7 @@ const Feeds = {
const id = elems[l].id;
const kind = elems[l].kind;
const ctr = parseInt(elems[l].counter);
const ctr = Math.min(this._max_counter_value, parseInt(elems[l].counter));
const error = elems[l].error;
const has_img = elems[l].has_img;
const updated = elems[l].updated;
@ -90,8 +91,10 @@ const Feeds = {
}*/
this.setUnread(id, (kind == "cat"), ctr);
this.setValue(id, (kind == "cat"), 'auxcounter', parseInt(elems[l].auxcounter));
this.setValue(id, (kind == "cat"), 'markedcounter', parseInt(elems[l].markedcounter));
this.setValue(id, (kind == "cat"), 'auxcounter',
Math.min(this._max_counter_value, parseInt(elems[l].auxcounter)));
this.setValue(id, (kind == "cat"), 'markedcounter',
Math.min(this._max_counter_value, parseInt(elems[l].markedcounter)));
if (kind != "cat") {
this.setValue(id, false, 'error', error);