@openui5/sap.f 1.120.7 → 1.121.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/dep5 +23 -21
- package/THIRDPARTY.txt +6 -43
- package/package.json +4 -4
- package/src/sap/f/.library +1 -1
- package/src/sap/f/Avatar.js +5 -4
- package/src/sap/f/AvatarGroup.js +4 -4
- package/src/sap/f/AvatarGroupItem.js +1 -1
- package/src/sap/f/CalendarAppointmentInCard.js +1 -1
- package/src/sap/f/CalendarInCard.js +7 -5
- package/src/sap/f/CalendarInCardRenderer.js +6 -11
- package/src/sap/f/Card.js +1 -1
- package/src/sap/f/CardBase.js +6 -6
- package/src/sap/f/DynamicPage.js +35 -15
- package/src/sap/f/DynamicPageAccessibleLandmarkInfo.js +1 -1
- package/src/sap/f/DynamicPageHeader.js +30 -16
- package/src/sap/f/DynamicPageTitle.js +10 -8
- package/src/sap/f/FlexibleColumnLayout.js +220 -90
- package/src/sap/f/FlexibleColumnLayoutAccessibleLandmarkInfo.js +1 -1
- package/src/sap/f/FlexibleColumnLayoutRenderer.js +7 -3
- package/src/sap/f/FlexibleColumnLayoutSemanticHelper.js +1 -1
- package/src/sap/f/GridContainer.js +45 -46
- package/src/sap/f/GridContainerItemLayoutData.js +1 -1
- package/src/sap/f/GridContainerRenderer.js +19 -11
- package/src/sap/f/GridContainerSettings.js +2 -2
- package/src/sap/f/GridList.js +15 -4
- package/src/sap/f/GridListItem.js +1 -1
- package/src/sap/f/GridNavigationMatrix.js +3 -3
- package/src/sap/f/IllustratedMessage.js +1 -1
- package/src/sap/f/Illustration.js +1 -1
- package/src/sap/f/PlanningCalendarInCardLegend.js +4 -5
- package/src/sap/f/PlanningCalendarInCardLegendRenderer.js +4 -4
- package/src/sap/f/ProductSwitch.js +7 -7
- package/src/sap/f/ProductSwitchItem.js +1 -1
- package/src/sap/f/ProductSwitchRenderer.js +3 -3
- package/src/sap/f/SearchManager.js +4 -4
- package/src/sap/f/ShellBar.js +71 -10
- package/src/sap/f/ShellBarRenderer.js +3 -3
- package/src/sap/f/SidePanel.js +22 -11
- package/src/sap/f/SidePanelItem.js +1 -1
- package/src/sap/f/cards/BaseHeader.js +21 -9
- package/src/sap/f/cards/Header.js +1 -1
- package/src/sap/f/cards/NumericHeader.js +1 -1
- package/src/sap/f/cards/NumericIndicators.js +1 -1
- package/src/sap/f/cards/NumericSideIndicator.js +1 -1
- package/src/sap/f/cards/loading/AnalyticalPlaceholder.js +1 -1
- package/src/sap/f/cards/loading/CalendarPlaceholder.js +1 -1
- package/src/sap/f/cards/loading/GenericPlaceholder.js +1 -1
- package/src/sap/f/cards/loading/ListPlaceholder.js +1 -1
- package/src/sap/f/cards/loading/ObjectPlaceholder.js +1 -1
- package/src/sap/f/cards/loading/PlaceholderBase.js +1 -1
- package/src/sap/f/cards/loading/PlaceholderBaseRenderer.js +2 -2
- package/src/sap/f/cards/loading/TablePlaceholder.js +1 -1
- package/src/sap/f/cards/loading/TimelinePlaceholder.js +1 -1
- package/src/sap/f/changeHandler/MoveDynamicPageTitleActions.js +1 -1
- package/src/sap/f/delegate/GridContainerItemNavigation.js +1 -1
- package/src/sap/f/delegate/GridItemNavigation.js +1 -1
- package/src/sap/f/designtime/messagebundle_en_US_saprigi.properties +4 -4
- package/src/sap/f/dnd/GridDragOver.js +5 -5
- package/src/sap/f/dnd/GridDropInfo.js +1 -1
- package/src/sap/f/library.js +23 -19
- package/src/sap/f/messagebundle.properties +4 -1
- package/src/sap/f/messagebundle_ar.properties +2 -0
- package/src/sap/f/messagebundle_bg.properties +2 -0
- package/src/sap/f/messagebundle_ca.properties +2 -0
- package/src/sap/f/messagebundle_cnr.properties +2 -0
- package/src/sap/f/messagebundle_cs.properties +2 -0
- package/src/sap/f/messagebundle_cy.properties +2 -0
- package/src/sap/f/messagebundle_da.properties +2 -0
- package/src/sap/f/messagebundle_de.properties +2 -0
- package/src/sap/f/messagebundle_el.properties +2 -0
- package/src/sap/f/messagebundle_en.properties +86 -1
- package/src/sap/f/messagebundle_en_GB.properties +2 -0
- package/src/sap/f/messagebundle_en_US_saprigi.properties +82 -80
- package/src/sap/f/messagebundle_es.properties +2 -0
- package/src/sap/f/messagebundle_es_MX.properties +2 -0
- package/src/sap/f/messagebundle_et.properties +2 -0
- package/src/sap/f/messagebundle_fi.properties +2 -0
- package/src/sap/f/messagebundle_fr.properties +2 -0
- package/src/sap/f/messagebundle_fr_CA.properties +2 -0
- package/src/sap/f/messagebundle_hi.properties +2 -0
- package/src/sap/f/messagebundle_hr.properties +2 -0
- package/src/sap/f/messagebundle_hu.properties +2 -0
- package/src/sap/f/messagebundle_id.properties +2 -0
- package/src/sap/f/messagebundle_it.properties +2 -0
- package/src/sap/f/messagebundle_iw.properties +2 -0
- package/src/sap/f/messagebundle_ja.properties +2 -0
- package/src/sap/f/messagebundle_kk.properties +2 -0
- package/src/sap/f/messagebundle_ko.properties +2 -0
- package/src/sap/f/messagebundle_lt.properties +2 -0
- package/src/sap/f/messagebundle_lv.properties +2 -0
- package/src/sap/f/messagebundle_mk.properties +2 -0
- package/src/sap/f/messagebundle_ms.properties +2 -0
- package/src/sap/f/messagebundle_nl.properties +2 -0
- package/src/sap/f/messagebundle_no.properties +2 -0
- package/src/sap/f/messagebundle_pl.properties +2 -0
- package/src/sap/f/messagebundle_pt.properties +2 -0
- package/src/sap/f/messagebundle_pt_PT.properties +2 -0
- package/src/sap/f/messagebundle_ro.properties +2 -0
- package/src/sap/f/messagebundle_ru.properties +2 -0
- package/src/sap/f/messagebundle_sh.properties +2 -0
- package/src/sap/f/messagebundle_sk.properties +2 -0
- package/src/sap/f/messagebundle_sl.properties +2 -0
- package/src/sap/f/messagebundle_sr.properties +2 -0
- package/src/sap/f/messagebundle_sv.properties +2 -0
- package/src/sap/f/messagebundle_th.properties +2 -0
- package/src/sap/f/messagebundle_tr.properties +2 -0
- package/src/sap/f/messagebundle_uk.properties +3 -1
- package/src/sap/f/messagebundle_vi.properties +2 -0
- package/src/sap/f/messagebundle_zh_CN.properties +2 -0
- package/src/sap/f/messagebundle_zh_TW.properties +2 -0
- package/src/sap/f/semantic/AddAction.js +1 -1
- package/src/sap/f/semantic/CloseAction.js +1 -1
- package/src/sap/f/semantic/CopyAction.js +1 -1
- package/src/sap/f/semantic/DeleteAction.js +1 -1
- package/src/sap/f/semantic/DiscussInJamAction.js +1 -1
- package/src/sap/f/semantic/EditAction.js +1 -1
- package/src/sap/f/semantic/ExitFullScreenAction.js +1 -1
- package/src/sap/f/semantic/FavoriteAction.js +1 -1
- package/src/sap/f/semantic/FlagAction.js +1 -1
- package/src/sap/f/semantic/FooterMainAction.js +1 -1
- package/src/sap/f/semantic/FullScreenAction.js +1 -1
- package/src/sap/f/semantic/MainAction.js +1 -1
- package/src/sap/f/semantic/MessagesIndicator.js +1 -1
- package/src/sap/f/semantic/NegativeAction.js +1 -1
- package/src/sap/f/semantic/PositiveAction.js +1 -1
- package/src/sap/f/semantic/PrintAction.js +1 -1
- package/src/sap/f/semantic/SemanticButton.js +1 -1
- package/src/sap/f/semantic/SemanticConfiguration.js +7 -8
- package/src/sap/f/semantic/SemanticControl.js +1 -1
- package/src/sap/f/semantic/SemanticFooter.js +2 -2
- package/src/sap/f/semantic/SemanticPage.js +19 -17
- package/src/sap/f/semantic/SemanticShareMenu.js +5 -2
- package/src/sap/f/semantic/SemanticToggleButton.js +1 -1
- package/src/sap/f/semantic/SendEmailAction.js +1 -1
- package/src/sap/f/semantic/SendMessageAction.js +1 -1
- package/src/sap/f/semantic/ShareInJamAction.js +1 -1
- package/src/sap/f/semantic/TitleMainAction.js +1 -1
- package/src/sap/f/shellBar/Accessibility.js +5 -5
- package/src/sap/f/shellBar/AdditionalContentSupport.js +1 -1
- package/src/sap/f/shellBar/CoPilot.js +8 -7
- package/src/sap/f/shellBar/ControlSpacer.js +1 -1
- package/src/sap/f/shellBar/Factory.js +14 -8
- package/src/sap/f/shellBar/ResponsiveHandler.js +23 -6
- package/src/sap/f/shellBar/Search.js +20 -4
- package/src/sap/f/themes/base/Card.less +2 -2
- package/src/sap/f/themes/base/CardLoading.less +94 -5
- package/src/sap/f/themes/base/DynamicPage.less +1 -1
- package/src/sap/f/themes/base/DynamicPageHeader.less +1 -1
- package/src/sap/f/themes/base/DynamicPageTitle.less +1 -1
- package/src/sap/f/themes/base/GridContainer.less +6 -4
- package/src/sap/f/themes/base/ShellBar.less +32 -13
- package/LICENSES/BSD-2-Clause.txt +0 -22
package/src/sap/f/ShellBar.js
CHANGED
|
@@ -14,6 +14,7 @@ sap.ui.define([
|
|
|
14
14
|
"sap/m/BarInPageEnabler",
|
|
15
15
|
"sap/m/BadgeCustomData",
|
|
16
16
|
"sap/m/Button",
|
|
17
|
+
"sap/ui/Device",
|
|
17
18
|
"sap/m/library",
|
|
18
19
|
"./ShellBarRenderer"
|
|
19
20
|
],
|
|
@@ -26,6 +27,7 @@ function(
|
|
|
26
27
|
BarInPageEnabler,
|
|
27
28
|
BadgeCustomData,
|
|
28
29
|
Button,
|
|
30
|
+
Device,
|
|
29
31
|
mobileLibrary,
|
|
30
32
|
ShellBarRenderer
|
|
31
33
|
) {
|
|
@@ -56,7 +58,7 @@ function(
|
|
|
56
58
|
* @implements sap.f.IShellBar, sap.m.IBar, sap.tnt.IToolHeader
|
|
57
59
|
*
|
|
58
60
|
* @author SAP SE
|
|
59
|
-
* @version 1.
|
|
61
|
+
* @version 1.121.0
|
|
60
62
|
*
|
|
61
63
|
* @constructor
|
|
62
64
|
* @public
|
|
@@ -197,8 +199,13 @@ function(
|
|
|
197
199
|
parameters: {
|
|
198
200
|
/**
|
|
199
201
|
* Reference to the button that has been pressed
|
|
202
|
+
* @deprecated Since version 1.121
|
|
200
203
|
*/
|
|
201
|
-
image : {type: "sap.m.Image"}
|
|
204
|
+
image : {type: "sap.m.Image"},
|
|
205
|
+
/**
|
|
206
|
+
* Reference to the button that has been pressed
|
|
207
|
+
*/
|
|
208
|
+
button : {type: "sap.m.Button"}
|
|
202
209
|
}
|
|
203
210
|
},
|
|
204
211
|
/**
|
|
@@ -254,6 +261,10 @@ function(
|
|
|
254
261
|
// Enhance the prototype with additional content aggregation support
|
|
255
262
|
AdditionalContentSupport.apply(ShellBar.prototype);
|
|
256
263
|
|
|
264
|
+
var SHELBAR_RANGE_SET = "ShellBarRangeSet";
|
|
265
|
+
|
|
266
|
+
Device.media.initRangeSet(SHELBAR_RANGE_SET, [600, 1024, 1440, 1920], "px", ["Phone", "Tablet", "Desktop", "LargeDesktop", "ExtraLargeDesktop"], true);
|
|
267
|
+
|
|
257
268
|
// Lifecycle
|
|
258
269
|
ShellBar.prototype.init = function () {
|
|
259
270
|
this._oFactory = new Factory(this);
|
|
@@ -275,12 +286,21 @@ function(
|
|
|
275
286
|
this._oResponsiveHandler = new ResponsiveHandler(this);
|
|
276
287
|
|
|
277
288
|
this._oAcc = new Accessibility(this);
|
|
289
|
+
|
|
290
|
+
this._sRangeSet = SHELBAR_RANGE_SET;
|
|
278
291
|
};
|
|
279
292
|
|
|
280
293
|
ShellBar.prototype.onBeforeRendering = function () {
|
|
281
294
|
this._assignControls();
|
|
282
295
|
};
|
|
283
296
|
|
|
297
|
+
ShellBar.prototype.onAfterRendering = function () {
|
|
298
|
+
if (!this.sCurrentRange) {
|
|
299
|
+
this._assignSearch();
|
|
300
|
+
this.invalidate();
|
|
301
|
+
}
|
|
302
|
+
};
|
|
303
|
+
|
|
284
304
|
ShellBar.prototype.exit = function () {
|
|
285
305
|
this._aLeftControls = [];
|
|
286
306
|
this._aRightControls = [];
|
|
@@ -411,30 +431,36 @@ function(
|
|
|
411
431
|
if (oConfig) {
|
|
412
432
|
if (!this._oManagedSearch) {
|
|
413
433
|
this._oManagedSearch = this._oFactory.getManagedSearch();
|
|
434
|
+
this.addStyleClass("sapFShellBarWithSearch", true);
|
|
414
435
|
}
|
|
415
436
|
} else {
|
|
416
437
|
this._oManagedSearch = null;
|
|
438
|
+
this.addStyleClass("sapFShellBarWithSearch", false);
|
|
417
439
|
}
|
|
418
440
|
|
|
419
441
|
this._bOTBUpdateNeeded = true;
|
|
420
442
|
|
|
443
|
+
|
|
421
444
|
return this;
|
|
422
445
|
};
|
|
423
446
|
|
|
424
447
|
ShellBar.prototype.setShowNotifications = function (bShow) {
|
|
425
|
-
var oShellbar = this
|
|
448
|
+
var oShellbar = this,
|
|
449
|
+
oParent;
|
|
426
450
|
|
|
427
451
|
if (bShow) {
|
|
428
452
|
if (!this._oNotifications) {
|
|
453
|
+
oParent = this.getParent();
|
|
454
|
+
|
|
429
455
|
this._oNotifications = this._oFactory.getNotifications();
|
|
430
456
|
this._oNotifications._onBeforeEnterOverflow = function () {
|
|
431
|
-
var oOTBButtonBadgeData =
|
|
457
|
+
var oOTBButtonBadgeData = oParent && oParent._getOverflowButton().getBadgeCustomData();
|
|
432
458
|
this._bInOverflow = true;
|
|
433
459
|
oOTBButtonBadgeData && oOTBButtonBadgeData.setVisible(this.getBadgeCustomData().getVisible());
|
|
434
460
|
};
|
|
435
461
|
|
|
436
462
|
this._oNotifications._onAfterExitOverflow = function () {
|
|
437
|
-
var oOTBButtonBadgeData =
|
|
463
|
+
var oOTBButtonBadgeData = oParent && oParent._getOverflowButton().getBadgeCustomData();
|
|
438
464
|
this._bInOverflow = false;
|
|
439
465
|
oOTBButtonBadgeData && oOTBButtonBadgeData.setVisible(false);
|
|
440
466
|
};
|
|
@@ -501,7 +527,7 @@ function(
|
|
|
501
527
|
return this.setProperty("showMenuButton", bShow);
|
|
502
528
|
};
|
|
503
529
|
|
|
504
|
-
|
|
530
|
+
/*
|
|
505
531
|
* Sets the number of upcoming notifications.
|
|
506
532
|
*
|
|
507
533
|
* @override
|
|
@@ -604,7 +630,10 @@ function(
|
|
|
604
630
|
|
|
605
631
|
// Utility
|
|
606
632
|
ShellBar.prototype._assignControlsToOverflowToolbar = function () {
|
|
607
|
-
var aAdditionalContent
|
|
633
|
+
var aAdditionalContent,
|
|
634
|
+
sMediaRange = this._getCurrentMediaRange();
|
|
635
|
+
|
|
636
|
+
this.sCurrentRange = sMediaRange;
|
|
608
637
|
|
|
609
638
|
if (!this._oOverflowToolbar) {return;}
|
|
610
639
|
|
|
@@ -612,14 +641,16 @@ function(
|
|
|
612
641
|
|
|
613
642
|
this.addControlToCollection(this._oToolbarSpacer, this._oOverflowToolbar);
|
|
614
643
|
|
|
615
|
-
|
|
616
|
-
this.addControlToCollection(this._oManagedSearch, this._oOverflowToolbar);
|
|
617
|
-
}
|
|
644
|
+
this._assignSearch();
|
|
618
645
|
|
|
619
646
|
if (this._oSearch) {
|
|
620
647
|
this.addControlToCollection(this._oSearch, this._oOverflowToolbar);
|
|
621
648
|
}
|
|
622
649
|
|
|
650
|
+
if (this._oCopilot) {
|
|
651
|
+
this.addControlToCollection(this._oCopilot, this._oOverflowToolbar);
|
|
652
|
+
}
|
|
653
|
+
|
|
623
654
|
if (this._oNotifications) {
|
|
624
655
|
this.addControlToCollection(this._oNotifications, this._oOverflowToolbar);
|
|
625
656
|
}
|
|
@@ -637,6 +668,25 @@ function(
|
|
|
637
668
|
return this._oOverflowToolbar;
|
|
638
669
|
};
|
|
639
670
|
|
|
671
|
+
// Utility for assigning Search to the relevant container
|
|
672
|
+
ShellBar.prototype._assignSearch = function () {
|
|
673
|
+
var sMediaRange = this._getCurrentMediaRange();
|
|
674
|
+
this.sCurrentRange = sMediaRange;
|
|
675
|
+
|
|
676
|
+
if (this._oManagedSearch && this.sCurrentRange !== "ExtraLargeDesktop") {
|
|
677
|
+
this.addControlToCollection(this._oManagedSearch, this._oOverflowToolbar);
|
|
678
|
+
this._oManagedSearch._switchOpenStateOnSearch();
|
|
679
|
+
} else if (this._oManagedSearch && this.sCurrentRange === "ExtraLargeDesktop") {
|
|
680
|
+
this._oManagedSearch.setIsOpen(true);
|
|
681
|
+
this.removeControlFromCollection(this._oManagedSearch, this._oOverflowToolbar);
|
|
682
|
+
}
|
|
683
|
+
};
|
|
684
|
+
|
|
685
|
+
// Utility for getting current media range
|
|
686
|
+
ShellBar.prototype._getCurrentMediaRange = function () {
|
|
687
|
+
return this.$().length && Device.media.getCurrentRange(this._sRangeSet, this.$().outerWidth()).name;
|
|
688
|
+
};
|
|
689
|
+
|
|
640
690
|
//Utility method for preparing and adding control to proper collection
|
|
641
691
|
ShellBar.prototype.addControlToCollection = function(oControl, aEntity) {
|
|
642
692
|
var fnAction;
|
|
@@ -649,6 +699,17 @@ function(
|
|
|
649
699
|
aEntity[fnAction](oControl);
|
|
650
700
|
};
|
|
651
701
|
|
|
702
|
+
|
|
703
|
+
//Utility method for preparing and adding control to proper collection
|
|
704
|
+
ShellBar.prototype.removeControlFromCollection = function(oControl, aEntity) {
|
|
705
|
+
var fnAction;
|
|
706
|
+
if (!Array.isArray(aEntity)) {
|
|
707
|
+
fnAction = aEntity === this._oAdditionalBox ? "removeItem" : "removeContent";
|
|
708
|
+
}
|
|
709
|
+
|
|
710
|
+
aEntity[fnAction](oControl);
|
|
711
|
+
};
|
|
712
|
+
|
|
652
713
|
ShellBar.prototype._updateNotificationsIndicators = function(sNotificationsNumber) {
|
|
653
714
|
var oOTBButton;
|
|
654
715
|
|
|
@@ -50,10 +50,10 @@ function() {
|
|
|
50
50
|
oControl._aLeftControls.forEach(oRm.renderControl, oRm);
|
|
51
51
|
|
|
52
52
|
oRm.close("div");
|
|
53
|
-
|
|
54
53
|
}
|
|
55
|
-
|
|
56
|
-
|
|
54
|
+
|
|
55
|
+
if (oControl._oManagedSearch && oControl.sCurrentRange === "ExtraLargeDesktop") {
|
|
56
|
+
oRm.renderControl(oControl._oManagedSearch);
|
|
57
57
|
}
|
|
58
58
|
|
|
59
59
|
if (oControl._aRightControls && oControl._aRightControls.length) {
|
package/src/sap/f/SidePanel.js
CHANGED
|
@@ -9,7 +9,9 @@ sap.ui.define([
|
|
|
9
9
|
"sap/ui/Device",
|
|
10
10
|
"sap/ui/core/Control",
|
|
11
11
|
"sap/ui/core/Core",
|
|
12
|
+
"sap/ui/core/Element",
|
|
12
13
|
"sap/ui/core/Icon",
|
|
14
|
+
"sap/ui/core/Lib",
|
|
13
15
|
"sap/ui/core/Popup",
|
|
14
16
|
"sap/ui/core/ResizeHandler",
|
|
15
17
|
"sap/ui/core/delegate/ScrollEnablement",
|
|
@@ -31,7 +33,9 @@ sap.ui.define([
|
|
|
31
33
|
Device,
|
|
32
34
|
Control,
|
|
33
35
|
Core,
|
|
36
|
+
Element,
|
|
34
37
|
Icon,
|
|
38
|
+
Library,
|
|
35
39
|
Popup,
|
|
36
40
|
ResizeHandler,
|
|
37
41
|
ScrollEnablement,
|
|
@@ -53,7 +57,7 @@ sap.ui.define([
|
|
|
53
57
|
"use strict";
|
|
54
58
|
|
|
55
59
|
// Resource Bundle
|
|
56
|
-
var oResourceBundle =
|
|
60
|
+
var oResourceBundle = Library.getResourceBundleFor("sap.f"),
|
|
57
61
|
InvisibleMessageMode = coreLibrary.InvisibleMessageMode,
|
|
58
62
|
SidePanelPosition = library.SidePanelPosition;
|
|
59
63
|
|
|
@@ -149,7 +153,7 @@ sap.ui.define([
|
|
|
149
153
|
* @extends sap.ui.core.Control
|
|
150
154
|
*
|
|
151
155
|
* @author SAP SE
|
|
152
|
-
* @version 1.
|
|
156
|
+
* @version 1.121.0
|
|
153
157
|
*
|
|
154
158
|
* @constructor
|
|
155
159
|
* @public
|
|
@@ -384,7 +388,7 @@ sap.ui.define([
|
|
|
384
388
|
* <b>Note:</b> it will be good to have dedicated Ids of the action items that will be selected programatically,
|
|
385
389
|
* otherwise the Ids of the action items wouldn't be stable.
|
|
386
390
|
*
|
|
387
|
-
* @param {sap.f.SidePanelItem|
|
|
391
|
+
* @param {sap.f.SidePanelItem|sap.ui.core.ID} vItem an action item or Id of the action item to select
|
|
388
392
|
* @returns {this} this for method chaining
|
|
389
393
|
*/
|
|
390
394
|
SidePanel.prototype.setSelectedItem = function(vItem) {
|
|
@@ -394,7 +398,7 @@ sap.ui.define([
|
|
|
394
398
|
|
|
395
399
|
if (typeof vItem === "string") {
|
|
396
400
|
sId = vItem;
|
|
397
|
-
oItem =
|
|
401
|
+
oItem = Element.getElementById(vItem);
|
|
398
402
|
} else if (vItem && vItem.isA("sap.f.SidePanelItem")) {
|
|
399
403
|
sId = vItem.getId();
|
|
400
404
|
oItem = vItem;
|
|
@@ -402,7 +406,7 @@ sap.ui.define([
|
|
|
402
406
|
|
|
403
407
|
if (!sId) {
|
|
404
408
|
// remove selected action item (if any) and collapse its side content
|
|
405
|
-
sSelectedItem && this._toggleItemSelection(
|
|
409
|
+
sSelectedItem && this._toggleItemSelection(Element.getElementById(sSelectedItem));
|
|
406
410
|
} else if (oItem && oItem.getEnabled() && sId !== sSelectedItem && sId !== this.getAggregation("_overflowItem").getId()) {
|
|
407
411
|
// select an action item and expand its side content
|
|
408
412
|
this._toggleItemSelection(oItem);
|
|
@@ -434,6 +438,12 @@ sap.ui.define([
|
|
|
434
438
|
this._detachResizableHandlers();
|
|
435
439
|
|
|
436
440
|
this._oInvisibleMessage = InvisibleMessage.getInstance();
|
|
441
|
+
|
|
442
|
+
if (this._isSingleItem()) {
|
|
443
|
+
var oSelectedItem = bActionBarExpanded ? this.getItems()[0] : null;
|
|
444
|
+
this.setProperty("sideContentExpanded", bActionBarExpanded);
|
|
445
|
+
this.setAssociation("selectedItem", oSelectedItem, true);
|
|
446
|
+
}
|
|
437
447
|
};
|
|
438
448
|
|
|
439
449
|
SidePanel.prototype.onAfterRendering = function() {
|
|
@@ -499,7 +509,7 @@ sap.ui.define([
|
|
|
499
509
|
}
|
|
500
510
|
} else if (bCtrlOrCmd && oEvent.which === KeyCodes.ARROW_RIGHT && bSideContentExpanded) {
|
|
501
511
|
if (bSideContentExpanded) {
|
|
502
|
-
this._contentControlToFocus =
|
|
512
|
+
this._contentControlToFocus = Element.getActiveElement();
|
|
503
513
|
}
|
|
504
514
|
this._oItemNavigation.getFocusedDomRef().focus();
|
|
505
515
|
} else if (bCtrlOrCmd && oEvent.shiftKey && oEvent.which === KeyCodes.P) {
|
|
@@ -596,7 +606,7 @@ sap.ui.define([
|
|
|
596
606
|
return;
|
|
597
607
|
}
|
|
598
608
|
|
|
599
|
-
this._toggleItemSelection(
|
|
609
|
+
this._toggleItemSelection(Element.getElementById(oItemDom.id));
|
|
600
610
|
};
|
|
601
611
|
|
|
602
612
|
/**
|
|
@@ -663,6 +673,7 @@ sap.ui.define([
|
|
|
663
673
|
};
|
|
664
674
|
|
|
665
675
|
SidePanel.prototype._setSideContentExpanded = function(bState) {
|
|
676
|
+
this._isSingleItem() && this.setActionBarExpanded(bState);
|
|
666
677
|
return this.setProperty("sideContentExpanded", bState);
|
|
667
678
|
};
|
|
668
679
|
|
|
@@ -686,13 +697,13 @@ sap.ui.define([
|
|
|
686
697
|
|
|
687
698
|
SidePanel.prototype._focusSideContent = function() {
|
|
688
699
|
// set focus to the last focused side content element, or to the Close Button
|
|
689
|
-
var oFocusControl = this._contentControlToFocus
|
|
700
|
+
var oFocusControl = this._contentControlToFocus || this.getAggregation("_closeButton");
|
|
690
701
|
|
|
691
702
|
oFocusControl && oFocusControl.focus();
|
|
692
703
|
};
|
|
693
704
|
|
|
694
705
|
SidePanel.prototype._closeSideContent = function() {
|
|
695
|
-
var oSelectedItem =
|
|
706
|
+
var oSelectedItem = Element.getElementById(this.getSelectedItem()),
|
|
696
707
|
bSkipPrevent = true;
|
|
697
708
|
|
|
698
709
|
// fire 'toggle' event for collapse if there is expanded action item
|
|
@@ -978,7 +989,7 @@ sap.ui.define([
|
|
|
978
989
|
// fire 'toggle' event for collapsed action item
|
|
979
990
|
if (oSelectedItem && (!bExpanded || bToggleDifferent)) {
|
|
980
991
|
bSkipPrevent = this._fireToggle({
|
|
981
|
-
item: bToggleDifferent ?
|
|
992
|
+
item: bToggleDifferent ? Element.getElementById(oSelectedItem) : oItem,
|
|
982
993
|
expanded: false
|
|
983
994
|
});
|
|
984
995
|
}
|
|
@@ -1057,7 +1068,7 @@ sap.ui.define([
|
|
|
1057
1068
|
};
|
|
1058
1069
|
|
|
1059
1070
|
SidePanel.prototype._getSelectedItem = function() {
|
|
1060
|
-
return
|
|
1071
|
+
return Element.getElementById(this.getSelectedItem());
|
|
1061
1072
|
};
|
|
1062
1073
|
|
|
1063
1074
|
SidePanel.prototype._getSideContentHeaderTitle = function() {
|
|
@@ -5,16 +5,16 @@
|
|
|
5
5
|
*/
|
|
6
6
|
sap.ui.define([
|
|
7
7
|
"sap/ui/core/Control",
|
|
8
|
-
"sap/ui/core/Core",
|
|
9
8
|
"sap/ui/core/IntervalTrigger",
|
|
9
|
+
"sap/ui/core/Lib",
|
|
10
10
|
"sap/ui/core/format/DateFormat",
|
|
11
11
|
"sap/ui/core/date/UniversalDate",
|
|
12
12
|
"sap/ui/core/library",
|
|
13
13
|
"sap/m/Text"
|
|
14
14
|
], function (
|
|
15
15
|
Control,
|
|
16
|
-
Core,
|
|
17
16
|
IntervalTrigger,
|
|
17
|
+
Library,
|
|
18
18
|
DateFormat,
|
|
19
19
|
UniversalDate,
|
|
20
20
|
coreLibrary,
|
|
@@ -27,6 +27,8 @@ sap.ui.define([
|
|
|
27
27
|
*/
|
|
28
28
|
var DATA_TIMESTAMP_REFRESH_INTERVAL = 60000;
|
|
29
29
|
|
|
30
|
+
var oResourceBundle = Library.getResourceBundleFor("sap.f");
|
|
31
|
+
|
|
30
32
|
var TextAlign = coreLibrary.TextAlign;
|
|
31
33
|
|
|
32
34
|
/**
|
|
@@ -42,7 +44,7 @@ sap.ui.define([
|
|
|
42
44
|
* @abstract
|
|
43
45
|
*
|
|
44
46
|
* @author SAP SE
|
|
45
|
-
* @version 1.
|
|
47
|
+
* @version 1.121.0
|
|
46
48
|
*
|
|
47
49
|
* @constructor
|
|
48
50
|
* @public
|
|
@@ -87,7 +89,17 @@ sap.ui.define([
|
|
|
87
89
|
* If the header should be rendered as a tile.
|
|
88
90
|
* @private
|
|
89
91
|
*/
|
|
90
|
-
useTileLayout: { type: "boolean", group: "Appearance", visibility: "hidden" }
|
|
92
|
+
useTileLayout: { type: "boolean", group: "Appearance", visibility: "hidden" },
|
|
93
|
+
|
|
94
|
+
/**
|
|
95
|
+
* Defines aria-level of the header.
|
|
96
|
+
*
|
|
97
|
+
* When header is in a dialog aria-level is 1
|
|
98
|
+
* When header is not in a dialog(standard scenario) aria-level is 3
|
|
99
|
+
*
|
|
100
|
+
* @private
|
|
101
|
+
*/
|
|
102
|
+
headingLevel: { type: "string", visibility: "hidden", defaultValue: "3"}
|
|
91
103
|
},
|
|
92
104
|
aggregations: {
|
|
93
105
|
/**
|
|
@@ -118,7 +130,7 @@ sap.ui.define([
|
|
|
118
130
|
});
|
|
119
131
|
|
|
120
132
|
BaseHeader.prototype.init = function () {
|
|
121
|
-
this._oRb =
|
|
133
|
+
this._oRb = Library.getResourceBundleFor("sap.f");
|
|
122
134
|
|
|
123
135
|
this._oToolbarDelegate = {
|
|
124
136
|
onfocusin: this._onToolbarFocusin,
|
|
@@ -199,7 +211,7 @@ sap.ui.define([
|
|
|
199
211
|
}
|
|
200
212
|
};
|
|
201
213
|
|
|
202
|
-
|
|
214
|
+
/*
|
|
203
215
|
* @override
|
|
204
216
|
*/
|
|
205
217
|
BaseHeader.prototype.setDataTimestamp = function (sDataTimestamp) {
|
|
@@ -221,7 +233,7 @@ sap.ui.define([
|
|
|
221
233
|
};
|
|
222
234
|
|
|
223
235
|
/**
|
|
224
|
-
* @
|
|
236
|
+
* @private
|
|
225
237
|
*/
|
|
226
238
|
BaseHeader.prototype.setDataTimestampUpdating = function (bDataTimestampUpdating) {
|
|
227
239
|
var oTimestampText = this._createDataTimestamp();
|
|
@@ -279,7 +291,7 @@ sap.ui.define([
|
|
|
279
291
|
|
|
280
292
|
// no less than "1 minute ago" should be shown, "30 seconds ago" should not be shown
|
|
281
293
|
if (oUniversalDate.getTime() + 59000 > Date.now()) {
|
|
282
|
-
sFormattedText = "
|
|
294
|
+
sFormattedText = oResourceBundle.getText("CARD_HEADER_DATETIMESTAMP_NOW");
|
|
283
295
|
}
|
|
284
296
|
|
|
285
297
|
oDataTimestamp.setText(sFormattedText);
|
|
@@ -342,7 +354,7 @@ sap.ui.define([
|
|
|
342
354
|
* @ui5-restricted
|
|
343
355
|
*/
|
|
344
356
|
BaseHeader.prototype.getAriaHeadingLevel = function () {
|
|
345
|
-
return "
|
|
357
|
+
return this.getProperty("headingLevel");
|
|
346
358
|
};
|
|
347
359
|
|
|
348
360
|
/**
|
|
@@ -4,7 +4,7 @@
|
|
|
4
4
|
* Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
|
|
5
5
|
*/
|
|
6
6
|
|
|
7
|
-
sap.ui.define(["sap/ui/core/
|
|
7
|
+
sap.ui.define(["sap/ui/core/Lib"], function(Library) {
|
|
8
8
|
"use strict";
|
|
9
9
|
|
|
10
10
|
/**
|
|
@@ -26,7 +26,7 @@ sap.ui.define(["sap/ui/core/Core"], function(Core) {
|
|
|
26
26
|
* @param {sap.f.cards.loading.PlaceholderBase} oControl An object representation of the control that should be rendered.
|
|
27
27
|
*/
|
|
28
28
|
PlaceholderBaseRenderer.render = function(oRm, oControl) {
|
|
29
|
-
var oResBundle =
|
|
29
|
+
var oResBundle = Library.getResourceBundleFor("sap.ui.core"),
|
|
30
30
|
sTitle = oResBundle.getText("BUSY_TEXT");
|
|
31
31
|
|
|
32
32
|
if (!oControl.getHasContent()) {
|
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
|
|
2
|
-
DYNAMIC_PAGE_HEADER_NAME=\u206A\u206A\u206A\u200C\u200B\u200B\
|
|
2
|
+
DYNAMIC_PAGE_HEADER_NAME=\u206A\u206A\u206A\u200C\u200B\u200B\u200C\u200C\u200C\u200C\u200B\u200C\u200B\u200B\u200B\u200D\u200C\u200D\u200B\u200D\u200B\u200B\u200B\u200B\u200C\u200B\u200D\u200D\u200D\u200D\u200B\u200C\u200D\u200C\u200B\u200B\u200B\u200D\u200B\u200D\u200B\u200B\u200B\u200D\u206APage header\u206A\u206A
|
|
3
3
|
|
|
4
|
-
DYNAMIC_PAGE_HEADER_NAME_PLURAL=\u206A\u206A\u206A\
|
|
4
|
+
DYNAMIC_PAGE_HEADER_NAME_PLURAL=\u206A\u206A\u206A\u200D\u200D\u200B\u200C\u200D\u200D\u200C\u200B\u200D\u200D\u200D\u200B\u200C\u200D\u200D\u200C\u200C\u200B\u200B\u200B\u200D\u200B\u200D\u200B\u200B\u200D\u200D\u200B\u200B\u200B\u200D\u200C\u200B\u200B\u200C\u200C\u200B\u200C\u200C\u200D\u206APage headers\u206A\u206A
|
|
5
5
|
|
|
6
|
-
DYNAMIC_PAGE_TITLE_NAME=\u206A\u206A\u206A\u200D\
|
|
6
|
+
DYNAMIC_PAGE_TITLE_NAME=\u206A\u206A\u206A\u200D\u200B\u200D\u200C\u200B\u200B\u200C\u200C\u200D\u200D\u200B\u200C\u200C\u200D\u200C\u200C\u200C\u200D\u200D\u200D\u200C\u200B\u200C\u200D\u200D\u200D\u200D\u200C\u200D\u200C\u200B\u200B\u200B\u200D\u200B\u200C\u200C\u200C\u200D\u206APage title\u206A\u206A
|
|
7
7
|
|
|
8
|
-
DYNAMIC_PAGE_TITLE_NAME_PLURAL=\u206A\u206A\u206A\u200C\u200B\
|
|
8
|
+
DYNAMIC_PAGE_TITLE_NAME_PLURAL=\u206A\u206A\u206A\u200D\u200C\u200B\u200D\u200C\u200C\u200B\u200C\u200B\u200B\u200C\u200D\u200C\u200D\u200B\u200B\u200C\u200B\u200C\u200C\u200C\u200C\u200C\u200B\u200D\u200D\u200D\u200D\u200B\u200D\u200B\u200D\u200C\u200D\u200D\u200D\u200D\u200D\u200B\u200C\u206APage titles\u206A\u206A
|