From c05f47f838db3e3011ec5efbb305c467c82c9deb Mon Sep 17 00:00:00 2001 From: Samuel Clay Date: Sun, 1 Jul 2012 14:28:11 -0700 Subject: [PATCH] Switching taskbar view when appropriate (i.e. showing a temp story view). --- media/css/reader.css | 2 -- media/js/newsblur/reader/reader.js | 2 +- media/js/newsblur/views/story_detail_view.js | 4 ++++ 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/media/css/reader.css b/media/css/reader.css index ac38df352..f30950d8b 100644 --- a/media/css/reader.css +++ b/media/css/reader.css @@ -2578,8 +2578,6 @@ background: transparent; border-left: 1px solid #9B9B9B; padding: .5em 2em; margin: 0px; - font-size: .9em; - line-height: 80%; } .content-pane .feed_counts_floater { diff --git a/media/js/newsblur/reader/reader.js b/media/js/newsblur/reader/reader.js index 747f463c4..8c352eb1a 100644 --- a/media/js/newsblur/reader/reader.js +++ b/media/js/newsblur/reader/reader.js @@ -2024,7 +2024,7 @@ // =================== switch_taskbar_view: function(view, skip_save_type) { - // NEWSBLUR.log(['switch_taskbar_view', view]); + // NEWSBLUR.log(['switch_taskbar_view', view, skip_save_type]); var self = this; var $story_pane = this.$s.$story_pane; var feed = this.model.get_feed(this.active_feed); diff --git a/media/js/newsblur/views/story_detail_view.js b/media/js/newsblur/views/story_detail_view.js index 489e4fb34..42f292fd6 100644 --- a/media/js/newsblur/views/story_detail_view.js +++ b/media/js/newsblur/views/story_detail_view.js @@ -263,6 +263,10 @@ NEWSBLUR.Views.StoryDetailView = Backbone.View.extend({ NEWSBLUR.app.story_list.show_stories_preference_in_feed_view(); NEWSBLUR.app.story_list.scroll_to_selected_story(model, options); } + + if (NEWSBLUR.reader.flags['feed_view_showing_story_view']) { + NEWSBLUR.reader.switch_to_correct_view(); + } }, // ===========