Merge "[INTERNAL] Clean-up: Usage of deprecated themes"

Author: Thodd

src/sap.m/test/sap/m/demokit/theming/webapp/controller/Overview.controller.js

@@ -54,30 +54,6 @@ sap.ui.define([
 		},
 		"sap_fiori_3_hcw": {
 			"text": "Quartz High Contrast White"
-		},
-		"sap_belize": {
-			"text": "Belize",
-			"deprecated": true
-		},
-		"sap_belize_plus": {
-			"text": "Belize Deep",
-			"deprecated": true
-		},
-		"sap_belize_hcb": {
-			"text": "Belize High Contrast Black",
-			"deprecated": true
-		},
-		"sap_belize_hcw": {
-			"text": "Belize High Contrast White",
-			"deprecated": true
-		},
-		"sap_bluecrystal": {
-			"text": "Blue Crystal",
-			"deprecated": true
-		},
-		"sap_hcb": {
-			"text": "High Contrast Black",
-			"deprecated": true
 		}
 	};
 
@@ -663,54 +639,33 @@ sap.ui.define([
 			this.onAction();
 			oCore.applyTheme(theme);
 			this.byId("title").setText(`Details for ''${themeName}''`);
-			var isDeprecated = mThemes[theme].deprecated;
-			if (isDeprecated) {
-				this.byId("tbLessParam").setPressed();
-				this.byId("tbLessParam").setEnabled(false);
-				this.byId("colCP").setVisible(false);
-				this.byId("colTP").setVisible(true);
-				this._oTableFilterState.aCPFilter = [];
-			} else {
-				this.byId("tbLessParam").setEnabled(true);
-				this.byId("colCP").setVisible(true);
-				this.byId("colTP").setVisible(false);
-				this._oTableFilterState.aCPFilter = [
-					new Filter("cp", FilterOperator.EQ, true)
-				];
-			}
-			this._applyFilterSearch();
 		},
 		// Event handler for pressing the copy to clipboard button
-		// Copies the UI5 parameter to the clipboard
+		// Copies the CSS Custom Property to the clipboard
 		onCopyCodeToClipboard: function (oEvt) {
-			var sTheme = sap.ui.getCore().getConfiguration().getTheme(),
-				isDeprecated = mThemes[sTheme].deprecated,
-				sString = oEvt.getSource().getParent().getCells()[isDeprecated ? 3 : 2].getText(),
+			var sString = oEvt.getSource().getParent().getCells()[2].getText(),
 				$temp = jQuery("<input>");
 			if (!sString) {
-				MessageToast.show("No UI5 Parameter to copy to clipboard");
+				MessageToast.show("No CSS Custom Property to copy to clipboard");
 				return;
 			}
 			try {
 				jQuery("body").append($temp);
 				$temp.val(sString).trigger("select");
 				document.execCommand("copy");
 				$temp.remove();
-				MessageToast.show("UI5 Parameter " + sString + " copied to clipboard");
+				MessageToast.show("CSS Custom Property " + sString + " copied to clipboard");
 			} catch (oException) {
-				MessageToast.show("UI5 Parameter " + sString + " not copied to clipboard");
+				MessageToast.show("CSS Custom Property " + sString + " not copied to clipboard");
 			}
 		},
 
 		//Event handler for the Search Field
 		onSearch: function (oEvt) {
 			var sQuery = oEvt.getSource().getValue();
 			if (sQuery && sQuery.length > 0) {
-				var sTheme = sap.ui.getCore().getConfiguration().getTheme(),
-					isDeprecated = mThemes[sTheme].deprecated;
 				this._oTableFilterState.aFilter = [
-					new Filter(isDeprecated ? "nameTP" : "nameCP", FilterOperator.Contains, sQuery)
-					//new Filter("nameTP", FilterOperator.Contains, sQuery) // TODO: support filter of Custom Prop and Theme Param
+					new Filter("nameCP", FilterOperator.Contains, sQuery)
 				];
 			} else {
 				this._oTableFilterState.aFilter = [];

src/sap.m/test/sap/m/demokit/theming/webapp/view/Overview.view.xml

@@ -116,16 +116,17 @@
 								text="{i18n>ToggleButtonQuickText}"
 								ariaLabelledBy="textFilter"
 								tooltip="{i18n>TooltipQuick}"/>
-							<ToolbarSeparator
-								visible="{= ${device>/system/desktop} }"/>
-							<ToggleButton
-								type="Transparent"
-								id="tbLessParam"
-								press=".onPressLessParam"
-								icon="sap-icon://vds-file"
-								text="{i18n>ToggleButtonLessParamText}"
-								ariaLabelledBy="textFilter"
-								tooltip="{i18n>TooltipLessParam}"/>
+								<ToolbarSeparator
+									visible="{= ${device>/system/desktop} }"/>
+								<ToggleButton
+									type="Transparent"
+									id="tbLessParam"
+									press=".onPressLessParam"
+									icon="sap-icon://vds-file"
+									text="{i18n>ToggleButtonLessParamText}"
+									ariaLabelledBy="textFilter"
+									tooltip="{i18n>TooltipLessParam}"/>
+
 					</OverflowToolbar>
 				</headerToolbar>
 			</Panel>

src/sap.ui.core/src/sap/ui/core/Core.js

@@ -1226,21 +1226,21 @@ sap.ui.define([
 	 * </pre>
 	 *
 	 * If parts of the theme are at different locations (e.g. because you provide a standard theme
-	 * like "sap_belize" for a custom control library and this self-made part of the standard theme is at a
+	 * like "sap_horizon" for a custom control library and this self-made part of the standard theme is at a
 	 * different location than the UI5 resources), you can also specify for which control libraries the setting
 	 * should be used, by giving an array with the names of the respective control libraries as second parameter:
 	 * <pre>
-	 *   sap.ui.getCore().setThemeRoot("sap_belize", ["my.own.library"], "https://mythemeserver.com/allThemes");
+	 *   sap.ui.getCore().setThemeRoot("sap_horizon", ["my.own.library"], "https://mythemeserver.com/allThemes");
 	 * </pre>
 	 *
-	 * This will cause the Belize theme to be loaded from the UI5 location for all standard libraries.
+	 * This will cause the Horizon theme to be loaded from the UI5 location for all standard libraries.
 	 * Resources for styling the <code>my.own.library</code> controls will be loaded from the configured
 	 * location:
 	 * <pre>
-	 *   https://sdk.openui5.org/resources/sap/ui/core/themes/sap_belize/library.css
-	 *   https://sdk.openui5.org/resources/sap/ui/layout/themes/sap_belize/library.css
-	 *   https://sdk.openui5.org/resources/sap/m/themes/sap_belize/library.css
-	 *   https://mythemeserver.com/allThemes/my/own/library/themes/sap_belize/library.css
+	 *   https://sdk.openui5.org/resources/sap/ui/core/themes/sap_horizon/library.css
+	 *   https://sdk.openui5.org/resources/sap/ui/layout/themes/sap_horizon/library.css
+	 *   https://sdk.openui5.org/resources/sap/m/themes/sap_horizon/library.css
+	 *   https://mythemeserver.com/allThemes/my/own/library/themes/sap_horizon/library.css
 	 * </pre>
 	 *
 	 * If the custom theme should be loaded initially (via bootstrap attribute), the <code>themeRoots</code>

src/sap.ui.core/src/sap/ui/core/Theming.js

@@ -162,21 +162,21 @@ sap.ui.define([
 		 * </pre>
 		 *
 		 * If parts of the theme are at different locations (e.g. because you provide a standard theme
-		 * like "sap_belize" for a custom control library and this self-made part of the standard theme is at a
+		 * like "sap_horizon" for a custom control library and this self-made part of the standard theme is at a
 		 * different location than the UI5 resources), you can also specify for which control libraries the setting
 		 * should be used, by giving an array with the names of the respective control libraries as second parameter:
 		 * <pre>
-		 *   Theming.setThemeRoot("sap_belize", ["my.own.library"], "https://mythemeserver.com/allThemes");
+		 *   Theming.setThemeRoot("sap_horizon", ["my.own.library"], "https://mythemeserver.com/allThemes");
 		 * </pre>
 		 *
-		 * This will cause the Belize theme to be loaded from the UI5 location for all standard libraries.
+		 * This will cause the Horizon theme to be loaded from the UI5 location for all standard libraries.
 		 * Resources for styling the <code>my.own.library</code> controls will be loaded from the configured
 		 * location:
 		 * <pre>
-		 *   https://openui5.hana.ondemand.com/resources/sap/ui/core/themes/sap_belize/library.css
-		 *   https://openui5.hana.ondemand.com/resources/sap/ui/layout/themes/sap_belize/library.css
-		 *   https://openui5.hana.ondemand.com/resources/sap/m/themes/sap_belize/library.css
-		 *   https://mythemeserver.com/allThemes/my/own/library/themes/sap_belize/library.css
+		 *   https://openui5.hana.ondemand.com/resources/sap/ui/core/themes/sap_horizon/library.css
+		 *   https://openui5.hana.ondemand.com/resources/sap/ui/layout/themes/sap_horizon/library.css
+		 *   https://openui5.hana.ondemand.com/resources/sap/m/themes/sap_horizon/library.css
+		 *   https://mythemeserver.com/allThemes/my/own/library/themes/sap_horizon/library.css
 		 * </pre>
 		 *
 		 * If the custom theme should be loaded initially (via bootstrap attribute), the <code>themeRoots</code>

src/sap.ui.core/test/sap/ui/core/getComputedStyle.html

@@ -5,23 +5,19 @@
 
 		<title>Just a Button</title>
 
-		<script src="../../../../resources/sap-ui-core.js"
-			id="sap-ui-bootstrap"
-			data-sap-ui-libs="sap.m"
-			data-sap-ui-theme="sap_belize"></script>
+		<script id="sap-ui-bootstrap"
+				src="../../../../resources/sap-ui-core.js"
+				data-sap-ui-libs="sap.m"
+				data-sap-ui-on-init="module:local/getComputedStyle"
+				data-sap-ui-resource-roots='{
+					"local": "./"
+				}'
+		></script>
 			<!-- only load the main library "sap.m" and the Belize theme -->
 
-			<script>
-				var style = window.getComputedStyle(document.documentElement);
-				//eslint-disable-next-line no-console -- there's no alternative in <head>
-				console.log("style >> " + style);
-				var oCarousel = new sap.m.Carousel();
-				oCarousel.placeAt("content");
-				oCarousel.setHeight("300px");
-				oCarousel.setWidth("300px");
-			</script>
+
 	</head>
 	<body id="content" class="sapUiBody">
 		invisible body content
 	</body>
-</html>
+</html>

src/sap.ui.core/test/sap/ui/core/getComputedStyle.js

@@ -0,0 +1,14 @@
+sap.ui.define([
+    "sap/m/Carousel"
+], function (Carousel) {
+    "use strict";
+    // Note: the HTML page 'getComputedStyle.html' loads this module via data-sap-ui-on-init
+
+    var style = window.getComputedStyle(document.documentElement);
+    //eslint-disable-next-line no-console -- there's no alternative in <head>
+    console.log("style >> " + style);
+    var oCarousel = new Carousel();
+    oCarousel.placeAt("content");
+    oCarousel.setHeight("300px");
+    oCarousel.setWidth("300px");
+});