summaryrefslogtreecommitdiffstats
path: root/js/service/FeedResource.js
diff options
context:
space:
mode:
Diffstat (limited to 'js/service/FeedResource.js')
-rw-r--r--js/service/FeedResource.js17
1 files changed, 6 insertions, 11 deletions
diff --git a/js/service/FeedResource.js b/js/service/FeedResource.js
index 4e8794137..5979493a6 100644
--- a/js/service/FeedResource.js
+++ b/js/service/FeedResource.js
@@ -183,31 +183,25 @@ app.factory('FeedResource', function (Resource, $http, BASE_URL, $q) {
FeedResource.prototype.create = function (url, folderId, title) {
- if (title) {
- title = title.toUpperCase();
- }
-
url = url.trim();
+ if (!url.startsWith('http')) {
+ url = 'http://' + url;
+ }
if (title !== undefined) {
title = title.trim();
+ } else {
+ title = url;
}
- 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'),
unreadCount: 0
};
this.add(feed);
-
this.updateFolderCache();
var deferred = this.$q.defer();
@@ -225,6 +219,7 @@ app.factory('FeedResource', function (Resource, $http, BASE_URL, $q) {
}).error(function (data) {
feed.faviconLink = '';
feed.error = data.message;
+ deferred.reject();
});
return deferred.promise;