Merge branch '5.5'
authorTim Düsterhus <duesterhus@woltlab.com>
Fri, 1 Jul 2022 11:51:17 +0000 (13:51 +0200)
committerTim Düsterhus <duesterhus@woltlab.com>
Fri, 1 Jul 2022 11:51:17 +0000 (13:51 +0200)
1  2 
wcfsetup/install/files/js/WoltLabSuite/Core/I18n/Plural.js
wcfsetup/install/files/js/WoltLabSuite/Core/Ui/Color/Picker.js

index 0bc7eef5c6554396febc4d0a19cbd84bdd5dd4ba,65e757b39a8c5abff2511f520c8168f5d0af2210..0447830077b466f406d2e226e646e08f971b0205
@@@ -186,18 -186,15 +186,18 @@@ define(["require", "exports", "tslib", 
           * @since 5.5
           */
          getColor(source) {
-             const a = parseFloat(this.channels.get("a" /* A */).value);
-             if (source === "hsl" /* HSL */) {
-                 const rgb = ColorUtil.hslToRgb(parseInt(this.hsl.get("hue" /* Hue */).value, 10), parseInt(this.hsl.get("saturation" /* Saturation */).value, 10), parseInt(this.hsl.get("lightness" /* Lightness */).value, 10));
+             const a = parseFloat(this.channels.get("a" /* Channel.A */).value);
+             if (source === "hsl" /* ColorSource.HSL */) {
+                 const rgb = ColorUtil.hslToRgb(parseInt(this.hsl.get("hue" /* HSL.Hue */).value, 10), parseInt(this.hsl.get("saturation" /* HSL.Saturation */).value, 10), parseInt(this.hsl.get("lightness" /* HSL.Lightness */).value, 10));
 -                return Object.assign(Object.assign({}, rgb), { a });
 +                return {
 +                    ...rgb,
 +                    a,
 +                };
              }
              return {
-                 r: parseInt(this.channels.get("r" /* R */).value, 10),
-                 g: parseInt(this.channels.get("g" /* G */).value, 10),
-                 b: parseInt(this.channels.get("b" /* B */).value, 10),
+                 r: parseInt(this.channels.get("r" /* Channel.R */).value, 10),
+                 g: parseInt(this.channels.get("g" /* Channel.G */).value, 10),
+                 b: parseInt(this.channels.get("b" /* Channel.B */).value, 10),
                  a,
              };
          }