aboutsummaryrefslogtreecommitdiffstats
path: root/app/assets/javascripts
diff options
context:
space:
mode:
Diffstat (limited to 'app/assets/javascripts')
-rw-r--r--app/assets/javascripts/es6_browserified/journey_patterns/actions/index.js6
-rw-r--r--app/assets/javascripts/es6_browserified/vehicle_journeys/actions/index.js6
2 files changed, 8 insertions, 4 deletions
diff --git a/app/assets/javascripts/es6_browserified/journey_patterns/actions/index.js b/app/assets/javascripts/es6_browserified/journey_patterns/actions/index.js
index 709686f21..54d62f999 100644
--- a/app/assets/javascripts/es6_browserified/journey_patterns/actions/index.js
+++ b/app/assets/javascripts/es6_browserified/journey_patterns/actions/index.js
@@ -130,9 +130,10 @@ const actions = {
if(next) {
dispatch(next)
} else {
- if(json.length != window.journeyPatternsPerPage){
- dispatch(actions.updateTotalCount(window.journeyPatternsPerPage - json.length))
+ if(json.length != window.currentItemsLength){
+ dispatch(actions.updateTotalCount(window.currentItemsLength - json.length))
}
+ window.currentItemsLength = json.length
dispatch(actions.receiveJourneyPatterns(json))
}
}
@@ -196,6 +197,7 @@ const actions = {
})
}
}
+ window.currentItemsLength = journeyPatterns.length
dispatch(actions.receiveJourneyPatterns(journeyPatterns))
}
})
diff --git a/app/assets/javascripts/es6_browserified/vehicle_journeys/actions/index.js b/app/assets/javascripts/es6_browserified/vehicle_journeys/actions/index.js
index 9abaf9d0f..d39943913 100644
--- a/app/assets/javascripts/es6_browserified/vehicle_journeys/actions/index.js
+++ b/app/assets/javascripts/es6_browserified/vehicle_journeys/actions/index.js
@@ -318,6 +318,7 @@ const actions = {
company_id: val.published_journey_name || 'non renseigné'
})
}
+ window.currentItemsLength = vehicleJourneys.length
dispatch(actions.receiveVehicleJourneys(vehicleJourneys))
dispatch(actions.receiveTotalCount(json.total))
}
@@ -348,9 +349,10 @@ const actions = {
if(next) {
dispatch(next)
} else {
- if(json.length != window.vehicleJourneysPerPage){
- dispatch(actions.updateTotalCount(window.vehicleJourneysPerPage - json.length))
+ if(json.length != window.currentItemsLength){
+ dispatch(actions.updateTotalCount(window.currentItemsLength - json.length))
}
+ window.currentItemsLength = json.length
dispatch(actions.receiveVehicleJourneys(json))
}
}