summaryrefslogtreecommitdiffstats
path: root/js/app/services/models
diff options
context:
space:
mode:
authorBernhard Posselt <nukeawhale@gmail.com>2013-04-22 16:05:45 +0200
committerBernhard Posselt <nukeawhale@gmail.com>2013-04-22 16:05:45 +0200
commitb9099435cb6535db835d25361e7b706b85744b20 (patch)
tree2a681b1f9ff0de9780f1f4a785be8378d7f577ab /js/app/services/models
parentac5c8f5f4faae74c034a5cfd1e7f85ca26815bc5 (diff)
add undo for feed and folder deletion, fix #56
Diffstat (limited to 'js/app/services/models')
-rw-r--r--js/app/services/models/feedmodel.coffee3
1 files changed, 2 insertions, 1 deletions
diff --git a/js/app/services/models/feedmodel.coffee b/js/app/services/models/feedmodel.coffee
index 4c925b94c..bddd647d3 100644
--- a/js/app/services/models/feedmodel.coffee
+++ b/js/app/services/models/feedmodel.coffee
@@ -40,7 +40,8 @@ angular.module('News').factory 'FeedModel',
if data.faviconLink == null
data.faviconLink = 'url(' +
@_utils.imagePath('news', 'rss.svg') + ')'
- else if angular.isDefined(data.faviconLink)
+ else if angular.isDefined(data.faviconLink) and
+ data.faviconLink.indexOf('url(') != 0
data.faviconLink = 'url(' + data.faviconLink + ')'
###
We want to add a feed on the client side before