public-mirrors/NewsBlur-viq
1
0
Fork 0
mirror of https://github.com/viq/NewsBlur.git synced 2025-09-18 21:43:31 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Switching all remaining google favicons to homemade favicons.

Browse source
This commit is contained in:
Samuel Clay 2011-02-17 10:32:47 -05:00
parent 76e5a62c62
commit 01f0060a04
5 changed files with 16 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
media/js/jquery.newsblur.js
View file

@ -129,7 +129,12 @@ NEWSBLUR.log = function(msg) {
});
$.extend({
favicon: function(feed_favicon) {
if (feed_favicon) return 'data:image/png;base64,' + feed_favicon;
return NEWSBLUR.Globals.MEDIA_URL + '/img/icons/silk/world.png';
},
deepCopy: function(obj) {
var type = $.typeOf(obj);
switch (type) {

13
media/js/newsblur/reader.js
View file

@ -862,7 +862,7 @@
$.make('div', { className: 'feed_counts' }, [
this.make_feed_counts_floater(feed.ps, feed.nt, feed.ng)
]),
$.make('img', { className: 'feed_favicon', src: this.get_favicon(feed.favicon) }),
$.make('img', { className: 'feed_favicon', src: $.favicon(feed.favicon) }),
$.make('span', { className: 'feed_title' }, [
feed.feed_title,
(type == 'story' && $.make('span', { className: 'NB-feedbar-train-feed', title: 'Train Intelligence' })),
@ -886,11 +886,6 @@
return $feed;
},
get_favicon: function(feed_favicon) {
if (feed_favicon) return 'data:image/png;base64,' + feed_favicon;
return NEWSBLUR.Globals.MEDIA_URL + '/img/icons/silk/world.png';
},
make_feed_counts_floater: function(positive_count, neutral_count, negative_count) {
var unread_class = "";
if (positive_count) {
@ -2286,7 +2281,7 @@
$.make('a', { href: story.story_permalink, className: 'story_title' }, [
(options['river_stories'] && feed &&
$.make('div', { className: 'NB-story-feed' }, [
$.make('img', { className: 'feed_favicon', src: this.get_favicon(feed.favicon) }),
$.make('img', { className: 'feed_favicon', src: $.favicon(feed.favicon) }),
$.make('span', { className: 'feed_title' }, feed.feed_title)
])),
$.make('div', { className: 'NB-storytitles-star'}),
@ -2861,7 +2856,7 @@
$.make('div', { className: 'NB-feed-story-header-feed ' + river_same_feed }, [
(options.river_stories && feed && // !river_same_feed
$.make('div', { className: 'NB-feed-story-feed' }, [
$.make('img', { className: 'feed_favicon', src: this.get_favicon(feed.favicon) }),
$.make('img', { className: 'feed_favicon', src: $.favicon(feed.favicon) }),
$.make('span', { className: 'feed_title' }, feed.feed_title)
])
)
@ -2943,7 +2938,7 @@
if (!$new_header.find('.NB-feed-story-feed').length) {
var feed = this.model.get_feed(story.story_feed_id);
feed && $new_header.append($.make('div', { className: 'NB-feed-story-feed' }, [
$.make('img', { className: 'feed_favicon', src: this.get_favicon(feed.favicon) }),
$.make('img', { className: 'feed_favicon', src: $.favicon(feed.favicon) }),
$.make('span', { className: 'feed_title' }, feed.feed_title)
]));
}

6
media/js/newsblur/reader_classifier.js
View file

@ -227,7 +227,7 @@ var classifier_prototype = {
if (this.options.feed_loaded) {
this.feed_tags = this.model.get_feed_tags();
this.feed_authors = this.model.get_feed_authors();
$('.NB-modal-subtitle .NB-modal-feed-image', this.$modal).attr('src', NEWSBLUR.Globals.google_favicon_url + this.feed['feed_link']);
$('.NB-modal-subtitle .NB-modal-feed-image', this.$modal).attr('src', $.favicon(this.feed.favicon));
$('.NB-modal-subtitle .NB-modal-feed-title', this.$modal).html(this.feed['feed_title']);
}
},
@ -343,7 +343,7 @@ var classifier_prototype = {
$.make('h2', { className: 'NB-modal-title' }, ''),
$.make('h2', { className: 'NB-modal-subtitle' }, [
(this.options['training'] && $.make('div', { className: 'NB-classifier-trainer-counts' })),
$.make('img', { className: 'NB-modal-feed-image feed_favicon', src: NEWSBLUR.Globals.google_favicon_url + this.feed.feed_link }),
$.make('img', { className: 'NB-modal-feed-image feed_favicon', src: $.favicon(this.feed.favicon) }),
$.make('span', { className: 'NB-modal-feed-title' }, this.feed.feed_title)
]),
(this.options['feed_loaded'] &&
@ -593,7 +593,7 @@ var classifier_prototype = {
(classifier_type == 'feed' &&
$.make('img', {
className: 'feed_favicon',
src: NEWSBLUR.Globals.google_favicon_url + this.feed.feed_link
src: $.favicon(this.feed.favicon)
})),
$.make('b', classifier_type_title+': '),
$.make('span', classifier_title)

2
media/js/newsblur/reader_feed_exception.js
View file

@ -28,7 +28,7 @@ NEWSBLUR.ReaderFeedException.prototype = {
$.make('div', { className: 'NB-modal-loading' }),
$.make('h2', { className: 'NB-modal-title' }, 'Fix a misbehaving site'),
$.make('h2', { className: 'NB-modal-subtitle' }, [
$.make('img', { className: 'NB-modal-feed-image feed_favicon', src: NEWSBLUR.Globals.google_favicon_url + this.feed.feed_link }),
$.make('img', { className: 'NB-modal-feed-image feed_favicon', src: $.favicon(this.feed.favicon) }),
$.make('span', { className: 'NB-modal-feed-title' }, this.feed.feed_title)
]),
$.make('div', { className: 'NB-fieldset NB-exception-option NB-exception-option-retry NB-modal-submit' }, [

4
media/js/newsblur/reader_statistics.js
View file

@ -34,7 +34,7 @@ NEWSBLUR.ReaderStatistics.prototype = {
$.make('div', { className: 'NB-modal-loading' }),
$.make('h2', { className: 'NB-modal-title' }, 'Statistics & History'),
$.make('h2', { className: 'NB-modal-subtitle' }, [
$.make('img', { className: 'NB-modal-feed-image feed_favicon', src: NEWSBLUR.Globals.google_favicon_url + this.feed.feed_link }),
$.make('img', { className: 'NB-modal-feed-image feed_favicon', src: $.favicon(this.feed.favicon) }),
$.make('span', { className: 'NB-modal-feed-title' }, this.feed.feed_title)
]),
$.make('div', { className: 'NB-modal-statistics-info' })
@ -51,7 +51,7 @@ NEWSBLUR.ReaderStatistics.prototype = {
this.feed_id = feed_id;
this.feed = this.model.get_feed(feed_id);
$('.NB-modal-subtitle .NB-modal-feed-image', this.$modal).attr('src', NEWSBLUR.Globals.google_favicon_url + this.feed['feed_link']);
$('.NB-modal-subtitle .NB-modal-feed-image', this.$modal).attr('src', $.favicon(this.feed.favicon));
$('.NB-modal-subtitle .NB-modal-feed-title', this.$modal).html(this.feed['feed_title']);
},