Merge pull request #33 from abap2UI5-renamed/create-pull-request/patch

Automatic Update

Author: oblomov-dev

src/01/03/z2ui6_cl_app_manifest_json.clas.abap

@@ -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",` &&
@@ -146,7 +145,6 @@ CLASS z2ui6_cl_app_manifest_json IMPLEMENTATION.
              `    "rootView": {` &&
              `      "viewName": "z2ui5.view.App",` &&
              `      "type": "XML",` &&
-             `      "async": true,` &&
              `      "id": "App"` &&
              `    }` &&
              `  },` &&
@@ -155,6 +153,7 @@ CLASS z2ui6_cl_app_manifest_json IMPLEMENTATION.
              `    "service": "z2ui5"` &&
              `  }` &&
              `}` &&
+             `` &&
               ``.
 
   ENDMETHOD.

src/01/03/z2ui6_cl_app_view1_js.clas.abap

@@ -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|  &&
@@ -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|  &&
@@ -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|  &&
@@ -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|  &&