diff options
3 files changed, 21 insertions, 55 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 090e22721..ca266af08 100644 --- a/app/assets/javascripts/es6_browserified/journey_patterns/components/SaveJourneyPattern.js +++ b/app/assets/javascripts/es6_browserified/journey_patterns/components/SaveJourneyPattern.js @@ -8,18 +8,10 @@ class SaveJourneyPattern extends Component{ super(props) } - componentDidUpdate(prevProps, prevState) { - if(prevProps.status.isFetching == true){ - $(window).scrollTop(0); - submitMover(); - } - } - render() { - if(this.props.status.isFetching == true || (this.props.status.policy['journey_patterns.edit'] == false)) { + if(this.props.status.policy['journey_patterns.edit'] == false) { return false - } - if(this.props.status.fetchSuccess == true) { + }else{ return ( <div className='row mt-md'> <div className='col-lg-12 text-right'> @@ -38,8 +30,6 @@ class SaveJourneyPattern extends Component{ </div> </div> ) - } else { - return false } } } 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 98b355fcb..24c91f282 100644 --- a/app/assets/javascripts/es6_browserified/time_tables/components/SaveTimetable.js +++ b/app/assets/javascripts/es6_browserified/time_tables/components/SaveTimetable.js @@ -8,39 +8,25 @@ class SaveTimetable extends Component{ super(props) } - componentDidUpdate(prevProps, prevState) { - if(prevProps.status.isFetching == true){ - $(window).scrollTop(0); - submitMover(); - } - } - render() { - if(this.props.status.isFetching == true) { - return false - } - if(this.props.status.fetchSuccess == true) { - return ( - <div className='row mt-md'> - <div className='col-lg-12 text-right'> - <form className='time_tables formSubmitr ml-xs' onSubmit={e => {e.preventDefault()}}> - <button - className='btn btn-default' - type='button' - onClick={e => { - e.preventDefault() - actions.submitTimetable(this.props.dispatch, this.props.timetable, this.props.metas) - }} - > - Valider - </button> - </form> - </div> + return ( + <div className='row mt-md'> + <div className='col-lg-12 text-right'> + <form className='time_tables formSubmitr ml-xs' onSubmit={e => {e.preventDefault()}}> + <button + className='btn btn-default' + type='button' + onClick={e => { + e.preventDefault() + actions.submitTimetable(this.props.dispatch, this.props.timetable, this.props.metas) + }} + > + Valider + </button> + </form> </div> - ) - } else { - return false - } + </div> + ) } } 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 f494ab92b..27a82cf48 100644 --- a/app/assets/javascripts/es6_browserified/vehicle_journeys/components/SaveVehicleJourneys.js +++ b/app/assets/javascripts/es6_browserified/vehicle_journeys/components/SaveVehicleJourneys.js @@ -8,18 +8,10 @@ class SaveVehicleJourneys extends Component{ super(props) } - componentDidUpdate(prevProps, prevState) { - if(prevProps.status.isFetching == true) { - $(window).scrollTop(0); - submitMover(); - } - } - render() { - if(this.props.status.isFetching == true || this.props.filters.policy['vehicle_journeys.edit'] == false) { + if(this.props.filters.policy['vehicle_journeys.edit'] == false) { return false - } - if(this.props.status.fetchSuccess == true) { + }else{ return ( <div className='row mt-md'> <div className='col-lg-12 text-right'> @@ -38,8 +30,6 @@ class SaveVehicleJourneys extends Component{ </div> </div> ) - } else { - return false } } } |