mirror of
https://github.com/chylex/Nextcloud-News.git
synced 2025-04-09 19:15:42 +02:00
correctly adjust unreadcount for folders when moving a feed
This commit is contained in:
parent
9969132b05
commit
747077e85e
10
css/news.css
10
css/news.css
@ -243,15 +243,15 @@ div.add_parentfolder {
|
||||
}
|
||||
|
||||
#feeds .folder.collapsable.open {
|
||||
background-image: linear-gradient(top, rgb(210,210,210) 0%, rgb(220,220,220) 100%),
|
||||
background-image: linear-gradient(top, rgb(213,213,213) 2px, rgb(223,223,223) 100%),
|
||||
url('%webroot%/core/img/places/folder.svg');
|
||||
background-image: -o-linear-gradient(top, rgb(210,210,210) 0%, rgb(220,220,220) 100%),
|
||||
background-image: -o-linear-gradient(top, rgb(213,213,213) 2px, rgb(223,223,223) 100%),
|
||||
url('%webroot%/core/img/places/folder.svg');
|
||||
background-image: -moz-linear-gradient(top, rgb(210,210,210) 0%, rgb(220,220,220) 100%),
|
||||
background-image: -moz-linear-gradient(top, rgb(213,213,213) 2px, rgb(223,223,223) 100%),
|
||||
url('%webroot%/core/img/places/folder.svg');
|
||||
background-image: -webkit-linear-gradient(top, rgb(210,210,210) 0%, rgb(220,220,220) 100%),
|
||||
background-image: -webkit-linear-gradient(top, rgb(213,213,213) 2px, rgb(223,223,223) 100%),
|
||||
url('%webroot%/core/img/places/folder.svg');
|
||||
background-image: -ms-linear-gradient(top, rgb(210,210,210) 0%, rgb(220,220,220) 100%),
|
||||
background-image: -ms-linear-gradient(top, rgb(213,213,213) 2px, rgb(223,223,223) 100%),
|
||||
url('%webroot%/core/img/places/folder.svg');
|
||||
border-bottom: 1px solid #bbb;
|
||||
padding-bottom: .5em;
|
||||
|
11
js/menu.js
11
js/menu.js
@ -866,12 +866,23 @@ var News = News || {};
|
||||
return;
|
||||
}
|
||||
|
||||
// adjust unreadcount for the old folder
|
||||
var feedUnreadCount = self._unreadCount[feedId];
|
||||
if(fromFolderId !== 0){
|
||||
self._setUnreadCount(MenuNodeType.Feed, feedId, 0);
|
||||
}
|
||||
|
||||
if($dropped.hasClass(self._menuNodeTypeToClass(MenuNodeType.Folder))){
|
||||
$dropped.children('ul').append($dragged[0]);
|
||||
} else {
|
||||
$dropped.append($dragged[0]);
|
||||
}
|
||||
|
||||
// adjust unreadcount for the new folder
|
||||
if(folderId !== 0){
|
||||
self._setUnreadCount(MenuNodeType.Feed, feedId, feedUnreadCount);
|
||||
}
|
||||
|
||||
self._resetOpenFolders();
|
||||
self._moveFeedToFolder(feedId, folderId);
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user