diff --git a/tns-core-modules/application/application-common.ts b/tns-core-modules/application/application-common.ts index 93c4c78eb..a87f9f9ba 100644 --- a/tns-core-modules/application/application-common.ts +++ b/tns-core-modules/application/application-common.ts @@ -5,6 +5,7 @@ import frame = require("ui/frame"); import cssSelector = require("ui/styling/css-selector"); import * as fileSystemModule from "file-system"; import * as styleScopeModule from "ui/styling/style-scope"; +import * as fileResolverModule from "file-system/file-name-resolver"; var styleScope: typeof styleScopeModule = undefined; @@ -85,3 +86,29 @@ export function parseCss(cssText: string, cssFileName?: string): Array`); + global.errorPage.showModal(); + } +} \ No newline at end of file diff --git a/tns-core-modules/application/application.android.ts b/tns-core-modules/application/application.android.ts index 5dac7f718..96ec3800b 100644 --- a/tns-core-modules/application/application.android.ts +++ b/tns-core-modules/application/application.android.ts @@ -3,7 +3,6 @@ import definition = require("application"); import frame = require("ui/frame"); import observable = require("data/observable"); import * as typesModule from "utils/types"; -import * as fileResolverModule from "file-system/file-name-resolver"; global.moduleMerge(appModule, exports); var typedExports: typeof definition = exports; @@ -341,17 +340,8 @@ global.__onLiveSync = function () { if (typedExports.android && typedExports.android.paused) { return; } - - var fileResolver: typeof fileResolverModule = require("file-system/file-name-resolver"); - - // Clear file resolver cache to respect newly added files. - fileResolver.clearCache(); - - // Reload app.css in case it was changed. - loadCss(); - - // Reload current page. - frame.reloadPage(); + + appModule.__onLiveSync(); } global.__onUncaughtError = function (error: definition.NativeScriptError) { diff --git a/tns-core-modules/application/application.ios.ts b/tns-core-modules/application/application.ios.ts index 9bf8bf72f..c3e6b79e9 100644 --- a/tns-core-modules/application/application.ios.ts +++ b/tns-core-modules/application/application.ios.ts @@ -1,9 +1,8 @@ import common = require("./application-common"); -import {Frame, NavigationEntry, reloadPage} from "ui/frame"; +import {Frame, NavigationEntry} from "ui/frame"; import definition = require("application"); import * as uiUtils from "ui/utils"; import * as typesModule from "utils/types"; -import * as fileResolverModule from "file-system/file-name-resolver"; import * as enumsModule from "ui/enums"; global.moduleMerge(common, exports); @@ -277,14 +276,5 @@ global.__onLiveSync = function () { return; } - var fileResolver: typeof fileResolverModule = require("file-system/file-name-resolver"); - - // Clear file resolver cache to respect newly added files. - fileResolver.clearCache(); - - // Reload app.css in case it was changed. - loadCss(); - - // Reload current page. - reloadPage(); + common.__onLiveSync(); }