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

fixed icon bug on field dragging

Browse source
This commit is contained in:
David Baldwynn 2017-11-19 22:42:59 -08:00
parent d74c04fa86
commit 5ad2875378
3 changed files with 17 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -16,14 +16,20 @@ angular.module('forms').directive('editFormDirective', ['$rootScope', 'FormField
*/ */
var newField; var newField;
//Populate local scope with rootScope methods/variables
$scope.update = $rootScope.update;
//Setup UI-Sortable //Setup UI-Sortable
$scope.sortableOptions = { $scope.sortableOptions = {
appendTo: '.dropzone', appendTo: '.dropzone',
//helper: 'clone', items: '.sortable-fields',
forceHelperSize: true, forceHelperSize: true,
forcePlaceholderSize: true, forcePlaceholderSize: true,
update: function(e, ui) { update: function(e, ui) {
$scope.update(false, $scope.myform, true, false, function(err){ $scope.update(false, $scope.myform, true, false, function(err){
if(err){
console.error(err);
}
}); });
}, },
}; };
@ -251,10 +257,6 @@ angular.module('forms').directive('editFormDirective', ['$rootScope', 'FormField
}); });
}; };
//Populate local scope with rootScope methods/variables
$scope.update = $rootScope.update;
/* /*
** Field CRUD Methods ** Field CRUD Methods
*/ */

7
public/form_modules/forms/base/directives/field-icon.client.directive.js → public/modules/forms/admin/directives/field-icon.client.directive.js
View file

@ -1,15 +1,15 @@
'use strict'; 'use strict';
angular.module('view-form').directive('fieldIconDirective', function() { angular.module('forms').directive('fieldIconDirective', function() {
return { return {
template: '<i class="{{typeIcon}}"></i>', template: '<i ng-class="iconTypeMap[typeName]"></i>',
restrict: 'E', restrict: 'E',
scope: { scope: {
typeName: '@' typeName: '@'
}, },
controller: function($scope){ controller: function($scope){
var iconTypeMap = { $scope.iconTypeMap = {
'textfield': 'fa fa-pencil-square-o', 'textfield': 'fa fa-pencil-square-o',
'dropdown': 'fa fa-th-list', 'dropdown': 'fa fa-th-list',
'date': 'fa fa-calendar', 'date': 'fa fa-calendar',
@ -27,7 +27,6 @@ angular.module('view-form').directive('fieldIconDirective', function() {
'yes_no': 'fa fa-toggle-on', 'yes_no': 'fa fa-toggle-on',
'number': 'fa fa-slack' 'number': 'fa fa-slack'
}; };
$scope.typeIcon = iconTypeMap[$scope.typeName];
} }
}; };
}); });

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

@ -487,8 +487,9 @@
</div> </div>
<div class="panel-group row" class="draggable" ng-model="addField.types"> <div class="panel-group row" class="draggable" ng-model="addField.types">
<div class="col-xs-12 col-sm-12 col-md-6" ng-repeat="type in addField.types" style="padding-top:7.5px;"> <div class="col-xs-12 col-sm-12 col-md-6"
<div class="panel panel-default" style="background-color:#f5f5f5;"> ng-repeat="type in addField.types" style="padding-top: 7.5px;">
<div class="panel panel-default" style="background-color: #f5f5f5;">
<div class="panel-heading" ng-click="addNewField(type.name)" style="cursor: pointer; font-size:12px; padding-left: 10px; padding-right: 10px;"> <div class="panel-heading" ng-click="addNewField(type.name)" style="cursor: pointer; font-size:12px; padding-left: 10px; padding-right: 10px;">
<span> <span>
<field-icon-directive type-name="{{type.name}}"> <field-icon-directive type-name="{{type.name}}">
@ -526,13 +527,14 @@
<div class="panel-group dropzone col-xs-12" ui-sortable="sortableOptions" ng-model="myform.form_fields"> <div class="panel-group dropzone col-xs-12" ui-sortable="sortableOptions" ng-model="myform.form_fields">
<div class="col-xs-12 field-row" ng-repeat="field in myform.form_fields track by $index" ng-hide="field.deletePreserved"> <div class="col-xs-12 field-row sortable-fields" ng-repeat="field in myform.form_fields track by $index">
<div class="col-xs-10"> <div class="col-xs-10 sortable-panel">
<div class="panel panel-default" ng-click="openEditModal(field, true, $index)"> <div class="panel panel-default" ng-click="openEditModal(field, true, $index)">
<div class="panel-heading"> <div class="panel-heading">
<div class="row"> <div class="row">
<span class="col-xs-1" ng-switch="field.fieldType"> <span class="col-xs-1" ng-switch="field.fieldType">
<field-icon-directive type-name="{{field.fieldType}}"></field-icon-directive> <field-icon-directive type-name="{{field.fieldType}}">
</field-icon-directive>
</span> </span>
<span class="col-xs-11"> <span class="col-xs-11">
{{field.title}} {{field.title}}
@ -551,7 +553,6 @@
</div> </div>
</div> </div>
</div> </div>
<div class="col-xs-1 box"> <div class="col-xs-1 box">
<div class="panel tool-panel panel-default"> <div class="panel tool-panel panel-default">
<div class="panel-heading" style="padding: 10px 10px;" ng-click="duplicateField($index)"> <div class="panel-heading" style="padding: 10px 10px;" ng-click="duplicateField($index)">