From 174c8372719033f984b4e2cad7bfc1c22ac1f068 Mon Sep 17 00:00:00 2001 From: Samuel Clay Date: Tue, 12 Feb 2013 16:07:01 -0800 Subject: [PATCH] Fixing last few story_view bugs. --- media/js/newsblur/models/stories.js | 7 ++++++- media/js/newsblur/reader/reader.js | 4 ++-- media/js/newsblur/views/story_detail_view.js | 7 +------ media/js/newsblur/views/story_title_view.js | 2 +- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/media/js/newsblur/models/stories.js b/media/js/newsblur/models/stories.js index 70b712b22..0597238b9 100644 --- a/media/js/newsblur/models/stories.js +++ b/media/js/newsblur/models/stories.js @@ -52,7 +52,12 @@ NEWSBLUR.Models.Story = Backbone.Model.extend({ } NEWSBLUR.reader.update_starred_count(); }, - + + open_story_in_new_tab: function() { + this.mark_read({skip_delay: true}); + window.open(this.get('story_permalink'), '_blank'); + window.focus(); + }, change_selected: function(model, selected) { if (model.collection) { diff --git a/media/js/newsblur/reader/reader.js b/media/js/newsblur/reader/reader.js index 119e099fb..25138e382 100644 --- a/media/js/newsblur/reader/reader.js +++ b/media/js/newsblur/reader/reader.js @@ -4908,7 +4908,7 @@ if (!self.flags['showing_confirm_input_on_manage_menu']) { var story_id = $t.closest('.NB-menu-manage-story').data('story_id'); var story = self.model.get_story(story_id); - story.story_view.open_story_in_new_tab(); + story.open_story_in_new_tab(); } }); $.targetIs(e, { tagSelector: '.NB-menu-manage-story-star' }, function($t, $p){ @@ -5454,7 +5454,7 @@ var story_id = self.active_story; if (!story_id) return; var story = self.model.get_story(story_id); - story.story_view.open_story_in_new_tab(); + story.open_story_in_new_tab(); }); $document.bind('keypress', 'e', function(e) { e.preventDefault(); diff --git a/media/js/newsblur/views/story_detail_view.js b/media/js/newsblur/views/story_detail_view.js index e82a93f77..71e919696 100644 --- a/media/js/newsblur/views/story_detail_view.js +++ b/media/js/newsblur/views/story_detail_view.js @@ -48,6 +48,7 @@ NEWSBLUR.Views.StoryDetailView = Backbone.View.extend({ !this.options.inline_story_title) { this.model.story_view = this; } else if (this.options.inline_story_title) { + this.model.story_view = this; this.model.inline_story_detail_view = this; } }, @@ -610,12 +611,6 @@ NEWSBLUR.Views.StoryDetailView = Backbone.View.extend({ this.model.star_story(); }, - open_story_in_new_tab: function() { - this.model.mark_read({skip_delay: true}); - window.open(this.model.get('story_permalink'), '_blank'); - window.focus(); - }, - scroll_to_comments: function() { NEWSBLUR.app.story_list.scroll_to_selected_story(this.model, { scroll_to_comments: true, diff --git a/media/js/newsblur/views/story_title_view.js b/media/js/newsblur/views/story_title_view.js index 6b413747b..ec8cfb07a 100644 --- a/media/js/newsblur/views/story_title_view.js +++ b/media/js/newsblur/views/story_title_view.js @@ -251,7 +251,7 @@ NEWSBLUR.Views.StoryTitleView = Backbone.View.extend({ this.model.set('selected', true, {'click_on_story_title': true}); if (NEWSBLUR.hotkeys.command) { - this.model.story_view.open_story_in_new_tab(); + this.model.open_story_in_new_tab(); } },