From 54756fca9994e32ccef9b6603ab8b833d36ec622 Mon Sep 17 00:00:00 2001
From: Alexander Zhukov <a.zhukov@akveo.com>
Date: Sat, 21 Jan 2017 14:59:02 +0300
Subject: [PATCH] fix(picture uploader): AOT minor fixes

---
 .../baPictureUploader/baPictureUploader.component.ts | 12 ++++++------
 .../baPictureUploader/baPictureUploader.html         |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/app/theme/components/baPictureUploader/baPictureUploader.component.ts b/src/app/theme/components/baPictureUploader/baPictureUploader.component.ts
index 28fd5b4e..798d5222 100644
--- a/src/app/theme/components/baPictureUploader/baPictureUploader.component.ts
+++ b/src/app/theme/components/baPictureUploader/baPictureUploader.component.ts
@@ -39,17 +39,17 @@ export class BaPictureUploader {
     }
   }
 
-  public bringFileSelector():boolean {
+  bringFileSelector():boolean {
     this.renderer.invokeElementMethod(this._fileUpload.nativeElement, 'click');
     return false;
   }
 
-  public removePicture():boolean {
+  removePicture():boolean {
     this.picture = '';
     return false;
   }
 
-  protected _changePicture(file:File):void {
+  _changePicture(file:File):void {
     const reader = new FileReader();
     reader.addEventListener('load', (event:Event) => {
       this.picture = (<any> event.target).result;
@@ -57,7 +57,7 @@ export class BaPictureUploader {
     reader.readAsDataURL(file);
   }
 
-  protected _onUpload(data):void {
+  _onUpload(data):void {
     if (data['done'] || data['abort'] || data['error']) {
       this._onUploadCompleted(data);
     } else {
@@ -65,12 +65,12 @@ export class BaPictureUploader {
     }
   }
 
-  protected _onUploadCompleted(data):void {
+  _onUploadCompleted(data):void {
     this.uploadInProgress = false;
     this.onUploadCompleted.emit(data);
   }
 
-  protected _canUploadOnServer():boolean {
+  _canUploadOnServer():boolean {
     return !!this.uploaderOptions['url'];
   }
 }
diff --git a/src/app/theme/components/baPictureUploader/baPictureUploader.html b/src/app/theme/components/baPictureUploader/baPictureUploader.html
index c1f97155..87f6489a 100644
--- a/src/app/theme/components/baPictureUploader/baPictureUploader.html
+++ b/src/app/theme/components/baPictureUploader/baPictureUploader.html
@@ -1,7 +1,7 @@
 <div class="picture-group" [ngClass]="{uploading: uploadInProgress}">
   <div class="picture-wrapper" (click)="bringFileSelector();">
     <img [src]="picture" *ngIf="picture">
-    <img [src]="defaultPicture" *ngIf="!picture && defaultPicture">
+    <img [src]="defaultPicture" *ngIf="!!!picture && !!defaultPicture">
 
     <div class="loading" *ngIf="uploadInProgress">
       <div class="spinner">