fix ignoring colors and style when using JSON attributes in formatting

jcubic · Apr 20, 2024 · fbabaee · fbabaee
1 parent 216dee9
commit fbabaee
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 8 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -9,6 +9,7 @@
 * fix calling `onCommandChange` when command don't change
 * fix sequence of animations in echo without newline [#930](https://github.com/jcubic/jquery.terminal/issues/930)
 * fix flash of old dynamic prompt on enter [#926](https://github.com/jcubic/jquery.terminal/issues/926)
+* fix ignoring colors and style when using JSON attributes in formatting
 
 ## 2.39.3
 ### Bugfix

diff --git a/js/jquery.terminal-src.js b/js/jquery.terminal-src.js
@@ -6846,10 +6846,11 @@
                 return [];
             }
             // -----------------------------------------------------------------
-            function attrs_to_string(style, attrs) {
+            function attrs_to_string(style, attrs, vaid_attrs) {
                 if (attrs) {
                     var keys = filter_attr_names(Object.keys(attrs));
                     if (keys.length) {
+                        var style_attrs;
                         var result = keys.map(function(name) {
                             if (attrs[name] === null) {
                                 return '';
@@ -6861,12 +6862,17 @@
                             if (name === 'style') {
                                 // merge style attr and colors #617
                                 value = value ? style + ';' + value : style;
+                                style_attrs = true;
                             }
                             return name + '="' + value + '"';
                         }).filter(Boolean);
                         if (!result.length) {
                             return '';
                         }
+                        if (!style_attrs) {
+                            // if there are not style attr we need to add style
+                            result.push('style="' + style + '"');
+                        }
                         return result.join(' ');
                     }
                 }

diff --git a/js/jquery.terminal.js b/js/jquery.terminal.js
@@ -41,7 +41,7 @@
  *
  * broken image by Sophia Bai from the Noun Project (CC-BY)
  *
- * Date: Sat, 20 Apr 2024 17:30:08 +0000
+ * Date: Sat, 20 Apr 2024 18:36:45 +0000
  */
 /* global define, Map, BigInt */
 /* eslint-disable */
@@ -5308,7 +5308,7 @@
     // -------------------------------------------------------------------------
     $.terminal = {
         version: 'DEV',
-        date: 'Sat, 20 Apr 2024 17:30:08 +0000',
+        date: 'Sat, 20 Apr 2024 18:36:45 +0000',
         // colors from https://www.w3.org/wiki/CSS/Properties/color/keywords
         color_names: [
             'transparent', 'currentcolor', 'black', 'silver', 'gray', 'white',
@@ -6846,10 +6846,11 @@
                 return [];
             }
             // -----------------------------------------------------------------
-            function attrs_to_string(style, attrs) {
+            function attrs_to_string(style, attrs, vaid_attrs) {
                 if (attrs) {
                     var keys = filter_attr_names(Object.keys(attrs));
                     if (keys.length) {
+                        var style_attrs;
                         var result = keys.map(function(name) {
                             if (attrs[name] === null) {
                                 return '';
@@ -6861,12 +6862,17 @@
                             if (name === 'style') {
                                 // merge style attr and colors #617
                                 value = value ? style + ';' + value : style;
+                                style_attrs = true;
                             }
                             return name + '="' + value + '"';
                         }).filter(Boolean);
                         if (!result.length) {
                             return '';
                         }
+                        if (!style_attrs) {
+                            // if there are not style attr we need to add style
+                            result.push('style="' + style + '"');
+                        }
                         return result.join(' ');
                     }
                 }

diff --git a/js/jquery.terminal.min.js b/js/jquery.terminal.min.js
diff --git a/js/jquery.terminal.min.js.map b/js/jquery.terminal.min.js.map
diff --git a/js/xml_formatting.js b/js/xml_formatting.js
@@ -134,7 +134,7 @@
                 var attrs = {};
                 if (m[2]) {
                     var string_attrs = m[2];
-                    var re = /([a-zA-Z]+)\s*=\s*"([^"]+)"/g;
+                    var re = /([\w-]+)\s*=\s*"([^"]+)"/g;
                     var match;
                     while (match = re.exec(string_attrs)) {
                         var attr_name = match[1];