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

Merge branch 'master' into offline

Browse source 
* master:
  Fixing min width of next unread button.
  Upping feed view position finder interval.
This commit is contained in:
Samuel Clay 2013-07-17 18:46:55 -07:00
commit b67a84530b
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
media/css/reader.css
View file

@ -3543,7 +3543,7 @@ background: transparent;
opacity: .2;
cursor: default;
}
.NB-feed-taskbar .NB-task-story-next-unread {
#story_taskbar .NB-task-story-next-unread {
min-width: 32px;
}
.NB-feed-taskbar .NB-task-add {

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

@ -409,9 +409,9 @@ NEWSBLUR.Views.StoryListView = Backbone.View.extend({
fetch_story_locations_in_feed_view: function(options) {
options = options || {};
var stories = NEWSBLUR.assets.stories;
if (!_.contains(['split', 'full'], NEWSBLUR.assets.preference('story_layout'))) return;
var stories = NEWSBLUR.assets.stories;
if (!stories || !stories.length) return;
if (options.reset_timer) this.counts['positions_timer'] = 0;
@ -427,7 +427,7 @@ NEWSBLUR.Views.StoryListView = Backbone.View.extend({
this.flags['feed_view_positions_calculated'] = true;
// NEWSBLUR.log(['Feed view entirely loaded', NEWSBLUR.assets.stories.length + " stories", this.counts['positions_timer']/1000 + " sec delay"]);
this.counts['positions_timer'] = Math.max(this.counts['positions_timer']*2, 1000);
this.counts['positions_timer'] = Math.min(Math.max(this.counts['positions_timer']+1000, 1000), 15*1000);
clearTimeout(this.flags['next_fetch']);
this.flags['next_fetch'] = _.delay(_.bind(this.fetch_story_locations_in_feed_view, this),
this.counts['positions_timer']);