Fix jcubic#219

Author: jcubic

js/jquery.terminal-0.9.2.js

@@ -44,7 +44,7 @@
  * Copyright (c) 2007-2013 Alexandru Marasteanu <hello at alexei dot ro>
  * licensed under 3 clause BSD license
  *
- * Date: Tue, 22 Dec 2015 16:17:03 +0000
+ * Date: Tue, 22 Dec 2015 18:55:36 +0000
  */
 
 /* TODO:
@@ -3101,22 +3101,26 @@
                 var string = $.type(line) === "function" ? line() : line;
                 string = $.type(string) === "string" ? string : String(string);
                 if (string !== '') {
-                    $.each(string.split(format_exec_re), function(i, string) {
-                        if (string.match(format_exec_re)) {
+                    if (line_settings.exec) {
+                        string = $.map(string.split(format_exec_re), function(string) {
+                            if (string.match(format_exec_re)) {
                             // redraw should not execute commands and it have
                             // and lines variable have all extended commands
-                            if (line_settings.exec) {
                                 string = string.replace(/^\[\[|\]\]$/g, '');
                                 if (prev_command && prev_command.command == string) {
                                     self.error(strings.recursiveCall);
                                 } else {
                                     $.terminal.extended_command(self, string);
                                 }
+                                return '';
+                            } else {
+                                return string;
                             }
-                        } else if (string !== '') {
-                            buffer_line(string, line_settings);
-                        }
-                    });
+                        }).join('');
+                        buffer_line(string, line_settings);
+                    } else {
+                        buffer_line(string, line_settings);
+                    }
                 }
             } catch (e) {
                 output_buffer = [];

js/jquery.terminal-0.9.2.min.js

@@ -3101,22 +3101,26 @@
                 var string = $.type(line) === "function" ? line() : line;
                 string = $.type(string) === "string" ? string : String(string);
                 if (string !== '') {
-                    $.each(string.split(format_exec_re), function(i, string) {
-                        if (string.match(format_exec_re)) {
+                    if (line_settings.exec) {
+                        string = $.map(string.split(format_exec_re), function(string) {
+                            if (string.match(format_exec_re)) {
                             // redraw should not execute commands and it have
                             // and lines variable have all extended commands
-                            if (line_settings.exec) {
                                 string = string.replace(/^\[\[|\]\]$/g, '');
                                 if (prev_command && prev_command.command == string) {
                                     self.error(strings.recursiveCall);
                                 } else {
                                     $.terminal.extended_command(self, string);
                                 }
+                                return '';
+                            } else {
+                                return string;
                             }
-                        } else if (string !== '') {
-                            buffer_line(string, line_settings);
-                        }
-                    });
+                        }).join('');
+                        buffer_line(string, line_settings);
+                    } else {
+                        buffer_line(string, line_settings);
+                    }
                 }
             } catch (e) {
                 output_buffer = [];