remove extra semicolon from style + unit tests #937

README.md

@@ -8,7 +8,7 @@
 [![npm](https://img.shields.io/badge/npm-DEV-blue.svg)](https://www.npmjs.com/package/jquery.terminal)
 ![bower](https://img.shields.io/badge/bower-DEV-yellow.svg)
 [![Build and test](https://github.com/jcubic/jquery.terminal/actions/workflows/build.yaml/badge.svg?branch=devel&event=push)](https://github.com/jcubic/jquery.terminal/actions/workflows/build.yaml)
-[![Coverage Status](https://coveralls.io/repos/github/jcubic/jquery.terminal/badge.svg?branch=devel&1b4f43839e9a18890938b506396293ca)](https://coveralls.io/github/jcubic/jquery.terminal?branch=devel)
+[![Coverage Status](https://coveralls.io/repos/github/jcubic/jquery.terminal/badge.svg?branch=devel&8f2e58e2cbb0889679fb75085e7c7a4b)](https://coveralls.io/github/jcubic/jquery.terminal?branch=devel)
 ![NPM Downloads](https://img.shields.io/npm/dm/jquery.terminal.svg?style=flat)
 [![jsDelivr Downloads](https://data.jsdelivr.com/v1/package/npm/jquery.terminal/badge?style=rounded&n=1)](https://www.jsdelivr.com/package/npm/jquery.terminal)
 [![Paid Support](https://img.shields.io/badge/paid-support-354465.svg)](https://support.jcubic.pl/)

__tests__/terminal.spec.js

@@ -1106,6 +1106,17 @@ describe('Terminal utils', function() {
             });
             expect(output).toMatchSnapshot();
         });
+        it('should handle images with html entties', () => {
+            const url = 'https://images.unsplash.com/photo-1564865878688-9a…4NzEyMjB8MA&ixlib=rb-4.0.3&q=80&w=400';
+            const style = 'border:1px solid red'
+            const input = `[[@;;;;${url};{"style":"${style}"}]black Android smartphone]`;
+            const output = $.terminal.format(input, {
+                allowedAttributes: ['style']
+            });
+            const $img = $(output);
+            expect($img.attr('src')).toEqual(url.replace(/&/g, '&'));
+            expect($img.attr('style')).toEqual(style);
+        });
     });
     describe('$.terminal.strip', function() {
         it('should remove formatting', function() {

js/jquery.terminal-2.40.6.js

@@ -41,7 +41,7 @@
  *
  * broken image by Sophia Bai from the Noun Project (CC-BY)
  *
- * Date: Mon, 29 Apr 2024 14:58:28 +0000
+ * Date: Mon, 29 Apr 2024 15:00:50 +0000
  */
 /* global define, Map, BigInt */
 /* eslint-disable */
@@ -5312,7 +5312,7 @@
     // -------------------------------------------------------------------------
     $.terminal = {
         version: 'DEV',
-        date: 'Mon, 29 Apr 2024 14:58:28 +0000',
+        date: 'Mon, 29 Apr 2024 15:00:50 +0000',
         // colors from https://www.w3.org/wiki/CSS/Properties/color/keywords
         color_names: [
             'transparent', 'currentcolor', 'black', 'silver', 'gray', 'white',
@@ -6857,7 +6857,9 @@
                             var value = escape_html_attr(attrs[name]);
                             if (name === 'style') {
                                 // merge style attr and colors #617
-                                value = value ? style + ';' + value : style;
+                                if (style) {
+                                    value = value ? style + ';' + value : style;
+                                }
                                 style_attrs = true;
                             }
                             return name + '="' + value + '"';

js/jquery.terminal-src.js

@@ -6857,7 +6857,9 @@
                             var value = escape_html_attr(attrs[name]);
                             if (name === 'style') {
                                 // merge style attr and colors #617
-                                value = value ? style + ';' + value : style;
+                                if (style) {
+                                    value = value ? style + ';' + value : style;
+                                }
                                 style_attrs = true;
                             }
                             return name + '="' + value + '"';

js/jquery.terminal.js

@@ -41,7 +41,7 @@
  *
  * broken image by Sophia Bai from the Noun Project (CC-BY)
  *
- * Date: Mon, 29 Apr 2024 14:58:28 +0000
+ * Date: Mon, 29 Apr 2024 15:00:50 +0000
  */
 /* global define, Map, BigInt */
 /* eslint-disable */
@@ -5312,7 +5312,7 @@
     // -------------------------------------------------------------------------
     $.terminal = {
         version: 'DEV',
-        date: 'Mon, 29 Apr 2024 14:58:28 +0000',
+        date: 'Mon, 29 Apr 2024 15:00:50 +0000',
         // colors from https://www.w3.org/wiki/CSS/Properties/color/keywords
         color_names: [
             'transparent', 'currentcolor', 'black', 'silver', 'gray', 'white',
@@ -6857,7 +6857,9 @@
                             var value = escape_html_attr(attrs[name]);
                             if (name === 'style') {
                                 // merge style attr and colors #617
-                                value = value ? style + ';' + value : style;
+                                if (style) {
+                                    value = value ? style + ';' + value : style;
+                                }
                                 style_attrs = true;
                             }
                             return name + '="' + value + '"';