aboutsummaryrefslogtreecommitdiffstats
path: root/app/javascript/packs/routes
diff options
context:
space:
mode:
authorZog2018-04-11 16:22:22 +0200
committerZog2018-04-11 16:22:22 +0200
commit61130315087432434fbbae50d30ad1753ff596a8 (patch)
treeb1976594f2a074961c331fead0fc25c8298e98ec /app/javascript/packs/routes
parent2d1ebb630ecfdd7b745571202ee60a35902b545f (diff)
downloadchouette-core-61130315087432434fbbae50d30ad1753ff596a8.tar.bz2
Make ReactJS views IE-compliant :firework:ie-fixes
Diffstat (limited to 'app/javascript/packs/routes')
-rw-r--r--app/javascript/packs/routes/edit.js27
-rw-r--r--app/javascript/packs/routes/show.js2
2 files changed, 23 insertions, 6 deletions
diff --git a/app/javascript/packs/routes/edit.js b/app/javascript/packs/routes/edit.js
index fc7aa203d..0512b7aff 100644
--- a/app/javascript/packs/routes/edit.js
+++ b/app/javascript/packs/routes/edit.js
@@ -1,3 +1,5 @@
+import '../../helpers/polyfills'
+
import React from 'react'
import PropTypes from 'prop-types'
@@ -56,12 +58,25 @@ const getInitialState = () => {
}
var initialState = { stopPoints: getInitialState() }
-const loggerMiddleware = createLogger()
-let store = createStore(
- reducers,
- initialState,
- applyMiddleware(thunkMiddleware, promise, loggerMiddleware)
-)
+let store = null
+
+if(Object.assign){
+ const loggerMiddleware = createLogger()
+ store = createStore(
+ reducers,
+ initialState,
+ applyMiddleware(thunkMiddleware, promise, loggerMiddleware)
+ )
+}
+else{
+ // IE
+ store = createStore(
+ reducers,
+ initialState,
+ applyMiddleware(thunkMiddleware, promise)
+ )
+}
+
render(
<Provider store={store}>
diff --git a/app/javascript/packs/routes/show.js b/app/javascript/packs/routes/show.js
index c20de0800..e8e068ddd 100644
--- a/app/javascript/packs/routes/show.js
+++ b/app/javascript/packs/routes/show.js
@@ -1,3 +1,5 @@
+import '../../helpers/polyfills'
+
import clone from '../../helpers/clone'
import RoutesMap from '../../helpers/routes_map'