@openui5/sap.ui.documentation 1.113.0 → 1.115.0

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

@@ -7,6 +7,7 @@
 /*global history */
 sap.ui.define([
 		"sap/ui/documentation/library",
+		"sap/ui/core/Core",
 		"sap/ui/core/Fragment",
 		"sap/ui/core/mvc/Controller",
 		"sap/ui/core/routing/History",
@@ -16,21 +17,23 @@ sap.ui.define([
 		"sap/ui/documentation/sdk/controller/util/APIInfo",
 		"sap/base/strings/formatMessage",
 		"sap/ui/documentation/WebPageTitleUtil"
-	], function (library, Fragment, Controller, History, ResourceModel, Device, mobileLibrary, APIInfo,
+	], function (library, Core, Fragment, Controller, History, ResourceModel, Device, mobileLibrary, APIInfo,
 				 formatMessage, WebPageTitleUtil) {
 		"use strict";
 
 		// shortcut for sap.m.SplitAppMode
 		var SplitAppMode = mobileLibrary.SplitAppMode;
 
+		var URLHelper = mobileLibrary.URLHelper;
+
 		var _oWebPageTitleUtil = new WebPageTitleUtil();
 
 		var _oPageTitle = [];
 
-		return Controller.extend("sap.ui.documentation.sdk.controller.BaseController", {
+		var BaseController = Controller.extend("sap.ui.documentation.sdk.controller.BaseController", {
 
 			// Prerequisites
-			_oCore: sap.ui.getCore(),
+			_oCore: Core,
 
 			formatMessage: formatMessage,
 
@@ -233,6 +236,16 @@ sap.ui.define([
 			handleLandingImageLoad: function () {
 				this.getView().byId("landingImageHeadline").setVisible(true);
 			},
+			/**
+			 * Handles the click on an item of the Footer Master (the footer placed
+			 * at the bottom of any MasterPage (left side of the SplitApp)).
+			 * @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];
+				URLHelper.redirect(sTarget, true);
+			},
 			/**
 			 * Checks if a control has API Reference
 			 * @param {string} sControlName
@@ -261,5 +274,17 @@ sap.ui.define([
 				return;
 			}
 		});
+
+		/**
+		 * STATIC MEMBERS
+		 */
+		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"
+		};
+
+		return BaseController;
 	}
 );

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

@@ -14,10 +14,10 @@ sap.ui.define([
 	"sap/ui/model/Filter",
 	"sap/ui/model/FilterOperator",
 	"sap/ui/model/Sorter",
-	"sap/base/util/Version",
 	"sap/ui/util/Storage",
 	"sap/ui/core/Core",
-	"sap/ui/documentation/sdk/controller/util/Highlighter"
+	"sap/ui/documentation/sdk/controller/util/Highlighter",
+	"sap/ui/core/Fragment"
 ], function(
 	jQuery,
 	Device,
@@ -28,10 +28,10 @@ sap.ui.define([
 	Filter,
 	FilterOperator,
 	Sorter,
-	Version,
 	Storage,
 	Core,
-	Highlighter
+	Highlighter,
+	Fragment
 ) {
 		"use strict";
 
@@ -57,7 +57,7 @@ sap.ui.define([
 				filter: {},
 				groupProperty: "category",
 				groupDescending: false,
-				version: Version(sap.ui.version).getMajor() + "." + Version(sap.ui.version).getMinor()
+				version: ''
 			},
 			_mGroupFunctions: {
 				"name": function (oContext) {
@@ -454,20 +454,33 @@ sap.ui.define([
 				this._updateView();
 			},
 
-			handleListSettings: function () {
-				// create dialog on demand
-				if (!this._oVSDialog) {
-					this._oVSDialog = sap.ui.xmlfragment(this.getView().getId(), "sap.ui.documentation.sdk.view.viewSettingsDialog", this);
-					this.getView().addDependent(this._oVSDialog);
-				}
-
-				this._oVSDialog.setSelectedFilterCompoundKeys(this._oListSettings.filter);
-				this._oVSDialog.setSelectedGroupItem(this._oListSettings.groupProperty);
-				this._oVSDialog.setGroupDescending(this._oListSettings.groupDescending);
+			getViewSettingsDialog: function () {
+				return new Promise(function (fnResolve) {
+					if (!this._oVSDialog) {
+						Fragment.load({
+							id: this.getView().getId(),
+							name: "sap.ui.documentation.sdk.view.viewSettingsDialog",
+							controller: this
+						}).then(function (oDialog) {
+							this._oVSDialog = oDialog;
+							this.getView().addDependent(this._oVSDialog);
+							fnResolve(this._oVSDialog);
+						}.bind(this));
+					} else {
+						fnResolve(this._oVSDialog);
+					}
+				}.bind(this));
+			},
 
-				// open
-				this._oVSDialog.open();
+			handleListSettings: function () {
+				this.getViewSettingsDialog().then(function (oDialog) {
+					oDialog.setSelectedFilterCompoundKeys(this._oListSettings.filter);
+					oDialog.setSelectedGroupItem(this._oListSettings.groupProperty);
+					oDialog.setGroupDescending(this._oListSettings.groupDescending);
 
+					// open
+					oDialog.open();
+				});
 			},
 
 			handleListFilter: function (oEvent) {

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

@@ -18,9 +18,10 @@ sap.ui.define([
 		"sap/ui/model/FilterOperator",
 		"sap/ui/model/json/JSONModel",
 		"sap/ui/model/resource/ResourceModel",
-		"sap/ui/thirdparty/jquery"
+		"sap/ui/thirdparty/jquery",
+		"sap/ui/core/Fragment"
 	], function(Log, MessageBox, MessageToast, Device, VersionInfo, BaseController, ResourceDownloadUtil,
-			 formatter, libraryData, Filter, FilterOperator, JSONModel, ResourceModel, jQuery) {
+			 formatter, libraryData, Filter, FilterOperator, JSONModel, ResourceModel, jQuery, Fragment) {
 		"use strict";
 
 		return BaseController.extend("sap.ui.documentation.sdk.controller.DemoApps", {
@@ -39,9 +40,16 @@ sap.ui.define([
 
 
 				// load demo app metadata from docuindex of all available libraries
-				libraryData.fillJSONModel(oModel);
-				this.setModel(oModel);
-				this.getView().setModel(oMessageBundle, "i18n");
+				libraryData.fillJSONModel(oModel)
+					.then(function () {
+						return this.loadDemoAppsCellFragments(oModel);
+					}.bind(this))
+					.then(function (oFragments) {
+						this._cellFragments = oFragments;
+						this.setModel(oModel);
+					}.bind(this));
+
+					this.getView().setModel(oMessageBundle, "i18n");
 
 				this.setModel(new JSONModel({
 					demoAppsHomeLink: "topic/a3ab54ecf7ac493b91904beb2095d208"
@@ -283,40 +291,151 @@ sap.ui.define([
 			/* lifecycle methods                                           */
 			/* =========================================================== */
 
+			loadDemoAppsCellFragments: function(oModel) {
+				var aResult = {},
+					createDemoAppCell = this.createDemoAppCell.bind(this),
+					demoApps = oModel.getProperty("/demoAppsByCategory");
+
+				function handleCategory(category) {
+					return Promise.all(category.rows.map(handleRow));
+				}
+
+				function handleRow(row) {
+					return Promise.all(row.map(function (cell) {
+						return createDemoAppCell(cell).then(function (oCell) {
+							aResult[cell.id] = oCell;
+						});
+					}));
+				}
+
+				return new Promise(function (resolve, reject) {
+					Promise.all(demoApps.map(handleCategory))
+						.then(function () {
+							resolve(aResult);
+						})
+						.catch(function (error) {
+							reject(error);
+						});
+				});
+			},
+
 			/**
 			 * Factory function for creating the demo app cells
 			 *
-			 * @param {string} sId the id for the current cell
+			 * @param {string} _ the id of the cell in the dom
 			 * @param {sap.ui.model.Context} oBindingContext the context for the current cell
 			 * @return {sap.ui.layout.BlockLayoutCell} either a teaser cell or a demo app cell based on the metadata in the model
 			 * @public
 			 */
-			createDemoAppCell: function (sId, oBindingContext) {
-				var oBlockLayoutCell;
-				if (oBindingContext.getObject().teaser) { // teaser cell (loads fragment from demo app)
-					try {
-						sap.ui.loader.config({paths:{"test-resources":"test-resources"}});
-						var sRelativePath = sap.ui.require.toUrl(oBindingContext.getObject().teaser);
-						var oTeaser = sap.ui.xmlfragment(sId, sRelativePath);
-						oBlockLayoutCell = sap.ui.xmlfragment(sId, "sap.ui.documentation.sdk.view.BlockLayoutTeaserCell", this);
-						oBlockLayoutCell.getContent()[0].addContent(oTeaser);
-						sap.ui.loader.config({paths:{"test-resources":null}});
-						//sets the teaser to aria-hidden => gets ignored by screen reader
-						oTeaser.addEventDelegate({"onAfterRendering": function() {
-							this.getParent().getDomRef().childNodes[1].setAttribute("aria-hidden", "true");
-							}.bind(oTeaser)});
-					} catch (oException) {
-						Log.warning("Teaser for demo app \"" + oBindingContext.getObject().name + "\" could not be loaded: " + oException);
-						oBlockLayoutCell = sap.ui.xmlfragment(sId, "sap.ui.documentation.sdk.view.BlockLayoutCell", this);
-					}
-				} else { // normal cell
-					oBlockLayoutCell = sap.ui.xmlfragment(sId, "sap.ui.documentation.sdk.view.BlockLayoutCell", this);
-				}
-				oBlockLayoutCell.setBindingContext(oBindingContext);
+			createDemoAppCellFactory: function (_, oBindingContext) {
+				var id = oBindingContext.getObject().id;
+				return this._cellFragments[id];
+			},
+
+			/**
+			 * Handler for the demo app cell creation
+			 *
+			 * @param {sap.ui.model.Context} oBindingContext the context for the current cell
+			 * @param {sap.ui.core.Control[]} aFragments the fragments for the current cell [teaser, default cell]
+			 * @return {sap.ui.layout.BlockLayoutCell} the demo app cell
+			 * @private
+			 **/
+			onDemoAppCellCreated: function (oBindingContext, aFragments) {
+				var oTeaser = aFragments[0],
+				oBlockLayoutCell = aFragments[1];
+
+				oBlockLayoutCell.getContent()[0].addContent(oTeaser);
+				sap.ui.loader.config({paths:{"test-resources":null}});
+				//sets the teaser to aria-hidden => gets ignored by screen reader
+				oTeaser.addEventDelegate({"onAfterRendering": function() {
+					this.getParent().getDomRef().childNodes[1].setAttribute("aria-hidden", "true");
+				}.bind(oTeaser)});
 
+				oBlockLayoutCell.setBindingContext(oBindingContext);
 				return oBlockLayoutCell;
 			},
 
+			/**
+			 * Handler for the demo app cell creation error
+			 * Creates and returns a normal demo app cell instead as promise
+			 *
+			 * @param {sap.ui.model.Context} oBindingContext the context for the current cell
+			 * @param {Error} oException the exception that occurred during the cell creation
+			 * @return {Promise<sap.ui.layout.BlockLayoutCell>} the demo app cell as promise
+			 * @private
+			 **/
+			onDemoAppCellFailed: function (oBindingContext, oException) {
+				Log.warning("Teaser for demo app \"" + oBindingContext.name + "\" could not be loaded: " + oException);
+				return this.createNormalDemoAppCell(oBindingContext);
+			},
+
+			/**
+			 * Creates a normal demo app cell
+			 * @param {sap.ui.model.Context} oBindingContext the context for the current cell
+			 * @return {Promise<sap.ui.layout.BlockLayoutCell>} the demo app cell as promise
+			 * @private
+			 **/
+			createNormalDemoAppCell: function (oBindingContext) {
+				return new Promise(function (resolve) {
+					Fragment.load({
+						id: oBindingContext.id,
+						name: "sap.ui.documentation.sdk.view.BlockLayoutCell",
+						controller: this
+					}).then(function (oBlockLayoutCell) {
+						oBlockLayoutCell.setBindingContext(oBindingContext);
+						resolve(oBlockLayoutCell);
+					});
+				}.bind(this));
+			},
+
+			/**
+			 * Creates a demo app cell with a teaser
+			 *
+			 * @param {sap.ui.model.Context} oBindingContext the context for the current cell
+			 * @return {Promise<sap.ui.layout.BlockLayoutCell>} the demo app cell as promise
+			 * @private
+			 **/
+			createDemoAppCellFromTeaser: function (oBindingContext) {
+				sap.ui.loader.config({paths:{"test-resources":"test-resources"}});
+				var sRelativePath = sap.ui.require.toUrl(oBindingContext.teaser),
+					oPromiseTeaser = Fragment.load({
+						id: oBindingContext.id,
+						name: sRelativePath,
+						controller: this
+					}),
+					oPromiseCell = Fragment.load({
+						id: oBindingContext.id,
+						name: "sap.ui.documentation.sdk.view.BlockLayoutTeaserCell",
+						controller: this
+					}),
+					onCreated = this.onDemoAppCellCreated.bind(this, oBindingContext),
+					onFailed = this.onDemoAppCellFailed.bind(this, oBindingContext);
+
+				return Promise.all([oPromiseTeaser, oPromiseCell])
+					.then(function (aFragments) {
+						return onCreated(aFragments);
+					})
+					.catch(function (oException) {
+						return onFailed(oException);
+					});
+			},
+
+			/**
+			 * Creates a demo app cell or a normal considering the teaser information
+			 * @param {sap.ui.model.Context} oBindingContext the context for the current cell
+			 * @return {Promise<sap.ui.layout.BlockLayoutCell>} the demo app cell as promise
+			 * @private
+			 **/
+			createDemoAppCell: function (oBindingContext) {
+				if (oBindingContext.teaser) {
+					// teaser cell (loads fragment from demo app)
+					return this.createDemoAppCellFromTeaser(oBindingContext);
+				} else {
+					// normal cell
+					return this.createNormalDemoAppCell(oBindingContext);
+				}
+			},
+
 			/* =========================================================== */
 			/* helper methods                                              */
 			/* =========================================================== */

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

@@ -18,6 +18,7 @@ sap.ui.define([
 	"sap/ui/core/HTML",
 	"sap/m/library",
 	"sap/base/Log",
+	"sap/ui/core/Core",
 	"sap/ui/core/Fragment",
 	"sap/ui/documentation/sdk/util/Resources",
 	"./config/sampleForwardingConfig",
@@ -36,6 +37,7 @@ sap.ui.define([
 	HTML,
 	mobileLibrary,
 	Log,
+	Core,
 	Fragment,
 	ResourcesUtil,
 	sampleForwardingConfig,
@@ -78,7 +80,7 @@ sap.ui.define([
 
 				this.getView().setModel(this.oModel);
 
-				this.bus = sap.ui.getCore().getEventBus();
+				this.bus = Core.getEventBus();
 				this.setDefaultSampleTheme();
 				this.bus.subscribe("themeChanged", "onDemoKitThemeChanged", this.onDemoKitThemeChanged, this);
 
@@ -254,6 +256,24 @@ sap.ui.define([
 				this.sIFrameUrl = ResourcesUtil.getResourceOrigin() + "/resources/sap/ui/documentation/sdk/index.html" + sSampleSearchParams;
 			},
 
+			getSettingsDialog: function () {
+				return new Promise(function (resolve, reject) {
+					if (!this._oSettingsDialog) {
+						Fragment.load({
+							id: "sample",
+							name: "sap.ui.documentation.sdk.view.appSettingsDialog",
+							controller: this
+						}).then(function (oSettingsDialog) {
+							this._oSettingsDialog = oSettingsDialog;
+							this._oSettingsDialog.setModel(this._oMessageBundle, "i18n");
+							resolve(this._oSettingsDialog);
+						}.bind(this));
+					} else {
+						resolve(this._oSettingsDialog);
+					}
+				}.bind(this));
+			},
+
 			/**
 			 * Opens the View settings dialog
 			 * @public
@@ -266,31 +286,31 @@ sap.ui.define([
 					});
 				}
 
-				if (!this._oSettingsDialog) {
-					this._oSettingsDialog = sap.ui.xmlfragment("sample", "sap.ui.documentation.sdk.view.appSettingsDialog", this);
-
-					this._oSettingsDialog.setModel(this._oMessageBundle, "i18n");
-				}
-
-				this.loadSampleSettings(this.applySampleSettings.bind(this)).then(function() {
-					this._oSettingsDialog.open();
-				}.bind(this)).catch(function(err) {
-					Log.error(err);
-				});
+				this.getSettingsDialog()
+					.then(function (oSettingsDialog) {
+						this.loadSampleSettings(this.applySampleSettings.bind(this));
+						return oSettingsDialog;
+					}.bind(this))
+					.then(function(oSettingsDialog) {
+						oSettingsDialog.open();
+					})
+					.catch(function(err) {
+						Log.error(err);
+					});
 			},
 
 			applySampleSettings: function(eMessage) {
 				if (eMessage.data.type === "SETTINGS") {
-					var oThemeSelect = sap.ui.getCore().byId("sample--ThemeSelect");
+					var oThemeSelect = Core.byId("sample--ThemeSelect");
 
 					// Theme select
 					oThemeSelect.setSelectedKey(eMessage.data.data.theme);
 
 					// RTL
-					sap.ui.getCore().byId("sample--RTLSwitch").setState(eMessage.data.data.RTL);
+					Core.byId("sample--RTLSwitch").setState(eMessage.data.data.RTL);
 
 					// Density mode select
-					sap.ui.getCore().byId("sample--DensityModeSwitch").setSelectedKey(this._presetDensity(eMessage.data.data.density, true));
+					Core.byId("sample--DensityModeSwitch").setSelectedKey(this._presetDensity(eMessage.data.data.density, true));
 
 				}
 			},
@@ -325,9 +345,9 @@ sap.ui.define([
 			},
 
 			handleSaveAppSettings: function () {
-				var	sDensityMode = sap.ui.getCore().byId("sample--DensityModeSwitch").getSelectedKey(),
-					sTheme = sap.ui.getCore().byId("sample--ThemeSelect").getSelectedKey(),
-					bRTL = sap.ui.getCore().byId("sample--RTLSwitch").getState();
+				var	sDensityMode = Core.byId("sample--DensityModeSwitch").getSelectedKey(),
+					sTheme = Core.byId("sample--ThemeSelect").getSelectedKey(),
+					bRTL = Core.byId("sample--RTLSwitch").getState();
 
 				this._oSettingsDialog.close();
 

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

@@ -196,9 +196,34 @@ sap.ui.define([
 				});
 		},
 
+		/**
+		 * Formats the name in NPM style string:
+		 *
+		 * A package.json file must contain "name" and "version" fields.
+		 * The "name" field contains your package's name, and must be lowercase and one word,
+		 * and may contain hyphens and underscores.
+		 *
+		 * @param {string} name The name to format
+		 * @returns {string} Formatted name
+		 */
+		_formatNameToNpmSpec: function (name) {
+			var result;
+			var testValidChars = /[^\w_\-\.]+/gi; // Only "words", "-", "_" and "."
+
+			name = name
+				.replace(testValidChars, "") // Cleanup invalid characters
+				.replaceAll(".", "-"); // Replace the dots with dashes
+
+			result = name.split(/(?=[A-Z])/); // Split on Capital letters
+
+			return result
+				.map(function (chunk) { return chunk.toLowerCase(); })
+				.join("-");
+		},
+
 		_formatPackageJson: function (sPackageFile, sManifestFile, oData) {
 			var sFormattedPackageFile = sPackageFile.replace(/{{TITLE}}/g, oData.title)
-				.replace(/{{SAMPLE_ID}}/g, oData.id),
+				.replace(/{{SAMPLE_ID}}/g, this._formatNameToNpmSpec(oData.id)),
 				oPackageFile = JSON.parse(sFormattedPackageFile),
 				oPackageDependencies = oPackageFile.dependencies,
 				oManifestFile,
@@ -226,7 +251,7 @@ sap.ui.define([
 		},
 
 		_formatYamlFile: function(sFile, oData) {
-			return sFile.replace(/{{SAMPLE_ID}}/g, oData.id);
+			return sFile.replace(/{{SAMPLE_ID}}/g, this._formatNameToNpmSpec(oData.id));
 		},
 
 		_formatManifestJsFile: function (sRawManifestFileJs) {

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

@@ -131,14 +131,26 @@ sap.ui.define([
 						oView.byId("samplesList").getItems()
 					),
 					iLen = aItems.length,
-					oItem;
+					oItem,
+					oLink,
+					sHref,
+					sTarget = "_self",
+					bExternal;
 
 				while (iLen--) {
 					oItem = aItems[iLen];
 					// Access control lazy loading method if available
 					if (oItem._getLinkSender) {
 						// Set link href to allow open in new window functionality
-						oItem._getLinkSender().setHref(oItem.getCustomData()[0].getValue());
+						oLink = oItem._getLinkSender();
+						sHref = oItem.getCustomData()[0].getValue();
+						bExternal = oItem.getCustomData()[1].getValue();
+						if (bExternal) {
+							sHref = new URL(sHref, document.baseURI).href;
+							sTarget = "_blank";
+						}
+						oLink.setHref(sHref);
+						oLink.setTarget(sTarget);
 					}
 				}
 			},

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

@@ -60,8 +60,8 @@ sap.ui.define([
 			this.setModel(new JSONModel({
 				inspectorHomeLink: "topic/b24e72443eb34d0fb7bf6940f2d697eb",
 				supportAssistantHomeLink: oData.supportAssistant.href,
-				iconExplorerHomeLink: "topic/21ea0ea94614480d9a910b2e93431291"
-				// etc
+				iconExplorerHomeLink: "topic/21ea0ea94614480d9a910b2e93431291",
+				ui5TestRecorderHomeLink: oData.ui5TestRecorder.href
 			}), "newWindowLinks");
 		},
 

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

@@ -7,11 +7,13 @@
 sap.ui.define([
 	"./BaseController",
 	"sap/ui/thirdparty/jquery",
+	"sap/ui/core/Core",
 	"sap/ui/documentation/sdk/controller/util/URLUtil",
 	"sap/m/library"
 ], function (
 	BaseController,
 	jQuery,
+	Core,
 	DemokitURLUtil,
 	mLib
 ) {
@@ -47,13 +49,13 @@ sap.ui.define([
 				sUrl = document.location.href,
 				sRedirectUrl,
 				sVersion = DemokitURLUtil.parseVersion(sUrl),
-				isRemoved = false;
+				oPatchInfo = this._getPatchInfo(oVersionInfo, sVersion),
+				isRemoved = oPatchInfo && oPatchInfo.removed,
+				isRuntimeOnly = oPatchInfo && oPatchInfo.runtimeOnly;
 
 			oMessagePage.setBusy(false);
 
-			isRemoved = this._isVersionRemoved(oVersionInfo, sVersion);
-
-			if (isRemoved && DemokitURLUtil.requestsDemokitView(sUrl)) {
+			if ((isRemoved || isRuntimeOnly) && DemokitURLUtil.requestsDemokitView(sUrl)) {
 				// redirect to the latest (version-less) URL
 				sRedirectUrl = DemokitURLUtil.removeVersion(sUrl);
 				mLib.URLHelper.redirect(sRedirectUrl);
@@ -72,6 +74,10 @@ sap.ui.define([
 				// show removed message
 				oMessagePage.setText(this._getLibraryResourceBundle().getText("NOT_FOUND_REMOVED_TEXT"));
 				oReadMoreBtn.setVisible(true);
+			} else if (isRuntimeOnly) {
+				// show removed message
+				oMessagePage.setText(this._getLibraryResourceBundle().getText("NOT_FOUND_DK_REMOVED_TEXT"));
+				oReadMoreBtn.setVisible(true);
 			} else {
 				// show unavailable message
 				oReadMoreBtn.setVisible(false);
@@ -79,21 +85,15 @@ sap.ui.define([
 			}
 		},
 
-		_isVersionRemoved: function (oVersionInfo, sVersion) {
-			var aPatches = oVersionInfo.patches,
-				iVersionIndex,
-				reVersion;
-
-			iVersionIndex = aPatches.findIndex(function (oData) {
-				reVersion = new RegExp(oData.version);
-				return oData.removed && reVersion.test(sVersion);
+		_getPatchInfo: function (oVersionInfo, sVersion) {
+			var aPatches = oVersionInfo.patches;
+			return aPatches.find(function (oData) {
+				return sVersion === oData.version;
 			});
-
-			return iVersionIndex > -1;
 		},
 
 		_getLibraryResourceBundle: function () {
-			return sap.ui.getCore().getLibraryResourceBundle("sap.ui.documentation");
+			return Core.getLibraryResourceBundle("sap.ui.documentation");
 		},
 
 		_loadVersionInfo: function () {

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

@@ -230,7 +230,7 @@ function() {
 	Highlighter.prototype._createHighlightedNode = function (oTokensToHighlight, sText) {
 		var oRootNode = document.createElement("span"),
 			aAllTokens = [],
-			fnSort = function(a, b) {return a > b;},
+			fnSort = function(a, b) {return parseInt(a) > parseInt(b);},
 			aIndices = Object.keys(oTokensToHighlight).sort(fnSort),
 			iIndex,
 			iStartIndex = 0;

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

@@ -563,7 +563,6 @@
 					oObject,
 					sDeprecatedMarker;
 				if (oDoc.category === DOC_CATEGORY.documentation) {
-					sNavURL = sNavURL.substring(0, sNavURL.lastIndexOf(".html"));
 					bShouldAddToSearchResults = true;
 					sCategory = "Documentation";
 					oObject = {
@@ -572,7 +571,8 @@
 						summary: sSummary || "",
 						score: oDoc.score,
 						modified: sModified,
-						category: sCategory
+						category: sCategory,
+						external: oDoc.external
 					};
 					aDataDoc.push(oObject);
 					iDocLength++;
@@ -589,7 +589,8 @@
 						summary: sSummary || "",
 						score: oDoc.score,
 						modified: sModified,
-						category: sCategory
+						category: sCategory,
+						external: oDoc.external
 					};
 					aDataExplored.push(oObject);
 					iExploredLength++;

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

@@ -78,6 +78,12 @@ sap.ui.define([],
 				"text": "Accessibility Guide",
 				"href": "test-resources/sap/m/demokit/accessibilityGuide/webapp/index.html",
 				"hideOnPhone": true
+			},
+			{
+				"id": "ui5TestRecorder",
+				"text": "UI5 Test Recorder",
+				"href": "topic/2535ef9272064cb6bd6b44e5402d531d",
+				"hideOnPhone": true
 			}
 		];