+
diff --git a/public/modules/forms/controllers/admin-form.client.controller.js b/public/modules/forms/controllers/admin-form.client.controller.js
index bae86b4a..93fbc5c7 100644
--- a/public/modules/forms/controllers/admin-form.client.controller.js
+++ b/public/modules/forms/controllers/admin-form.client.controller.js
@@ -77,6 +77,12 @@ angular.module('forms').controller('AdminFormController', ['$rootScope', '$scope
$scope.cancelDeleteModal = function(){
if($scope.deleteModal){
$scope.deleteModal.dismiss('cancel');
+ $scope.deleteModal.result(function(selectedItem){
+ this.selected = selectedItem;
+ }, function(type){
+ this.canceled = true;
+ });
+
}
};
diff --git a/public/modules/forms/directives/auto-save.client.directive.js b/public/modules/forms/directives/auto-save.client.directive.js
index b266e7ba..1def20ea 100644
--- a/public/modules/forms/directives/auto-save.client.directive.js
+++ b/public/modules/forms/directives/auto-save.client.directive.js
@@ -54,6 +54,7 @@ angular.module('forms').directive('autoSaveForm', ['$rootScope', '$timeout', fun
if(!err){
console.log('\n\nForm data persisted -- setting pristine flag');
$formCtrl.$setPristine();
+ $formCtrl.$setUntouched();
}else{
console.error('Error form data NOT persisted');
console.error(err);
@@ -63,11 +64,13 @@ angular.module('forms').directive('autoSaveForm', ['$rootScope', '$timeout', fun
//Update/Save Form if any Form fields are Dirty and Touched
$scope.$watch(function(newValue, oldValue) {
- // console.log($scope);
- // console.log($scope.editForm);
+ console.log('introParagraphStartPage.$dirty: '+$scope.editForm.introParagraphStartPage.$dirty);
+ console.log('introParagraphStartPage.$touched: '+$scope.editForm.introParagraphStartPage.$touched);
if($rootScope.finishedRender && $scope.anyDirtyAndTouched($scope.editForm) && !$rootScope.saveInProgress){
- // console.log('Form saving started');
+ console.log('Form saving started');
debounceSave();
+ console.log('introParagraphStartPage.$dirty AFTER: '+$scope.editForm.introParagraphStartPage.$dirty);
+
}
});
diff --git a/public/modules/forms/tests/unit/controllers/admin-form.client.controller.test.js b/public/modules/forms/tests/unit/controllers/admin-form.client.controller.test.js
index 46a2746a..b67228a2 100644
--- a/public/modules/forms/tests/unit/controllers/admin-form.client.controller.test.js
+++ b/public/modules/forms/tests/unit/controllers/admin-form.client.controller.test.js
@@ -28,9 +28,9 @@
admin: 'ed873933b1f1dea0ce12fab9',
language: 'english',
form_fields: [
- {fieldType:'textfield', title:'First Name', fieldValue: '', deletePreserved: false},
- {fieldType:'checkbox', title:'nascar', fieldValue: '', deletePreserved: false},
- {fieldType:'checkbox', title:'hockey', fieldValue: '', deletePreserved: false}
+ {fieldType:'textfield', title:'First Name', fieldValue: '', deletePreserved: false, _id:'56340745f59a6fc9e22028e9'},
+ {fieldType:'checkbox', title:'nascar', fieldValue: '', deletePreserved: false, _id:'5c9e22028e907634f45f59a6'},
+ {fieldType:'checkbox', title:'hockey', fieldValue: '', deletePreserved: false, _id:'56e90745f5934fc9e22028a6'}
],
_id: '525a8422f6d0f87f0e407a33'
};
@@ -40,14 +40,14 @@
admin: 'ed873933b1f1dea0ce12fab9',
language: 'english',
form_fields: [
- {fieldType:'textfield', title:'First Name', fieldValue: '', deletePreserved: false},
- {fieldType:'checkbox', title:'nascar', fieldValue: '', deletePreserved: false},
- {fieldType:'checkbox', title:'hockey', fieldValue: '', deletePreserved: false}
+ {fieldType:'textfield', title:'First Name', fieldValue: '', deletePreserved: false, _id:'56340745f59a6fc9e22028e9'},
+ {fieldType:'checkbox', title:'nascar', fieldValue: '', deletePreserved: false, _id:'5c9e22028e907634f45f59a6'},
+ {fieldType:'checkbox', title:'hockey', fieldValue: '', deletePreserved: false, _id:'56e90745f5934fc9e22028a6'}
],
visible_form_fields: [
- {fieldType:'textfield', title:'First Name', fieldValue: '', deletePreserved: false},
- {fieldType:'checkbox', title:'nascar', fieldValue: '', deletePreserved: false},
- {fieldType:'checkbox', title:'hockey', fieldValue: '', deletePreserved: false}
+ {fieldType:'textfield', title:'First Name', fieldValue: '', deletePreserved: false, _id:'56340745f59a6fc9e22028e9'},
+ {fieldType:'checkbox', title:'nascar', fieldValue: '', deletePreserved: false, _id:'5c9e22028e907634f45f59a6'},
+ {fieldType:'checkbox', title:'hockey', fieldValue: '', deletePreserved: false, _id:'56e90745f5934fc9e22028a6'}
],
_id: '525a8422f6d0f87f0e407a33'
};
@@ -160,8 +160,8 @@
});
}));
- beforeEach(inject(function($modal) {
- spyOn($modal, 'open').and.returnValue(new fakeModal());
+ beforeEach(inject(function($uibModal) {
+ spyOn($uibModal, 'open').and.returnValue(new fakeModal());
}));
// The injector ignores leading and trailing underscores here (i.e. _$httpBackend_).
@@ -262,19 +262,13 @@
expect( scope.deleteModal.opened ).toEqual(true);
});
- it('$scope.cancelDeleteModal() should close scope.deleteModal', inject(function($modal) {
+ it('$scope.cancelDeleteModal() should close $scope.deleteModal', inject(function($uibModal) {
var controller = createAdminFormController();
//Run controller functionality
scope.openDeleteModal();
console.log(scope.deleteModal.opened);
- scope.deleteModal.result(function(selectedItem){
- this.selected = selectedItem;
- }, function(type){
- this.canceled = true;
- });
-
//Run controller functionality
scope.cancelDeleteModal();
expect( scope.deleteModal.opened ).toEqual(false);
diff --git a/public/modules/forms/views/directiveViews/form/edit-form.client.view.html b/public/modules/forms/views/directiveViews/form/edit-form.client.view.html
index 6042a0b0..98721165 100644
--- a/public/modules/forms/views/directiveViews/form/edit-form.client.view.html
+++ b/public/modules/forms/views/directiveViews/form/edit-form.client.view.html
@@ -99,8 +99,7 @@
+ name="introParagraphStartPage"/>