added ui-select
This commit is contained in:
parent
65bd7de983
commit
63c53d1e01
|
@ -32,7 +32,8 @@
|
||||||
"angular-bootstrap-colorpicker": "~3.0.19",
|
"angular-bootstrap-colorpicker": "~3.0.19",
|
||||||
"components-font-awesome": "~4.4.0",
|
"components-font-awesome": "~4.4.0",
|
||||||
"angular-ui-router-tabs": "~1.7.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": {
|
"resolutions": {
|
||||||
"angular-bootstrap": "^0.14.0",
|
"angular-bootstrap": "^0.14.0",
|
||||||
|
|
|
@ -4,7 +4,7 @@
|
||||||
var ApplicationConfiguration = (function() {
|
var ApplicationConfiguration = (function() {
|
||||||
// Init module configuration options
|
// Init module configuration options
|
||||||
var applicationModuleName = 'NodeForm';
|
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
|
// Add a new vertical module
|
||||||
var registerModule = function(moduleName, dependencies) {
|
var registerModule = function(moduleName, dependencies) {
|
||||||
|
|
15
public/dist/application.js
vendored
15
public/dist/application.js
vendored
File diff suppressed because one or more lines are too long
6
public/dist/application.min.js
vendored
6
public/dist/application.min.js
vendored
File diff suppressed because one or more lines are too long
|
@ -157,8 +157,10 @@ angular.module('forms').directive('editFormDirective', ['$rootScope', 'FormField
|
||||||
// add new option to the field
|
// add new option to the field
|
||||||
$scope.addOption = function(field_index){
|
$scope.addOption = function(field_index){
|
||||||
var currField = $scope.myform.form_fields[field_index];
|
var currField = $scope.myform.form_fields[field_index];
|
||||||
|
console.log(field_index];
|
||||||
if(currField.fieldType === 'checkbox' || currField.fieldType === 'dropdown' || currField.fieldType === 'radio'){
|
console.log(currField);
|
||||||
|
|
||||||
|
if(currField.fieldType === 'checkbox' || currField.fieldType === 'dropdown' || currField.fieldType === 'radio'){
|
||||||
if(!currField.fieldOptions) $scope.myform.form_fields[field_index].fieldOptions = [];
|
if(!currField.fieldOptions) $scope.myform.form_fields[field_index].fieldOptions = [];
|
||||||
|
|
||||||
var lastOptionID = 0;
|
var lastOptionID = 0;
|
||||||
|
@ -210,4 +212,4 @@ angular.module('forms').directive('editFormDirective', ['$rootScope', 'FormField
|
||||||
|
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
]);
|
]);
|
||||||
|
|
|
@ -7,17 +7,17 @@
|
||||||
</h3>
|
</h3>
|
||||||
</div>
|
</div>
|
||||||
<div class="col-xs-12 field-input ">
|
<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-model-options="{ debounce: 250 }"
|
||||||
ng-required="field.required"
|
ng-required="field.required"
|
||||||
ng-disabled="field.disabled"
|
ng-disabled="field.disabled"
|
||||||
ng-focus="setActiveField(field._id, index)">
|
ng-focus="setActiveField(field._id, index)">
|
||||||
<option ng-repeat="option in field.fieldOptions"
|
<ui-select-match placeholder="Type or select an option">{{$select.selected.option_value}}</ui-select-match>
|
||||||
ng-selected="option.option_value == field.fieldValue"
|
<ui-select-choices repeat="option in field.fieldOptions | filter: $select.search">
|
||||||
ng-value="option.option_value">
|
<span>{{option.option_value | highlight: $select.search}}</span>
|
||||||
{{option.option_value}}
|
</ui-select-choices>
|
||||||
</option>
|
</ui-select>
|
||||||
</select>
|
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<br>
|
<br>
|
||||||
|
|
|
@ -11,14 +11,13 @@
|
||||||
</p>
|
</p>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="col-xs-12 field-input" ng-focus="setActiveField(field._id, index)">
|
<div class="col-xs-12 field-input">
|
||||||
<div class="row">
|
<div class="row">
|
||||||
{{field.fieldValue}}
|
|
||||||
<label class="btn btn-default col-xs-2"
|
<label class="btn btn-default col-xs-2"
|
||||||
style="background: rgba(0,0,0,0.1); text-align:left;"
|
style="background: rgba(0,0,0,0.1); text-align:left;">
|
||||||
ng-click="field.fieldValue = true;">
|
<input type="radio" value="true"
|
||||||
<input type="radio" value="true"
|
style="opacity: 0; margin-left: 0px;"
|
||||||
style="display: none;"
|
ng-focus="setActiveField(field._id, index)"
|
||||||
ng-model="field.fieldValue"
|
ng-model="field.fieldValue"
|
||||||
ng-model-options="{ debounce: 250 }"
|
ng-model-options="{ debounce: 250 }"
|
||||||
ng-required="field.required"
|
ng-required="field.required"
|
||||||
|
@ -27,17 +26,17 @@
|
||||||
Y
|
Y
|
||||||
</div>
|
</div>
|
||||||
<span>Yes</span>
|
<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>
|
</label>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="row" style="margin-top: 10px;">
|
<div class="row" style="margin-top: 10px;">
|
||||||
<label class="btn btn-default col-xs-2"
|
<label class="btn btn-default col-xs-2"
|
||||||
style="background: rgba(0,0,0,0.1); text-align:left;"
|
style="background: rgba(0,0,0,0.1); text-align:left;">
|
||||||
ng-click="field.fieldValue = false;">
|
|
||||||
|
|
||||||
<input type="radio" value="false"
|
<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="field.fieldValue"
|
||||||
ng-model-options="{ debounce: 250 }"
|
ng-model-options="{ debounce: 250 }"
|
||||||
ng-required="field.required"
|
ng-required="field.required"
|
||||||
|
@ -47,7 +46,7 @@
|
||||||
N
|
N
|
||||||
</div>
|
</div>
|
||||||
<span>No</span>
|
<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>
|
</label>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
|
@ -216,12 +216,12 @@
|
||||||
<div ng-repeat="option in field.fieldOptions track by option.option_id" class="row">
|
<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">
|
<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>
|
<i class="fa fa-trash-o"></i>
|
||||||
</a>
|
</a>
|
||||||
</div>
|
</div>
|
||||||
<div class="row">
|
<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
|
<i class="icon-plus icon-white"></i> Add Option
|
||||||
</button>
|
</button>
|
||||||
</div>
|
</div>
|
||||||
|
|
File diff suppressed because one or more lines are too long
Loading…
Reference in a new issue