@openui5/sap.m 1.93.3 → 1.96.2

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

@@ -4,11 +4,6 @@
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 
-// Ensure that sap.ui.unified is loaded before the module dependencies will be required.
-// Loading it synchronously is the only compatible option and doesn't harm when sap.ui.unified
-// already has been loaded asynchronously (e.g. via a dependency declared in the manifest)
-sap.ui.getCore().loadLibrary("sap.ui.unified");
-
 sap.ui.define([
 	"sap/ui/core/Control",
 	"sap/ui/core/Icon",
@@ -44,7 +39,7 @@ sap.ui.define([
 	 * and requests, unified behavior of instant and deferred uploads, as well as improved progress indication.
 	 * @extends sap.ui.core.Control
 	 * @author SAP SE
-	 * @version 1.93.3
+	 * @version 1.96.2
 	 * @constructor
 	 * @public
 	 * @since 1.63
@@ -338,7 +333,8 @@ sap.ui.define([
 					}
 				}
 			}
-		}
+		},
+		renderer: Renderer
 	});
 
 	var UploadState = MobileLibrary.UploadState;
@@ -494,17 +490,18 @@ sap.ui.define([
 	};
 
 	UploadSet.prototype.removeAggregation = function (sAggregationName, oObject, bSuppressInvalidate) {
-		var oListItem;
-		Control.prototype.removeAggregation.call(this, sAggregationName, oObject, bSuppressInvalidate);
-		if (oObject && (sAggregationName === "items" || sAggregationName === "incompleteItems")) {
-			oListItem = oObject._getListItem();
-			var oItem = this.getList().removeAggregation("items", oListItem, bSuppressInvalidate);
-			if (oItem) {
-				oItem.destroy();
-			}
-			this._refreshInnerListStyle();
-		}
-	};
+        var oListItem;
+        Control.prototype.removeAggregation.call(this, sAggregationName, oObject, bSuppressInvalidate);
+        if (oObject && (sAggregationName === "items" || sAggregationName === "incompleteItems")) {
+            oListItem = oObject._getListItem();
+            var oItem = this.getList().removeAggregation("items", oListItem, bSuppressInvalidate);
+            if (oItem && oObject) {
+                oObject.destroy();
+                oItem.destroy();
+            }
+            this._refreshInnerListStyle();
+        }
+    };
 
 	UploadSet.prototype.removeAllAggregation = function (sAggregationName, bSuppressInvalidate) {
 		if (sAggregationName === "items") {
@@ -685,7 +682,10 @@ sap.ui.define([
 				uploadStart: [this._onUploadStarted, this],
 				uploadProgress: [this._onUploadProgressed, this],
 				uploadComplete: [this._onUploadCompleted, this],
-				uploadAborted: [this._onUploadAborted, this]
+				uploadAborted: [this._onUploadAborted, this],
+				typeMissmatch: [this._fireFileTypeMismatch, this],
+				fileSizeExceed: [this._fireFileSizeExceed, this],
+				filenameLengthExceed: [this._fireFilenameLengthExceed, this]
 			});
 		}
 
@@ -728,6 +728,7 @@ sap.ui.define([
 	UploadSet.prototype._onUploadCompleted = function (oEvent) {
 		var oItem = oEvent.getParameter("item");
 		oItem.setProgress(100);
+		this.insertItem(oItem, 0);
 		oItem.setUploadState(UploadState.Complete);
 		this.fireUploadCompleted({item: oItem});
 	};
@@ -775,7 +776,7 @@ sap.ui.define([
 		}
 
 		if (oFile.name !== sNewFileName) {
-			sNewFullName = sNewFileName + "." + oFile.extension;
+			sNewFullName = oFile.extension ? sNewFileName + "." + oFile.extension : sNewFileName;
 			oItem.setFileName(sNewFullName);
 		}
 		oItem._setContainsError(false);
@@ -1098,9 +1099,8 @@ sap.ui.define([
 	};
 
 	UploadSet.prototype._checkRestrictions = function () {
-		this.getItems().forEach(function (oItem) {
-			this._checkRestrictionsForItem(oItem);
-		}.bind(this));
+		// this will only check the restriction for the newly uploaded files
+		// or files for which the upload is pending
 		this.getIncompleteItems().forEach(function (oItem) {
 			this._checkRestrictionsForItem(oItem);
 		}.bind(this));
@@ -1113,5 +1113,30 @@ sap.ui.define([
 		oItem._checkMediaTypeRestriction(this.getMediaTypes());
 	};
 
+	UploadSet.prototype._fireFileTypeMismatch = function (oItem) {
+		var aMediaTypes = this.getMediaTypes();
+		var aFileTypes = this.getFileTypes();
+
+		var sFileType = oItem.getParameter("fileType");
+		var sMediaType = oItem.getParameter("mimeType");
+
+		var bMediaRestricted = (!!aMediaTypes && (aMediaTypes.length > 0) && !!sMediaType && aMediaTypes.indexOf(sMediaType) === -1);
+		var bFileRestricted = (!!aFileTypes && (aFileTypes.length > 0) && !!sFileType && aFileTypes.indexOf(sFileType) === -1);
+
+		if (bMediaRestricted){
+			this.fireMediaTypeMismatch({item: oItem});
+		} else if (bFileRestricted){
+			this.fireFileTypeMismatch({item: oItem});
+		}
+	};
+
+	UploadSet.prototype._fireFileSizeExceed = function (oItem) {
+		this.fireFileSizeExceeded({item: oItem});
+	};
+
+	UploadSet.prototype._fireFilenameLengthExceed = function (oItem) {
+		this.fireFileNameLengthExceeded({item: oItem});
+	};
+
 	return UploadSet;
 });

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

@@ -36,7 +36,7 @@ sap.ui.define([
 	 * @class Item that represents one file to be uploaded using the {@link sap.m.upload.UploadSet} control.
 	 * @extends sap.ui.core.Element
 	 * @author SAP SE
-	 * @version 1.93.3
+	 * @version 1.96.2
 	 * @constructor
 	 * @public
 	 * @since 1.63
@@ -170,7 +170,7 @@ sap.ui.define([
 				}
 				oRm.openEnd();
 
-				oRm.openStart("div").style("display", "flex").openEnd();
+				oRm.openStart("div").class("sapMUSTextInnerContainer").openEnd();
 				oRm.renderControl(oItem._bInEditMode ? oItem._getFileNameEdit() : oItem._getFileNameLink());
 				oItem._renderMarkers(oRm);
 				oRm.close("div");
@@ -668,7 +668,12 @@ sap.ui.define([
 		var oResult = {};
 		var oRegex = /(?:\.([^.]+))?$/;
 		var aFileExtension = oRegex.exec(sFileName);
-		oResult.name = sFileName.slice(0, sFileName.indexOf(aFileExtension[0]));
+		if (!aFileExtension[0]) {
+			aFileExtension[0] = "";
+			oResult.name = sFileName;
+		} else {
+			oResult.name = sFileName ? sFileName.slice(0, sFileName.indexOf(aFileExtension[0])) : "";
+		}
 		if (bWithDot) {
 			oResult.extension = aFileExtension[0];
 		} else {
@@ -816,7 +821,7 @@ sap.ui.define([
 			oRm.openStart("div").class("sapMUCAttrContainer").openEnd();
 			this.getAttributes().forEach(function (oAttribute, iIndex) {
 				oRm.renderControl(oAttribute.addStyleClass("sapMUCAttr"));
-				if (iIndex < iLastAttribure) {
+				if (iIndex < iLastAttribure && oAttribute.getVisible()) {
 					oRm.openStart("div").class("sapMUCSeparator").openEnd();
 					oRm.text("\u00a0\u00B7\u00a0").close("div");
 				}

package/ui5.yaml

@@ -1,5 +1,5 @@
 ---
-specVersion: "1.1"
+specVersion: "2.0"
 type: library
 metadata:
   name: sap.m
@@ -7,3 +7,6 @@ metadata:
    OpenUI5
     * (c) Copyright 2009-${currentYear} SAP SE or an SAP affiliate company.
     * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
+resources:
+  configuration:
+    propertiesFileSourceEncoding: ISO-8859-1

package/src/sap/m/ios7.js

@@ -1,199 +0,0 @@
-/*!
- * OpenUI5
- * (c) Copyright 2009-2021 SAP SE or an SAP affiliate company.
- * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
- */
-/*global window, document *///declare unusual global vars for JSLint/SAPUI5 validation
-
-sap.ui.define(["sap/ui/core/IntervalTrigger", "sap/ui/thirdparty/jquery", "sap/ui/base/EventProvider", "sap/ui/Device"],
-	function(IntervalTrigger, jQuery, EventProvider, Device) {
-	"use strict";
-
-
-
-		var _Ios7 = EventProvider.extend("sap.m._Ios7", {
-			/**
-			 * IOS 7 behaves strange if the keyboard is open and you do an orientation change:
-			 * There will be a black space below the page and it will scroll away from the top in this case.
-			 * That's why we scroll to the top on orientation change.
-			 * We also need to catch blur since if you do orientation change with keyboard open, close the Keyboard, Open it on another input,
-			 * the black box will appear again. Since closing the keyboard will fire blur, we attach on this one.
-			 * @private
-			 */
-			constructor : function() {
-				var bIsIOS7Safari = Device.os.ios && Device.os.version >= 7 && Device.os.version < 8 && Device.browser.name === "sf";
-
-				//call the base to properly init the event registry
-				EventProvider.apply(this);
-
-				if (!bIsIOS7Safari) {
-					return;
-				}
-
-				this._bIntervallAttached = false;
-				this._bInputIsOpen = false;
-				this._bNavigationBarEventFired = false;
-
-				var bIsLandscape = window.orientation === 90 || window.orientation === -90;
-				if (bIsLandscape) {
-					this._attachNavigationBarPolling();
-				}
-
-				Device.orientation.attachHandler(this._onOrientationChange, this);
-
-				this._onFocusin =  jQuery.proxy(this._onFocusin, this);
-				document.addEventListener("focusin", this._onFocusin , true);
-
-				this._onFocusout = jQuery.proxy(this._onFocusout, this);
-				//attach this event in the capturing phase, so noone can stop propagation
-				document.addEventListener("focusout", this._onFocusout, true);
-			}
-		});
-
-		/*****************************
-		internals
-		*****************************/
-		/**
-		 * gets the height of the navigation bar in px. Only returns a number < 0 in landscape mode - will return 0 for portrait mode or if no navigation bar is shown.
-		 * @internal
-		 * @returns {int} the height of the navigation bar
-		 */
-		_Ios7.prototype.getNavigationBarHeight = function () {
-			if (!this._bNavigationBarEventFired) {
-				return 0;
-			}
-			return this._iNavigationBarHeight;
-		};
-
-		/*****************************
-		privates
-		*****************************/
-
-		_Ios7.prototype._attachNavigationBarPolling = function () {
-			if (!Device.system.phone || this._bIntervallAttached) {
-				return;
-			}
-
-			IntervalTrigger.addListener(this._detectNavigationBar, this);
-			this._bIntervallAttached = true;
-		};
-
-		_Ios7.prototype._detachNavigationBarPolling = function () {
-			if (!Device.system.phone || !this._bIntervallAttached) {
-				return;
-			}
-
-			IntervalTrigger.removeListener(this._detectNavigationBar, this);
-			this._bIntervallAttached = false;
-		};
-
-		//We cannot turn this off in landscape mode, since the inner and outer height might be different when the soft-keyboard pops up.
-		//So we need to do a lot of unnecessary scrolls, since keyboard and navigation bar cannot be distinguished.
-		_Ios7.prototype._detectNavigationBar = function () {
-			var iHeightDifference = window.outerHeight - window.innerHeight;
-
-			if (iHeightDifference === 0 || this._bInputIsOpen || this._bNavigationBarEventFired) {
-				this._iPreviousHeight = null;
-				return;
-			}
-
-			if (this._iPreviousHeight === window.innerHeight) {
-				window.scrollTo(0,0);
-				var iNewWindowHeightDifference = window.outerHeight - window.innerHeight;
-				if (iHeightDifference !== iNewWindowHeightDifference) {
-					return;
-				}
-
-				this._iNavigationBarHeight = iHeightDifference;
-				this._bNavigationBarEventFired = true;
-				this.fireEvent("navigationBarShownInLandscape", { barHeight : iHeightDifference });
-				this._detachNavigationBarPolling();
-				this._iPreviousHeight = null;
-			} else {
-				this._iPreviousHeight = window.innerHeight;
-			}
-		};
-
-		_Ios7.prototype.destroy = function() {
-			EventProvider.prototype.destroy.apply(this, arguments);
-
-			document.removeEventListener("focusin", this._onFocusin , true);
-			document.removeEventListener("focusout", this._onFocusout, true);
-		};
-		/*****************************
-		window / document event handling
-		*****************************/
-
-		/**
-		 * @param oEvent the native focusin event
-		 * @private
-		 */
-		_Ios7.prototype._onFocusin = function (oEvent) {
-			var sTagName = oEvent.target.tagName;
-
-			if (!_Ios7._rTagRegex.test(sTagName)) {
-				return;
-			}
-
-			//we have to disable polling while the keyboard is open since scrollTop(0,0) will scroll the input out of the users view
-			this._inputTarget = oEvent.target;
-			this._detachNavigationBarPolling();
-			this._bInputIsOpen = true;
-			this.fireEvent("inputOpened");
-		};
-
-		_Ios7._rTagRegex = /INPUT|TEXTAREA|SELECT/;
-
-		/**
-		 * @param oEvent the native focusout event
-		 * @private
-		 */
-		_Ios7.prototype._onFocusout = function (oEvent) {
-			var sTagName = oEvent.srcElement.tagName,
-				oRelated = oEvent.relatedTarget,
-				sRelatedTag = (oRelated && (oRelated.getAttribute("readonly") === null) && (oRelated.getAttribute("disabled") === null)) ? oRelated.tagName : "";
-
-			//only handle the focusout for elements that can bring up a soft-keyboard
-			//there are a lot of input types that might not bring up the soft-keyboard - checking for them might be a bit too much
-			if (_Ios7._rTagRegex.test(sTagName) && !_Ios7._rTagRegex.test(sRelatedTag)) {
-				window.scrollTo(0,0);
-
-				//Attach the polling again, since it was disabled in the focus in. But only do it in landscape.
-				if (window.orientation === 90 || window.orientation === -90) {
-					this._attachNavigationBarPolling();
-				}
-
-				this._bInputIsOpen = false;
-				this.fireEvent("inputClosed");
-			}
-		};
-
-		/**
-		 * handles the orientation change
-		 * @private
-		 */
-		_Ios7.prototype._onOrientationChange = function (oEvent) {
-			var bIsLandscape = oEvent.landscape;
-
-			window.scrollTo(0,0);
-
-			this._bNavigationBarEventFired = false;
-
-			//The page gets messed up if the softkeyboard is opened
-			if (this._bInputIsOpen && this._inputTarget && this._inputTarget.blur) {
-				this._inputTarget.blur();
-			} else if (bIsLandscape) {
-				this._attachNavigationBarPolling();
-				//in landscape mode the navigation bar is visible anyways - disable the polling
-			} else if (!bIsLandscape) {
-				this._detachNavigationBarPolling();
-			}
-		};
-
-		//expose the singleton
-		var ios7 = new _Ios7();
-
-
-	return ios7;
-
-}, /* bExport= */ true);