diff options
| author | Martin Wortschack <mwortschack@gitlab.com> | 2018-10-24 06:25:46 +0000 |
|---|---|---|
| committer | Mike Greiling <mike@pixelcog.com> | 2018-10-24 06:25:46 +0000 |
| commit | 97bbf0df8e7f414fbf3a39887fcccbc051fcbea8 (patch) | |
| tree | e63652ff285d2d362bac4ca17496606972f56d5e /app/assets/javascripts/activities.js | |
| parent | 22ab1a82ff9b6d0fda64df0d6b633fd588dd965e (diff) | |
| download | gitlab-ce-97bbf0df8e7f414fbf3a39887fcccbc051fcbea8.tar.gz | |
Resolve "Endless scroll loader is visible on user profile overview page"
Diffstat (limited to 'app/assets/javascripts/activities.js')
| -rw-r--r-- | app/assets/javascripts/activities.js | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/app/assets/javascripts/activities.js b/app/assets/javascripts/activities.js index de4566bb119..05de970e387 100644 --- a/app/assets/javascripts/activities.js +++ b/app/assets/javascripts/activities.js @@ -6,10 +6,12 @@ import Pager from './pager'; import { localTimeAgo } from './lib/utils/datetime_utility'; export default class Activities { - constructor() { - Pager.init(20, true, false, data => data, this.updateTooltips); + constructor(container = '') { + this.container = container; - $('.event-filter-link').on('click', (e) => { + Pager.init(20, true, false, data => data, this.updateTooltips, this.container); + + $('.event-filter-link').on('click', e => { e.preventDefault(); this.toggleFilter(e.currentTarget); this.reloadActivities(); @@ -22,7 +24,7 @@ export default class Activities { reloadActivities() { $('.content_list').html(''); - Pager.init(20, true, false, data => data, this.updateTooltips); + Pager.init(20, true, false, data => data, this.updateTooltips, this.container); } toggleFilter(sender) { |