public-mirrors/NewsBlur-viq
1
0
Fork 0
mirror of https://github.com/viq/NewsBlur.git synced 2025-09-18 21:43:31 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'social' into redis

Browse source 
* social:
  Firefox bug would call resize window at all hours of the night. Fixing a bug where the content pane feed counter would inadvertantly get loaded on non-feeds.
This commit is contained in:
Samuel Clay 2012-07-23 11:04:04 -07:00
commit adb3dcd28f
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -144,7 +144,7 @@
view = 'story';
flag = 'story';
}
this.flags.scrolling_by_selecting_story_title = true;
clearTimeout(this.locks.scrolling);
this.locks.scrolling = _.delay(_.bind(function() {
@ -160,6 +160,7 @@
NEWSBLUR.app.story_list.reset_story_positions();
}, 2000);
this.flags.fetch_story_locations_in_feed_view();
console.log(["resize_window", view, flag]);
},
apply_resizable_layout: function(refresh) {
@ -1754,6 +1755,7 @@
feed_id = feed_id || this.active_feed;
if (!feed_id) return;
var feed = this.model.get_feed(feed_id);
if (!feed) return;
if (NEWSBLUR.app.story_unread_counter) {
NEWSBLUR.app.story_unread_counter.remove();