Andreas/wekan
1
0
Fork 0
mirror of https://github.com/wekan/wekan.git synced 2026-02-13 19:54:21 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

Merge branch 'marc1006-mobile_fix'

Browse source
This commit is contained in:
Lauri Ojansivu 2020-06-18 02:18:58 +03:00
commit 3f0fddf448
1 changed files with 4 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

5
client/components/activities/activities.js
View file

@ -7,8 +7,9 @@ BlazeComponent.extendComponent({
// XXX Should we use ReactiveNumber? // XXX Should we use ReactiveNumber?
this.page = new ReactiveVar(1); this.page = new ReactiveVar(1);
this.loadNextPageLocked = false; this.loadNextPageLocked = false;
// TODO is sidebar always available? E.g. on small screens/mobile devices
const sidebar = Sidebar; const sidebar = Sidebar;
sidebar.callFirstWith(null, 'resetNextPeak'); sidebar && sidebar.callFirstWith(null, 'resetNextPeak');
this.autorun(() => { this.autorun(() => {
let mode = this.data().mode; let mode = this.data().mode;
const capitalizedMode = Utils.capitalize(mode); const capitalizedMode = Utils.capitalize(mode);
@ -29,6 +30,8 @@ BlazeComponent.extendComponent({
this.subscribe('activities', mode, searchId, limit, hideSystem, () => { this.subscribe('activities', mode, searchId, limit, hideSystem, () => {
this.loadNextPageLocked = false; this.loadNextPageLocked = false;
// TODO the guard can be removed as soon as the TODO above is resolved
if (!sidebar) return;
// If the sibear peak hasn't increased, that mean that there are no more // If the sibear peak hasn't increased, that mean that there are no more
// activities, and we can stop calling new subscriptions. // activities, and we can stop calling new subscriptions.
// XXX This is hacky! We need to know excatly and reactively how many // XXX This is hacky! We need to know excatly and reactively how many