From f1c055805fbb9f414fa54a6ed254b80cb845aa7f Mon Sep 17 00:00:00 2001 From: luisramos0 Date: Sat, 9 Nov 2019 21:25:46 +0000 Subject: [PATCH] Use $timeout instead of setTimeout which makes it possible to remove apply() --- .../order_cycle_exchanges_controller.js.coffee | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/app/assets/javascripts/admin/order_cycles/controllers/order_cycle_exchanges_controller.js.coffee b/app/assets/javascripts/admin/order_cycles/controllers/order_cycle_exchanges_controller.js.coffee index 6cc56ebe3e..82aea0a434 100644 --- a/app/assets/javascripts/admin/order_cycles/controllers/order_cycle_exchanges_controller.js.coffee +++ b/app/assets/javascripts/admin/order_cycles/controllers/order_cycle_exchanges_controller.js.coffee @@ -1,5 +1,5 @@ angular.module('admin.orderCycles') - .controller 'AdminOrderCycleExchangesCtrl', ($scope, $controller, $filter, $window, $location, OrderCycle, Enterprise, EnterpriseFee, Schedules, RequestMonitor, ocInstance, StatusMessage) -> + .controller 'AdminOrderCycleExchangesCtrl', ($scope, $controller, $filter, $window, $location, $timeout, OrderCycle, Enterprise, EnterpriseFee, Schedules, RequestMonitor, ocInstance, StatusMessage) -> $controller('AdminEditOrderCycleCtrl', {$scope: $scope, ocInstance: ocInstance, $location: $location}) $scope.supplier_enterprises = Enterprise.producer_enterprises @@ -38,11 +38,9 @@ angular.module('admin.orderCycles') OrderCycle.addDistributor($scope.new_distributor_id) $scope.setPickupTimeFieldDirty = (index) -> - setTimeout -> - last_outgoing_exchange_pickup_time_field_name = "order_cycle_outgoing_exchange_" + index + "_pickup_time" - $scope.order_cycle_form[last_outgoing_exchange_pickup_time_field_name].$setDirty() - $scope.$apply() - , 1 + $timeout -> + pickup_time_field_name = "order_cycle_outgoing_exchange_" + index + "_pickup_time" + $scope.order_cycle_form[pickup_time_field_name].$setDirty() $scope.removeDistributionOfVariant = (variant_id) -> OrderCycle.removeDistributionOfVariant(variant_id)