Correctly remove the button title if the button is disabled

contao · Jan 10, 2023 · 9bbae92 · 9bbae92
1 parent 1b56bad
commit 9bbae92
Show file tree

Hide file tree

Showing 14 changed files with 17 additions and 19 deletions.
diff --git a/core-bundle/assets/controllers/image-size-controller.js b/core-bundle/assets/controllers/image-size-controller.js
@@ -35,10 +35,10 @@ export default class extends Controller {
     updateWizard () {
         if (this.canEdit()) {
             this.button.title = this.configValue.title;
-            this.button.disabled = false;
+            delete this.button.disabled;
             this.buttonImage.src = this.configValue.icon;
         } else {
-            this.button.title = null;
+            delete this.button.title;
             this.button.disabled = true;
             this.buttonImage.src = this.configValue.iconDisabled;
         }

diff --git a/core-bundle/contao/languages/en/default.xlf b/core-bundle/contao/languages/en/default.xlf
@@ -2109,7 +2109,7 @@
         <source>visible from %s to %s</source>
       </trans-unit>
       <trans-unit id="MSC.editImageSize">
-        <source>Edit image size</source>
+        <source>Edit the image size</source>
       </trans-unit>
       <trans-unit id="MSC.booleanNot">
         <source>Not %s</source>

diff --git a/core-bundle/contao/themes/flexible/basic.css b/core-bundle/contao/themes/flexible/basic.css
@@ -829,7 +829,7 @@ a.tl_submit {
 	vertical-align: middle;
 }
 
-.wizard .tl_text, .wizard .tl_select {
+.wizard .tl_text, .wizard .tl_select, .wizard .tl_image_size {
 	width: calc(100% - 24px);
 }
 
@@ -839,7 +839,6 @@ a.tl_submit {
 
 .wizard .tl_image_size {
 	display: inline-block;
-	width: calc(100% - 24px);
 }
 
 .wizard img {

diff --git a/core-bundle/contao/themes/flexible/basic.min.css b/core-bundle/contao/themes/flexible/basic.min.css
diff --git a/core-bundle/contao/themes/flexible/main.min.css b/core-bundle/contao/themes/flexible/main.min.css
diff --git a/core-bundle/contao/widgets/ImageSize.php b/core-bundle/contao/widgets/ImageSize.php
@@ -189,27 +189,29 @@ public function generate()
 		{
 			if (isset($arrOption['value']))
 			{
-				$arrValues[] = $arrOption['value'] ?? '';
 				$arrOptions[] = sprintf(
 					'<option value="%s"%s>%s</option>',
 					self::specialcharsValue($arrOption['value'] ?? ''),
 					$this->optionSelected($arrOption['value'] ?? null, $this->varValue[2] ?? null),
 					$arrOption['label'] ?? null
 				);
+
+				$arrValues[] = $arrOption['value'] ?? '';
 			}
 			else
 			{
 				$arrOptgroups = array();
 
 				foreach ($arrOption as $arrOptgroup)
 				{
-					$arrValues[] = $arrOptgroup['value'] ?? '';
 					$arrOptgroups[] = sprintf(
 						'<option value="%s"%s>%s</option>',
 						self::specialcharsValue($arrOptgroup['value'] ?? ''),
 						$this->optionSelected($arrOptgroup['value'] ?? null, $this->varValue[2] ?? null),
 						$arrOptgroup['label'] ?? null
 					);
+
+					$arrValues[] = $arrOptgroup['value'] ?? '';
 				}
 
 				$arrOptions[] = sprintf('<optgroup label="&nbsp;%s">%s</optgroup>', StringUtil::specialchars($strKey), implode('', $arrOptgroups));
@@ -247,7 +249,7 @@ public function generate()
 		);
 	}
 
-	private function getStimulusAttributes($arrValues)
+	private function getStimulusAttributes($arrValues): string
 	{
 		if ($this->wizard)
 		{

diff --git a/core-bundle/public/backend.ca171027.js b/core-bundle/public/backend.ca171027.js
diff --git a/core-bundle/public/backend.ca171027.js.map b/core-bundle/public/backend.ca171027.js.map
diff --git a/core-bundle/public/backend.f14d0695.js b/core-bundle/public/backend.f14d0695.js
diff --git a/core-bundle/public/backend.f14d0695.js.map b/core-bundle/public/backend.f14d0695.js.map
diff --git a/core-bundle/public/backend.f1b41651.js b/core-bundle/public/backend.f1b41651.js
diff --git a/core-bundle/public/backend.f1b41651.js.map b/core-bundle/public/backend.f1b41651.js.map
diff --git a/core-bundle/public/entrypoints.json b/core-bundle/public/entrypoints.json
@@ -7,7 +7,7 @@
     },
     "backend": {
       "js": [
-        "/bundles/contaocore/backend.f1b41651.js"
+        "/bundles/contaocore/backend.ca171027.js"
       ]
     }
   }

diff --git a/core-bundle/public/manifest.json b/core-bundle/public/manifest.json
@@ -1,6 +1,6 @@
 {
   "ajax-form.js": "/bundles/contaocore/ajax-form.8d9f14a4.js",
-  "backend.js": "/bundles/contaocore/backend.f1b41651.js",
+  "backend.js": "/bundles/contaocore/backend.ca171027.js",
   "ajax-form.8d9f14a4.js.map": "/bundles/contaocore/ajax-form.8d9f14a4.js.map",
-  "backend.f1b41651.js.map": "/bundles/contaocore/backend.f1b41651.js.map"
+  "backend.ca171027.js.map": "/bundles/contaocore/backend.ca171027.js.map"
 }