From 67f75d02575b58b9d07ad8527e1124c253465ad4 Mon Sep 17 00:00:00 2001 From: Juanfran Date: Thu, 17 Dec 2015 08:37:32 +0100 Subject: [PATCH] [backport] timeline load twice - fixed --- app/coffee/app.coffee | 2 +- app/modules/profile/profile-favs/profile-favs.jade | 1 - app/modules/user-timeline/user-timeline/user-timeline.jade | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/app/coffee/app.coffee b/app/coffee/app.coffee index 268b7c3a..be3cf91e 100644 --- a/app/coffee/app.coffee +++ b/app/coffee/app.coffee @@ -628,7 +628,7 @@ init = ($log, $rootscope, $auth, $events, $analytics, $translate, $location, $na pluginsWithModule = _.filter(@.taigaContribPlugins, (plugin) -> plugin.module) -pluginsWithModule = _.filter(@.taigaContribPlugins, (plugin) -> plugin.module) +angular.module('infinite-scroll').value('THROTTLE_MILLISECONDS', 500) modules = [ # Main Global Modules diff --git a/app/modules/profile/profile-favs/profile-favs.jade b/app/modules/profile/profile-favs/profile-favs.jade index 38d976e3..94e09e4c 100644 --- a/app/modules/profile/profile-favs/profile-favs.jade +++ b/app/modules/profile/profile-favs/profile-favs.jade @@ -53,7 +53,6 @@ section.profile-favs div( infinite-scroll="vm.loadItems()" - infinite-scroll-distance="2" infinite-scroll-disabled="vm.scrollDisabled" ) div( diff --git a/app/modules/user-timeline/user-timeline/user-timeline.jade b/app/modules/user-timeline/user-timeline/user-timeline.jade index c4ebca16..3972492f 100644 --- a/app/modules/user-timeline/user-timeline/user-timeline.jade +++ b/app/modules/user-timeline/user-timeline/user-timeline.jade @@ -3,5 +3,5 @@ section.profile-timeline div.spin img(src="/svg/spinner-circle.svg", alt="Loading...") - div(infinite-scroll="vm.loadTimeline()", infinite-scroll-distance="3", infinite-scroll-disabled="vm.scrollDisabled") + div(infinite-scroll="vm.loadTimeline()", infinite-scroll-disabled="vm.scrollDisabled") div(tg-repeat="timeline in vm.timelineList", tg-user-timeline-item="timeline")