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

added ui-select

Browse source
This commit is contained in:
David Baldwynn 2016-04-16 17:56:01 -04:00
parent 65bd7de983
commit 63c53d1e01
9 changed files with 42 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
bower.json
View file

@ -32,7 +32,8 @@
"angular-bootstrap-colorpicker": "~3.0.19",
"components-font-awesome": "~4.4.0",
"angular-ui-router-tabs": "~1.7.0",
"angular-scroll": "^1.0.0"
"angular-scroll": "^1.0.0",
"ui-select": "angular-ui-select#^0.16.1"
},
"resolutions": {
"angular-bootstrap": "^0.14.0",

2
public/config.js
View file

@ -4,7 +4,7 @@
var ApplicationConfiguration = (function() {
// Init module configuration options
var applicationModuleName = 'NodeForm';
var applicationModuleVendorDependencies = ['duScroll', 'ngResource', 'NodeForm.templates', 'ngAnimate', 'ui.router', 'ui.bootstrap', 'ui.utils', 'ngRaven', 'cgBusy'];
var applicationModuleVendorDependencies = ['duScroll', 'ui.select', 'ngResource', 'NodeForm.templates', 'ngAnimate', 'ui.router', 'ui.bootstrap', 'ui.utils', 'ngRaven', 'cgBusy'];
// Add a new vertical module
var registerModule = function(moduleName, dependencies) {

15
public/dist/application.js vendored
View file

File diff suppressed because one or more lines are too long

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

File diff suppressed because one or more lines are too long

8
public/modules/forms/directives/edit-form.client.directive.js
View file

@ -157,8 +157,10 @@ angular.module('forms').directive('editFormDirective', ['$rootScope', 'FormField
// add new option to the field
$scope.addOption = function(field_index){
var currField = $scope.myform.form_fields[field_index];
if(currField.fieldType === 'checkbox' || currField.fieldType === 'dropdown' || currField.fieldType === 'radio'){
console.log(field_index];
console.log(currField);
if(currField.fieldType === 'checkbox' || currField.fieldType === 'dropdown' || currField.fieldType === 'radio'){
if(!currField.fieldOptions) $scope.myform.form_fields[field_index].fieldOptions = [];
var lastOptionID = 0;
@ -210,4 +212,4 @@ angular.module('forms').directive('editFormDirective', ['$rootScope', 'FormField
};
}
]);
]);

14
public/modules/forms/views/directiveViews/field/dropdown.html
View file

@ -7,17 +7,17 @@
</h3>
</div>
<div class="col-xs-12 field-input ">
<select ng-model="field.fieldValue"
<ui-select ng-model="field.fieldValue"
theme="selectize"
ng-model-options="{ debounce: 250 }"
ng-required="field.required"
ng-disabled="field.disabled"
ng-focus="setActiveField(field._id, index)">
<option ng-repeat="option in field.fieldOptions"
ng-selected="option.option_value == field.fieldValue"
ng-value="option.option_value">
{{option.option_value}}
</option>
</select>
<ui-select-match placeholder="Type or select an option">{{$select.selected.option_value}}</ui-select-match>
<ui-select-choices repeat="option in field.fieldOptions | filter: $select.search">
<span>{{option.option_value | highlight: $select.search}}</span>
</ui-select-choices>
</ui-select>
</div>
</div>
<br>

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

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

4
public/modules/forms/views/directiveViews/form/edit-form.client.view.html
View file

@ -216,12 +216,12 @@
<div ng-repeat="option in field.fieldOptions track by option.option_id" class="row">
<input type="text" name="{{option.option_value}}{{field._id}}" ng-model="option.option_value" class="col-xs-5">
<a class="btn btn-danger btn-mini right" type="button" ng-click="deleteOption(field, option)" class="col-xs-3">
<a class="btn btn-danger btn-mini right" type="button" ng-click="deleteOption($index, option)" class="col-xs-3">
<i class="fa fa-trash-o"></i>
</a>
</div>
<div class="row">
<button class="btn btn-primary btn-small col-md-offset-0 col-md-6 col-sm-4 col-sm-offset-4 col-xs-6 col-xs-offset-6" type="button" ng-click="addOption(field)">
<button class="btn btn-primary btn-small col-md-offset-0 col-md-6 col-sm-4 col-sm-offset-4 col-xs-6 col-xs-offset-6" type="button" ng-click="addOption($index)">
<i class="icon-plus icon-white"></i> Add Option
</button>
</div>

8
public/populate_template_cache.js
View file

File diff suppressed because one or more lines are too long