summaryrefslogtreecommitdiffstats
path: root/js/public/app.js
diff options
context:
space:
mode:
authorBernhard Posselt <dev@bernhard-posselt.com>2014-04-09 16:53:00 +0200
committerBernhard Posselt <dev@bernhard-posselt.com>2014-04-09 22:52:27 +0200
commit8588c4602811f698dec26a607bd14ea980c5ce72 (patch)
treed538be3c2e81fbb01325669cd25515e9898d5cba /js/public/app.js
parent3b5d012b57774420049408b96aa64282f0d34609 (diff)
fix user settings request
Diffstat (limited to 'js/public/app.js')
-rw-r--r--js/public/app.js11
1 files changed, 3 insertions, 8 deletions
diff --git a/js/public/app.js b/js/public/app.js
index 8aac72b38..0c94f1a57 100644
--- a/js/public/app.js
+++ b/js/public/app.js
@@ -3387,20 +3387,15 @@ License along with this library. If not, see <http://www.gnu.org/licenses/>.
Loads the initial data from the server
*/
- var successCallback, successCount,
+ var successCallback,
_this = this;
- successCount = 0;
this.deferred = $q.defer();
this.getAllFolders();
successCallback = function() {
- if (successCount === 1) {
- return _this.deferred.resolve();
- } else {
- return successCount++;
- }
+ return _this.deferred.resolve();
};
this.getAllFeeds(successCallback);
- this.getSettings(successCallback);
+ this.getSettings();
this.getActiveFeed(function() {
return _this.getItems(_this._activeFeed.getType(), _this._activeFeed.getId());
});