diff options
| author | Bernhard Posselt <nukeawhale@gmail.com> | 2013-09-12 00:59:39 +0200 |
|---|---|---|
| committer | Bernhard Posselt <nukeawhale@gmail.com> | 2013-09-12 01:00:32 +0200 |
| commit | 2391e6bf62e0a3624685a2a7c72bdb7de499bef2 (patch) | |
| tree | bd8bbc00f9894a082f5628efd3ad79916da16e4d /js/app | |
| parent | 00c6e040deec9c3998ab679dcb84fc46ae72d2ac (diff) | |
fix #342
Diffstat (limited to 'js/app')
| -rw-r--r-- | js/app/controllers/settingscontroller.coffee | 8 | ||||
| -rw-r--r-- | js/app/services/businesslayer/feedbusinesslayer.coffee | 20 | ||||
| -rw-r--r-- | js/app/services/persistence.coffee | 8 |
3 files changed, 13 insertions, 23 deletions
diff --git a/js/app/controllers/settingscontroller.coffee b/js/app/controllers/settingscontroller.coffee index b7cea8d21..120dfed49 100644 --- a/js/app/controllers/settingscontroller.coffee +++ b/js/app/controllers/settingscontroller.coffee @@ -37,14 +37,16 @@ angular.module('News').controller 'SettingsController', $scope.error = true - $scope.importGoogleReader = (fileContent) => + $scope.importArticles = (fileContent) => $scope.jsonError = false - ShowAll.setShowAll(true) + $scope.loading = true try parsedJSON = JSON.parse(fileContent) - FeedBusinessLayer.importGoogleReader(parsedJSON) + FeedBusinessLayer.importArticles parsedJSON, -> + $scope.loading = false catch error $scope.jsonError = true + $scope.loading = false ]
\ No newline at end of file diff --git a/js/app/services/businesslayer/feedbusinesslayer.coffee b/js/app/services/businesslayer/feedbusinesslayer.coffee index cff714ac0..9b5f08a1c 100644 --- a/js/app/services/businesslayer/feedbusinesslayer.coffee +++ b/js/app/services/businesslayer/feedbusinesslayer.coffee @@ -174,25 +174,11 @@ FeedModel, NewLoading, _ExistsError, Utils, $rootScope, NewestItem)-> @_feedModel.removeByUrl(url) - importGoogleReader: (json) -> - url = 'http://owncloud/googlereader' # hardcoded - - if angular.isUndefined(@_feedModel.getByUrl(url)) - feed = - title: 'Google Reader' - url: url - folderId: 0 - unreadCount: 0 - faviconLink: 'url(' + - @_utils.imagePath('core', 'loading.gif') + ')' - - @_feedModel.add(feed) - + importArticles: (json, callback) -> onSuccess = (response) => - id = response.data.feeds[0].id - @load(id) + callback() - @_persistence.importGoogleReader(json, onSuccess) + @_persistence.importArticles(json, onSuccess) return new FeedBusinessLayer(ShowAll, FeedModel, Persistence, ActiveFeed, diff --git a/js/app/services/persistence.coffee b/js/app/services/persistence.coffee index e1562fc46..559601f69 100644 --- a/js/app/services/persistence.coffee +++ b/js/app/services/persistence.coffee @@ -254,13 +254,15 @@ $rootScope, $q) -> @_request.post 'news_feeds_update', params - importGoogleReader: (json, onSuccess) -> + importArticles: (json, onSuccess) -> params = data: json: json - onSuccess: onSuccess + onSuccess: => + @getAllFeeds() + onSuccess() - @_request.post 'news_feeds_import_googlereader', params + @_request.post 'news_feeds_import_articles', params ### |