diff options
author | Bernhard Posselt <dev@bernhard-posselt.com> | 2014-09-12 03:03:44 +0200 |
---|---|---|
committer | Bernhard Posselt <dev@bernhard-posselt.com> | 2014-09-12 03:03:44 +0200 |
commit | 761412ebaaf0930499ca26e7acdd0965be5a50ae (patch) | |
tree | 24c62f2b64e12d92e339c16f96fb1f01dae7972c /js/service | |
parent | 1a04a1c73540be7c7294ef86b92df65bd91c5fc8 (diff) |
create folders!
Diffstat (limited to 'js/service')
-rw-r--r-- | js/service/FeedResource.js | 17 | ||||
-rw-r--r-- | js/service/FolderResource.js | 7 |
2 files changed, 15 insertions, 9 deletions
diff --git a/js/service/FeedResource.js b/js/service/FeedResource.js index 7e1513238..4e8794137 100644 --- a/js/service/FeedResource.js +++ b/js/service/FeedResource.js @@ -187,17 +187,26 @@ app.factory('FeedResource', function (Resource, $http, BASE_URL, $q) { title = title.toUpperCase(); } + url = url.trim(); + + if (title !== undefined) { + title = title.trim(); + } + + if (!url.startsWith('http')) { + url = 'http://' + url; + } + // FIXME: use OC.generateUrl() var feed = { url: url, folderId: folderId || 0, title: title, - faviconLink: OC.generateUrl('/apps/news/css/loading.gif') + faviconLink: OC.generateUrl('/apps/news/css/loading.gif'), + unreadCount: 0 }; - if (!this.get(url)) { - this.add(feed); - } + this.add(feed); this.updateFolderCache(); diff --git a/js/service/FolderResource.js b/js/service/FolderResource.js index 0b667ac3a..46f55e318 100644 --- a/js/service/FolderResource.js +++ b/js/service/FolderResource.js @@ -64,6 +64,7 @@ app.factory('FolderResource', function (Resource, $http, BASE_URL, $q) { FolderResource.prototype.create = function (folderName) { + folderName = folderName.trim(); var folder = { name: folderName }; @@ -72,10 +73,7 @@ app.factory('FolderResource', function (Resource, $http, BASE_URL, $q) { var deferred = this.$q.defer(); - var self = this; - setTimeout(function () { - - self.http({ + this.http({ url: this.BASE_URL + '/folders', method: 'POST', data: { @@ -86,7 +84,6 @@ app.factory('FolderResource', function (Resource, $http, BASE_URL, $q) { }).error(function (data) { folder.error = data.message; }); - }, 30000); return deferred.promise; }; |