diff options
| author | Bernhard Posselt <nukeawhale@gmail.com> | 2013-04-17 11:53:59 +0200 |
|---|---|---|
| committer | Bernhard Posselt <nukeawhale@gmail.com> | 2013-04-17 11:53:59 +0200 |
| commit | 9452c4bf7fc914a22034371be1635d4bd8403520 (patch) | |
| tree | 8f2344ea33f4ac979cda35e2774e1c4d3bfe6dd1 /js | |
| parent | 1fbcd35ac8f868e48228aafa375c5a305554a3c3 (diff) | |
dont kill favicons on feed update
Diffstat (limited to 'js')
| -rw-r--r-- | js/app/services/models/feedmodel.coffee | 2 | ||||
| -rw-r--r-- | js/public/app.js | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/js/app/services/models/feedmodel.coffee b/js/app/services/models/feedmodel.coffee index f0296957e..feaeffee0 100644 --- a/js/app/services/models/feedmodel.coffee +++ b/js/app/services/models/feedmodel.coffee @@ -40,7 +40,7 @@ angular.module('News').factory 'FeedModel', if data.faviconLink == null data.faviconLink = 'url(' + @_utils.imagePath('news', 'rss.svg') + ')' - else + else if angular.isDefined(data.faviconLink) data.faviconLink = 'url(' + data.faviconLink + ')' ### We want to add a feed on the client side before diff --git a/js/public/app.js b/js/public/app.js index 15504d914..6e3967a24 100644 --- a/js/public/app.js +++ b/js/public/app.js @@ -1602,7 +1602,7 @@ License along with this library. If not, see <http://www.gnu.org/licenses/>. } if (data.faviconLink === null) { data.faviconLink = 'url(' + this._utils.imagePath('news', 'rss.svg') + ')'; - } else { + } else if (angular.isDefined(data.faviconLink)) { data.faviconLink = 'url(' + data.faviconLink + ')'; } /* |