fix updating hash for long async commands #703

jcubic · Dec 13, 2021 · 9957159 · 9957159
1 parent af710c0
commit 9957159
Show file tree

Hide file tree

Showing 8 changed files with 26 additions and 13 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -12,6 +12,7 @@
 * fix black line before the image [#708](https://github.com/jcubic/jquery.terminal/issues/708)
 * fix scroll to bottom when echo an image [#716](https://github.com/jcubic/jquery.terminal/issues/716)
 * fix multiple echo with `!flush && !newline` [#709](https://github.com/jcubic/jquery.terminal/issues/709)
+* fix updating hash for long async commands [#703](https://github.com/jcubic/jquery.terminal/issues/703)
 
 ## 2.29.5
 ### Bugfix

diff --git a/README.md b/README.md
@@ -12,7 +12,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&90815d01d44b0c402ae7b2043086f506)](https://coveralls.io/github/jcubic/jquery.terminal?branch=devel)
+[![Coverage Status](https://coveralls.io/repos/github/jcubic/jquery.terminal/badge.svg?branch=devel&5507ee84c3031a012991aaf4bfcff76d)](https://coveralls.io/github/jcubic/jquery.terminal?branch=devel)
 ![downloads](https://img.shields.io/npm/dm/jquery.terminal.svg?style=flat)
 [![Paid Support](https://data.jsdelivr.com/v1/package/npm/jquery.terminal/badge?style=rounded)](https://www.jsdelivr.com/package/npm/jquery.terminal)
 [![](https://img.shields.io/badge/paid-support-354465.svg)](https://support.jcubic.pl/)

diff --git a/js/jquery.terminal-2.29.5.js b/js/jquery.terminal-2.29.5.js
@@ -41,7 +41,7 @@
  *
  * broken image by Sophia Bai from the Noun Project (CC-BY)
  *
- * Date: Mon, 13 Dec 2021 21:31:59 +0000
+ * Date: Mon, 13 Dec 2021 21:50:23 +0000
  */
 /* global define, Map */
 /* eslint-disable */
@@ -5110,7 +5110,7 @@
     // -------------------------------------------------------------------------
     $.terminal = {
         version: 'DEV',
-        date: 'Mon, 13 Dec 2021 21:31:59 +0000',
+        date: 'Mon, 13 Dec 2021 21:50:23 +0000',
         // colors from https://www.w3.org/wiki/CSS/Properties/color/keywords
         color_names: [
             'transparent', 'currentcolor', 'black', 'silver', 'gray', 'white',
@@ -8219,7 +8219,7 @@
                 }
             }
             // -----------------------------------------------------------------
-            function after_exec() {
+            function before_exec() {
                 // variables defined later in commands
                 if (!exec) {
                     change_hash = true;
@@ -8228,6 +8228,9 @@
                     }
                     change_hash = saved_change_hash;
                 }
+            }
+            // -----------------------------------------------------------------
+            function after_exec() {
                 deferred.resolve();
                 fire_event('onAfterCommand', [command]);
             }
@@ -8245,6 +8248,7 @@
             }
             // -----------------------------------------------------------------
             function invoke() {
+                before_exec();
                 // Call user interpreter function
                 var result = interpreter.interpreter.call(self, command, self);
                 if (result) {

diff --git a/js/jquery.terminal-2.29.5.min.js b/js/jquery.terminal-2.29.5.min.js
diff --git a/js/jquery.terminal-src.js b/js/jquery.terminal-src.js
@@ -8219,7 +8219,7 @@
                 }
             }
             // -----------------------------------------------------------------
-            function after_exec() {
+            function before_exec() {
                 // variables defined later in commands
                 if (!exec) {
                     change_hash = true;
@@ -8228,6 +8228,9 @@
                     }
                     change_hash = saved_change_hash;
                 }
+            }
+            // -----------------------------------------------------------------
+            function after_exec() {
                 deferred.resolve();
                 fire_event('onAfterCommand', [command]);
             }
@@ -8245,6 +8248,7 @@
             }
             // -----------------------------------------------------------------
             function invoke() {
+                before_exec();
                 // Call user interpreter function
                 var result = interpreter.interpreter.call(self, command, self);
                 if (result) {

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: Mon, 13 Dec 2021 21:31:59 +0000
+ * Date: Mon, 13 Dec 2021 21:50:23 +0000
  */
 /* global define, Map */
 /* eslint-disable */
@@ -5110,7 +5110,7 @@
     // -------------------------------------------------------------------------
     $.terminal = {
         version: 'DEV',
-        date: 'Mon, 13 Dec 2021 21:31:59 +0000',
+        date: 'Mon, 13 Dec 2021 21:50:23 +0000',
         // colors from https://www.w3.org/wiki/CSS/Properties/color/keywords
         color_names: [
             'transparent', 'currentcolor', 'black', 'silver', 'gray', 'white',
@@ -8219,7 +8219,7 @@
                 }
             }
             // -----------------------------------------------------------------
-            function after_exec() {
+            function before_exec() {
                 // variables defined later in commands
                 if (!exec) {
                     change_hash = true;
@@ -8228,6 +8228,9 @@
                     }
                     change_hash = saved_change_hash;
                 }
+            }
+            // -----------------------------------------------------------------
+            function after_exec() {
                 deferred.resolve();
                 fire_event('onAfterCommand', [command]);
             }
@@ -8245,6 +8248,7 @@
             }
             // -----------------------------------------------------------------
             function invoke() {
+                before_exec();
                 // Call user interpreter function
                 var result = interpreter.interpreter.call(self, command, self);
                 if (result) {

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