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

Observable needs __extends function which comes from globals in the case of Snapshot.

Browse Source
This commit is contained in:
Hristo Hristov
2017-03-06 18:18:31 +02:00
parent 6b94cac39f
commit a6fa0781f7
2 changed files with 10 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
tns-core-modules/application/application-common.ts
View File

@ -1,16 +1,11 @@
import { Observable, EventData } from "data/observable";
// Require globals first so that snapshot takes __extends function.
require("globals");
import { Observable, EventData } from "data/observable";
const events = new Observable();
function __export(m) {
for (var p in m) { if (!exports.hasOwnProperty(p)) { exports[p] = m[p]; } }
}
__export(events);
export { Observable };
// NOTE: This requires modules that requires application.on so the above should be done before globals is required.
import "globals";
// First merge all functions from events into application-common so that later appModule.on will be defined.
global.moduleMerge(events, exports);
import { NativeScriptError, UnhandledErrorEventData, iOSApplication, AndroidApplication, CssChangedEventData } from "application";
import { NavigationEntry } from "ui/frame";

8
tns-core-modules/platform/platform.android.ts
View File

@ -102,11 +102,6 @@ class Device implements DeviceDefinition {
class MainScreen implements ScreenMetricsDefinition {
private _metrics: android.util.DisplayMetrics;
constructor() {
// NOTE: This will be memory leak but we MainScreen is singleton
appModule.on("cssChanged", this.cssChanged, this);
}
private cssChanged(args: appModule.CssChangedEventData): void {
if (!this._metrics) {
this._metrics = new android.util.DisplayMetrics();
@ -121,6 +116,9 @@ class MainScreen implements ScreenMetricsDefinition {
private get metrics(): android.util.DisplayMetrics {
if (!this._metrics) {
// NOTE: This will be memory leak but we MainScreen is singleton
appModule.on("cssChanged", this.cssChanged, this);
this._metrics = new android.util.DisplayMetrics();
this.initMetrics();
}