aboutsummaryrefslogtreecommitdiffstats
path: root/app/assets/javascripts
diff options
context:
space:
mode:
authorjpl2017-01-09 12:10:24 +0100
committerjpl2017-01-09 12:10:24 +0100
commit953fb3a48c43f5801bbc35dd02a2db26b21479b1 (patch)
tree2d42c8e5b59a6031f3100fac098ed2ff3e679cc9 /app/assets/javascripts
parent7b57387a03a5f100320f91d7c8cb25e29d126815 (diff)
downloadchouette-core-953fb3a48c43f5801bbc35dd02a2db26b21479b1.tar.bz2
adding modal specs
Diffstat (limited to 'app/assets/javascripts')
-rw-r--r--app/assets/javascripts/es6_browserified/journey_patterns/index.js14
-rw-r--r--app/assets/javascripts/es6_browserified/journey_patterns/reducers/modal.js13
2 files changed, 15 insertions, 12 deletions
diff --git a/app/assets/javascripts/es6_browserified/journey_patterns/index.js b/app/assets/javascripts/es6_browserified/journey_patterns/index.js
index 449cd3202..41e27d9d1 100644
--- a/app/assets/javascripts/es6_browserified/journey_patterns/index.js
+++ b/app/assets/javascripts/es6_browserified/journey_patterns/index.js
@@ -6,10 +6,10 @@ var journeyPatternsApp = require('./reducers')
var App = require('./components/App')
// logger, DO NOT REMOVE
-// var applyMiddleware = require('redux').applyMiddleware
-// var createLogger = require('redux-logger')
-// var thunkMiddleware = require('redux-thunk').default
-// var promise = require('redux-promise')
+var applyMiddleware = require('redux').applyMiddleware
+var createLogger = require('redux-logger')
+var thunkMiddleware = require('redux-thunk').default
+var promise = require('redux-promise')
var initialState = {
journeyPatterns: [],
@@ -23,12 +23,12 @@ var initialState = {
confirmModal: {}
}
}
-// const loggerMiddleware = createLogger()
+const loggerMiddleware = createLogger()
let store = createStore(
journeyPatternsApp,
- initialState
- // applyMiddleware(thunkMiddleware, promise, loggerMiddleware)
+ initialState,
+ applyMiddleware(thunkMiddleware, promise, loggerMiddleware)
)
render(
diff --git a/app/assets/javascripts/es6_browserified/journey_patterns/reducers/modal.js b/app/assets/javascripts/es6_browserified/journey_patterns/reducers/modal.js
index 81c3580eb..85df48954 100644
--- a/app/assets/javascripts/es6_browserified/journey_patterns/reducers/modal.js
+++ b/app/assets/javascripts/es6_browserified/journey_patterns/reducers/modal.js
@@ -14,21 +14,24 @@ const modal = (state = {}, action) => {
modalProps: {
index: action.index,
journeyPattern: action.journeyPattern
- }
+ },
+ confirmModal: {}
}
case 'CREATE_JOURNEYPATTERN_MODAL':
return {
type: 'create',
- modalProps: { index: action.index }
+ modalProps: {},
+ confirmModal: {}
}
case 'DELETE_JOURNEYPATTERN':
- return Object.assign({}, state, { type :'' })
+ return Object.assign({}, state, { type: '' })
case 'SAVE_MODAL':
- return Object.assign({}, state, { type :'' })
+ return Object.assign({}, state, { type: '' })
case 'CLOSE_MODAL':
return {
type: '',
- modalProps: {}
+ modalProps: {},
+ confirmModal: {}
}
default:
return state