Update SNJS

2020-03-14 11:06:03 -05:00
parent 444c18bbde
commit 8fcfef08a6
22 changed files with 89726 additions and 68 deletions
--- a/app/assets/javascripts/directives/views/conflictResolutionModal.js
+++ b/app/assets/javascripts/directives/views/conflictResolutionModal.js
@@ -27,7 +27,7 @@ class ConflictResolutionCtrl {
  }

  keepItem1() {
-    this.application.alertManager.confirm({
+    this.application.alertService.confirm({
      text: `Are you sure you want to delete the item on the right?`,
      destructive: true,
      onConfirm: () => {
@@ -39,7 +39,7 @@ class ConflictResolutionCtrl {
  }

  keepItem2() {
-    this.application.alertManager.confirm({
+    this.application.alertService.confirm({
      text: `Are you sure you want to delete the item on the left?`,
      destructive: true,
      onConfirm: () => {