chylex/Nextcloud-News
1
0
Fork 0
mirror of https://github.com/chylex/Nextcloud-News.git synced 2025-05-12 07:34:05 +02:00
Code

fixed active menu item and reload for unread

Browse Source 
Signed-off-by: anoy <anoymouserver+github@mailbox.org>
This commit is contained in:
anoy 2020-04-24 16:43:15 +02:00 committed by Benjamin Brahmer
parent 5f6db2400f
commit b5340676dc
2 changed files with 12 additions and 6 deletions

5
js/controller/NavigationController.js
View File

@ -140,6 +140,11 @@ app.controller('NavigationController', function ($route, FEED_TYPE, FeedResource
$route.current.$$route.type === FEED_TYPE.SUBSCRIPTIONS; $route.current.$$route.type === FEED_TYPE.SUBSCRIPTIONS;
}; };
this.isUnreadActive = function () {
return $route.current &&
$route.current.$$route.type === FEED_TYPE.UNREAD;
};
this.isStarredActive = function () { this.isStarredActive = function () {
return $route.current && return $route.current &&
$route.current.$$route.type === FEED_TYPE.STARRED; $route.current.$$route.type === FEED_TYPE.STARRED;

13
templates/part.navigation.unreadfeed.php
View File

@ -1,10 +1,10 @@
<li ng-class="{ <li ng-class="{
active: Navigation.isSubscriptionsActive(), active: Navigation.isUnreadActive(),
unread: Navigation.isUnread() unread: Navigation.isUnread()
}" }"
class="subscriptions-feed with-counter with-menu"> class="subscriptions-feed with-counter with-menu">
<a class="icon-rss" ng-href="#/items/unread" > <a class="icon-rss" ng-href="#/items/unread/" >
<?php p($l->t('Unread articles'))?> <?php p($l->t('Unread articles'))?>
</a> </a>
@ -40,13 +40,14 @@
active: Navigation.isSubscriptionsActive(), active: Navigation.isSubscriptionsActive(),
unread: Navigation.isUnread() unread: Navigation.isUnread()
}" }"
class="all-subscriptions-feed with-counter with-menu"> ng-if="Navigation.isShowAll()"
class="all-subscriptions-feed with-menu">
<a class="icon-rss" ng-href="#/items/" ng-if="Navigation.isShowAll()"> <a class="icon-rss" ng-href="#/items/">
<?php p($l->t('All articles'))?> <?php p($l->t('All articles'))?>
</a> </a>
<div class="app-navigation-entry-utils" ng-if="Navigation.isShowAll()"> <div class="app-navigation-entry-utils">
<ul> <ul>
<li class="app-navigation-entry-utils-menu-button"> <li class="app-navigation-entry-utils-menu-button">
<button <button
@ -56,7 +57,7 @@
</ul> </ul>
</div> </div>
<div class="app-navigation-entry-menu" ng-if="navigation.isShowAll()"> <div class="app-navigation-entry-menu">
<ul> <ul>
<li class="mark-read"> <li class="mark-read">
<button ng-click="Navigation.markRead()"> <button ng-click="Navigation.markRead()">