diff options
| author | Bernhard Posselt <nukeawhale@gmail.com> | 2013-05-10 15:19:30 +0200 |
|---|---|---|
| committer | Bernhard Posselt <nukeawhale@gmail.com> | 2013-05-10 15:19:30 +0200 |
| commit | 3843f75b494bd8f612dc7b940a1d9b331d70f581 (patch) | |
| tree | b7342ddf4820b3d060bbbae5b5aa64235bc492a1 /js/app/services/businesslayer/feedbusinesslayer.coffee | |
| parent | 347000cc2d5597c1971942ebdbe97461c9fa5802 (diff) | |
undo queue fixes (unittests not adjusted yet: todo fix folderbusinesslayer and feedbusinesslayer specs)
Diffstat (limited to 'js/app/services/businesslayer/feedbusinesslayer.coffee')
| -rw-r--r-- | js/app/services/businesslayer/feedbusinesslayer.coffee | 22 |
1 files changed, 12 insertions, 10 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 |