summaryrefslogtreecommitdiffstats
path: root/js/app/services
diff options
context:
space:
mode:
Diffstat (limited to 'js/app/services')
-rw-r--r--js/app/services/businesslayer/businesslayer.coffee (renamed from js/app/services/bl/bl.coffee)6
-rw-r--r--js/app/services/businesslayer/feedbusinesslayer.coffee (renamed from js/app/services/bl/feedbl.coffee)16
-rw-r--r--js/app/services/businesslayer/folderbusinesslayer.coffee (renamed from js/app/services/bl/folderbl.coffee)34
-rw-r--r--js/app/services/businesslayer/itembusinesslayer.coffee (renamed from js/app/services/bl/itembl.coffee)20
-rw-r--r--js/app/services/businesslayer/starredbusinesslayer.coffee (renamed from js/app/services/bl/starredbl.coffee)11
-rw-r--r--js/app/services/businesslayer/subscriptionsbusinesslayer.coffee (renamed from js/app/services/bl/subscriptionsbl.coffee)27
6 files changed, 60 insertions, 54 deletions
diff --git a/js/app/services/bl/bl.coffee b/js/app/services/businesslayer/businesslayer.coffee
index 27e4d321a..7cfbb703c 100644
--- a/js/app/services/bl/bl.coffee
+++ b/js/app/services/businesslayer/businesslayer.coffee
@@ -21,9 +21,9 @@ License along with this library. If not, see <http://www.gnu.org/licenses/>.
###
-angular.module('News').factory '_Bl', ->
+angular.module('News').factory '_BusinessLayer', ->
- class Bl
+ class BusinessLayer
constructor: (@_activeFeed, @_persistence, @_itemModel, @_type) ->
@@ -42,4 +42,4 @@ angular.module('News').factory '_Bl', ->
return @_activeFeed.getType() == @_type && @_activeFeed.getId() == id
- return Bl \ No newline at end of file
+ return BusinessLayer \ No newline at end of file
diff --git a/js/app/services/bl/feedbl.coffee b/js/app/services/businesslayer/feedbusinesslayer.coffee
index 38aa5bff0..2540cfc5f 100644
--- a/js/app/services/bl/feedbl.coffee
+++ b/js/app/services/businesslayer/feedbusinesslayer.coffee
@@ -21,13 +21,13 @@ License along with this library. If not, see <http://www.gnu.org/licenses/>.
###
-angular.module('News').factory 'FeedBl',
-['_Bl', 'ShowAll', 'Persistence', 'ActiveFeed', 'FeedType', 'ItemModel',
-'FeedModel', 'NewLoading', '_ExistsError', 'Utils',
-(_Bl, ShowAll, Persistence, ActiveFeed, FeedType, ItemModel, FeedModel,
-NewLoading, _ExistsError, Utils) ->
+angular.module('News').factory 'FeedBusinessLayer',
+['_BusinessLayer', 'ShowAll', 'Persistence', 'ActiveFeed', 'FeedType',
+'ItemModel', 'FeedModel', 'NewLoading', '_ExistsError', 'Utils',
+(_BusinessLayer, ShowAll, Persistence, ActiveFeed, FeedType, ItemModel,
+FeedModel, NewLoading, _ExistsError, Utils) ->
- class FeedBl extends _Bl
+ class FeedBusinessLayer extends _BusinessLayer
constructor: (@_showAll, @_feedModel, persistence, activeFeed, feedType,
itemModel, @_newLoading, @_utils) ->
@@ -171,7 +171,7 @@ NewLoading, _ExistsError, Utils) ->
@_persistence.updateFeed(feed.id)
- return new FeedBl(ShowAll, FeedModel, Persistence, ActiveFeed, FeedType,
- ItemModel, NewLoading, Utils)
+ return new FeedBusinessLayer(ShowAll, FeedModel, Persistence, ActiveFeed,
+ FeedType, ItemModel, NewLoading, Utils)
] \ No newline at end of file
diff --git a/js/app/services/bl/folderbl.coffee b/js/app/services/businesslayer/folderbusinesslayer.coffee
index 42c1d9752..969783222 100644
--- a/js/app/services/bl/folderbl.coffee
+++ b/js/app/services/businesslayer/folderbusinesslayer.coffee
@@ -21,15 +21,15 @@ License along with this library. If not, see <http://www.gnu.org/licenses/>.
###
-angular.module('News').factory 'FolderBl',
-['_Bl', 'FolderModel', 'FeedBl', 'Persistence', 'FeedType', 'ActiveFeed',
-'ItemModel', 'ShowAll', '_ExistsError', 'OPMLParser',
-(_Bl, FolderModel, FeedBl, Persistence, FeedType, ActiveFeed,
-ItemModel, ShowAll, _ExistsError, OPMLParser)->
+angular.module('News').factory 'FolderBusinessLayer',
+['_BusinessLayer', 'FolderModel', 'FeedBusinessLayer', 'Persistence',
+'FeedType', 'ActiveFeed', 'ItemModel', 'ShowAll', '_ExistsError', 'OPMLParser',
+(_BusinessLayer, FolderModel, FeedBusinessLayer, Persistence, FeedType,
+ActiveFeed, ItemModel, ShowAll, _ExistsError, OPMLParser) ->
- class FolderBl extends _Bl
+ class FolderBusinessLayer extends _BusinessLayer
- constructor: (@_folderModel, @_feedBl, @_showAll, activeFeed,
+ constructor: (@_folderModel, @_feedBusinessLayer, @_showAll, activeFeed,
persistence, @_feedType, itemModel, @_opmlParser) ->
super(activeFeed, persistence, itemModel, @_feedType.Folder)
@@ -43,7 +43,7 @@ ItemModel, ShowAll, _ExistsError, OPMLParser)->
hasFeeds: (folderId) ->
- return @_feedBl.getFeedsOfFolder(folderId).length
+ return @_feedBusinessLayer.getFeedsOfFolder(folderId).length
open: (folderId) ->
@@ -66,12 +66,12 @@ ItemModel, ShowAll, _ExistsError, OPMLParser)->
markFolderRead: (folderId) ->
- for feed in @_feedBl.getFeedsOfFolder(folderId)
- @_feedBl.markFeedRead(feed.id)
+ for feed in @_feedBusinessLayer.getFeedsOfFolder(folderId)
+ @_feedBusinessLayer.markFeedRead(feed.id)
getUnreadCount: (folderId) ->
- return @_feedBl.getFolderUnreadCount(folderId)
+ return @_feedBusinessLayer.getFolderUnreadCount(folderId)
isVisible: (folderId) ->
@@ -79,10 +79,10 @@ ItemModel, ShowAll, _ExistsError, OPMLParser)->
return true
else
if @isActive(folderId) or
- @_feedBl.getFolderUnreadCount(folderId) > 0
+ @_feedBusinessLayer.getFolderUnreadCount(folderId) > 0
return true
if @_activeFeed.getType() == @_feedType.Feed
- for feed in @_feedBl.getFeedsOfFolder(folderId)
+ for feed in @_feedBusinessLayer.getFeedsOfFolder(folderId)
if feed.id == @_activeFeed.getId()
return true
return false
@@ -146,13 +146,15 @@ ItemModel, ShowAll, _ExistsError, OPMLParser)->
else
try
do (item) =>
- @_feedBl.create(item.getUrl(), parentFolderId)
+ @_feedBusinessLayer.create(item.getUrl(),
+ parentFolderId)
catch error
if not error instanceof _ExistsError
console.info error
- return new FolderBl(FolderModel, FeedBl, ShowAll, ActiveFeed, Persistence,
- FeedType, ItemModel, OPMLParser)
+ return new FolderBusinessLayer(FolderModel, FeedBusinessLayer, ShowAll,
+ ActiveFeed, Persistence, FeedType, ItemModel,
+ OPMLParser)
] \ No newline at end of file
diff --git a/js/app/services/bl/itembl.coffee b/js/app/services/businesslayer/itembusinesslayer.coffee
index 6a09400af..294be1f40 100644
--- a/js/app/services/bl/itembl.coffee
+++ b/js/app/services/businesslayer/itembusinesslayer.coffee
@@ -21,14 +21,16 @@ License along with this library. If not, see <http://www.gnu.org/licenses/>.
###
-angular.module('News').factory 'ItemBl',
-['ItemModel', 'FeedModel', 'Persistence', 'ActiveFeed', 'FeedType', 'StarredBl',
-(ItemModel, FeedModel, Persistence, ActiveFeed, FeedType, StarredBl) ->
+angular.module('News').factory 'ItemBusinessLayer',
+['ItemModel', 'FeedModel', 'Persistence', 'ActiveFeed', 'FeedType',
+'StarredBusinessLayer',
+(ItemModel, FeedModel, Persistence, ActiveFeed, FeedType,
+StarredBusinessLayer) ->
- class ItemBl
+ class ItemBusinessLayer
constructor: (@_itemModel, @_feedModel, @_persistence, @_activeFeed,
- @_feedType, @_starredBl) ->
+ @_feedType, @_starredBusinessLayer) ->
getAll: ->
return @_itemModel.getAll()
@@ -59,11 +61,11 @@ angular.module('News').factory 'ItemBl',
item = @_itemModel.getById(itemId)
if item.isStarred()
item.setUnstarred()
- @_starredBl.decreaseCount()
+ @_starredBusinessLayer.decreaseCount()
@_persistence.unstarItem(item.feedId, item.guidHash)
else
item.setStarred()
- @_starredBl.increaseCount()
+ @_starredBusinessLayer.increaseCount()
@_persistence.starItem(item.feedId, item.guidHash)
@@ -107,7 +109,7 @@ angular.module('News').factory 'ItemBl',
- return new ItemBl(ItemModel, FeedModel, Persistence, ActiveFeed, FeedType,
- StarredBl)
+ return new ItemBusinessLayer(ItemModel, FeedModel, Persistence, ActiveFeed,
+ FeedType, StarredBusinessLayer)
] \ No newline at end of file
diff --git a/js/app/services/bl/starredbl.coffee b/js/app/services/businesslayer/starredbusinesslayer.coffee
index 176973e04..656a3befb 100644
--- a/js/app/services/bl/starredbl.coffee
+++ b/js/app/services/businesslayer/starredbusinesslayer.coffee
@@ -21,11 +21,12 @@ License along with this library. If not, see <http://www.gnu.org/licenses/>.
###
-angular.module('News').factory 'StarredBl',
-['_Bl', 'StarredCount', 'Persistence', 'ActiveFeed', 'FeedType', 'ItemModel',
-(_Bl, StarredCount, Persistence, ActiveFeed, FeedType, ItemModel) ->
+angular.module('News').factory 'StarredBusinessLayer',
+['_BusinessLayer', 'StarredCount', 'Persistence', 'ActiveFeed', 'FeedType',
+'ItemModel',
+(_BusinessLayer, StarredCount, Persistence, ActiveFeed, FeedType, ItemModel) ->
- class StarredBl extends _Bl
+ class StarredBusinessLayer extends _BusinessLayer
constructor: (@_starredCount, feedType,
persistence, activeFeed, itemModel) ->
@@ -49,6 +50,6 @@ angular.module('News').factory 'StarredBl',
decreaseCount: ->
@_starredCount.setStarredCount(@_starredCount.getStarredCount() - 1)
- return new StarredBl(StarredCount, FeedType, Persistence,
+ return new StarredBusinessLayer(StarredCount, FeedType, Persistence,
ActiveFeed, ItemModel)
]
diff --git a/js/app/services/bl/subscriptionsbl.coffee b/js/app/services/businesslayer/subscriptionsbusinesslayer.coffee
index 102ae8c44..2f08504eb 100644
--- a/js/app/services/bl/subscriptionsbl.coffee
+++ b/js/app/services/businesslayer/subscriptionsbusinesslayer.coffee
@@ -21,14 +21,15 @@ License along with this library. If not, see <http://www.gnu.org/licenses/>.
###
-angular.module('News').factory 'SubscriptionsBl',
-['_Bl', 'FeedBl', 'Persistence', 'ShowAll', 'ActiveFeed', 'FeedType',
-'ItemModel',
-(_Bl, FeedBl, Persistence, ShowAll, ActiveFeed, FeedType, ItemModel) ->
+angular.module('News').factory 'SubscriptionsBusinessLayer',
+['_BusinessLayer', 'FeedBusinessLayer', 'Persistence', 'ShowAll', 'ActiveFeed',
+'FeedType', 'ItemModel',
+(_BusinessLayer, FeedBusinessLayer, Persistence, ShowAll, ActiveFeed, FeedType,
+ItemModel) ->
- class SubscriptionsBl extends _Bl
+ class SubscriptionsBusinessLayer extends _BusinessLayer
- constructor: (@_feedBl, @_showAll, feedType,
+ constructor: (@_feedBusinessLayer, @_showAll, feedType,
persistence, activeFeed, itemModel) ->
super(activeFeed, persistence, itemModel, feedType.Subscriptions)
@@ -37,21 +38,21 @@ angular.module('News').factory 'SubscriptionsBl',
return true
if @_showAll.getShowAll()
- return @_feedBl.getNumberOfFeeds() > 0
+ return @_feedBusinessLayer.getNumberOfFeeds() > 0
else
- visible = @_feedBl.getNumberOfFeeds() > 0 &&
- @_feedBl.getAllUnreadCount() > 0
+ visible = @_feedBusinessLayer.getNumberOfFeeds() > 0 &&
+ @_feedBusinessLayer.getAllUnreadCount() > 0
return visible
markAllRead: ->
- @_feedBl.markAllRead()
+ @_feedBusinessLayer.markAllRead()
getUnreadCount: ->
- return @_feedBl.getAllUnreadCount()
+ return @_feedBusinessLayer.getAllUnreadCount()
- return new SubscriptionsBl(FeedBl, ShowAll, FeedType, Persistence,
- ActiveFeed, ItemModel)
+ return new SubscriptionsBusinessLayer(FeedBusinessLayer, ShowAll, FeedType,
+ Persistence, ActiveFeed, ItemModel)
]