Fix ios placeholder implementation (NativeScript#4067)

Hristo Hristov · web-flow · commit 502a37d27c4e · 2017-04-26T14:27:24.000+03:00
* Fix NativeScript#4043 * Merge ios & android implementation
diff --git a/tests/app/ui/placeholder/placeholder-tests.ts b/tests/app/ui/placeholder/placeholder-tests.ts
@@ -1,7 +1,6 @@
 ﻿import * as TKUnit from "../../TKUnit";
 // >> article-creating-view
-import * as platform from "tns-core-modules/platform";
-//var utils = require("utils/utils");
+import { isIOS, isAndroid } from "tns-core-modules/platform";
 import * as utils from "tns-core-modules/utils/utils";
 import * as helper from "../helper";
 import * as viewModule from "tns-core-modules/ui/core/view";
@@ -11,56 +10,57 @@ import * as placeholderModule from "tns-core-modules/ui/placeholder";
 // << article-require-placeholder-module
 
 function creatingView(args) {
-   var nativeView;
-   if (platform.device.os === platform.platformNames.ios) {
-       nativeView = UITextView.new();
-       nativeView.text = "Native";
-   } else if (platform.device.os === platform.platformNames.android) {
-       nativeView = new android.widget.TextView(utils.ad.getApplicationContext());
-       nativeView.setText("Native");
-   }
+    let nativeView;
+    if (isIOS) {
+        nativeView = UITextView.new();
+        nativeView.text = "Native";
+    } else if (isAndroid) {
+        nativeView = new android.widget.TextView(utils.ad.getApplicationContext());
+        nativeView.setText("Native");
+    }
 
-   args.view = nativeView;
+    args.view = nativeView;
 }
 
 exports.creatingView = creatingView;
 // << article-creating-view
 
 export function test_placeholder_creatingView() {
-    var nativeView;
-
-    var p = new placeholderModule.Placeholder();
-    p.id = "test";
+    const p = new placeholderModule.Placeholder();
     p.on(placeholderModule.Placeholder.creatingViewEvent, (args: placeholderModule.CreateViewEventData) => {
-        if (platform.device.os === platform.platformNames.ios) {
-        nativeView = UITextView.new();
+        let nativeView;
+        if (isIOS) {
+            nativeView = UITextView.new();
             nativeView.text = "Native";
-        } else if (platform.device.os === platform.platformNames.android) {
+        } else if (isAndroid) {
             nativeView = new android.widget.TextView(utils.ad.getApplicationContext());
             nativeView.setText("Native");
         }
-    
+
         args.view = nativeView;
     });
 
-    if (platform.device.os === platform.platformNames.ios) {
-       TKUnit.assert(p.ios instanceof UITextView, "ios property should be UITextView. Current value: " + p.ios);
-    } else if (platform.device.os === platform.platformNames.android) {
-       p._emit("creatingView");
-       TKUnit.assert(nativeView instanceof android.widget.TextView, "Native view should be android.widget.TextView. Current value: " + nativeView);
-    }
+    function testAction(views: Array<viewModule.View>) {
+        if (isIOS) {
+            TKUnit.assert(p.nativeView instanceof UITextView, "nativeView property should be UITextView. Current value: " + p.nativeView);
+        } else if (isAndroid) {
+            TKUnit.assert(p.nativeView instanceof android.widget.TextView, "Native view should be android.widget.TextView. Current value: " + p.nativeView);
+        }
+    };
+
+    helper.buildUIAndRunTest(p, testAction);
 }
 
 export function test_placeholder_will_not_crash_wihout_creatingView() {
-    var p = new placeholderModule.Placeholder();   
+   const p = new placeholderModule.Placeholder();
 
     function testAction(views: Array<viewModule.View>) {
-        if (platform.device.os === platform.platformNames.ios) {
+        if (isIOS) {
             TKUnit.assert(p.ios === undefined, "ios property should be undefined. Current value: " + p.ios);
-        } else if (platform.device.os === platform.platformNames.android) {
+        } else if (isAndroid) {
             TKUnit.assert(p.android === undefined, "android view should be undefined. Current value: " + p.android);
         }
     };
 
     helper.buildUIAndRunTest(p, testAction);
-}
+}
diff --git a/tns-core-modules/ui/placeholder/placeholder.android.ts b/tns-core-modules/ui/placeholder/placeholder.android.ts
@@ -5,7 +5,7 @@ export class Placeholder extends View implements PlaceholderDefinition {
     public static creatingViewEvent = "creatingView";
 
     public createNativeView() {
-        let args = <CreateViewEventData>{ eventName: Placeholder.creatingViewEvent, object: this, view: undefined, context: this._context };
+        const args = <CreateViewEventData>{ eventName: Placeholder.creatingViewEvent, object: this, view: undefined, context: this._context };
         this.notify(args);
         return <android.view.View>args.view;
     }
diff --git a/tns-core-modules/ui/placeholder/placeholder.ios.ts b/tns-core-modules/ui/placeholder/placeholder.ios.ts
diff --git a/tns-core-modules/ui/placeholder/placeholder.ts b/tns-core-modules/ui/placeholder/placeholder.ts
@@ -0,0 +1,12 @@
+﻿import { Placeholder as PlaceholderDefinition, CreateViewEventData } from "."
+import { View } from "../core/view"
+
+export class Placeholder extends View implements PlaceholderDefinition {
+    public static creatingViewEvent = "creatingView";
+
+    public createNativeView() {
+        const args = <CreateViewEventData>{ eventName: Placeholder.creatingViewEvent, object: this, view: undefined, context: this._context };
+        this.notify(args);
+        return args.view;
+    }
+}

Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@ export class Placeholder extends View implements PlaceholderDefinition {`
`5`	`5`	`public static creatingViewEvent = "creatingView";`
`6`	`6`
`7`	`7`	`public createNativeView() {`
`8`		`- let args = <CreateViewEventData>{ eventName: Placeholder.creatingViewEvent, object: this, view: undefined, context: this._context };`
	`8`	`+ const args = <CreateViewEventData>{ eventName: Placeholder.creatingViewEvent, object: this, view: undefined, context: this._context };`
`9`	`9`	`this.notify(args);`
`10`	`10`	`return <android.view.View>args.view;`
`11`	`11`	`}`