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

fixed visible form fields display bug

Browse source
This commit is contained in:
David Baldwynn 2016-04-22 15:46:58 -04:00
parent a5776c6dc8
commit 10f26db043
5 changed files with 25 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
public/dist/application.js vendored
View file

@ -254,7 +254,7 @@ angular.module('NodeForm.templates', []).run(['$templateCache', function($templa
" <span class=col-xs-1 ng-switch=field.fieldType>\n" +
" <field-icon-directive type-name={{field.fieldType}}></field-icon-directive>\n" +
" </span>\n" +
" <span style=col-xs-10>\n" +
" <span class=col-xs-10>\n" +
" {{field.title}} \n" +
" <span ng-show=field.required>*</span>\n" +
" </span>\n" +
@ -1794,18 +1794,21 @@ angular.module('forms').directive('submitFormDirective', ['$http', 'TimeCounter'
$scope.reloadForm = function(){
//Reset Form
$scope.myform.submitted = false;
$scope.myform.form_fields = _.chain($scope.myform.form_fields).map(function(field){
$scope.myform.form_fields = _.chain($scope.myform.visible_form_fields).map(function(field){
field.fieldValue = '';
return field;
}).value();
$scope.loading = false;
$scope.error = '';
$scope.selected = {
_id: $scope.myform.form_fields[0]._id,
index: 0,
_id: '',
index: 0
};
$scope.setActiveField($scope.myform.visible_form_fields[0]._id, 0, false);
console.log($scope.selected);
//Reset Timer
TimeCounter.restartClock();
};
@ -1816,10 +1819,8 @@ angular.module('forms').directive('submitFormDirective', ['$http', 'TimeCounter'
$scope.fieldTop = elemBox.top;
$scope.fieldBottom = elemBox.bottom;
console.log($scope.forms.myForm);
//console.log($scope.forms.myForm);
if(!$scope.noscroll){
//Focus on submit button
if( $scope.selected.index === $scope.myform.form_fields.length-1 && $scope.fieldBottom < 200){
@ -1936,9 +1937,9 @@ angular.module('forms').directive('submitFormDirective', ['$http', 'TimeCounter'
};
//Load our form when the page is ready
angular.element(document).ready(function() {
//angular.element(document).ready(function() {
$scope.reloadForm();
});
//});
}]
};

6
public/dist/application.min.js vendored
View file

File diff suppressed because one or more lines are too long

19
public/modules/forms/directives/submit-form.client.directive.js
View file

@ -22,18 +22,21 @@ angular.module('forms').directive('submitFormDirective', ['$http', 'TimeCounter'
$scope.reloadForm = function(){
//Reset Form
$scope.myform.submitted = false;
$scope.myform.form_fields = _.chain($scope.myform.form_fields).map(function(field){
$scope.myform.form_fields = _.chain($scope.myform.visible_form_fields).map(function(field){
field.fieldValue = '';
return field;
}).value();
$scope.loading = false;
$scope.error = '';
$scope.selected = {
_id: $scope.myform.form_fields[0]._id,
index: 0,
_id: '',
index: 0
};
$scope.setActiveField($scope.myform.visible_form_fields[0]._id, 0, false);
console.log($scope.selected);
//Reset Timer
TimeCounter.restartClock();
};
@ -44,10 +47,8 @@ angular.module('forms').directive('submitFormDirective', ['$http', 'TimeCounter'
$scope.fieldTop = elemBox.top;
$scope.fieldBottom = elemBox.bottom;
console.log($scope.forms.myForm);
//console.log($scope.forms.myForm);
if(!$scope.noscroll){
//Focus on submit button
if( $scope.selected.index === $scope.myform.form_fields.length-1 && $scope.fieldBottom < 200){
@ -164,9 +165,9 @@ angular.module('forms').directive('submitFormDirective', ['$http', 'TimeCounter'
};
//Load our form when the page is ready
angular.element(document).ready(function() {
//angular.element(document).ready(function() {
$scope.reloadForm();
});
//});
}
};

1
public/modules/forms/views/directiveViews/form/submit-form.client.view.html
View file

@ -49,7 +49,6 @@ class="submission-form col-sm-12 col-md-offset-1 col-md-10">
ng-if="!field.deletePreserved"
data-index="{{$index}}"
data-id="{{field._id}}"
du-scrollspy
ng-class="{activeField: selected._id == field._id }"
class="row field-directive">
<field-directive field="field" design="myform.design" index="$index">

2
public/populate_template_cache.js
View file

File diff suppressed because one or more lines are too long