deploy: abap2UI5/abap2UI5@28194d0

abap2UI5 · Jan 17, 2025 · a698fe2 · a698fe2
1 parent 25eb80b
commit a698fe2
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 5 deletions.
diff --git a/app/webapp/controller/View1.controller.js b/app/webapp/controller/View1.controller.js
@@ -321,7 +321,12 @@ sap.ui.define(["sap/ui/core/mvc/Controller", "sap/ui/core/mvc/XMLView", "sap/ui/
                             "sap/ushell/Container"
                         ], async (ushellContainer) => {
                             // z2ui5.oCrossAppNavigator = await ushellContainer.getServiceAsync("CrossApplicationNavigation");
-                            z2ui5.oCrossAppNavigator = ushellContainer.getService("CrossApplicationNavigation");
+                            if (ushellContainer){
+                                z2ui5.oCrossAppNavigator = ushellContainer.getService("CrossApplicationNavigation");
+                            } else {
+                                // fallback needed for UI5 version < 1.120
+                                z2ui5.oCrossAppNavigator = sap.ushell.Container.getService("CrossApplicationNavigation");
+                            }
                             z2ui5.oCrossAppNavigator.backToPreviousApp();
                         });
                         break;
@@ -331,7 +336,12 @@ sap.ui.define(["sap/ui/core/mvc/Controller", "sap/ui/core/mvc/XMLView", "sap/ui/
                             "sap/ushell/Container"
                         ], async (ushellContainer) => {
                             // z2ui5.oCrossAppNavigator = await ushellContainer.getServiceAsync("CrossApplicationNavigation");
-                            z2ui5.oCrossAppNavigator = ushellContainer.getService("CrossApplicationNavigation");
+                            if (ushellContainer){
+                                z2ui5.oCrossAppNavigator = ushellContainer.getService("CrossApplicationNavigation");
+                            } else {
+                                // fallback needed for UI5 version < 1.120
+                                z2ui5.oCrossAppNavigator = sap.ushell.Container.getService("CrossApplicationNavigation");
+                            }
                             const hash = (z2ui5.oCrossAppNavigator.hrefForExternal({
                                 target: z2ui5.args[1],
                                 params: z2ui5.args[2]

diff --git a/app/webapp/manifest.json b/app/webapp/manifest.json
@@ -84,7 +84,6 @@
       "config": {
         "routerClass": "sap.m.routing.Router",
         "viewType": "XML",
-        "async": true,
         "viewPath": "z2ui5.view",
         "controlAggregation": "pages",
         "controlId": "app",
@@ -126,12 +125,11 @@
     "rootView": {
       "viewName": "z2ui5.view.App",
       "type": "XML",
-      "async": true,
       "id": "App"
     }
   },
   "sap.cloud": {
     "public": true,
     "service": "z2ui5"
   }
-}
+}