Browse Source

Fix activities view on mobile devices

Turns out that the sidebar is not available on mobile device therefore add
guards for this for now. This needs further investigation.
Marc Hartmayer 5 năm trước cách đây
mục cha
commit
e21c078521
1 tập tin đã thay đổi với 4 bổ sung1 xóa
  1. 4 1
      client/components/activities/activities.js

+ 4 - 1
client/components/activities/activities.js

@@ -7,8 +7,9 @@ BlazeComponent.extendComponent({
     // XXX Should we use ReactiveNumber?
     this.page = new ReactiveVar(1);
     this.loadNextPageLocked = false;
+    // TODO is sidebar always available? E.g. on small screens/mobile devices
     const sidebar = Sidebar;
-    sidebar.callFirstWith(null, 'resetNextPeak');
+    sidebar && sidebar.callFirstWith(null, 'resetNextPeak');
     this.autorun(() => {
       let mode = this.data().mode;
       const capitalizedMode = Utils.capitalize(mode);
@@ -29,6 +30,8 @@ BlazeComponent.extendComponent({
       this.subscribe('activities', mode, searchId, limit, hideSystem, () => {
         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
         // activities, and we can stop calling new subscriptions.
         // XXX This is hacky! We need to know excatly and reactively how many