dont show loading sign when updating feeds and folders, fix #153

3 files changed, 37 insertions, 20 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
diff --git a/js/public/app.js b/js/public/app.js
index d71e77cbe..ced24417e 100644
--- a/js/public/app.js
+++ b/js/public/app.js
@@ -51,8 +51,8 @@ License along with this library.  If not, see <http://www.gnu.org/licenses/>.
     'Persistence', 'Config', function(Persistence, Config) {
       Persistence.init();
       return setInterval(function() {
-        Persistence.getAllFeeds();
-        return Persistence.getAllFolders();
+        Persistence.getAllFeeds(null, false);
+        return Persistence.getAllFolders(null, false);
       }, Config.feedUpdateInterval);
     }
   ]);
@@ -2682,19 +2682,29 @@ License along with this library.  If not, see <http://www.gnu.org/licenses/>.
         */
 
 
-        Persistence.prototype.getAllFolders = function(onSuccess) {
+        Persistence.prototype.getAllFolders = function(onSuccess, showLoading) {
           var failureCallbackWrapper, params, successCallbackWrapper,
             _this = this;
 
+          if (showLoading == null) {
+            showLoading = true;
+          }
           onSuccess || (onSuccess = function() {});
-          this._feedLoading.increase();
-          successCallbackWrapper = function(data) {
-            onSuccess();
-            return _this._feedLoading.decrease();
-          };
-          failureCallbackWrapper = function(data) {
-            return _this._feedLoading.decrease();
-          };
+          if (showLoading) {
+            this._feedLoading.increase();
+            successCallbackWrapper = function(data) {
+              onSuccess();
+              return _this._feedLoading.decrease();
+            };
+            failureCallbackWrapper = function(data) {
+              return _this._feedLoading.decrease();
+            };
+          } else {
+            successCallbackWrapper = function(data) {
+              return onSuccess();
+            };
+            failureCallbackWrapper = function(data) {};
+          }
           params = {
             onSuccess: successCallbackWrapper,
             onFailure: failureCallbackWrapper