public-mirrors/NewsBlur-viq
1
0
Fork 0
mirror of https://github.com/viq/NewsBlur.git synced 2025-08-05 16:49:45 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Showing social stories feed in reader. Needs unread counts, original view, routing, starred status, among others.

Browse source
This commit is contained in:
Samuel Clay 2012-01-25 09:52:34 -08:00
parent 66867a812f
commit f82380c183
6 changed files with 126 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apps/social/models.py
View file

@ -235,12 +235,14 @@ class MSocialProfile(mongo.Document):
def to_json(self, compact=False, full=False):
if compact:
params = {
'id': self.user_id,
'user_id': self.user_id,
'username': self.username,
'photo_url': self.photo_url
}
else:
params = {
'id': self.user_id,
'user_id': self.user_id,
'username': self.username,
'photo_url': self.photo_url,

1
apps/social/views.py
View file

@ -133,7 +133,6 @@ def load_social_stories(request, social_user_id, social_username=None):
shared_date = localtime_for_timezone(story['shared_date'], user.profile.timezone)
story['shared_date'] = format_story_link_date__long(shared_date, now)
story['read_status'] = 1
story['starred'] = True
story['intelligence'] = {
'feed': 0,
'author': 0,

6
media/css/reader.css
View file

@ -569,7 +569,8 @@ body.NB-theme-serif #story_pane .NB-feed-story-content {
text-shadow: 0 1px 0 #EBF3FA;
}
.NB-feedlist .feed.selected .feed_title {
.NB-feedlist .feed.selected .feed_title,
.NB-feedlist .feed.NB-selected .feed_title {
text-shadow: 0 1px 0 #FFC97D;
color: #000000;
}
@ -678,7 +679,8 @@ body.NB-theme-serif #story_pane .NB-feed-story-content {
.NB-feedlist .NB-feedbar-mark-feed-read {
display: none;
}
.NB-feedlist .feed.selected {
.NB-feedlist .feed.selected,
.NB-feedlist .feed.NB-selected {
background: #f6a828 url('/media/css/jquery-ui/images/ui-bg_highlight-hard_35_f6a828_1x100.png') 0 50% repeat-x;
border-top: 1px solid #A8A8A8;
border-bottom: 1px solid #A8A8A8;

17
media/js/newsblur/common/assetmodel.js
View file

@ -426,6 +426,23 @@ NEWSBLUR.AssetModel.Reader.prototype = {
});
},
fetch_social_stories: function(feed_id, user_id, page, callback, error_callback, first_load) {
var self = this;
var pre_callback = function(data) {
return self.load_feed_precallback(data, feed_id, callback, first_load);
};
this.feed_id = feed_id;
this.make_request('/social/stories/'+user_id+'/', {
page: page
}, pre_callback, error_callback, {
'ajax_group': (page > 1 ? 'feed_page' : 'feed'),
'request_type': 'GET'
});
},
get_feeds_trainer: function(feed_id, callback) {
var self = this;
var params = {};

2
media/js/newsblur/common/router.js
View file

@ -23,7 +23,7 @@ NEWSBLUR.Router = Backbone.Router.extend({
},
site: function(site_id, slug) {
console.log(["site", site_id, slug, NEWSBLUR.reader]);
site_id = parseInt(site_id, 10);
NEWSBLUR.reader.open_feed(site_id, {silent: true});
},

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

@ -58,7 +58,8 @@
'river_feeds_with_unreads': [],
'mouse_position_y': parseInt(this.model.preference('lock_mouse_indicator'), 10),
'$feed_in_feed_list': {},
'$feed_counts_in_feed_list': {}
'$feed_counts_in_feed_list': {},
'$feed_in_social_feed_list': {}
};
this.layout = {};
this.constants = {
@ -502,7 +503,7 @@
});
this.cache.$feed_in_feed_list[feed_id] = $feeds;
return $feeds;
},
@ -1734,7 +1735,8 @@
'feed_title_floater_story_id': null,
'last_feed_view_story_feed_id': null,
'$feed_in_feed_list': {},
'$feed_counts_in_feed_list': {}
'$feed_counts_in_feed_list': {},
'$feed_in_social_feed_list': {}
});
$.extend(this.counts, {
@ -2152,6 +2154,94 @@
return feeds;
},
// ==================
// = Social Stories =
// ==================
open_social_stories: function(user_id) {
var $story_titles = this.$s.$story_titles;
var $social_feed = this.find_social_feed_with_user_id(user_id);
console.log(["$social_feed", $social_feed.length, $social_feed[0]]);
$story_titles.empty().scrollTop('0px');
this.reset_feed();
this.hide_splash_page();
this.active_feed = 'river:social:' + user_id;
$social_feed.addClass('NB-selected');
$story_titles.data('page', 1);
$story_titles.data('feed_id', null);
$story_titles.data('user_id', null);
this.iframe_scroll = null;
this.flags['opening_feed'] = true;
this.mark_feed_as_selected(null, null);
this.make_feed_title_in_stories(user_id);
this.show_correct_feed_in_feed_title_floater();
this.$s.$body.addClass('NB-view-river');
this.flags.river_view = true;
$('.task_view_page', this.$s.$taskbar).addClass('NB-disabled');
var explicit_view_setting = this.model.view_setting(this.active_feed);
this.set_correct_story_view_for_feed(this.active_feed, explicit_view_setting);
this.show_feedbar_loading();
this.switch_taskbar_view(this.story_view);
this.setup_mousemove_on_views();
this.show_stories_progress_bar();
this.model.fetch_social_stories(this.active_feed, user_id, 1,
_.bind(this.post_open_social_stories, this), this.show_stories_error, true);
},
post_open_social_stories: function(data, first_load) {
// NEWSBLUR.log(['post_open_river_stories', data, this.active_feed]);
if (!data) {
return this.show_stories_error();
}
if (this.active_feed && this.active_feed.indexOf('river:social:') != -1) {
this.flags['opening_feed'] = false;
this.flags['feed_view_positions_calculated'] = false;
this.story_titles_clear_loading_endbar();
this.create_story_titles(data.stories, {'river_stories': true});
this.make_story_feed_entries(data.stories, first_load, {'river_stories': true});
this.show_story_titles_above_intelligence_level({'animate': false});
// $('.NB-feedbar-last-updated-date').text(data.last_update + ' ago');
this.flags['story_titles_loaded'] = true;
if (this.counts['find_next_unread_on_page_of_feed_stories_load']) {
this.show_next_unread_story(true);
} else if (this.counts['find_last_unread_on_page_of_feed_stories_load']) {
this.show_last_unread_story(true);
}
this.scroll_story_titles_to_show_selected_story_title();
this.fill_out_story_titles();
this.prefetch_story_locations_in_feed_view();
this.hide_stories_progress_bar();
}
},
find_social_feed_with_user_id: function(user_id) {
if (_.contains(this.cache.$feed_in_social_feed_list, user_id)) {
return this.cache.$feed_in_social_feed_list[user_id];
}
var $social_feeds = this.$s.$social_feeds;
var $feeds = $([]);
$('.feed', $social_feeds).each(function() {
if (parseInt($(this).attr('data-id'), 10) == user_id) {
$feeds.push($(this).get(0));
}
});
this.cache.$feed_in_social_feed_list[user_id] = $feeds;
return $feeds;
},
// =================
// = Story loading =
// =================
show_stories_progress_bar: function(feeds_loading) {
this.hide_stories_error();
@ -2193,6 +2283,8 @@
console.log(["show_stories_error", arguments]);
this.hide_stories_progress_bar();
this.flags['iframe_view_not_busting'] = true;
var $error = $.make('div', { className: 'NB-feed-error' }, [
$.make('div', { className: 'NB-feed-error-icon' }),
$.make('div', { className: 'NB-feed-error-text' }, 'Oh no! There was an error!')
@ -3634,10 +3726,9 @@
},
mark_feed_as_selected: function(feed_id, $feed_link) {
if ($feed_link === undefined) {
$feed_link = this.find_feed_in_feed_list(feed_id);
if (!$feed_link || ($feed_link && !$feed_link.length)) {
$feed_link = this.find_feed_in_feed_list(feed_id);
}
$('#feed_list .selected').removeClass('selected');
$('#feed_list .after_selected').removeClass('after_selected');
if ($feed_link) {
@ -6325,6 +6416,11 @@
var folder_title = $t.find('.folder_title_text').text();
self.open_river_stories($folder, folder_title);
});
$.targetIs(e, { tagSelector: '.NB-socialfeeds .feed' }, function($t, $p){
e.preventDefault();
var user_id = parseInt($t.attr('data-id'), 10);
self.open_social_stories(user_id);
});
// ============
// = Feed Bar =