taiga
/
taiga-front
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[backport] timeline load twice - fixed

stable
Juanfran 2015-12-17 08:37:32 +01:00
parent 33e1f5272e
commit 67f75d0257
3 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/coffee/app.coffee
View File

@ -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)
pluginsWithModule = _.filter(@.taigaContribPlugins, (plugin) -> plugin.module) angular.module('infinite-scroll').value('THROTTLE_MILLISECONDS', 500)
modules = [ modules = [
# Main Global Modules # Main Global Modules

1
app/modules/profile/profile-favs/profile-favs.jade
View File

@ -53,7 +53,6 @@ section.profile-favs
div( div(
infinite-scroll="vm.loadItems()" infinite-scroll="vm.loadItems()"
infinite-scroll-distance="2"
infinite-scroll-disabled="vm.scrollDisabled" infinite-scroll-disabled="vm.scrollDisabled"
) )
div( div(

2
app/modules/user-timeline/user-timeline/user-timeline.jade
View File

@ -3,5 +3,5 @@ section.profile-timeline
div.spin div.spin
img(src="/svg/spinner-circle.svg", alt="Loading...") 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") div(tg-repeat="timeline in vm.timelineList", tg-user-timeline-item="timeline")