[INTERNAL] sap.m.Dialog: beginButton type change fixed for Quartz Light

No matter what type of 'beginButton' or 'endButton' the user gave, they were turned to 'Emphasized' and 'Transparent'. This is not wanted for sap.m.Dialog, but wanted for other types of dialogs, where we have control over the buttons. Now the following controls have their 'beginButton' emphasized for all themes: - sap.m.SelectDialog - sap.m.TableSelectDialog Change-Id: Iee2bb98657e2e509ec65dedba4be0c51a2372977 JIRA: BGSOFUIRODOPI-2080
SAP · Aug 12, 2019 · 1f421b0 · 1f421b0
1 parent 504606d
commit 1f421b0
Show file tree

Hide file tree

Showing 6 changed files with 27 additions and 13 deletions.
diff --git a/src/sap.m/src/sap/m/Dialog.js b/src/sap.m/src/sap/m/Dialog.js
@@ -1546,21 +1546,17 @@ function(
 		};
 
 		Dialog.prototype.setBeginButton = function (oButton) {
-			var sTheme = Core.getConfiguration().getTheme();
 
-			if (oButton && oButton.isA("sap.m.Button") && sTheme.startsWith("sap_fiori_")) {
-				oButton.setType("Emphasized");
+			if (oButton && oButton.isA("sap.m.Button")) {
 				oButton.addStyleClass("sapMDialogBeginButton");
 			}
 
 			return this.setAggregation("beginButton", oButton);
 		};
 
 		Dialog.prototype.setEndButton = function (oButton) {
-			var sTheme = Core.getConfiguration().getTheme();
 
-			if (oButton && oButton.isA("sap.m.Button") && sTheme.startsWith("sap_fiori_")) {
-				oButton.setType("Transparent");
+			if (oButton && oButton.isA("sap.m.Button")) {
 				oButton.addStyleClass("sapMDialogEndButton");
 			}
 

diff --git a/src/sap.m/src/sap/m/SelectDialog.js b/src/sap.m/src/sap/m/SelectDialog.js
@@ -44,6 +44,8 @@ function(
 	// shortcut for sap.m.ListMode
 	var ListMode = library.ListMode;
 
+	// shortcut for sap.m.ButtonType
+	var ButtonType = library.ButtonType;
 
 
 	/**
@@ -1012,6 +1014,7 @@ function(
 
 		if (!this._oOkButton) {
 			this._oOkButton = new Button(this.getId() + "-ok", {
+				type: ButtonType.Emphasized,
 				text: this.getConfirmButtonText() || this._oRb.getText("SELECT_CONFIRM_BUTTON"),
 				press: function () {
 					// attach the reset function to afterClose to hide the dialog changes from the end user

diff --git a/src/sap.m/src/sap/m/TableSelectDialog.js b/src/sap.m/src/sap/m/TableSelectDialog.js
@@ -44,6 +44,8 @@ sap.ui.define([
 	// shortcut for sap.m.ListMode
 	var ListMode = library.ListMode;
 
+	// shortcut for sap.m.ButtonType
+	var ButtonType = library.ButtonType;
 
 
 	/**
@@ -1015,6 +1017,7 @@ sap.ui.define([
 
 		if (!this._oOkButton) {
 			this._oOkButton = new Button(this.getId() + "-ok", {
+				type: ButtonType.Emphasized,
 				text: this.getConfirmButtonText() || this._oRb.getText("SELECT_CONFIRM_BUTTON"),
 				press: function () {
 					// attach the reset function to afterClose to hide the dialog changes from the end user

diff --git a/src/sap.m/test/sap/m/demokit/sample/Dialog/C.controller.js b/src/sap.m/test/sap/m/demokit/sample/Dialog/C.controller.js
@@ -1,12 +1,12 @@
 sap.ui.define([
-		'jquery.sap.global',
 		'sap/m/Button',
 		'sap/m/Dialog',
 		'sap/m/List',
 		'sap/m/StandardListItem',
 		'sap/ui/core/mvc/Controller',
-		'sap/ui/model/json/JSONModel'
-	], function(jQuery, Button, Dialog, List, StandardListItem, Controller, JSONModel) {
+		'sap/ui/model/json/JSONModel',
+		'sap/m/ButtonType'
+	], function(Button, Dialog, List, StandardListItem, Controller, JSONModel, ButtonType) {
 	"use strict";
 
 	return Controller.extend("sap.m.sample.Dialog.C", {
@@ -37,6 +37,7 @@ sap.ui.define([
 						}
 					}),
 					beginButton: new Button({
+						type: ButtonType.Emphasized,
 						text: 'OK',
 						press: function () {
 							this.pressDialog.close();

diff --git a/src/sap.m/test/sap/m/demokit/sample/DialogConfirm/C.controller.js b/src/sap.m/test/sap/m/demokit/sample/DialogConfirm/C.controller.js
@@ -7,8 +7,9 @@ sap.ui.define([
 		'sap/m/TextArea',
 		'sap/ui/core/mvc/Controller',
 		'sap/ui/layout/HorizontalLayout',
-		'sap/ui/layout/VerticalLayout'
-	], function(Button, Dialog, Label, MessageToast, Text, TextArea, Controller, HorizontalLayout, VerticalLayout) {
+		'sap/ui/layout/VerticalLayout',
+		'sap/m/ButtonType'
+	], function(Button, Dialog, Label, MessageToast, Text, TextArea, Controller, HorizontalLayout, VerticalLayout, ButtonType) {
 	"use strict";
 
 	var CController = Controller.extend("sap.m.sample.DialogConfirm.C", {
@@ -19,6 +20,7 @@ sap.ui.define([
 				type: 'Message',
 				content: new Text({ text: 'Are you sure you want to submit your shopping cart?' }),
 				beginButton: new Button({
+					type: ButtonType.Emphasized,
 					text: 'Submit',
 					press: function () {
 						MessageToast.show('Submit pressed!');
@@ -51,6 +53,7 @@ sap.ui.define([
 					})
 				],
 				beginButton: new Button({
+					type: ButtonType.Emphasized,
 					text: 'Reject',
 					press: function () {
 						var sText = sap.ui.getCore().byId('rejectDialogTextarea').getValue();
@@ -90,6 +93,7 @@ sap.ui.define([
 					})
 				],
 				beginButton: new Button({
+					type: ButtonType.Emphasized,
 					text: 'Submit',
 					enabled: false,
 					press: function () {
@@ -142,6 +146,7 @@ sap.ui.define([
 					})
 				],
 				beginButton: new Button({
+					type: ButtonType.Emphasized,
 					text: 'Submit',
 					press: function () {
 						var sText = sap.ui.getCore().byId('confirmDialogTextarea').getValue();

diff --git a/src/sap.m/test/sap/m/demokit/sample/DialogMessage/C.controller.js b/src/sap.m/test/sap/m/demokit/sample/DialogMessage/C.controller.js
@@ -2,8 +2,9 @@ sap.ui.define([
 		'sap/m/Button',
 		'sap/m/Dialog',
 		'sap/m/Text',
-		'sap/ui/core/mvc/Controller'
-	], function(Button, Dialog, Text, Controller) {
+		'sap/ui/core/mvc/Controller',
+		'sap/m/ButtonType'
+	], function(Button, Dialog, Text, Controller, ButtonType) {
 	"use strict";
 
 	var CController = Controller.extend("sap.m.sample.DialogMessage.C", {
@@ -16,6 +17,7 @@ sap.ui.define([
 						text: 'Build enterprise-ready web applications, responsive to all devices and running on the browser of your choice. That´s OpenUI5.'
 					}),
 				beginButton: new Button({
+					type: ButtonType.Emphasized,
 					text: 'OK',
 					press: function () {
 						dialog.close();
@@ -38,6 +40,7 @@ sap.ui.define([
 					text: 'The only error you can make is not even trying.'
 				}),
 				beginButton: new Button({
+					type: ButtonType.Emphasized,
 					text: 'OK',
 					press: function () {
 						dialog.close();
@@ -60,6 +63,7 @@ sap.ui.define([
 					text: 'Ruling the world is a time-consuming task. You will not have a lot of spare time.'
 				}),
 				beginButton: new Button({
+					type: ButtonType.Emphasized,
 					text: 'OK',
 					press: function () {
 						dialog.close();
@@ -82,6 +86,7 @@ sap.ui.define([
 					text: 'One of the keys to success is creating realistic goals that can be achieved in a reasonable amount of time.'
 				}),
 				beginButton: new Button({
+					type: ButtonType.Emphasized,
 					text: 'OK',
 					press: function () {
 						dialog.close();
@@ -104,6 +109,7 @@ sap.ui.define([
 					text: 'Dialog with value state Information.'
 				}),
 				beginButton: new Button({
+					type: ButtonType.Emphasized,
 					text: 'OK',
 					press: function () {
 						dialog.close();