Fixing goto feed shortcut to work on collapsed blurblogs.

This commit is contained in:
Samuel Clay 2012-10-03 16:20:56 -07:00
parent 6f85d0b38e
commit d594366db5
3 changed files with 6 additions and 5 deletions

View file

@ -775,15 +775,16 @@ body.NB-theme-serif #story_pane .NB-feed-story-content {
display: block; display: block;
} }
#feed_list.NB-feedlist.NB-selector-active .feed, #feed_list.NB-feedlist.NB-selector-active .feed,
.NB-feedlist.NB-socialfeeds.NB-selector-active .feed { .NB-socialfeeds-folder.NB-selector-active .feed {
display: none; display: none;
} }
#feed_list.NB-feedlist.NB-selector-active .feed.NB-feed-selector-active, #feed_list.NB-feedlist.NB-selector-active .feed.NB-feed-selector-active,
.NB-feedlist.NB-socialfeeds.NB-selector-active .feed.NB-feed-selector-active { .NB-socialfeeds-folder.NB-selector-active .feed.NB-feed-selector-active {
display: block; display: block;
opacity: 1; opacity: 1;
} }
.NB-feedlist.NB-selector-active .NB-folder-collapsed .folder { .NB-feedlist.NB-selector-active .NB-folder-collapsed .folder,
.NB-socialfeeds-folder.NB-selector-active {
display: block !important; display: block !important;
opacity: 1 !important; opacity: 1 !important;
} }

View file

@ -20,7 +20,7 @@
$sidebar: $('.NB-sidebar'), $sidebar: $('.NB-sidebar'),
$feed_lists: $('.NB-feedlists'), $feed_lists: $('.NB-feedlists'),
$feed_list: $('#feed_list'), $feed_list: $('#feed_list'),
$social_feeds: $('.NB-socialfeeds'), $social_feeds: $('.NB-socialfeeds-folder'),
$story_titles: $('#story_titles'), $story_titles: $('#story_titles'),
$content_pane: $('.content-pane'), $content_pane: $('.content-pane'),
$story_taskbar: $('#story_taskbar'), $story_taskbar: $('#story_taskbar'),

View file

@ -107,7 +107,7 @@ NEWSBLUR.Views.FeedList = Backbone.View.extend({
}, },
make_social_feeds: function() { make_social_feeds: function() {
var $social_feeds = this.$s.$social_feeds; var $social_feeds = $('.NB-socialfeeds', this.$s.$social_feeds);
var profile = NEWSBLUR.assets.user_profile; var profile = NEWSBLUR.assets.user_profile;
var $feeds = NEWSBLUR.assets.social_feeds.map(function(feed) { var $feeds = NEWSBLUR.assets.social_feeds.map(function(feed) {
var feed_view = new NEWSBLUR.Views.FeedTitleView({ var feed_view = new NEWSBLUR.Views.FeedTitleView({