Archives/Athou_commafeed
1
0
Fork 1
mirror of https://github.com/Athou/commafeed.git synced 2026-03-21 21:37:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix #25

Browse Source
This commit is contained in:
Athou
2013-04-09 09:03:52 +02:00
parent ea8a5def8c
commit 7b9bfeb816
8 changed files with 29 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/webapp/directives/category.html
View File

@@ -3,7 +3,7 @@
ng-class="{selected: (node.id == selectedId && selectedType == 'category')}">{{formatCategoryName({category:node})}}
</label>
<ul>
<li ng-repeat="feed in node.feeds" ng-mouseenter="hovered=feed" ng-mouseleave="hovered=null" ng-class="{error: feed.message}">
<li ng-repeat="feed in node.feeds" ng-mouseenter="hovered=feed" ng-mouseleave="hovered=null" ng-class="{error: feed.message && feed.errorCount > 10}">
<div class="dropdown pull-right">
<a dropdown-toggle class="pull-right"><i ng-show="hovered==feed" class="icon icon-chevron-down"></i> </a>
<ul class="dropdown-menu">

4
src/main/webapp/js/controllers.js
View File

@@ -253,6 +253,7 @@ module.controller('FeedListCtrl', function($scope, $stateParams, $http, $route,
$scope.name = null;
$scope.message = null;
$scope.errorCount = 0;
$scope.entries = [];
$scope.settingsService = SettingsService;
@@ -287,6 +288,7 @@ module.controller('FeedListCtrl', function($scope, $stateParams, $http, $route,
}
$scope.name = data.name;
$scope.message = data.message;
$scope.errorCount = data.errorCount;
$scope.busy = false;
$scope.hasMore = data.entries.length == limit;
};
@@ -407,6 +409,8 @@ module.controller('FeedListCtrl', function($scope, $stateParams, $http, $route,
$scope.$on('reload', function(event, args) {
$scope.name = null;
$scope.entries = [];
$scope.message = null;
$scope.errorCount = 0;
$scope.busy = false;
$scope.hasMore = true;
$scope.loadMoreEntries();

4
src/main/webapp/templates/feeds.view.html
View File

@@ -5,7 +5,7 @@
</div>
<div infinite-scroll="loadMoreEntries()" infinite-scroll-disabled="busy || !settingsService.settings.readingMode" infinite-scroll-distance="1" id="feed-accordion">
<div ng-show="message">Error while loading this feed : {{message}}</div>
<div ng-show="message && errorCount > 10">Error while loading this feed : {{message}}</div>
<div ng-repeat="entry in entries" class="entry" scroll-to="isOpen && current == entry" scroll-to-offset="-58">
<a href="{{entry.url}}" target="_blank" class="entry-heading" ng-click="entryClicked(entry, $event)"
ng-class="{open: current == entry, closed: current != entry}">
@@ -29,6 +29,6 @@
</div>
</div>
</div>
<div class="no-entries" ng-show="!message && name && entries.length == 0 && !busy">"{{name}}" has no unread items.</div>
<div class="no-entries" ng-show="name && entries.length == 0 && !busy">"{{name}}" has no unread items.</div>
</div>
</div>