Use regular promise for http calls

3 files changed, 16 insertions, 28 deletions

diff --git a/js/service/FeedResource.js b/js/service/FeedResource.js
index 3e138a952..bb1f30f3f 100644
--- a/js/service/FeedResource.js
+++ b/js/service/FeedResource.js
@@ -184,9 +184,7 @@ app.factory('FeedResource', function (Resource, $http, BASE_URL, $q) {
         this.add(feed);
         this.updateFolderCache();
 
-        var deferred = this.$q.defer();
-
-        this.http({
+        return this.http({
             method: 'POST',
             url: this.BASE_URL + '/feeds',
             data: {
@@ -196,15 +194,12 @@ app.factory('FeedResource', function (Resource, $http, BASE_URL, $q) {
                 user: user || null,
                 password: password || null
             }
-        }).success(function (data) {
-            deferred.resolve(data);
-        }).error(function (data) {
+        }).then(function (response) {
+            return response.data;
+        }, function (response) {
             feed.faviconLink = '';
-            feed.error = data.message;
-            deferred.reject();
+            feed.error = response.data.message;
         });
-
-        return deferred.promise;
     };
 
 
diff --git a/js/service/FolderResource.js b/js/service/FolderResource.js
index c5105e521..43ff8422d 100644
--- a/js/service/FolderResource.js
+++ b/js/service/FolderResource.js
@@ -60,26 +60,21 @@ app.factory('FolderResource', function (Resource, $http, BASE_URL, $q) {
 
     FolderResource.prototype.rename = function (folderName, toFolderName) {
         var folder = this.get(folderName);
-        var deferred = this.$q.defer();
         var self = this;
 
-        this.http({
+        return this.http({
             url: this.BASE_URL + '/folders/' + folder.id + '/rename',
             method: 'POST',
             data: {
                 folderName: toFolderName
             }
-        }).success(function () {
+        }).then(function () {
             folder.name = toFolderName;
             delete self.hashMap[folderName];
             self.hashMap[toFolderName] = folder;
-
-            deferred.resolve();
-        }).error(function (data) {
-            deferred.reject(data.message);
+        }, function (response) {
+            return response.data.message;
         });
-
-        return deferred.promise;
     };
 
     FolderResource.prototype.getById = function (id) {
@@ -94,21 +89,17 @@ app.factory('FolderResource', function (Resource, $http, BASE_URL, $q) {
 
         this.add(folder);
 
-        var deferred = this.$q.defer();
-
-        this.http({
+        return this.http({
             url: this.BASE_URL + '/folders',
             method: 'POST',
             data: {
                 folderName: folderName
             }
-        }).success(function (data) {
-            deferred.resolve(data);
-        }).error(function (data) {
-            folder.error = data.message;
+        }).then(function (response) {
+            return response.data;
+        }, function (response) {
+            folder.error = response.data.message;
         });
-
-        return deferred.promise;
     };
 
 
diff --git a/js/service/ItemResource.js b/js/service/ItemResource.js
index 6e1f83400..159216797 100644
--- a/js/service/ItemResource.js
+++ b/js/service/ItemResource.js
@@ -216,6 +216,8 @@ app.factory('ItemResource', function (Resource, $http, BASE_URL,
             data: {
                 json: json
             }
+        }).then(function(response) {
+            return response.data;
         });
     };