Trigger a digest cycle when opening modals with dynamic content

app/assets/javascripts/admin/customers/directives/edit_address_dialog.js.coffee

@@ -1,4 +1,4 @@
-angular.module("admin.customers").directive 'editAddressDialog', ($compile, $templateCache, DialogDefaults, Customers, StatusMessage, CountryStates) ->
+angular.module("admin.customers").directive 'editAddressDialog', ($rootScope, $compile, $templateCache, DialogDefaults, Customers, StatusMessage, CountryStates) ->
   restrict: 'A'
   scope: true
   link: (scope, element, attr) ->
@@ -18,6 +18,7 @@ angular.module("admin.customers").directive 'editAddressDialog', ($compile, $tem
           scope.customer = data
           scope.errors = []
           template.dialog('close')
+          $rootScope.$evalAsync()
           StatusMessage.display('success', t('admin.customers.index.update_address_success'))
       else
         scope.errors.push(t('admin.customers.index.update_address_error'))
@@ -33,4 +34,4 @@ angular.module("admin.customers").directive 'editAddressDialog', ($compile, $tem
       template = $compile($templateCache.get('admin/edit_address_dialog.html'))(scope)
       template.dialog(DialogDefaults)
       template.dialog('open')
-      scope.$apply()
+      $rootScope.$evalAsync()

app/assets/javascripts/admin/customers/directives/new_customer_dialog.js.coffee

@@ -1,4 +1,4 @@
-angular.module("admin.customers").directive 'newCustomerDialog', ($compile, $templateCache, DialogDefaults, CurrentShop, Customers) ->
+angular.module("admin.customers").directive 'newCustomerDialog', ($rootScope, $compile, $templateCache, DialogDefaults, CurrentShop, Customers) ->
   restrict: 'A'
   scope: true
   link: (scope, element, attr) ->
@@ -20,6 +20,7 @@ angular.module("admin.customers").directive 'newCustomerDialog', ($compile, $tem
             scope.email = ""
             scope.submitted = false
             template.dialog('close')
+            $rootScope.$evalAsync()
         , (response) ->
           if response.data.errors
             scope.errors.push(error) for error in response.data.errors
@@ -37,5 +38,6 @@ angular.module("admin.customers").directive 'newCustomerDialog', ($compile, $tem
     element.bind 'click', (e) ->
       if CurrentShop.shop.id
         template.dialog('open')
+        $rootScope.$evalAsync()
       else
         alert(t('js.customers.select_shop'))

app/assets/javascripts/admin/enterprises/directives/terms_and_conditions_warning.js.coffee

@@ -1,4 +1,4 @@
-angular.module("admin.enterprises").directive 'termsAndConditionsWarning', ($compile, $templateCache, DialogDefaults, $timeout) ->
+angular.module("admin.enterprises").directive 'termsAndConditionsWarning', ($rootScope, $compile, $templateCache, DialogDefaults, $timeout) ->
   restrict: 'A'
   scope: true
 
@@ -10,13 +10,14 @@ angular.module("admin.enterprises").directive 'termsAndConditionsWarning', ($com
       if scope.template.dialog
         scope.template.dialog(DialogDefaults)
         scope.template.dialog('open')
-      scope.$apply()
+      $rootScope.$evalAsync()
 
     element.bind 'click', scope.hold_file_input_and_show_warning_modal
 
     # When the user presses continue in the warning modal, we open the browser file input dialog
     scope.continue = ->
       scope.template.dialog('close')
+      $rootScope.$evalAsync()
 
       # unbind warning modal handler and click file input again to open the browser file input dialog
       element.unbind('click').trigger('click')
@@ -27,4 +28,5 @@ angular.module("admin.enterprises").directive 'termsAndConditionsWarning', ($com
 
     scope.close = ->
       scope.template.dialog('close')
+      $rootScope.$evalAsync()
       return

app/assets/javascripts/admin/order_cycles/controllers/incoming_controller.js.coffee

@@ -1,4 +1,4 @@
-angular.module('admin.orderCycles').controller 'AdminOrderCycleIncomingCtrl', ($scope, $controller, $location, Enterprise, OrderCycle, ExchangeProduct, ocInstance) ->
+angular.module('admin.orderCycles').controller 'AdminOrderCycleIncomingCtrl', ($scope, $rootScope, $controller, $location, Enterprise, OrderCycle, ExchangeProduct, ocInstance) ->
   $controller('AdminOrderCycleExchangesCtrl', {$scope: $scope, ocInstance: ocInstance, $location: $location})
 
   $scope.view = 'incoming'
@@ -28,4 +28,4 @@ angular.module('admin.orderCycles').controller 'AdminOrderCycleIncomingCtrl', ($
   $scope.selectAllVariants = (exchange, selected) ->
     $scope.loadAllExchangeProducts(exchange).then ->
       $scope.setExchangeVariants(exchange, $scope.suppliedVariants(exchange.enterprise_id), selected)
-      $scope.$apply()
+      $rootScope.$evalAsync()

app/assets/javascripts/admin/order_cycles/directives/schedule_dialog.js.coffee

@@ -1,4 +1,4 @@
-angular.module("admin.orderCycles").directive 'scheduleDialog', ($window, $compile, $injector, $templateCache, DialogDefaults, OrderCycles, Schedules) ->
+angular.module("admin.orderCycles").directive 'scheduleDialog', ($rootScope, $window, $compile, $injector, $templateCache, DialogDefaults, OrderCycles, Schedules) ->
   restrict: 'A'
   scope:
     scheduleId: '@'
@@ -22,9 +22,11 @@ angular.module("admin.orderCycles").directive 'scheduleDialog', ($window, $compi
       scope.template.dialog(angular.extend(settings,{width: $window.innerWidth * 0.6}))
       scope.template.dialog(close: -> scope.template.remove())
       scope.template.dialog('open')
+      $rootScope.$evalAsync()
 
     scope.close = ->
       scope.template.dialog('close')
+      $rootScope.$evalAsync()
       return
 
     scope.delete = ->
@@ -55,6 +57,7 @@ angular.module("admin.orderCycles").directive 'scheduleDialog', ($window, $compi
           if data.id
             scope.submitted = false
             scope.template.dialog('close')
+            $rootScope.$evalAsync()
         , (response) ->
           if response.data.errors
             scope.errors.push(error) for error in response.data.errors

app/assets/javascripts/admin/subscriptions/directives/new_subscription_dialog.js.coffee

@@ -1,4 +1,4 @@
-angular.module("admin.subscriptions").directive 'newSubscriptionDialog', ($compile, $window, $templateCache, DialogDefaults, shops) ->
+angular.module("admin.subscriptions").directive 'newSubscriptionDialog', ($rootScope, $compile, $window, $templateCache, DialogDefaults, shops) ->
   restrict: 'A'
   scope: true
   link: (scope, element, attr) ->
@@ -26,3 +26,4 @@ angular.module("admin.subscriptions").directive 'newSubscriptionDialog', ($compi
         scope.newSubscription()
       else
         template.dialog('open')
+        $rootScope.$evalAsync()

app/assets/javascripts/admin/tag_rules/directives/new_rule_dialog.js.coffee

@@ -1,4 +1,4 @@
-angular.module("admin.tagRules").directive 'newTagRuleDialog', ($compile, $templateCache, DialogDefaults) ->
+angular.module("admin.tagRules").directive 'newTagRuleDialog', ($rootScope, $compile, $templateCache, DialogDefaults) ->
   restrict: 'A'
   scope:
     tagGroup: '='
@@ -22,8 +22,10 @@ angular.module("admin.tagRules").directive 'newTagRuleDialog', ($compile, $templ
     # Link opening of dialog to click event on element
     element.bind 'click', (e) ->
       template.dialog('open')
+      $rootScope.$evalAsync()
 
     scope.addRule = (tagGroup, ruleType) ->
       scope.addNewRuleTo(tagGroup, ruleType)
       template.dialog('close')
+      $rootScope.$evalAsync()
       return

app/assets/javascripts/admin/utils/directives/help-modal.js.coffee

@@ -1,4 +1,4 @@
-angular.module("admin.utils").directive 'helpModal', ($compile, $templateCache, $window, DialogDefaults) ->
+angular.module("admin.utils").directive 'helpModal', ($rootScope, $compile, $templateCache, $window, DialogDefaults) ->
   restrict: 'C'
   scope:
     template: '@'
@@ -10,8 +10,11 @@ angular.module("admin.utils").directive 'helpModal', ($compile, $templateCache,
     template.dialog(DialogDefaults)
 
     # Link opening of dialog to click event on element
-    element.bind 'click', (e) -> template.dialog('open')
+    element.bind 'click', (e) ->
+      template.dialog('open')
+      $rootScope.$evalAsync()
 
     scope.close = ->
       template.dialog('close')
+      $rootScope.$evalAsync()
       return

app/assets/javascripts/admin/utils/services/confirm_dialog.js.coffee

@@ -10,12 +10,15 @@ angular.module("admin.utils").factory 'ConfirmDialog', ($rootScope, $q, $compile
       template = $compile($templateCache.get('admin/confirm_dialog.html'))(scope)
       template.dialog(DialogDefaults)
       template.dialog('open')
+      $rootScope.$evalAsync()
       scope.confirm = ->
         deferred.resolve()
         template.dialog('close')
+        $rootScope.$evalAsync()
         null
       scope.close = ->
         deferred.reject()
         template.dialog('close')
+        $rootScope.$evalAsync()
         null
       deferred.promise

app/assets/javascripts/admin/utils/services/info_dialog.js.coffee

@@ -15,8 +15,10 @@ angular.module("admin.utils").factory 'InfoDialog', ($rootScope, $q, $compile, $
       template = $compile($templateCache.get(templateUrl))(scope)
       template.dialog(DialogDefaults)
       template.dialog('open')
+      $rootScope.$evalAsync()
       scope.close = ->
         deferred.resolve()
         template.dialog('close')
+        $rootScope.$evalAsync()
         null
       deferred.promise