ssb-chess-mithril 2.1.1 → 2.1.3

package/index.js

@@ -61,11 +61,13 @@ module.exports = (attachToElement, dataAccess, opts = {}) => {
     const gamesMyMoveObs = mainCtrl.getGameCtrl().getGamesWhereMyMove();
     const observableGamesObs = mainCtrl.getGameCtrl().getFriendsObservableGames();
     const userRecentActivity = mainCtrl.getRecentActivityCtrl().getRecentActivityForUserGames();
+    const pendingChallengesReceived = mainCtrl.getInviteCtrl().pendingChallengesReceived()
+    const unseenNotifications = mainCtrl.getRecentActivityCtrl().unseenNotifications()
 
     // Hack: keep observables loaded with the latest value.
     const watches = [
       gamesInProgressObs(e => e),
-      gamesMyMoveObs(),
+      gamesMyMoveObs(e => e),
       observableGamesObs(e => e),
       userRecentActivity(e => e)
      ];
@@ -74,7 +76,12 @@ module.exports = (attachToElement, dataAccess, opts = {}) => {
 
     m.route.prefix = '?';
 
-    const navigationBar = NavigationBar(mainCtrl, settingsCtrl)
+    const navigationBar = NavigationBar(mainCtrl, settingsCtrl, {
+      gamesWhereMyMove: gamesMyMoveObs,
+      friendsObservableGames: observableGamesObs,
+      pendingChallengesReceived: pendingChallengesReceived,
+      unseenNotifications: unseenNotifications
+    })
 
     m.route(mountElement, defaultView, {
       '/my_games': layoutTemplate(navigationBar, MiniboardListComponent(mainCtrl, gamesInProgressObs, mainCtrl.getMyIdent())),
@@ -151,7 +158,7 @@ module.exports = (attachToElement, dataAccess, opts = {}) => {
     },
     destroy: () => {
       // unmount the app
-      m.route(attachToElement, null);
+      m.mount(attachToElement, null);
       globalWatches.then((watches) => watches.forEach(w => w()))
     }
   };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ssb-chess-mithril",
-  "version": "2.1.1",
+  "version": "2.1.3",
   "description": "An ssb-chess client",
   "main": "index.js",
   "scripts": {

package/ui/pageLayout/navigation.js

@@ -1,9 +1,11 @@
 const m = require('mithril');
 const SettingsDialog = require('../settings/settings-dialog');
 
-module.exports = (mainCtrl, settings) => {
+module.exports = (mainCtrl, settings, globalObservables) => {
   m.route.prefix = '?';
 
+  const { gamesWhereMyMove, friendsObservableGames, pendingChallengesReceived, unseenNotifications } = globalObservables;
+
   const gamesInProgress = {
     name: 'Games',
     link: '/my_games',
@@ -14,21 +16,21 @@ module.exports = (mainCtrl, settings) => {
     name: 'My Move',
     link: '/games_my_move',
     count: 0,
-    countUpdateFn: mainCtrl.getGameCtrl().getGamesWhereMyMove,
+    countUpdateFn: () => gamesWhereMyMove,
     countHoverText: () => `${gamesMyMove.count} games awaiting your move.`,
   };
   const invitations = {
     name: 'Invitations',
     link: '/invitations',
     count: 0,
-    countUpdateFn: mainCtrl.getInviteCtrl().pendingChallengesReceived,
+    countUpdateFn: () => pendingChallengesReceived,
     countHoverText: () => `${invitations.count} pending invitations received.`,
   };
   const observable = {
     name: 'Observe',
     link: '/observable',
     count: 0,
-    countUpdateFn: mainCtrl.getGameCtrl().getFriendsObservableGames,
+    countUpdateFn: () => friendsObservableGames,
     countOnHoverOnly: true,
     countHoverText: () => `${observable.count} observable games.`,
   };
@@ -36,7 +38,7 @@ module.exports = (mainCtrl, settings) => {
     name: 'Recent Activity',
     link: '/activity',
     count: 0,
-    countUpdateFn: mainCtrl.getRecentActivityCtrl().unseenNotifications,
+    countUpdateFn: () => unseenNotifications,
     countHoverText: () => 'Recent Activity',
   };