@openui5/sap.m 1.138.0 → 1.140.0

package/src/sap/m/PDFViewer.js

@@ -45,7 +45,7 @@ sap.ui.define([
 		 * @extends sap.ui.core.Control
 		 *
 		 * @author SAP SE
-		 * @version 1.138.0
+		 * @version 1.140.0
 		 * @since 1.48
 		 *
 		 * @constructor
@@ -332,30 +332,60 @@ sap.ui.define([
 		 * @description - this method fetches response headers from server to validate content-type.
 		 * @private
 		 */
-		PDFViewer.prototype._getHeaderInfo = function(src, method) {
-			return new Promise((resolve, reject) => {
-				const oXMLHttpRequest = new XMLHttpRequest();
-				oXMLHttpRequest.open(method, src, false);
-				oXMLHttpRequest.onload = () => {
-					const sStatus = oXMLHttpRequest.status;
-					if (sStatus === 200) {
-						const response = oXMLHttpRequest.getAllResponseHeaders().toLowerCase().trim();
-						const items = response.split("\n");
-						const responseHeader = [];
-						for (let i = 0; i < items.length; i++) {
-							const parts = items[i].split(': ');
-							responseHeader[parts[0].trim()] = parts[1].trim();
+		PDFViewer.prototype._getHeaderInfo = function (src, sMethod) {
+			if (window.fetch) {
+				// Trigger fetch call to retrieve the content-type header for the given PDF
+				return window.fetch(src, { method: sMethod })
+					.then(function(response) {
+						if (response.status === 200) {
+							// If the HEAD request is successful, return the content-type header
+							return response.headers.get("content-type");
+						} else if (response.status === 404) {
+							// If the HEAD request fails to fetch the content defined in source, an error event is triggered and LoadingError IllustratedMessage is displayed.
+							var error = new Error("Error fetching header: " + response.statusText);
+							error.status = response.status;
+							throw error;
+						} else {
+							// If the HEAD request fails for any other reason, throw an error
+							var error = new Error("Error in fetching header with method " + sMethod + ", status " + response.status + ", statusText " + response.statusText);
+							error.status = response.status;
+							throw error;
 						}
-						resolve(responseHeader['content-type']);
-					} else {
-						reject(new Error(`Error in fetching header with method ${method}, status ${oXMLHttpRequest.status} and statusText ${oXMLHttpRequest.statusText}`));
-					}
-				};
-				oXMLHttpRequest.onerror = (error) => {
-					reject(new Error(`Error in fetching header with method ${method}, status ${oXMLHttpRequest.status}, statusText ${oXMLHttpRequest.statusText} and error ${error}`));
-				};
-				oXMLHttpRequest.send(null);
-			});
+					});
+			} else {
+				return new Promise(function(resolve, reject) {
+					var oXMLHttpRequest = new window.XMLHttpRequest();
+					oXMLHttpRequest.open(sMethod, src, false);
+					oXMLHttpRequest.onload = function() {
+						var sStatus = oXMLHttpRequest.status;
+						if (sStatus === 200) {
+							var response = oXMLHttpRequest.getAllResponseHeaders().toLowerCase().trim();
+							var items = response.split("\n");
+							var responseHeader = [];
+							for (var i = 0; i < items.length; i++) {
+								var parts = items[i].split(': ');
+								responseHeader[parts[0].trim()] = parts[1].trim();
+							}
+							resolve(responseHeader['content-type']);
+						} else if (sStatus === 404) {
+							// If the HEAD request fails to fetch the content defined in source, an error event is triggered and LoadingError IllustratedMessage is displayed.
+							var error = new Error("Error fetching header: " + oXMLHttpRequest.statusText);
+							error.status = oXMLHttpRequest.status;
+							reject(error);
+						} else {
+							var error = new Error("Error in fetching header with method " + sMethod + ", status " + oXMLHttpRequest.status + " and statusText " + oXMLHttpRequest.statusText);
+							error.status = oXMLHttpRequest.status;
+							reject(error);
+						}
+					};
+					oXMLHttpRequest.onerror = function(error) {
+						var error = new Error("Error in fetching header with method " + sMethod + ", status " + oXMLHttpRequest.status + " and statusText " + oXMLHttpRequest.statusText);
+						error.status = oXMLHttpRequest.status;
+						reject(error);
+					};
+					oXMLHttpRequest.send(null);
+				});
+			}
 		};
 
 		/**
@@ -364,8 +394,8 @@ sap.ui.define([
 		 */
 		PDFViewer.prototype._onLoadListener = function (oEvent) {
 			try {
-				const oTarget = jQuery(oEvent.target);
-				let bContinue = true, sCurrentContentType = '';
+				var oTarget = jQuery(oEvent.target);
+				var bContinue = true, sCurrentContentType = '';
 
 				//HTML body.children can be accessed only in scenario when chrome://flags/#pdf-oopif = disabled OR invalid path given to the iframe src
 				try {
@@ -411,26 +441,36 @@ sap.ui.define([
 						this._fireErrorEvent(oEvent.target);
 					}
 				} else {
+					// Check if PDF plugin is enabled before proceeding
+					if (!PDFViewerRenderer._isPdfPluginEnabled()) {
+						this._fireErrorEvent(oEvent.target);
+						return;
+					}
 					//If chrome://flags/#pdf-oopif = enabled trigger the HEAD Request
-					const sMethod = 'HEAD';
+					var sMethod = 'HEAD';
 					this._getHeaderInfo(this._sParametrizedSource, sMethod)
-					.then((sCurrentContentType) => {
+					.then(function(sCurrentContentType) {
 						/*	LoadedEvent will be triggered if all the below criteria matches
 								1. If ContentType = "application/pdf" / "application/x-google-chrome-pdf".
 								2. If Browser PDFPlugin is enabled.
 							else the ErrorEvent will be triggered and LoadingError IllustratedMessage is displayed.
 						*/
-						if (PDFViewerRenderer._isSupportedMimeType(sCurrentContentType) && PDFViewerRenderer._isPdfPluginEnabled()) {
+						if (PDFViewerRenderer._isSupportedMimeType(sCurrentContentType)) {
 							this._fireLoadedEvent();
 						} else {
 							this._fireErrorEvent(oEvent.target);
 						}
-					}).catch((e) => {
-						//If Head Request fails ErrorEvent will be triggered and LoadingError IllustratedMessage is displayed.
-						this._fireErrorEvent(oEvent.target);
-						Log.fatal(e);
-						this.fireEvent("sourceValidationFailed", {}, true);
-					});
+					}.bind(this)).catch(function(error) {
+						if (error.status === 404) {
+							//If the HEAD Request fails to get the content defined in source, the ErrorEvent is triggered and LoadingError IllustratedMessage is displayed.
+							this._fireErrorEvent(oEvent.target);
+						} else {
+							// If the HEAD Requets fails for any other scenario, the default behaviour is to continue the display of PDF based on isTrustedSource.
+							Log.warning("PDF is displayed based on isTrustedSource property skipping the content type validation.");
+							this._fireLoadedEvent();
+							this.fireEvent("sourceValidationFailed", {}, true);
+						}
+					}.bind(this));
 				}
 			} catch (error) {
 				//Generic Error Handling

package/src/sap/m/Page.js

@@ -97,7 +97,7 @@ function(
 		 * @extends sap.ui.core.Control
 		 * @mixes sap.ui.core.ContextMenuSupport
 		 * @author SAP SE
-		 * @version 1.138.0
+		 * @version 1.140.0
 		 *
 		 * @public
 		 * @alias sap.m.Page

package/src/sap/m/PageAccessibleLandmarkInfo.js

@@ -22,7 +22,7 @@ sap.ui.define(['sap/ui/core/Element', './library'],
 	 * @extends sap.ui.core.Element
 	 *
 	 * @author SAP SE
-	 * @version 1.138.0
+	 * @version 1.140.0
 	 *
 	 * @constructor
 	 * @public

package/src/sap/m/PagingButton.js

@@ -27,7 +27,7 @@ sap.ui.define([
 		 * @extends sap.ui.core.Control
 		 *
 		 * @author SAP SE
-		 * @version 1.138.0
+		 * @version 1.140.0
 		 *
 		 * @constructor
 		 * @public

package/src/sap/m/Panel.js

@@ -68,7 +68,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.138.0
+	 * @version 1.140.0
 	 *
 	 * @constructor
 	 * @public