Refs #2953: fix html entities on javascript

4 files changed, 28 insertions, 22 deletions

diff --git a/app/assets/javascripts/es6_browserified/itineraries/components/BSelect2.js b/app/assets/javascripts/es6_browserified/itineraries/components/BSelect2.js
index 3414636fa..dae62d3e1 100644
--- a/app/assets/javascripts/es6_browserified/itineraries/components/BSelect2.js
+++ b/app/assets/javascripts/es6_browserified/itineraries/components/BSelect2.js
@@ -29,15 +29,20 @@ class BSelect3 extends React.Component{
   }
 
   parsedText(data) {
-    let a = this.props.value.text.replace('</em></small>', '')
+    let a = data.replace('</em></small>', '')
     let b = a.split('<small><em>')
-
-    return (
-      <span>
-        {b[0]}
-        <small><em>{b[1]}</em></small>
-      </span>
-    )
+    if (b.length > 1) {
+      return (
+        <span>
+          {b[0]}
+          <small><em>{b[1]}</em></small>
+        </span>
+      )
+    } else {
+      return (
+        <span>{data}</span>
+      )
+    }
   }
 
   render() {
@@ -61,7 +66,7 @@ class BSelect3 extends React.Component{
             href={origin + path + '/stop_areas/' + this.props.value.stoparea_id}
             title="Voir l'arrêt"
           >
-            {this.parsedText(this.props.text)}
+            {this.parsedText(this.props.value.text)}
           </a>
         )
   }
diff --git a/app/assets/javascripts/es6_browserified/itineraries/index.js b/app/assets/javascripts/es6_browserified/itineraries/index.js
index 0141459b8..b70dc88c9 100644
--- a/app/assets/javascripts/es6_browserified/itineraries/index.js
+++ b/app/assets/javascripts/es6_browserified/itineraries/index.js
@@ -7,31 +7,31 @@ var App = require('./components/App')
 var addInput = require('./form_helper')
 
 // 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')
 
 const getInitialState = () => {
   let state = []
   let datas = JSON.parse(decodeURIComponent(window.itinerary_stop))
 
   datas.map(function(v, i) {
-    let fancyText = v.name
+    let fancyText = v.name.replace("&#39;", "\'")
     if(v.zip_code && v.city_name)
-      fancyText += ", " + v.zip_code + " " + v.city_name
+      fancyText += ", " + v.zip_code + " " + v.city_name.replace("&#39;", "\'")
 
     state.push({
       stoppoint_id: v.stoppoint_id,
       stoparea_id: v.stoparea_id,
       user_objectid: v.user_objectid,
-      short_name: v.short_name,
+      short_name: v.short_name.replace("&#39;", "\'"),
       area_type: v.area_type,
       index: i,
       edit: false,
-      city_name: v.city_name,
+      city_name: v.city_name.replace("&#39;", "\'"),
       zip_code: v.zip_code,
-      name: v.name,
+      name: v.name.replace("&#39;", "\'"),
       registration_number: v.registration_number,
       text: fancyText,
       for_boarding: v.for_boarding || "normal",
@@ -49,11 +49,11 @@ const getInitialState = () => {
 }
 
 var initialState = {stopPoints: getInitialState()}
-// const loggerMiddleware = createLogger()
+const loggerMiddleware = createLogger()
 let store = createStore(
   reducers,
-  initialState
-  // applyMiddleware(thunkMiddleware, promise, loggerMiddleware)
+  initialState,
+  applyMiddleware(thunkMiddleware, promise, loggerMiddleware)
 )
 
 render(
diff --git a/app/assets/stylesheets/modules/_routes_stopoints.sass b/app/assets/stylesheets/modules/_routes_stopoints.sass
index 8a42e3fcd..735e91df7 100644
--- a/app/assets/stylesheets/modules/_routes_stopoints.sass
+++ b/app/assets/stylesheets/modules/_routes_stopoints.sass
@@ -62,7 +62,7 @@
             bottom: 0
             left: 5px
 
-    &:last-child > .wrapper > div:first-child
+    &:last-child > .wrapper:last-child > div:first-child
       span:after
         bottom: 5px
 
diff --git a/app/views/routes/_form.html.slim b/app/views/routes/_form.html.slim
index 2603f64cb..df9a81406 100644
--- a/app/views/routes/_form.html.slim
+++ b/app/views/routes/_form.html.slim
@@ -15,6 +15,7 @@
 
   .row
     .col-lg-12
+      p = @route.stop_areas.last.name
       #stop_points
 
   = f.button :submit, t('actions.submit'), class: 'btn btn-default formSubmitr', form: 'route_form'