@openui5/sap.ui.documentation 1.108.2 → 1.110.0

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

@@ -1,58 +1,67 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2023 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 
 // Provides reuse functionality for reading documentation from metamodel entities
 sap.ui.define([
     './APIInfo',
-    "sap/base/util/ObjectPath"
+    "sap/base/util/ObjectPath",
+    "sap/ui/VersionInfo"
 ],
-	function(APIInfo, ObjectPath) {
+	function(APIInfo, ObjectPath, VersionInfo) {
 	"use strict";
 
 	function findLibraryFromEntityName(sEntityName) {
-		var oVersionInfo = sap.ui.getVersionInfo(),
-			oLibrary,
-			iLen,
-			i;
-
-		if ( oVersionInfo && Array.isArray(oVersionInfo.libraries) ) {
-			iLen = oVersionInfo.libraries.length;
-			for (i = 0; i < iLen; i++) {
-				oLibrary = oVersionInfo.libraries[i];
-				if ( sEntityName === oLibrary.name || sEntityName.indexOf(oLibrary.name + ".") === 0 ) {
-					return oLibrary.name;
+		return VersionInfo.load().catch(function() {}).then(function(oVersionInfo) {
+			if ( oVersionInfo && Array.isArray(oVersionInfo.libraries) ) {
+				var iLen = oVersionInfo.libraries.length;
+				for (var i = 0; i < iLen; i++) {
+					var oLibrary = oVersionInfo.libraries[i];
+					if ( sEntityName === oLibrary.name || sEntityName.indexOf(oLibrary.name + ".") === 0 ) {
+						return oLibrary.name;
+					}
 				}
 			}
-		}
 
-		// fallback to core (this ensures that the extraordinary packages of sap.ui.core are found, but doesn't work as
-		// soon as other libs do the same)
-		return "sap.ui.core";
+			// fallback to core (this ensures that the extraordinary packages of sap.ui.core are found, but doesn't work as
+			// soon as other libs do the same)
+			return "sap.ui.core";
+		});
 	}
 
-	function getAsync(sEntityName, sLibraryName) {
-		var oEntityDoc;
+	function findLibraryName(sEntityName, sLibraryName) {
 
-		if (!sLibraryName) {
-			var oClass = ObjectPath.get(sEntityName || "");
-			if (oClass && oClass.getMetadata) {
-				var oMetadata = oClass.getMetadata();
-				if (oMetadata.getLibraryName) {
-					sLibraryName = oMetadata.getLibraryName();
-				} else {
-					sLibraryName = "sap.ui.core";
-				}
+		// if library name is provided, go with it
+		if (sLibraryName) {
+			return Promise.resolve(sLibraryName);
+		}
+
+		// check if sEntityName represents a subclass of BaseObject and if so, use the metadata
+		// TODO this relies on global names and needs to be refactored
+		var oClass = ObjectPath.get(sEntityName || "");
+		if (oClass && oClass.getMetadata) {
+			var oMetadata = oClass.getMetadata();
+			if (oMetadata.getLibraryName) {
+				sLibraryName = oMetadata.getLibraryName();
 			} else {
-				sLibraryName = findLibraryFromEntityName(sEntityName);
+				sLibraryName = "sap.ui.core";
 			}
+			return Promise.resolve(sLibraryName);
 		}
 
-		// If we have APIInfo json file we return a new promise which will return the oEntityDoc
-		return APIInfo.getLibraryElementsJSONPromise(sLibraryName).then(function (oEntityCollection) {
-			var oEntity;
+		return findLibraryFromEntityName(sEntityName);
+	}
+
+	function getAsync(sEntityName, sLibraryName) {
+
+		return findLibraryName(sEntityName, sLibraryName).then(function(sLibraryName) {
+			// If we have APIInfo json file, we return a new promise which will return the oEntityDoc
+			return APIInfo.getLibraryElementsJSONPromise(sLibraryName);
+		}).then(function (oEntityCollection) {
+			var oEntity,
+				oEntityDoc;
 
 			// Find single entity entry
 			for (var i = 0, iLen = oEntityCollection.length; i < iLen; i++) {

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

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2023 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 
@@ -131,7 +131,8 @@ function() {
 
 	Highlighter.prototype._processNode = function (oNode) {
 		var sText, oRegEx, i, j, oMatches, sCurrentMatch,
-			oCurrentMatch, aBlockedIndices, iCurrMatchIndex;
+			oCurrentMatch, aBlockedIndices, iCurrMatchIndex,
+			oHighligtedNode;
 
 		if (oNode.nodeName === "IFRAME") {
 			this._highlightSubTree(oNode.contentDocument.body);
@@ -168,8 +169,8 @@ function() {
 			}
 
 			if (Object.keys(oMatches).length !== 0) {
-				sText = this._highlightTerms(oMatches, sText);
-				this._replaceNode(oNode, sText);
+				oHighligtedNode = this._createHighlightedNode(oMatches, sText);
+				this._replaceNode(oNode, oHighligtedNode);
 			}
 		}
 	};
@@ -195,17 +196,13 @@ function() {
 		});
 	};
 
-	Highlighter.prototype._replaceNode = function (oNode, sHtml) {
-		var oWrapper;
+	Highlighter.prototype._replaceNode = function (oNode, oHighligtedNode) {
 
 		if (oNode.parentNode) {
-			oWrapper = document.createElement('span');
-			oWrapper.innerHTML = sHtml;
-
-			oNode.parentNode.replaceChild(oWrapper, oNode);
+			oNode.parentNode.replaceChild(oHighligtedNode, oNode);
 
 			// we cache which nodes are replaced with such as highlighted spans
-			this._aPreviouslyHighlightedNodes.push(oWrapper); // Highlighted Node with span
+			this._aPreviouslyHighlightedNodes.push(oHighligtedNode); // Highlighted Node with span
 			this._aPreviouslyOriginalNodes.push(oNode); // Original Node
 		}
 	};
@@ -230,27 +227,50 @@ function() {
 		this._toggleMutationObserver(true);
 	};
 
-	Highlighter.prototype._highlightTerms = function (oMatches, sText) {
-		var sOpeningTag = this._bUseExternalStyles ? '<span class="highlightedText">'
-			: '<span class="defaultHighlightedText">',
-			sClosingTag = '</span>',
-			sCurrMatch,
-			iUpdatedIndex,
-			iCounter = 0,
-			iIndex;
+	Highlighter.prototype._createHighlightedNode = function (oTokensToHighlight, sText) {
+		var oRootNode = document.createElement("span"),
+			aAllTokens = [],
+			fnSort = function(a, b) {return a > b;},
+			aIndices = Object.keys(oTokensToHighlight).sort(fnSort),
+			iIndex,
+			iStartIndex = 0;
+
+		// split the <code>sText</code> into tokens,
+		// including both the tokens to highlight
+		// and the remaing parts of the <code>sText</code> string
+		for (var i = 0; i < aIndices.length; i++) {
+			var iTokenIndex = Number(aIndices[i]),
+				sToken = oTokensToHighlight[iTokenIndex],
+				iTokenLength = sToken.length,
+				sBeforeToken = sText.substring(iStartIndex, iTokenIndex);
+
+			if (sBeforeToken.length) {
+				aAllTokens.push(sBeforeToken);
+			}
+			aAllTokens.push(sToken);
+
+			// shift the <code>iStartIndex</code> to the
+			// remaining part of the <code>sText</code> string
+			iStartIndex = iTokenIndex + iTokenLength;
+		}
 
-		for (iIndex in oMatches) {
-			iUpdatedIndex = +iIndex + (iCounter * (sOpeningTag.length + sClosingTag.length));
+		if (iStartIndex < sText.length) {
+			aAllTokens.push(sText.substring(iStartIndex));
+		}
 
-			sCurrMatch = oMatches[iIndex];
-			sText = sText.substring(0, iUpdatedIndex)
-					+ sOpeningTag + sCurrMatch + sClosingTag
-					+ sText.substring(iUpdatedIndex + sCurrMatch.length);
+		// wrap each token in a span
+		// and append to the root span
+		for (iIndex in aAllTokens) {
+			var oNextNode = document.createElement("span");
+			oNextNode.innerText = aAllTokens[iIndex];
+			if (Object.values(oTokensToHighlight).indexOf(aAllTokens[iIndex]) > -1) {
+				oNextNode.classList.add("defaultHighlightedText");
+			}
 
-			iCounter++;
+			oRootNode.appendChild(oNextNode);
 		}
 
-		return sText;
+		return oRootNode;
 	};
 
 	Highlighter.prototype._addMutationObserver = function () {

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

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

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

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2023 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/util/NewsInfo.js

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2023 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/util/ResourceDownloadUtil.js

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2023 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/util/ResponsiveImageMap.js

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2023 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/util/SearchUtil.js

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2023 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/util/SidyBySideImageMap.js

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2023 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/util/ToolsInfo.js

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2023 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/util/Tooltip.js

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2023 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/util/TreeUtil.js

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2023 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/util/URLUtil.js

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2023 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/util/XML2JSONUtils.js

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2023 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/util/datatable/filters/DataTableFilterDropDown.js

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2023 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/util/datatable/filters/DataTableFilterDropDownRenderer.js

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2023 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/util/datatable/filters/DataTableFilterRange.js

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2023 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/util/datatable/filters/DataTableFilterRangeRenderer.js

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2023 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/util/overlay/Overlay.js

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2023 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/util/overlay/shapes/Circle.js

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2023 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/util/overlay/shapes/Polygon.js

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2023 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/util/overlay/shapes/Rect.js

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2023 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/util/overlay/shapes/Shape.js

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2023 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/util/overlay/shapes/ShapeFactory.js

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

package/src/sap/ui/documentation/sdk/cookieSettingsDialog/Component.js

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

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

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

package/src/sap/ui/documentation/sdk/cookieSettingsDialog/manifest.json

@@ -8,7 +8,10 @@
 	"sap.ui5": {
 		"dependencies": {
 			"libs": {
-				"sap.m": {}
+				"sap.f": {},
+				"sap.m": {},
+				"sap.ui.core": {},
+				"sap.ui.layout": {}
 			}
 		},
 		"resources": {

package/src/sap/ui/documentation/sdk/css/style.css

@@ -315,7 +315,7 @@ html.sap-desktop .sapContrast.sapMSlt.sapUiDocumentationSelect:not(.sapMSltExpan
 /* Topics - dynamic page */
 .sapUiDocumentationTopicTitle {
 	font-size: 2rem;
-	font-family: "72Black", "72", "72full", Arial, Helvetica, sans-serif;
+	font-family: "72Black", "72Blackfull", "72", "72full", Arial, Helvetica, sans-serif;
 }
 
 .sapUiMedia-Std-Phone .sapUiDocumentationTopicTitle {

package/src/sap/ui/documentation/sdk/index.js

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

package/src/sap/ui/documentation/sdk/model/formatter.js

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

package/src/sap/ui/documentation/sdk/model/libraryData.js

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

package/src/sap/ui/documentation/sdk/model/models.js

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

package/src/sap/ui/documentation/sdk/util/DocumentationRouter.js

@@ -1,7 +1,7 @@
 /* global hasher */
 /*!
  * OpenUI5
- * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2023 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 // Provides a customized router class for the 'documentation' app.

package/src/sap/ui/documentation/sdk/util/LiveEditorOutput.js

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2023 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 // Applies the html of a live-edited code-sample

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

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2023 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 
@@ -45,7 +45,7 @@
 			return self['sap-ui-documentation-config'] && self['sap-ui-documentation-config'].demoKitResourceOrigin || ".";
 		},
 		getResourceOrigin: function() {
-			return this.getConfig().replace("/sapui5/", "").replace("/openui5/", "");
+			return this.getConfig().replace("/sapui5", "").replace("/openui5", "");
 		},
 		_formatPath: function(sPath) {
 			sPath = sPath.replace(/^\.\//, '/');

package/src/sap/ui/documentation/sdk/util/ToggleFullScreenHandler.js

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

package/src/sap/ui/documentation/sdk/view/App.view.xml

@@ -90,14 +90,7 @@
 
 						<custom:Search id="searchControl" toggle="onToggleSearchMode" search="onSearch" liveChange="onSearchLiveChange" width="{= (${appView>/bPhoneSize} &amp;&amp; ${appView>/bSearchMode}) ? '100%' : ''}"/>
 
-						<Button id="feedBackDialogButton" tooltip="{i18n>APP_FEEDBACK_BTN_TOOLTIP}" press="feedbackDialogOpen" icon="sap-icon://comment" type="Transparent" visible="{=${appView>/bUseFeedbackDialog} &amp;&amp; !${appView>/bPhoneSize} &amp;&amp; !${appView>/bSearchMode}}">
-
-							<layoutData>
-								<OverflowToolbarLayoutData priority="NeverOverflow" />
-							</layoutData>
-						</Button>
-
-						<Button id="surveyButton" class="surveyButton" tooltip="{i18n>APP_FEEDBACK_BTN_TOOLTIP}" press="launchSurvey" icon="sap-icon://feedback" type="Transparent" visible="{=!${appView>/bUseFeedbackDialog} &amp;&amp; !${appView>/bPhoneSize} &amp;&amp; !${appView>/bSearchMode}}">
+						<Button id="surveyButton" class="surveyButton" tooltip="{i18n>APP_FEEDBACK_BTN_TOOLTIP}" press="launchSurvey" icon="sap-icon://feedback" type="Transparent" visible="{= !${appView>/bPhoneSize} &amp;&amp; !${appView>/bSearchMode} }">
 							<customData>
 								<BadgeCustomData
 									visible="{appView>/bShowLongSurvey}"
@@ -151,6 +144,8 @@
 											<items>
 												<MenuItem  key="light" text="{i18n>APP_INFORMATION_BTN_APPEARANCE_LIGHT}" />
 												<MenuItem  key="dark" text="{i18n>APP_INFORMATION_BTN_APPEARANCE_DARK}" />
+												<MenuItem  key="hcb" text="{i18n>APP_INFORMATION_BTN_APPEARANCE_HCB}" />
+												<MenuItem  key="hcw" text="{i18n>APP_INFORMATION_BTN_APPEARANCE_HCW}" />
 												<MenuItem  key="auto" text="{i18n>APP_INFORMATION_BTN_APPEARANCE_AUTO}" />
 											</items>
 										</MenuItem>
@@ -158,8 +153,8 @@
 										<MenuItem icon="sap-icon://document-text" text="{i18n>APP_INFORMATION_BTN_TERMS_OF_USE}" key="terms_of_use" visible="{versionData>/isOpenUI5}"/>
 										<MenuItem icon="sap-icon://tree" text="{i18n>APP_INFORMATION_BTN_SITEMAP}" key="sitemap" visible="{versionData>/isOpenUI5}"/>
 										<MenuItem icon="sap-icon://hello-world" text="{i18n>APP_SETTINGS_DIALOG_LANGUAGE}" key="settings"/>
-										<MenuItem icon="sap-icon://customize" text="{i18n>APP_SETTINGS_DIALOG_COOKIE_PREFERENCES}" key="cookie_preferences"
-												visible="{= ${versionData>/enableAdvancedCookieSettings}}"/>
+										<MenuItem icon="sap-icon://customize" text="{i18n>APP_SETTINGS_DIALOG_COOKIE_PREFERENCES}" key="cookie_preferences" visible="{= ${versionData>/enableAdvancedCookieSettings}}"/>
+										<MenuItem icon="sap-icon://feedback" text="{i18n>APP_FEEDBACK_BTN_TOOLTIP}" key="feedback" />
 									</items>
 								</Menu>
 							</menu>

package/src/sap/ui/documentation/sdk/view/ControlsMaster.view.xml

@@ -15,7 +15,6 @@
 			<Toolbar width="100%">
 				<SearchField id="searchField" placeholder="{i18n>CONTROLS_MASTER_FILTER_PLACERHOLDER}" liveChange="handleListFilter" class="sapUiDocumentationFilterField" />
 				<Button id="listFilterSettings" icon="sap-icon://drop-down-list" press="handleListSettings" tooltip="{i18n>CONTROLS_MASTER_FILTER_BTN_TOOLTIP}"/>
-				<Button id="sampleSettings" icon="sap-icon://action-settings" press="handleSettings" />
 			</Toolbar>
 		</customHeader>
 

package/src/sap/ui/documentation/sdk/view/License.view.xml

@@ -1,5 +1,4 @@
 <mvc:View controllerName="sap.ui.documentation.sdk.controller.License"
-          id="license"
           height="100%"
           xmlns:mvc="sap.ui.core.mvc"
           xmlns="sap.m">

package/src/sap/ui/documentation/sdk/view/SubApiDetail.view.xml

@@ -196,6 +196,9 @@
 													<m:ObjectStatus text="Visibility: {parts : [{path : 'visibility'}, {path : 'allowedFor'}], formatter : 'sap.ui.documentation.sdk.model.formatter.formatVisibility'}"
 															state="{= ${visibility} === 'public' ? 'Success' : 'Warning'}"/>
 													<m:ObjectStatus visible="{=${since} !== undefined}" text="Since: {since}" />
+													<m:FormattedText visible="{=${borrowedFrom} !== undefined}"
+														htmlText="Borrowed from: &lt;a style='vertical-align:initial' target='_self' href='api/{borrowedFrom}' &gt;{borrowedFrom}&lt;/a&gt;">
+													</m:FormattedText>
 												</layout:VerticalLayout>
 											</custom:Row>
 										</custom:LightTable>

package/src/sap/ui/documentation/sdk/view/TermsOfUse.view.xml

@@ -1,5 +1,4 @@
 <mvc:View controllerName="sap.ui.documentation.sdk.controller.TermsOfUse"
-          id="termsOfUse"
           height="100%"
           xmlns:mvc="sap.ui.core.mvc"
           xmlns="sap.m">

package/src/sap/ui/documentation/sdk/view/TopicDetail.view.xml

@@ -1,7 +1,6 @@
 <mvc:View
 		height="100%"
 		controllerName="sap.ui.documentation.sdk.controller.TopicDetail"
-		id="sap.ui.documentation.sdk.controller.TopicDetail"
 		xmlns="sap.f"
 		xmlns:m="sap.m"
 		xmlns:l="sap.ui.layout"

package/src/sap/ui/documentation/sdk/view/VersionInfo.view.xml

@@ -1,5 +1,4 @@
 <mvc:View
-		id="versionInfo"
 		height="100%"
 		xmlns:mvc="sap.ui.core.mvc"
 		xmlns:core="sap.ui.core">