aboutsummaryrefslogtreecommitdiffstats
path: root/app
diff options
context:
space:
mode:
authorjpl2016-11-07 10:03:58 +0100
committerjpl2016-11-07 10:03:58 +0100
commit22fdf9380bb62eefccdc344424aca8d7f36c0af8 (patch)
tree4b03e44ea21bed263906d175eb7694d6d3ed7cdb /app
parent3d7f82296c3a265a3ad40139277c1177bf860f17 (diff)
downloadchouette-core-22fdf9380bb62eefccdc344424aca8d7f36c0af8.tar.bz2
rename js reactux file for better understanding
Diffstat (limited to 'app')
-rw-r--r--app/assets/javascripts/es6_browserified/getJSON.js2
-rw-r--r--app/assets/javascripts/es6_browserified/stop_points.js (renamed from app/assets/javascripts/es6_browserified/test.js)0
-rw-r--r--app/views/routes/_form.html.slim2
-rw-r--r--app/views/routes/new.html.slim2
4 files changed, 3 insertions, 3 deletions
diff --git a/app/assets/javascripts/es6_browserified/getJSON.js b/app/assets/javascripts/es6_browserified/getJSON.js
index 5e7e1a078..c65336b2d 100644
--- a/app/assets/javascripts/es6_browserified/getJSON.js
+++ b/app/assets/javascripts/es6_browserified/getJSON.js
@@ -1,4 +1,4 @@
data = decodeURIComponent(window.itinerary_stop)
JSONobject = JSON.parse(data)
-console.log(JSONobject)
+console.log("JSON", JSONobject)
diff --git a/app/assets/javascripts/es6_browserified/test.js b/app/assets/javascripts/es6_browserified/stop_points.js
index 9e8b62fbc..9e8b62fbc 100644
--- a/app/assets/javascripts/es6_browserified/test.js
+++ b/app/assets/javascripts/es6_browserified/stop_points.js
diff --git a/app/views/routes/_form.html.slim b/app/views/routes/_form.html.slim
index 61ed1b77b..b4ead3fe7 100644
--- a/app/views/routes/_form.html.slim
+++ b/app/views/routes/_form.html.slim
@@ -47,7 +47,7 @@ div#root
= f.button :submit, class: 'btn btn-danger'
-
+
= javascript_tag do
| window.itinerary_stop = "#{URI.escape(@route.stop_areas.all.to_json)}"
diff --git a/app/views/routes/new.html.slim b/app/views/routes/new.html.slim
index a09f2f3f4..8ec5a38e9 100644
--- a/app/views/routes/new.html.slim
+++ b/app/views/routes/new.html.slim
@@ -3,4 +3,4 @@
== render 'form'
/ TEST ES6
-= javascript_include_tag 'es6_browserified/test.js'
+= javascript_include_tag 'es6_browserified/stop_points.js'