Skip to content

Commit a698fe2

Browse files
1 parent 25eb80b commit a698fe2

File tree

2 files changed

+13
-5
lines changed

2 files changed

+13
-5
lines changed

app/webapp/controller/View1.controller.js

+12-2
Original file line numberDiff line numberDiff line change
@@ -321,7 +321,12 @@ sap.ui.define(["sap/ui/core/mvc/Controller", "sap/ui/core/mvc/XMLView", "sap/ui/
321321
"sap/ushell/Container"
322322
], async (ushellContainer) => {
323323
// z2ui5.oCrossAppNavigator = await ushellContainer.getServiceAsync("CrossApplicationNavigation");
324-
z2ui5.oCrossAppNavigator = ushellContainer.getService("CrossApplicationNavigation");
324+
if (ushellContainer){
325+
z2ui5.oCrossAppNavigator = ushellContainer.getService("CrossApplicationNavigation");
326+
} else {
327+
// fallback needed for UI5 version < 1.120
328+
z2ui5.oCrossAppNavigator = sap.ushell.Container.getService("CrossApplicationNavigation");
329+
}
325330
z2ui5.oCrossAppNavigator.backToPreviousApp();
326331
});
327332
break;
@@ -331,7 +336,12 @@ sap.ui.define(["sap/ui/core/mvc/Controller", "sap/ui/core/mvc/XMLView", "sap/ui/
331336
"sap/ushell/Container"
332337
], async (ushellContainer) => {
333338
// z2ui5.oCrossAppNavigator = await ushellContainer.getServiceAsync("CrossApplicationNavigation");
334-
z2ui5.oCrossAppNavigator = ushellContainer.getService("CrossApplicationNavigation");
339+
if (ushellContainer){
340+
z2ui5.oCrossAppNavigator = ushellContainer.getService("CrossApplicationNavigation");
341+
} else {
342+
// fallback needed for UI5 version < 1.120
343+
z2ui5.oCrossAppNavigator = sap.ushell.Container.getService("CrossApplicationNavigation");
344+
}
335345
const hash = (z2ui5.oCrossAppNavigator.hrefForExternal({
336346
target: z2ui5.args[1],
337347
params: z2ui5.args[2]

app/webapp/manifest.json

+1-3
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,6 @@
8484
"config": {
8585
"routerClass": "sap.m.routing.Router",
8686
"viewType": "XML",
87-
"async": true,
8887
"viewPath": "z2ui5.view",
8988
"controlAggregation": "pages",
9089
"controlId": "app",
@@ -126,12 +125,11 @@
126125
"rootView": {
127126
"viewName": "z2ui5.view.App",
128127
"type": "XML",
129-
"async": true,
130128
"id": "App"
131129
}
132130
},
133131
"sap.cloud": {
134132
"public": true,
135133
"service": "z2ui5"
136134
}
137-
}
135+
}

0 commit comments

Comments
 (0)