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 loading line when switching feeds that have different story layouts (specifically to/from grid).

Browse source
This commit is contained in:
Samuel Clay 2015-07-22 12:43:55 -07:00
parent 0024813a53
commit b4977ae04c
2 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1388,11 +1388,6 @@
NEWSBLUR.app.story_unread_counter.remove();
}
if (NEWSBLUR.assets.view_setting(NEWSBLUR.reader.active_feed, 'layout') == 'full') {
NEWSBLUR.app.story_list.show_loading(options);
} else {
NEWSBLUR.app.story_titles.show_loading(options);
}
NEWSBLUR.app.taskbar_info.hide_stories_error();
this.iframe_scroll = null;
this.set_correct_story_view_for_feed(feed.id);
@ -1400,6 +1395,12 @@
this.switch_taskbar_view(this.story_view);
this.switch_story_layout();
if (NEWSBLUR.assets.view_setting(NEWSBLUR.reader.active_feed, 'layout') == 'full') {
NEWSBLUR.app.story_list.show_loading(options);
} else {
NEWSBLUR.app.story_titles.show_loading(options);
}
_.delay(_.bind(function() {
if (!options.delay || feed.id == self.next_feed) {
this.model.load_feed(feed.id, 1, true, $.rescope(this.post_open_feed, this),

2
media/js/newsblur/views/story_titles_view.js
View file

@ -159,7 +159,7 @@ NEWSBLUR.Views.StoryTitlesView = Backbone.View.extend({
show_loading: function(options) {
options = options || {};
if (NEWSBLUR.assets.flags['no_more_stories']) return;
var $story_titles = NEWSBLUR.reader.$s.$story_titles;
this.$('.NB-end-line').remove();
var $endline = $.make('div', { className: "NB-end-line NB-short" });