From 5f94a302fb882b19b7932ed40250957cb79fa83a Mon Sep 17 00:00:00 2001
From: zh-m <maya.zhecheva@gmail.com>
Date: Tue, 29 Nov 2016 17:43:50 +0200
Subject: [PATCH] ImageAsset extends Observable

---
 tns-core-modules/image-asset/image-asset-common.ts | 3 ++-
 tns-core-modules/image-asset/image-asset.d.ts      | 4 +++-
 tns-core-modules/image-source/image-source.ios.ts  | 4 +++-
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/tns-core-modules/image-asset/image-asset-common.ts b/tns-core-modules/image-asset/image-asset-common.ts
index e08382c78..3adc7772a 100644
--- a/tns-core-modules/image-asset/image-asset-common.ts
+++ b/tns-core-modules/image-asset/image-asset-common.ts
@@ -1,7 +1,8 @@
 import definition = require("image-asset");
+import observable = require("data/observable");
 import platform = require("platform");
 
-export class ImageAsset implements definition.ImageAsset {
+export class ImageAsset  extends observable.Observable implements definition.ImageAsset {
     private _options: definition.ImageAssetOptions;
     private _ios: PHAsset;
     private _nativeImage: any;
diff --git a/tns-core-modules/image-asset/image-asset.d.ts b/tns-core-modules/image-asset/image-asset.d.ts
index 21adf6aa7..b4ede15b4 100644
--- a/tns-core-modules/image-asset/image-asset.d.ts
+++ b/tns-core-modules/image-asset/image-asset.d.ts
@@ -1,5 +1,7 @@
 declare module "image-asset" {
-    export class ImageAsset {
+    import observable = require("data/observable");
+
+    export class ImageAsset extends observable.Observable {
         constructor(asset: any);
         getImageAsync(callback: (image: any, error: any) => void); //UIImage for iOS and android.graphics.Bitmap for Android
         ios: any; //PHAsset
diff --git a/tns-core-modules/image-source/image-source.ios.ts b/tns-core-modules/image-source/image-source.ios.ts
index 7bcce45ad..abd7b12c7 100644
--- a/tns-core-modules/image-source/image-source.ios.ts
+++ b/tns-core-modules/image-source/image-source.ios.ts
@@ -122,7 +122,9 @@ export class ImageSource implements definition.ImageSource {
     }
 
     public setNativeSource(source: any): boolean {
-        this.ios = source;
+        if (source instanceof UIImage) {
+            this.ios = source;
+        }
         return source != null;
     }