public-mirrors/NewsBlur
1
0
Fork 0
mirror of https://github.com/samuelclay/NewsBlur.git synced 2025-08-31 21:41:33 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixing animation preference in Feed view.

Browse source
This commit is contained in:
Samuel Clay 2012-06-26 11:20:05 -07:00
parent 9b2ed2944d
commit c2c8851984
1 changed files with 4 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -68,17 +68,15 @@ NEWSBLUR.Views.StoryListView = Backbone.View.extend({
scroll_to_selected_story: function(story, options) { scroll_to_selected_story: function(story, options) {
options = options || {}; options = options || {};
if (!story || !story.story_view) return; if (!story || !story.story_view) return;
if (!options.immediate) {
clearTimeout(NEWSBLUR.reader.locks.scrolling);
NEWSBLUR.reader.flags.scrolling_by_selecting_story_title = true;
}
var $story = story.story_view.$el; var $story = story.story_view.$el;
if (!NEWSBLUR.assets.preference('animations')) options.immediate = true;
if (options.scroll_to_comments) { if (options.scroll_to_comments) {
$story = $('.NB-feed-story-comments', $story); $story = $('.NB-feed-story-comments', $story);
} }
clearTimeout(NEWSBLUR.reader.locks.scrolling);
NEWSBLUR.reader.flags.scrolling_by_selecting_story_title = true;
this.$el.scrollable().stop(); this.$el.scrollable().stop();
this.$el.scrollTo($story, { this.$el.scrollTo($story, {
duration: options.immediate ? 0 : 340, duration: options.immediate ? 0 : 340,
@ -87,8 +85,6 @@ NEWSBLUR.Views.StoryListView = Backbone.View.extend({
offset: options.scroll_offset || 0, offset: options.scroll_offset || 0,
queue: false, queue: false,
onAfter: function() { onAfter: function() {
if (options.immediate) return;
NEWSBLUR.reader.locks.scrolling = setTimeout(function() { NEWSBLUR.reader.locks.scrolling = setTimeout(function() {
NEWSBLUR.reader.flags.scrolling_by_selecting_story_title = false; NEWSBLUR.reader.flags.scrolling_by_selecting_story_title = false;
}, 100); }, 100);