From e08a61f9bb61e6ae678487fe72871db9cc19bcff Mon Sep 17 00:00:00 2001
From: Tim Otten <totten@civicrm.org>
Date: Wed, 18 Feb 2015 11:54:24 -0800
Subject: [PATCH] crmMailing, crmMailingAB - Use CrmAutosaveCtrl

---
 js/angular-crmMailing.js               | 17 ++++++++++++++++-
 js/angular-crmMailingAB.js             | 15 ++++++++++++++-
 partials/crmMailing/edit-unified.html  |  2 +-
 partials/crmMailing/edit-unified2.html |  2 +-
 partials/crmMailing/edit-wizard.html   |  2 +-
 partials/crmMailing/edit.html          |  2 +-
 partials/crmMailingAB/edit.html        |  2 +-
 7 files changed, 35 insertions(+), 7 deletions(-)

diff --git a/js/angular-crmMailing.js b/js/angular-crmMailing.js
index cb6e6449d0..1c0b3ff882 100644
--- 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 9379970845..73fc5ae904 100644
--- 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 15ece1ea92..ca1ef5cf1c 100644
--- 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 2d6f53967e..464e89058c 100644
--- 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 5458c42119..9e2ba6a112 100644
--- 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 4ae598a370..0d6f08e3b6 100644
--- 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 74c1fc3b95..3def3ebbea 100644
--- 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">
-- 
2.25.1