public-mirrors/NewsBlur
1
0
Fork 0
mirror of https://github.com/samuelclay/NewsBlur.git synced 2025-08-31 21:41:33 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Initial stab at a ghetto feed title floater.

Browse source
This commit is contained in:
Samuel Clay 2011-01-19 08:54:59 -05:00
parent 2c9c6d8aa4
commit 2ae1e1719a
3 changed files with 32 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
media/css/reader.css
View file

@ -1424,6 +1424,17 @@ background: transparent;
left: 200%; left: 200%;
} }
/* ================================ */
/* = Feed View Feed Title Floater = */
/* ================================ */
.NB-feed-story-view-floater {
position: fixed;
top: 0;
left: 0;
width: 100%;
}
/* ================= */ /* ================= */
/* = Story Content = */ /* = Story Content = */
/* ================= */ /* ================= */

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

@ -25,7 +25,8 @@
$header: $('.NB-feeds-header'), $header: $('.NB-feeds-header'),
$starred_header: $('.NB-feeds-header-starred'), $starred_header: $('.NB-feeds-header-starred'),
$river_header: $('.NB-feeds-header-river'), $river_header: $('.NB-feeds-header-river'),
$taskbar: $('.taskbar_nav') $taskbar: $('.taskbar_nav'),
$feed_floater: $('.NB-feed-story-view-floater')
}; };
this.flags = { this.flags = {
'feed_view_images_loaded': {}, 'feed_view_images_loaded': {},
@ -578,6 +579,9 @@
this.mark_story_title_as_selected($next_story_title); this.mark_story_title_as_selected($next_story_title);
this.mark_story_as_read(story.id); this.mark_story_as_read(story.id);
this.mark_story_as_read_in_feed_view(story, {'animate': this.story_view == 'feed'}); this.mark_story_as_read_in_feed_view(story, {'animate': this.story_view == 'feed'});
if (this.flags.river_view) {
this.show_correct_feed_in_feed_title_floater(story);
}
} }
} }
}, },
@ -1219,7 +1223,8 @@
'iframe_prevented_from_loading': false, 'iframe_prevented_from_loading': false,
'pause_feed_refreshing': false, 'pause_feed_refreshing': false,
'feed_list_showing_manage_menu': false, 'feed_list_showing_manage_menu': false,
'unread_threshold_temporarily': null 'unread_threshold_temporarily': null,
'river_view': false
}); });
$.extend(this.cache, { $.extend(this.cache, {
@ -1241,7 +1246,7 @@
this.active_story = null; this.active_story = null;
this.$s.$story_titles.data('page', 0); this.$s.$story_titles.data('page', 0);
this.$s.$story_titles.data('feed_id', null); this.$s.$story_titles.data('feed_id', null);
this.$s.$feed_view.empty(); $('.NB-feed-stories', this.$s.$feed_view).remove();
this.$s.$starred_header.removeClass('NB-selected'); this.$s.$starred_header.removeClass('NB-selected');
this.$s.$river_header.removeClass('NB-selected'); this.$s.$river_header.removeClass('NB-selected');
$('.NB-selected', this.$s.$feed_list).removeClass('NB-selected'); $('.NB-selected', this.$s.$feed_list).removeClass('NB-selected');
@ -1442,6 +1447,7 @@
this.mark_feed_as_selected(null, null); this.mark_feed_as_selected(null, null);
this.$s.$starred_header.addClass('NB-selected'); this.$s.$starred_header.addClass('NB-selected');
this.$s.$body.addClass('NB-view-river'); this.$s.$body.addClass('NB-view-river');
this.flags.river_view = true;
$('.task_view_page', this.$s.$taskbar).addClass('NB-disabled'); $('.task_view_page', this.$s.$taskbar).addClass('NB-disabled');
var explicit_view_setting = NEWSBLUR.Preferences.view_settings[this.active_feed]; var explicit_view_setting = NEWSBLUR.Preferences.view_settings[this.active_feed];
if (!explicit_view_setting) { if (!explicit_view_setting) {
@ -1495,6 +1501,7 @@
this.iframe_scroll = null; this.iframe_scroll = null;
this.mark_feed_as_selected(null, null); this.mark_feed_as_selected(null, null);
this.$s.$body.addClass('NB-view-river'); this.$s.$body.addClass('NB-view-river');
this.flags.river_view = true;
$folder.addClass('NB-selected'); $folder.addClass('NB-selected');
$('.task_view_page', this.$s.$taskbar).addClass('NB-disabled'); $('.task_view_page', this.$s.$taskbar).addClass('NB-disabled');
var explicit_view_setting = NEWSBLUR.Preferences.view_settings[this.active_feed]; var explicit_view_setting = NEWSBLUR.Preferences.view_settings[this.active_feed];
@ -2587,7 +2594,7 @@
if (first_load) { if (first_load) {
$stories = $.make('ul', { className: 'NB-feed-stories' }); $stories = $.make('ul', { className: 'NB-feed-stories' });
$feed_view.empty(); $('.NB-feed-stories', $feed_view).remove();
$feed_view.scrollTop('0px'); $feed_view.scrollTop('0px');
$feed_view.append($stories); $feed_view.append($stories);
} else { } else {
@ -2680,6 +2687,13 @@
this.show_stories_preference_in_feed_view(true); this.show_stories_preference_in_feed_view(true);
}, },
show_correct_feed_in_feed_title_floater: function(story) {
var $feed_floater = this.$s.$feed_floater;
var $story = this.find_story_in_feed_view(story);
$feed_floater.empty().append($('.NB-feed-story-header-feed', $story).clone());
},
apply_story_styling: function(reset_stories) { apply_story_styling: function(reset_stories) {
var $body = this.$s.$body; var $body = this.$s.$body;
$body.removeClass('NB-theme-sans-serif'); $body.removeClass('NB-theme-sans-serif');

4
templates/reader/feeds.xhtml
View file

@ -448,7 +448,9 @@ $(document).ready(function() {
<div id="story_pane" class="content-center"> <div id="story_pane" class="content-center">
<div class="NB-story-pane-container"> <div class="NB-story-pane-container">
<iframe id="feed_iframe" class="NB-feed-iframe"></iframe> <iframe id="feed_iframe" class="NB-feed-iframe"></iframe>
<div class="NB-feed-story-view NB-view-hidden"></div> <div class="NB-feed-story-view NB-view-hidden">
<div class="NB-feed-story-view-floater"></div>
</div>
<iframe id="story_iframe" class="NB-story-iframe"></iframe> <iframe id="story_iframe" class="NB-story-iframe"></iframe>
</div> </div>
</div> </div>