@openui5/sap.m 1.118.0 → 1.119.1

package/src/sap/m/upload/{UploadSetTableItem.js → UploadSetwithTableItem.js}

@@ -4,31 +4,35 @@
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 
-// Provides control sap.m.upload.UploadSetTableItem.
+// Provides control sap.m.upload.UploadSetwithTableItem.
 sap.ui.define([
 	"sap/m/ColumnListItem",
 	"sap/ui/core/IconPool",
-	"sap/m/upload/UploadSetTableItemRenderer",
-	"sap/base/Log"
-], function (ColumnListItem, IconPool, UploadSetTableItemRenderer, Log) {
+	"sap/m/upload/UploadSetwithTableItemRenderer",
+	"sap/base/Log",
+	"sap/ui/core/Core"
+], function (ColumnListItem, IconPool, UploadSetwithTableItemRenderer, Log, Core) {
     "use strict";
 
 	/**
-	 * Constructor for a new UploadSetTableItem.
+	 * Constructor for a new UploadSetwithTableItem.
 	 *
 	 * @param {string} [sId] ID for the new control, will be generated automatically if no ID is provided.
 	 * @param {object} [mSettings] Initial settings for the new control.
-	 * @class ColumnListItem that represents one item to be uploaded using the {@link sap.m.upload.UploadSetTable} control.
+	 * @class
+	 * <code>sap.m.UploadSetwithTableItem</code> represents one item to be uploaded using the {@link sap.m.upload.UploadSetwithTable UploadSetwithTable} control. This control can be used with the cells aggregation to create rows for the {@link sap.m.upload.UploadSetwithTable UploadSetwithTable} control. The columns aggregation of the sap.m.upload.UploadSetwithTable should match with the cells aggregation.
+	 * Note: This control should only be used within the {@link sap.m.upload.UploadSetwithTable UploadSetwithTable} control. The inherited counter property of sap.m.ListItemBase is not supported.
 	 * @extends sap.m.ColumnListItem
 	 * @author SAP SE
 	 * @constructor
 	 * @private
 	 * @experimental
 	 * @internal
-	 * @alias sap.m.upload.UploadSetTableItem
+	 * @alias sap.m.upload.UploadSetwithTableItem
 	 */
-    var UploadSetTableItem = ColumnListItem.extend("sap.m.upload.UploadSetTableItem", {
+    var UploadSetwithTableItem = ColumnListItem.extend("sap.m.upload.UploadSetwithTableItem", {
 			metadata: {
+				library: "sap.m",
 				properties: {
 					/**
 					 * Specifies the name of the uploaded file.
@@ -43,7 +47,7 @@ sap.ui.define([
 					 */
 					url: {type: "string", defaultValue: null},
 					/**
-					 * URL where the uploaded files will be stored. If empty, uploadUrl from the uploader is considered.
+					 * URL where the uploaded files are stored. If empty, uploadUrl from the uploader is considered.
 					 */
 					uploadUrl: {type: "string", defaultValue: null},
 					/**
@@ -53,7 +57,11 @@ sap.ui.define([
 					/**
 					 * Specifies whether the item can be previewed.
 					 */
-					previewable: {type: "boolean", defaultValue: true}
+					previewable: {type: "boolean", defaultValue: true},
+					/**
+					 * Specifies file size of the item in bytes.
+					 */
+					fileSize: {type: "float", defaultValue: 0}
 				},
 				aggregations: {
 					/**
@@ -62,14 +70,14 @@ sap.ui.define([
 					headerFields: {type: "sap.ui.core.Item", multiple: true, singularName: "headerField"}
 				}
 			},
-			render: UploadSetTableItemRenderer
+			render: UploadSetwithTableItemRenderer
     });
 
 	/* ================== */
 	/* Lifecycle handling */
 	/* ================== */
 
-    UploadSetTableItem.prototype.init = function () {
+    UploadSetwithTableItem.prototype.init = function () {
         ColumnListItem.prototype.init.apply(this, arguments);
 		this._oFileObject = null;
 		this._fFileSize = null;
@@ -78,18 +86,18 @@ sap.ui.define([
 		this._bNameLengthRestricted = false;
 		this._bSizeRestricted = false;
 		this._bMediaTypeRestricted = false;
-		this._oRb = sap.ui.getCore().getLibraryResourceBundle("sap.m");
+		this._oRb = Core.getLibraryResourceBundle("sap.m");
     };
 
-    UploadSetTableItem.prototype.onBeforeRendering = function () {
+    UploadSetwithTableItem.prototype.onBeforeRendering = function () {
         ColumnListItem.prototype.onBeforeRendering.apply(this, arguments);
     };
 
-	UploadSetTableItem.prototype.onAfterRendering = function() {
+	UploadSetwithTableItem.prototype.onAfterRendering = function() {
 		ColumnListItem.prototype.onAfterRendering.call(this);
 	};
 
-	UploadSetTableItem.prototype.exit = function() {
+	UploadSetwithTableItem.prototype.exit = function() {
 		ColumnListItem.prototype.exit.call(this);
 	};
 
@@ -97,7 +105,7 @@ sap.ui.define([
 	/* Overriden API methods */
 	/* ===================== */
 
-	UploadSetTableItem.prototype.setFileName = function (sFileName) {
+	UploadSetwithTableItem.prototype.setFileName = function (sFileName) {
 		if (this.getFileName() !== sFileName) {
 			this.setProperty("fileName", sFileName, true);
 			// File name related controls available no sooner than a parent is set
@@ -121,7 +129,7 @@ sap.ui.define([
 	 * @returns {File|Blob} File object.
 	 *
 	 */
-	UploadSetTableItem.prototype.getFileObject = function () {
+	UploadSetwithTableItem.prototype.getFileObject = function () {
 		return this._oFileObject;
 	};
 
@@ -129,7 +137,7 @@ sap.ui.define([
 	 * Previews pressed file.
 	 * @public
 	 */
-	UploadSetTableItem.prototype.openPreview = function () {
+	UploadSetwithTableItem.prototype.openPreview = function () {
 		this.getParent()?._openFilePreview(this);
 	};
 
@@ -139,7 +147,7 @@ sap.ui.define([
 	 * @public
 	 * @returns {boolean} <code>true</code> if download is possible, <code>false</code> otherwise.
 	 */
-	UploadSetTableItem.prototype.download = function (bAskForLocation) {
+	UploadSetwithTableItem.prototype.download = function (bAskForLocation) {
 		var oParent = this.getParent();
 		if (!oParent) {
 			Log.warning("Download cannot proceed without a parent association.");
@@ -150,14 +158,13 @@ sap.ui.define([
 	};
 
 	/**
-	 * Validates if the item is restricted, which means that it is restricted for the file type, media type, maximum file name length and maximum file size limit.
+	 * Validates if the item is restricted, to check if it is restricted for the file type, media type, maximum file name length and maximum file size limit.
 	 *
 	 * @public
-	 * @since 1.98
 	 * @returns {boolean} <code>true</code> if item is restricted, <code>false</code> otherwise.
 	 *
 	 */
-	UploadSetTableItem.prototype.isRestricted = function () {
+	UploadSetwithTableItem.prototype.isRestricted = function () {
 		return this._isRestricted();
 	};
 
@@ -165,7 +172,7 @@ sap.ui.define([
 	/* Private methods */
 	/* =============== */
 
-	UploadSetTableItem._getIconByMimeType = function(sMimeType, fileName) {
+	UploadSetwithTableItem._getIconByMimeType = function(sMimeType, fileName) {
 
 		var mimeTypeForImages = ["image/png", "image/tiff", "image/bmp", "image/jpeg", "image/gif"];
 
@@ -173,14 +180,14 @@ sap.ui.define([
 			if (mimeTypeForImages.indexOf(sMimeType) === -1) {
 				return IconPool.getIconForMimeType(sMimeType);
 			}
-			return UploadSetTableItem._getIconByFileType(fileName);
+			return UploadSetwithTableItem._getIconByFileType(fileName);
 		} else {
-			return UploadSetTableItem._getIconByFileType(fileName);
+			return UploadSetwithTableItem._getIconByFileType(fileName);
 		}
 	};
 
-	UploadSetTableItem._getIconByFileType = function (fileName) {
-		var sFileExtension = UploadSetTableItem._splitFileName(fileName).extension;
+	UploadSetwithTableItem._getIconByFileType = function (fileName) {
+		var sFileExtension = UploadSetwithTableItem._splitFileName(fileName).extension;
 		if (!sFileExtension) {
 			return "sap-icon://document";
 		}
@@ -190,7 +197,7 @@ sap.ui.define([
 			case "jpg" :
 			case "jpeg" :
 			case "png" :
-				return UploadSetTableItem.IMAGE_FILE_ICON;
+				return UploadSetwithTableItem.IMAGE_FILE_ICON;
 			case "csv" :
 			case "xls" :
 			case "xlsx" :
@@ -211,7 +218,7 @@ sap.ui.define([
 		}
 	};
 
-	UploadSetTableItem._splitFileName = function (sFileName, bWithDot) {
+	UploadSetwithTableItem._splitFileName = function (sFileName, bWithDot) {
 		var oResult = {};
 		var oRegex = /(?:\.([^.]+))?$/;
 		var aFileExtension = oRegex.exec(sFileName);
@@ -229,10 +236,11 @@ sap.ui.define([
 		return oResult;
 	};
 
-	UploadSetTableItem.prototype._setFileObject = function (oFileObject) {
+	UploadSetwithTableItem.prototype._setFileObject = function (oFileObject) {
 		this._oFileObject = oFileObject;
 		if (oFileObject) {
-			this._fFileSize = oFileObject.size / UploadSetTableItem.MEGABYTE;
+			this._fFileSize = oFileObject.size / UploadSetwithTableItem.MEGABYTE;
+			this.setFileSize(oFileObject.size);
 			this.setMediaType(oFileObject.type);
 		} else {
 			this._fFileSize = null;
@@ -249,7 +257,7 @@ sap.ui.define([
 	 * @param {int} iMaxLength Maximum length of file name.
 	 * @private
 	 */
-	UploadSetTableItem.prototype._checkNameLengthRestriction = function (iMaxLength) {
+	UploadSetwithTableItem.prototype._checkNameLengthRestriction = function (iMaxLength) {
 		var bRestricted = (iMaxLength && !!this.getFileName() && this.getFileName().length > iMaxLength);
 		if (bRestricted !== this._bNameLengthRestricted) {
 			this._bNameLengthRestricted = bRestricted;
@@ -265,7 +273,7 @@ sap.ui.define([
 	 * @param {float} fMaxSize Maximum file size allowed in megabytes.
 	 * @private
 	 */
-	UploadSetTableItem.prototype._checkSizeRestriction = function (fMaxSize) {
+	UploadSetwithTableItem.prototype._checkSizeRestriction = function (fMaxSize) {
 		var bRestricted = (fMaxSize && this._fFileSize > fMaxSize);
 		if (bRestricted !== this._bSizeRestricted) {
 			this._bSizeRestricted = bRestricted;
@@ -281,7 +289,7 @@ sap.ui.define([
 	 * @param {string[]} aTypes List of allowed mime types.
 	 * @private
 	 */
-	UploadSetTableItem.prototype._checkMediaTypeRestriction = function (aTypes) {
+	UploadSetwithTableItem.prototype._checkMediaTypeRestriction = function (aTypes) {
 		var bRestricted = (!!aTypes && (aTypes.length > 0) && !!this.getMediaType() && aTypes.indexOf(this.getMediaType()) === -1);
 		if (bRestricted !== this._bMediaTypeRestricted) {
 			this._bMediaTypeRestricted = bRestricted;
@@ -297,8 +305,8 @@ sap.ui.define([
 	 * @param {string[]} aTypes List of allowed file types.
 	 * @private
 	 */
-	UploadSetTableItem.prototype._checkTypeRestriction = function (aTypes) {
-		var oFile = UploadSetTableItem._splitFileName(this.getFileName()),
+	UploadSetwithTableItem.prototype._checkTypeRestriction = function (aTypes) {
+		var oFile = UploadSetwithTableItem._splitFileName(this.getFileName()),
 			bRestricted =
 				(!!this.getFileName() && !!aTypes && (aTypes.length > 0)
 					&& oFile.extension && aTypes.indexOf(oFile.extension.toLowerCase()) === -1);
@@ -311,12 +319,12 @@ sap.ui.define([
 		}
 	};
 
-	UploadSetTableItem.prototype._isRestricted = function () {
+	UploadSetwithTableItem.prototype._isRestricted = function () {
 		return this._bFileTypeRestricted || this._bNameLengthRestricted || this._bSizeRestricted || this._bMediaTypeRestricted;
 	};
 
-    UploadSetTableItem.IMAGE_FILE_ICON = "sap-icon://card";
-	UploadSetTableItem.MEGABYTE = 1048576;
+    UploadSetwithTableItem.IMAGE_FILE_ICON = "sap-icon://card";
+	UploadSetwithTableItem.MEGABYTE = 1048576;
 
-    return UploadSetTableItem;
+    return UploadSetwithTableItem;
 });

package/src/sap/m/upload/{UploadSetTableItemRenderer.js → UploadSetwithTableItemRenderer.js}

@@ -8,15 +8,16 @@ sap.ui.define(["sap/ui/core/Renderer", "sap/m/ColumnListItemRenderer", "sap/m/Li
 	"use strict";
 
 	/**
-	 * UploadSetTableItem renderer.
+	 * UploadSetwithTableItem renderer.
 	 * @namespace
 	 */
-	var UploadSetTableItemRenderer = Renderer.extend(ColumnListItemRenderer);
-	UploadSetTableItemRenderer.apiVersion = 2;
+	var UploadSetwithTableItemRenderer = Renderer.extend(ColumnListItemRenderer);
+	UploadSetwithTableItemRenderer.apiVersion = 2;
 
-    UploadSetTableItemRenderer.render = function(rm, oLI) {
+    UploadSetwithTableItemRenderer.render = function(rm, oLI) {
+		oLI.addStyleClass("SapMUSTI");
 		ColumnListItemRenderer.render.apply(this, arguments);
 	};
     // enable in-place DOM patching
-	return UploadSetTableItemRenderer;
+	return UploadSetwithTableItemRenderer;
 }, /* bExport= */ true);

package/src/sap/m/upload/{UploadSetTableRenderer.js → UploadSetwithTableRenderer.js}

@@ -9,26 +9,23 @@ sap.ui.define(["sap/ui/core/Renderer", "sap/m/TableRenderer", "sap/m/Table"
 	"use strict";
 
 	/**
-	 * UploadSetTable renderer.
+	 * UploadSetwithTable renderer.
 	 * @namespace
 	 */
-	var UploadSetTableRenderer = Renderer.extend(TableRenderer);
-	UploadSetTableRenderer.apiVersion = 2; // enable in-place DOM patching
+	var UploadSetwithTableRenderer = Renderer.extend(TableRenderer);
+	UploadSetwithTableRenderer.apiVersion = 2; // enable in-place DOM patching
 
 
 	/**
 	 * Renders the HTML for the given control, using the provided {@link sap.ui.core.RenderManager}.
 	 *
 	 * @param {sap.ui.core.RenderManager} oRm the RenderManager that can be used for writing to the render output buffer.
-	 * @param {sap.m.upload.UploadSetTable} oControl an object representation of the control that should be rendered.
+	 * @param {sap.m.upload.UploadSetwithTable} oControl an object representation of the control that should be rendered.
 	 */
-	UploadSetTableRenderer.render = function (oRm, oControl) {
-		oRm.openStart("div",oControl);
-		oRm.class("sapMUST");
-		oRm.openEnd();
+	UploadSetwithTableRenderer.render = function (oRm, oControl) {
+		oControl.addStyleClass("sapMUST");
 		TableRenderer.render.apply(this,arguments);
-		oRm.close("div");
 	};
 
-	return UploadSetTableRenderer;
+	return UploadSetwithTableRenderer;
 });

package/src/sap/m/upload/UploaderTableItem.js

@@ -10,7 +10,7 @@ sap.ui.define([
 	"sap/ui/core/Element",
 	"sap/ui/core/util/File",
 	"sap/ui/Device",
-	"sap/m/upload/UploadSetTableItem",
+	"sap/m/upload/UploadSetwithTableItem",
 	"sap/m/upload/UploaderHttpRequestMethod"
 ], function (Log, MobileLibrary, Element, FileUtil, Device, UploadSetItem, UploaderHttpRequestMethod) {
 	"use strict";
@@ -40,48 +40,46 @@ sap.ui.define([
 				 */
 				uploadUrl: {type: "string", defaultValue: null},
 				/**
-				 * URL where the next file is going to be download from.
+				 * URL where the next file is going to be downloaded from.
 				 */
 				downloadUrl: {type: "string", defaultValue: null},
 				/**
 				 * HTTP request method chosen for file upload.
-				 * @since 1.90
 				 */
 				httpRequestMethod: {type: "sap.m.upload.UploaderHttpRequestMethod", defaultValue: UploaderHttpRequestMethod.Post},
 				/**
 				* This property decides the type of request. If set to "true", the request gets sent as a multipart/form-data request instead of file only request.
-				* @since 1.92
 				*/
 				useMultipart: { type: "boolean", defaultValue: false }
             },
 			events: {
 				/**
-				 * The event is fired just after the POST request was sent.
+				 * The event is fired just after the POST request is sent.
 				 */
 				uploadStarted: {
 					parameters: {
 						/**
 						 * The item that is going to be uploaded.
 						 */
-						item: {type: "sap.m.upload.UploadSetTableItem"}
+						item: {type: "sap.m.upload.UploadSetwithTableItem"}
 					}
 				},
 				/**
-				 * The event is fired every time an XHR request reports progress in uploading.
+				 * The event is fired every time an XHR request reports progress while uploading.
 				 */
 				uploadProgressed: {
 					parameters: {
 						/**
 						 * The item that is being uploaded.
 						 */
-						item: {type: "sap.m.upload.UploadSetTableItem"},
+						item: {type: "sap.m.upload.UploadSetwithTableItem"},
 						/**
 						 * The number of bytes transferred since the beginning of the operation.
 						 * This doesn't include headers and other overhead, but only the content itself
 						 */
 						loaded: {type: "int"},
 						/**
-						 * The total number of bytes of content that will be transferred during the operation.
+						 * The total number of bytes of content that is transferred during the operation.
 						 * If the total size is unknown, this value is zero.
 						 */
 						total: {type: "int"}
@@ -95,7 +93,7 @@ sap.ui.define([
 						/**
 						 * The item that was uploaded.
 						 */
-						item: {type: "sap.m.upload.UploadSetTableItem"},
+						item: {type: "sap.m.upload.UploadSetwithTableItem"},
 						/**
 						 * A JSON object containing the additional response parameters like response, responseXML, readyState, status and headers.
 						 * <i>Sample response object:</i>
@@ -121,12 +119,12 @@ sap.ui.define([
 	};
 
 	/**
-	 * Starts function for uploading one file object to given url. Returns promise that resolves when the upload is finished or rejects when the upload fails.
+	 * Starts the function for uploading one file object to a given URL. Returns promise that is resolved when the upload is finished, or is rejected when the upload fails.
 	 *
-	 * @param {File|Blob} oFile File or Blob object to be uploaded.
+	 * @param {File|Blob} oFile File or blob object to be uploaded.
 	 * @param {string} sUrl Upload Url.
 	 * @param {sap.ui.core.Item[]} [aHeaderFields] Collection of request header fields to be send along.
-	 * @returns {Promise} Promise that resolves when the upload is finished or rejects when the upload fails.
+	 * @returns {Promise} Promise that is resolved when the upload is finished, or is rejected when the upload fails.
 	 * @public
 	 */
 	Uploader.uploadFile = function (oFile, sUrl, aHeaderFields) {
@@ -163,7 +161,7 @@ sap.ui.define([
 	/**
 	 * Starts the process of uploading the specified file.
 	 *
-	 * @param {sap.m.upload.UploadSetTableItem} oItem Item representing the file to be uploaded.
+	 * @param {sap.m.upload.UploadSetwithTableItem} oItem Item representing the file to be uploaded.
 	 * @param {sap.ui.core.Item[]} [aHeaderFields] Collection of request header fields to be send along.
 	 * @public
 	 */
@@ -231,16 +229,16 @@ sap.ui.define([
 	/**
 	 * Starts the process of downloading a file.
 	 *
-	 * @param {sap.m.upload.UploadSetTableItem} oItem Item representing the file to be downloaded.
+	 * @param {sap.m.upload.UploadSetwithTableItem} oItem Item representing the file to be downloaded.
 	 * @param {sap.ui.core.Item[]} aHeaderFields List of header fields to be added to the GET request.
-	 * @param {boolean} bAskForLocation True if the location to where download the file should be first queried by a browser dialog.
-	 * @return {boolean} True if the download process successfully
+	 * @param {boolean} bAskForLocation If it is true, the location of where the file is to be downloaded is queried by a browser dialog.
+	 * @return {boolean} It returns true if the download is processed successfully
 	 * @public
 	 */
 	Uploader.prototype.download = function (oItem, aHeaderFields, bAskForLocation) {
 		var sUrl = this.getDownloadUrl() || oItem.getUrl();
 
-		// File.save doesn't work in Safari but URLHelper.redirect does work.
+		// File.save doesn't work in Safari, however, URLHelper.redirect works.
 		// So, this overwrites the value of bAskForLocation in order to make it work.
 		if (Device.browser.name === "sf") {
 			bAskForLocation = false;