@openui5/sap.ui.documentation 1.145.1 → 1.147.0

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

@@ -6,10 +6,16 @@
 
 sap.ui.define([
 		"sap/ui/thirdparty/jquery",
+		"sap/base/Log",
 		"sap/ui/core/Fragment",
+		"sap/ui/documentation/sdk/controller/util/APIInfo",
 		"sap/ui/documentation/sdk/controller/BaseController",
 		"sap/ui/documentation/sdk/util/ToggleFullScreenHandler",
 		"sap/ui/documentation/sdk/model/formatter",
+		"sap/ui/documentation/Row",
+		"sap/ui/documentation/ParamText",
+		"sap/ui/documentation/JSDocType",
+		"sap/ui/documentation/JSDocText",
 		"sap/m/Image",
 		"sap/m/Label",
 		"sap/m/Link",
@@ -19,14 +25,20 @@ sap.ui.define([
 		"sap/m/ObjectStatus",
 		"sap/m/Popover",
 		"sap/m/library",
+		"sap/m/MessageToast",
 		"sap/ui/core/library",
 		"sap/m/CustomListItem",
 		"sap/m/List",
 		"sap/ui/dom/includeStylesheet",
-		"sap/ui/dom/includeScript"
-	], function (jQuery, Fragment, BaseController, ToggleFullScreenHandler,
-			formatter, Image, Label, Link, Text, HBox, ObjectAttribute, ObjectStatus, Popover,
-			library, coreLibrary, CustomListItem, List, includeStylesheet, includeScript) {
+		"sap/ui/dom/includeScript",
+		"sap/uxap/ObjectPageSection",
+		"sap/ui/documentation/ObjectPageSubSection",
+		"sap/ui/core/HTML",
+		"sap/ui/core/Core"
+	], function (jQuery, Log, Fragment, APIInfo, BaseController, ToggleFullScreenHandler,
+			formatter, Row, ParamText, JSDocType, JSDocText, Image, Label, Link, Text, HBox, ObjectAttribute, ObjectStatus, Popover,
+			library, MessageToast, coreLibrary, CustomListItem, List, includeStylesheet, includeScript,
+			ObjectPageSection, ObjectPageSubSection, HTML, Core) {
 		"use strict";
 
 		// shortcut for sap.m.FlexWrap
@@ -122,21 +134,56 @@ sap.ui.define([
 					this._oModel.setProperty("/ui5-metadata/associations", bHasSelfAssoc ? this._selfAssociations : this._allAssociations);
 				}
 
-				if (this._oModel.getProperty("/hasFAQ")) {
-					var sLibName = this._oEntityData.lib,
-						sLibPath = sLibName.replace(/\./g, '/'),
-						sFile = this._oEntityData.name.replace(sLibName, "").replace(/^[.]/, "").replace(/\./g, '/') + ".html";
-					jQuery.ajax({
-						type: "GET",
-						url: './docs/api/' + sLibPath +
-						'/demokit/faq/' + sFile,
-						success: function (data) {
-							this._oModel.setProperty("/faqContent", data);
-						}.bind(this)
+				var sLibName = this._oEntityData.lib,
+					sLibPath = sLibName.replace(/\./g, '/'),
+					sComponentPath = this._oEntityData.name.replace(sLibName, "").replace(/^[.]/, "").replace(/\./g, '/'),
+					aSectionTypes = (this._oControlData.customSections || []).map(function(section) {
+						var sType = typeof section === 'string' ? section : section.name;
+						return {
+							type: sType,
+							property: sType + "Content",
+							displayTitle: sType.charAt(0).toUpperCase() + sType.slice(1),
+							sectionId: sType.toLowerCase(),
+							hasSubsections: section.hasSubsections || false,
+							subsections: section.subsections || null
+						};
 					});
-				}
 
-				// Attach the model to the view
+				var fnLoadContent = function(sUrl, sProperty) {
+					return new Promise(function(resolve) {
+						jQuery.ajax({
+							url: sUrl,
+							success: function(data) {
+								this._oModel.setProperty("/" + sProperty, data);
+								resolve(true);
+							}.bind(this),
+							error: function() { resolve(false); }
+						});
+					}.bind(this));
+				}.bind(this);
+
+				var aContentPromises = aSectionTypes.map(function(oSection) {
+					var aPromises = [];
+					var sBaseUrl = './docs/api/' + sLibPath + '/demokit/sections/' + sComponentPath + '/';
+
+					if (oSection.hasSubsections) {
+						// Load main + subsections
+						aPromises.push(fnLoadContent(sBaseUrl + oSection.type + '.html', oSection.type + "_mainContent"));
+						oSection.subsections.forEach(function(sub) {
+							aPromises.push(fnLoadContent(sBaseUrl + oSection.type + '/' + sub + '.html', oSection.type + "_" + sub + "Content"));
+						});
+					} else {
+						// Load single section
+						aPromises.push(fnLoadContent(sBaseUrl + oSection.type + '.html', oSection.property));
+					}
+
+					return Promise.all(aPromises).then(function() { return oSection; });
+			});
+
+			Promise.all(aContentPromises).then(function(aSections) {
+					aSections.forEach(this._createAndAddSection, this);
+				}.bind(this));
+
 				this.setModel(this._oModel);
 
 				// Build needed resources and pre-process data
@@ -223,6 +270,42 @@ sap.ui.define([
 				ToggleFullScreenHandler.updateMode(oEvent, this._oContainerView, this._oContainerController);
 			},
 
+			onSectionLinkIconPress: function (oEvent) {
+				var oSection = oEvent.getSource();
+				this._copyBookmarkURL(oSection, null);
+			},
+
+			onSubSectionLinkIconPress: function (oEvent) {
+				// SubSection fires the event directly - one getParent() to reach the Section
+				var oSubSection = oEvent.getSource(),
+					oSection = oSubSection.getParent();
+				this._copyBookmarkURL(oSection, oSubSection);
+			},
+
+			/**
+			 * Updates the browser URL to reflect the given section/subsection and copies
+			 * it to the clipboard, then scrolls to the target.
+			 * @param {sap.uxap.ObjectPageSection} oSection
+			 * @param {sap.uxap.ObjectPageSubSection|null} oSubSection  null for section-only links
+			 * @private
+			 */
+			_copyBookmarkURL: function (oSection, oSubSection) {
+				var oI18n = Core.getLibraryResourceBundle("sap.ui.documentation"),
+					oTarget = oSubSection || oSection;
+
+				this._modifyURL(oSection, oSubSection, true);
+
+				if (navigator.clipboard) {
+					navigator.clipboard.writeText(window.location.href).then(function () {
+						MessageToast.show(oI18n.getText("API_DETAIL_BOOKMARK_COPIED"));
+					}).catch(function () {
+						MessageToast.show(oI18n.getText("API_DETAIL_BOOKMARK_URL_UPDATED"));
+					});
+				}
+
+				this._objectPage.scrollToSection(oTarget.getId(), 250);
+			},
+
 			onBorrowedPropCheckboxClick: function (oEvent) {
 				var bChecked = oEvent.getParameter("selected");
 
@@ -305,6 +388,40 @@ sap.ui.define([
 				}
 			},
 
+			/**
+			 * Applies syntax highlighting to a LightTable after it is re-rendered.
+			 * Attaches an onAfterRendering delegate to the LightTable, applies highlighting,
+			 * and then removes the delegate.
+			 * @param {sap.ui.documentation.LightTable} oLightTable The LightTable control to apply highlighting to
+			 * @private
+			 */
+			_applyHljsToLightTable: function(oLightTable) {
+				if (!oLightTable || !window.hljs) {
+					return;
+				}
+
+				var oDelegate = {
+					onAfterRendering: function() {
+						// Find unprocessed pre elements within the LightTable's DOM
+						var oDomRef = oLightTable.getDomRef();
+						if (oDomRef) {
+							var aPreElements = oDomRef.querySelectorAll('pre:not(.hljs)');
+							if (aPreElements.length > 0) {
+								aPreElements.forEach(function(oElement) {
+									oElement.classList.add('hljs');
+									window.hljs.highlightElement(oElement);
+								});
+							}
+						}
+						// Remove the delegate after execution
+						oLightTable.removeEventDelegate(oDelegate);
+					}
+				};
+
+				// Attach the delegate to the LightTable
+				oLightTable.addEventDelegate(oDelegate);
+			},
+
 			scrollToEntity: function (sSectionId, sEntityId) {
 
 				var aFilteredSubSections,
@@ -657,6 +774,366 @@ sap.ui.define([
 				return this._oPopover;
 			},
 
+			/**
+			 * Handles the typedef toggle event
+			 * @param {sap.ui.base.Event} oEvent The event object
+			 */
+			onTypedefToggle: function(oEvent) {
+				var oRow = oEvent.getSource(),
+					oLightTable = this._findParentLightTable(oRow),
+					sTypedefName = oRow?.getTypedefName();
+
+				if (!sTypedefName || !oLightTable) {
+					return;
+				}
+
+				if (oRow.getExpanded()) {
+					oRow.setExpanded(false);
+
+					oLightTable.invalidate();
+					this._applyHljsToLightTable(oLightTable);
+
+					return;
+				}
+
+				if (oRow.getSubRows().length > 0) {
+					// Already loaded typedef properties, just expand
+					oRow.setExpanded(true);
+
+					oLightTable.invalidate();
+					this._applyHljsToLightTable(oLightTable);
+
+					return;
+				}
+
+				// Find the typedef entity in the API index first
+				var oTypedefInfo = this._findTypedefInApiIndex(sTypedefName);
+
+				if (oTypedefInfo) {
+					// Fetch complete typedef data from API.json including inherited properties
+					this._collectTypedefPropertiesWithInheritance(oTypedefInfo)
+						.then(function(aTypedefProperties) {
+							// Add Row controls to the LightTable for each typedef property
+							if (aTypedefProperties && aTypedefProperties.length > 0) {
+								this._addTypedefSubRows(oRow, aTypedefProperties);
+
+								oRow.setExpanded(true);
+								oLightTable.invalidate();
+								this._applyHljsToLightTable(oLightTable);
+							}
+						}.bind(this))
+						.catch(function(oError) {
+							// Handle error silently
+							Log.error("Error loading typedef data: " + oError);
+						});
+				}
+			},
+
+			/**
+			 * Collects typedef properties including inherited properties from base typedefs.
+			 * Traverses the inheritance chain and concatenates all properties.
+			 * @param {object} oTypedefInfo Initial typedef info from API index
+			 * @returns {Promise} Promise that resolves with array of all typedef properties (own + inherited)
+			 * @private
+			 */
+			_collectTypedefPropertiesWithInheritance: function(oTypedefInfo) {
+				var aInheritanceChain = [],
+					aRequiredLibs = [];
+
+				// Build the inheritance chain by traversing the extends property
+				// Also collect all required libraries for loading
+				return this._buildTypedefInheritanceChain(oTypedefInfo)
+					.then(function(oChainResult) {
+						aInheritanceChain = oChainResult.chain;
+						aRequiredLibs = oChainResult.libs;
+
+						// Generate promises for all required libraries
+						var aPromises = aRequiredLibs.map(function(sLibName) {
+							return APIInfo.getLibraryElementsJSONPromise(sLibName);
+						});
+
+						return Promise.all(aPromises);
+					})
+					.then(function(aLibResults) {
+						// Combine all library elements into one array
+						var aAllLibraryElements = [];
+						aLibResults.forEach(function(aSingleLibraryElements) {
+							aAllLibraryElements = aAllLibraryElements.concat(aSingleLibraryElements);
+						});
+
+						// Collect properties from all typedefs in the inheritance chain
+						var aAllProperties = [],
+							aPropertyNames = []; // Track property names to handle overrides
+
+						// Process inheritance chain in order (current typedef first, then base typedefs)
+						aInheritanceChain.forEach(function(sTypedefName, iIndex) {
+							var oTypedefData = this._findEntityInLibraryData(aAllLibraryElements, sTypedefName);
+
+							if (oTypedefData?.properties) {
+								oTypedefData.properties.forEach(function(oProperty) {
+									// Only add property if it's not already defined (handle overrides)
+									if (aPropertyNames.indexOf(oProperty.name) === -1) {
+										// Clone the property to avoid modifying the original
+										var oClone = jQuery.extend(true, {}, oProperty);
+										oClone.depth = 1;
+
+										// Mark inherited properties (not from the first typedef in chain)
+										if (iIndex > 0) {
+											oClone.borrowedFrom = sTypedefName;
+										}
+
+										aAllProperties.push(oClone);
+										aPropertyNames.push(oProperty.name);
+									}
+								});
+							}
+						}.bind(this));
+
+						return aAllProperties;
+					}.bind(this));
+			},
+
+			/**
+			 * Builds the inheritance chain for a typedef by following the extends property.
+			 * @param {object} oTypedefInfo Initial typedef info from API index
+			 * @returns {Promise} Promise that resolves with object containing chain array and libs array
+			 * @private
+			 */
+			_buildTypedefInheritanceChain: function(oTypedefInfo) {
+				var aInheritanceChain = [oTypedefInfo.name],
+					aRequiredLibs = [];
+
+				// Add the initial library
+				if (oTypedefInfo.lib && aRequiredLibs.indexOf(oTypedefInfo.lib) === -1) {
+					aRequiredLibs.push(oTypedefInfo.lib);
+				}
+
+				// Load the initial typedef to get its extends property
+				return this._loadCompleteTypedefData(oTypedefInfo)
+					.then(function(oFullTypedefData) {
+						// Check if typedef has a base typedef (extends property)
+						if (!oFullTypedefData.extends) {
+							return {
+								chain: aInheritanceChain,
+								libs: aRequiredLibs
+							};
+						}
+
+						// Build the rest of the inheritance chain
+						return this._traverseTypedefInheritanceChain(
+							oFullTypedefData.extends,
+							aInheritanceChain,
+							aRequiredLibs
+						);
+					}.bind(this));
+			},
+
+			/**
+			 * Recursively traverses the typedef inheritance chain.
+			 * @param {string} sBaseTypedefName Name of the base typedef to process
+			 * @param {array} aInheritanceChain Current inheritance chain array
+			 * @param {array} aRequiredLibs Current required libraries array
+			 * @returns {Promise} Promise that resolves with object containing chain and libs arrays
+			 * @private
+			 */
+			_traverseTypedefInheritanceChain: function(sBaseTypedefName, aInheritanceChain, aRequiredLibs) {
+				// Find the base typedef in the API index
+				var oBaseTypedefInfo = this._findTypedefInApiIndex(sBaseTypedefName);
+
+				// If base typedef not found, stop traversal
+				if (!oBaseTypedefInfo) {
+					return Promise.resolve({
+						chain: aInheritanceChain,
+						libs: aRequiredLibs
+					});
+				}
+
+				// Add to inheritance chain
+				aInheritanceChain.push(sBaseTypedefName);
+
+				// Add library if not already included
+				if (oBaseTypedefInfo.lib && aRequiredLibs.indexOf(oBaseTypedefInfo.lib) === -1) {
+					aRequiredLibs.push(oBaseTypedefInfo.lib);
+				}
+
+				// Load the base typedef to check if it also has a parent
+				return this._loadCompleteTypedefData(oBaseTypedefInfo)
+					.then(function(oBaseTypedefData) {
+						// If this typedef also extends another, continue traversal
+						if (oBaseTypedefData.extends) {
+							return this._traverseTypedefInheritanceChain(
+								oBaseTypedefData.extends,
+								aInheritanceChain,
+								aRequiredLibs
+							);
+						}
+
+						// No more parents, return the complete chain
+						return {
+							chain: aInheritanceChain,
+							libs: aRequiredLibs
+						};
+					}.bind(this))
+					.catch(function() {
+						// If loading fails, return what we have so far
+						return {
+							chain: aInheritanceChain,
+							libs: aRequiredLibs
+						};
+					});
+			},
+
+			/**
+			 * Adds Row controls to the LightTable for typedef properties
+			 * @param {sap.ui.documentation.Row} oParentRow The parent row being expanded
+			 * @param {array} aTypedefProperties Array of typedef properties to add as rows
+			 * @private
+			 */
+			_addTypedefSubRows: function(oParentRow, aTypedefProperties) {
+				// Create sub-row controls for typedef properties
+				var aSubRows = aTypedefProperties.map(function(oProperty) {
+					return new Row({
+						content: [
+							new ParamText({
+								text: oProperty.name,
+								phoneText: oProperty.phoneName,
+								depth: oProperty.depth || 1,
+								optional: oProperty.optional
+							}),
+							new JSDocType({
+								typeInfo: oProperty.typeInfo
+							}),
+							new Text({
+								text: oProperty.defaultValue || "",
+								wrapping: false
+							}),
+							new JSDocText({
+								sanitizeContent: false,
+								text: this.formatter.escapeSettingsValue(oProperty.description)
+							})
+						]
+					}).addStyleClass("subrow");
+				}.bind(this));
+
+				// Add sub-rows to the parent row
+				aSubRows.forEach(function(oSubRow) {
+					oParentRow.addSubRow(oSubRow);
+				});
+			},
+
+			/**
+			 * Finds the parent LightTable control of a given control
+			 * @param {sap.ui.core.Control} oControl - The control to find the parent LightTable for
+			 * @returns {sap.ui.documentation.LightTable|null} The parent LightTable control or null if not found
+			 * @private
+			 */
+			_findParentLightTable: function(oControl) {
+				var oParent = oControl?.getParent();
+
+				while (oParent) {
+					if (oParent.isA("sap.ui.documentation.LightTable")) {
+						return oParent;
+					}
+					oParent = oParent.getParent();
+				}
+
+				return null;
+			},
+
+			/**
+			 * Finds a typedef entity in the API index
+			 * @param {string} sTypedefName The name of the typedef to find
+			 * @returns {object} The typedef entity data or null if not found
+			 * @private
+			 */
+			_findTypedefInApiIndex: function(sTypedefName) {
+				var oTypedefData = null;
+
+				// Recursive function to find the typedef in the API index
+				function findSymbol(aNodes) {
+					if (!aNodes) {
+						return false;
+					}
+
+					return aNodes.some(function(oNode) {
+						var bFound = oNode.name === sTypedefName;
+						if (bFound) {
+							oTypedefData = oNode;
+							return true;
+						} else if (oNode.nodes && sTypedefName.startsWith(oNode.name + ".")) {
+							return findSymbol(oNode.nodes);
+						}
+						return false;
+					});
+				}
+
+				// Search in the API index
+				if (this._aApiIndex) {
+					findSymbol(this._aApiIndex);
+				}
+
+				return oTypedefData;
+			},
+
+			/**
+			 * Loads complete typedef data from API.json files
+			 * @param {object} oTypedefInfo Initial typedef info from API index
+			 * @returns {Promise} Promise that resolves with the complete typedef data
+			 * @private
+			 */
+			_loadCompleteTypedefData: function(oTypedefInfo) {
+				// Get the library name from the typedef info
+				var sLibName = oTypedefInfo.lib;
+
+				if (!sLibName) {
+					return Promise.reject("Library name not found for typedef");
+				}
+
+				// Use APIInfo to load the library's API.json data
+				return APIInfo.getLibraryElementsJSONPromise(sLibName)
+					.then(function(aLibData) {
+						try {
+							// Find the complete typedef data in the library elements
+							var oTypedefData = this._findEntityInLibraryData(aLibData, oTypedefInfo.name);
+
+							if (oTypedefData) {
+								return oTypedefData;
+							} else {
+								return Promise.reject("Typedef not found in library data");
+							}
+						} catch (oProcessError) {
+							return Promise.reject("Error processing typedef data: " + oProcessError);
+						}
+					}.bind(this))
+					.catch(function(oError) {
+						return Promise.reject("Error loading library data: " + oError);
+					});
+			},
+
+			/**
+			 * Finds an entity in library data loaded from API.json
+			 * @param {array} aLibraryData Array of library elements from API.json
+			 * @param {string} sEntityName Name of the entity to find
+			 * @returns {object} The entity data or null if not found
+			 * @private
+			 */
+			_findEntityInLibraryData: function(aLibraryData, sEntityName) {
+				// Find entity in loaded libs data
+				for (var i = 0, iLen = aLibraryData.length; i < iLen; i++) {
+					var oLibItem = aLibraryData[i];
+					if (oLibItem.name === sEntityName) {
+						// Check if we are allowed to display the requested symbol
+						// BCP: 1870269087 item may not have visibility info at all. In this case we show the item
+						if (oLibItem.visibility === undefined || this._aAllowedMembers.indexOf(oLibItem.visibility) >= 0) {
+							return oLibItem;
+						} else {
+							return null;
+						}
+					}
+				}
+				return null;
+			},
+
 			/**
 			 * Builds the header layout structure.
 			 * The header displays the entity data in 3 columns
@@ -727,6 +1204,37 @@ sap.ui.define([
 				}, this);
 			},
 
+			/**
+			 * Creates and adds a dynamic section to the ObjectPageLayout
+			 * @param {object} oSectionConfig Section configuration object
+			 * @private
+			 */
+			_createAndAddSection: function(oSectionConfig) {
+				var fnCreateSubSection = function(sProperty, sTitle) {
+					var oHTML = new HTML({content: "{/" + sProperty + "}"});
+					oHTML.setModel(this._oModel);
+					return new ObjectPageSubSection(sTitle ? {title: sTitle, blocks: [oHTML]} : {blocks: [oHTML]});
+				}.bind(this);
+
+				var aSubSections = [];
+				if (oSectionConfig.hasSubsections) {
+					aSubSections.push(fnCreateSubSection(oSectionConfig.type + "_mainContent", "Overview"));
+					oSectionConfig.subsections.forEach(function(sub) {
+						aSubSections.push(fnCreateSubSection(oSectionConfig.type + "_" + sub + "Content", sub));
+					});
+				} else {
+					aSubSections.push(fnCreateSubSection(oSectionConfig.property));
+				}
+
+				var oPageSection = new ObjectPageSection({
+					id: this.createId(oSectionConfig.sectionId),
+					title: oSectionConfig.displayTitle,
+					titleUppercase: false,
+					subSections: aSubSections
+				});
+				oPageSection.addStyleClass("sectionContent");
+				this._objectPage.addSection(oPageSection);
+			},
 			onAnnotationsLinkPress: function () {
 				this.scrollToEntity("annotations", "Summary");
 			},

package/src/sap/ui/documentation/sdk/controller/util/ConfigUtil.js

@@ -34,6 +34,7 @@ sap.ui.define([
 		},
 
 		constructor : function (oComponent) {
+			BaseObject.call(this);
 			this._oComponent = oComponent;
 		},
 

package/src/sap/ui/documentation/sdk/controller/util/CookiesConsentManager.js

@@ -74,6 +74,7 @@ sap.ui.define(
             "sap.ui.documentation.sdk.controller.util.DefaultConsentManager",
             {
                 constructor: function (oComponent, oConfig) {
+                    BaseObject.call(this);
                     this._oCmponent = oComponent;
                     this._oConfigUtil = oComponent.getConfigUtil();
                     this._sConsentDialogComponentId = oConfig.defaultConsentDialogComponentId;

package/src/sap/ui/documentation/sdk/controller/util/ResourcesInfo.js

@@ -54,6 +54,11 @@ sap.ui.define([],
 				"text": "UI5 MCP server",
 				"href": "https://github.com/UI5/mcp-server"
 			},
+			{
+				"id": "fioriMcpServer",
+				"text": "SAP Fiori MCP server",
+				"href": "https://github.com/SAP/open-ux-tools/tree/main/packages/fiori-mcp-server"
+			},
 			{
 				"id": "businessAppStudio",
 				"text": "SAP Business Application Studio",

package/src/sap/ui/documentation/sdk/controller/util/UsageTracker.js

@@ -69,6 +69,7 @@ sap.ui.define(
             "sap.ui.documentation.sdk.controller.util.UsageTracker",
             {
                 constructor: function (oComponent) {
+                    BaseObject.call(this);
                     this._oComponent = oComponent;
                     this._oRouter = oComponent.getRouter();
                     this._oConfig = oComponent.getConfig();

package/src/sap/ui/documentation/sdk/cookieSettingsDialog/controller/CookieSettingsDialog.controller.js

@@ -16,6 +16,7 @@ sap.ui.define([
 		return Controller.extend("sap.ui.documentation.sdk.cookieSettingsDialog.controller.CookieSettingsDialog", {
 
 			constructor: function() {
+				Controller.call(this);
 				this._oCookiesUtil = null;
 				this._oRootView = null;
 				this._oInitOptions = null;

package/src/sap/ui/documentation/sdk/cookieSettingsDialog/view/CookieSettingsDialog.fragment.xml

@@ -30,19 +30,19 @@
 			</custom:DivContainer>
 		</content>
 	<buttons>
-		<Button text="{i18n>COOKIE_SETTINGS_DIALOG_FUNCTIONAL_COOKIES_ACCEPT_ALL}" type="Emphasized" press="onAcceptAllCookies" visible="{=! ${cookieData>/showCookieDetails} }">
+		<Button text="{i18n>COOKIE_SETTINGS_DIALOG_FUNCTIONAL_COOKIES_ACCEPT_ALL}" type="Emphasized" press=".onAcceptAllCookies" visible="{=! ${cookieData>/showCookieDetails} }">
 			<layoutData>
 				<OverflowToolbarLayoutData priority="NeverOverflow"/>
 			</layoutData>
 		</Button>
-		<Button text="{i18n>COOKIE_SETTINGS_DIALOG_FUNCTIONAL_COOKIES_SET_PREFERENCES}" id="btnSetPreferences" type="Ghost" press="showCookieDetails" visible="{= !${cookieData>/showCookieDetails} &amp;&amp; ${cookieData>/enableAdvancedSettings} }"></Button>
-		<Button text="{i18n>COOKIE_SETTINGS_DIALOG_FUNCTIONAL_COOKIES_REJECT_ALL}" press="onRejectAllCookies" visible="{=! ${cookieData>/showCookieDetails} }">
+		<Button text="{i18n>COOKIE_SETTINGS_DIALOG_FUNCTIONAL_COOKIES_SET_PREFERENCES}" id="btnSetPreferences" type="Ghost" press=".showCookieDetails" visible="{= !${cookieData>/showCookieDetails} &amp;&amp; ${cookieData>/enableAdvancedSettings} }"></Button>
+		<Button text="{i18n>COOKIE_SETTINGS_DIALOG_FUNCTIONAL_COOKIES_REJECT_ALL}" press=".onRejectAllCookies" visible="{=! ${cookieData>/showCookieDetails} }">
 			<layoutData>
 				<OverflowToolbarLayoutData priority="NeverOverflow"/>
 			</layoutData>
 		</Button>
-		<Button text="{i18n>COOKIE_SETTINGS_DIALOG_FUNCTIONAL_COOKIES_SAVE_PREFERENCES}" id="btnSavePreferences" type="Emphasized" press="onSaveCookies" visible="{cookieData>/showCookieDetails}"></Button>
-		<Button text="{i18n>COOKIE_SETTINGS_DIALOG_CANCEL_BTN}" press="onCancelPress" visible="{= ${cookieData>/showCookieDetails} }"></Button>
+		<Button text="{i18n>COOKIE_SETTINGS_DIALOG_FUNCTIONAL_COOKIES_SAVE_PREFERENCES}" id="btnSavePreferences" type="Emphasized" press=".onSaveCookies" visible="{cookieData>/showCookieDetails}"></Button>
+		<Button text="{i18n>COOKIE_SETTINGS_DIALOG_CANCEL_BTN}" press=".onCancelPress" visible="{= ${cookieData>/showCookieDetails} }"></Button>
 	</buttons>
 	</Dialog>
 </core:FragmentDefinition>