fix(form) Revert 9ab7329

mchapman · mchapman · commit 82d733976ae5 · 2017-07-27T19:45:09.000+02:00
diff --git a/config/karma.midway.conf.js b/config/karma.midway.conf.js
@@ -19,6 +19,9 @@ module.exports = function(config) {
           'test/midway/**/*.js'
         ],
 
+        client: {
+          captureConsole: true
+        },
         autoWatch : true,
         usePolling: true,
 
diff --git a/dist/forms-angular.js b/dist/forms-angular.js
@@ -624,6 +624,7 @@ var fng;
                         var allInputsVars = formMarkupHelper.allInputsVars(scope, fieldInfo, options, modelString, idString, nameString);
                         var common = allInputsVars.common;
                         var value;
+                        var requiredStr = (isRequired || fieldInfo.required) ? ' required' : '';
                         isRequired = isRequired || fieldInfo.required;
                         var requiredStr = isRequired ? ' required' : '';
                         var enumInstruction;
@@ -636,14 +637,7 @@ var fng;
                                     common += (fieldInfo.readonly ? 'disabled ' : '');
                                     common += fieldInfo.add ? (' ' + fieldInfo.add + ' ') : '';
                                     value = '<select ' + common + 'class="' + allInputsVars.formControl.trim() + allInputsVars.compactClass + allInputsVars.sizeClassBS2 + '" ' + requiredStr + '>';
-                                    if (isRequired) {
-                                        /*
-                                          Tell the user to select a value
-                                          This becomes disabled in updateRecordWithLookupValues (setting disabled now causes $pristine to be unset, which conflicts with the condition in updateRecordWithLookupValues)
-                                        */
-                                        value += '<option class="disableMe" value="">Select a value</option>';
-                                    }
-                                    else {
+                                    if (!isRequired) {
                                         value += '<option></option>';
                                     }
                                     if (angular.isArray(fieldInfo.options)) {
@@ -2717,9 +2711,6 @@ var fng;
                     if (newVal) {
                         setData($scope.record, schemaElement.name, undefined, newVal);
                     }
-                    if (schemaElement.required) {
-                        angular.element('#' + schemaElement.id + ' .disableMe').prop('disabled', true);
-                    }
                 }
             };
             // Split a field name into the next level and all following levels
diff --git a/dist/forms-angular.min.js b/dist/forms-angular.min.js
diff --git a/js/directives/form.ts b/js/directives/form.ts
@@ -110,6 +110,7 @@ module fng.directives {
           var allInputsVars = formMarkupHelper.allInputsVars(scope, fieldInfo, options, modelString, idString, nameString);
           var common = allInputsVars.common;
           var value;
+          var requiredStr = (isRequired || fieldInfo.required) ? ' required' : '';
           isRequired = isRequired || fieldInfo.required;
           var requiredStr = isRequired ? ' required' : '';
           var enumInstruction:IEnumInstruction;
@@ -122,13 +123,8 @@ module fng.directives {
                 common += (fieldInfo.readonly ? 'disabled ' : '');
                 common += fieldInfo.add ? (' ' + fieldInfo.add + ' ') : '';
                 value = '<select ' + common + 'class="' + allInputsVars.formControl.trim() + allInputsVars.compactClass + allInputsVars.sizeClassBS2 + '" ' + requiredStr + '>';
-                if (isRequired) {
-                  /*
-                    Tell the user to select a value
-                    This becomes disabled in updateRecordWithLookupValues (setting disabled now causes $pristine to be unset, which conflicts with the condition in updateRecordWithLookupValues)
-                  */
-                  value += '<option class="disableMe" value="">Select a value</option>';
-                } else {
+
+                if (!isRequired) {
                   value += '<option></option>';
                 }
                 if (angular.isArray(fieldInfo.options)) {
diff --git a/js/services/record-handler.ts b/js/services/record-handler.ts
@@ -98,9 +98,6 @@ module fng.services {
         if (newVal) {
           setData($scope.record, schemaElement.name, undefined, newVal);
         }
-        if (schemaElement.required) {
-          angular.element('#' + schemaElement.id + ' .disableMe').prop('disabled', true);
-        }
       }
     };
 
diff --git a/test/midway/selectSpec.js b/test/midway/selectSpec.js
@@ -72,12 +72,9 @@ describe('Select.', function () {
       expect(input.val()).toBe('Brown');
 
       input = input.find('option');
-      expect(input.length).toBe(5);
-
-      var option = angular.element(input[0]);
-      expect(option.text()).toBe('Select a value');
+      expect(input.length).toBe(4);
 
-      option = angular.element(input[4]);
+      var option = angular.element(input[3]);
       expect(option.text()).toBe('Hazel');
     });
 
@@ -159,4 +156,3 @@ describe('Select.', function () {
   });
 
 });
-

Original file line number	Diff line number	Diff line change
`@@ -98,9 +98,6 @@ module fng.services {`
`98`	`98`	`if (newVal) {`
`99`	`99`	`setData($scope.record, schemaElement.name, undefined, newVal);`
`100`	`100`	`}`
`101`		`- if (schemaElement.required) {`
`102`		`- angular.element('#' + schemaElement.id + ' .disableMe').prop('disabled', true);`
`103`		`- }`
`104`	`101`	`}`
`105`	`102`	`};`
`106`	`103`