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

fixed statement button nextField bug

Browse source
This commit is contained in:
David Baldwynn 2016-04-21 12:21:05 -04:00
parent 40a1cedf42
commit ae3337f150
5 changed files with 14 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
public/dist/application.js vendored
View file

@ -180,7 +180,7 @@ angular.module('NodeForm.templates', []).run(['$templateCache', function($templa
$templateCache.put("../public/modules/forms/views/directiveViews/field/rating.html",
"<div class=\"textfield field row\" ng-click=\"setActiveField(field._id, index, true)\"><div class=\"col-xs-12 field-title\" ng-style=\"{'color': design.colors.questionColor}\"><h3><span class=\"fa fa-angle-double-right\"></span> {{field.title}} <span class=required-error ng-show=\"field.required && !field.fieldValue\">*(required)</span></h3></div><div class=\"col-xs-12 field-input\"><input-stars max=5 ng-focus=\"setActiveField(field._id, index, true)\" icon-full=fa-star icon-base=\"fa fa-3x\" icon-empty=fa-star-o ng-init=\"field.fieldValue = 1\" ng-model=field.fieldValue ng-model-options=\"{ debounce: 250 }\" ng-required=field.required ng-disabled=field.disabled class=angular-input-stars></input-stars></div></div>");
$templateCache.put("../public/modules/forms/views/directiveViews/field/statement.html",
"<div class=\"statement field row\" ng-click=\"setActiveField(field._id, index, true)\"><div class=\"row field-title field-title\"><div class=col-xs-1><i class=\"fa fa-quote-left fa-1\"></i></div><h2 class=\"text-left col-xs-9\">{{field.title}}</h2></div><div class=\"row field-title field-input\"><p class=col-xs-12 ng-if=field.description.length>{{field.description}}</p><br><div class=\"col-xs-offset-1 col-xs-11\"><button class=\"btn btn-info\" style=\"font-size: 1.3em\" ng-focus=\"setActiveField(field._id, index, true)\" ng-click=$root.nextField()>Continue</button></div></div></div>");
"<div class=\"statement field row\"><div class=\"row field-title field-title\"><div class=col-xs-1><i class=\"fa fa-quote-left fa-1\"></i></div><h2 class=\"text-left col-xs-9\">{{field.title}}</h2></div><div class=\"row field-title field-input\"><p class=col-xs-12 ng-if=field.description.length>{{field.description}}</p><br><div class=\"col-xs-offset-1 col-xs-11\"><button class=\"btn btn-info\" style=\"font-size: 1.3em\" ng-focused=\"setActiveField(field._id, index, true)\" ng-click=$root.nextField()>Continue</button></div></div></div>");
$templateCache.put("../public/modules/forms/views/directiveViews/field/textarea.html",
"<div class=\"field row\" ng-click=\"setActiveField(field._id, index, true)\"><div class=\"col-xs-12 field-title\" ng-style=\"{'color': design.colors.questionColor}\"><h3><span class=\"fa fa-angle-double-right\"></span> {{field.title}} <span class=required-error ng-show=\"field.required && !field.fieldValue\">*(required)</span></h3></div><div class=\"col-xs-12 field-input\"><textarea class=textarea type=text ng-model=field.fieldValue ng-model-options=\"{ debounce: 250 }\" value={{field.fieldValue}} ng-required=field.required ng-disabled=field.disabled ng-focus=\"setActiveField(field._id, index, true)\">\n" +
" </textarea></div></div><div class=\"col-xs-12 row\"><div class=\"btn btn-lg btn-default row-fluid\" style=\"padding: 4px; margin-top:8px\"><button ng-disabled=!field.fieldValue ng-click=$root.nextField() class=\"btn btn-primary col-sm-5 col-xs-5\">OK <i class=\"fa fa-check\"></i></button><div class=\"col-sm-3 col-xs-6\" style=margin-top:0.2em><small style=\"color:#ddd; font-size:70%\">press ENTER</small></div></div></div>");
@ -1804,9 +1804,6 @@ angular.module('forms').directive('submitFormDirective', ['$http', 'TimeCounter'
$scope.fieldTop = elemBox.top;
$scope.fieldBottom = elemBox.bottom;
//fieldbottom<173
//fieldTop>173
if(!$scope.noscroll){
//Focus on submit button
if( $scope.selected.index === $scope.myform.form_fields.length-1 && $scope.fieldBottom < 200){
@ -1855,7 +1852,7 @@ angular.module('forms').directive('submitFormDirective', ['$http', 'TimeCounter'
if(animateScroll){
$scope.noscroll=true;
setTimeout(function() {
$document.scrollToElement(angular.element('.activeField'), 0, 200).then(function(){
$document.scrollToElement(angular.element('.activeField'), -10, 200).then(function(){
$scope.noscroll = false;
});
}, 20);
@ -1863,6 +1860,7 @@ angular.module('forms').directive('submitFormDirective', ['$http', 'TimeCounter'
};
$rootScope.nextField = $scope.nextField = function(){
console.log('nextfield');
//console.log($scope.selected.index);
//console.log($scope.myform.form_fields.length-1);
if($scope.selected.index < $scope.myform.form_fields.length-1){
@ -1875,6 +1873,7 @@ angular.module('forms').directive('submitFormDirective', ['$http', 'TimeCounter'
$rootScope.setActiveField(selected_id, selected_index, true);
}
};
$rootScope.prevField = $scope.prevField = function(){
if($scope.selected.index > 0){
var selected_index = $scope.selected.index - 1;

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

File diff suppressed because one or more lines are too long

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

@ -44,9 +44,6 @@ angular.module('forms').directive('submitFormDirective', ['$http', 'TimeCounter'
$scope.fieldTop = elemBox.top;
$scope.fieldBottom = elemBox.bottom;
//fieldbottom<173
//fieldTop>173
if(!$scope.noscroll){
//Focus on submit button
if( $scope.selected.index === $scope.myform.form_fields.length-1 && $scope.fieldBottom < 200){
@ -95,7 +92,7 @@ angular.module('forms').directive('submitFormDirective', ['$http', 'TimeCounter'
if(animateScroll){
$scope.noscroll=true;
setTimeout(function() {
$document.scrollToElement(angular.element('.activeField'), 0, 200).then(function(){
$document.scrollToElement(angular.element('.activeField'), -10, 200).then(function(){
$scope.noscroll = false;
});
}, 20);
@ -103,6 +100,7 @@ angular.module('forms').directive('submitFormDirective', ['$http', 'TimeCounter'
};
$rootScope.nextField = $scope.nextField = function(){
console.log('nextfield');
//console.log($scope.selected.index);
//console.log($scope.myform.form_fields.length-1);
if($scope.selected.index < $scope.myform.form_fields.length-1){
@ -115,6 +113,7 @@ angular.module('forms').directive('submitFormDirective', ['$http', 'TimeCounter'
$rootScope.setActiveField(selected_id, selected_index, true);
}
};
$rootScope.prevField = $scope.prevField = function(){
if($scope.selected.index > 0){
var selected_index = $scope.selected.index - 1;

6
public/modules/forms/views/directiveViews/field/statement.html
View file

@ -1,4 +1,4 @@
<div class="statement field row" ng-click="setActiveField(field._id, index, true)">
<div class="statement field row">
<div class="row field-title field-title">
<div class="col-xs-1"><i class="fa fa-quote-left fa-1"></i></div>
<h2 class="text-left col-xs-9">{{field.title}} </h2>
@ -9,8 +9,8 @@
<div class="col-xs-offset-1 col-xs-11">
<button class="btn btn-info"
style="font-size: 1.3em;"
ng-focus="setActiveField(field._id, index, true)"
ng-click="$root.nextField()">
ng-focused="setActiveField(field._id, index, true)"
ng-click="$root.nextField()">
Continue
</button>
</div>

2
public/populate_template_cache.js
View file

@ -65,7 +65,7 @@ angular.module('NodeForm.templates', []).run(['$templateCache', function($templa
$templateCache.put("../public/modules/forms/views/directiveViews/field/rating.html",
"<div class=\"textfield field row\" ng-click=\"setActiveField(field._id, index, true)\"><div class=\"col-xs-12 field-title\" ng-style=\"{'color': design.colors.questionColor}\"><h3><span class=\"fa fa-angle-double-right\"></span> {{field.title}} <span class=required-error ng-show=\"field.required && !field.fieldValue\">*(required)</span></h3></div><div class=\"col-xs-12 field-input\"><input-stars max=5 ng-focus=\"setActiveField(field._id, index, true)\" icon-full=fa-star icon-base=\"fa fa-3x\" icon-empty=fa-star-o ng-init=\"field.fieldValue = 1\" ng-model=field.fieldValue ng-model-options=\"{ debounce: 250 }\" ng-required=field.required ng-disabled=field.disabled class=angular-input-stars></input-stars></div></div>");
$templateCache.put("../public/modules/forms/views/directiveViews/field/statement.html",
"<div class=\"statement field row\" ng-click=\"setActiveField(field._id, index, true)\"><div class=\"row field-title field-title\"><div class=col-xs-1><i class=\"fa fa-quote-left fa-1\"></i></div><h2 class=\"text-left col-xs-9\">{{field.title}}</h2></div><div class=\"row field-title field-input\"><p class=col-xs-12 ng-if=field.description.length>{{field.description}}</p><br><div class=\"col-xs-offset-1 col-xs-11\"><button class=\"btn btn-info\" style=\"font-size: 1.3em\" ng-focus=\"setActiveField(field._id, index, true)\" ng-click=$root.nextField()>Continue</button></div></div></div>");
"<div class=\"statement field row\"><div class=\"row field-title field-title\"><div class=col-xs-1><i class=\"fa fa-quote-left fa-1\"></i></div><h2 class=\"text-left col-xs-9\">{{field.title}}</h2></div><div class=\"row field-title field-input\"><p class=col-xs-12 ng-if=field.description.length>{{field.description}}</p><br><div class=\"col-xs-offset-1 col-xs-11\"><button class=\"btn btn-info\" style=\"font-size: 1.3em\" ng-focused=\"setActiveField(field._id, index, true)\" ng-click=$root.nextField()>Continue</button></div></div></div>");
$templateCache.put("../public/modules/forms/views/directiveViews/field/textarea.html",
"<div class=\"field row\" ng-click=\"setActiveField(field._id, index, true)\"><div class=\"col-xs-12 field-title\" ng-style=\"{'color': design.colors.questionColor}\"><h3><span class=\"fa fa-angle-double-right\"></span> {{field.title}} <span class=required-error ng-show=\"field.required && !field.fieldValue\">*(required)</span></h3></div><div class=\"col-xs-12 field-input\"><textarea class=textarea type=text ng-model=field.fieldValue ng-model-options=\"{ debounce: 250 }\" value={{field.fieldValue}} ng-required=field.required ng-disabled=field.disabled ng-focus=\"setActiveField(field._id, index, true)\">\n" +
" </textarea></div></div><div class=\"col-xs-12 row\"><div class=\"btn btn-lg btn-default row-fluid\" style=\"padding: 4px; margin-top:8px\"><button ng-disabled=!field.fieldValue ng-click=$root.nextField() class=\"btn btn-primary col-sm-5 col-xs-5\">OK <i class=\"fa fa-check\"></i></button><div class=\"col-sm-3 col-xs-6\" style=margin-top:0.2em><small style=\"color:#ddd; font-size:70%\">press ENTER</small></div></div></div>");