diff options
| author | Bernhard Posselt <nukeawhale@gmail.com> | 2013-04-02 10:37:51 +0200 |
|---|---|---|
| committer | Bernhard Posselt <nukeawhale@gmail.com> | 2013-04-02 10:38:00 +0200 |
| commit | 711c260bfea993e0a1124951a55eee6c989ee888 (patch) | |
| tree | 8982f13a41e9054bb7c2377b66769fe83ae9371a /js/app | |
| parent | 635a9d779549832b4dacb2c5b9f4033d846bf154 (diff) | |
small pixel fixes
Diffstat (limited to 'js/app')
| -rw-r--r-- | js/app/controllers/feedcontroller.coffee | 32 | ||||
| -rw-r--r-- | js/app/controllers/settingscontroller.coffee | 4 | ||||
| -rw-r--r-- | js/app/services/bl/feedbl.coffee | 2 |
3 files changed, 21 insertions, 17 deletions
diff --git a/js/app/controllers/feedcontroller.coffee b/js/app/controllers/feedcontroller.coffee index 580bd4763..1b6a79c53 100644 --- a/js/app/controllers/feedcontroller.coffee +++ b/js/app/controllers/feedcontroller.coffee @@ -41,7 +41,7 @@ angular.module('News').factory '_FeedController', -> @$scope.isShown = (type, id) => - return @isShown(type, id) + return true @$scope.getUnreadCount = => return @_transFormCount(@_feedBl.getUnreadCount()) @@ -53,7 +53,7 @@ angular.module('News').factory '_FeedController', -> return @_transFormCount(@_feedBl.getFeedUnreadCount(feedId)) @$scope.getUnreadCount = (folderId) => - return @_transFormCount(@_folderBl.getFolderUnreadCount(folderId)) + return @_transFormCount(@_feedBl.getFolderUnreadCount(folderId)) @$scope.isShowAll = => return @isShowAll() @@ -133,20 +133,20 @@ angular.module('News').factory '_FeedController', -> return type == @_active.getType() and id == @_active.getId() - isShown: (type, id) -> - hasUnread = @getUnreadCount(type, id) > 0 - if hasUnread - return true - else - if @isShowAll() - switch type - when @_feedType.Subscriptions - return @_feedModel.size() > 0 - when @_feedType.Folder - return @_folderModel.size() > 0 - when @_feedType.Feed - return @_feedModel.size() > 0 - return false + #isShown: (type, id) -> + # hasUnread = @getUnreadCount(type, id) > 0 + # if hasUnread + # return true + # else + # if @isShowAll() + # switch type + # when @_feedType.Subscriptions + # return @_feedModel.size() > 0 + # when @_feedType.Folder + # return @_folderModel.size() > 0 + # when @_feedType.Feed + # return @_feedModel.size() > 0 + # return false isShowAll: -> diff --git a/js/app/controllers/settingscontroller.coffee b/js/app/controllers/settingscontroller.coffee index 0383b13fe..ec94b843c 100644 --- a/js/app/controllers/settingscontroller.coffee +++ b/js/app/controllers/settingscontroller.coffee @@ -27,5 +27,9 @@ angular.module('News').factory '_SettingsController', -> constructor: (@$scope) -> + @$scope.import = (fileContent) => + console.log 'hi' + console.log fileContent + return SettingsController
\ No newline at end of file diff --git a/js/app/services/bl/feedbl.coffee b/js/app/services/bl/feedbl.coffee index 1c2e4af09..ffbc6e51c 100644 --- a/js/app/services/bl/feedbl.coffee +++ b/js/app/services/bl/feedbl.coffee @@ -28,7 +28,7 @@ angular.module('News').factory '_FeedBl', -> constructor: (@_feedModel, @_itemBl, @_persistence) -> - getUnreadCount: (feedId) -> + getFeedUnreadCount: (feedId) -> @_feedModel.getFeedUnreadCount(feedId) |