javascript/NativeScript
1
0
Fork 0
mirror of https://github.com/NativeScript/NativeScript.git synced 2025-08-16 11:42:04 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #949 from NativeScript/global.android

Browse Source 
global.android replaced with platform.device.os === platform.platformNames.android
This commit is contained in:
Vladimir Enchev
2015-10-16 11:08:38 +03:00
parent 0ccffd1d25 619c2fe665
commit 729bed9fd8
9 changed files with 21 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
apps/tests/application-tests-common.ts
View File

@ -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");
}
}

4
apps/tests/testRunner.ts
View File

@ -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;
}
}