Merge branch 'marc1006-fix'

This commit is contained in:
Lauri Ojansivu 2020-06-11 15:07:22 +03:00
commit 2add82efc5

View file

@ -7,7 +7,7 @@ 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;
const sidebar = this.parentComponent(); // XXX for some reason not working const sidebar = Sidebar;
sidebar.callFirstWith(null, 'resetNextPeak'); sidebar.callFirstWith(null, 'resetNextPeak');
this.autorun(() => { this.autorun(() => {
let mode = this.data().mode; let mode = this.data().mode;
@ -43,16 +43,15 @@ BlazeComponent.extendComponent({
}); });
}); });
}, },
}).register('activities');
BlazeComponent.extendComponent({
loadNextPage() { loadNextPage() {
if (this.loadNextPageLocked === false) { if (this.loadNextPageLocked === false) {
this.page.set(this.page.get() + 1); this.page.set(this.page.get() + 1);
this.loadNextPageLocked = true; this.loadNextPageLocked = true;
} }
}, },
}).register('activities');
BlazeComponent.extendComponent({
checkItem() { checkItem() {
const checkItemId = this.currentData().activity.checklistItemId; const checkItemId = this.currentData().activity.checklistItemId;
const checkItem = ChecklistItems.findOne({ _id: checkItemId }); const checkItem = ChecklistItems.findOne({ _id: checkItemId });