summaryrefslogtreecommitdiffstats
path: root/js/app
diff options
context:
space:
mode:
authorBernhard Posselt <nukeawhale@gmail.com>2013-04-22 18:24:31 +0200
committerBernhard Posselt <nukeawhale@gmail.com>2013-04-22 18:24:31 +0200
commitdf18314b32b05f10720936831ed43573e1792ae6 (patch)
treea2b8e28e165727e7a88d7ac3529f64d5f6b938e2 /js/app
parent366c1b15545b4da69bc8e236ba4350c28ad24e77 (diff)
added import from google reader, fix #80
Diffstat (limited to 'js/app')
-rw-r--r--js/app/services/businesslayer/feedbusinesslayer.coffee8
-rw-r--r--js/app/services/persistence.coffee3
2 files changed, 8 insertions, 3 deletions
diff --git a/js/app/services/businesslayer/feedbusinesslayer.coffee b/js/app/services/businesslayer/feedbusinesslayer.coffee
index 93f89ad31..9a23bec43 100644
--- a/js/app/services/businesslayer/feedbusinesslayer.coffee
+++ b/js/app/services/businesslayer/feedbusinesslayer.coffee
@@ -188,8 +188,12 @@ FeedModel, NewLoading, _ExistsError, Utils, $rootScope, UndoQueue) ->
faviconLink: 'url('+@_utils.imagePath('core', 'loading.gif')+')'
@_feedModel.add(feed)
-
- @_persistence.importGoogleReader(json)
+
+ onSuccess = (response) =>
+ id = response.data.feeds[0].id
+ @load(id)
+
+ @_persistence.importGoogleReader(json, onSuccess)
return new FeedBusinessLayer(ShowAll, FeedModel, Persistence, ActiveFeed,
diff --git a/js/app/services/persistence.coffee b/js/app/services/persistence.coffee
index a5a6bc092..188f5a7c7 100644
--- a/js/app/services/persistence.coffee
+++ b/js/app/services/persistence.coffee
@@ -253,10 +253,11 @@ $rootScope) ->
@_request.post 'news_feeds_update', params
- importGoogleReader: (json) ->
+ importGoogleReader: (json, onSuccess) ->
params =
data:
json: json
+ onSuccess: onSuccess
@_request.post 'news_feeds_import_googlereader', params