fix for valid /[/]/g regex

jcubic · Jan 15, 2017 · e0f3930 · e0f3930
1 parent 9e449f6
commit e0f3930
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 18 deletions.
diff --git a/CHANGELOG b/CHANGELOG
@@ -22,6 +22,7 @@
           onPush and onPop callbacks
           interpeter and terminal accept extra option that can be use in onPop or onPush
           all callbacks have terminal as this (terminal in parameter stay the same)
+          fix for valid /[/]/g regex
 0.11.23   add scrollBottomOffset option
 0.11.22   scroll to bottom of the terminal when option scrollOnEcho is set to false but the terminal is
           at the bottom, add new api methods is_bottom and scroll_to_bottom.

diff --git a/js/jquery.terminal-0.11.23.js b/js/jquery.terminal-0.11.23.js
@@ -31,7 +31,7 @@
  * Copyright (c) 2007-2013 Alexandru Marasteanu <hello at alexei dot ro>
  * licensed under 3 clause BSD license
  *
- * Date: Sun, 15 Jan 2017 15:49:16 +0000
+ * Date: Sun, 15 Jan 2017 16:43:06 +0000
  */
 
 /* TODO:
@@ -2326,14 +2326,15 @@
         // ---------------------------------------------------------------------
         parse_arguments: function(string) {
             var float_re = /^[-+]?[0-9]*\.?[0-9]+([eE][-+]?[0-9]+)?$/;
+            var re_re = /^\/((?:\\\/|[^\/]|\[[^\]]*\/[^\]]*\])+)\/([gimy]*)$/;
             return $.map(string.match(command_re) || [], function(arg) {
-                if (arg[0] === "'" && arg[arg.length-1] === "'") {
+                var regex = arg.match(re_re);
+                if (regex) {
+                    return new RegExp(regex[1], regex[2]);
+                } else if (arg[0] === "'" && arg[arg.length-1] === "'") {
                     return arg.replace(/^'|'$/g, '');
                 } else if (arg[0] === '"' && arg[arg.length-1] === '"') {
                     return $.parseJSON(arg);
-                } else if (arg.match(/^\/(\\\/|[^\/])+\/[gimy]*$/)) { // RegEx
-                    var m = arg.match(/^\/([^\/]+)\/([^\/]*)$/);
-                    return new RegExp(m[1], m[2]);
                 } else if (arg.match(/^-?[0-9]+$/)) {
                     return parseInt(arg, 10);
                 } else if (arg.match(float_re)) {

diff --git a/js/jquery.terminal-0.11.23.min.js b/js/jquery.terminal-0.11.23.min.js
diff --git a/js/jquery.terminal-src.js b/js/jquery.terminal-src.js
@@ -2326,14 +2326,15 @@
         // ---------------------------------------------------------------------
         parse_arguments: function(string) {
             var float_re = /^[-+]?[0-9]*\.?[0-9]+([eE][-+]?[0-9]+)?$/;
+            var re_re = /^\/((?:\\\/|[^\/]|\[[^\]]*\/[^\]]*\])+)\/([gimy]*)$/;
             return $.map(string.match(command_re) || [], function(arg) {
-                if (arg[0] === "'" && arg[arg.length-1] === "'") {
+                var regex = arg.match(re_re);
+                if (regex) {
+                    return new RegExp(regex[1], regex[2]);
+                } else if (arg[0] === "'" && arg[arg.length-1] === "'") {
                     return arg.replace(/^'|'$/g, '');
                 } else if (arg[0] === '"' && arg[arg.length-1] === '"') {
                     return $.parseJSON(arg);
-                } else if (arg.match(/^\/(\\\/|[^\/])+\/[gimy]*$/)) { // RegEx
-                    var m = arg.match(/^\/([^\/]+)\/([^\/]*)$/);
-                    return new RegExp(m[1], m[2]);
                 } else if (arg.match(/^-?[0-9]+$/)) {
                     return parseInt(arg, 10);
                 } else if (arg.match(float_re)) {

diff --git a/js/jquery.terminal.js b/js/jquery.terminal.js
@@ -31,7 +31,7 @@
  * Copyright (c) 2007-2013 Alexandru Marasteanu <hello at alexei dot ro>
  * licensed under 3 clause BSD license
  *
- * Date: Sun, 15 Jan 2017 15:49:16 +0000
+ * Date: Sun, 15 Jan 2017 16:43:06 +0000
  */
 
 /* TODO:
@@ -2326,14 +2326,15 @@
         // ---------------------------------------------------------------------
         parse_arguments: function(string) {
             var float_re = /^[-+]?[0-9]*\.?[0-9]+([eE][-+]?[0-9]+)?$/;
+            var re_re = /^\/((?:\\\/|[^\/]|\[[^\]]*\/[^\]]*\])+)\/([gimy]*)$/;
             return $.map(string.match(command_re) || [], function(arg) {
-                if (arg[0] === "'" && arg[arg.length-1] === "'") {
+                var regex = arg.match(re_re);
+                if (regex) {
+                    return new RegExp(regex[1], regex[2]);
+                } else if (arg[0] === "'" && arg[arg.length-1] === "'") {
                     return arg.replace(/^'|'$/g, '');
                 } else if (arg[0] === '"' && arg[arg.length-1] === '"') {
                     return $.parseJSON(arg);
-                } else if (arg.match(/^\/(\\\/|[^\/])+\/[gimy]*$/)) { // RegEx
-                    var m = arg.match(/^\/([^\/]+)\/([^\/]*)$/);
-                    return new RegExp(m[1], m[2]);
                 } else if (arg.match(/^-?[0-9]+$/)) {
                     return parseInt(arg, 10);
                 } else if (arg.match(float_re)) {

diff --git a/js/jquery.terminal.min.js b/js/jquery.terminal.min.js