Trumbowyg 2.25.2 (#12182)

OrchardCMS · Aug 30, 2022 · 68a2b45 · 68a2b45
1 parent 1d8ce29
commit 68a2b45
Show file tree

Hide file tree

Showing 71 changed files with 2,305 additions and 2,449 deletions.
diff --git a/...ardCore.Modules/OrchardCore.Resources/Assets/trumbowyg/plugins/base64/trumbowyg.base64.js b/...ardCore.Modules/OrchardCore.Resources/Assets/trumbowyg/plugins/base64/trumbowyg.base64.js
@@ -26,6 +26,12 @@
                 errFileReaderNotSupported: 'FileReader is not supported by your browser.',
                 errInvalidImage: 'Invalid image file.'
             },
+            by: {
+                base64: 'Выява (фармат base64)',
+                file: 'Файл',
+                errFileReaderNotSupported: 'FileReader не падтрымліваецца вашым браўзэрам.',
+                errInvalidImage: 'Несапраўдны файл выявы.'
+            },
             cs: {
                 base64: 'Vložit obrázek',
                 file: 'Soubor'

diff --git a/...ardCore.Modules/OrchardCore.Resources/Assets/trumbowyg/plugins/colors/trumbowyg.colors.js b/...ardCore.Modules/OrchardCore.Resources/Assets/trumbowyg/plugins/colors/trumbowyg.colors.js
@@ -20,6 +20,12 @@
                 foreColorRemove: 'Remove text color',
                 backColorRemove: 'Remove background color'
             },
+            by: {
+                foreColor: 'Колер тэксту',
+                backColor: 'Колер фону тэксту',
+                foreColorRemove: 'Выдаліць колер тэксту',
+                backColorRemove: 'Выдаліць колер фону тэксту'
+            },
             cs: {
                 foreColor: 'Barva textu',
                 backColor: 'Barva pozadí'
@@ -70,7 +76,9 @@
             },
             ru: {
                 foreColor: 'Цвет текста',
-                backColor: 'Цвет выделения текста'
+                backColor: 'Цвет выделения текста',
+                foreColorRemove: 'Очистить цвет текста',
+                backColorRemove: 'Очистить цвет выделения текста'
             },
             sk: {
                 foreColor: 'Farba textu',
@@ -107,6 +115,9 @@
             return 'transparent';
         } else {
             rgb = rgb.match(/^rgba?\((\d+),\s*(\d+),\s*(\d+)(?:,\s*(\d?(.\d+)))?\)$/);
+            if (rgb == null) {
+                return 'transparent'; // No match, return transparent as unkown color
+            }
             return hex(rgb[1]) + hex(rgb[2]) + hex(rgb[3]);
         }
     }

diff --git a/...dules/OrchardCore.Resources/Assets/trumbowyg/plugins/colors/ui/sass/trumbowyg.colors.scss b/...dules/OrchardCore.Resources/Assets/trumbowyg/plugins/colors/ui/sass/trumbowyg.colors.scss
@@ -1,14 +1,3 @@
-/**
- * Trumbowyg v2.25.1 - A lightweight WYSIWYG editor
- * Default stylesheet for Trumbowyg editor plugin
- * ------------------------
- * @link http://alex-d.github.io/Trumbowyg
- * @license MIT
- * @author Alexandre Demode (Alex-D)
- *         Twitter : @AlexandreDemode
- *         Website : alex-d.fr
- */
-
 .trumbowyg-dropdown-foreColor:not(.trumbowyg-dropdown--color-list),
 .trumbowyg-dropdown-backColor:not(.trumbowyg-dropdown--color-list) {
     max-width: 276px;