crmMailing, crmMailingAB - Use CrmAutosaveCtrl

diff --git a/js/angular-crmMailing.js b/js/angular-crmMailing.js
index cb6e6449d013c7c1e3235f3918cd43a98d5deda9..1c0b3ff8822fbb96e17543dc308308a6b9b4dc99 100644 (file)
--- a/js/angular-crmMailing.js
+++ b/js/angular-crmMailing.js
@@ -67,7 +67,7 @@
     $location.replace();
   });
 
-  angular.module('crmMailing').controller('EditMailingCtrl', function EditMailingCtrl($scope, selectedMail, $location, crmMailingMgr, crmStatus, attachments, crmMailingPreviewMgr, crmBlocker) {
+  angular.module('crmMailing').controller('EditMailingCtrl', function EditMailingCtrl($scope, selectedMail, $location, crmMailingMgr, crmStatus, attachments, crmMailingPreviewMgr, crmBlocker, CrmAutosaveCtrl, $timeout) {
     $scope.mailing = selectedMail;
     $scope.attachments = attachments;
     $scope.crmMailingConst = CRM.crmMailing;
@@ -162,6 +162,21 @@
           });
       }
     };
+
+    var myAutosave = new CrmAutosaveCtrl({
+      save: $scope.save,
+      saveIf: function() {
+        return true;
+      },
+      model: function() {
+        return [$scope.mailing, $scope.attachments.getAutosaveSignature()];
+      },
+      form: function() {
+        return $scope.crmMailing;
+      }
+    });
+    $timeout(myAutosave.start);
+    $scope.$on('$destroy', myAutosave.stop);
   });
 
   // Controller for the edit-recipients fields (

diff --git a/js/angular-crmMailingAB.js b/js/angular-crmMailingAB.js
index 93799708457a5324550e4419a7590a691e715b01..73fc5ae904725631365e16578dda300ca4ddd404 100644 (file)
--- a/js/angular-crmMailingAB.js
+++ b/js/angular-crmMailingAB.js
@@ -68,7 +68,7 @@
     $location.replace();
   });
 
-  angular.module('crmMailingAB').controller('CrmMailingABEditCtrl', function ($scope, abtest, crmMailingABCriteria, crmMailingMgr, crmMailingPreviewMgr, crmStatus, $q, $location, crmBlocker, $interval) {
+  angular.module('crmMailingAB').controller('CrmMailingABEditCtrl', function ($scope, abtest, crmMailingABCriteria, crmMailingMgr, crmMailingPreviewMgr, crmStatus, $q, $location, crmBlocker, $interval, $timeout, CrmAutosaveCtrl) {
     $scope.abtest = abtest;
     var ts = $scope.ts = CRM.ts(null);
     var block = $scope.block = crmBlocker();
@@ -170,6 +170,19 @@
     $scope.$on('$destroy', function(){
       $interval.cancel(syncJob);
     });
+
+    var myAutosave = new CrmAutosaveCtrl({
+      save: $scope.save,
+      saveIf: $scope.sync,
+      model: function(){
+        return abtest.getAutosaveSignature();
+      },
+      form: function() {
+        return $scope.crmMailingAB;
+      }
+    });
+    $timeout(myAutosave.start);
+    $scope.$on('$destroy', myAutosave.stop);
   });
 
   angular.module('crmMailingAB').controller('CrmMailingABReportCtrl', function ($scope, crmApi, crmMailingPreviewMgr, dialogService) {

diff --git a/partials/crmMailing/edit-unified.html b/partials/crmMailing/edit-unified.html
index 15ece1ea924854007382277b620ff1548df9ae90..ca1ef5cf1c029acb522cc529390b131032acba44 100644 (file)
--- a/partials/crmMailing/edit-unified.html
+++ b/partials/crmMailing/edit-unified.html
@@ -6,7 +6,7 @@
   {{ts('This mailing has been submitted.')}}
 </div>
 
-<form name="crmMailing" novalidate ng-hide="isSubmitted()" crm-autosave="save()" crm-autosave-model="[mailing, attachments.getAutosaveSignature()]" crm-autosave-if="true">
+<form name="crmMailing" novalidate ng-hide="isSubmitted()">
   <div class="crm-block crm-form-block crmMailing">
 
     <div crm-mailing-block-summary crm-mailing="mailing"/>

diff --git a/partials/crmMailing/edit-unified2.html b/partials/crmMailing/edit-unified2.html
index 2d6f53967e181c24333873ff43d44a57c8fd3ff4..464e89058ca346754bc92638d11bec2c9ff7c659 100644 (file)
--- a/partials/crmMailing/edit-unified2.html
+++ b/partials/crmMailing/edit-unified2.html
@@ -6,7 +6,7 @@
   {{ts('This mailing has been submitted.')}}
 </div>
 
-<form name="crmMailing" novalidate ng-hide="isSubmitted()" crm-autosave="save()" crm-autosave-model="[mailing, attachments.getAutosaveSignature()]" crm-autosave-if="true">
+<form name="crmMailing" novalidate ng-hide="isSubmitted()">
   <div class="crm-block crm-form-block crmMailing">
 
     <div crm-mailing-block-summary crm-mailing="mailing"/>

diff --git a/partials/crmMailing/edit-wizard.html b/partials/crmMailing/edit-wizard.html
index 5458c421194e208ea6dc62d8acfeb35426a295e1..9e2ba6a11293ac79387d75b41d517e18e0323518 100644 (file)
--- a/partials/crmMailing/edit-wizard.html
+++ b/partials/crmMailing/edit-wizard.html
@@ -6,7 +6,7 @@
   {{ts('This mailing has been submitted.')}}
 </div>
 
-<form name="crmMailing" novalidate ng-hide="isSubmitted()" crm-autosave="save()" crm-autosave-model="[mailing, attachments.getAutosaveSignature()]" crm-autosave-if="true">
+<form name="crmMailing" novalidate ng-hide="isSubmitted()">
   <div class="crm-block crm-form-block crmMailing">
 
     <div crm-ui-wizard>

diff --git a/partials/crmMailing/edit.html b/partials/crmMailing/edit.html
index 4ae598a370ea9e3e0829d0f66cd02a78c48f0928..0d6f08e3b64e936705001dd0e2180ca988cc7fb3 100644 (file)
--- a/partials/crmMailing/edit.html
+++ b/partials/crmMailing/edit.html
@@ -6,7 +6,7 @@
   {{ts('This mailing has been submitted.')}}
 </div>
 
-<form name="crmMailing" novalidate ng-hide="isSubmitted()" crm-autosave="save()" crm-autosave-model="[mailing, attachments.getAutosaveSignature()]" crm-autosave-if="true">
+<form name="crmMailing" novalidate ng-hide="isSubmitted()">
 
   <div class="crm-block crm-form-block crmMailing">
     <div crm-ui-wizard>

diff --git a/partials/crmMailingAB/edit.html b/partials/crmMailingAB/edit.html
index 74c1fc3b95813f5812c16934a12bb4496003f4f4..3def3ebbea57c69a3aa75ade2408747c0ec0cadd 100644 (file)
--- a/partials/crmMailingAB/edit.html
+++ b/partials/crmMailingAB/edit.html
@@ -13,7 +13,7 @@
   <div ng-include="'~/crmMailingAB/report.html'"></div>
 </div>
 
-<form name="crmMailingAB" novalidate crm-autosave="save()" crm-autosave-model="abtest.getAutosaveSignature()" crm-autosave-if="sync()">
+<form name="crmMailingAB" novalidate>
   <div class="crm-block crm-form-block crmMailing" ng-if="!isSubmitted()">
     <div crm-ui-wizard>
       <div crm-ui-wizard-step="10" crm-title="ts('Setup')" ng-form="setupForm">