diff options
author | Bernhard Posselt <dev@bernhard-posselt.com> | 2014-09-13 02:42:19 +0200 |
---|---|---|
committer | Bernhard Posselt <dev@bernhard-posselt.com> | 2014-09-13 02:42:19 +0200 |
commit | 0a818fa9ff21d98c16def02cfbf1043ea675d2a9 (patch) | |
tree | 53cfa5d989fe2046d81fe086fd26d1c8ae5dd6b6 /js/service | |
parent | 8c38ef40bd9b1ff794de218ea71d43971bef4c59 (diff) |
delete + undo folders
Diffstat (limited to 'js/service')
-rw-r--r-- | js/service/FeedResource.js | 2 | ||||
-rw-r--r-- | js/service/FolderResource.js | 22 |
2 files changed, 5 insertions, 19 deletions
diff --git a/js/service/FeedResource.js b/js/service/FeedResource.js index fa2ffd044..425d41b12 100644 --- a/js/service/FeedResource.js +++ b/js/service/FeedResource.js @@ -220,6 +220,8 @@ app.factory('FeedResource', function (Resource, $http, BASE_URL, $q) { this.updateUnreadCache(); this.updateFolderCache(); + + return feed; }; diff --git a/js/service/FolderResource.js b/js/service/FolderResource.js index cd5adc266..a0c75a2e4 100644 --- a/js/service/FolderResource.js +++ b/js/service/FolderResource.js @@ -18,15 +18,6 @@ app.factory('FolderResource', function (Resource, $http, BASE_URL, $q) { FolderResource.prototype = Object.create(Resource.prototype); - FolderResource.prototype.delete = function (folderName) { - var folder = this.get(folderName); - this.deleted = folder; - - Resource.prototype.delete.call(this, folderName); - - return this.http.delete(this.BASE_URL + '/folders/' + folder.id); - }; - FolderResource.prototype.toggleOpen = function (folderName) { var folder = this.get(folderName); @@ -94,20 +85,13 @@ app.factory('FolderResource', function (Resource, $http, BASE_URL, $q) { }; - FolderResource.prototype.reversiblyDeleteFolder = function (id) { + FolderResource.prototype.reversiblyDelete = function (id) { return this.http.delete(this.BASE_URL + '/folders/' + id); }; - FolderResource.prototype.undoDelete = function () { - // TODO: check for errors - if (this.deleted) { - this.add(this.deleted); - - return this.http.post( - this.BASE_URL + '/folders/' + this.deleted.id + '/restore' - ); - } + FolderResource.prototype.undoDelete = function (id) { + return this.http.post(this.BASE_URL + '/folders/' + id + '/restore'); }; |