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

First draft of story title hidden indicators. I don't like the fact that these a) look ugly, and b) don't show the unreads that are also missing. This needs some love before it can be shipped.

Browse source
This commit is contained in:
Samuel Clay 2010-11-01 18:20:26 -04:00
parent 62cf877ef2
commit 451c0860db
2 changed files with 155 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

75
media/css/reader.css
View file

@ -593,6 +593,16 @@ a img {
background-color: #CC2A2E;
}
.unread_view_positive .unread_count {
padding: 0 6px;
}
.unread_view_neutral .unread_count {
padding: 0 3px;
}
/* Showing unread counts above threshold */
.unread_view_positive .unread_positive .unread_count_positive {
display: block;
}
@ -623,14 +633,20 @@ a img {
font-weight: bold;
}
.unread_view_positive .unread_count {
padding: 0 6px;
/* Showing unread counts below threshold */
.unread_threshold_positive .unread_negative .unread_count_negative,
.unread_threshold_positive .unread_neutral .unread_count_neutral {
font-weight: bold;
display: block;
}
.unread_view_neutral .unread_count {
padding: 0 3px;
.unread_threshold_neutral .unread_negative .unread_count_negative {
font-weight: bold;
display: block;
}
/* ====================== */
/* = Feeds Progress Bar = */
/* ====================== */
@ -920,7 +936,58 @@ background: transparent;
display: block;
}
#story_titles .NB-story-title-indicator {
clear: both;
border-bottom: 1px solid #505050;
height: 10px;
font-size: 9px;
background-color: #606060;
overflow: hidden;
cursor: pointer;
}
#story_titles .NB-story-title-indicator:hover {
}
#story_titles .NB-story-title-indicator .feed_counts_floater {
float: left;
padding: 0 0 0 4px;
text-align: center;
}
#story_titles .NB-story-title-indicator .unread_count_neutral,
#story_titles .NB-story-title-indicator .unread_count_negative {
opacity: .3;
}
#story_titles .NB-story-title-indicator.unread_threshold_positive:hover .unread_count_neutral {
opacity: 1;
}
#story_titles .NB-story-title-indicator.unread_threshold_neutral:hover .unread_count_negative {
opacity: 1;
}
#story_titles .NB-story-title-indicator .NB-story-title-indicator-text {
color: #B0B0B0;
text-shadow: 1px 1px 0 #202020;
opacity: .8;
font-weight: bold;
text-transform: uppercase;
font-size: 9px;
padding: 0 0 0 44px;
line-height: 10px;
display: block;
}
#story_titles .NB-story-title-indicator:hover .NB-story-title-indicator-text {
color: #D0D0D0;
}
#story_titles .NB-story-title-indicator .feed_counts_floater .unread_count {
padding: 0 3px;
margin: 0 2px 0 0;
line-height: 10px;
}
#story_titles .story {
overflow: hidden;

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

@ -1092,7 +1092,7 @@
if (feed_id != this.active_feed || force) {
$story_titles.empty().scrollTop('0px');
$story_titles.empty().scrollTop(0);
this.reset_feed();
this.hide_splash_page();
@ -1103,7 +1103,7 @@
this.set_correct_story_view_for_feed(feed_id);
$feed_link = $feed_link || $('.feed.selected', this.$s.$feed_list).eq(0);
this.mark_feed_as_selected(feed_id, $feed_link);
this.show_feed_title_in_stories($story_titles, feed_id);
this.show_feed_title_in_stories(feed_id);
this.show_feedbar_loading();
this.make_content_pane_feed_counter(feed_id);
this.switch_taskbar_view(this.story_view);
@ -1155,6 +1155,7 @@
this.hover_over_story_titles();
this.make_story_feed_entries(stories, first_load);
this.show_correct_stories_in_page_and_feed_view();
this.show_feed_hidden_story_title_indicator();
$('.NB-feedbar-last-updated-date').text(data.last_update + ' ago');
if (this.flags['find_next_unread_on_page_of_feed_stories_load']) {
this.show_next_unread_story(true);
@ -1324,7 +1325,7 @@
} else if (this.story_view == 'feed' || this.flags['page_view_showing_feed_view']) {
$feed_view.scrollable().stop();
$feed_view.scrollTo($story, 600, { axis: 'y', easing: 'easeInOutQuint', offset: 0, queue: false });
$feed_view.scrollTo($story, 400, { axis: 'y', easing: 'easeInOutQuint', offset: 0, queue: false });
}
}
clearInterval(this.locks.scrolling);
@ -1348,7 +1349,7 @@
$iframe.scrollTo($story, 0, { axis: 'y', offset: -24 }); // Do this at story_view switch
} else if (this.story_view == 'page') {
$iframe.scrollable().stop();
$iframe.scrollTo($story, 800, { axis: 'y', easing: 'easeInOutQuint', offset: -24, queue: false });
$iframe.scrollTo($story, 600, { axis: 'y', easing: 'easeInOutQuint', offset: -24, queue: false });
}
var parent_scroll = $story.parents('.NB-feed-story-view').scrollTop();
var story_offset = $story.offset().top;
@ -1923,7 +1924,8 @@
});
},
show_feed_title_in_stories: function($story_titles, feed_id) {
show_feed_title_in_stories: function(feed_id) {
var $story_titles = this.$s.$story_titles;
var feed = this.model.get_feed(feed_id);
var $feedbar = $.make('div', { className: 'NB-feedbar' }, [
@ -1943,6 +1945,63 @@
$('.unread_count', $feedbar).corner('4px');
},
show_feed_hidden_story_title_indicator: function() {
var $story_titles = this.$s.$story_titles;
var feed_id = this.active_feed;
var feed = this.model.get_feed(feed_id);
var unread_view_name = this.get_unread_view_name();
if ((feed.nt > 0 && unread_view_name == 'positive') ||
(feed.ng > 0 && unread_view_name == 'neutral') ||
(feed.ng > 0 && unread_view_name == 'postiive')) {
var $indicator = $.make('div', { className: 'NB-story-title-indicator' }, [
this.make_feed_counts_floater(feed.ps, feed.nt, feed.ng),
$.make('span', { className: 'NB-story-title-indicator-text' }, 'hidden stories')
]);
$indicator.removeClass('unread_threshold_positive')
.removeClass('unread_threshold_neutral')
.removeClass('unread_threshold_negative')
.addClass('unread_threshold_'+unread_view_name)
.css({
'height': 0,
'opacity': 0
});
$('.NB-story-title-indicator', $story_titles).remove();
$('.NB-feedbar', this.$story_titles).after($indicator);
_.delay(function() {
$indicator.animate({'height': 10, 'opacity': 1}, {'duration': 400, 'easing': 'easeOutQuint'});
}, 500);
}
},
show_hidden_story_titles: function() {
var feed_id = this.active_feed;
var feed = this.model.get_feed(feed_id);
var $indicator = $('.NB-story-title-indicator', this.$s.$story_titles);
// First click, open neutral. Second click, open negative.
if ($indicator.hasClass('unread_threshold_positive') && feed.nt > 0 && feed.ng > 0) {
this.show_correct_story_titles_in_unread_view({
'unread_view_name': 'neutral',
'animate': true,
'follow': true
});
$indicator.removeClass('unread_threshold_positive').addClass('unread_threshold_neutral');
} else if ($indicator.hasClass('unread_threshold_neutral') || feed.ng == 0) {
this.show_correct_story_titles_in_unread_view({
'unread_view_name': (feed.ng > 0 ? 'negative' : 'neutral'),
'animate': true,
'follow': true
});
$indicator.removeClass('unread_threshold_positive')
.removeClass('unread_threshold_neutral')
.addClass('unread_threshold_negative');
$indicator.slideUp(500);
}
},
open_feed_link: function(feed_id, $fd) {
if (!feed_id) feed_id = this.active_feed;
this.mark_feed_as_read(feed_id);
@ -2264,10 +2323,10 @@
// NEWSBLUR.log(['Showing feed view', this.story_view, this.flags['page_view_showing_feed_view']]);
if (this.story_view == 'page' && this.flags['page_view_showing_feed_view']) {
this.show_correct_story_titles_in_unread_view({'animate': false});
this.show_correct_story_titles_in_unread_view({'animate': false, 'follow': false});
} else if (this.story_view == 'feed') {
$stories.removeClass('NB-feed-view-story').addClass('NB-feed-view-feed');
this.show_correct_story_titles_in_unread_view({'animate': false});
this.show_correct_story_titles_in_unread_view({'animate': false, 'follow': false});
} else if (this.story_view == 'story') {
$stories.removeClass('NB-feed-view-feed').addClass('NB-feed-view-story');
var $current_story = this.get_current_story_from_story_titles();
@ -2659,6 +2718,7 @@
var $feed_list = this.$s.$feed_list;
var unread_view_name = this.get_unread_view_name(unread_view);
var $next_story_button = $('.task_story_next_unread');
var $story_title_indicator = $('.NB-story-title-indicator', this.$story_titles);
$feed_list.removeClass('unread_view_positive')
.removeClass('unread_view_neutral')
@ -2669,6 +2729,11 @@
.removeClass('task_story_next_neutral')
.removeClass('task_story_next_negative')
.addClass('task_story_next_'+unread_view_name);
$story_title_indicator.removeClass('unread_threshold_positive')
.removeClass('unread_threshold_neutral')
.removeClass('unread_threshold_negative')
.addClass('unread_threshold_'+unread_view_name);
},
get_unread_view_name: function(unread_view) {
@ -2703,10 +2768,16 @@
return total;
},
show_correct_story_titles_in_unread_view: function(options) {
show_correct_story_titles_in_unread_view: function(opts) {
var defaults = {
'unread_view_name': null,
'animate': true,
'follow': true
};
var options = $.extend({}, defaults, opts);
var self = this;
var $story_titles = this.$s.$story_titles;
var unread_view_name = this.get_unread_view_name();
var unread_view_name = options['unread_view_name'] || this.get_unread_view_name();
var $stories_show, $stories_hide;
if (unread_view_name == 'positive') {
@ -3356,6 +3427,10 @@
self.open_feed_intelligence_modal(1, this.active_feed, true);
}
});
$.targetIs(e, { tagSelector: '.NB-story-title-indicator' }, function($t, $p){
e.preventDefault();
self.show_hidden_story_titles();
});
// = Feed Bar =====================================================