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

Fixing the display of removed comments.

Browse source
This commit is contained in:
Samuel Clay 2012-06-07 10:25:15 -07:00
parent 79bc3978f8
commit 9c7c943063
4 changed files with 13 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
apps/social/views.py
View file

@ -262,6 +262,7 @@ def mark_story_as_shared(request):
story = Feed.format_story(story)
stories, profiles = MSharedStory.stories_with_comments_and_profiles([story], request.user)
story = stories[0]
story['shared_comments'] = shared_story['comments'] or ""
return {'code': code, 'story': story, 'user_profiles': profiles}

9
media/js/newsblur/models/stories.js
View file

@ -2,11 +2,16 @@ NEWSBLUR.Models.Story = Backbone.Model.extend({
initialize: function() {
this.bind('change:comments', this.populate_comments);
this.bind('change:comment_count', this.populate_comments);
this.populate_comments();
},
populate_comments: function() {
if (this.get('comments')) {
populate_comments: function(story, collection, changes) {
var comments = this.get('comments');
if (!this.get('comment_count')) {
delete this.comments;
} else if (comments && comments.length) {
this.comments = new NEWSBLUR.Collections.Comments(this.get('comments'));
}
},

4
media/js/newsblur/views/story_comments_view.js
View file

@ -39,7 +39,7 @@ NEWSBLUR.Views.StoryCommentsView = Backbone.View.extend({
},
render_comments_friends: function() {
if (!this.model.get('comment_count_friends')) return;
if (!this.model.get('comment_count_friends') || !this.model.get('comment_count')) return;
this.model.comments.each(_.bind(function(comment) {
var $comment = new NEWSBLUR.Views.StoryComment({model: comment, story: this.model}).render().el;
@ -48,7 +48,7 @@ NEWSBLUR.Views.StoryCommentsView = Backbone.View.extend({
},
render_comments_public: function() {
if (!this.model.get('comment_count_public')) return;
if (!this.model.get('comment_count_public') || !this.model.get('comment_count')) return;
var $public_teaser = $.make('div', { className: 'NB-story-comments-public-teaser-wrapper' }, [
$.make('div', { className: 'NB-story-comments-public-teaser' }, [

16
media/js/newsblur/views/story_share_view.js
View file

@ -104,7 +104,7 @@ NEWSBLUR.Views.StoryShareView = Backbone.View.extend({
// 'complete': _.bind(this.fetch_story_locations_in_feed_view, this, {'reset_timer': true})
}).data('original_height', original_height);
}
this.update_share_button_label($comment_input);
this.update_share_button_label();
var share = _.bind(function(e) {
e.preventDefault();
this.mark_story_as_shared({'source': 'sideoption'});
@ -131,7 +131,7 @@ NEWSBLUR.Views.StoryShareView = Backbone.View.extend({
this.model.set("shared", true);
$share_button.addClass('NB-saving').addClass('NB-disabled').text('Sharing...');
$share_button_menu.addClass('NB-saving').addClass('NB-disabled').text('Sharing...');
NEWSBLUR.assets.mark_story_as_shared(this.model.id, this.model.get('story_feed_id'), comments, source_user_id, _.bind(function(data) {
NEWSBLUR.assets.mark_story_as_shared(this.model.id, this.model.get('story_feed_id'), comments, source_user_id, _.bind(function() {
this.toggle_feed_story_share_dialog({'close': true});
NEWSBLUR.reader.hide_confirm_story_share_menu_item(true);
$share_button.removeClass('NB-saving').removeClass('NB-disabled').text('Share');
@ -140,16 +140,6 @@ NEWSBLUR.Views.StoryShareView = Backbone.View.extend({
$comments_menu.val(comments);
$comments_sideoptions.val(comments);
this.model.story_view.render_comments();
// var $new_comments = $.make('div', { className: 'NB-feed-story-comments' }, new NEWSBLUR.Views.StoryComment({
// model: comment,
// story: this.model
// }).el);
// var $old_comments = this.model.story_view.$('.NB-feed-story-comments');
// if (!$old_comments.length) {
// $old_comments = $.make('div', { className: 'NB-feed-story-comments' });
// this.model.story_view.$('.NB-feed-story-content').after($old_comments);
// }
// $old_comments.replaceWith($new_comments);
$share_star.attr({'title': 'Shared!'});
$share_star.tipsy({
@ -200,7 +190,7 @@ NEWSBLUR.Views.StoryShareView = Backbone.View.extend({
var $comment_input = this.$('.NB-sideoption-share-comments');
var $share_button = this.$('.NB-sideoption-share-save,.NB-menu-manage-story-share-save');
$share_button.removeClass('NB-saving');
$share_button.removeClass('NB-saving').removeClass('NB-disabled');
if (!_.string.isBlank($comment_input.val())) {
$share_button.text('Share with comment');