diff --git a/pom.xml b/pom.xml index 47a325c76..2179c79d2 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.gentics.mesh mesh-admin-ui2 - 1.3.6 + 1.3.7 pom Mesh - Admin UI diff --git a/src/app/form-generator/components/binary-field/binary-field.component.spec.ts b/src/app/form-generator/components/binary-field/binary-field.component.spec.ts index 01189c0ff..dd92aa8f9 100644 --- a/src/app/form-generator/components/binary-field/binary-field.component.spec.ts +++ b/src/app/form-generator/components/binary-field/binary-field.component.spec.ts @@ -369,21 +369,21 @@ describe('BinaryFieldComponent:', () => { focalPointX: 0.5, focalPointY: 0.5 }); - - expect(instance.binaryFieldComponent.scaledTransform).toEqual({ - width: 208, - height: 146, - cropRect: { - width: 208, - height: 208, - startX: 21, - startY: 21 - }, - scaleX: 0.85, - scaleY: 0.5, - focalPointX: 0.5, - focalPointY: 0.5 - }); +// +// expect(instance.binaryFieldComponent.scaledTransform).toEqual({ +// width: 208, +// height: 146, +// cropRect: { +// width: 208, +// height: 208, +// startX: 21, +// startY: 21 +// }, +// scaleX: 0.85, +// scaleY: 0.5, +// focalPointX: 0.5, +// focalPointY: 0.5 +// }); } ) ); diff --git a/src/app/form-generator/components/binary-field/binary-field.component.ts b/src/app/form-generator/components/binary-field/binary-field.component.ts index 0a521259f..740132161 100644 --- a/src/app/form-generator/components/binary-field/binary-field.component.ts +++ b/src/app/form-generator/components/binary-field/binary-field.component.ts @@ -93,13 +93,13 @@ export class BinaryFieldComponent extends BaseFieldComponent { onImageLoad(): void { this.loadingPreview = false; if (this.binaryProperties && this.binaryProperties.file && this.lastParams) { - this.scaledTransform = { - ...this.lastParams, - ...{ - focalPointX: this.lastParams.focalPointX, - focalPointY: this.lastParams.focalPointY - } - }; +// this.scaledTransform = { +// ...this.lastParams, +// ...{ +// focalPointX: this.lastParams.focalPointX, +// focalPointY: this.lastParams.focalPointY +// } +// }; this.lastParams = undefined; } } @@ -123,16 +123,16 @@ export class BinaryFieldComponent extends BaseFieldComponent { this.modalService .fromComponent(ImageEditorModalComponent, undefined, { - imageUrl, - params: { - ...this.transformParams, - // set focalpoint data if exist - ...(imageField.focalPoint && - ({ - focalPointX: imageField.focalPoint.x, - focalPointY: imageField.focalPoint.y - } as any)) - } + imageUrl +// , params: { +// ...this.transformParams, +// // set focalpoint data if exist +// ...(imageField.focalPoint && +// ({ +// focalPointX: imageField.focalPoint.x, +// focalPointY: imageField.focalPoint.y +// } as any)) +// } }) .then(modal => modal.open()) .then(params => { @@ -145,18 +145,18 @@ export class BinaryFieldComponent extends BaseFieldComponent { this.lastParams = params; } else { const value = this.api.getValue(); - this.scaledTransform = this.calculateScaledTransformParams(imageField, params); + //this.scaledTransform = this.calculateScaledTransformParams(imageField, params); this.api.setValue({ - ...value, - // update focalpoint data - focalPoint: { - x: params.focalPointX, - y: params.focalPointY - }, - transform: params + ...value +// // update focalpoint data +// , focalPoint: { +// x: params.focalPointX, +// y: params.focalPointY +// }, +// transform: params }); } - this.transformParams = params; +// this.transformParams = params; this.changeDetector.markForCheck(); }); }