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

fixed focus selection bug of input filed

Browse source
This commit is contained in:
David Baldwynn 2016-04-16 16:36:55 -04:00
parent 5a30ad5ef2
commit 65bd7de983
6 changed files with 36 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
public/dist/application.js vendored
View file

File diff suppressed because one or more lines are too long

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

File diff suppressed because one or more lines are too long

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

@ -34,9 +34,9 @@ angular.module('forms').directive('submitFormDirective', ['$http', 'TimeCounter'
** Field Controls
*/
$scope.setActiveField = $rootScope.setActiveField = function(field_id, field_index) {
if($scope.selected === null){
return;
}
if($scope.selected === null || $scope.selected._id === field_id){
return;
}
console.log('field_id: '+field_id);
console.log('field_index: '+field_index);
console.log($scope.selected);

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

@ -1,14 +1,18 @@
<div class="statement field row" ng-click="setActiveField(field._id, index)">
<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-center col-xs-9">{{field.title}} </h2>
<div class="col-xs-1"><i class="fa fa-quote-right 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">{{field.description}} </p>
<p class="col-xs-12" ng-if="field.description.length">{{field.description}} </p>
<br>
<button class="btn btn-info col-xs-6 col-xs-offset-3" style="font-size: 1.3em;" ng-focus="setActiveField(field._id, index)" ng-click="nextField()">
Continue
</button>
<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)"
ng-click="nextField()">
Continue
</button>
</div>
</div>
</div>

33
public/modules/forms/views/directiveViews/field/yes_no.html
View file

@ -11,13 +11,13 @@
</p>
</div>
<div class="col-xs-12 field-input">
<div class="col-xs-12 field-input" ng-focus="setActiveField(field._id, index)">
<div class="row">
{{field.fieldValue}}
<label class="btn btn-default col-xs-2"
style="background: rgba(0,0,0,0.1); text-align:left;">
<input ng-focus="setActiveField(field._id, index)"
type="radio" value="true"
style="background: rgba(0,0,0,0.1); text-align:left;"
ng-click="field.fieldValue = true;">
<input type="radio" value="true"
style="display: none;"
ng-model="field.fieldValue"
ng-model-options="{ debounce: 250 }"
@ -27,24 +27,27 @@
Y
</div>
<span>Yes</span>
<i ng-show="field.fieldValue = true" class="fa fa-check" aria-hidden="true"></i>
<i ng-show="!!field.fieldValue" class="fa fa-check" aria-hidden="true"></i>
</label>
</div>
<div class="row" style="margin-top: 10px;">
</div>
<div class="row" style="margin-top: 10px;">
<label class="btn btn-default col-xs-2"
style="background: rgba(0,0,0,0.1); text-align:left;">
<input ng-focus="setActiveField(field._id, index)"
type="radio" value="false"
style="background: rgba(0,0,0,0.1); text-align:left;"
ng-click="field.fieldValue = false;">
<input type="radio" value="false"
style="display: none;"
ng-model="field.fieldValue"
ng-model-options="{ debounce: 250 }"
ng-required="field.required"
ng-disabled="field.disabled"/>
<div class="letter">
N
</div>
<span>No</span>
<i ng-show="field.fieldValue == false" class="fa fa-check" aria-hidden="true"></i>
<div class="letter">
N
</div>
<span>No</span>
<i ng-show="!field.fieldValue" class="fa fa-check" aria-hidden="true"></i>
</label>
</div>
</div>

4
public/populate_template_cache.js
View file

File diff suppressed because one or more lines are too long