@openui5/sap.ui.documentation 1.131.1 → 1.132.0

package/src/sap/ui/documentation/sdk/controller/App.controller.js

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2024 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2025 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 
@@ -32,8 +32,7 @@ sap.ui.define([
 	"sap/m/Toolbar",
 	"sap/ui/documentation/sdk/util/Resources",
 	'sap/base/util/LoaderExtensions',
-	"sap/ui/documentation/sdk/controller/util/ThemePicker",
-	"sap/ui/thirdparty/URI"
+	"sap/ui/documentation/sdk/controller/util/ThemePicker"
 ], function(
 	Localization,
 	Element,
@@ -62,8 +61,7 @@ sap.ui.define([
 	Toolbar,
 	ResourcesUtil,
 	LoaderExtensions,
-	ThemePicker,
-	URI
+	ThemePicker
 ) {
 	"use strict";
 
@@ -132,7 +130,6 @@ sap.ui.define([
 
 			var oViewModel = new JSONModel({
 				bCNICPShow: window.location.href.includes("sapui5.platform.sapcloud.cn"),
-				bShowTAConsent: false,
 				busy: false,
 				delay: 0,
 				device: Device,
@@ -156,8 +153,7 @@ sap.ui.define([
 					"<a href='https://sdk.openui5.org/1.71.46/'>https://sdk.openui5.org/1.71.46/</a>"
 			});
 
-			var oComponent = this.getOwnerComponent(),
-				oController = this;
+			var oController = this;
 
 			ThemePicker.init(oController);
 
@@ -188,16 +184,20 @@ sap.ui.define([
 
 			}.bind(this));
 
-			//setup cookie query parsing
-			var oUri = new URI(window.location.href);
-			if (oUri.hasQuery("sap-ui-xx-tracking") && oUri.query(true)["sap-ui-xx-tracking"] === "aa") {
-				oViewModel.setProperty("/bShowTAConsent", true);
-			}
+			this._oCookiesConsentManager = this.getOwnerComponent().getCookiesConsentManager();
+			this._oCookiesConsentManager.checkUserAcceptsUsageTracking(function(bAccepts) {
+				if (bAccepts) {
+					// start tracking, including the route visited at app-startup (before the check of the persisted consent-decision completed)
+					this.getOwnerComponent().getUsageTracker().start(this._aRouterCachedEventDetails);
+					this._aRouterCachedEventDetails = []; // clear the already logged route visits
+				}
+			}.bind(this));
 
 			// Config routes
 			this.oRouter = this.getRouter();
 			this.oRouter.attachRouteMatched(this.onRouteChange.bind(this));
 			this.oRouter.attachBypassed(this.onRouteNotFound.bind(this));
+			this.oRouter.attachEvent("_navToWithoutHash", this.onNavToWithoutHash.bind(this));
 
 			// Store product version information
 			this._aNeoAppVersions = [];
@@ -253,19 +253,13 @@ sap.ui.define([
 
 			this._createConfigurationBasedOnURIInput();
 
-			if (this._oConfigUtil.getCookieValue(this._oCookieNames.ALLOW_REQUIRED_COOKIES) === "1" && this._aConfiguration.length > 0) {
-				this._applyCookiesConfiguration(this._aConfiguration);
-			} else {
-				this._applyDefaultConfiguration(this._aConfiguration);
-			}
-
-			var bExternalCookiesManager = oViewModel.getProperty("/bShowTAConsent");
-
-			if (!bExternalCookiesManager) {
-				oComponent.getCookiesManagement().then(function(oCookieMgmtComponent) {
-					oCookieMgmtComponent.enable(oComponent.getRootControl());
-				});
-			}
+			this._oCookiesConsentManager.checkUserAcceptsRequiredCookies(function(bAccepts) {
+				if (bAccepts && this._aConfiguration.length > 0) {
+					this._applyCookiesConfiguration(this._aConfiguration);
+				} else {
+					this._applyDefaultConfiguration(this._aConfiguration);
+				}
+			}.bind(this));
 
 			// Handle page resize
 			ResizeHandler.register(this._demoKitPage, this.onPageResize.bind(this));
@@ -295,9 +289,12 @@ sap.ui.define([
 			if (this.highlighter) {
 				this.highlighter.destroy();
 			}
+
+			this._oCookiesConsentManager = null;
 		},
 
 		onRouteChange: function (oEvent) {
+			this._cacheRouteEventDetails(oEvent);
 			if (!this.oRouter.getRoute(oEvent.getParameter("name"))._oConfig.target) {
 				return;
 			}
@@ -329,6 +326,10 @@ sap.ui.define([
 			this.appendPageTitle(null).appendPageTitle(WEB_PAGE_TITLE[sKey]);
 		},
 
+		onNavToWithoutHash: function(oEvent) {
+			this._cacheRouteEventDetails(oEvent);
+		},
+
 		toggleMaster: function (oEvent) {
 			var oViewModel = this.getModel("appView"),
 				sMasterViewId = oViewModel.getProperty("/sMasterViewId"),
@@ -450,9 +451,7 @@ sap.ui.define([
 			} else if (sTargetText === CHANGE_SETTINGS_TEXT) {
 				this.settingsDialogOpen();
 			} else if (sTargetText === CHANGE_COOKIE_PREFERENCES_TEXT) {
-				this.getOwnerComponent().getCookiesManagement().then(function (oCookieMgmtComponent) {
-					oCookieMgmtComponent.cookieSettingsDialogOpen({ showCookieDetails: true }, this.getView());
-				}.bind(this));
+				this.onEditCookiePreferencesRequest();
 			} else if (sTargetText === CHANGE_VERSION_TEXT) {
 				this.onChangeVersionButtonPress();
 			} else if (ThemePicker._getTheme()[sTargetText]) {
@@ -860,9 +859,11 @@ sap.ui.define([
 		_setSelectedLanguage: function (sLanguage) {
 			this._oSupportedLangModel.setProperty("/selectedLang", sLanguage);
 			Localization.setLanguage(sLanguage);
-			if (this._oConfigUtil.getCookieValue(this._oCookieNames.ALLOW_REQUIRED_COOKIES) === "1") {
-				this._oConfigUtil.setCookie(DEMOKIT_CONFIGURATION_LANGUAGE, sLanguage);
-			}
+			this._oCookiesConsentManager.checkUserAcceptsRequiredCookies(function(bAccepts) {
+				if (bAccepts) {
+					this._oConfigUtil.setCookie(DEMOKIT_CONFIGURATION_LANGUAGE, sLanguage);
+				}
+			}.bind(this));
 
 			if (this._sKey) {
 				this._setSelectedSectionTitle(this._sKey);

package/src/sap/ui/documentation/sdk/controller/BPSupport.controller.js

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2024 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2025 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 

package/src/sap/ui/documentation/sdk/controller/BaseController.js

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2024 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2025 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 
@@ -61,6 +61,7 @@ sap.ui.define([
 				if (Device.system.phone || Device.system.tablet) {
 					this.getOwnerComponent().loadVersionInfo(); // for Desktop is always loaded in <code>Component.js</code>
 				}
+				this._aRouterCachedEventDetails = [];
 
 			},
 
@@ -114,7 +115,7 @@ sap.ui.define([
 			 * @returns {object} the configuration of the component
 			 */
 			getConfig : function () {
-				return this.getOwnerComponent().getManifestEntry("/sap.ui5/config") || {};
+				return this.getOwnerComponent().getConfig() || {};
 			},
 
 			/**
@@ -242,8 +243,12 @@ sap.ui.define([
 			 * @param {object} oEvent the Event object from which we are going to get the correct item key.
 			 */
 			handleFooterMasterItemPress: function(oEvent) {
-				var sTargetText = oEvent.getParameter("item").getKey(),
-				sTarget = BaseController.LEGAL_LINKS[sTargetText];
+				var sTargetText = oEvent.getParameter("item").getKey();
+				if (sTargetText === FOOTER_MENU_OPTIONS.COOKIE_PREFERENCES) {
+					this.onEditCookiePreferencesRequest();
+					return;
+				}
+				var sTarget = BaseController.LEGAL_LINKS[sTargetText];
 				URLHelper.redirect(sTarget, true);
 			},
 			/**
@@ -266,23 +271,61 @@ sap.ui.define([
 				});
 			},
 
-			onRouteNotFound: function () {
+			onRouteNotFound: function (oEvent) {
 				var sNotFoundTitle = this.getModel("i18n").getProperty("NOT_FOUND_TITLE");
 
+				if (this._isRouteBypassedEvent(oEvent)) {
+					this._cacheRouteEventDetails(oEvent);
+				}
+
 				this.getRouter().myNavToWithoutHash("sap.ui.documentation.sdk.view.NotFound", "XML", false);
 				setTimeout(this.appendPageTitle.bind(this, sNotFoundTitle));
 				return;
+			},
+
+			onEditCookiePreferencesRequest: function () {
+				var oConsentManager = this.getOwnerComponent().getCookiesConsentManager();
+				oConsentManager.showPreferencesDialog(this.getView());
+				if (!oConsentManager.supportsWaitForPreferencesSubmission()) {
+					return;
+				}
+				oConsentManager.waitForPreferencesSubmission().then(function () {
+					oConsentManager.checkUserAcceptsUsageTracking(function(bAcceptsUsageTracking) {
+						if (bAcceptsUsageTracking) {
+							this.getOwnerComponent().getUsageTracker().start();
+						} else {
+							this.getOwnerComponent().getUsageTracker().stop();
+						}
+					}.bind(this));
+				}.bind(this));
+			},
+
+			_isRouteBypassedEvent: function (oEvent) {
+				return typeof oEvent?.getId === "function" && oEvent.getId() === "bypassed";
+			},
+
+			_cacheRouteEventDetails: function(oEvent) {
+				var oEventDetails = Object.assign({eventId: oEvent.getId()}, oEvent.getParameters());
+				this._aRouterCachedEventDetails.push(oEventDetails);
 			}
 		});
 
 		/**
 		 * STATIC MEMBERS
 		 */
+		const FOOTER_MENU_OPTIONS = {
+			COOKIE_PREFERENCES: "cookie_preferences",
+			LEGAL: "legal",
+			PRIVACY: "privacy",
+			TERMS_OF_USE: "terms_of_use",
+			LICENSE: "license"
+		};
+
 		BaseController.LEGAL_LINKS = {
-			"legal": "https://www.sap.com/corporate/en/legal/impressum.html",
-			"privacy": "https://www.sap.com/corporate/en/legal/privacy.html",
-			"terms_of_use": "https://www.sap.com/corporate/en/legal/terms-of-use.html",
-			"license": "LICENSE.txt"
+			[FOOTER_MENU_OPTIONS.LEGAL]: "https://www.sap.com/corporate/en/legal/impressum.html",
+			[FOOTER_MENU_OPTIONS.PRIVACY]: "https://www.sap.com/corporate/en/legal/privacy.html",
+			[FOOTER_MENU_OPTIONS.TERMS_OF_USE]: "https://www.sap.com/corporate/en/legal/terms-of-use.html",
+			[FOOTER_MENU_OPTIONS.LICENSE]: "LICENSE.txt"
 		};
 
 		return BaseController;

package/src/sap/ui/documentation/sdk/controller/Code.controller.js

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2024 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2025 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 

package/src/sap/ui/documentation/sdk/controller/Controls.controller.js

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2024 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2025 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 

package/src/sap/ui/documentation/sdk/controller/ControlsMaster.controller.js

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2024 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2025 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 

package/src/sap/ui/documentation/sdk/controller/DemoApps.controller.js

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2024 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2025 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 

package/src/sap/ui/documentation/sdk/controller/Downloads.controller.js

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2024 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2025 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 

package/src/sap/ui/documentation/sdk/controller/Entity.controller.js

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2024 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2025 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 

package/src/sap/ui/documentation/sdk/controller/ErrorHandler.js

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2024 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2025 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 

package/src/sap/ui/documentation/sdk/controller/Group.controller.js

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2024 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2025 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 

package/src/sap/ui/documentation/sdk/controller/License.controller.js

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2024 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2025 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 

package/src/sap/ui/documentation/sdk/controller/LiveEditor.controller.js

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2024 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2025 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 

package/src/sap/ui/documentation/sdk/controller/MasterTreeBaseController.js

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2024 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2025 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 
@@ -26,8 +26,8 @@ sap.ui.define([
 			 * @param childrenField - the field which holds the array with the node's children
 			 * @private
 			 */
-			_initTreeUtil: function (nodeIdField, childrenField) {
-				this._oTreeUtil = new TreeUtil(nodeIdField, childrenField);
+			_initTreeUtil: function (treeType, nodeIdField, childrenField) {
+				this._oTreeUtil = TreeUtil.getInstance(treeType, nodeIdField, childrenField);
 			},
 
 			/**

package/src/sap/ui/documentation/sdk/controller/News.controller.js

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2024 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2025 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 

package/src/sap/ui/documentation/sdk/controller/NotFound.controller.js

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2024 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2025 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 

package/src/sap/ui/documentation/sdk/controller/ReleaseNotes.controller.js

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2024 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2025 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 
@@ -141,7 +141,8 @@ sap.ui.define([
 					// Error
 					function() {
 						Log.warning("No neo-app.json was detected");
-					}
+						this.onRouteNotFound();
+					}.bind(this)
 				);
 			},
 			/**

package/src/sap/ui/documentation/sdk/controller/Resources.controller.js

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2024 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2025 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 

package/src/sap/ui/documentation/sdk/controller/Sample.controller.js

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2024 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2025 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 

package/src/sap/ui/documentation/sdk/controller/SampleBaseController.js

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2024 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2025 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 

package/src/sap/ui/documentation/sdk/controller/SampleNotFound.controller.js

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2024 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2025 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 

package/src/sap/ui/documentation/sdk/controller/SearchPage.controller.js

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2024 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2025 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 
@@ -138,7 +138,8 @@ sap.ui.define([
 						oView.byId("allList").getItems(),
 						oView.byId("apiList").getItems(),
 						oView.byId("documentationList").getItems(),
-						oView.byId("samplesList").getItems()
+						oView.byId("samplesList").getItems(),
+						oView.byId("externalList").getItems()
 					),
 					iLen = aItems.length,
 					oItem,
@@ -223,6 +224,11 @@ sap.ui.define([
 				this._modifyLinks(true);
 			},
 
+			onExternalLoadMore : function (oEvent) {
+				this.getModel("searchView").setProperty("/visibleExternalLength", oEvent.getParameter("actual"));
+				this._modifyLinks(true);
+			},
+
 			onSwitchTab: function(oEvent) {
 				var sCategory = oEvent.getParameter("section").data("category"),
 					oRouterParams = {searchParam: this.getModel("searchView").getProperty("/lastProcessedQuery")};

package/src/sap/ui/documentation/sdk/controller/Sitemap.controller.js

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2024 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2025 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 

package/src/sap/ui/documentation/sdk/controller/SubApiDetail.controller.js

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2024 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2025 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 
@@ -205,7 +205,6 @@ sap.ui.define([
 					}.bind(this), 1000);
 				}.bind(this), 0);
 
-				this.searchResultsButtonVisibilitySwitch(this.byId("apiDetailBackToSearch"));
 				this.appendPageTitle(this._oModel.getProperty("/displayName"));
 			},
 

package/src/sap/ui/documentation/sdk/controller/TermsOfUse.controller.js

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2024 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2025 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 

package/src/sap/ui/documentation/sdk/controller/TopicDetail.controller.js

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2024 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2025 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 
@@ -9,10 +9,10 @@ sap.ui.define([
 		"sap/ui/core/ResizeHandler",
 		"sap/ui/documentation/sdk/controller/BaseController",
 		"sap/ui/model/json/JSONModel",
-		"sap/ui/documentation/sdk/controller/util/XML2JSONUtils",
 		"sap/ui/Device",
 		"sap/ui/documentation/sdk/util/ToggleFullScreenHandler",
 		"sap/ui/documentation/sdk/util/Resources",
+		"sap/ui/documentation/sdk/controller/util/DocumentationLoader",
 		"sap/ui/documentation/sdk/controller/util/ResponsiveImageMap",
 		"sap/ui/documentation/sdk/controller/util/SidyBySideImageMap",
 		"sap/m/LightBox",
@@ -32,10 +32,10 @@ sap.ui.define([
 		ResizeHandler,
 		BaseController,
 		JSONModel,
-		XML2JSONUtils,
 		Device,
 		ToggleFullScreenHandler,
 		ResourcesUtil,
+		DocumentationLoader,
 		ResponsiveImageMap,
 		SidyBySideImageMap,
 		LightBox,
@@ -258,26 +258,16 @@ sap.ui.define([
 				return DataTableHelper.getInstance();
 			},
 
-			_onHtmlResourceLoaded: function (htmlContent) {
-				var jsonObj;
-
-				if (!htmlContent) {
-					setTimeout(function () {
-						this.onRouteNotFound();
-					}.bind(this), 0);
-					return;
-				}
-
-				jsonObj = XML2JSONUtils.XML2JSON(htmlContent, this._oConfig);
-				jsonObj.bIsPhone = Device.system.phone;
-				jsonObj.topicURL = this.sTopicURL;
-				if (jsonObj.shortdesc) {
-					jsonObj.shortdesc = jsonObj.shortdesc.trim().replace(/(\r\n|\n|\r)/gm, ' ');
+			_onHtmlResourceLoaded: function (oResourceInfo) {
+				oResourceInfo.bIsPhone = Device.system.phone;
+				oResourceInfo.topicURL = this.sTopicURL;
+				if (oResourceInfo.shortdesc) {
+					oResourceInfo.shortdesc = oResourceInfo.shortdesc.trim().replace(/(\r\n|\n|\r)/gm, ' ');
 				}
 
-				this.jsonDefModel.setData(jsonObj);
+				this.jsonDefModel.setData(oResourceInfo);
 
-				this.oHtml.setContent(jsonObj.html);
+				this.oHtml.setContent(oResourceInfo.html);
 				this.oLayout.invalidate();
 
 				this._scrollContentToTop();
@@ -296,22 +286,17 @@ sap.ui.define([
 			 */
 			_onTopicMatched: function (event) {
 				//TODO: global jquery call found
-				var sId = decodeURIComponent(event.getParameter("arguments").id),
-					aUrlParts = sId.split("#"),
-					sTopicId = aUrlParts[0],
-					sSubTopicId = aUrlParts[1],
-					oOptions = event.getParameter("arguments")["?options"];
-
-				this.sTopicId = sTopicId.replace(".html", "");
-				this.sSubTopicId = sSubTopicId;
-				this.sTopicURL = ResourcesUtil.getResourceOriginPath(this._oConfig.docuPath + sTopicId + (sTopicId.match(/\.html/) ? "" : ".html"));
-				this.sSubTopicId = event.getParameter("arguments").subId || sSubTopicId;
+				var oTopicInfo = this.getRouter()._decodeDocumentationRouteArguments(event.getParameter("arguments")),
+					oOptions = oTopicInfo.options;
 
+				this.sTopicId = oTopicInfo.topicId;
+				this.sSubTopicId = oTopicInfo.subTopicId;
+				this.sTopicURL = oTopicInfo.topicURL;
 				this.sQueryFromUrl = oOptions && oOptions.q ? decodeURIComponent(oOptions.q) : "";
 
-				jQuery.ajax(this.sTopicURL)
-					.done(this._onHtmlResourceLoaded.bind(this))
-					.fail(this.onRouteNotFound.bind(this));
+				DocumentationLoader.getInstance(this._oConfig).fetch(this.sTopicURL)
+					.then(this._onHtmlResourceLoaded.bind(this))
+					.catch(this.onRouteNotFound.bind(this));
 			},
 
 			_onHtmlRendered: function () {

package/src/sap/ui/documentation/sdk/controller/TopicDetailInitial.controller.js

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2024 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2025 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 

package/src/sap/ui/documentation/sdk/controller/TopicMaster.controller.js

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2024 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2025 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 
@@ -11,8 +11,9 @@ sap.ui.define([
 		"sap/m/library",
 		"sap/base/Log",
 		"sap/ui/documentation/sdk/controller/util/Highlighter",
-		"sap/ui/documentation/sdk/controller/util/DocuInfo"
-	], function (Device, MasterTreeBaseController, JSONModel, mobileLibrary, Log, Highlighter, DocuInfo) {
+		"sap/ui/documentation/sdk/controller/util/DocuInfo",
+		"sap/ui/documentation/sdk/controller/util/TreeUtil"
+	], function (Device, MasterTreeBaseController, JSONModel, mobileLibrary, Log, Highlighter, DocuInfo, TreeUtil) {
 		"use strict";
 
 		// shortcut for sap.m.SplitAppMode
@@ -43,7 +44,7 @@ sap.ui.define([
 
 						// Add data to model and initialize tree
 						oModel.setData(oData);
-						this._initTreeUtil("key", "links");
+						this._initTreeUtil(TreeUtil.treeTypes.Documentation, "key", "links");
 					}.bind(this))
 					.catch(function () {
 						this.onRouteNotFound();

package/src/sap/ui/documentation/sdk/controller/VersionNotFound.controller.js

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2024 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2025 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */