From e7876300329ccfd5abf97c3710f18816f4dd6f07 Mon Sep 17 00:00:00 2001
From: David Baldwynn <david.baldwin@alumni.ubc.ca>
Date: Mon, 16 May 2016 18:53:17 -0700
Subject: [PATCH] fixed html parsing error in rating field

---
 .../directives/auto-save.client.directive.js  | 34 +++++++++----------
 .../directives/edit-form.client.directive.js  |  5 ++-
 .../views/directiveViews/field/rating.html    |  2 +-
 .../form/edit-form.client.view.html           |  3 +-
 4 files changed, 23 insertions(+), 21 deletions(-)

diff --git a/public/modules/forms/directives/auto-save.client.directive.js b/public/modules/forms/directives/auto-save.client.directive.js
index 473f07d6..42df93da 100644
--- a/public/modules/forms/directives/auto-save.client.directive.js
+++ b/public/modules/forms/directives/auto-save.client.directive.js
@@ -4,14 +4,14 @@
 function removeDateFieldsFunc(o) {
     var clone = _.clone(o);
     function eachObject(v,k){
-        
+
 		if(k === 'lastModified' || k === 'created'){
         	delete clone[i][k];
         }
 	}
 
 	for(var i=0; i<clone.length; i++){
-        _.each(clone[i], eachObject); 
+        _.each(clone[i], eachObject);
     }
     return clone;
 }
@@ -19,7 +19,7 @@ function removeDateFieldsFunc(o) {
 _.mixin({ removeDateFields : removeDateFieldsFunc });
 
 angular.module('forms').directive('autoSaveForm', ['$rootScope', '$timeout', function($rootScope, $timeout) {
-  
+
     return {
         require: ['^form'],
         restrict: 'AE',
@@ -58,24 +58,24 @@ angular.module('forms').directive('autoSaveForm', ['$rootScope', '$timeout', fun
                     $rootScope[$attrs.autoSaveCallback](true,
                         function(err){
                         if(!err){
-                            console.log('\n\nForm data persisted -- setting pristine flag');
-                            $formCtrl.$setPristine(); 
-                            $formCtrl.$setUntouched(); 
+                            //console.log('\n\nForm data persisted -- setting pristine flag');
+                            $formCtrl.$setPristine();
+                            $formCtrl.$setUntouched();
                         }else{
                             console.error('Error form data NOT persisted');
                             console.error(err);
                         }
-                    }); 
+                    });
                 };
 
                 //Update/Save Form if any Form fields are Dirty and Touched
                 $scope.$watch(function(newValue, oldValue) {
-                    console.log('introParagraphStartPage.$dirty: '+$scope.editForm.introParagraphStartPage.$dirty);
-                    console.log('introParagraphStartPage.$touched: '+$scope.editForm.introParagraphStartPage.$touched);
+                    //console.log('introParagraphStartPage.$dirty: '+$scope.editForm.introParagraphStartPage.$dirty);
+                    //console.log('introParagraphStartPage.$touched: '+$scope.editForm.introParagraphStartPage.$touched);
                     if($rootScope.finishedRender && $scope.anyDirtyAndTouched($scope.editForm) && !$rootScope.saveInProgress){
-                        console.log('Form saving started');
+                        //console.log('Form saving started');
                         debounceSave();
-                        console.log('introParagraphStartPage.$dirty AFTER: '+$scope.editForm.introParagraphStartPage.$dirty);
+                        //console.log('introParagraphStartPage.$dirty AFTER: '+$scope.editForm.introParagraphStartPage.$dirty);
                     }
                 });
 
@@ -99,7 +99,7 @@ angular.module('forms').directive('autoSaveForm', ['$rootScope', '$timeout', fun
                     if( (!newValue && !oldValue) || !oldValue ){
                         return;
                     }
-                      
+
                     // console.log('Autosaving');
                     // console.log('\n\n----------');
                     // console.log('!$dirty: '+ !$formCtrl.$dirty );
@@ -112,7 +112,7 @@ angular.module('forms').directive('autoSaveForm', ['$rootScope', '$timeout', fun
                     // console.log(oldValue.form_fields);
                     // console.log(newValue.form_fields);
 
-                    if(oldValue.form_fields.length === 0) { 
+                    if(oldValue.form_fields.length === 0) {
                         $rootScope.finishedRender = true;
                     }
 
@@ -124,9 +124,9 @@ angular.module('forms').directive('autoSaveForm', ['$rootScope', '$timeout', fun
                             savePromise = null;
                         }
 
-                        savePromise = $timeout(function() {   
-                            debounceSave();           
-                        }); 
+                        savePromise = $timeout(function() {
+                            debounceSave();
+                        });
                     }
                     //If we are finished rendering then form saving should be finished
                     else if($rootScope.finishedRender && $rootScope.saveInProgress){
@@ -137,5 +137,5 @@ angular.module('forms').directive('autoSaveForm', ['$rootScope', '$timeout', fun
             });
         }
     };
-  
+
 }]);
diff --git a/public/modules/forms/directives/edit-form.client.directive.js b/public/modules/forms/directives/edit-form.client.directive.js
index 63b17337..aaae27cf 100644
--- a/public/modules/forms/directives/edit-form.client.directive.js
+++ b/public/modules/forms/directives/edit-form.client.directive.js
@@ -19,9 +19,12 @@ angular.module('forms').directive('editFormDirective', ['$rootScope', 'FormField
 				//Setup UI-Sortable
 				$scope.sortableOptions = {
 					appendTo: '.dropzone',
-					cursorAt: { top: -160 }
+					cursorAt: { top: -155 },
+					forceHelperSize: true,
+					forcePlaceholderSize: true
 				};
 
+
 				console.log($scope.sortableOptions);
 
                 //Populate AddField with all available form field types
diff --git a/public/modules/forms/views/directiveViews/field/rating.html b/public/modules/forms/views/directiveViews/field/rating.html
index 405f167c..231182f2 100644
--- a/public/modules/forms/views/directiveViews/field/rating.html
+++ b/public/modules/forms/views/directiveViews/field/rating.html
@@ -1,5 +1,5 @@
 <div class="textfield field row"
-	 on-enter-key="nextField()"
+	 on-enter-key="nextField()">
     <div class="col-xs-12 field-title" ng-style="{'color': design.colors.questionColor}">
 	    <h3>
 			<small class="field-number">
diff --git a/public/modules/forms/views/directiveViews/form/edit-form.client.view.html b/public/modules/forms/views/directiveViews/form/edit-form.client.view.html
index c8a02263..f2e2130e 100644
--- a/public/modules/forms/views/directiveViews/form/edit-form.client.view.html
+++ b/public/modules/forms/views/directiveViews/form/edit-form.client.view.html
@@ -165,12 +165,11 @@
             <div class="col-sm-12 col-md-8 dropzoneContainer">
 
                 <accordion close-others="accordion.oneAtATime"
-						   ui-floating="true"
 						   ui-sortable="sortableOptions"
 						   ng-model="myform.form_fields"
 						   class="dropzone">
 
-                    <accordion-group data-ng-repeat="field in myform.form_fields track by field._id"
+                    <accordion-group ng-repeat="field in myform.form_fields track by field._id"
 									 is-open="accordion[$index].isOpen"
 									 on-finish-render="editFormFields"
 									 ng-if="!field.deletePreserved">