call onClear before clear and allow to cancel #527

jcubic · Oct 13, 2019 · bc6815b · bc6815b
1 parent 646fa69
commit bc6815b
Show file tree

Hide file tree

Showing 7 changed files with 25 additions and 21 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,7 @@
 ## 2.9.0
 ### features
 * allow to return a promise from greetings function [#531](https://github.com/jcubic/jquery.terminal/issues/531)
+* call onClear before clear and allow to cancel [#527](https://github.com/jcubic/jquery.terminal/issues/527)
 ### Bugfix
 * fix links from formatters in cmd
 * fix images from formatters in cmd [#519](https://github.com/jcubic/jquery.terminal/issues/519)

diff --git a/js/jquery.terminal-2.8.0.js b/js/jquery.terminal-2.8.0.js
@@ -39,7 +39,7 @@
  * emoji regex v7.0.1 by Mathias Bynens
  * MIT license
  *
- * Date: Sun, 13 Oct 2019 18:24:31 +0000
+ * Date: Sun, 13 Oct 2019 21:34:11 +0000
  */
 /* global location, setTimeout, window, global, sprintf, setImmediate,
           IntersectionObserver,  ResizeObserver, module, require, define,
@@ -4053,7 +4053,7 @@
     // -------------------------------------------------------------------------
     $.terminal = {
         version: 'DEV',
-        date: 'Sun, 13 Oct 2019 18:24:31 +0000',
+        date: 'Sun, 13 Oct 2019 21:34:11 +0000',
         // colors from https://www.w3.org/wiki/CSS/Properties/color/keywords
         color_names: [
             'transparent', 'currentcolor', 'black', 'silver', 'gray', 'white',
@@ -7345,10 +7345,11 @@
             // :: Clear the output
             // -------------------------------------------------------------
             clear: function() {
-                lines = [];
-                output.html('');
-                fire_event('onClear');
-                self.attr({scrollTop: 0});
+                if (fire_event('onClear') !== false) {
+                    lines = [];
+                    output.html('');
+                    self.attr({scrollTop: 0});
+                }
                 return self;
             },
             // -------------------------------------------------------------

diff --git a/js/jquery.terminal-2.8.0.min.js b/js/jquery.terminal-2.8.0.min.js
diff --git a/js/jquery.terminal-src.js b/js/jquery.terminal-src.js
@@ -7345,10 +7345,11 @@
             // :: Clear the output
             // -------------------------------------------------------------
             clear: function() {
-                lines = [];
-                output.html('');
-                fire_event('onClear');
-                self.attr({scrollTop: 0});
+                if (fire_event('onClear') !== false) {
+                    lines = [];
+                    output.html('');
+                    self.attr({scrollTop: 0});
+                }
                 return self;
             },
             // -------------------------------------------------------------

diff --git a/js/jquery.terminal.js b/js/jquery.terminal.js
@@ -39,7 +39,7 @@
  * emoji regex v7.0.1 by Mathias Bynens
  * MIT license
  *
- * Date: Sun, 13 Oct 2019 18:24:31 +0000
+ * Date: Sun, 13 Oct 2019 21:34:11 +0000
  */
 /* global location, setTimeout, window, global, sprintf, setImmediate,
           IntersectionObserver,  ResizeObserver, module, require, define,
@@ -4053,7 +4053,7 @@
     // -------------------------------------------------------------------------
     $.terminal = {
         version: 'DEV',
-        date: 'Sun, 13 Oct 2019 18:24:31 +0000',
+        date: 'Sun, 13 Oct 2019 21:34:11 +0000',
         // colors from https://www.w3.org/wiki/CSS/Properties/color/keywords
         color_names: [
             'transparent', 'currentcolor', 'black', 'silver', 'gray', 'white',
@@ -7345,10 +7345,11 @@
             // :: Clear the output
             // -------------------------------------------------------------
             clear: function() {
-                lines = [];
-                output.html('');
-                fire_event('onClear');
-                self.attr({scrollTop: 0});
+                if (fire_event('onClear') !== false) {
+                    lines = [];
+                    output.html('');
+                    self.attr({scrollTop: 0});
+                }
                 return self;
             },
             // -------------------------------------------------------------

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