@openui5/sap.ui.documentation 1.108.0 → 1.109.0

package/THIRDPARTY.txt

@@ -478,7 +478,7 @@ License: Apache-2.0
 License Text: https://github.com/SAP/openui5/blob/master/LICENSES/Apache-2.0.txt
 Contained in: lib/jsdoc/ui5/plugin.js
 
-Component: SAP Theming Base Content, version: 11.1.40
+Component: SAP Theming Base Content, version: 11.1.44
 Copyright: SAP SE or an SAP affiliate company and Theming Base Content contributors
 License: Apache-2.0
 License Text: https://github.com/SAP/openui5/blob/master/LICENSES/Apache-2.0.txt

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openui5/sap.ui.documentation",
-  "version": "1.108.0",
+  "version": "1.109.0",
   "description": "OpenUI5 UI Library sap.ui.documentation",
   "author": "SAP SE (https://www.sap.com)",
   "license": "Apache-2.0",
@@ -14,10 +14,11 @@
     "url": "https://github.com/SAP/openui5.git"
   },
   "dependencies": {
-    "@openui5/sap.m": "1.108.0",
-    "@openui5/sap.ui.core": "1.108.0",
-    "@openui5/sap.ui.layout": "1.108.0",
-    "@openui5/themelib_sap_belize": "1.108.0",
-    "@openui5/themelib_sap_fiori_3": "1.108.0"
+    "@openui5/sap.m": "1.109.0",
+    "@openui5/sap.ui.core": "1.109.0",
+    "@openui5/sap.ui.layout": "1.109.0",
+    "@openui5/themelib_sap_belize": "1.109.0",
+    "@openui5/themelib_sap_fiori_3": "1.109.0",
+    "@openui5/themelib_sap_horizon": "1.109.0"
   }
 }

package/src/sap/ui/documentation/.library

@@ -6,7 +6,7 @@
   <copyright>OpenUI5
  * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.</copyright>
-  <version>1.108.0</version>
+  <version>1.109.0</version>
 
   <documentation>SAPUI5 library for the Demokit 2.0.</documentation>
 

package/src/sap/ui/documentation/library.js

@@ -25,13 +25,13 @@ sap.ui.define([
 	 * @namespace
 	 * @alias sap.ui.documentation
 	 * @author SAP SE
-	 * @version 1.108.0
+	 * @version 1.109.0
 	 * @since 1.48
 	 * @public
 	 */
 	var thisLibrary = sap.ui.getCore().initLibrary({
 		name : 'sap.ui.documentation',
-		version: '1.108.0',
+		version: '1.109.0',
 		dependencies : ['sap.ui.core','sap.m'],
 		types: [],
 		interfaces: [],

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

@@ -66,9 +66,6 @@ sap.ui.define([
 		// shortcut for sap.m.SplitAppMode
 		var SplitAppMode = mobileLibrary.SplitAppMode;
 
-		// Shortcut for sap.m.URLHelper
-		var URLHelper = mobileLibrary.URLHelper;
-
 		var MAIN_WEB_PAGE_TITLE = "Demo Kit - \uFFFD SDK",
 			WEB_PAGE_TITLE = {
 				topic: "Documentation - " + MAIN_WEB_PAGE_TITLE,
@@ -163,8 +160,7 @@ sap.ui.define([
 					"Check at <a href = 'https://sdk.openui5.org/versionoverview.html'>https://sdk.openui5.org/versionoverview.html</a> " +
 					"which versions are available. " +
 					"You can view the version-specific Demo Kit by adding the version number to the URL, e.g. " +
-					"<a href='https://sdk.openui5.org/1.71.46/'>https://sdk.openui5.org/1.71.46/</a>",
-					bUseFeedbackDialog: false // enable to restore previous feedback dialog and hide the Qualtrics surveys
+					"<a href='https://sdk.openui5.org/1.71.46/'>https://sdk.openui5.org/1.71.46/</a>"
 				});
 
 				var oComponent = this.getOwnerComponent();
@@ -462,17 +458,12 @@ sap.ui.define([
 
 			handleMenuItemClick: function (oEvent) {
 				var sTargetText = oEvent.getParameter("item").getKey(),
-					sTarget = this.MENU_LINKS_MAP[sTargetText],
-					bUseFeedbackDialog = this.getModel("appView").getProperty("/bUseFeedbackDialog");
+					sTarget = this.MENU_LINKS_MAP[sTargetText];
 
 				if (sTargetText === ABOUT_TEXT) {
 					this.aboutDialogOpen();
 				} else if (sTargetText === FEEDBACK_TEXT) {
-					if (!bUseFeedbackDialog) {
-						this.launchSurvey(oEvent, true);
-					} else {
-						this.feedbackDialogOpen();
-					}
+					this.feedbackDialogOpen();
 				} else if (sTargetText === CHANGE_SETTINGS_TEXT) {
 					this.settingsDialogOpen();
 				} else if (sTargetText === CHANGE_COOKIE_PREFERENCES_TEXT) {
@@ -1288,7 +1279,7 @@ sap.ui.define([
 			},
 
 			/**
-			 * Opens the Qualtrics UX survey when the feedback button gets pressed.
+			 * Opens the Qualtrics UX survey when the feedback button is pressed.
 			 * There are two available surveys - a short one (all year round), and quarterly survey.
 			 *
 			 * Depending on the number of available surveys:

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

@@ -5,21 +5,22 @@
  */
 
 sap.ui.define([
-		"sap/ui/thirdparty/jquery",
-		"sap/ui/documentation/sdk/controller/BaseController",
-		"sap/ui/model/resource/ResourceModel",
+		"sap/base/Log",
+		"sap/m/MessageBox",
+		"sap/m/MessageToast",
 		"sap/ui/Device",
-		"sap/ui/model/json/JSONModel",
+		"sap/ui/VersionInfo",
+		"sap/ui/documentation/sdk/controller/BaseController",
 		"sap/ui/documentation/sdk/controller/util/ResourceDownloadUtil",
 		"sap/ui/documentation/sdk/model/formatter",
-		"sap/m/MessageBox",
-		"sap/m/MessageToast",
+		'sap/ui/documentation/sdk/model/libraryData',
 		"sap/ui/model/Filter",
 		"sap/ui/model/FilterOperator",
-		'sap/ui/documentation/sdk/model/libraryData',
-		"sap/base/Log"
-	], function(jQuery, BaseController, ResourceModel, Device, JSONModel, ResourceDownloadUtil, formatter, MessageBox,
-			MessageToast, Filter, FilterOperator, libraryData, Log) {
+		"sap/ui/model/json/JSONModel",
+		"sap/ui/model/resource/ResourceModel",
+		"sap/ui/thirdparty/jquery"
+	], function(Log, MessageBox, MessageToast, Device, VersionInfo, BaseController, ResourceDownloadUtil,
+			 formatter, libraryData, Filter, FilterOperator, JSONModel, ResourceModel, jQuery) {
 		"use strict";
 
 		return BaseController.extend("sap.ui.documentation.sdk.controller.DemoApps", {
@@ -49,7 +50,7 @@ sap.ui.define([
 
 				this.getRouter().getRoute("demoapps").attachPatternMatched(this._onMatched, this);
 
-				sap.ui.getVersionInfo({async: true}).then(function (oVersionInfo) {
+				VersionInfo.load().then(function (oVersionInfo) {
 					var oViewModel = new JSONModel({
 						isOpenUI5: oVersionInfo && oVersionInfo.gav && /openui5/i.test(oVersionInfo.gav)
 					});

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

@@ -195,7 +195,7 @@ sap.ui.define([
 								}
 							}
 							// Sets the current iframe URL or restores it to "undefined"
-							oModelData.iframe = oSampleConfig.iframe;
+							oModelData.iframe = oSampleConfig.iframe || null;
 							oPage.setProperty("enableScrolling", !!oSampleConfig.stretch, true);
 						}
 

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

@@ -7,52 +7,61 @@
 // 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

@@ -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/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/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}"
@@ -158,8 +151,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>