Hhristov/ios background image crash fix (NativeScript#4214)

Hristo Hristov · web-flow · commit 0d21f52c99aa · 2017-05-17T15:40:14.000+03:00
* uiColorFromImage should return if there is no image.

* added unit-test
diff --git a/tests/app/ui/view/view-tests-common.ts b/tests/app/ui/view/view-tests-common.ts
@@ -249,7 +249,7 @@ export function test_InheritableStylePropertiesWhenUsedWithExtendedClass_AreInhe
     page.content = newButton;
 
     TKUnit.assertEqual(newButton.style.color, redColor);
-};
+}
 
 // TestView definition START
 const customCssProperty = new CssProperty<Style, string>({ name: "customCssProperty", cssName: "custom-css-property" });
@@ -919,3 +919,11 @@ export function test_getActualSize() {
         TKUnit.assertAreClose(actualSize.height, 200, delta, "actualSize.height");
     });
 };
+
+export function test_background_image_doesnt_throw() {
+   var btn = new Button();
+   btn.style.backgroundImage = 'https://www.bodybuilding.com/images/2016/june/8-benefits-to-working-out-in-the-morning-header-v2-830x467.jpg';
+   helper.buildUIAndRunTest(btn, function (views: Array<View>) {
+        TKUnit.waitUntilReady(() => btn.isLayoutValid);
+    });
+}
diff --git a/tns-core-modules/ui/styling/background.ios.ts b/tns-core-modules/ui/styling/background.ios.ts
@@ -262,6 +262,7 @@ function getDrawParams(this: void, image: UIImage, background: BackgroundDefinit
 function uiColorFromImage(img: UIImage, view: View, callback: (uiColor: UIColor) => void, flip?: boolean): void {
     if (!img) {
         callback(null);
+        return;
     }
 
     const nativeView = view.nativeView as UIView;

Original file line number	Diff line number	Diff line change
`@@ -262,6 +262,7 @@ function getDrawParams(this: void, image: UIImage, background: BackgroundDefinit`
`262`	`262`	`function uiColorFromImage(img: UIImage, view: View, callback: (uiColor: UIColor) => void, flip?: boolean): void {`
`263`	`263`	`if (!img) {`
`264`	`264`	`callback(null);`
	`265`	`+ return;`
`265`	`266`	`}`
`266`	`267`
`267`	`268`	`const nativeView = view.nativeView as UIView;`