summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--js/build/app.js6
-rw-r--r--js/controller/NavigationController.js4
-rw-r--r--templates/part.listfeed.php134
3 files changed, 73 insertions, 71 deletions
diff --git a/js/build/app.js b/js/build/app.js
index 33c8b6ae3..69ddbc4ec 100644
--- a/js/build/app.js
+++ b/js/build/app.js
@@ -375,10 +375,12 @@ var $__build_47_app__ = function () {
return $route.current && $route.current.$$route.type === FEED_TYPE.STARRED;
};
this.isFolderActive = function (folderId) {
- return $route.current && $route.current.$$route.type === FEED_TYPE.FOLDER && $route.current.params.id === folderId;
+ return $route.current && $route.current.$$route.type === FEED_TYPE.FOLDER && $route.current.params.id === folderId + '';
};
this.isFeedActive = function (feedId) {
- return $route.current && $route.current.$$route.type === FEED_TYPE.FEED && $route.current.params.id === feedId;
+ console.log(feedId);
+ console.log($route.current.params);
+ return $route.current && $route.current.$$route.type === FEED_TYPE.FEED && $route.current.params.id === feedId + '';
};
this.isAddingFolder = function () {
return true;
diff --git a/js/controller/NavigationController.js b/js/controller/NavigationController.js
index d91f14d88..8307b0e75 100644
--- a/js/controller/NavigationController.js
+++ b/js/controller/NavigationController.js
@@ -100,13 +100,13 @@ function ($route, FEED_TYPE, FeedResource, FolderResource, ItemResource,
this.isFolderActive = (folderId) => {
return $route.current &&
$route.current.$$route.type === FEED_TYPE.FOLDER &&
- $route.current.params.id === folderId;
+ $route.current.params.id === folderId + '';
};
this.isFeedActive = (feedId) => {
return $route.current &&
$route.current.$$route.type === FEED_TYPE.FEED &&
- $route.current.params.id === feedId;
+ $route.current.params.id === feedId + '';
};
// TBD
diff --git a/templates/part.listfeed.php b/templates/part.listfeed.php
index da9de8cc2..16084da7c 100644
--- a/templates/part.listfeed.php
+++ b/templates/part.listfeed.php
@@ -1,84 +1,84 @@
<li ng-class="{
- active: Navigation.isFeedActive(feed.id),
- unread: Navigation.getFeedUnreadCount(feed.id) > 0,
- failed: feed.error
- }"
- ng-repeat="feed in Navigation.getFeedsOfFolder(<?php p($_['folderId']); ?>) | orderBy:'id':true track by feed.url"
- ng-show="Navigation.getFeedUnreadCount(feed.id) > 0
- || Navigation.isShowAll()
- || Navigation.isFeedActive(feed.id)
- || !feed.id"
- data-id="{{ feed.id }}"
- class="feed"
- news-draggable="{
- stack: '> li',
- zIndex: 1000,
- axis: 'y',
- delay: 200,
- containment: '#app-navigation ul',
- scroll: true,
- revert: true
- }">
+ active: Navigation.isFeedActive(feed.id),
+ unread: Navigation.getFeedUnreadCount(feed.id) > 0,
+ failed: feed.error
+ }"
+ ng-repeat="feed in Navigation.getFeedsOfFolder(<?php p($_['folderId']); ?>) | orderBy:'id':true track by feed.url"
+ ng-show="Navigation.getFeedUnreadCount(feed.id) > 0
+ || Navigation.isShowAll()
+ || Navigation.isFeedActive(feed.id)
+ || !feed.id"
+ data-id="{{ feed.id }}"
+ class="feed"
+ news-draggable="{
+ stack: '> li',
+ zIndex: 1000,
+ axis: 'y',
+ delay: 200,
+ containment: '#app-navigation ul',
+ scroll: true,
+ revert: true
+ }">
- <div ng-if="feed.editing" class="rename-feed">
+ <div ng-if="feed.editing" class="rename-feed">
<input type="text" ng-model="feed.title" autofocus>
<button title="<?php p($l->t('Cancel')); ?>"
- ng-click="cancelRenameFeed(feed.id)"
- class="action-button back-button action"></button>
- <button title="<?php p($l->t('Save')); ?>"
- ng-click="Navigation.renameFeed(feed.id, feed.title)"
- class="action-button create-button action">
- </button>
+ ng-click="cancelRenameFeed(feed.id)"
+ class="action-button back-button action"></button>
+ <button title="<?php p($l->t('Save')); ?>"
+ ng-click="Navigation.renameFeed(feed.id, feed.title)"
+ class="action-button create-button action">
+ </button>
</div>
- <a ng-style="{ backgroundImage: 'url(' + feed.faviconLink + ')'}"
- ng-class="{
- 'progress-icon': !feed.id,
- 'problem-icon': feed.error
- }"
- ng-hide="feed.editing"
- href="#/items/feeds/{{ feed.id }}"
- class="title"
- title="{{ feed.title }}">
+ <a ng-style="{ backgroundImage: 'url(' + feed.faviconLink + ')'}"
+ ng-class="{
+ 'progress-icon': !feed.id,
+ 'problem-icon': feed.error
+ }"
+ ng-hide="feed.editing"
+ href="#/items/feeds/{{ feed.id }}"
+ class="title"
+ title="{{ feed.title }}">
- {{ feed.title }}
- </a>
+ {{ feed.title }}
+ </a>
- <span class="utils">
+ <span class="utils">
- <!--<button ng-click="Navigation.deleteFeed(feed.id)"
- class="svg action delete-icon delete-button"
- title="<?php p($l->t('Delete website')); ?>"
- ng-show="feed.id && !feed.editing && !feed.error"
- oc-tooltip></button>-->
+ <!--<button ng-click="Navigation.deleteFeed(feed.id)"
+ class="svg action delete-icon delete-button"
+ title="<?php p($l->t('Delete website')); ?>"
+ ng-show="feed.id && !feed.editing && !feed.error"
+ oc-tooltip></button>-->
- <span class="unread-counter"
- ng-show="feed.id && Navigation.getUnreadCount(feed.id) > 0 && !feed.error && !feed.editing">
- {{ Navigation.getFeedUnreadCount(feed.id) | unreadCountFormatter }}
- </span>
+ <span class="unread-counter"
+ ng-show="feed.id && Navigation.getUnreadCount(feed.id) > 0 && !feed.error && !feed.editing">
+ {{ Navigation.getFeedUnreadCount(feed.id) | unreadCountFormatter }}
+ </span>
- <!--
- <button class="svg action mark-read-icon"
- ng-show="Navigation.getUnreadCount(feed.id) > 0 && feed.id && !feed.error && !feed.editing"
- ng-click="Navigation.markRead(feed.id)"
- title="<?php p($l->t('Mark read')); ?>"
- oc-tooltip></button>
+ <!--
+ <button class="svg action mark-read-icon"
+ ng-show="Navigation.getUnreadCount(feed.id) > 0 && feed.id && !feed.error && !feed.editing"
+ ng-click="Navigation.markRead(feed.id)"
+ title="<?php p($l->t('Mark read')); ?>"
+ oc-tooltip></button>
- <button class="svg action rename-feed-icon"
- ng-hide="feed.editing || feed.error"
- ng-click="edit(feed)"
- title="<?php p($l->t('Rename feed')); ?>"
- oc-tooltip></button>
+ <button class="svg action rename-feed-icon"
+ ng-hide="feed.editing || feed.error"
+ ng-click="edit(feed)"
+ title="<?php p($l->t('Rename feed')); ?>"
+ oc-tooltip></button>
- <button class="svg action delete-icon"
- ng-click="Navigation.markErrorRead(feed.url)"
- title="<?php p($l->t('Delete website')); ?>"
- ng-show="feed.error"
- oc-tooltip></button>
- -->
- </span>
+ <button class="svg action delete-icon"
+ ng-click="Navigation.markErrorRead(feed.url)"
+ title="<?php p($l->t('Delete website')); ?>"
+ ng-show="feed.error"
+ oc-tooltip></button>
+ -->
+ </span>
- <div class="message" ng-show="feed.error">{{ feed.error }}</div>
+ <div class="message" ng-show="feed.error">{{ feed.error }}</div>
</li>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-02 12:46:25 +0000