From 7d5fe8f0eed4f62ae309ebd831b3c9138318f29e Mon Sep 17 00:00:00 2001 From: vjrj Date: Wed, 28 Feb 2018 01:52:10 +0100 Subject: [PATCH] isHomeAndMobile reactive --- imports/ui/components/Utils/isMobile.js | 4 ++-- imports/ui/pages/FireSubscription/FireSubscription.js | 4 ++-- imports/ui/pages/FiresMap/FiresMap.js | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/imports/ui/components/Utils/isMobile.js b/imports/ui/components/Utils/isMobile.js index 4328a3d..00b91a7 100644 --- a/imports/ui/components/Utils/isMobile.js +++ b/imports/ui/components/Utils/isMobile.js @@ -2,8 +2,8 @@ import isMobile from 'ismobilejs'; import { isHome } from './location'; // https://github.com/ReactTraining/react-router/issues/184 -export const isHomeAndMobile = isHome() && isMobile.any; -export const isNotHomeAndMobile = !isHomeAndMobile; +export const isHomeAndMobile = () => isHome() && isMobile.any; +export const isNotHomeAndMobile = () => !isHomeAndMobile(); export const isAnyMobile = isMobile.any; // https://stackoverflow.com/questions/18625321/detect-webkit-browser-in-javascript export const isChrome = /Chrome/.test(navigator.userAgent) && /Google Inc/.test(navigator.vendor); diff --git a/imports/ui/pages/FireSubscription/FireSubscription.js b/imports/ui/pages/FireSubscription/FireSubscription.js index 8013b86..177cbd7 100644 --- a/imports/ui/pages/FireSubscription/FireSubscription.js +++ b/imports/ui/pages/FireSubscription/FireSubscription.js @@ -73,7 +73,7 @@ class FireSubscription extends React.Component { return (
- {isNotHomeAndMobile && + {isNotHomeAndMobile() &&
} this.onSliderChange(value)} /> - {isNotHomeAndMobile && + {isNotHomeAndMobile() && this.centerOnUserLocation(viewport)} /> diff --git a/imports/ui/pages/FiresMap/FiresMap.js b/imports/ui/pages/FiresMap/FiresMap.js index f4c1604..cd47ac5 100644 --- a/imports/ui/pages/FiresMap/FiresMap.js +++ b/imports/ui/pages/FiresMap/FiresMap.js @@ -227,13 +227,13 @@ class FiresMap extends React.Component { En rojo, {{ count: this.props.activefires.length + this.props.firealerts.length }} fuegos activos en el mapa. Hay un total de {{ countTotal: this.props.activefirestotal }} fuegos activos detectados en todo el mundo por la NASA. Datos actualizados . }

- {isNotHomeAndMobile && this.props.firealerts.length > 0 && + {isNotHomeAndMobile() && this.props.firealerts.length > 0 &&

En naranja, los fuegos notificados por nuestros usuarios/as recientemente.

} - {isNotHomeAndMobile && this.props.firealerts.length === 0 && + {isNotHomeAndMobile() && this.props.firealerts.length === 0 &&

No hay fuegos notificados recientemente por nuestros usuarios/as en esta zona.

} - {isNotHomeAndMobile && + {isNotHomeAndMobile() &&