fix major issue when wcwidth is included

jcubic · Mar 14, 2020 · 1b7f02a · 1b7f02a
1 parent 1b16a23
commit 1b7f02a
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 18 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,6 +6,7 @@
 * fix vertical bar cursor animation on empty command line
 * fix edge case while splitting the command line with formatting (better fix for [#379](https://github.com/jcubic/jquery.terminal/379))
 * fix option parser when using minus or double minus as argument
+* fix major issue when wcwidth is added and there are no wide characters
 
 ## 2.14.1
 ### Bugfix

diff --git a/js/jquery.terminal-2.14.1.js b/js/jquery.terminal-2.14.1.js
@@ -41,7 +41,7 @@
  *
  * broken image by Sophia Bai from the Noun Project (CC-BY)
  *
- * Date: Sat, 14 Mar 2020 15:55:16 +0000
+ * Date: Sat, 14 Mar 2020 16:37:49 +0000
  */
 /* global define, Map */
 /* eslint-disable */
@@ -3967,9 +3967,6 @@
                 }];
             }, []);
             return specs.map(function(spec) {
-                if (spec.len === 1) {
-                    return spec.chr;
-                }
                 var style = char_width_prop(spec.sum, options);
                 if (spec.sum === chars.length || !style.length) {
                     return '<span>' + make_string(spec) + '</span>';
@@ -4280,7 +4277,7 @@
     // -------------------------------------------------------------------------
     $.terminal = {
         version: 'DEV',
-        date: 'Sat, 14 Mar 2020 15:55:16 +0000',
+        date: 'Sat, 14 Mar 2020 16:37:49 +0000',
         // colors from https://www.w3.org/wiki/CSS/Properties/color/keywords
         color_names: [
             'transparent', 'currentcolor', 'black', 'silver', 'gray', 'white',

diff --git a/js/jquery.terminal-2.14.1.min.js b/js/jquery.terminal-2.14.1.min.js
diff --git a/js/jquery.terminal-src.js b/js/jquery.terminal-src.js
@@ -3967,9 +3967,6 @@
                 }];
             }, []);
             return specs.map(function(spec) {
-                if (spec.len === 1) {
-                    return spec.chr;
-                }
                 var style = char_width_prop(spec.sum, options);
                 if (spec.sum === chars.length || !style.length) {
                     return '<span>' + make_string(spec) + '</span>';

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: Sat, 14 Mar 2020 15:55:16 +0000
+ * Date: Sat, 14 Mar 2020 16:37:49 +0000
  */
 /* global define, Map */
 /* eslint-disable */
@@ -3967,9 +3967,6 @@
                 }];
             }, []);
             return specs.map(function(spec) {
-                if (spec.len === 1) {
-                    return spec.chr;
-                }
                 var style = char_width_prop(spec.sum, options);
                 if (spec.sum === chars.length || !style.length) {
                     return '<span>' + make_string(spec) + '</span>';
@@ -4280,7 +4277,7 @@
     // -------------------------------------------------------------------------
     $.terminal = {
         version: 'DEV',
-        date: 'Sat, 14 Mar 2020 15:55:16 +0000',
+        date: 'Sat, 14 Mar 2020 16:37:49 +0000',
         // colors from https://www.w3.org/wiki/CSS/Properties/color/keywords
         color_names: [
             'transparent', 'currentcolor', 'black', 'silver', 'gray', 'white',

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