@openui5/sap.ui.core 1.98.0 → 1.101.0

package/src/sap/ui/core/delegate/ScrollEnablement.js

@@ -58,7 +58,7 @@ sap.ui.define([
 		 *
 		 * @protected
 		 * @alias sap.ui.core.delegate.ScrollEnablement
-		 * @version 1.98.0
+		 * @version 1.101.0
 		 * @author SAP SE
 		 */
 		var ScrollEnablement = BaseObject.extend("sap.ui.core.delegate.ScrollEnablement", /** @lends sap.ui.core.delegate.ScrollEnablement.prototype */ {
@@ -217,12 +217,12 @@ sap.ui.define([
 			},
 			/**
 			 * Scrolls to a specific position in scroll container.
-			 * @param {int} iHorizontalPosition Horizontal position of the scrollbar
-			 * @param {int} iVerticalPosition Vertical position of the scrollbar
-			 * @param {int} [iTime=0]
+			 * @param {int} x Horizontal position of the scrollbar
+			 * @param {int} y Vertical position of the scrollbar
+			 * @param {int} [time=0]
 			 *           The duration of animated scrolling in milliseconds. To scroll immediately without animation,
 			 *           give 0 as value.
-			 * @param {function} fnCallback
+			 * @param {function} fnScrollEndCallback
 			 * @returns {this}
 			 * @public
 			 */
@@ -246,7 +246,10 @@ sap.ui.define([
 					$OffsetParent = $Element.offsetParent(),
 					oAddUpPosition;
 
-				while (!$OffsetParent.is(this._$Container)) {
+				// Not positioned elements (position = "unset" or "fixed") are skipped and not returned as offsetParent.
+				// If the this._$Container is not positioned this function ends in infinite loop.
+				// Last value returned from offsetParent is the root html element or null.
+				while (!$OffsetParent.is(this._$Container) && !$OffsetParent.is("html") && $OffsetParent.length) {
 					oAddUpPosition = $OffsetParent.position();
 					oElementPosition.top += oAddUpPosition.top;
 					oElementPosition.left += oAddUpPosition.left;

package/src/sap/ui/core/dnd/DragAndDrop.js

@@ -4,15 +4,18 @@
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 sap.ui.define([
+	"../library",
 	"sap/ui/Device",
 	"../UIArea",
 	"sap/ui/thirdparty/jquery",
 	// jQuery Plugin "control"
 	"sap/ui/dom/jquery/control"
 ],
-function(Device, UIArea, jQuery) {
+function(lib, Device, UIArea, jQuery) {
 	"use strict";
 
+	var RelativeDropPosition = lib.dnd.RelativeDropPosition;
+
 	/**
 	 * Contains classes and helpers related to drag & drop functionality.
 	 *
@@ -267,7 +270,7 @@ function(Device, UIArea, jQuery) {
 			/**
 			 * Returns the calculated position of the drop action relative to the valid dropped control.
 			 *
-			 * @returns {string}
+			 * @returns {sap.ui.core.dnd.RelativeDropPosition}
 			 * @protected
 			 */
 			getDropPosition: function() {
@@ -323,7 +326,7 @@ function(Device, UIArea, jQuery) {
 			};
 
 		if (!sDropPosition || sDropPosition == "On") {
-			sRelativePosition = "On";
+			sRelativePosition = RelativeDropPosition.On;
 			sDropLayout = "";
 		} else if (sDropLayout == "Horizontal") {
 			var iCursorX = oEvent.pageX - mDropRect.left;
@@ -333,27 +336,27 @@ function(Device, UIArea, jQuery) {
 			if (sDropPosition == "Between") {
 				mStyle.width = "";
 				if (iCursorX < mDropRect.width * 0.5) {
-					sRelativePosition = "Before";
+					sRelativePosition = RelativeDropPosition.Before;
 					mStyle.left = mDropRect.left;
 				} else {
-					sRelativePosition = "After";
+					sRelativePosition = RelativeDropPosition.After;
 					mStyle.left = mDropRect.right;
 				}
 			} else if (sDropPosition == "OnOrBetween") {
 				if (iCursorX < mDropRect.width * 0.25) {
-					sRelativePosition = "Before";
+					sRelativePosition = RelativeDropPosition.Before;
 					mStyle.left = mDropRect.left;
 					mStyle.width = "";
 				} else if (iCursorX > mDropRect.width * 0.75) {
-					sRelativePosition = "After";
+					sRelativePosition = RelativeDropPosition.After;
 					mStyle.left = mDropRect.right;
 					mStyle.width = "";
 				} else {
-					sRelativePosition = "On";
+					sRelativePosition = RelativeDropPosition.On;
 				}
 			}
-			if (sRelativePosition != "On" && sap.ui.getCore().getConfiguration().getRTL()) {
-				sRelativePosition = (sRelativePosition == "After") ? "Before" : "After";
+			if (sRelativePosition != RelativeDropPosition.On && sap.ui.getCore().getConfiguration().getRTL()) {
+				sRelativePosition = (sRelativePosition == RelativeDropPosition.After) ? RelativeDropPosition.Before : RelativeDropPosition.After;
 			}
 		} else {
 			var iCursorY = oEvent.pageY - mDropRect.top;
@@ -363,23 +366,23 @@ function(Device, UIArea, jQuery) {
 			if (sDropPosition == "Between") {
 				mStyle.height = "";
 				if (iCursorY < mDropRect.height * 0.5) {
-					sRelativePosition = "Before";
+					sRelativePosition = RelativeDropPosition.Before;
 					mStyle.top = mDropRect.top;
 				} else {
-					sRelativePosition = "After";
+					sRelativePosition = RelativeDropPosition.After;
 					mStyle.top = mDropRect.bottom;
 				}
 			} else if (sDropPosition == "OnOrBetween") {
 				if (iCursorY < mDropRect.height * 0.25) {
-					sRelativePosition = "Before";
+					sRelativePosition = RelativeDropPosition.Before;
 					mStyle.top = mDropRect.top;
 					mStyle.height = "";
 				} else if (iCursorY > mDropRect.height * 0.75) {
-					sRelativePosition = "After";
+					sRelativePosition = RelativeDropPosition.After;
 					mStyle.top = mDropRect.bottom;
 					mStyle.height = "";
 				} else {
-					sRelativePosition = "On";
+					sRelativePosition = RelativeDropPosition.On;
 				}
 			}
 		}
@@ -388,7 +391,7 @@ function(Device, UIArea, jQuery) {
 			return sRelativePosition;
 		}
 
-		if (sRelativePosition == "On") {
+		if (sRelativePosition == RelativeDropPosition.On) {
 			mStyle.top = mDropRect.top;
 			mStyle.left = mDropRect.left;
 			mStyle.width = mDropRect.width;
@@ -456,9 +459,11 @@ function(Device, UIArea, jQuery) {
 		// allow dropping
 		oEvent.preventDefault();
 
-		// set visual drop indicator from drop info
-		var sDropEffect = oDropInfo.getDropEffect().toLowerCase();
-		oEvent.originalEvent.dataTransfer.dropEffect = sDropEffect;
+		// set visual drop indicator from the drop info in case of the dragged source is a control
+		if (oDragControl) {
+			var sDropEffect = oDropInfo.getDropEffect().toLowerCase();
+			oEvent.originalEvent.dataTransfer.dropEffect = sDropEffect;
+		}
 	}
 
 	function showDropPosition(oEvent, oDropInfo, oValidDropControl) {
@@ -542,9 +547,9 @@ function(Device, UIArea, jQuery) {
 			return;
 		}
 
-		// firefox needs data set to allow dragging
-		if (Device.browser.firefox && oEvent.originalEvent.dataTransfer.types.length === 0) {
-			oEvent.originalEvent.dataTransfer.setData("ui5/dummyDataForFirefox", "data");
+		// mobile devices needs text data set on the dataTransfer object to allow dragging
+		if (!Device.system.desktop && !oEvent.originalEvent.dataTransfer.getData("text")) {
+			oEvent.originalEvent.dataTransfer.setData("text", "");
 		}
 
 		// create the drag session object and attach to the event

package/src/sap/ui/core/dnd/DragDropBase.js

@@ -25,7 +25,6 @@ sap.ui.define([
 	 * This feature enables a native HTML5 drag-and-drop API for the controls, therefore it is limited to browser support.
 	 * <h3>Restrictions</h3>
 	 * <ul>
-	 *   <li>There is no mobile device that supports drag and drop.</li>
 	 *   <li>There is no accessible alternative for drag and drop. Applications which use the drag-and-drop functionality must provide an
 	 *   accessible alternative UI (for example, action buttons or menus) to perform the same operations.</li>
 	 *   <li>Transparency of the drag ghost element and the cursor during drag-and-drop operations depends on the browser implementation.</li>
@@ -38,7 +37,7 @@ sap.ui.define([
 	 *
 	 * @extends sap.ui.core.Element
 	 * @author SAP SE
-	 * @version 1.98.0
+	 * @version 1.101.0
 	 *
 	 * @public
 	 * @since 1.52

package/src/sap/ui/core/dnd/DragDropInfo.js

@@ -22,7 +22,7 @@ sap.ui.define(["./DragInfo", "./DropInfo", "sap/ui/Device", "sap/base/Log"],
 	 * @extends sap.ui.core.dnd.DropInfo
 	 *
 	 * @author SAP SE
-	 * @version 1.98.0
+	 * @version 1.101.0
 	 *
 	 * @public
 	 * @since 1.52

package/src/sap/ui/core/dnd/DragInfo.js

@@ -22,7 +22,7 @@ sap.ui.define(["./DragDropBase"],
 	 * @extends sap.ui.core.dnd.DragDropBase
 	 *
 	 * @author SAP SE
-	 * @version 1.98.0
+	 * @version 1.101.0
 	 *
 	 * @public
 	 * @since 1.56

package/src/sap/ui/core/dnd/DropInfo.js

@@ -21,7 +21,7 @@ sap.ui.define(["./DragDropBase"],
 	 * @extends sap.ui.core.dnd.DragDropBase
 	 *
 	 * @author SAP SE
-	 * @version 1.98.0
+	 * @version 1.101.0
 	 *
 	 * @public
 	 * @since 1.56
@@ -85,7 +85,7 @@ sap.ui.define(["./DragDropBase"],
 			 * @param {object} oControlEvent.getParameters
 			 * @param {sap.ui.core.Element} oControlEvent.getParameters.target The target element on which the dragged element will be dropped
 			 * @param {sap.ui.core.dnd.DragSession} oControlEvent.getParameters.dragSession The UI5 <code>dragSession</code> object that exists only during drag and drop
-			 * @param {string} oControlEvent.getParameters.dropPosition The calculated position of the drop action relative to the <code>target</code>, possible values are <code>Before</code>, <code>On</code>, <code>After</code>
+			 * @param {sap.ui.core.dnd.RelativeDropPosition} oControlEvent.getParameters.dropPosition The calculated position of the drop action relative to the <code>target</code>.
 			 * @param {Event} oControlEvent.getParameters.browserEvent The underlying browser event
 			 * @public
 			 * @since 1.56
@@ -104,7 +104,7 @@ sap.ui.define(["./DragDropBase"],
 			 * @param {sap.ui.core.dnd.DragSession} oControlEvent.getParameters.dragSession The UI5 <code>dragSession</code> object that exists only during drag and drop
 			 * @param {sap.ui.core.Element} oControlEvent.getParameters.draggedControl The element being dragged
 			 * @param {sap.ui.core.Element} oControlEvent.getParameters.droppedControl The element being dropped
-			 * @param {string} oControlEvent.getParameters.dropPosition The calculated position of the drop action relative to the <code>droppedControl</code>, possible values are <code>Before</code>, <code>On</code>, <code>After</code>
+			 * @param {sap.ui.core.dnd.RelativeDropPosition} oControlEvent.getParameters.dropPosition The calculated position of the drop action relative to the <code>droppedControl</code>.
 			 * @param {Event} oControlEvent.getParameters.browserEvent The underlying browser event
 			 * @public
 			 */