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

fixed field formatting

Browse source
This commit is contained in:
David Baldwynn 2015-11-05 18:02:25 -08:00
parent 065f2a47f6
commit 73948afd85
3 changed files with 41 additions and 43 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
public/modules/forms/controllers/admin-form.client.controller.js
View file

@ -10,8 +10,6 @@ angular.module('forms').controller('AdminFormController', ['$rootScope', '$scope
$rootScope.saveInProgress = false;
CurrentForm.setForm($scope.myform);
// console.log($scope.myform);
// Find a specific Form
$scope.findOne = function(){
Forms.get({

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

@ -61,49 +61,49 @@ angular.module('forms').directive('editFormDirective', ['$rootScope', '$q', '$ht
handle: ' .handle'
};
// $scope.draggable = {
// connectWith: ".dropzone",
// start: function (e, ui) {
// // $scope.$apply(function() {
// // $scope.dragging = true
// // });
// $('.dropzone').sortable('refresh');
// },
// update: function (e, ui) {
// var isInDropzone = $(e.target).parentsUntil('.panel-group').hasClass('dropzone');
$scope.draggable = {
connectWith: ".dropzone",
start: function (e, ui) {
// $scope.$apply(function() {
// $scope.dragging = true
// });
$('.dropzone').sortable('refresh');
},
update: function (e, ui) {
var isInDropzone = $(e.target).parentsUntil('.panel-group').hasClass('dropzone');
// console.log('isInDropzone: '+isInDropzone);
// //Disable drag and drop if we aren't in dropzone
// if(!isInDropzone){
// ui.item.sortable.cancel();
// }
// },
// stop: function (e, ui) {
// var isInDropzone = $(e.target).parentsUntil('.panel-group').hasClass('dropzone');
console.log('isInDropzone: '+isInDropzone);
//Disable drag and drop if we aren't in dropzone
if(!isInDropzone){
ui.item.sortable.cancel();
}
},
stop: function (e, ui) {
var isInDropzone = $(e.target).parentsUntil('.panel-group').hasClass('dropzone');
// //Disable drag and drop if we aren't in dropzone
// if(isInDropzone){
// console.log($(e.target));
// }
//Disable drag and drop if we aren't in dropzone
if(isInDropzone){
console.log($(e.target));
}
// // if (ui.item.sortable.droptarget === undefined) {
// // $scope.$apply($scope.dragging = false);
// // return;
// // }else if (ui.item.sortable.droptarget[0].classList[0] === "dropzone") {
// // // run code when item is dropped in the dropzone
// // $scope.$apply($scope.dragging = false);
// // }else{
// // // $scope.$apply($scope.dragging = false);
// // }
// // console.log('has class .dropzone :'+);
// // if ($(e.target).hasClass('dropzone') && ui.item.sortable.droptarget && e.target != ui.item.sortable.droptarget[0] ) {
// // // restore original types
// // $scope.addField.types = FormFields.types;
// // }
// if (ui.item.sortable.droptarget === undefined) {
// $scope.$apply($scope.dragging = false);
// return;
// }else if (ui.item.sortable.droptarget[0].classList[0] === "dropzone") {
// // run code when item is dropped in the dropzone
// $scope.$apply($scope.dragging = false);
// }else{
// // $scope.$apply($scope.dragging = false);
// }
// console.log('has class .dropzone :'+);
// if ($(e.target).hasClass('dropzone') && ui.item.sortable.droptarget && e.target != ui.item.sortable.droptarget[0] ) {
// // restore original types
// $scope.addField.types = FormFields.types;
// }
// }
// };
}
};
/*

6
public/modules/forms/views/directiveViews/form/configure-form.client.view.html
View file

@ -285,17 +285,17 @@
</div>
<div class="row field">
<div class="field-title col-sm-6">
<h5>Hide Form Footer?</h5>
<h5>Display Form Footer?</h5>
</div>
<div class="field-input col-sm-6">
<label>
<input type="radio" data-ng-value="true" ng-model="myform.hideFooter" ng-required="true" />
<input type="radio" data-ng-value="false" ng-model="myform.hideFooter" ng-required="true" />
&nbsp;<span>Yes</span>
</label>
<label>
<input type="radio" data-ng-value="false" ng-model="myform.hideFooter" ng-required="true" />
<input type="radio" data-ng-value="true" ng-model="myform.hideFooter" ng-required="true" />
&nbsp;<span>No</span>
</label>
</div>