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 #897 from NativeScript/atanasovg/ios-uncaughtError

Browse Source 
Integrate recent iOS Runtime global.__onUncaughtError feature
This commit is contained in:
Vladimir Enchev
2015-10-12 11:52:10 +03:00
parent 0bdf8d913e 33310f4455
commit 302e9d36e8
2 changed files with 14 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
application/application.android.ts
View File

@ -301,19 +301,12 @@ class BroadcastReceiver extends android.content.BroadcastReceiver {
} }
global.__onUncaughtError = function (error: Error) { global.__onUncaughtError = function (error: Error) {
if (!types.isFunction(exports.onUncaughtError)) { // TODO: Obsolete this
return; if (types.isFunction(exports.onUncaughtError)) {
exports.onUncaughtError(error);
} }
var nsError = { exports.notify({ eventName: dts.uncaughtErrorEvent, object: appModule.android, android: error });
message: error.message,
name: error.name,
nativeError: (<any>error).nativeException
}
exports.onUncaughtError(nsError);
exports.notify({ eventName: dts.uncaughtErrorEvent, object: appModule.android, android: nsError });
} }
exports.start = function () { exports.start = function () {

29
application/application.ios.ts
View File

@ -208,25 +208,16 @@ class IOSApplication implements definition.iOSApplication {
var iosApp = new IOSApplication(); var iosApp = new IOSApplication();
exports.ios = iosApp; exports.ios = iosApp;
exports.start = function () { global.__onUncaughtError = function (error: Error) {
// TODO: This should be obsoleted
appModule.loadCss(); if (types.isFunction(exports.onUncaughtError)) {
try {
// The "UIApplicationMain" enters a modal loop and the call will not return while the application is running.
// This try-catch block here will catch JavaScript errors but no Objective C ones.
// TODO: We need to implement better error handling for our native calls and to use the "error" parameter of the iOS APIs.
UIApplicationMain(0, null, null, exports.ios && exports.ios.delegate ? NSStringFromClass(exports.ios.delegate) : NSStringFromClass(Responder));
}
catch (error) {
// At this point the main application loop is exited and no UI May be created.
if (!types.isFunction(exports.onUncaughtError)) {
return;
}
exports.onUncaughtError(error); exports.onUncaughtError(error);
definition.notify({ eventName: definition.uncaughtErrorEvent, object: <any>definition.ios, ios: error });
} }
definition.notify({ eventName: definition.uncaughtErrorEvent, object: <any>definition.ios, ios: error });
}
exports.start = function () {
appModule.loadCss();
UIApplicationMain(0, null, null, exports.ios && exports.ios.delegate ? NSStringFromClass(exports.ios.delegate) : NSStringFromClass(Responder));
} }