diff options
Diffstat (limited to 'js/app/services/businesslayer')
-rw-r--r-- | js/app/services/businesslayer/feedbusinesslayer.coffee | 22 | ||||
-rw-r--r-- | js/app/services/businesslayer/folderbusinesslayer.coffee | 27 |
2 files changed, 26 insertions, 23 deletions
diff --git a/js/app/services/businesslayer/feedbusinesslayer.coffee b/js/app/services/businesslayer/feedbusinesslayer.coffee index 8dc1c126a..2219ce2cd 100644 --- a/js/app/services/businesslayer/feedbusinesslayer.coffee +++ b/js/app/services/businesslayer/feedbusinesslayer.coffee @@ -24,15 +24,15 @@ License along with this library. If not, see <http://www.gnu.org/licenses/>. angular.module('News').factory 'FeedBusinessLayer', ['_BusinessLayer', 'ShowAll', 'Persistence', 'ActiveFeed', 'FeedType', 'ItemModel', 'FeedModel', 'NewLoading', '_ExistsError', 'Utils', '$rootScope', -'UndoQueue', 'NewestItem', +'NewestItem', (_BusinessLayer, ShowAll, Persistence, ActiveFeed, FeedType, ItemModel, -FeedModel, NewLoading, _ExistsError, Utils, $rootScope, UndoQueue, NewestItem)-> +FeedModel, NewLoading, _ExistsError, Utils, $rootScope, NewestItem)-> class FeedBusinessLayer extends _BusinessLayer constructor: (@_showAll, @_feedModel, persistence, activeFeed, feedType, itemModel, @_newLoading, @_utils, @_$rootScope, - @_undoQueue, @_newestItem) -> + @_newestItem) -> super(activeFeed, persistence, itemModel, feedType.Feed) @_feedType = feedType @@ -55,13 +55,15 @@ FeedModel, NewLoading, _ExistsError, Utils, $rootScope, UndoQueue, NewestItem)-> delete: (feedId) -> feed = @_feedModel.removeById(feedId) - callback = => - @_persistence.deleteFeed(feedId) - - undoCallback = => - @_feedModel.add(feed) - @_undoQueue.add(feed.title, callback, 10*1000, undoCallback) + data = + undoCallback: => + @_persistence.restoreFeed feedId, => + @_persistence.getAllFeeds() + caption: feed.title + + @_$rootScope.$broadcast 'undoMessage', data + @_persistence.deleteFeed(feedId) markRead: (feedId) -> @@ -192,6 +194,6 @@ FeedModel, NewLoading, _ExistsError, Utils, $rootScope, UndoQueue, NewestItem)-> return new FeedBusinessLayer(ShowAll, FeedModel, Persistence, ActiveFeed, FeedType, ItemModel, NewLoading, Utils, - $rootScope, UndoQueue, NewestItem) + $rootScope, NewestItem) ]
\ No newline at end of file diff --git a/js/app/services/businesslayer/folderbusinesslayer.coffee b/js/app/services/businesslayer/folderbusinesslayer.coffee index 3d1fbb7c7..94bc974e6 100644 --- a/js/app/services/businesslayer/folderbusinesslayer.coffee +++ b/js/app/services/businesslayer/folderbusinesslayer.coffee @@ -24,16 +24,16 @@ License along with this library. If not, see <http://www.gnu.org/licenses/>. angular.module('News').factory 'FolderBusinessLayer', ['_BusinessLayer', 'FolderModel', 'FeedBusinessLayer', 'Persistence', 'FeedType', 'ActiveFeed', 'ItemModel', 'ShowAll', '_ExistsError', 'OPMLParser', -'UndoQueue', 'NewestItem', 'FeedModel', +'NewestItem', 'FeedModel', '$rootScope', (_BusinessLayer, FolderModel, FeedBusinessLayer, Persistence, FeedType, -ActiveFeed, ItemModel, ShowAll, _ExistsError, OPMLParser, UndoQueue, -NewestItem, FeedModel) -> +ActiveFeed, ItemModel, ShowAll, _ExistsError, OPMLParser, NewestItem, +FeedModel, $rootScope) -> class FolderBusinessLayer extends _BusinessLayer constructor: (@_folderModel, @_feedBusinessLayer, @_showAll, activeFeed, persistence, @_feedType, itemModel, @_opmlParser, - @_undoQueue, @_newestItem, @_feedModel) -> + @_newestItem, @_feedModel, @_$rootScope) -> super(activeFeed, persistence, itemModel, @_feedType.Folder) @@ -48,16 +48,17 @@ NewestItem, FeedModel) -> feeds.push(@_feedModel.removeById(feed.id)) folder = @_folderModel.removeById(folderId) - - callback = => - @_persistence.deleteFolder(folderId) - undoCallback = => - @_folderModel.add(folder) - for feed in feeds - @_feedModel.add(feed) + data = + undoCallback: => + @_persistence.restoreFolder folderId, => + @_persistence.getAllFeeds() + @_persistence.getAllFolders() + caption: folder.name + + @_$rootScope.$broadcast 'undoMessage', data + @_persistence.deleteFolder(folderId) - @_undoQueue.add(folder.name, callback, 10*1000, undoCallback) hasFeeds: (folderId) -> @@ -183,6 +184,6 @@ NewestItem, FeedModel) -> return new FolderBusinessLayer(FolderModel, FeedBusinessLayer, ShowAll, ActiveFeed, Persistence, FeedType, ItemModel, - OPMLParser, UndoQueue, NewestItem, FeedModel) + OPMLParser, NewestItem, FeedModel, $rootScope) ]
\ No newline at end of file |