Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Automatic Update #33

Merged
merged 1 commit into from
Jan 19, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions src/01/03/z2ui6_cl_app_manifest_json.clas.abap
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,6 @@ CLASS z2ui6_cl_app_manifest_json IMPLEMENTATION.
` "config": {` &&
` "routerClass": "sap.m.routing.Router",` &&
` "viewType": "XML",` &&
` "async": true,` &&
` "viewPath": "z2ui5.view",` &&
` "controlAggregation": "pages",` &&
` "controlId": "app",` &&
Expand Down Expand Up @@ -146,7 +145,6 @@ CLASS z2ui6_cl_app_manifest_json IMPLEMENTATION.
` "rootView": {` &&
` "viewName": "z2ui5.view.App",` &&
` "type": "XML",` &&
` "async": true,` &&
` "id": "App"` &&
` }` &&
` },` &&
Expand All @@ -155,6 +153,7 @@ CLASS z2ui6_cl_app_manifest_json IMPLEMENTATION.
` "service": "z2ui5"` &&
` }` &&
`}` &&
`` &&
``.

ENDMETHOD.
Expand Down
18 changes: 14 additions & 4 deletions src/01/03/z2ui6_cl_app_view1_js.clas.abap
Original file line number Diff line number Diff line change
Expand Up @@ -341,7 +341,12 @@ CLASS z2ui6_cl_app_view1_js IMPLEMENTATION.
` "sap/ushell/Container"` && |\n| &&
` ], async (ushellContainer) => {` && |\n| &&
` // z2ui5.oCrossAppNavigator = await ushellContainer.getServiceAsync("CrossApplicationNavigation");` && |\n| &&
` z2ui5.oCrossAppNavigator = ushellContainer.getService("CrossApplicationNavigation");` && |\n| &&
` if (ushellContainer){` && |\n| &&
` z2ui5.oCrossAppNavigator = ushellContainer.getService("CrossApplicationNavigation");` && |\n| &&
` } else {` && |\n| &&
` // fallback needed for UI5 version < 1.120` && |\n| &&
` z2ui5.oCrossAppNavigator = sap.ushell.Container.getService("CrossApplicationNavigation");` && |\n| &&
` }` && |\n| &&
` z2ui5.oCrossAppNavigator.backToPreviousApp();` && |\n| &&
` });` && |\n| &&
` break;` && |\n| &&
Expand All @@ -351,7 +356,12 @@ CLASS z2ui6_cl_app_view1_js IMPLEMENTATION.
` "sap/ushell/Container"` && |\n| &&
` ], async (ushellContainer) => {` && |\n| &&
` // z2ui5.oCrossAppNavigator = await ushellContainer.getServiceAsync("CrossApplicationNavigation");` && |\n| &&
` z2ui5.oCrossAppNavigator = ushellContainer.getService("CrossApplicationNavigation");` && |\n| &&
` if (ushellContainer){` && |\n| &&
` z2ui5.oCrossAppNavigator = ushellContainer.getService("CrossApplicationNavigation");` && |\n| &&
` } else {` && |\n| &&
` // fallback needed for UI5 version < 1.120` && |\n| &&
` z2ui5.oCrossAppNavigator = sap.ushell.Container.getService("CrossApplicationNavigation");` && |\n| &&
` }` && |\n| &&
` const hash = (z2ui5.oCrossAppNavigator.hrefForExternal({` && |\n| &&
` target: z2ui5.args[1],` && |\n| &&
` params: z2ui5.args[2]` && |\n| &&
Expand Down Expand Up @@ -408,6 +418,8 @@ CLASS z2ui6_cl_app_view1_js IMPLEMENTATION.
` break;` && |\n| &&
` case 'URLHELPER':` && |\n| &&
` var URLHelper = mobileLibrary.URLHelper;` && |\n| &&
|\n|.
result = result &&
` var params = args[2];` && |\n| &&
` switch (args[1]) {` && |\n| &&
` case 'REDIRECT':` && |\n| &&
Expand All @@ -418,8 +430,6 @@ CLASS z2ui6_cl_app_view1_js IMPLEMENTATION.
` break;` && |\n| &&
` case 'TRIGGER_SMS':` && |\n| &&
` URLHelper.triggerSms(params);` && |\n| &&
|\n|.
result = result &&
` break;` && |\n| &&
` case 'TRIGGER_TEL':` && |\n| &&
` URLHelper.triggerTel(params);` && |\n| &&
Expand Down