diff options
| author | jpl | 2016-11-04 15:03:49 +0100 |
|---|---|---|
| committer | jpl | 2016-11-04 15:03:49 +0100 |
| commit | cb0500d5949153d75f1aeb656034d8d55e02a615 (patch) | |
| tree | f7398e0ad8c68382724dd96209703bf4b69fe967 | |
| parent | b2acd04ec51fb09b55ab4df643de1488b7571da6 (diff) | |
| download | chouette-core-cb0500d5949153d75f1aeb656034d8d55e02a615.tar.bz2 | |
getting itinerary stop_points data in js, formatted in correct JSON object
| -rw-r--r-- | app/assets/javascripts/es6_browserified/getJSON.js | 5 | ||||
| -rw-r--r-- | app/views/routes/_form.html.slim | 7 | ||||
| -rw-r--r-- | app/views/routes/edit.html.slim | 5 |
3 files changed, 11 insertions, 6 deletions
diff --git a/app/assets/javascripts/es6_browserified/getJSON.js b/app/assets/javascripts/es6_browserified/getJSON.js index e883522b0..5e7e1a078 100644 --- a/app/assets/javascripts/es6_browserified/getJSON.js +++ b/app/assets/javascripts/es6_browserified/getJSON.js @@ -1 +1,4 @@ -console.log(window.itinerary_stop); +data = decodeURIComponent(window.itinerary_stop) +JSONobject = JSON.parse(data) + +console.log(JSONobject) diff --git a/app/views/routes/_form.html.slim b/app/views/routes/_form.html.slim index 6783cf6d6..61ed1b77b 100644 --- a/app/views/routes/_form.html.slim +++ b/app/views/routes/_form.html.slim @@ -45,3 +45,10 @@ div#root .col-lg-12.col-md-12.col-sm-12.col-xs-12.text-right = link_to 'Annuler', :back, class: 'btn btn-link' = f.button :submit, class: 'btn btn-danger' + + + += javascript_tag do + | window.itinerary_stop = "#{URI.escape(@route.stop_areas.all.to_json)}" + += javascript_include_tag 'es6_browserified/getJSON.js' diff --git a/app/views/routes/edit.html.slim b/app/views/routes/edit.html.slim index abd32bbd9..a0431dc32 100644 --- a/app/views/routes/edit.html.slim +++ b/app/views/routes/edit.html.slim @@ -3,8 +3,3 @@ .row .col-lg-8.col-lg-offset-2.col-md-8.col-md-offset-2.col-sm-8.col-sm-offset-2 == render 'form' - -= javascript_tag do - | window.itinerary_stop = "#{@route.stop_areas.all.to_json}"; - -= javascript_include_tag 'es6_browserified/getJSON.js' |