summaryrefslogtreecommitdiffstats
path: root/js/app
diff options
context:
space:
mode:
authorBernhard Posselt <nukeawhale@gmail.com>2013-05-06 11:50:50 +0200
committerBernhard Posselt <nukeawhale@gmail.com>2013-05-06 11:50:50 +0200
commit5981406dc05e7043bcccfad19a3da126b8bc1c0c (patch)
tree11237fe865353ff3f6d71fa81daf633adf559d37 /js/app
parent17356ec05fdc19725689d6475b6443f1b3dbd24a (diff)
dont show loading sign when updating feeds and folders, fix #153
Diffstat (limited to 'js/app')
-rw-r--r--js/app/app.coffee4
-rw-r--r--js/app/services/persistence.coffee21
2 files changed, 16 insertions, 9 deletions
diff --git a/js/app/app.coffee b/js/app/app.coffee
index 00218728d..a6e0511f4 100644
--- a/js/app/app.coffee
+++ b/js/app/app.coffee
@@ -39,8 +39,8 @@ angular.module('News').run ['Persistence', 'Config',
Persistence.init()
setInterval ->
- Persistence.getAllFeeds()
- Persistence.getAllFolders()
+ Persistence.getAllFeeds(null, false)
+ Persistence.getAllFolders(null, false)
, Config.feedUpdateInterval
]
diff --git a/js/app/services/persistence.coffee b/js/app/services/persistence.coffee
index 341cf66f6..771f6a5fb 100644
--- a/js/app/services/persistence.coffee
+++ b/js/app/services/persistence.coffee
@@ -238,16 +238,23 @@ $rootScope) ->
###
FOLDER CONTROLLER
###
- getAllFolders: (onSuccess) ->
+ getAllFolders: (onSuccess, showLoading=true) ->
onSuccess or= ->
+
# loading sign handling
- @_feedLoading.increase()
- successCallbackWrapper = (data) =>
- onSuccess()
- @_feedLoading.decrease()
- failureCallbackWrapper = (data) =>
- @_feedLoading.decrease()
+ if showLoading
+ @_feedLoading.increase()
+ successCallbackWrapper = (data) =>
+ onSuccess()
+ @_feedLoading.decrease()
+ failureCallbackWrapper = (data) =>
+ @_feedLoading.decrease()
+ else
+ successCallbackWrapper = (data) =>
+ onSuccess()
+ failureCallbackWrapper = (data) =>
+
params =
onSuccess: successCallbackWrapper