@openui5/sap.ui.documentation 1.84.27 → 1.84.29

package/package.json

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

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.84.27</version>
+  <version>1.84.29</version>
 
   <documentation>SAPUI5 library for the Demokit 2.0.</documentation>
 

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

@@ -21,7 +21,7 @@ sap.ui.define([
 	// delegate further initialization of this library to the Core
 	sap.ui.getCore().initLibrary({
 		name : 'sap.ui.documentation',
-		version: '1.84.27',
+		version: '1.84.29',
 		dependencies : ['sap.ui.core','sap.m'],
 		types: [],
 		interfaces: [],
@@ -47,7 +47,7 @@ sap.ui.define([
 	 * @namespace
 	 * @name sap.ui.documentation
 	 * @author SAP SE
-	 * @version 1.84.27
+	 * @version 1.84.29
 	 * @public
 	 */
 	var thisLibrary = sap.ui.documentation;

package/src/sap/ui/documentation/messagebundle.properties

@@ -360,20 +360,12 @@ APP_SETTINGS_DIALOG_CANCEL_BTN = Cancel
 
 #XHED: The title of the dialog for configuring the cookie settings
 COOKIE_SETTINGS_DIALOG_TITLE = Your Cookie Settings
-#XTXT: Summary note that explains why we use cookies
-COOKIE_SETTINGS_DIALOG_SUMMARY = We use cookies and SAP Web Analytics to improve your experience on our site. By continuing to use this site, you consent to use our cookies.
 #XTXT: Title of the section about the required cookies used in the application
 COOKIE_SETTINGS_DIALOG_REQUIRED_COOKIES_TITLE = Required Cookies
 #XTXT: Summary note that explains what are the required cookies in the application
 COOKIE_SETTINGS_DIALOG_REQUIRED_COOKIES_SUMMARY = These cookies are required to enable core site functionality.
 #XTXT: Detailed note that explains why we use the required cookies in the application
 COOKIE_SETTINGS_DIALOG_REQUIRED_COOKIES_TEXT = We use cookies to improve your experience on our site. By continuing to use this site, you consent to use our cookies.
-#XTXT: Title of the section about the extra functional cookies used in the application
-COOKIE_SETTINGS_DIALOG_FUNCTIONAL_COOKIES_TITLE = Functional Cookies
-#XTXT: Summary note that explains what are the functional cookies in the application
-COOKIE_SETTINGS_DIALOG_FUNCTIONAL_COOKIES_SUMMARY = These cookies are used to analyse site usage for the purpose of measuring and improving site performance.
-#XTXT: Detailed note that explains why we use the functional cookies in the application
-COOKIE_SETTINGS_DIALOG_FUNCTIONAL_COOKIES_TEXT = This site uses SAP Web Analytics to analyze how users use this site. The information generated (including a part of your IP address and a browser ID) will be transmitted to and stored by SAP on its servers. Cookies are used to identify your repeat visit and your visit origin page. We will use this information only for the purpose of evaluating website usage and compiling reports on website activity for website operators - and finally, to improve the site. If you would like to opt-in for SAP Web Analytics tracking, please specify your preference using the "On"/"Off" switch above. By opt-in, you consent to the processing of analytics data about you in the manner and for the purposes set out above.
 #XTXT: Title of the panel that contains more detailed information
 COOKIE_SETTINGS_DIALOG_FUNCTIONAL_COOKIES_MORE_INFO = More Info
 #XTXT: Title of the button to accept all cookies

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

@@ -85,24 +85,20 @@ sap.ui.define([
 
 			onAcceptAllCookies: function () {
 				this._saveCookiePreference(this._oCookieNames.ALLOW_REQUIRED_COOKIES, true);
-				this._saveCookiePreference(this._oCookieNames.ALLOW_USAGE_TRACKING, true);
 
 				this._oCookieSettingsDialog.close();
 			},
 
 			onRejectAllCookies: function () {
 				this._saveCookiePreference(this._oCookieNames.ALLOW_REQUIRED_COOKIES, false);
-				this._saveCookiePreference(this._oCookieNames.ALLOW_USAGE_TRACKING, false);
 
 				this._oCookieSettingsDialog.close();
 			},
 
 			onSaveCookies: function() {
-				var bHasConsentRequiredCookies = Core.byId("requiredCookiesSwitch").getState(),
-					bHasConsentFunctionalCookies = Core.byId("functionalCookiesSwitch").getState();
+				var bHasConsentRequiredCookies = Core.byId("requiredCookiesSwitch").getState();
 
 				this._saveCookiePreference(this._oCookieNames.ALLOW_REQUIRED_COOKIES, bHasConsentRequiredCookies);
-				this._saveCookiePreference(this._oCookieNames.ALLOW_USAGE_TRACKING, bHasConsentFunctionalCookies);
 
 				this._oCookieSettingsDialog.close();
 			},
@@ -124,18 +120,11 @@ sap.ui.define([
 			onCancelEditCookies: function() {
 				this._oCookieSettingsDialog.close();
 				Core.byId("requiredCookiesSwitch").setState(this._oConfigUtil.getCookieValue(this._oCookieNames.ALLOW_REQUIRED_COOKIES) === "1");
-				Core.byId("functionalCookiesSwitch").setState(this._oConfigUtil.getCookieValue(this._oCookieNames.ALLOW_USAGE_TRACKING) === "1");
 			},
 
 			_saveCookiePreference: function(sCookieName, bEnable) {
 				var sValue = bEnable ? "1" : "0";
 
-				if ((sCookieName === this._oCookieNames.ALLOW_USAGE_TRACKING)
-					&& bEnable
-					&& this._oConfigUtil.getCookieValue(this._oCookieNames.ALLOW_USAGE_TRACKING) !== "1") {
-					this._oConfigUtil.enableUsageTracking();
-				}
-
 				this._oConfigUtil.setCookie(sCookieName, sValue);
 				this._oModel.setProperty("/" + sCookieName, sValue);
 			},
@@ -156,10 +145,8 @@ sap.ui.define([
 					// when the user opens the edit dialog for a first time, show the cookies enabled
 					// the user will then edit and save his choice
 					oData[this._oCookieNames.ALLOW_REQUIRED_COOKIES] = "1";
-					oData[this._oCookieNames.ALLOW_USAGE_TRACKING] = "1";
 				} else {
 					oData[this._oCookieNames.ALLOW_REQUIRED_COOKIES] = this._oConfigUtil.getCookieValue(this._oCookieNames.ALLOW_REQUIRED_COOKIES);
-					oData[this._oCookieNames.ALLOW_USAGE_TRACKING] = this._oConfigUtil.getCookieValue(this._oCookieNames.ALLOW_USAGE_TRACKING);
 				}
 
 				this._oModel.setData(oData, true /* merge */);

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

@@ -15,8 +15,7 @@ sap.ui.define([
 
 		"COOKIE_NAMES": {
 			"APPROVAL_REQUESTED": "dk_approval_requested",
-			"ALLOW_REQUIRED_COOKIES": "dk_allow_required_cookies",
-			"ALLOW_USAGE_TRACKING": "dk_allow_usage_tracking"
+			"ALLOW_REQUIRED_COOKIES": "dk_allow_required_cookies"
 		},
 
 		constructor : function (oComponent) {
@@ -66,10 +65,6 @@ sap.ui.define([
 			return "";
 		},
 
-		enableUsageTracking: function() {
-			window["swa"] && window["swa"].enable();
-		},
-
 		_getMasterTargetName: function(sRouteName) {
 			var oRouteConfig = this._getRouteConfig(sRouteName),
 				bIsSplitView = oRouteConfig && oRouteConfig.target.length === 2,

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/view/CookieSettingsDialog.fragment.xml

@@ -19,16 +19,6 @@
 						<Switch id="requiredCookiesSwitch" class="cookieStateSwitch"
 							state="{path: 'cookieData>/dk_allow_required_cookies', type: 'sap.ui.model.type.Boolean', formatter: '.formatter.formatCookieValue'}"/>
 					</CustomListItem>
-
-					<CustomListItem class="cookieSetting sapUiSmallMarginTop">
-						<Title text="{i18n>COOKIE_SETTINGS_DIALOG_FUNCTIONAL_COOKIES_TITLE}"/>
-						<Text class="cookieSummaryText"  text="{i18n>COOKIE_SETTINGS_DIALOG_FUNCTIONAL_COOKIES_SUMMARY}"/>
-						<Panel headerText="{i18n>COOKIE_SETTINGS_DIALOG_FUNCTIONAL_COOKIES_MORE_INFO}" expandable="true" class="sapUiTinyMarginTop">
-							<Text text="{i18n>COOKIE_SETTINGS_DIALOG_FUNCTIONAL_COOKIES_TEXT}"/>
-						</Panel>
-						<Switch id="functionalCookiesSwitch" class="cookieStateSwitch"
-							state="{path: 'cookieData>/dk_allow_usage_tracking', type: 'sap.ui.model.type.Boolean', formatter: '.formatter.formatCookieValue'}"/>
-					</CustomListItem>
 				</List>
 			</html:div>
 		</content>