@openui5/sap.ui.documentation 1.84.16 → 1.84.20

package/LICENSE.txt

@@ -581,7 +581,7 @@ License: MIT License
 <copyright holders> = Bjarke Walling
 <year> = 2014
 
-Component: URI.js 1.19.6
+Component: URI.js 1.19.7
 Licensor: Rodney Rehm
 Website: http://github.com/medialize/URI.js/
 License: MIT License

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openui5/sap.ui.documentation",
-  "version": "1.84.16",
+  "version": "1.84.20",
   "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.16",
-    "@openui5/sap.ui.core": "1.84.16",
-    "@openui5/sap.ui.layout": "1.84.16",
-    "@openui5/themelib_sap_belize": "1.84.16",
-    "@openui5/themelib_sap_fiori_3": "1.84.16"
+    "@openui5/sap.m": "1.84.20",
+    "@openui5/sap.ui.core": "1.84.20",
+    "@openui5/sap.ui.layout": "1.84.20",
+    "@openui5/themelib_sap_belize": "1.84.20",
+    "@openui5/themelib_sap_fiori_3": "1.84.20"
   }
 }

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

@@ -6,7 +6,7 @@
   <copyright>OpenUI5
  * (c) Copyright 2009-2021 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.</copyright>
-  <version>1.84.16</version>
+  <version>1.84.20</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.16',
+		version: '1.84.20',
 		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.16
+	 * @version 1.84.20
 	 * @public
 	 */
 	var thisLibrary = sap.ui.documentation;

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

@@ -75,6 +75,7 @@ sap.ui.define([
 			sVersionOverviewJsonPath = "/versionoverview.json", /* Load versionoverview.json always from root URL */
 			ABOUT_TEXT = "about",
 			FEEDBACK_TEXT = "feedback",
+			FEEDBACK_URL = "https://demokit-feedback-proxy.cfapps.eu12.hana.ondemand.com/issue",
 			CHANGE_VERSION_TEXT = "change_version",
 			CHANGE_SETTINGS_TEXT = "settings",
 			CHANGE_COOKIE_PREFERENCES_TEXT = "cookie_preferences",
@@ -141,8 +142,6 @@ sap.ui.define([
 					}
 				}.bind(this));
 
-				this.FEEDBACK_SERVICE_URL = "https://feedback-sapuisofiaprod.hana.ondemand.com:443/api/v2/apps/5bb7d7ff-bab9-477a-a4c7-309fa84dc652/posts";
-
 				// Cache view reference
 				this._oSupportedLangModel = new JSONModel({
 					"langs": this._prepareSupportedLangModelData()
@@ -795,37 +794,27 @@ sap.ui.define([
 			 * Event handler for the send feedback button
 			 */
 			onFeedbackDialogSend: function() {
-				var data = {},
+				var oVersionInfo = Version(sap.ui.version),
+				data = {
+						"text": this._oFeedbackDialog.textInput.getValue(),
+						"rating": this._oFeedbackDialog.ratingStatus.value,
+						"major": oVersionInfo.getMajor(),
+						"minor": oVersionInfo.getMinor(),
+						"patch": oVersionInfo.getPatch(),
+						"distribution": this._getUI5Distribution(),
+						"snapshot": oVersionInfo.getSuffix().indexOf("SNAPSHOT") > -1,
+						"url": this._getCurrentURL(),
+						"page": this._getCurrentPageRelativeURL(),
+						"pageContext": this._oFeedbackDialog.contextCheckBox.getSelected()
+					},
 					oResourceBundle = this.getModel("i18n").getResourceBundle();
 
-				if (this._oFeedbackDialog.contextCheckBox.getSelected()) {
-					data = {
-						"texts": {
-							"t1": this._oFeedbackDialog.textInput.getValue()
-						},
-						"ratings":{
-							"r1": {"value" : this._oFeedbackDialog.ratingStatus.value}
-						},
-						"context": {"page": this._getCurrentPageRelativeURL(), "attr1": this._getUI5Distribution() + ":" + sap.ui.version}
-					};
-				} else {
-					data = {
-						"texts": {
-							"t1": this._oFeedbackDialog.textInput.getValue()
-						},
-						"ratings":{
-							"r1": {"value" : this._oFeedbackDialog.ratingStatus.value}
-						},
-						"context": {"attr1": this._getUI5Distribution() + ":" + sap.ui.version}
-					};
-				}
-
 				// send feedback
 				this._oFeedbackDialog.setBusyIndicatorDelay(0);
 				this._oFeedbackDialog.setBusy(true);
 
 				jQuery.ajax({
-					url: this.FEEDBACK_SERVICE_URL,
+					url: FEEDBACK_URL,
 					type: "POST",
 					contentType: "application/json",
 					data: JSON.stringify(data)
@@ -1121,8 +1110,13 @@ sap.ui.define([
 			},
 
 			_getCurrentPageRelativeURL: function () {
-				var parser = window.location;
-				return parser.pathname + parser.hash + parser.search;
+				var currentLocation = window.location;
+				return currentLocation.pathname + currentLocation.hash + currentLocation.search;
+			},
+
+			_getCurrentURL: function () {
+				var currentLocation = window.location;
+				return currentLocation.href;
 			},
 
 			_setHeaderSelectedKey: function(sKey) {

package/src/sap/ui/documentation/sdk/tmpl/LICENSE.txt

@@ -574,7 +574,7 @@ License: MIT License
 <copyright holders> = Bjarke Walling
 <year> = 2014
 
-Component: URI.js 1.19.6
+Component: URI.js 1.19.7
 Licensor: Rodney Rehm
 Website: http://github.com/medialize/URI.js/
 License: MIT License