Refs #3047: Turbolinks load

3 files changed, 73 insertions, 72 deletions

diff --git a/Gemfile.lock b/Gemfile.lock
index 231afaf1f..49ab0c9ac 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -9,9 +9,9 @@ GIT
 
 GIT
   remote: git://github.com/af83/language_engine.git
-  revision: 591595e0262e0ee5f97fa4cf837cefbcf37a6c56
+  revision: c4d7d5af781b55c1df4806c3960caf3c22f1ee96
   specs:
-    language_engine (0.0.6)
+    language_engine (0.0.7)
       rails (~> 4.2)
 
 GIT
@@ -32,14 +32,14 @@ GIT
 
 GIT
   remote: git@github.com:AF83/stif-codifline-api.git
-  revision: 72d53d7666736523b5cbef41a2de7e466d58ea1a
+  revision: 9afe38cce298165765d98936f6d63f8d3cc33bce
   specs:
     codifligne (0.0.2)
       nokogiri (~> 1.6)
 
 GIT
   remote: git@github.com:AF83/stif-reflex-api.git
-  revision: 2c01010dce3a6cb39339995c373faf89ae00f3f3
+  revision: 7c517b98c3900c9bb0b81dd0ccab97f8e8f5f249
   specs:
     reflex (0.0.1)
       nokogiri (~> 1.6)
@@ -50,7 +50,8 @@ GEM
   specs:
     RedCloth (4.3.2)
     SyslogLogger (2.0)
-    aasm (4.11.1)
+    aasm (4.12.0)
+      concurrent-ruby (~> 1.0)
     actionmailer (4.2.8)
       actionpack (= 4.2.8)
       actionview (= 4.2.8)
@@ -70,7 +71,7 @@ GEM
       erubis (~> 2.7.0)
       rails-dom-testing (~> 1.0, >= 1.0.5)
       rails-html-sanitizer (~> 1.0, >= 1.0.3)
-    active_attr (0.9.0)
+    active_attr (0.10.0)
       activemodel (>= 3.0.2, < 5.1)
       activesupport (>= 3.0.2, < 5.1)
     activejob (4.2.8)
@@ -154,8 +155,8 @@ GEM
     coffee-script (2.4.1)
       coffee-script-source
       execjs
-    coffee-script-source (1.11.1)
-    concurrent-ruby (1.0.2)
+    coffee-script-source (1.12.2)
+    concurrent-ruby (1.0.5)
     connection_pool (2.2.1)
     crack (0.4.3)
       safe_yaml (~> 1.0.0)
@@ -178,7 +179,7 @@ GEM
     cucumber-wire (0.0.1)
     daemons (1.2.4)
     database_cleaner (1.5.3)
-    dbf (3.0.8)
+    dbf (3.1.0)
     debug_inspector (0.0.2)
     deep_cloneable (2.0.2)
       activerecord (>= 3.1.0, < 5.0.0)
@@ -193,14 +194,14 @@ GEM
       devise (>= 3.2, < 4.0)
     devise-encryptable (0.2.0)
       devise (>= 2.1.0)
-    devise-i18n (1.1.1)
-    devise_cas_authenticatable (1.9.2)
+    devise-i18n (1.1.2)
+    devise_cas_authenticatable (1.10.0)
       devise (>= 1.2.0)
       rubycas-client (>= 2.2.1)
     devise_invitable (1.6.1)
       actionmailer (>= 3.2.6)
       devise (>= 3.2.0)
-    diff-lcs (1.2.5)
+    diff-lcs (1.3)
     docile (1.1.5)
     dr-ffi-proj4 (0.0.3)
       ffi (>= 1.0.0)
@@ -218,10 +219,10 @@ GEM
     erubis (2.7.0)
     execjs (2.7.0)
     fabrication (2.14.1)
-    factory_girl (4.7.0)
+    factory_girl (4.8.0)
       activesupport (>= 3.0.0)
-    factory_girl_rails (4.7.0)
-      factory_girl (~> 4.7.0)
+    factory_girl_rails (4.8.0)
+      factory_girl (~> 4.8.0)
       railties (>= 3.0.0)
     faker (1.7.3)
       i18n (~> 0.5)
@@ -231,8 +232,8 @@ GEM
     faraday_middleware (0.9.2)
       faraday (>= 0.7.4, < 0.10)
     ffaker (2.1.0)
-    ffi (1.9.14)
-    ffi-geos (1.1.1)
+    ffi (1.9.18)
+    ffi-geos (1.2.0)
       ffi (>= 1.0.0)
     font-awesome-sass (4.7.0)
       sass (>= 3.2)
@@ -249,20 +250,20 @@ GEM
       geokit (= 1.6.7)
       georuby (>= 1.9.8)
       rgeo (>= 0.3.20)
-    gherkin (4.0.0)
+    gherkin (4.1.1)
     globalid (0.3.7)
       activesupport (>= 4.1.0)
     google-analytics-rails (1.1.0)
-    has_scope (0.6.0)
-      actionpack (>= 3.2, < 5)
-      activesupport (>= 3.2, < 5)
-    hashdiff (0.3.1)
+    has_scope (0.7.0)
+      actionpack (>= 4.1, < 5.1)
+      activesupport (>= 4.1, < 5.1)
+    hashdiff (0.3.2)
     highline (1.7.8)
     hike (1.2.3)
     httparty (0.14.0)
       multi_xml (>= 0.5.2)
     i18n (0.8.1)
-    i18n-tasks (0.9.6)
+    i18n-tasks (0.9.13)
       activesupport (>= 4.0.2)
       ast (>= 2.1.0)
       easy_translate (>= 0.5.0)
@@ -270,15 +271,15 @@ GEM
       highline (>= 1.7.3)
       i18n
       parser (>= 2.2.3.0)
-      term-ansicolor (>= 1.3.2)
+      rainbow (~> 2.2)
       terminal-table (>= 1.5.1)
-    inherited_resources (1.6.0)
-      actionpack (>= 3.2, < 5)
-      has_scope (~> 0.6.0.rc)
-      railties (>= 3.2, < 5)
+    inherited_resources (1.7.1)
+      actionpack (>= 3.2, < 5.1)
+      has_scope (~> 0.6)
+      railties (>= 3.2, < 5.1)
       responders
-    jbuilder (2.6.1)
-      activesupport (>= 3.0.0, < 5.1)
+    jbuilder (2.6.3)
+      activesupport (>= 3.0.0, < 5.2)
       multi_json (~> 1.2)
     jquery-rails (3.1.4)
       railties (>= 3.0, < 5.0)
@@ -288,12 +289,13 @@ GEM
       addressable (~> 2.3)
     letter_opener (1.4.1)
       launchy (~> 2.2)
-    libv8 (3.16.14.17)
-    license_finder (2.1.2)
+    libv8 (3.16.14.19)
+    license_finder (3.0.0)
       bundler
       httparty
       rubyzip
       thor
+      with_env (> 1.0)
       xml-simple
     loofah (2.0.3)
       nokogiri (>= 1.5.9)
@@ -315,19 +317,19 @@ GEM
       net-ssh (>= 2.6.5)
     net-sftp (2.1.2)
       net-ssh (>= 2.6.5)
-    net-ssh (3.2.0)
-    net-ssh-gateway (1.2.0)
-      net-ssh (>= 2.6.5)
-    newrelic_rpm (3.17.1.326)
+    net-ssh (4.1.0)
+    net-ssh-gateway (2.0.0)
+      net-ssh (>= 4.0.0)
+    newrelic_rpm (4.0.0.332)
     nokogiri (1.7.1)
       mini_portile2 (~> 2.1.0)
     open4 (1.3.4)
     orm_adapter (0.5.0)
-    parser (2.3.3.1)
+    parser (2.4.0.0)
       ast (~> 2.2)
-    pg (0.19.0)
+    pg (0.20.0)
     phantomjs (2.1.1.0)
-    poltergeist (1.12.0)
+    poltergeist (1.14.0)
       capybara (~> 2.1)
       cliver (~> 0.3.1)
       websocket-driver (>= 0.2.0)
@@ -341,8 +343,8 @@ GEM
     pry-byebug (3.4.2)
       byebug (~> 9.0)
       pry (~> 0.10)
-    pry-rails (0.3.4)
-      pry (>= 0.9.10)
+    pry-rails (0.3.6)
+      pry (>= 0.10.4)
     pundit (1.1.0)
       activesupport (>= 3.0.0)
     quiet_assets (1.1.0)
@@ -369,7 +371,7 @@ GEM
       rails-assets-jquery (>= 1.9.1, < 4)
     rails-assets-footable (2.0.3)
       rails-assets-jquery (>= 1.4.4)
-    rails-assets-jquery (3.1.1)
+    rails-assets-jquery (3.2.1)
     rails-assets-jquery-tokeninput (1.7.0)
       rails-assets-jquery (>= 1.5)
     rails-assets-modernizr (2.0.6)
@@ -399,7 +401,7 @@ GEM
       activesupport (= 4.2.8)
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
-    rainbow (2.1.0)
+    rainbow (2.2.1)
     rake (12.0.0)
     ransack (1.6.5)
       actionpack (>= 3.0)
@@ -408,19 +410,19 @@ GEM
       i18n
       polyamorous (~> 1.1)
     rb-fsevent (0.9.8)
-    rb-inotify (0.9.7)
+    rb-inotify (0.9.8)
       ffi (>= 0.5.0)
     rdoc (4.3.0)
-    redis (3.3.2)
+    redis (3.3.3)
     ref (2.0.0)
-    request_store (1.3.1)
+    request_store (1.3.2)
     responders (2.3.0)
       railties (>= 4.2.0, < 5.1)
     rgeo (0.5.3)
     rgeo-activerecord (4.0.5)
       activerecord (~> 4.2)
       rgeo (~> 0.3)
-    roo (2.5.1)
+    roo (2.7.1)
       nokogiri (~> 1)
       rubyzip (~> 1.1, < 2.0.0)
     rspec-core (3.5.4)
@@ -440,7 +442,7 @@ GEM
       rspec-mocks (~> 3.5.0)
       rspec-support (~> 3.5.0)
     rspec-support (3.5.0)
-    ruby-graphviz (1.2.2)
+    ruby-graphviz (1.2.3)
     rubycas-client (2.3.9)
       activesupport
     rubyzip (1.1.7)
@@ -461,7 +463,7 @@ GEM
       thor (~> 0.14)
     shoulda-matchers (3.1.1)
       activesupport (>= 4.0.0)
-    sidekiq (4.2.7)
+    sidekiq (4.2.10)
       concurrent-ruby (~> 1.0)
       connection_pool (~> 2.2, >= 2.2.0)
       rack-protection (>= 1.5.0)
@@ -469,26 +471,26 @@ GEM
     simple_form (3.1.1)
       actionpack (~> 4.0)
       activemodel (~> 4.0)
-    simplecov (0.12.0)
+    simplecov (0.14.1)
       docile (~> 1.1.0)
       json (>= 1.8, < 3)
       simplecov-html (~> 0.10.0)
     simplecov-html (0.10.0)
     simplecov-rcov (0.2.3)
       simplecov (>= 0.4.1)
-    sinatra (1.4.7)
+    sinatra (1.4.8)
       rack (~> 1.5)
       rack-protection (~> 1.4)
       tilt (>= 1.3, < 3)
     slim (3.0.7)
       temple (~> 0.7.6)
       tilt (>= 1.3.3, < 2.1)
-    slim-rails (3.1.1)
+    slim-rails (3.1.2)
       actionpack (>= 3.1)
       railties (>= 3.1)
       slim (~> 3.0)
     slop (3.6.0)
-    spring (2.0.0)
+    spring (2.0.1)
       activesupport (>= 4.2)
     sprockets (2.12.4)
       hike (~> 1.2)
@@ -499,29 +501,26 @@ GEM
       actionpack (>= 3.0)
       activesupport (>= 3.0)
       sprockets (>= 2.8, < 4.0)
-    sqlite3 (1.3.12)
+    sqlite3 (1.3.13)
     teaspoon (1.1.5)
       railties (>= 3.2.5, < 6)
     teaspoon-jasmine (2.3.4)
       teaspoon (>= 1.0.0)
     temple (0.7.7)
-    term-ansicolor (1.4.0)
-      tins (~> 1.0)
     terminal-table (1.7.3)
       unicode-display_width (~> 1.1.1)
-    therubyracer (0.12.2)
-      libv8 (~> 3.16.14.0)
+    therubyracer (0.12.3)
+      libv8 (~> 3.16.14.15)
       ref
     thor (0.19.4)
     thread (0.2.2)
     thread_safe (0.3.6)
     tilt (1.4.1)
-    tins (1.13.0)
-    transpec (3.2.2)
-      activesupport (>= 3.0, < 5.0)
+    transpec (3.3.0)
+      activesupport (>= 3.0, < 6.0)
       astrolabe (~> 1.2)
       bundler (~> 1.3)
-      json (~> 1.8)
+      json (>= 1.8, < 3.0)
       parser (>= 2.3.0.7)
       rainbow (>= 1.99.1, < 3.0)
     turbolinks (5.0.1)
@@ -532,19 +531,20 @@ GEM
     uglifier (2.7.2)
       execjs (>= 0.3.0)
       json (>= 1.8.0)
-    unicode-display_width (1.1.2)
-    warden (1.2.6)
+    unicode-display_width (1.1.3)
+    warden (1.2.7)
       rack (>= 1.0)
-    webmock (2.3.1)
+    webmock (3.0.0)
       addressable (>= 2.3.6)
       crack (>= 0.3.2)
       hashdiff
-    websocket-driver (0.6.4)
+    websocket-driver (0.6.5)
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.2)
-    will_paginate (3.0.12)
+    will_paginate (3.1.5)
     will_paginate-bootstrap (1.0.1)
       will_paginate (>= 3.0.3)
+    with_env (1.1.0)
     xml-simple (1.1.5)
     xpath (2.0.0)
       nokogiri (~> 1.3)
diff --git a/app/assets/javascripts/routing_constraint_zones.coffee b/app/assets/javascripts/routing_constraint_zones.coffee
index 707b6a856..7460a64a7 100644
--- a/app/assets/javascripts/routing_constraint_zones.coffee
+++ b/app/assets/javascripts/routing_constraint_zones.coffee
@@ -14,7 +14,8 @@ fill_stop_points_options = ->
       console.log textStatus
       console.log errorThrown
 
-# $ ->
-#   if document.location.pathname.endsWith('new')
-#     fill_stop_points_options()
-#   $('#routing_constraint_zone_route_id').change(fill_stop_points_options)
+$(document).on 'turbolinks:load', ->
+  if document.location.pathname.endsWith('new')
+    fill_stop_points_options()
+  $('#routing_constraint_zone_route_id').change(fill_stop_points_options)
+
diff --git a/app/views/routing_constraint_zones/_form.html.slim b/app/views/routing_constraint_zones/_form.html.slim
index e07b21fec..baffb6b49 100644
--- a/app/views/routing_constraint_zones/_form.html.slim
+++ b/app/views/routing_constraint_zones/_form.html.slim
@@ -8,7 +8,7 @@
   .row
     .col-lg-6.col-sm-12
       - stop_points_collection = @routing_constraint_zone.persisted? ? @routing_constraint_zone.route.stop_points : []
-      = f.input :stop_point_ids, id: 'stop_point_ids', as: :select, collection: stop_points_collection, selected: @routing_constraint_zone.stop_point_ids, label: Chouette::StopPoint.model_name.human.pluralize.capitalize, label_method: :name, input_html: { 'data-select2ed': 'true', 'data-select2ed-placeholder': 'Sélection des arrêts sur séquence d\'arrêts', 'multiple': 'multiple', style: 'width: 100%' }
+      = f.input :stop_point_ids, as: :select, collection: stop_points_collection, selected: @routing_constraint_zone.stop_point_ids, label: Chouette::StopPoint.model_name.human.pluralize.capitalize, label_method: :name, input_html: { 'data-select2ed': 'true', 'data-select2ed-placeholder': 'Sélection des arrêts sur séquence d\'arrêts', 'multiple': 'multiple', style: 'width: 100%' }
 
   .row
     .col-lg-12.text-right