merge with devel

.github/PULL_REQUEST_TEMPLATE

@@ -1,5 +1,5 @@
 <!--
 
-Thank you the PR, if you want your PR to be merged make sure you modify -src files and create PR against devel branch
+Thank you for the PR, if you want your PR to be merged make sure you modify -src files and create PR against devel branch
 
 -->

CHANGELOG.md

@@ -1,3 +1,16 @@
+## 2.40.0
+### Features
+* don't force any attributes when using xml (`span`, `img`, and `a` tags) [#913](https://github.com/jcubic/jquery.terminal/issues/913)
+* alow using attributes in color xml tags [#924](https://github.com/jcubic/jquery.terminal/issues/924)
+### Bugfix
+* fix init and resize of long prompt [#919](https://github.com/jcubic/jquery.terminal/issues/919)
+* fix occasional selecting Accessibility label (about clipboard textarea) in CMD
+* fix sync commands and dynamic prompt [#923](https://github.com/jcubic/jquery.terminal/issues/923) [#922](https://github.com/jcubic/jquery.terminal/issues/922)
+* 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
 * fix broken full screen terminal height on Desktop

README.md

@@ -8,7 +8,7 @@
 [![npm](https://img.shields.io/badge/npm-2.39.3-blue.svg)](https://www.npmjs.com/package/jquery.terminal)
 ![bower](https://img.shields.io/badge/bower-2.39.3-yellow.svg)
 [![Build and test](https://github.com/jcubic/jquery.terminal/actions/workflows/build.yaml/badge.svg?branch=master&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=master&ee2a03a16ea250797b28569c122c3138)](https://coveralls.io/github/jcubic/jquery.terminal?branch=master)
+[![Coverage Status](https://coveralls.io/repos/github/jcubic/jquery.terminal/badge.svg?branch=master&b68a7df0dd0c8bfd4f7e9bbbc513838b)](https://coveralls.io/github/jcubic/jquery.terminal?branch=master)
 ![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__/__snapshots__/terminal.spec.js.snap

@@ -779,6 +779,8 @@ Array [
 ]
 `;
 
+exports[`extensions echo_newline should create sequance of animations (#930) 1`] = `"<div data-index=\\"0\\" class=\\"\\"><div style=\\"width: 100%;\\"><span data-text=\\"Hello,&nbsp;\\">Hello,&nbsp;</span><span data-text=\\"jQuery&nbsp;\\">jQuery&nbsp;</span><span data-text=\\"Terminal\\">Terminal</span></div></div>"`;
+
 exports[`extensions echo_newline should print mixed newline with !flush 1`] = `
 "foo, bar
 baz, quux"

__tests__/terminal.spec.js

@@ -2326,8 +2326,8 @@ describe('Terminal utils', function() {
                 }
             }));
             return term.exec('output | grep /foo/').then(function() {
-                expect(get_lines(term)).toEqual(['foo']);
-            }).catch(e => console.log(e));
+                return expect(get_lines(term)).toEqual(['foo']);
+            });
         });
         it('should escape pipe', async function() {
             var term = $('<div/>').terminal($.terminal.pipe({
@@ -2767,13 +2767,13 @@ describe('extensions', function() {
                 expect(output(term)).toEqual(['hello, world']);
             }
         });
-        it('finalize with newline : false', function() {
+        it('finalize with newline: false', function() {
             term.echo('foo', {
-                finalize: (a) => a.children().children().css("color", "red"),
+                finalize: (node) => node.css("color", "red"),
                 newline : false
             });
-            var color = term[0].querySelector(`[data-index='${term.last_index()}`).firstChild.firstChild.style.color;
-            expect(color).toEqual("red");
+            const node = term.find(`[data-index='${term.last_index()}']`).get(0);
+            expect(node.style.color).toEqual("red");
         });
         it('should print multiple !flush && !newline', function() {
             term.echo('foo, ', {newline: false, flush: false});
@@ -2794,6 +2794,12 @@ describe('extensions', function() {
             expect(term.get_output()).toMatchSnapshot();
             expect(output(term)).toMatchSnapshot();
         });
+        it('should create sequance of animations (#930)', async function() {
+            await term.echo("Hello, ", { typing: true, delay: 0, newline: false });
+            await term.echo("jQuery ", { typing: true, delay: 0, newline: false });
+            await term.echo("Terminal", { typing: true, delay: 0 });
+            expect(term.find('.terminal-output').html()).toMatchSnapshot();
+        });
     });
     describe('autocomplete_menu', function() {
         function completion(term) {