From 7cebc63defdd640b822132a1e24b489345ac06e9 Mon Sep 17 00:00:00 2001
From: Daniel Schaal <daniel@schaal.email>
Date: Thu, 8 Jun 2017 05:10:34 +0200
Subject: Use regular promise for http calls

---
 js/controller/ContentController.js  | 9 +++++----
 js/controller/SettingsController.js | 2 +-
 2 files changed, 6 insertions(+), 5 deletions(-)

(limited to 'js/controller')

diff --git a/js/controller/ContentController.js b/js/controller/ContentController.js
index dbd8bbc75..51f8eca69 100644
--- a/js/controller/ContentController.js
+++ b/js/controller/ContentController.js
@@ -178,10 +178,10 @@ app.controller('ContentController',
             Loading.setLoading('autopaging', true);
 
             ItemResource.autoPage(type, id, oldestFirst, showAll, search)
-                .success(function (data) {
-                    Publisher.publishAll(data);
+                .then(function (response) {
+                    Publisher.publishAll(response.data);
 
-                    if (data.items.length >= ITEM_AUTO_PAGE_SIZE) {
+                    if (response.data.items.length >= ITEM_AUTO_PAGE_SIZE) {
                         self.isAutoPagingEnabled = true;
                     } else {
                         self.isNothingMoreToAutoPage = true;
@@ -190,7 +190,8 @@ app.controller('ContentController',
                     if (self.isAutoPagingEnabled && self.autoPageAgain) {
                         self.autoPage();
                     }
-                }).error(function () {
+                    return response.data;
+                }, function () {
                 self.isAutoPagingEnabled = true;
             }).finally(function () {
                 Loading.setLoading('autopaging', false);
diff --git a/js/controller/SettingsController.js b/js/controller/SettingsController.js
index 1507fdf55..c20f801c8 100644
--- a/js/controller/SettingsController.js
+++ b/js/controller/SettingsController.js
@@ -74,7 +74,7 @@ app.controller('SettingsController',
                 var articles = JSON.parse(content);
 
                 var self = this;
-                ItemResource.importArticles(articles).success(function (data) {
+                ItemResource.importArticles(articles).then(function (data) {
                     Publisher.publishAll(data);
                 }).finally(function () {
                     self.isArticlesImporting = false;
-- 
cgit v1.2.3