Refs #2891: fix teaspoon tests, updating submitMover context

4 files changed, 12 insertions, 6 deletions

diff --git a/app/assets/javascripts/es6_browserified/journey_patterns/components/SaveJourneyPattern.js b/app/assets/javascripts/es6_browserified/journey_patterns/components/SaveJourneyPattern.js
index 93dfa8c6b..090e22721 100644
--- a/app/assets/javascripts/es6_browserified/journey_patterns/components/SaveJourneyPattern.js
+++ b/app/assets/javascripts/es6_browserified/journey_patterns/components/SaveJourneyPattern.js
@@ -10,6 +10,7 @@ class SaveJourneyPattern extends Component{
 
   componentDidUpdate(prevProps, prevState) {
     if(prevProps.status.isFetching == true){
+      $(window).scrollTop(0);
       submitMover();
     }
   }
diff --git a/app/assets/javascripts/es6_browserified/time_tables/components/SaveTimetable.js b/app/assets/javascripts/es6_browserified/time_tables/components/SaveTimetable.js
index d05ff7473..98b355fcb 100644
--- a/app/assets/javascripts/es6_browserified/time_tables/components/SaveTimetable.js
+++ b/app/assets/javascripts/es6_browserified/time_tables/components/SaveTimetable.js
@@ -10,6 +10,7 @@ class SaveTimetable extends Component{
 
   componentDidUpdate(prevProps, prevState) {
     if(prevProps.status.isFetching == true){
+      $(window).scrollTop(0);
       submitMover();
     }
   }
@@ -22,7 +23,7 @@ class SaveTimetable extends Component{
       return (
         <div className='row mt-md'>
           <div className='col-lg-12 text-right'>
-            <form className='formSubmitr ml-xs' onSubmit={e => {e.preventDefault()}}>
+            <form className='time_tables formSubmitr ml-xs' onSubmit={e => {e.preventDefault()}}>
               <button
                 className='btn btn-default'
                 type='button'
@@ -30,7 +31,7 @@ class SaveTimetable extends Component{
                   e.preventDefault()
                   actions.submitTimetable(this.props.dispatch, this.props.timetable, this.props.metas)
                 }}
-                >
+              >
                 Valider
               </button>
             </form>
diff --git a/app/assets/javascripts/es6_browserified/vehicle_journeys/components/SaveVehicleJourneys.js b/app/assets/javascripts/es6_browserified/vehicle_journeys/components/SaveVehicleJourneys.js
index bd34ae114..f494ab92b 100644
--- a/app/assets/javascripts/es6_browserified/vehicle_journeys/components/SaveVehicleJourneys.js
+++ b/app/assets/javascripts/es6_browserified/vehicle_journeys/components/SaveVehicleJourneys.js
@@ -10,6 +10,7 @@ class SaveVehicleJourneys extends Component{
 
   componentDidUpdate(prevProps, prevState) {
     if(prevProps.status.isFetching == true) {
+      $(window).scrollTop(0);
       submitMover();
     }
   }
diff --git a/app/assets/javascripts/main_menu.coffee b/app/assets/javascripts/main_menu.coffee
index 2e0cd3470..f6266f06b 100644
--- a/app/assets/javascripts/main_menu.coffee
+++ b/app/assets/javascripts/main_menu.coffee
@@ -6,6 +6,7 @@ $(document).on 'turbolinks:load', ->
     link = []
     ptitleCont = ""
 
+
   $el = $('#main_nav')
     # Opening/closing left-side menu
   $el.find('.openMenu').on 'click', (e) ->
@@ -19,10 +20,7 @@ $(document).on 'turbolinks:load', ->
   selectedItem.closest('.panel-collapse').addClass 'in'
   selectedItem.closest('.panel-title').children('a').attr('aria-expanded') == true
 
-  # Sticky content
-
-  # Sticky behavior
-  $(document).on 'scroll', ->
+  sticker = () ->
     limit = 51
 
     if $(window).scrollTop() >= limit
@@ -43,6 +41,7 @@ $(document).on 'turbolinks:load', ->
           $('#menu_top').children('.menu-content').after(stickyContent)
         if link.length == 0
           link = $('.page-action .small').next()
+
         $('.sticky-paction .small').after(link)
 
     else
@@ -52,3 +51,7 @@ $(document).on 'turbolinks:load', ->
         if !$('.page-action').find('.formSubmitr').length
           $('.page-action .small').after(link)
         $('.sticky-content').remove()
+
+  sticker();
+  # Sticky behavior
+  $(document).on 'scroll', sticker