From 5cf985aada298cf83acfaf08f7cc2ab6d2c7c838 Mon Sep 17 00:00:00 2001 From: vjrj Date: Thu, 25 Jan 2018 15:54:27 +0100 Subject: [PATCH] Disable map sleep in chrome --- imports/ui/components/SelectionMap/SelectionMap.js | 3 ++- imports/ui/components/Utils/isMobile.js | 2 ++ imports/ui/pages/FiresMap/FiresMap.js | 4 ++-- imports/ui/pages/Subscriptions/SubscriptionsMap.js | 3 ++- 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/imports/ui/components/SelectionMap/SelectionMap.js b/imports/ui/components/SelectionMap/SelectionMap.js index 647f73b..bbc008a 100644 --- a/imports/ui/components/SelectionMap/SelectionMap.js +++ b/imports/ui/components/SelectionMap/SelectionMap.js @@ -22,6 +22,7 @@ import Control from 'react-leaflet-control'; import { Row, Col, Button, ButtonGroup } from 'react-bootstrap'; import subsUnion from '/imports/ui/components/Maps/SubsUnion/SubsUnion'; import UserSubsToFiresCollection from '/imports/api/Subscriptions/Subscriptions'; +import { isChrome } from '/imports/ui/components/Utils/isMobile'; import './SelectionMap.scss'; export const action = { @@ -173,7 +174,7 @@ class SelectionMap extends Component { className="selectionmap-leaflet-container" onViewportChanged={this.onViewportChanged} animate - sleep={window.location.pathname === '/'} + sleep={window.location.pathname === '/' && !isChrome} sleepTime={10750} wakeTime={750} sleepNote diff --git a/imports/ui/components/Utils/isMobile.js b/imports/ui/components/Utils/isMobile.js index 5007f01..868ba97 100644 --- a/imports/ui/components/Utils/isMobile.js +++ b/imports/ui/components/Utils/isMobile.js @@ -4,3 +4,5 @@ import isMobile from 'ismobilejs'; export const isHomeAndMobile = (window.location.pathname === '/' && 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/FiresMap/FiresMap.js b/imports/ui/pages/FiresMap/FiresMap.js index 469b35a..032455d 100644 --- a/imports/ui/pages/FiresMap/FiresMap.js +++ b/imports/ui/pages/FiresMap/FiresMap.js @@ -25,7 +25,7 @@ import Loading from '/imports/ui/components/Loading/Loading'; import ActiveFiresCollection from '/imports/api/ActiveFires/ActiveFires'; import FireAlertsCollection from '/imports/api/FireAlerts/FireAlerts'; import UserSubsToFiresCollection from '/imports/api/Subscriptions/Subscriptions'; -import { isNotHomeAndMobile } from '/imports/ui/components/Utils/isMobile'; +import { isNotHomeAndMobile, isChrome } from '/imports/ui/components/Utils/isMobile'; import './FiresMap.scss'; @@ -180,7 +180,7 @@ class FiresMap extends React.Component { onClick={this.onClickReset} viewport={this.state.viewport} onViewportChanged={this.onViewportChanged} - sleep={window.location.pathname === '/'} + sleep={window.location.pathname === '/' && !isChrome} sleepTime={10750} wakeTime={750} sleepNote diff --git a/imports/ui/pages/Subscriptions/SubscriptionsMap.js b/imports/ui/pages/Subscriptions/SubscriptionsMap.js index a109ff7..2bfe389 100644 --- a/imports/ui/pages/Subscriptions/SubscriptionsMap.js +++ b/imports/ui/pages/Subscriptions/SubscriptionsMap.js @@ -19,6 +19,7 @@ import subsUnion from '/imports/ui/components/Maps/SubsUnion/SubsUnion'; import DefMapLayers from '/imports/ui/components/Maps/DefMapLayers'; import Loading from '/imports/ui/components/Loading/Loading'; import UserSubsToFiresCollection from '/imports/api/Subscriptions/Subscriptions'; +import { isChrome } from '/imports/ui/components/Utils/isMobile'; import './SubscriptionsMap.scss'; @@ -97,7 +98,7 @@ class SubscriptionsMap extends React.Component { center={this.state.viewport.center} className="subscriptionsmap-leaflet-container" animate - sleep={window.location.pathname === '/'} + sleep={window.location.pathname === '/' && !isChrome} sleepTime={10750} wakeTime={750} sleepNote