fix parsing empty strings

CHANGELOG.md

@@ -13,6 +13,7 @@
 * fix for wide characters inside bigger text [#369](https://github.com/jcubic/jquery.terminal/issues/369)
 * when clicking on terminal and it already had focus the textarea was blured
   [#370](https://github.com/jcubic/jquery.terminal/issues/370)
+* fix parsing empty strings "" or ''
 
 ## 1.11.4
 * handle non string and functions in error the same as in echo

js/jquery.terminal-1.11.4.js

@@ -32,7 +32,7 @@
  * Copyright (c) 2007-2013 Alexandru Marasteanu <hello at alexei dot ro>
  * licensed under 3 clause BSD license
  *
- * Date: Sat, 24 Feb 2018 10:40:25 +0000
+ * Date: Sat, 24 Feb 2018 11:08:16 +0000
  */
 
 /* TODO:
@@ -2864,7 +2864,7 @@
     }
     $.terminal = {
         version: 'DEV',
-        date: 'Sat, 24 Feb 2018 10:40:25 +0000',
+        date: 'Sat, 24 Feb 2018 11:08:16 +0000',
         // colors from http://www.w3.org/wiki/CSS/Properties/color/keywords
         color_names: [
             'transparent', 'currentcolor', 'black', 'silver', 'gray', 'white',
@@ -3516,6 +3516,10 @@
                 // we don't remove slases becuase they are handled by JSON.parse
                 //string = string.replace(/([^\\])['"]$/, '$1');
                 if (string.match(/^['"]/)) {
+                    // fixing regex to match empty string is not worth it
+                    if (string === '""' || string === "''") {
+                        return '';
+                    }
                     var quote = string[0];
                     var re = new RegExp("((^|[^\\\\])(?:\\\\\\\\)*)" + quote, "g");
                     string = string.replace(re, "$1");

js/jquery.terminal-src.js

@@ -3516,6 +3516,10 @@
                 // we don't remove slases becuase they are handled by JSON.parse
                 //string = string.replace(/([^\\])['"]$/, '$1');
                 if (string.match(/^['"]/)) {
+                    // fixing regex to match empty string is not worth it
+                    if (string === '""' || string === "''") {
+                        return '';
+                    }
                     var quote = string[0];
                     var re = new RegExp("((^|[^\\\\])(?:\\\\\\\\)*)" + quote, "g");
                     string = string.replace(re, "$1");

js/jquery.terminal.js

@@ -32,7 +32,7 @@
  * Copyright (c) 2007-2013 Alexandru Marasteanu <hello at alexei dot ro>
  * licensed under 3 clause BSD license
  *
- * Date: Sat, 24 Feb 2018 10:40:25 +0000
+ * Date: Sat, 24 Feb 2018 11:08:16 +0000
  */
 
 /* TODO:
@@ -2864,7 +2864,7 @@
     }
     $.terminal = {
         version: 'DEV',
-        date: 'Sat, 24 Feb 2018 10:40:25 +0000',
+        date: 'Sat, 24 Feb 2018 11:08:16 +0000',
         // colors from http://www.w3.org/wiki/CSS/Properties/color/keywords
         color_names: [
             'transparent', 'currentcolor', 'black', 'silver', 'gray', 'white',
@@ -3516,6 +3516,10 @@
                 // we don't remove slases becuase they are handled by JSON.parse
                 //string = string.replace(/([^\\])['"]$/, '$1');
                 if (string.match(/^['"]/)) {
+                    // fixing regex to match empty string is not worth it
+                    if (string === '""' || string === "''") {
+                        return '';
+                    }
                     var quote = string[0];
                     var re = new RegExp("((^|[^\\\\])(?:\\\\\\\\)*)" + quote, "g");
                     string = string.replace(re, "$1");

spec/terminalSpec.js

@@ -172,8 +172,8 @@ var support_animations = (function() {
 })();
 function tests_on_ready() {
     describe('Terminal utils', function() {
-        var command = 'test "foo bar" baz /^asd [x]/ str\\ str 10 1e10';
-        var args = '"foo bar" baz /^asd [x]/ str\\ str 10 1e10';
+        var command = 'test "foo bar" baz /^asd [x]/ str\\ str 10 1e10 ""';
+        var args = '"foo bar" baz /^asd [x]/ str\\ str 10 1e10 ""';
         describe('$.terminal.split_arguments', function() {
             it('should create array of arguments', function() {
                 expect($.terminal.split_arguments(args)).toEqual([
@@ -182,7 +182,8 @@ function tests_on_ready() {
                     '/^asd [x]/',
                     'str str',
                     '10',
-                    '1e10'
+                    '1e10',
+                    ''
                 ]);
             });
         });
@@ -194,7 +195,8 @@ function tests_on_ready() {
                         /^asd [x]/,
                     'str str',
                     10,
-                    1e10
+                    1e10,
+                    ''
                 ]);
             });
         });
@@ -210,10 +212,11 @@ function tests_on_ready() {
                         '/^asd [x]/',
                         'str str',
                         '10',
-                        '1e10'
+                        '1e10',
+                        ''
                     ],
-                    args_quotes: ['"', '', '', '', '', ''],
-                    rest: '"foo bar" baz /^asd [x]/ str\\ str 10 1e10'
+                    args_quotes: ['"', '', '', '', '', '', '"'],
+                    rest: '"foo bar" baz /^asd [x]/ str\\ str 10 1e10 ""'
                 });
             });
         });
@@ -229,10 +232,11 @@ function tests_on_ready() {
                             /^asd [x]/,
                         'str str',
                         10,
-                        1e10
+                        1e10,
+                        ''
                     ],
-                    args_quotes: ['"', '', '', '', '', ''],
-                    rest: '"foo bar" baz /^asd [x]/ str\\ str 10 1e10'
+                    args_quotes: ['"', '', '', '', '', '', '"'],
+                    rest: '"foo bar" baz /^asd [x]/ str\\ str 10 1e10 ""'
                 });
             });
         });