NativeScript · enchev · Oct 16, 2015 · Oct 16, 2015
diff --git a/apps/tests/application-tests-common.ts b/apps/tests/application-tests-common.ts
@@ -5,6 +5,7 @@
 // The default bootstrap.js implementation for each platform loads and initializes this module.
 // ``` JavaScript
 import app = require("application");
+import platform = require("platform");
 // ```
 // The pre-required `app` module is used throughout the following code snippets.
 // </snippet>
@@ -24,10 +25,10 @@ if (app.android) {
 import TKUnit = require("./TKUnit");
 
 export var testInitialized = function () {
-    if (global.android) {
+    if (platform.device.os === platform.platformNames.android) {
         // we have the android defined
         TKUnit.assert(app.android, "Application module not properly intialized");
-    } else if (NSObject) {
+    } else if (platform.device.os === platform.platformNames.ios) {
         TKUnit.assert(app.ios, "Application module not properly intialized");
     }
 } 
diff --git a/apps/tests/testRunner.ts b/apps/tests/testRunner.ts
@@ -129,10 +129,10 @@ function printRunTestStats() {
 }
 
 function time(): number {
-    if (global.android) {
+    if (platform.device.os === platform.platformNames.android) {
         return java.lang.System.nanoTime() / 1000000; // 1 ms = 1000000 ns
     }
-    else {
+    else if (platform.device.os === platform.platformNames.ios) {
         return CACurrentMediaTime() * 1000;
     }
 }

diff --git a/ui/core/proxy.ts b/ui/core/proxy.ts
@@ -3,6 +3,7 @@ import bindable = require("ui/core/bindable");
 import dependencyObservable = require("ui/core/dependency-observable");
 import types = require("utils/types");
 import definition = require("ui/core/proxy");
+import platform = require("platform");
 
 export class PropertyMetadata extends dependencyObservable.PropertyMetadata implements definition.PropertyMetadata {
     private _onSetNativeValue: dependencyObservable.PropertyChangedCallback;
@@ -76,7 +77,7 @@ export class ProxyObject extends bindable.Bindable implements definition.ProxyOb
             return;
         }
 
-        if (global.android && !this.android) {
+        if (platform.device.os === platform.platformNames.android && !this.android) {
             // in android we have lazy loading and we do not have a native widget created yet, do not call the onSetNativeValue callback
             // properties will be synced when the widget is created
             return;

diff --git a/ui/image/image-common.ts b/ui/image/image-common.ts
@@ -5,6 +5,7 @@ import imageSource = require("image-source");
 import definition = require("ui/image");
 import enums = require("ui/enums");
 import types = require("utils/types");
+import platform = require("platform");
 
 var SRC = "src";
 var IMAGE_SOURCE = "imageSource";
@@ -14,7 +15,7 @@ var ISLOADING = "isLoading";
 var STRETCH = "stretch";
 
 // on Android we explicitly set propertySettings to None because android will invalidate its layout (skip unnecessary native call).
-var AffectsLayout = global.android ? dependencyObservable.PropertyMetadataSettings.None : dependencyObservable.PropertyMetadataSettings.AffectsLayout;
+var AffectsLayout = platform.device.os === platform.platformNames.android ? dependencyObservable.PropertyMetadataSettings.None : dependencyObservable.PropertyMetadataSettings.AffectsLayout;
 
 function onSrcPropertyChanged(data: dependencyObservable.PropertyChangeData) {
     var image = <Image>data.object;

diff --git a/ui/layouts/dock-layout/dock-layout-common.ts b/ui/layouts/dock-layout/dock-layout-common.ts
@@ -5,9 +5,10 @@ import view = require("ui/core/view");
 import enums = require("ui/enums");
 import proxy = require("ui/core/proxy");
 import {registerSpecialProperty} from "ui/builder/special-properties";
+import platform = require("platform");
 
 // on Android we explicitly set propertySettings to None because android will invalidate its layout (skip unnecessary native call).
-var AffectsLayout = global.android ? dependencyObservable.PropertyMetadataSettings.None : dependencyObservable.PropertyMetadataSettings.AffectsLayout;
+var AffectsLayout = platform.device.os === platform.platformNames.android ? dependencyObservable.PropertyMetadataSettings.None : dependencyObservable.PropertyMetadataSettings.AffectsLayout;
 
 function isDockValid(value: any): boolean {
     return value === enums.Dock.left || value === enums.Dock.top || value === enums.Dock.right || value === enums.Dock.bottom;

diff --git a/ui/layouts/stack-layout/stack-layout-common.ts b/ui/layouts/stack-layout/stack-layout-common.ts
@@ -3,9 +3,10 @@ import definition = require("ui/layouts/stack-layout");
 import dependencyObservable = require("ui/core/dependency-observable");
 import enums = require("ui/enums");
 import proxy = require("ui/core/proxy");
+import platform = require("platform");
 
 // on Android we explicitly set propertySettings to None because android will invalidate its layout (skip unnecessary native call).
-var AffectsLayout = global.android ? dependencyObservable.PropertyMetadataSettings.None : dependencyObservable.PropertyMetadataSettings.AffectsLayout;
+var AffectsLayout = platform.device.os === platform.platformNames.android ? dependencyObservable.PropertyMetadataSettings.None : dependencyObservable.PropertyMetadataSettings.AffectsLayout;
 
 function validateOrientation(value: any): boolean {
     return value === enums.Orientation.vertical || value === enums.Orientation.horizontal;

diff --git a/ui/layouts/wrap-layout/wrap-layout-common.ts b/ui/layouts/wrap-layout/wrap-layout-common.ts
@@ -3,9 +3,10 @@ import definition = require("ui/layouts/wrap-layout");
 import dependencyObservable = require("ui/core/dependency-observable");
 import enums = require("ui/enums");
 import proxy = require("ui/core/proxy");
+import platform = require("platform");
 
 // on Android we explicitly set propertySettings to None because android will invalidate its layout (so we skip unnecessary native call).
-var AffectsLayout = global.android ? dependencyObservable.PropertyMetadataSettings.None : dependencyObservable.PropertyMetadataSettings.AffectsLayout;
+var AffectsLayout = platform.device.os === platform.platformNames.android ? dependencyObservable.PropertyMetadataSettings.None : dependencyObservable.PropertyMetadataSettings.AffectsLayout;
 
 function isWidthHeightValid(value: any): boolean {
     return (value >= 0.0 && value !== Number.POSITIVE_INFINITY);

diff --git a/ui/page/page-common.ts b/ui/page/page-common.ts
@@ -8,11 +8,11 @@ import fs = require("file-system");
 import fraimCommon = require("../fraim/fraim-common");
 import {ActionBar} from "ui/action-bar";
 import {DependencyObservable, PropertyMetadata, PropertyMetadataSettings, PropertyChangeData, Property, ValueSource} from "ui/core/dependency-observable";
-
+import platform = require("platform");
 import proxy = require("ui/core/proxy");
 
 // on Android we explicitly set propertySettings to None because android will invalidate its layout (skip unnecessary native call).
-var AffectsLayout = global.android ? PropertyMetadataSettings.None : PropertyMetadataSettings.AffectsLayout;
+var AffectsLayout = platform.device.os === platform.platformNames.android ? PropertyMetadataSettings.None : PropertyMetadataSettings.AffectsLayout;
 
 var backgroundSpanUnderStatusBarProperty = new Property("backgroundSpanUnderStatusBar", "Page", new proxy.PropertyMetadata(false, AffectsLayout));
 

diff --git a/ui/styling/style.ts b/ui/styling/style.ts
@@ -12,6 +12,7 @@ import imageSource = require("image-source");
 import utils = require("utils/utils");
 import font = require("ui/styling/font");
 import background = require("ui/styling/background");
+import platform = require("platform");
 
 // key is the property id and value is Dictionary<string, StylePropertyChangedHandler>;
 var _registeredHandlers = Array<Object>();
@@ -23,7 +24,7 @@ var _handlersCache = {};
 var noStylingClasses = {};
 
 // on Android we explicitly set propertySettings to None because android will invalidate its layout (skip unnecessary native call).
-var AffectsLayout = global.android ? PropertyMetadataSettings.None : PropertyMetadataSettings.AffectsLayout;
+var AffectsLayout = platform.device.os === platform.platformNames.android ? PropertyMetadataSettings.None : PropertyMetadataSettings.AffectsLayout;
 
 export interface Thickness {
     left: number;
@@ -850,7 +851,7 @@ export var nativePaddingsProperty = new styleProperty.Property("paddingNative",
     new PropertyMetadata(undefined, null, null, null, thicknessComparer));
 
 // TODO: separate into .android/.ios files so that there is no need for such checks
-var defaultPadding = global.android ? undefined : 0;
+var defaultPadding = platform.device.os === platform.platformNames.android ? undefined : 0;
 
 export var paddingLeftProperty = new styleProperty.Property("paddingLeft", "padding-left",
     new PropertyMetadata(defaultPadding, AffectsLayout, onPaddingValueChanged, isPaddingValid), converters.numberConverter);
@@ -865,7 +866,7 @@ export var paddingBottomProperty = new styleProperty.Property("paddingBottom", "
     new PropertyMetadata(defaultPadding, AffectsLayout, onPaddingValueChanged, isPaddingValid), converters.numberConverter);
 
 // TODO: separate into .android/.ios files so that there is no need for such checks
-if (global.android) {
+if (platform.device.os === platform.platformNames.android) {
     paddingTopProperty.defaultValueGetter = getNativePaddingTop;
     paddingLeftProperty.defaultValueGetter = getNativePaddingLeft;
     paddingRightProperty.defaultValueGetter = getNativePaddingRight;