javascript/NativeScript
1
0
Fork 0
mirror of https://github.com/NativeScript/NativeScript.git synced 2025-08-26 03:01:51 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #396 from NativeScript/android-events

Browse Source 
Moved Activity related Android-specific events to application.android…
This commit is contained in:
Rossen Hristov
2015-07-07 09:33:55 +03:00
parent d54cc19351 849d6bee26
commit 4acc7a46f2
5 changed files with 93 additions and 178 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
ui/frame/frame.android.ts
View File

@ -427,8 +427,8 @@ var NativeActivity = {
result(requestCode, resultCode, data);
}
application.notify(<application.AndroidActivityResultEventData>{
eventName: application.androidActivityResultEvent,
application.android.notify(<application.AndroidActivityResultEventData>{
eventName: "activityResult",
object: application.android,
activity: this,
requestCode: requestCode,
@ -496,12 +496,12 @@ var NativeActivity = {
trace.write("NativeScriptActivity.onBackPressed;", trace.categories.NativeLifecycle);
var args = <application.AndroidActivityBackPressedEventData>{
eventName: application.androidActivityBackPressedEvent,
eventName: "activityBackPressed",
object: application.android,
activity: this,
cancel: false,
};
application.notify(args);
application.android.notify(args);
if (args.cancel) {
return;