@openui5/sap.ui.dt 1.136.2 → 1.138.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/REUSE.toml +0 -28
- package/THIRDPARTY.txt +0 -24
- package/package.json +2 -2
- package/src/sap/ui/dt/.library +1 -1
- package/src/sap/ui/dt/AggregationDesignTimeMetadata.js +1 -1
- package/src/sap/ui/dt/AggregationOverlay.js +1 -3
- package/src/sap/ui/dt/ControlObserver.js +1 -1
- package/src/sap/ui/dt/DOMUtil.js +33 -77
- package/src/sap/ui/dt/DesignTime.js +6 -9
- package/src/sap/ui/dt/DesignTimeMetadata.js +6 -8
- package/src/sap/ui/dt/ElementDesignTimeMetadata.js +1 -1
- package/src/sap/ui/dt/ElementOverlay.js +12 -17
- package/src/sap/ui/dt/ElementUtil.js +26 -32
- package/src/sap/ui/dt/ManagedObjectObserver.js +1 -1
- package/src/sap/ui/dt/MetadataPropagationUtil.js +1 -1
- package/src/sap/ui/dt/MutationObserver.js +13 -16
- package/src/sap/ui/dt/Overlay.js +42 -35
- package/src/sap/ui/dt/OverlayRegistry.js +1 -1
- package/src/sap/ui/dt/OverlayUtil.js +8 -116
- package/src/sap/ui/dt/Plugin.js +3 -4
- package/src/sap/ui/dt/ScrollbarSynchronizer.js +7 -10
- package/src/sap/ui/dt/SelectionManager.js +1 -1
- package/src/sap/ui/dt/SelectionMode.js +1 -1
- package/src/sap/ui/dt/TaskManager.js +1 -1
- package/src/sap/ui/dt/TaskRunner.js +1 -1
- package/src/sap/ui/dt/Util.js +1 -1
- package/src/sap/ui/dt/enablement/ElementEnablementTest.js +1 -1
- package/src/sap/ui/dt/enablement/Test.js +1 -1
- package/src/sap/ui/dt/enablement/Util.js +1 -1
- package/src/sap/ui/dt/enablement/report/LibraryReport.js +1 -1
- package/src/sap/ui/dt/enablement/report/QUnitReport.js +1 -1
- package/src/sap/ui/dt/library.js +3 -3
- package/src/sap/ui/dt/plugin/ContextMenu.js +6 -4
- package/src/sap/ui/dt/plugin/ControlDragDrop.js +1 -1
- package/src/sap/ui/dt/plugin/CutPaste.js +1 -1
- package/src/sap/ui/dt/plugin/DragDrop.js +10 -12
- package/src/sap/ui/dt/plugin/ElementMover.js +1 -1
- package/src/sap/ui/dt/plugin/MouseSelection.js +1 -1
- package/src/sap/ui/dt/plugin/ToolHooks.js +1 -1
- package/src/sap/ui/dt/themes/base/ContextMenu.less +25 -22
- package/src/sap/ui/dt/themes/sap_hcb/ContextMenu.less +4 -19
- package/src/sap/ui/dt/util/ZIndexManager.js +1 -1
- package/src/sap/ui/dt/enablement/report/Statistic.js +0 -116
- package/src/sap/ui/dt/enablement/report/StatisticRenderer.js +0 -37
- package/src/sap/ui/dt/enablement/report/Table.js +0 -257
- package/src/sap/ui/dt/enablement/report/TableRenderer.js +0 -37
package/REUSE.toml
CHANGED
|
@@ -238,27 +238,6 @@ SPDX-FileCopyrightText = [
|
|
|
238
238
|
SPDX-License-Identifier = "Apache-2.0 and MIT"
|
|
239
239
|
SPDX-FileComment = "these files contain content from SAP and JUnit Reporter for QUnit: qunit-junit.js is overall written by SAP, but contains a modified copy of JUnit Reporter for QUnit (qunit-reporter-junit)"
|
|
240
240
|
|
|
241
|
-
[[annotations]]
|
|
242
|
-
path = "src/sap.ui.core/src/sap/ui/thirdparty/iscroll.js"
|
|
243
|
-
precedence = "aggregate"
|
|
244
|
-
SPDX-FileCopyrightText = "2012 Matteo Spinelli"
|
|
245
|
-
SPDX-License-Identifier = "MIT"
|
|
246
|
-
SPDX-FileComment = "these files belong to: cubiq.org - iScroll"
|
|
247
|
-
|
|
248
|
-
[[annotations]]
|
|
249
|
-
path = "src/sap.ui.core/src/sap/ui/thirdparty/iscroll-lite.js"
|
|
250
|
-
precedence = "aggregate"
|
|
251
|
-
SPDX-FileCopyrightText = "2011 Matteo Spinelli"
|
|
252
|
-
SPDX-License-Identifier = "MIT"
|
|
253
|
-
SPDX-FileComment = "these files belong to: cubiq.org - iScroll Lite"
|
|
254
|
-
|
|
255
|
-
[[annotations]]
|
|
256
|
-
path = "src/sap.ui.core/src/sap/ui/thirdparty/swipe-view.js"
|
|
257
|
-
precedence = "aggregate"
|
|
258
|
-
SPDX-FileCopyrightText = "2012 Matteo Spinelli"
|
|
259
|
-
SPDX-License-Identifier = "MIT"
|
|
260
|
-
SPDX-FileComment = "these files belong to: cubiq.org - swipeview"
|
|
261
|
-
|
|
262
241
|
[[annotations]]
|
|
263
242
|
path = "src/sap.ui.core/src/sap/ui/thirdparty/zyngascroll.js"
|
|
264
243
|
precedence = "aggregate"
|
|
@@ -308,13 +287,6 @@ SPDX-FileCopyrightText = "1991-2024 Unicode, Inc."
|
|
|
308
287
|
SPDX-License-Identifier = "LicenseRef-Unicode-3.0"
|
|
309
288
|
SPDX-FileComment = "these files belong to: Unicode Common Locale Data Repository"
|
|
310
289
|
|
|
311
|
-
[[annotations]]
|
|
312
|
-
path = "src/sap.ui.core/src/sap/ui/thirdparty/mobiscroll/**"
|
|
313
|
-
precedence = "aggregate"
|
|
314
|
-
SPDX-FileCopyrightText = "2010-2013, Acid Media"
|
|
315
|
-
SPDX-License-Identifier = "MIT"
|
|
316
|
-
SPDX-FileComment = "these files belong to: MobiScroll"
|
|
317
|
-
|
|
318
290
|
[[annotations]]
|
|
319
291
|
path = [
|
|
320
292
|
"src/sap.ui.core/src/sap/ui/thirdparty/sinon.js",
|
package/THIRDPARTY.txt
CHANGED
|
@@ -133,24 +133,6 @@ License Text: https://github.com/SAP/openui5/blob/master/LICENSES/MIT.txt
|
|
|
133
133
|
Contained in: src/sap.ui.core/src/sap/ui/thirdparty/qunit-reporter-junit.js
|
|
134
134
|
src/sap.ui.core/src/sap/ui/qunit/qunit-junit.js
|
|
135
135
|
|
|
136
|
-
Component: cubiq.org - iScroll, version: 4.2.5
|
|
137
|
-
Copyright: 2012 Matteo Spinelli
|
|
138
|
-
License: MIT
|
|
139
|
-
License Text: https://github.com/SAP/openui5/blob/master/LICENSES/MIT.txt
|
|
140
|
-
Contained in: src/sap.ui.core/src/sap/ui/thirdparty/iscroll.js
|
|
141
|
-
|
|
142
|
-
Component: cubiq.org - iScroll Lite, version: 4.1.6
|
|
143
|
-
Copyright: 2011 Matteo Spinelli
|
|
144
|
-
License: MIT
|
|
145
|
-
License Text: https://github.com/SAP/openui5/blob/master/LICENSES/MIT.txt
|
|
146
|
-
Contained in: src/sap.ui.core/src/sap/ui/thirdparty/iscroll-lite.js
|
|
147
|
-
|
|
148
|
-
Component: cubiq.org - swipeview, version: 1.0
|
|
149
|
-
Copyright: 2012 Matteo Spinelli
|
|
150
|
-
License: MIT
|
|
151
|
-
License Text: https://github.com/SAP/openui5/blob/master/LICENSES/MIT.txt
|
|
152
|
-
Contained in: src/sap.ui.core/src/sap/ui/thirdparty/swipe-view.js
|
|
153
|
-
|
|
154
136
|
Component: Zynga Scroller, version: 1.2.1-0-g5d43806
|
|
155
137
|
Copyright: 2011 Zynga Inc.
|
|
156
138
|
License: MIT
|
|
@@ -193,12 +175,6 @@ License: LicenseRef-Unicode-3.0
|
|
|
193
175
|
License Text: https://github.com/SAP/openui5/blob/master/LICENSES/LicenseRef-Unicode-3.0.txt
|
|
194
176
|
Contained in: src/sap.ui.core/src/sap/ui/core/cldr/**
|
|
195
177
|
|
|
196
|
-
Component: MobiScroll, version: 2.9.0
|
|
197
|
-
Copyright: 2010-2013, Acid Media
|
|
198
|
-
License: MIT
|
|
199
|
-
License Text: https://github.com/SAP/openui5/blob/master/LICENSES/MIT.txt
|
|
200
|
-
Contained in: src/sap.ui.core/src/sap/ui/thirdparty/mobiscroll/**
|
|
201
|
-
|
|
202
178
|
Component: SinonJS, version: 1.14.1
|
|
203
179
|
Copyright: 2010-2014, Christian Johansen, christian@cjohansen.no
|
|
204
180
|
License: BSD-3-Clause
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@openui5/sap.ui.dt",
|
|
3
|
-
"version": "1.
|
|
3
|
+
"version": "1.138.0",
|
|
4
4
|
"description": "OpenUI5 UI Library sap.ui.dt",
|
|
5
5
|
"author": "SAP SE (https://www.sap.com)",
|
|
6
6
|
"license": "Apache-2.0",
|
|
@@ -14,6 +14,6 @@
|
|
|
14
14
|
"url": "https://github.com/SAP/openui5.git"
|
|
15
15
|
},
|
|
16
16
|
"dependencies": {
|
|
17
|
-
"@openui5/sap.ui.core": "1.
|
|
17
|
+
"@openui5/sap.ui.core": "1.138.0"
|
|
18
18
|
}
|
|
19
19
|
}
|
package/src/sap/ui/dt/.library
CHANGED
|
@@ -6,7 +6,7 @@
|
|
|
6
6
|
<copyright>OpenUI5
|
|
7
7
|
* (c) Copyright 2025 SAP SE or an SAP affiliate company.
|
|
8
8
|
* Licensed under the Apache License, Version 2.0 - see LICENSE.txt.</copyright>
|
|
9
|
-
<version>1.
|
|
9
|
+
<version>1.138.0</version>
|
|
10
10
|
|
|
11
11
|
<documentation>SAP UI library: sap.ui.dt (by SAP, Author)</documentation>
|
|
12
12
|
|
|
@@ -33,7 +33,7 @@ function(
|
|
|
33
33
|
* @extends sap.ui.dt.Overlay
|
|
34
34
|
*
|
|
35
35
|
* @author SAP SE
|
|
36
|
-
* @version 1.
|
|
36
|
+
* @version 1.138.0
|
|
37
37
|
*
|
|
38
38
|
* @constructor
|
|
39
39
|
* @private
|
|
@@ -145,8 +145,6 @@ function(
|
|
|
145
145
|
|
|
146
146
|
if (!bChildRendered) {
|
|
147
147
|
var oRenderResult = oChild.render(true);
|
|
148
|
-
// TODO: change when renderer does not return jquery object any more!
|
|
149
|
-
oRenderResult = oRenderResult.jquery ? oRenderResult.get(0) : oRenderResult;
|
|
150
148
|
}
|
|
151
149
|
|
|
152
150
|
var oChildDOM = bChildRendered ? oChild.getDomRef() : oRenderResult;
|
package/src/sap/ui/dt/DOMUtil.js
CHANGED
|
@@ -25,7 +25,7 @@ sap.ui.define([
|
|
|
25
25
|
*
|
|
26
26
|
* @namespace
|
|
27
27
|
* @author SAP SE
|
|
28
|
-
* @version 1.
|
|
28
|
+
* @version 1.138.0
|
|
29
29
|
*
|
|
30
30
|
* @private
|
|
31
31
|
* @since 1.30
|
|
@@ -36,7 +36,6 @@ sap.ui.define([
|
|
|
36
36
|
|
|
37
37
|
/**
|
|
38
38
|
* Returns the offset for an element
|
|
39
|
-
* Replaces the jQuery method offset
|
|
40
39
|
* @param {HTMLElement} oElement - Element
|
|
41
40
|
* @returns {PositionObject} the calculated offset containing left and top values
|
|
42
41
|
*/
|
|
@@ -49,25 +48,6 @@ sap.ui.define([
|
|
|
49
48
|
};
|
|
50
49
|
};
|
|
51
50
|
|
|
52
|
-
/**
|
|
53
|
-
* Returns if the <code>oDomElement</code> is currently visible on the screen.
|
|
54
|
-
*
|
|
55
|
-
* @param {HTMLElement|jQuery} oDomElement Element to be evaluated
|
|
56
|
-
* @returns{boolean} - Returns if <code>oDomElement</code> is currently visible on the screen.
|
|
57
|
-
*/
|
|
58
|
-
DOMUtil.isElementInViewport = function(oDomElement) {
|
|
59
|
-
oDomElement = oDomElement.jquery ? oDomElement.get(0) : oDomElement;
|
|
60
|
-
|
|
61
|
-
var mRect = oDomElement.getBoundingClientRect();
|
|
62
|
-
|
|
63
|
-
return (
|
|
64
|
-
mRect.top >= 0 &&
|
|
65
|
-
mRect.left >= 0 &&
|
|
66
|
-
mRect.bottom <= (window.innerHeight || document.documentElement.clientHeight) &&
|
|
67
|
-
mRect.right <= (window.innerWidth || document.documentElement.clientWidth)
|
|
68
|
-
);
|
|
69
|
-
};
|
|
70
|
-
|
|
71
51
|
DOMUtil.getSize = function(oDomRef) {
|
|
72
52
|
var oClientRec = oDomRef.getBoundingClientRect();
|
|
73
53
|
return {
|
|
@@ -78,9 +58,8 @@ sap.ui.define([
|
|
|
78
58
|
|
|
79
59
|
/**
|
|
80
60
|
* Returns the parents for an element
|
|
81
|
-
* Replaces the jQuery method parents
|
|
82
61
|
* @param {HTMLElement} oElement - Element
|
|
83
|
-
* @param {string} sSelector -
|
|
62
|
+
* @param {string} sSelector - CSS selector to search for
|
|
84
63
|
* @returns {Array} aParents - Array containing Parents which match selector
|
|
85
64
|
*/
|
|
86
65
|
DOMUtil.getParents = function(oElement, sSelector) {
|
|
@@ -113,7 +92,7 @@ sap.ui.define([
|
|
|
113
92
|
var iScrollTop = oParent ? oParent.scrollTop : null;
|
|
114
93
|
var iScrollLeft = oParent ? DOMUtil.getScrollLeft(oParent) : null;
|
|
115
94
|
|
|
116
|
-
var mParentOffset = oParent ?
|
|
95
|
+
var mParentOffset = oParent ? DOMUtil.getOffset(oParent) : null;
|
|
117
96
|
|
|
118
97
|
var mOffset = {
|
|
119
98
|
left: oGeometry.position.left,
|
|
@@ -276,7 +255,7 @@ sap.ui.define([
|
|
|
276
255
|
|
|
277
256
|
DOMUtil.getGeometry = function(oDomRef, bUseWindowOffset) {
|
|
278
257
|
if (oDomRef) {
|
|
279
|
-
var oOffset =
|
|
258
|
+
var oOffset = DOMUtil.getOffset(oDomRef);
|
|
280
259
|
if (bUseWindowOffset) {
|
|
281
260
|
oOffset.left = oOffset.left - window.scrollX;
|
|
282
261
|
oOffset.top = oOffset.top - window.scrollY;
|
|
@@ -284,9 +263,9 @@ sap.ui.define([
|
|
|
284
263
|
|
|
285
264
|
return {
|
|
286
265
|
domRef: oDomRef,
|
|
287
|
-
size:
|
|
266
|
+
size: DOMUtil.getSize(oDomRef),
|
|
288
267
|
position: oOffset,
|
|
289
|
-
visible:
|
|
268
|
+
visible: DOMUtil.isVisible(oDomRef)
|
|
290
269
|
};
|
|
291
270
|
}
|
|
292
271
|
return undefined;
|
|
@@ -308,30 +287,32 @@ sap.ui.define([
|
|
|
308
287
|
};
|
|
309
288
|
|
|
310
289
|
/**
|
|
311
|
-
*
|
|
312
|
-
* @param {Element
|
|
313
|
-
* @param {string} sCSSSelector -
|
|
314
|
-
* @returns {
|
|
290
|
+
* Returns HTML Element found in oDomRef for sCSSSelector
|
|
291
|
+
* @param {Element} oDomRef - to search in
|
|
292
|
+
* @param {string} sCSSSelector - CSS-like selector to look for
|
|
293
|
+
* @returns {Element} found domRef
|
|
315
294
|
*/
|
|
295
|
+
|
|
316
296
|
DOMUtil.getDomRefForCSSSelector = function(oDomRef, sCSSSelector) {
|
|
317
297
|
if (sCSSSelector && oDomRef) {
|
|
318
|
-
var $domRef = jQuery(oDomRef);
|
|
319
|
-
|
|
320
298
|
if (sCSSSelector === ":sap-domref") {
|
|
321
|
-
return
|
|
299
|
+
return oDomRef;
|
|
322
300
|
}
|
|
323
301
|
|
|
324
|
-
// ":sap-domref
|
|
302
|
+
// Replace ":sap-domref" with ":scope" to make the selector compatible with browsers.
|
|
303
|
+
// Example: ":sap-domref > sapMPage" becomes ":scope > sapMPage", scoping the query to oDomRef.
|
|
325
304
|
if (sCSSSelector.indexOf(":sap-domref") > -1) {
|
|
326
|
-
|
|
305
|
+
const sModifiedSelector = sCSSSelector.replace(/:sap-domref/g, ":scope");
|
|
306
|
+
return oDomRef.querySelector(sModifiedSelector);
|
|
327
307
|
}
|
|
328
308
|
|
|
329
|
-
//
|
|
330
|
-
|
|
309
|
+
// Prefix ":scope" to child selectors (>) to scope the query to oDomRef.
|
|
310
|
+
// Example: "div > p, span > a" becomes "div :scope > p, span :scope > a".
|
|
311
|
+
const sScopedSelector = sCSSSelector.replace(/(^|,)\s*(>)/g, "$1:scope$2");
|
|
312
|
+
return oDomRef.querySelector(sScopedSelector);
|
|
331
313
|
}
|
|
332
314
|
|
|
333
|
-
|
|
334
|
-
return jQuery();
|
|
315
|
+
return undefined;
|
|
335
316
|
};
|
|
336
317
|
|
|
337
318
|
/**
|
|
@@ -350,31 +331,6 @@ sap.ui.define([
|
|
|
350
331
|
return false;
|
|
351
332
|
};
|
|
352
333
|
|
|
353
|
-
/**
|
|
354
|
-
* Sets the draggable attribute to a specified node
|
|
355
|
-
* @param {HTMLElement} oNode - Target node to add the attribute to
|
|
356
|
-
* @param {boolean} bValue - Attribute value
|
|
357
|
-
*/
|
|
358
|
-
DOMUtil.setDraggable = function(oNode, bValue) {
|
|
359
|
-
oNode.setAttribute("draggable", bValue);
|
|
360
|
-
};
|
|
361
|
-
|
|
362
|
-
/**
|
|
363
|
-
* Sets the draggable attribute of a specified node
|
|
364
|
-
* @param {HTMLElement} oNode - Target node to set the draggable attribute on
|
|
365
|
-
* @returns {boolean|undefined} undefined when draggable is not set to the node
|
|
366
|
-
*/
|
|
367
|
-
DOMUtil.getDraggable = function(oNode) {
|
|
368
|
-
switch (oNode.getAttribute("draggable")) {
|
|
369
|
-
case "true":
|
|
370
|
-
return true;
|
|
371
|
-
case "false":
|
|
372
|
-
return false;
|
|
373
|
-
default:
|
|
374
|
-
return undefined;
|
|
375
|
-
}
|
|
376
|
-
};
|
|
377
|
-
|
|
378
334
|
/**
|
|
379
335
|
* Copy the given styles object to a destination DOM node.
|
|
380
336
|
* @param {Object} oStyles A styles object, which is retrieved from window.getComputedStyle
|
|
@@ -410,16 +366,16 @@ sap.ui.define([
|
|
|
410
366
|
|
|
411
367
|
// pseudo elements can't be inserted via js, so we should create a real elements,
|
|
412
368
|
// which copy pseudo styling
|
|
413
|
-
var oPseudoElement =
|
|
369
|
+
var oPseudoElement = document.createElement("span");
|
|
414
370
|
if (sPseudoElement === ":after") {
|
|
415
|
-
|
|
371
|
+
oDest.appendChild(oPseudoElement);
|
|
416
372
|
} else {
|
|
417
|
-
|
|
373
|
+
oDest.insertBefore(oPseudoElement, oDest.firstChild);
|
|
418
374
|
}
|
|
419
375
|
|
|
420
|
-
oPseudoElement.
|
|
421
|
-
DOMUtil._copyStylesTo(mStyles, oPseudoElement
|
|
422
|
-
oPseudoElement.
|
|
376
|
+
oPseudoElement.textContent = sContent.replace(/(^['"])|(['"]$)/g, "");
|
|
377
|
+
DOMUtil._copyStylesTo(mStyles, oPseudoElement);
|
|
378
|
+
oPseudoElement.style.display = "inline";
|
|
423
379
|
}
|
|
424
380
|
};
|
|
425
381
|
|
|
@@ -433,13 +389,13 @@ sap.ui.define([
|
|
|
433
389
|
|
|
434
390
|
DOMUtil._copyStylesTo(mStyles, oDest);
|
|
435
391
|
|
|
436
|
-
|
|
437
|
-
|
|
392
|
+
DOMUtil._copyPseudoElement(":after", oSrc, oDest);
|
|
393
|
+
DOMUtil._copyPseudoElement(":before", oSrc, oDest);
|
|
438
394
|
};
|
|
439
395
|
|
|
440
396
|
DOMUtil.copyComputedStyles = function(oSrc, oDest) {
|
|
441
397
|
for (var i = 0; i < oSrc.children.length; i++) {
|
|
442
|
-
|
|
398
|
+
DOMUtil.copyComputedStyles(oSrc.children[i], oDest.children[i]);
|
|
443
399
|
}
|
|
444
400
|
|
|
445
401
|
// we shouldn't copy classes because they can affect styling
|
|
@@ -451,12 +407,12 @@ sap.ui.define([
|
|
|
451
407
|
oDest.setAttribute("for", "");
|
|
452
408
|
oDest.setAttribute("tabindex", -1);
|
|
453
409
|
|
|
454
|
-
|
|
410
|
+
DOMUtil.copyComputedStyle(oSrc, oDest);
|
|
455
411
|
};
|
|
456
412
|
|
|
457
413
|
DOMUtil.cloneDOMAndStyles = function(oNode, oTarget) {
|
|
458
414
|
var oCopy = oNode.cloneNode(true);
|
|
459
|
-
|
|
415
|
+
DOMUtil.copyComputedStyles(oNode, oCopy);
|
|
460
416
|
|
|
461
417
|
oTarget.append(oCopy);
|
|
462
418
|
};
|
|
@@ -486,4 +442,4 @@ sap.ui.define([
|
|
|
486
442
|
};
|
|
487
443
|
|
|
488
444
|
return DOMUtil;
|
|
489
|
-
}
|
|
445
|
+
});
|
|
@@ -28,8 +28,7 @@ sap.ui.define([
|
|
|
28
28
|
"sap/ui/dt/TaskManager",
|
|
29
29
|
"sap/ui/dt/TaskRunner",
|
|
30
30
|
"sap/ui/dt/util/ZIndexManager",
|
|
31
|
-
"sap/ui/dt/Util"
|
|
32
|
-
"sap/ui/thirdparty/jquery"
|
|
31
|
+
"sap/ui/dt/Util"
|
|
33
32
|
], function(
|
|
34
33
|
_curry,
|
|
35
34
|
_difference,
|
|
@@ -54,8 +53,7 @@ sap.ui.define([
|
|
|
54
53
|
TaskManager,
|
|
55
54
|
TaskRunner,
|
|
56
55
|
ZIndexManager,
|
|
57
|
-
Util
|
|
58
|
-
jQuery
|
|
56
|
+
Util
|
|
59
57
|
) {
|
|
60
58
|
"use strict";
|
|
61
59
|
|
|
@@ -71,7 +69,7 @@ sap.ui.define([
|
|
|
71
69
|
* @extends sap.ui.base.ManagedObject
|
|
72
70
|
*
|
|
73
71
|
* @author SAP SE
|
|
74
|
-
* @version 1.
|
|
72
|
+
* @version 1.138.0
|
|
75
73
|
*
|
|
76
74
|
* @constructor
|
|
77
75
|
* @private
|
|
@@ -634,8 +632,7 @@ sap.ui.define([
|
|
|
634
632
|
})
|
|
635
633
|
.then(
|
|
636
634
|
function(oElementOverlay) {
|
|
637
|
-
|
|
638
|
-
jQuery(Overlay.getOverlayContainer()).append(oElementOverlay.render());
|
|
635
|
+
Overlay.getOverlayContainer().append(oElementOverlay.render());
|
|
639
636
|
this._oTaskManager.add({
|
|
640
637
|
type: "applyStyles",
|
|
641
638
|
callbackFn: oElementOverlay.applyStyles.bind(oElementOverlay),
|
|
@@ -1116,9 +1113,9 @@ sap.ui.define([
|
|
|
1116
1113
|
// If creation of one of the children is aborted, we still continue our execution
|
|
1117
1114
|
.catch(function(oError) {
|
|
1118
1115
|
const mError = this._enrichChildCreationError(oError, oChildElement, sParentElementClassName, sAggregationName);
|
|
1119
|
-
// Omit error message if the parent was already destroyed
|
|
1116
|
+
// Omit error message if the parent or the DesignTime instance was already destroyed
|
|
1120
1117
|
// e.g. SimpleForm move where many elements are created/destroyed in a row
|
|
1121
|
-
if (!oElement.isDestroyed() && !oElementOverlay.isDestroyed()) {
|
|
1118
|
+
if (!oElement.isDestroyed() && !oElementOverlay.isDestroyed() && !this.bIsDestroyed) {
|
|
1122
1119
|
Log[mError.severity](mError.message);
|
|
1123
1120
|
}
|
|
1124
1121
|
return mError.errorObject;
|
|
@@ -45,7 +45,7 @@ sap.ui.define([
|
|
|
45
45
|
* @extends sap.ui.base.ManagedObject
|
|
46
46
|
*
|
|
47
47
|
* @author SAP SE
|
|
48
|
-
* @version 1.
|
|
48
|
+
* @version 1.138.0
|
|
49
49
|
*
|
|
50
50
|
* @constructor
|
|
51
51
|
* @private
|
|
@@ -143,20 +143,18 @@ sap.ui.define([
|
|
|
143
143
|
|
|
144
144
|
if (typeof (vDomRef) === "function") {
|
|
145
145
|
try {
|
|
146
|
-
// TODO: replace jQuery when we know that vDomRef will always return a DOM Element
|
|
147
146
|
var vRes = vDomRef(...aArgs);
|
|
148
|
-
// convert
|
|
149
|
-
if (
|
|
147
|
+
// convert NodeList to an Array
|
|
148
|
+
if (vRes instanceof NodeList) {
|
|
150
149
|
vRes = Array.from(vRes);
|
|
151
150
|
}
|
|
152
|
-
// we return an Array
|
|
153
|
-
return vRes
|
|
151
|
+
// we return an Array of DOM elements
|
|
152
|
+
return vRes;
|
|
154
153
|
} catch (error) {
|
|
155
154
|
return undefined;
|
|
156
155
|
}
|
|
157
156
|
} else if (oElementDomRef && typeof (vDomRef) === "string") {
|
|
158
|
-
|
|
159
|
-
return DOMUtil.getDomRefForCSSSelector(oElementDomRef, vDomRef).get(0);
|
|
157
|
+
return DOMUtil.getDomRefForCSSSelector(oElementDomRef, vDomRef);
|
|
160
158
|
}
|
|
161
159
|
}
|
|
162
160
|
return undefined;
|
|
@@ -16,7 +16,6 @@ sap.ui.define([
|
|
|
16
16
|
"sap/ui/dt/DOMUtil",
|
|
17
17
|
"sap/ui/dt/Util",
|
|
18
18
|
"sap/ui/core/Control",
|
|
19
|
-
"sap/ui/thirdparty/jquery",
|
|
20
19
|
"sap/base/Log",
|
|
21
20
|
"sap/base/util/isPlainObject",
|
|
22
21
|
"sap/base/util/merge",
|
|
@@ -34,7 +33,6 @@ sap.ui.define([
|
|
|
34
33
|
DOMUtil,
|
|
35
34
|
Util,
|
|
36
35
|
Control,
|
|
37
|
-
jQuery,
|
|
38
36
|
Log,
|
|
39
37
|
isPlainObject,
|
|
40
38
|
merge,
|
|
@@ -57,7 +55,7 @@ sap.ui.define([
|
|
|
57
55
|
* @extends sap.ui.dt.Overlay
|
|
58
56
|
*
|
|
59
57
|
* @author SAP SE
|
|
60
|
-
* @version 1.
|
|
58
|
+
* @version 1.138.0
|
|
61
59
|
*
|
|
62
60
|
* @constructor
|
|
63
61
|
* @private
|
|
@@ -516,8 +514,7 @@ sap.ui.define([
|
|
|
516
514
|
if (this._bInit) {
|
|
517
515
|
if (this.isRoot()) {
|
|
518
516
|
if (!this.isRendered()) {
|
|
519
|
-
|
|
520
|
-
jQuery(Overlay.getOverlayContainer()).append(this.render());
|
|
517
|
+
Overlay.getOverlayContainer().append(this.render());
|
|
521
518
|
this.applyStyles();
|
|
522
519
|
} else {
|
|
523
520
|
Log.error("sap.ui.dt.ElementOverlay: overlay is already rendered and can\'t be placed in overlay container. Isn\'t it already there?");
|
|
@@ -583,11 +580,11 @@ sap.ui.define([
|
|
|
583
580
|
|
|
584
581
|
/**
|
|
585
582
|
* Renders children of the current overlay
|
|
586
|
-
* @return {
|
|
583
|
+
* @return {Array<Element>} - returns array of children DOM Nodes
|
|
587
584
|
* @private
|
|
588
585
|
*/
|
|
589
586
|
ElementOverlay.prototype._renderChildren = function(...aArgs) {
|
|
590
|
-
var
|
|
587
|
+
var aChildren = Overlay.prototype._renderChildren.apply(this, aArgs);
|
|
591
588
|
|
|
592
589
|
this.getScrollContainers().forEach(function(mScrollContainer, iIndex) {
|
|
593
590
|
var oScrollContainer = document.createElement("div");
|
|
@@ -600,18 +597,16 @@ sap.ui.define([
|
|
|
600
597
|
this.getAggregationNames()
|
|
601
598
|
).forEach(function(sAggregationName) {
|
|
602
599
|
var oAggregationOverlay = this.getAggregationOverlay(sAggregationName);
|
|
603
|
-
var iAggregationOverlayIndex =
|
|
600
|
+
var iAggregationOverlayIndex = aChildren.indexOf(oAggregationOverlay.getDomRef());
|
|
604
601
|
oAggregationOverlay.setScrollContainerId(iIndex);
|
|
605
|
-
oScrollContainer.append(
|
|
606
|
-
|
|
602
|
+
oScrollContainer.append(aChildren[iAggregationOverlayIndex]);
|
|
603
|
+
aChildren.splice(iAggregationOverlayIndex, 1);
|
|
607
604
|
}, this);
|
|
608
605
|
}
|
|
609
|
-
|
|
610
|
-
// TODO remove jQuery when Overlay._renderChildren / .render() returns DOM Element
|
|
611
|
-
a$Children.push(jQuery(oScrollContainer));
|
|
606
|
+
aChildren.push(oScrollContainer);
|
|
612
607
|
}, this);
|
|
613
608
|
|
|
614
|
-
return
|
|
609
|
+
return aChildren;
|
|
615
610
|
};
|
|
616
611
|
|
|
617
612
|
/**
|
|
@@ -777,12 +772,12 @@ sap.ui.define([
|
|
|
777
772
|
ElementOverlay.prototype._onChildAdded = function(oEvent) {
|
|
778
773
|
var oAggregationOverlay = oEvent.getSource();
|
|
779
774
|
if (this.isRendered() && !oAggregationOverlay.isRendered()) {
|
|
780
|
-
var
|
|
775
|
+
var oTarget = (
|
|
781
776
|
Util.isInteger(oAggregationOverlay.getScrollContainerId())
|
|
782
777
|
? this.getScrollContainerById(oAggregationOverlay.getScrollContainerId())
|
|
783
|
-
:
|
|
778
|
+
: this.getChildrenDomRef()
|
|
784
779
|
);
|
|
785
|
-
|
|
780
|
+
oTarget.append(oAggregationOverlay.render());
|
|
786
781
|
}
|
|
787
782
|
};
|
|
788
783
|
|