comunes/todos-contra-el-fuego-web
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Disable map sleep in chrome

Browse source
This commit is contained in:
vjrj 2018-01-25 15:54:27 +01:00
parent ce18aab493
commit 5cf985aada
4 changed files with 8 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

3
imports/ui/components/SelectionMap/SelectionMap.js
View file

@ -22,6 +22,7 @@ import Control from 'react-leaflet-control';
import { Row, Col, Button, ButtonGroup } from 'react-bootstrap'; import { Row, Col, Button, ButtonGroup } from 'react-bootstrap';
import subsUnion from '/imports/ui/components/Maps/SubsUnion/SubsUnion'; import subsUnion from '/imports/ui/components/Maps/SubsUnion/SubsUnion';
import UserSubsToFiresCollection from '/imports/api/Subscriptions/Subscriptions'; import UserSubsToFiresCollection from '/imports/api/Subscriptions/Subscriptions';
import { isChrome } from '/imports/ui/components/Utils/isMobile';
import './SelectionMap.scss'; import './SelectionMap.scss';
export const action = { export const action = {
@ -173,7 +174,7 @@ class SelectionMap extends Component {
className="selectionmap-leaflet-container" className="selectionmap-leaflet-container"
onViewportChanged={this.onViewportChanged} onViewportChanged={this.onViewportChanged}
animate animate
sleep={window.location.pathname === '/'} sleep={window.location.pathname === '/' && !isChrome}
sleepTime={10750} sleepTime={10750}
wakeTime={750} wakeTime={750}
sleepNote sleepNote

2
imports/ui/components/Utils/isMobile.js
View file

@ -4,3 +4,5 @@ import isMobile from 'ismobilejs';
export const isHomeAndMobile = (window.location.pathname === '/' && isMobile.any); export const isHomeAndMobile = (window.location.pathname === '/' && isMobile.any);
export const isNotHomeAndMobile = !isHomeAndMobile; export const isNotHomeAndMobile = !isHomeAndMobile;
export const isAnyMobile = isMobile.any; 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);

4
imports/ui/pages/FiresMap/FiresMap.js
View file

@ -25,7 +25,7 @@ import Loading from '/imports/ui/components/Loading/Loading';
import ActiveFiresCollection from '/imports/api/ActiveFires/ActiveFires'; import ActiveFiresCollection from '/imports/api/ActiveFires/ActiveFires';
import FireAlertsCollection from '/imports/api/FireAlerts/FireAlerts'; import FireAlertsCollection from '/imports/api/FireAlerts/FireAlerts';
import UserSubsToFiresCollection from '/imports/api/Subscriptions/Subscriptions'; 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'; import './FiresMap.scss';
@ -180,7 +180,7 @@ class FiresMap extends React.Component {
onClick={this.onClickReset} onClick={this.onClickReset}
viewport={this.state.viewport} viewport={this.state.viewport}
onViewportChanged={this.onViewportChanged} onViewportChanged={this.onViewportChanged}
sleep={window.location.pathname === '/'} sleep={window.location.pathname === '/' && !isChrome}
sleepTime={10750} sleepTime={10750}
wakeTime={750} wakeTime={750}
sleepNote sleepNote

3
imports/ui/pages/Subscriptions/SubscriptionsMap.js
View file

@ -19,6 +19,7 @@ import subsUnion from '/imports/ui/components/Maps/SubsUnion/SubsUnion';
import DefMapLayers from '/imports/ui/components/Maps/DefMapLayers'; import DefMapLayers from '/imports/ui/components/Maps/DefMapLayers';
import Loading from '/imports/ui/components/Loading/Loading'; import Loading from '/imports/ui/components/Loading/Loading';
import UserSubsToFiresCollection from '/imports/api/Subscriptions/Subscriptions'; import UserSubsToFiresCollection from '/imports/api/Subscriptions/Subscriptions';
import { isChrome } from '/imports/ui/components/Utils/isMobile';
import './SubscriptionsMap.scss'; import './SubscriptionsMap.scss';
@ -97,7 +98,7 @@ class SubscriptionsMap extends React.Component {
center={this.state.viewport.center} center={this.state.viewport.center}
className="subscriptionsmap-leaflet-container" className="subscriptionsmap-leaflet-container"
animate animate
sleep={window.location.pathname === '/'} sleep={window.location.pathname === '/' && !isChrome}
sleepTime={10750} sleepTime={10750}
wakeTime={750} wakeTime={750}
sleepNote sleepNote