diff options
| author | Bernhard Posselt <dev@bernhard-posselt.com> | 2013-09-23 02:11:54 +0200 |
|---|---|---|
| committer | Bernhard Posselt <dev@bernhard-posselt.com> | 2013-09-23 02:11:54 +0200 |
| commit | 00119cb60c9c1b24b141c7197fadb02c4e482861 (patch) | |
| tree | 8b94ca4262e3c72aa1f7513520c20a7fc2c48e7e /js | |
| parent | d8eb445220de1b6a71ce77468b6aedec3e547697 (diff) | |
Empty folders should probably be displayed
Edit
fix #361
Diffstat (limited to 'js')
| -rw-r--r-- | js/app/services/businesslayer/folderbusinesslayer.coffee | 2 | ||||
| -rw-r--r-- | js/public/app.js | 2 | ||||
| -rw-r--r-- | js/tests/services/businesslayer/folderbusinesslayerSpec.coffee | 7 |
3 files changed, 9 insertions, 2 deletions
diff --git a/js/app/services/businesslayer/folderbusinesslayer.coffee b/js/app/services/businesslayer/folderbusinesslayer.coffee index 6c5457e91..c039a7d39 100644 --- a/js/app/services/businesslayer/folderbusinesslayer.coffee +++ b/js/app/services/businesslayer/folderbusinesslayer.coffee @@ -105,7 +105,7 @@ FeedModel, $rootScope) -> isVisible: (folderId) -> - if @_showAll.getShowAll() + if @_showAll.getShowAll() || @_feedBusinessLayer.noFeeds() return true else if @isActive(folderId) or diff --git a/js/public/app.js b/js/public/app.js index 9ec1a71de..d92c0aec3 100644 --- a/js/public/app.js +++ b/js/public/app.js @@ -1379,7 +1379,7 @@ License along with this library. If not, see <http://www.gnu.org/licenses/>. FolderBusinessLayer.prototype.isVisible = function(folderId) { var feed, _i, _len, _ref; - if (this._showAll.getShowAll()) { + if (this._showAll.getShowAll() || this._feedBusinessLayer.noFeeds()) { return true; } else { if (this.isActive(folderId) || this._feedBusinessLayer.getFolderUnreadCount(folderId) > 0) { diff --git a/js/tests/services/businesslayer/folderbusinesslayerSpec.coffee b/js/tests/services/businesslayer/folderbusinesslayerSpec.coffee index 2409649ae..e4c96a991 100644 --- a/js/tests/services/businesslayer/folderbusinesslayerSpec.coffee +++ b/js/tests/services/businesslayer/folderbusinesslayerSpec.coffee @@ -138,12 +138,19 @@ describe 'FolderBusinessLayer', -> it 'should be visible if show all is true', => + @FolderModel.add({id: 3, opened: false, name: 'ho'}) + @FeedModel.add({id: 3, unreadCount:0, folderId: 3, url: 'a1'}) expect(@FolderBusinessLayer.isVisible(3)).toBe(false) @ShowAll.setShowAll(true) expect(@FolderBusinessLayer.isVisible(3)).toBe(true) + it 'should be visible if it has no feeds', => + @FolderModel.add({id: 13, opened: false, name: 'ho'}) + expect(@FolderBusinessLayer.isVisible(13)).toBe(true) + + it 'should be visible if its active', => @ActiveFeed.handle({type: @FeedType.Folder, id:3}) expect(@FolderBusinessLayer.isVisible(3)).toBe(true) |