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

Inline author classifiers. Needs to update the story header without blowing away the --now-- class.

Browse source
This commit is contained in:
Samuel Clay 2011-03-17 18:33:59 -04:00
parent dcbd9ecb00
commit 38b5e2c93c
2 changed files with 71 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
media/css/reader.css
View file

@ -1657,6 +1657,38 @@ background: transparent;
text-transform: uppercase; text-transform: uppercase;
margin: 4px 24px 0 0; margin: 4px 24px 0 0;
text-shadow: 1px 1px 0 #F0F0F0; text-shadow: 1px 1px 0 #F0F0F0;
cursor: pointer;
}
#story_pane .NB-feed-story-author.NB-score-1 {
color: #34912E;
}
#story_pane .NB-feed-story-author.NB-score--1 {
color: #A90103;
}
#story_pane .NB-feed-story-author:hover {
/* Gray, active -> [Light] Green */
color: #89AE6E;
}
#story_pane .NB-feed-story-author.NB-score-1:hover {
/* Green, active -> [Light] Red */
color: #E35356;
}
#story_pane .NB-feed-story-author.NB-score--1:hover {
/* Red, active -> [Light] Grey */
color: #E2E2E2;
/* color: #A7A399;*/
}
#story_pane .NB-feed-story-author.NB-score-now-0:hover {
/* Grey, active */
color: #808080;
}
#story_pane .NB-feed-story-author.NB-score-now-1.NB-score-1:hover {
/* Green, active */
color: #34912E;
}
#story_pane .NB-feed-story-author.NB-score-now--1.NB-score--1:hover {
/* Red, active */
color: #A90103;
} }
#story_pane .NB-feed-story-tags { #story_pane .NB-feed-story-tags {
@ -1741,12 +1773,6 @@ background: transparent;
#story_pane .NB-feed-story-title .NB-score--1 { #story_pane .NB-feed-story-title .NB-score--1 {
color: #A90103; color: #A90103;
} }
#story_pane .NB-feed-story-author.NB-score-1 {
color: #34912E;
}
#story_pane .NB-feed-story-author.NB-score--1 {
color: #A90103;
}
#story_pane .NB-feed-story-header .NB-feed-story-date { #story_pane .NB-feed-story-header .NB-feed-story-date {
position: absolute; position: absolute;
right: 28px; right: 28px;

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

@ -2526,7 +2526,7 @@
} else if (score < 0) { } else if (score < 0) {
$story.addClass('NB-story-negative'); $story.addClass('NB-story-negative');
} }
// NEWSBLUR.log(['story', story, story.read_status, $story]); NEWSBLUR.log(['story recalculation', story, story.read_status, $story]);
// $story.toggleClass('read', !story.read_status); // $story.toggleClass('read', !story.read_status);
$('.NB-feed-story-tags', $story).replaceWith(this.make_story_feed_tags(story)); $('.NB-feed-story-tags', $story).replaceWith(this.make_story_feed_tags(story));
$('.NB-feed-story-author', $story).replaceWith(this.make_story_feed_author(story)); $('.NB-feed-story-author', $story).replaceWith(this.make_story_feed_author(story));
@ -3080,8 +3080,8 @@
var score = this.model.classifiers.authors[story.story_authors]; var score = this.model.classifiers.authors[story.story_authors];
return $.make('div', { return $.make('div', {
className: 'NB-feed-story-author ' + (!!score && 'NB-score-'+score) className: 'NB-feed-story-author ' + (!!score && 'NB-score-'+score || '')
}, story.story_authors); }, story.story_authors).data('author', story.story_authors);
}, },
make_story_feed_tags: function(story) { make_story_feed_tags: function(story) {
@ -3096,10 +3096,10 @@
})); }));
}, },
preserve_classifier_color: function($story, value, score) { preserve_classifier_color: function($story, classifier_type, value, score) {
var $t; var $t;
$('.NB-feed-story-tag', $story).each(function() { $('.NB-feed-story-'+classifier_type, $story).each(function() {
if ($(this).data('tag') == value) { if ($(this).data(classifier_type) == value) {
$t = $(this); $t = $(this);
return false; return false;
} }
@ -3118,7 +3118,7 @@
}); });
}, },
save_classifier: function(type, value, score, feed_id) { save_classifier: function(type, value, score, feed_id, callback) {
var data = { var data = {
'feed_id': feed_id 'feed_id': feed_id
}; };
@ -3132,7 +3132,7 @@
this.model.classifiers[type+'s'][value] = score; this.model.classifiers[type+'s'][value] = score;
this.model.save_classifier_publisher(data, _.bind(function(resp) { this.model.save_classifier_publisher(data, _.bind(function(resp) {
this.force_feeds_refresh(null, true, feed_id); this.force_feeds_refresh(callback, false, feed_id);
}, this)); }, this));
this.recalculate_story_scores(feed_id); this.recalculate_story_scores(feed_id);
}, },
@ -4319,22 +4319,6 @@
this.model.save_exception_retry(feed_id, _.bind(this.force_feed_refresh, this, feed_id, $feed)); this.model.save_exception_retry(feed_id, _.bind(this.force_feed_refresh, this, feed_id, $feed));
}, },
force_feed_refresh: function(feed_id, $feed) {
var self = this;
feed_id = feed_id || this.active_feed;
$feed = $feed || this.find_feed_in_feed_list(feed_id);
this.force_feeds_refresh(function(feeds) {
var $new_feed = self.make_feed_title_line(feeds[feed_id], true, 'feed');
if ($feed.hasClass('NB-toplevel')) $new_feed.addClass('NB-toplevel');
$feed.replaceWith($new_feed);
self.hover_over_feed_titles($new_feed);
if (self.active_feed == feed_id) {
self.open_feed(feed_id, true, $new_feed);
}
}, true, feed_id);
},
setup_feed_refresh: function(new_feeds) { setup_feed_refresh: function(new_feeds) {
var self = this; var self = this;
var refresh_interval = this.FEED_REFRESH_INTERVAL; var refresh_interval = this.FEED_REFRESH_INTERVAL;
@ -4358,6 +4342,22 @@
}, refresh_interval); }, refresh_interval);
}, },
force_feed_refresh: function(feed_id, $feed) {
var self = this;
feed_id = feed_id || this.active_feed;
$feed = $feed || this.find_feed_in_feed_list(feed_id);
this.force_feeds_refresh(function(feeds) {
var $new_feed = self.make_feed_title_line(feeds[feed_id], true, 'feed');
if ($feed.hasClass('NB-toplevel')) $new_feed.addClass('NB-toplevel');
$feed.replaceWith($new_feed);
self.hover_over_feed_titles($new_feed);
if (self.active_feed == feed_id) {
self.open_feed(feed_id, true, $new_feed);
}
}, true, feed_id);
},
force_feeds_refresh: function(callback, replace_active_feed, feed_id) { force_feeds_refresh: function(callback, replace_active_feed, feed_id) {
if (callback) { if (callback) {
this.cache.refresh_callback = callback; this.cache.refresh_callback = callback;
@ -5020,10 +5020,22 @@
e.preventDefault(); e.preventDefault();
var $story = $t.closest('.NB-feed-story'); var $story = $t.closest('.NB-feed-story');
var feed_id = $story.data('feed_id'); var feed_id = $story.data('feed_id');
var tag = $t.data('tag'); var classifier_type = 'tag';
var tag = $t.data(classifier_type);
var score = $t.hasClass('NB-score-1') ? -1 : $t.hasClass('NB-score--1') ? 0 : 1; var score = $t.hasClass('NB-score-1') ? -1 : $t.hasClass('NB-score--1') ? 0 : 1;
self.save_classifier('tag', tag, score, feed_id); self.save_classifier(classifier_type, tag, score, feed_id);
self.preserve_classifier_color($story, tag, score); self.preserve_classifier_color($story, classifier_type, tag, score);
});
$.targetIs(e, { tagSelector: '.NB-feed-story-author' }, function($t, $p){
e.preventDefault();
var $story = $t.closest('.NB-feed-story');
var feed_id = $story.data('feed_id');
var classifier_type = 'author';
var author = $t.data(classifier_type);
var score = $t.hasClass('NB-score-1') ? -1 : $t.hasClass('NB-score--1') ? 0 : 1;
self.save_classifier(classifier_type, author, score, feed_id);
self.preserve_classifier_color($story, classifier_type, tag, score);
}); });
$.targetIs(e, { tagSelector: '.story' }, function($t, $p){ $.targetIs(e, { tagSelector: '.story' }, function($t, $p){