beenull/tellform
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

fixed autosave bugs

Browse source
This commit is contained in:
David Baldwynn 2016-11-02 12:43:04 -07:00
parent 52632f3328
commit cdd5c122aa
1 changed files with 9 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
public/modules/forms/admin/directives/auto-save.client.directive.js
View file

@ -64,22 +64,15 @@ angular.module('forms').directive('autoSaveForm', ['$rootScope', '$timeout', fun
} }
}); });
}; };
//Update/Save Form if any Form fields are Dirty and Touched
$scope.$watch(function(newValue, oldValue) {
if($rootScope.finishedRender && $scope.anyDirtyAndTouched($scope.editForm) && !$rootScope.saveInProgress){
delete newValue.visible_form_fields;
debounceSave(DeepDiff.diff(oldValue, newValue));
}
});
//Autosave Form when model (specified in $attrs.autoSaveWatch) changes //Autosave Form when model (specified in $attrs.autoSaveWatch) changes
$scope.$watch($attrs.autoSaveWatch, function(newValue, oldValue) { $scope.$watch($attrs.autoSaveWatch, function(newValue, oldValue) {
newValue = angular.copy(newValue); newValue = angular.copy(newValue);
oldValue = angular.copy(oldValue); oldValue = angular.copy(oldValue);
delete newValue.visible_form_fields;
delete oldValue.visible_form_fields;
newValue.form_fields = _.removeDateFields(newValue.form_fields); newValue.form_fields = _.removeDateFields(newValue.form_fields);
oldValue.form_fields = _.removeDateFields(oldValue.form_fields); oldValue.form_fields = _.removeDateFields(oldValue.form_fields);
@ -95,20 +88,20 @@ angular.module('forms').directive('autoSaveForm', ['$rootScope', '$timeout', fun
$rootScope.finishedRender = true; $rootScope.finishedRender = true;
} }
console.log('Autosaving'); //console.log('Autosaving');
console.log('\n\n----------'); //console.log('\n\n----------');
console.log('!$dirty: '+ !$formCtrl.$dirty ); //console.log('!$dirty: '+ !$formCtrl.$dirty );
console.log('changedFields: '+changedFields); console.log('changedFields: '+changedFields);
// console.log('changedFieldMap: '+changedFieldMap); // console.log('changedFieldMap: '+changedFieldMap);
console.log('finishedRender: '+$rootScope.finishedRender); //console.log('finishedRender: '+$rootScope.finishedRender);
console.log('!saveInProgress: '+!$rootScope.saveInProgress); //console.log('!saveInProgress: '+!$rootScope.saveInProgress);
// console.log('newValue: '+newValue); // console.log('newValue: '+newValue);
// console.log('oldValue: '+oldValue); // console.log('oldValue: '+oldValue);
// console.log(oldValue.form_fields); // console.log(oldValue.form_fields);
// console.log(newValue.form_fields); // console.log(newValue.form_fields);
//Save form ONLY IF rendering is finished, form_fields have been changed AND currently not save in progress //Save form ONLY IF rendering is finished, form_fields have been changed AND currently not save in progress
if( $rootScope.finishedRender && (changedFields) && !$rootScope.saveInProgress) { if( $rootScope.finishedRender && (changedFields) && !$rootScope.saveInProgress) {
if(savePromise) { if(savePromise) {
$timeout.cancel(savePromise); $timeout.cancel(savePromise);