Merge d3c4222 into 76f9709

ESSS · Jan 25, 2019 · cdb9e43 · cdb9e43
2 parents 76f9709 + d3c4222
commit cdb9e43
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 6 deletions.
diff --git a/src/ng-xform/measure-field/measure-field.component.spec.ts b/src/ng-xform/measure-field/measure-field.component.spec.ts
@@ -65,24 +65,24 @@ describe('MeasureFieldComponent', () => {
 
     inputEl.nativeElement.value = newValueString;
     inputEl.nativeElement.dispatchEvent(new Event('input'));
-    expect(component.control.value).toEqual(new Measure(15, 'm'));
+    expect(component.formattedValue).toEqual('15 m');
 
     component.changeUnit('cm');
     expect(component.viewModel).toEqual(1500);
     expect(component.viewUnit).toEqual('cm');
-    expect(component.control.value).toEqual(new Measure(15, 'm'));
+    expect(component.formattedValue).toEqual('1500 cm');
 
     component.changeUnit('');
     expect(component.viewModel).toEqual(15);
     expect(component.viewUnit).toEqual('m');
-    expect(component.control.value).toEqual(new Measure(15, 'm'));
+    expect(component.formattedValue).toEqual('15 m');
 
     component.field.modelUnit = 'inch';
     fixture.detectChanges();
     component.ngOnInit();
     inputEl.nativeElement.value = newValueString;
     inputEl.nativeElement.dispatchEvent(new Event('input'));
-    expect(component.control.value).toEqual(new Measure(15, 'inch'));
+    expect(component.formattedValue).toEqual('15 inch');
   });
 
   it('should show unit and units dropdown', () => {

diff --git a/src/ng-xform/measure-field/measure-field.component.ts b/src/ng-xform/measure-field/measure-field.component.ts
@@ -69,8 +69,7 @@ export class MeasureFieldComponent extends BaseDynamicFieldComponent<MeasureFiel
         this.field.modelUnit
       );
     }
-
-    this.control.setValue(newValue, { emitModelToViewChange: false });
+    this.updateInputValue();
     this._onChange(newValue);
   }