Skip to content

Commit 729bed9

Browse files
author
Vladimir Enchev
committed
Merge pull request #949 from NativeScript/global.android
global.android replaced with platform.device.os === platform.platformNames.android
2 parents 0ccffd1 + 619c2fe commit 729bed9

File tree

9 files changed

+21
-14
lines changed

9 files changed

+21
-14
lines changed

‎apps/tests/application-tests-common.ts‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
// The default bootstrap.js implementation for each platform loads and initializes this module.
66
// ``` JavaScript
77
import app = require("application");
8+
import platform = require("platform");
89
// ```
910
// The pre-required `app` module is used throughout the following code snippets.
1011
// </snippet>
@@ -24,10 +25,10 @@ if (app.android) {
2425
import TKUnit = require("./TKUnit");
2526

2627
export var testInitialized = function () {
27-
if (global.android) {
28+
if (platform.device.os === platform.platformNames.android) {
2829
// we have the android defined
2930
TKUnit.assert(app.android, "Application module not properly intialized");
30-
} else if (NSObject) {
31+
} else if (platform.device.os === platform.platformNames.ios) {
3132
TKUnit.assert(app.ios, "Application module not properly intialized");
3233
}
3334
}

‎apps/tests/testRunner.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -129,10 +129,10 @@ function printRunTestStats() {
129129
}
130130

131131
function time(): number {
132-
if (global.android) {
132+
if (platform.device.os === platform.platformNames.android) {
133133
return java.lang.System.nanoTime() / 1000000; // 1 ms = 1000000 ns
134134
}
135-
else {
135+
else if (platform.device.os === platform.platformNames.ios) {
136136
return CACurrentMediaTime() * 1000;
137137
}
138138
}

‎ui/core/proxy.ts‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ import bindable = require("ui/core/bindable");
33
import dependencyObservable = require("ui/core/dependency-observable");
44
import types = require("utils/types");
55
import definition = require("ui/core/proxy");
6+
import platform = require("platform");
67

78
export class PropertyMetadata extends dependencyObservable.PropertyMetadata implements definition.PropertyMetadata {
89
private _onSetNativeValue: dependencyObservable.PropertyChangedCallback;
@@ -76,7 +77,7 @@ export class ProxyObject extends bindable.Bindable implements definition.ProxyOb
7677
return;
7778
}
7879

79-
if (global.android && !this.android) {
80+
if (platform.device.os === platform.platformNames.android && !this.android) {
8081
// in android we have lazy loading and we do not have a native widget created yet, do not call the onSetNativeValue callback
8182
// properties will be synced when the widget is created
8283
return;

‎ui/image/image-common.ts‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ import imageSource = require("image-source");
55
import definition = require("ui/image");
66
import enums = require("ui/enums");
77
import types = require("utils/types");
8+
import platform = require("platform");
89

910
var SRC = "src";
1011
var IMAGE_SOURCE = "imageSource";
@@ -14,7 +15,7 @@ var ISLOADING = "isLoading";
1415
var STRETCH = "stretch";
1516

1617
// on Android we explicitly set propertySettings to None because android will invalidate its layout (skip unnecessary native call).
17-
var AffectsLayout = global.android ? dependencyObservable.PropertyMetadataSettings.None : dependencyObservable.PropertyMetadataSettings.AffectsLayout;
18+
var AffectsLayout = platform.device.os === platform.platformNames.android ? dependencyObservable.PropertyMetadataSettings.None : dependencyObservable.PropertyMetadataSettings.AffectsLayout;
1819

1920
function onSrcPropertyChanged(data: dependencyObservable.PropertyChangeData) {
2021
var image = <Image>data.object;

‎ui/layouts/dock-layout/dock-layout-common.ts‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,10 @@ import view = require("ui/core/view");
55
import enums = require("ui/enums");
66
import proxy = require("ui/core/proxy");
77
import {registerSpecialProperty} from "ui/builder/special-properties";
8+
import platform = require("platform");
89

910
// on Android we explicitly set propertySettings to None because android will invalidate its layout (skip unnecessary native call).
10-
var AffectsLayout = global.android ? dependencyObservable.PropertyMetadataSettings.None : dependencyObservable.PropertyMetadataSettings.AffectsLayout;
11+
var AffectsLayout = platform.device.os === platform.platformNames.android ? dependencyObservable.PropertyMetadataSettings.None : dependencyObservable.PropertyMetadataSettings.AffectsLayout;
1112

1213
function isDockValid(value: any): boolean {
1314
return value === enums.Dock.left || value === enums.Dock.top || value === enums.Dock.right || value === enums.Dock.bottom;

‎ui/layouts/stack-layout/stack-layout-common.ts‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,10 @@ import definition = require("ui/layouts/stack-layout");
33
import dependencyObservable = require("ui/core/dependency-observable");
44
import enums = require("ui/enums");
55
import proxy = require("ui/core/proxy");
6+
import platform = require("platform");
67

78
// on Android we explicitly set propertySettings to None because android will invalidate its layout (skip unnecessary native call).
8-
var AffectsLayout = global.android ? dependencyObservable.PropertyMetadataSettings.None : dependencyObservable.PropertyMetadataSettings.AffectsLayout;
9+
var AffectsLayout = platform.device.os === platform.platformNames.android ? dependencyObservable.PropertyMetadataSettings.None : dependencyObservable.PropertyMetadataSettings.AffectsLayout;
910

1011
function validateOrientation(value: any): boolean {
1112
return value === enums.Orientation.vertical || value === enums.Orientation.horizontal;

‎ui/layouts/wrap-layout/wrap-layout-common.ts‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,10 @@ import definition = require("ui/layouts/wrap-layout");
33
import dependencyObservable = require("ui/core/dependency-observable");
44
import enums = require("ui/enums");
55
import proxy = require("ui/core/proxy");
6+
import platform = require("platform");
67

78
// on Android we explicitly set propertySettings to None because android will invalidate its layout (so we skip unnecessary native call).
8-
var AffectsLayout = global.android ? dependencyObservable.PropertyMetadataSettings.None : dependencyObservable.PropertyMetadataSettings.AffectsLayout;
9+
var AffectsLayout = platform.device.os === platform.platformNames.android ? dependencyObservable.PropertyMetadataSettings.None : dependencyObservable.PropertyMetadataSettings.AffectsLayout;
910

1011
function isWidthHeightValid(value: any): boolean {
1112
return (value >= 0.0 && value !== Number.POSITIVE_INFINITY);

‎ui/page/page-common.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,11 @@ import fs = require("file-system");
88
import frameCommon = require("../frame/frame-common");
99
import {ActionBar} from "ui/action-bar";
1010
import {DependencyObservable, PropertyMetadata, PropertyMetadataSettings, PropertyChangeData, Property, ValueSource} from "ui/core/dependency-observable";
11-
11+
import platform = require("platform");
1212
import proxy = require("ui/core/proxy");
1313

1414
// on Android we explicitly set propertySettings to None because android will invalidate its layout (skip unnecessary native call).
15-
var AffectsLayout = global.android ? PropertyMetadataSettings.None : PropertyMetadataSettings.AffectsLayout;
15+
var AffectsLayout = platform.device.os === platform.platformNames.android ? PropertyMetadataSettings.None : PropertyMetadataSettings.AffectsLayout;
1616

1717
var backgroundSpanUnderStatusBarProperty = new Property("backgroundSpanUnderStatusBar", "Page", new proxy.PropertyMetadata(false, AffectsLayout));
1818

‎ui/styling/style.ts‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ import imageSource = require("image-source");
1212
import utils = require("utils/utils");
1313
import font = require("ui/styling/font");
1414
import background = require("ui/styling/background");
15+
import platform = require("platform");
1516

1617
// key is the property id and value is Dictionary<string, StylePropertyChangedHandler>;
1718
var _registeredHandlers = Array<Object>();
@@ -23,7 +24,7 @@ var _handlersCache = {};
2324
var noStylingClasses = {};
2425

2526
// on Android we explicitly set propertySettings to None because android will invalidate its layout (skip unnecessary native call).
26-
var AffectsLayout = global.android ? PropertyMetadataSettings.None : PropertyMetadataSettings.AffectsLayout;
27+
var AffectsLayout = platform.device.os === platform.platformNames.android ? PropertyMetadataSettings.None : PropertyMetadataSettings.AffectsLayout;
2728

2829
export interface Thickness {
2930
left: number;
@@ -850,7 +851,7 @@ export var nativePaddingsProperty = new styleProperty.Property("paddingNative",
850851
new PropertyMetadata(undefined, null, null, null, thicknessComparer));
851852

852853
// TODO: separate into .android/.ios files so that there is no need for such checks
853-
var defaultPadding = global.android ? undefined : 0;
854+
var defaultPadding = platform.device.os === platform.platformNames.android ? undefined : 0;
854855

855856
export var paddingLeftProperty = new styleProperty.Property("paddingLeft", "padding-left",
856857
new PropertyMetadata(defaultPadding, AffectsLayout, onPaddingValueChanged, isPaddingValid), converters.numberConverter);
@@ -865,7 +866,7 @@ export var paddingBottomProperty = new styleProperty.Property("paddingBottom", "
865866
new PropertyMetadata(defaultPadding, AffectsLayout, onPaddingValueChanged, isPaddingValid), converters.numberConverter);
866867

867868
// TODO: separate into .android/.ios files so that there is no need for such checks
868-
if (global.android) {
869+
if (platform.device.os === platform.platformNames.android) {
869870
paddingTopProperty.defaultValueGetter = getNativePaddingTop;
870871
paddingLeftProperty.defaultValueGetter = getNativePaddingLeft;
871872
paddingRightProperty.defaultValueGetter = getNativePaddingRight;

0 commit comments

Comments
 (0)