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

No longer scrolling to story if the feed view isn't changing. This is nice for resize events that come from training a feed. Fixes #27.

Browse source
This commit is contained in:
Samuel Clay 2011-04-30 23:33:36 -04:00
parent 8b4b696b47
commit e79b6a6f4c
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -69,7 +69,7 @@
// = Event Handlers =
// ==================
$(window).bind('resize', _.throttle($.rescope(this.resize_window, this), 1000));
$(window).bind('resize.reader', _.throttle($.rescope(this.resize_window, this), 1000));
this.$s.$body.bind('dblclick.reader', $.rescope(this.handle_dblclicks, this));
this.$s.$body.bind('click.reader', $.rescope(this.handle_clicks, this));
this.$s.$body.live('contextmenu.reader', $.rescope(this.handle_rightclicks, this));
@ -3480,9 +3480,10 @@
if (view == 'page' && feed && feed.has_exception && feed.exception_type == 'page') {
this.open_feed_exception_modal(this.active_feed);
return;
}
if ($('.task_button_view.task_view_'+view).hasClass('NB-disabled')) {
} else if ($('.task_button_view.task_view_'+view).hasClass('NB-disabled')) {
return;
} else if (view == this.story_view && !this.flags['page_view_showing_feed_view'] && !this.flags['feed_view_showing_story_view']) {
return;
}
// NEWSBLUR.log(['$button', $button, this.flags['page_view_showing_feed_view'], $button.hasClass('NB-active'), skip_save_type]);
var $taskbar_buttons = $('.NB-taskbar .task_button_view');
@ -3498,7 +3499,6 @@
$page_to_feed_arrow.hide();
$feed_to_story_arrow.hide();
this.flags['page_view_showing_feed_view'] = false;
this.flags['page_view_showing_feed_view'] = false;
if (skip_save_type == 'page') {
$page_to_feed_arrow.show();
this.flags['page_view_showing_feed_view'] = true;

2
media/js/newsblur/reader_classifier.js
View file

@ -671,7 +671,7 @@ var classifier_prototype = {
dialog.data.fadeIn(200);
setTimeout(function() {
self.flags.modal_loaded = true;
$(window).resize();
$(window).trigger('resize.simplemodal');
});
});
},