aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Haddad2016-12-15 14:39:42 +0100
committerThomas Haddad2016-12-15 14:39:42 +0100
commitbdacc126920bbc3ae672024dafcb6592e0b49199 (patch)
tree7bd494f6b8119ecc360e70b86f0ee53a7cbaa412
parent7a8bbbf87a710c596b8c73d7a4cb8bfd6db09358 (diff)
downloadchouette-core-bdacc126920bbc3ae672024dafcb6592e0b49199.tar.bz2
JS gardening for journey_patterns
Signed-off-by: Thomas Shawarma Haddad <thomas.haddad@af83.com>
-rw-r--r--app/assets/javascripts/es6_browserified/journey_patterns/actions/index.js15
-rw-r--r--app/assets/javascripts/es6_browserified/journey_patterns/components/JourneyPattern.js3
-rw-r--r--app/assets/javascripts/es6_browserified/journey_patterns/containers/AddJourneyPattern.js1
-rw-r--r--app/assets/javascripts/es6_browserified/journey_patterns/containers/JourneyPatternList.js3
-rw-r--r--app/views/journey_patterns_collections/show.html.slim2
5 files changed, 10 insertions, 14 deletions
diff --git a/app/assets/javascripts/es6_browserified/journey_patterns/actions/index.js b/app/assets/javascripts/es6_browserified/journey_patterns/actions/index.js
index 620890b9f..fea293c95 100644
--- a/app/assets/javascripts/es6_browserified/journey_patterns/actions/index.js
+++ b/app/assets/javascripts/es6_browserified/journey_patterns/actions/index.js
@@ -7,14 +7,12 @@ const actions = {
type: 'LOAD_FIRST_PAGE',
dispatch
}),
- goToPreviousPage : (dispatch, currentPage) => {
- return {
- type: 'GO_TO_PREVIOUS_PAGE',
- dispatch,
- currentPage,
- nextPage : false
- }
- },
+ goToPreviousPage : (dispatch, currentPage) => ({
+ type: 'GO_TO_PREVIOUS_PAGE',
+ dispatch,
+ currentPage,
+ nextPage : false
+ }),
goToNextPage : (dispatch, currentPage) => ({
type: 'GO_TO_NEXT_PAGE',
dispatch,
@@ -73,5 +71,4 @@ const actions = {
}
}
-
module.exports = actions
diff --git a/app/assets/javascripts/es6_browserified/journey_patterns/components/JourneyPattern.js b/app/assets/javascripts/es6_browserified/journey_patterns/components/JourneyPattern.js
index 8848eec35..9265099e7 100644
--- a/app/assets/javascripts/es6_browserified/journey_patterns/components/JourneyPattern.js
+++ b/app/assets/javascripts/es6_browserified/journey_patterns/components/JourneyPattern.js
@@ -13,7 +13,8 @@ const JourneyPattern = (props) => {
}
JourneyPattern.propTypes = {
- value: PropTypes.object
+ value: PropTypes.object,
+ index: PropTypes.number
}
module.exports = JourneyPattern
diff --git a/app/assets/javascripts/es6_browserified/journey_patterns/containers/AddJourneyPattern.js b/app/assets/javascripts/es6_browserified/journey_patterns/containers/AddJourneyPattern.js
index b4f18bf66..0f0656b4e 100644
--- a/app/assets/javascripts/es6_browserified/journey_patterns/containers/AddJourneyPattern.js
+++ b/app/assets/javascripts/es6_browserified/journey_patterns/containers/AddJourneyPattern.js
@@ -7,7 +7,6 @@ let AddJourneyPattern = ({ dispatch }) => {
<div className="clearfix" style={{marginBottom: 10}}>
<form onSubmit={e => {
e.preventDefault()
- dispatch(actions.addStop())
}}>
<button type="submit" className="btn btn-primary btn-xs pull-right">
<span className="fa fa-plus"></span> Ajouter une mission
diff --git a/app/assets/javascripts/es6_browserified/journey_patterns/containers/JourneyPatternList.js b/app/assets/javascripts/es6_browserified/journey_patterns/containers/JourneyPatternList.js
index 5be1869a9..7a5075e35 100644
--- a/app/assets/javascripts/es6_browserified/journey_patterns/containers/JourneyPatternList.js
+++ b/app/assets/javascripts/es6_browserified/journey_patterns/containers/JourneyPatternList.js
@@ -32,8 +32,7 @@ class JourneyPatternList extends Component{
const mapStateToProps = (state) => {
return {
- journeyPatterns: state.journeyPatterns,
- page: state.pagination
+ journeyPatterns: state.journeyPatterns
}
}
diff --git a/app/views/journey_patterns_collections/show.html.slim b/app/views/journey_patterns_collections/show.html.slim
index bb4d3f0c6..7b6f7ae7a 100644
--- a/app/views/journey_patterns_collections/show.html.slim
+++ b/app/views/journey_patterns_collections/show.html.slim
@@ -1,4 +1,4 @@
-#journey_patterns data
+#journey_patterns
= javascript_tag do
| window.journeyPatternLength = #{@journey_patterns.total_entries()}
= javascript_include_tag 'es6_browserified/journey_patterns/index.js'