Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion packages/fiori/src/SideNavigation.js
Original file line number Diff line number Diff line change
Expand Up @@ -241,7 +241,7 @@ class SideNavigation extends UI5Element {

async openPicker(opener) {
const responsivePopover = await this.getPicker();
responsivePopover.open(opener);
responsivePopover.openBy(opener);
}

async closePicker(opener) {
Expand Down
2 changes: 1 addition & 1 deletion packages/fiori/src/Wizard.js
Original file line number Diff line number Diff line change
Expand Up @@ -588,7 +588,7 @@ class Wizard extends UI5Element {
}

const responsivePopover = await this._respPopover();
responsivePopover.open(oDomTarget);
responsivePopover.openBy(oDomTarget);
}

async _onGroupedTabClick(event) {
Expand Down
2 changes: 1 addition & 1 deletion packages/main/src/ComboBox.js
Original file line number Diff line number Diff line change
Expand Up @@ -646,7 +646,7 @@ class ComboBox extends UI5Element {
}

_openRespPopover() {
this.responsivePopover.open(this);
this.responsivePopover.openBy(this);
}

_filterItems(str) {
Expand Down
4 changes: 2 additions & 2 deletions packages/main/src/DatePicker.js
Original file line number Diff line number Diff line change
Expand Up @@ -551,7 +551,7 @@ class DatePicker extends DateComponentBase {

_click(event) {
if (isPhone()) {
this.responsivePopover.open(this);
this.responsivePopover.openBy(this);
event.preventDefault(); // prevent immediate selection of any item
}
}
Expand Down Expand Up @@ -713,7 +713,7 @@ class DatePicker extends DateComponentBase {
this._calendarCurrentPicker = "day";
this.responsivePopover = await this._respPopover();

this.responsivePopover.open(this);
this.responsivePopover.openBy(this);
}

togglePicker() {
Expand Down
2 changes: 1 addition & 1 deletion packages/main/src/Input.js
Original file line number Diff line number Diff line change
Expand Up @@ -675,7 +675,7 @@ class Input extends UI5Element {

_click(event) {
if (isPhone() && !this.readonly && this.Suggestions) {
this.Suggestions.open(this);
this.Suggestions.openBy(this);
this.isRespPopoverOpen = true;
}
}
Expand Down
4 changes: 2 additions & 2 deletions packages/main/src/MultiComboBox.js
Original file line number Diff line number Diff line change
Expand Up @@ -501,7 +501,7 @@ class MultiComboBox extends UI5Element {
if (filteredItems.length === 0) {
this.allItemsPopover.close();
} else {
this.allItemsPopover.open(this);
this.allItemsPopover.openBy(this);
}
}

Expand Down Expand Up @@ -662,7 +662,7 @@ class MultiComboBox extends UI5Element {

_click(event) {
if (isPhone() && !this.readonly && !this._showMorePressed) {
this.allItemsPopover.open(this);
this.allItemsPopover.openBy(this);
}

this._showMorePressed = false;
Expand Down
7 changes: 3 additions & 4 deletions packages/main/src/ResponsivePopover.js
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ class ResponsivePopover extends Popover {
* @async
* @returns {Promise} Resolves when the responsive popover is open
*/
async open(opener) {
async openBy(opener) {
this.style.display = this._isPhone ? "contents" : "";

if (this.isOpen() || (this._dialog && this._dialog.isOpen())) {
Expand All @@ -132,8 +132,7 @@ class ResponsivePopover extends Popover {
if (!this.noStretch) {
this._minWidth = Math.max(POPOVER_MIN_WIDTH, opener.getBoundingClientRect().width);
}

await this.openBy(opener);
await super.openBy(opener);
} else {
this.style.zIndex = getNextZIndex();
await this._dialog.open();
Expand All @@ -157,7 +156,7 @@ class ResponsivePopover extends Popover {
return this.close();
}

this.open(opener);
this.openBy(opener);
}

/**
Expand Down
2 changes: 1 addition & 1 deletion packages/main/src/Select.js
Original file line number Diff line number Diff line change
Expand Up @@ -372,7 +372,7 @@ class Select extends UI5Element {
if (this._isPickerOpen) {
this.responsivePopover.close();
} else {
this.responsivePopover.open(this);
this.responsivePopover.openBy(this);
}
}

Expand Down
2 changes: 1 addition & 1 deletion packages/main/src/TabContainer.js
Original file line number Diff line number Diff line change
Expand Up @@ -497,7 +497,7 @@ class TabContainer extends UI5Element {
if (this.responsivePopover.opened) {
this.responsivePopover.close();
} else {
this.responsivePopover.open(button);
this.responsivePopover.openBy(button);
}
}

Expand Down
2 changes: 1 addition & 1 deletion packages/main/src/TimePickerBase.js
Original file line number Diff line number Diff line change
Expand Up @@ -302,7 +302,7 @@ class TimePickerBase extends UI5Element {
async openPicker() {
this.tempValue = this.value && this.isValid(this.value) ? this.value : this.getFormat().format(new Date());
const responsivePopover = await this._getPopover();
responsivePopover.open(this);
responsivePopover.openBy(this);
this._isPickerOpen = true;
}

Expand Down
2 changes: 1 addition & 1 deletion packages/main/src/Tokenizer.js
Original file line number Diff line number Diff line change
Expand Up @@ -169,7 +169,7 @@ class Tokenizer extends UI5Element {
if (this.showPopover) {
const popover = await this.getPopover();

popover.open(this.morePopoverOpener || this);
popover.openBy(this.morePopoverOpener || this);
}

this.fireEvent("show-more-items-press");
Expand Down
2 changes: 1 addition & 1 deletion packages/main/src/features/InputSuggestions.js
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ class Suggestions {
this._beforeOpen();

if (this._getItems().length) {
this.responsivePopover.open(this._getComponent());
this.responsivePopover.openBy(this._getComponent());
}
}

Expand Down
2 changes: 1 addition & 1 deletion packages/main/test/pages/ColorPalette.html
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@
changeResult.value = event.detail.color;
});
colorPaletteBtn.addEventListener("click", function(event) {
respPopover.open(colorPaletteBtn);
respPopover.openBy(colorPaletteBtn);
});
btnClose.addEventListener("click", function(event) {
respPopover.close();
Expand Down
8 changes: 4 additions & 4 deletions packages/main/test/pages/ResponsivePopover.html
Original file line number Diff line number Diff line change
Expand Up @@ -101,21 +101,21 @@ <h2> Inputs based component that opens popover/dialog within dialog</h2>

<script>
btnOpen.addEventListener("click", function(event) {
respPopover.open(btnOpen);
respPopover.openBy(btnOpen);
});
btnClose.addEventListener("click", function(event) {
respPopover.close();
});

btnOpen2.addEventListener("click", function(event) {
respPopover2.open(btnOpen2);
respPopover2.openBy(btnOpen2);
});
btnClose2.addEventListener("click", function(event) {
respPopover2.close();
});

btnOpen3.addEventListener("click", function(event) {
respPopover3.open(btnOpen3);
respPopover3.openBy(btnOpen3);
});
btnClose3.addEventListener("click", function(event) {
respPopover3.close();
Expand All @@ -125,7 +125,7 @@ <h2> Inputs based component that opens popover/dialog within dialog</h2>
});

btnSimpleRP.addEventListener("click", function(event) {
simpleRP.open(btnSimpleRP);
simpleRP.openBy(btnSimpleRP);
});
</script>
</body>
Expand Down
4 changes: 2 additions & 2 deletions packages/main/test/samples/ResponsivePopover.sample.html
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ <h3>Basic ResponsivePopover</h3>
var popoverCloser = document.getElementById("closePopoverButton");

popoverOpener.addEventListener("click", function() {
popover.open(popoverOpener);
popover.openBy(popoverOpener);
});
popoverCloser.addEventListener("click", function() {
popover.close();
Expand Down Expand Up @@ -61,7 +61,7 @@ <h3>Basic ResponsivePopover</h3>
var popoverCloser = document.getElementById("closePopoverButton");

popoverOpener.addEventListener("click", function() {
popover.open(popoverOpener);
popover.openBy(popoverOpener);
});
popoverCloser.addEventListener("click", function() {
popover.close();
Expand Down