fix handling slashes + ignore broken ANSI escapes #460

jcubic · Jan 19, 2019 · 00ba172 · 00ba172
1 parent d599cbd
commit 00ba172
Show file tree

Hide file tree

Showing 7 changed files with 15 additions and 41 deletions.
diff --git a/js/jquery.terminal-2.0.2.js b/js/jquery.terminal-2.0.2.js
@@ -35,7 +35,7 @@
  * emoji regex v7.0.1 by Mathias Bynens
  * MIT license
  *
- * Date: Sat, 19 Jan 2019 10:17:34 +0000
+ * Date: Sat, 19 Jan 2019 10:43:55 +0000
  */
 
 /* TODO:
@@ -3471,7 +3471,7 @@
     // -------------------------------------------------------------------------
     $.terminal = {
         version: 'DEV',
-        date: 'Sat, 19 Jan 2019 10:17:34 +0000',
+        date: 'Sat, 19 Jan 2019 10:43:55 +0000',
         // colors from http://www.w3.org/wiki/CSS/Properties/color/keywords
         color_names: [
             'transparent', 'currentcolor', 'black', 'silver', 'gray', 'white',
@@ -4205,16 +4205,7 @@
         // ---------------------------------------------------------------------
         format: function format(str, options) {
             function safe_text(string) {
-                if (string.match(/\\]/)) {
-                    string = string.replace(/(\\+)]/g, function(_, slashes) {
-                        if (slashes.length % 2 === 1) {
-                            return ']';
-                        } else {
-                            return slashes.replace(/../, '\\');
-                        }
-                    });
-                }
-                return safe(string);
+                return safe(string.replace(/\\\\/g, '\\'));
             }
             var settings = $.extend({}, {
                 linksNoReferrer: false,

diff --git a/js/jquery.terminal-2.0.2.min.js b/js/jquery.terminal-2.0.2.min.js
diff --git a/js/jquery.terminal-src.js b/js/jquery.terminal-src.js
@@ -4205,16 +4205,7 @@
         // ---------------------------------------------------------------------
         format: function format(str, options) {
             function safe_text(string) {
-                if (string.match(/\\]/)) {
-                    string = string.replace(/(\\+)]/g, function(_, slashes) {
-                        if (slashes.length % 2 === 1) {
-                            return ']';
-                        } else {
-                            return slashes.replace(/../, '\\');
-                        }
-                    });
-                }
-                return safe(string);
+                return safe(string.replace(/\\\\/g, '\\'));
             }
             var settings = $.extend({}, {
                 linksNoReferrer: false,

diff --git a/js/jquery.terminal.js b/js/jquery.terminal.js
@@ -35,7 +35,7 @@
  * emoji regex v7.0.1 by Mathias Bynens
  * MIT license
  *
- * Date: Sat, 19 Jan 2019 10:17:34 +0000
+ * Date: Sat, 19 Jan 2019 10:43:55 +0000
  */
 
 /* TODO:
@@ -3471,7 +3471,7 @@
     // -------------------------------------------------------------------------
     $.terminal = {
         version: 'DEV',
-        date: 'Sat, 19 Jan 2019 10:17:34 +0000',
+        date: 'Sat, 19 Jan 2019 10:43:55 +0000',
         // colors from http://www.w3.org/wiki/CSS/Properties/color/keywords
         color_names: [
             'transparent', 'currentcolor', 'black', 'silver', 'gray', 'white',
@@ -4205,16 +4205,7 @@
         // ---------------------------------------------------------------------
         format: function format(str, options) {
             function safe_text(string) {
-                if (string.match(/\\]/)) {
-                    string = string.replace(/(\\+)]/g, function(_, slashes) {
-                        if (slashes.length % 2 === 1) {
-                            return ']';
-                        } else {
-                            return slashes.replace(/../, '\\');
-                        }
-                    });
-                }
-                return safe(string);
+                return safe(string.replace(/\\\\/g, '\\'));
             }
             var settings = $.extend({}, {
                 linksNoReferrer: false,

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/unix_formatting.js b/js/unix_formatting.js
@@ -594,10 +594,11 @@
                             break;
                     }
                 } else if (splitted[i] !== '') {
+                    var text = splitted[i].replace(/\x1b\[[0-9;]*/g, '');
                     if (settings.unixFormattingEscapeBrackets) {
-                        output.push($.terminal.escape_formatting(splitted[i]));
+                        output.push($.terminal.escape_formatting(text));
                     } else {
-                        output.push(splitted[i]);
+                        output.push(text);
                     }
                 }
             } // for