From 90b7ef3286d4e49f72fcd79440240086dc7b1ea4 Mon Sep 17 00:00:00 2001
From: Martijn Willekens <willekensm@gmail.com>
Date: Wed, 15 Jan 2020 21:41:08 +0100
Subject: [PATCH] Fixes #246 and #228

---
 projects/ngx-image-cropper/package.json                     | 2 +-
 .../src/lib/component/image-cropper.component.html          | 1 +
 .../src/lib/component/image-cropper.component.ts            | 6 +++---
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/projects/ngx-image-cropper/package.json b/projects/ngx-image-cropper/package.json
index c379193..edb25b3 100644
--- a/projects/ngx-image-cropper/package.json
+++ b/projects/ngx-image-cropper/package.json
@@ -1,6 +1,6 @@
 {
     "name": "ngx-image-cropper",
-    "version": "2.1.0",
+    "version": "2.1.1",
     "description": "An image cropper for Angular",
     "author": "Martijn Willekens",
     "repository": {
diff --git a/projects/ngx-image-cropper/src/lib/component/image-cropper.component.html b/projects/ngx-image-cropper/src/lib/component/image-cropper.component.html
index 7823a33..d964369 100644
--- a/projects/ngx-image-cropper/src/lib/component/image-cropper.component.html
+++ b/projects/ngx-image-cropper/src/lib/component/image-cropper.component.html
@@ -2,6 +2,7 @@
     <img
         #sourceImage
         class="source-image"
+        *ngIf="safeImgDataUrl"
         [src]="safeImgDataUrl"
         [style.visibility]="imageVisible ? 'visible' : 'hidden'"
         (load)="imageLoadedInView()"
diff --git a/projects/ngx-image-cropper/src/lib/component/image-cropper.component.ts b/projects/ngx-image-cropper/src/lib/component/image-cropper.component.ts
index c0bda58..26601d0 100644
--- a/projects/ngx-image-cropper/src/lib/component/image-cropper.component.ts
+++ b/projects/ngx-image-cropper/src/lib/component/image-cropper.component.ts
@@ -34,7 +34,7 @@ export class ImageCropperComponent implements OnChanges, OnInit {
     marginLeft: SafeStyle | string = '0px';
     imageVisible = false;
 
-    @ViewChild('sourceImage', {static: true}) sourceImage: ElementRef;
+    @ViewChild('sourceImage', {static: false}) sourceImage: ElementRef;
 
     @Input()
     set imageChangedEvent(event: any) {
@@ -817,10 +817,10 @@ export class ImageCropperComponent implements OnChanges, OnInit {
     }
 
     private getClientX(event: any): number {
-        return event.touches && event.touches[0] && event.touches[0].clientX || event.clientX;
+        return (event.touches && event.touches[0] ? event.touches[0].clientX : event.clientX) || 0;
     }
 
     private getClientY(event: any): number {
-        return event.touches && event.touches[0] && event.touches[0].clientY || event.clientY;
+        return (event.touches && event.touches[0] ? event.touches[0].clientY : event.clientY) || 0;
     }
 }