Merge branch 'master' into card_refactoring

SAP · Jul 24, 2021 · 0e047ba · 0e047ba
2 parents 925f2ea + 0ecc508
commit 0e047ba
Show file tree

Hide file tree

Showing 29 changed files with 59 additions and 117 deletions.
diff --git a/docs/How To Use.md b/docs/How To Use.md
@@ -228,7 +228,7 @@ Get a reference to the UI5 Web Component and call the method on it, as you would
 
 ```js
 const myDialog = document.getElementsByTagName("ui5-dialog")[0];
-myDialog.open();
+myDialog.show();
 ```
 
 Consult the documentation for the available public methods for each UI5 Web Component.

diff --git a/docs/Public Module Imports.md b/docs/Public Module Imports.md
@@ -39,7 +39,6 @@ For API documentation and samples, please check the [UI5 Web Components Playgrou
 | Date Range Picker        | `ui5-daterange-picker`   | `import "@ui5/webcomponents/dist/DateRangePicker.js";`     |
 | Date Time Picker         | `ui5-datetime-picker`    | `import "@ui5/webcomponents/dist/DateTimePicker.js";`      |
 | Dialog                   | `ui5-dialog`             | `import "@ui5/webcomponents/dist/Dialog.js";`              |
-| Duration Picker          | `ui5-duration-picker`    | `import "@ui5/webcomponents/dist/DurationPicker.js";`      |
 | File Uploader            | `ui5-file-uploader`      | `import "@ui5/webcomponents/dist/FileUploader.js";`        |
 | Icon                     | `ui5-icon`               | `import "@ui5/webcomponents/dist/Icon.js";`                |
 | Input                    | `ui5-input`              | `import "@ui5/webcomponents/dist/Input.js";`               |

diff --git a/packages/fiori/test/pages/IllustratedMessage.html b/packages/fiori/test/pages/IllustratedMessage.html
@@ -79,7 +79,7 @@
 		});
 
 		dialogOpener.addEventListener("click", () => {
-			dialog.open();
+			dialog.show();
 		});
 
 		dialogCloser.addEventListener("click", () => {

diff --git a/packages/fiori/test/pages/Wizard.html b/packages/fiori/test/pages/Wizard.html
@@ -721,7 +721,7 @@ <h2>Wizard non-standard 3</h2>
 		var wiz2 = document.getElementById("wiz2");
 
 		btnOpenDialog.addEventListener("click", function () {
-			dialog.open();
+			dialog.show();
 		});
 
 		wiz2.addEventListener("step-change", function () {

diff --git a/packages/fiori/test/pages/Wizard_test.html b/packages/fiori/test/pages/Wizard_test.html
@@ -382,7 +382,7 @@
 		});
 
 		btnOpenDialog.addEventListener("click", function () {
-			dialog.open();
+			dialog.show();
 		});
 
 		setting.addEventListener("step-change", function (event) {

diff --git a/packages/fiori/test/samples/IllustratedMessage.sample.html b/packages/fiori/test/samples/IllustratedMessage.sample.html
@@ -44,7 +44,7 @@ <h3>Illustrated message in dialog</h3>
 			var dialogCloser = document.getElementById("closeDialogButton");
 
 			dialogOpener.addEventListener("click", function () {
-				dialog.open();
+				dialog.show();
 			});
 
 			dialogCloser.addEventListener("click", function () {

diff --git a/packages/fiori/test/specs/UploadCollection.spec.js b/packages/fiori/test/specs/UploadCollection.spec.js
@@ -140,7 +140,7 @@ describe("UploadCollection", () => {
 			browser.keys("last.reports-edited");
 			browser.keys("Enter");
 
-			assert.strictEqual(latestReportsPdf.getProperty("fileName"), "last.reports-edited.pdf", "file extension '.pdf' should be preserved");
+			// assert.strictEqual(latestReportsPdf.getProperty("fileName"), "last.reports-edited.pdf", "file extension '.pdf' should be preserved");
 
 			// reset the item
 			browser.execute(() => {

diff --git a/packages/main/src/ColorPalette.js b/packages/main/src/ColorPalette.js
@@ -234,7 +234,7 @@ class ColorPalette extends UI5Element {
 
 	async _openMoreColorsDialog() {
 		const dialog = await this._getDialog();
-		dialog.open();
+		dialog.show();
 	}
 
 	/**

diff --git a/packages/main/src/Dialog.js b/packages/main/src/Dialog.js
@@ -215,15 +215,15 @@ class Dialog extends Popup {
 	}
 
 	/**
-	 * Opens the dialog
+	 * Shows the dialog.
 	 *
 	 * @param {boolean} preventInitialFocus Prevents applying the focus inside the popup
 	 * @async
 	 * @returns {Promise} Resolves when the dialog is open
 	 * @public
 	 */
-	async open(preventInitialFocus) {
-		await super.open(preventInitialFocus);
+	async show(preventInitialFocus) {
+		await super._open(preventInitialFocus);
 	}
 
 	get isModal() { // Required by Popup.js
@@ -277,8 +277,8 @@ class Dialog extends Popup {
 		return this._movable ? "0" : undefined;
 	}
 
-	show() {
-		super.show();
+	_show() {
+		super._show();
 		this._center();
 		this._attachResizeHandlers();
 	}

diff --git a/packages/main/src/DurationPicker.js b/packages/main/src/DurationPicker.js
@@ -7,7 +7,7 @@ import {
 } from "./generated/i18n/i18n-defaults.js";
 
 /**
- * @public
+ * @private
  */
 const metadata = {
 	tag: "ui5-duration-picker",
@@ -164,7 +164,7 @@ const pad = number => {
  * @alias sap.ui.webcomponents.main.DurationPicker
  * @extends TimePickerBase
  * @tagname ui5-duration-picker
- * @public
+ * @private
  */
 class DurationPicker extends TimePickerBase {
 	static get metadata() {

diff --git a/packages/main/src/Popover.js b/packages/main/src/Popover.js
@@ -305,7 +305,7 @@ class Popover extends Popup {
 		this._opener = opener;
 		this._openerRect = opener.getBoundingClientRect();
 
-		await super.open(preventInitialFocus);
+		await super._open(preventInitialFocus);
 	}
 
 	/**
@@ -360,10 +360,10 @@ class Popover extends Popup {
 	}
 
 	reposition() {
-		this.show();
+		this._show();
 	}
 
-	show() {
+	_show() {
 		let placement;
 		const popoverSize = this.getPopoverSize();
 
@@ -392,7 +392,7 @@ class Popover extends Popup {
 		}
 
 		if (this._oldPlacement && (this._oldPlacement.left === placement.left) && (this._oldPlacement.top === placement.top) && stretching) {
-			super.show();
+			super._show();
 			this.style.width = this._width;
 			return;
 		}
@@ -437,7 +437,7 @@ class Popover extends Popup {
 			top: `${top}px`,
 			left: `${left}px`,
 		});
-		super.show();
+		super._show();
 
 		if (stretching && this._width) {
 			this.style.width = this._width;

diff --git a/packages/main/src/Popup.js b/packages/main/src/Popup.js
@@ -361,7 +361,7 @@ class Popup extends UI5Element {
 	 * Shows the block layer (for modal popups only) and sets the correct z-index for the purpose of popup stacking
 	 * @protected
 	 */
-	async open(preventInitialFocus) {
+	async _open(preventInitialFocus) {
 		const prevented = !this.fireEvent("before-open", {}, true, false);
 		if (prevented) {
 			return;
@@ -378,7 +378,7 @@ class Popup extends UI5Element {
 		this.style.zIndex = this._zIndex;
 		this._focusedElementBeforeOpen = getFocusedElement();
 
-		this.show();
+		this._show();
 
 		if (!this._disableInitialFocus && !preventInitialFocus) {
 			this.applyInitialFocus();
@@ -461,7 +461,7 @@ class Popup extends UI5Element {
 	 * Sets "block" display to the popup. The property can be overriden by derivatives of Popup.
 	 * @protected
 	 */
-	show() {
+	_show() {
 		this.style.display = this._displayProp;
 	}
 

diff --git a/packages/main/src/ResponsivePopover.js b/packages/main/src/ResponsivePopover.js
@@ -135,7 +135,7 @@ class ResponsivePopover extends Popover {
 			await super.openBy(opener);
 		} else {
 			this.style.zIndex = getNextZIndex();
-			await this._dialog.open();
+			await this._dialog.show();
 		}
 	}
 

diff --git a/packages/main/test/pages/BusyIndicator.html b/packages/main/test/pages/BusyIndicator.html
@@ -222,11 +222,11 @@
 		});
 
 		document.getElementById("open-dialog-inactive-indicator").addEventListener("click", function () {
-			document.getElementById("dialog-inactive-indicator").open();
+			document.getElementById("dialog-inactive-indicator").show();
 		});
 
 		document.getElementById("open-dialog-active-indicator").addEventListener("click", function () {
-			document.getElementById("dialog-active-indicator").open();
+			document.getElementById("dialog-active-indicator").show();
 		});
 	</script>
 </body>

diff --git a/packages/main/test/pages/Dialog.html b/packages/main/test/pages/Dialog.html
@@ -377,24 +377,24 @@
 		let preventClosing = true;
 
 		btnOpenDialog.addEventListener("click", function () {
-			dialog.open();
+			dialog.show();
 		});
 		btnCloseDialog.addEventListener("click", function () {
 			dialog.close();
 		});
 
 		prevent.addEventListener("click", function () {
-			window["prevent-dialog"].open();
+			window["prevent-dialog"].show();
 		});
 
 		message.addEventListener("click", function () {
-			window["msg-dialog"].open();
+			window["msg-dialog"].show();
 		});
 
 		window["prevent-dialog"].addEventListener("ui5-beforeClose", function (event) {
 			if (preventClosing) {
 				event.preventDefault();
-				window["confirm-dialog"].open();
+				window["confirm-dialog"].show();
 			}
 
 			if (!preventClosing) {
@@ -416,21 +416,21 @@
 		window["modals-open"].addEventListener("click", function (event) { pop.openBy(event.target) });
 
 		popbtn.addEventListener('click', function (event) {
-			danger.open();
+			danger.show();
 		});
 
 		bigDanger.addEventListener('click', function (event) {
 			bigDangerPop.openBy(bigDanger);
 		});
 
-		window["empty-open"].addEventListener("click", function () { window["empty-dialog"].open(); });
-		window["wide-open"].addEventListener("click", function () { window["wide-dialog"].open(); });
-		window["wide-open2"].addEventListener("click", function () { window["wide-dialog2"].open(); });
-		window["draggable-open"].addEventListener("click", function () { window["draggable-dialog"].open(); });
+		window["empty-open"].addEventListener("click", function () { window["empty-dialog"].show(); });
+		window["wide-open"].addEventListener("click", function () { window["wide-dialog"].show(); });
+		window["wide-open2"].addEventListener("click", function () { window["wide-dialog2"].show(); });
+		window["draggable-open"].addEventListener("click", function () { window["draggable-dialog"].show(); });
 		window["draggable-close"].addEventListener("click", function () { window["draggable-dialog"].close(); });
-		window["resizable-open"].addEventListener("click", function () { window["resizable-dialog"].open(); });
+		window["resizable-open"].addEventListener("click", function () { window["resizable-dialog"].show(); });
 		window["resizable-close"].addEventListener("click", function () { window["resizable-dialog"].close(); });
-		window["draggable-and-resizable-open"].addEventListener("click", function () { window["draggable-and-resizable-dialog"].open(); });
+		window["draggable-and-resizable-open"].addEventListener("click", function () { window["draggable-and-resizable-dialog"].show(); });
 		window["draggable-and-resizable-close"].addEventListener("click", function () { window["draggable-and-resizable-dialog"].close(); });
 
 		window["dynamic-open"].addEventListener("click", function () {
@@ -448,7 +448,7 @@
 
 			document.body.appendChild(dialog);
 
-			dialog.open();
+			dialog.show();
 		});
 	</script>
 </body>

diff --git a/packages/main/test/pages/DialogLifecycle.html b/packages/main/test/pages/DialogLifecycle.html
@@ -52,7 +52,7 @@
 		});
 
 		document.body.appendChild(dialog);
-		dialog.open();
+		dialog.show();
 	});
 </script>
 

diff --git a/packages/main/test/pages/DialogSemantic.html b/packages/main/test/pages/DialogSemantic.html
@@ -83,7 +83,7 @@
 
 	<script>
 		btnWarning.addEventListener("click", function () {
-			dialogWarning.open();
+			dialogWarning.show();
 		});
 		btnWarningClose.addEventListener("click", function () {
 			dialogWarning.close();

diff --git a/packages/main/test/pages/Input.html b/packages/main/test/pages/Input.html
@@ -355,7 +355,7 @@ <h3>Test Backspace</h3>
 		});
 
 		btnOpenDialog.addEventListener("click", function () {
-			dialog.open();
+			dialog.show();
 		});
 		var sap_database_entries = [{ key: "A", text: "A" }, { key: "Afg", text: "Afghanistan" }, { key: "Arg", text: "Argentina" }, { key: "Alb", text: "Albania" }, { key: "Arm", text: "Armenia" }, { key: "Alg", text: "Algeria" }, { key: "And", text: "Andorra" }, { key: "Ang", text: "Angola" }, { key: "Ast", text: "Austria" }, { key: "Aus", text: "Australia" }, { key: "Aze", text: "Azerbaijan" }, { key: "Aruba", text: "Aruba" }, { key: "Antigua", text: "Antigua and Barbuda" }, { key: "B", text: "B" }, { key: "Bel", text: "Belarus" }, { key: "Bel", text: "Belgium" }, { key: "Bg", text: "Bulgaria" }, { key: "Bra", text: "Brazil" }, { key: "C", text: "C" }, { key: "Ch", text: "China" }, { key: "Cub", text: "Cuba" }, { key: "Chil", text: "Chili" }, { key: "L", text: "L" }, { key: "Lat", text: "Latvia" }, { key: "Lit", text: "Litva" }, { key: "P", text: "P" }, { key: "Prt", text: "Portugal" }, { key: "S", text: "S" }, { key: "Sen", text: "Senegal" }, { key: "Ser", text: "Serbia" }, { key: "Sey", text: "Seychelles" }, { key: "Sierra", text: "Sierra Leone" }, { key: "Sgp", text: "Singapore" }, { key: "Sint", text: "Sint Maarten" }, { key: "Slv", text: "Slovakia" }, { key: "Slo", text: "Slovenia" }];
 

diff --git a/packages/main/test/pages/MultiInput.html b/packages/main/test/pages/MultiInput.html
@@ -337,7 +337,7 @@ <h1>Test value-help-trigger with F4 and Alt + ArrowUp/Down</h1>
 				list.appendChild(li);
 			});
 
-			document.getElementById("dialog").open();
+			document.getElementById("dialog").show();
 		});
 
 		document.getElementById("suggestion-token").addEventListener("ui5-suggestion-item-select", function (event) {

diff --git a/packages/main/test/pages/MultiInput_Suggestions.html b/packages/main/test/pages/MultiInput_Suggestions.html
@@ -126,7 +126,7 @@ <h1>Token Creation onChange (unique)</h1>
 				list.appendChild(li);
 			});
 
-			document.getElementById("dialog").open();
+			document.getElementById("dialog").show();
 		});
 
 		document.getElementById("suggestion-token").addEventListener("ui5-suggestion-item-select", function (event) {

diff --git a/packages/main/test/pages/ResponsivePopover.html b/packages/main/test/pages/ResponsivePopover.html
@@ -126,7 +126,7 @@ <h2> Inputs based component that opens popover/dialog within dialog</h2>
 			respPopover3.close();
 		});
 		btnOpenDialog.addEventListener('click', function (event) {
-			dialog.open(btnOpenDialog);
+			dialog.show();
 		});
 
 		btnSimpleRP.addEventListener("click", function(event) {

diff --git a/packages/main/test/pages/Toast.html b/packages/main/test/pages/Toast.html
@@ -97,7 +97,7 @@ <h3>Test Dialog and Toast</h3>
 		});
 
 		btnDialog.addEventListener('click', function () {
-			dialog.open();
+			dialog.show();
 		});
 
 		btnDialog2.addEventListener('click', function () {

diff --git a/packages/main/test/pages/kitchen-scripts.js b/packages/main/test/pages/kitchen-scripts.js
@@ -97,10 +97,10 @@ document.addEventListener("DOMContentLoaded", function(event) {
 
 
 	dialogOpener.addEventListener("click", function() {
-		dialog.open();
+		dialog.show();
 	});
 	dialogOpener2.addEventListener("click", function() {
-		dialog2.open();
+		dialog2.show();
 	});
 	dialogCloser.addEventListener("click", function() {
 		dialog.close();

diff --git a/packages/main/test/pages/modules/Popups.js b/packages/main/test/pages/modules/Popups.js
@@ -3,7 +3,7 @@ function onload() {
 	var wcBtnOpenDialog = document.querySelector('.wcBtnOpenDialog');
 	wcBtnOpenDialog.addEventListener('click', function () {
 		var wcDialog = document.querySelector('.wcDialog');
-		wcDialog.open();
+		wcDialog.show();
 	});
 
 	var wcBtnCloseDialog = document.querySelector('.wcBtnCloseDialog');
@@ -15,7 +15,7 @@ function onload() {
 	var wcBtnOpenNewDialog = document.querySelector('.wcBtnOpenNewDialog');
 	wcBtnOpenNewDialog.addEventListener('click', function () {
 		var wcNewDialog = document.querySelector('.wcNewDialog');
-		wcNewDialog.open();
+		wcNewDialog.show();
 	});
 
 	var wcBtnOpenNewDialogPopover = document.querySelector('.wcBtnOpenNewDialogPopover');
@@ -46,6 +46,6 @@ function onload() {
 	var wcBtnOpenNewPopoverDialog11 = document.querySelector('.wcBtnOpenNewPopoverDialog11');
 	wcBtnOpenNewPopoverDialog11.addEventListener('click', function () {
 		var wcNewPopoverDialog11 = document.querySelector('.wcNewPopoverDialog11');
-		wcNewPopoverDialog11.open();
+		wcNewPopoverDialog11.show();
 	});
 }