Fix resizing and wrapping on update

jcubic · Dec 28, 2017 · 039ac01 · 039ac01
1 parent 3369273
commit 039ac01
Show file tree

Hide file tree

Showing 12 changed files with 58 additions and 92 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,7 +1,10 @@
-## Next
+## 1.11.2
 * fix issue with --char-width == 0 if terminal have display:none
 * fix DELETE numpad key on IE
 * ignore invalid procedures description in system.describe
+* fix font resizer and init resizers when terminal hidden initialy
+* fix broken wrapping in new feature of updating divs on resize
+
 
 ## 1.11.1
 * fix IE inconsistency in key property for numpad calc keys (reported by @ovk [#362](https://github.com/jcubic/jquery.terminal/issues/362)

diff --git a/css/jquery.terminal-1.11.1.css b/css/jquery.terminal-1.11.1.css
@@ -12,7 +12,7 @@
  * Copyright (c) 2011-2017 Jakub Jankiewicz <http://jcubic.pl>
  * Released under the MIT license
  *
- * Date: Wed, 27 Dec 2017 14:27:58 +0000
+ * Date: Thu, 28 Dec 2017 08:36:02 +0000
  */
 .terminal .terminal-output .format, .cmd .format,
 .cmd .prompt, .cmd .prompt div, .terminal .terminal-output div div{
@@ -462,8 +462,8 @@ terminal .terminal-output > div {
         background-color: var(--background, #000);
     }
     .terminal .font {
-        width: calc(var(--size) * 1em);
-        height: calc(var(--size) * 1em);
+        width: calc(var(--size, 1) * 1em);
+        height: calc(var(--size, 1) * 1em);
     }
     .terminal span[style*="--length"] {
         width: calc(var(--length, 1) * var(--char-width) * 1px);

diff --git a/css/jquery.terminal-1.11.1.min.css b/css/jquery.terminal-1.11.1.min.css
diff --git a/css/jquery.terminal-src.css b/css/jquery.terminal-src.css
@@ -462,8 +462,8 @@ terminal .terminal-output > div {
         background-color: var(--background, #000);
     }
     .terminal .font {
-        width: calc(var(--size) * 1em);
-        height: calc(var(--size) * 1em);
+        width: calc(var(--size, 1) * 1em);
+        height: calc(var(--size, 1) * 1em);
     }
     .terminal span[style*="--length"] {
         width: calc(var(--length, 1) * var(--char-width) * 1px);

diff --git a/css/jquery.terminal.css b/css/jquery.terminal.css
@@ -12,7 +12,7 @@
  * Copyright (c) 2011-2017 Jakub Jankiewicz <http://jcubic.pl>
  * Released under the MIT license
  *
- * Date: Wed, 27 Dec 2017 14:27:58 +0000
+ * Date: Thu, 28 Dec 2017 08:36:02 +0000
  */
 .terminal .terminal-output .format, .cmd .format,
 .cmd .prompt, .cmd .prompt div, .terminal .terminal-output div div{
@@ -462,8 +462,8 @@ terminal .terminal-output > div {
         background-color: var(--background, #000);
     }
     .terminal .font {
-        width: calc(var(--size) * 1em);
-        height: calc(var(--size) * 1em);
+        width: calc(var(--size, 1) * 1em);
+        height: calc(var(--size, 1) * 1em);
     }
     .terminal span[style*="--length"] {
         width: calc(var(--length, 1) * var(--char-width) * 1px);

diff --git a/css/jquery.terminal.min.css b/css/jquery.terminal.min.css
diff --git a/js/dterm.js b/js/dterm.js
@@ -24,8 +24,7 @@
     $.fn.dterm = function(interpreter, options) {
         var op = $.extend_if_has({}, options, defaults);
         op.enabled = false;
-        var terminal = $('<div/>').appendTo(this)
-                .terminal(interpreter, op);
+        var terminal = this.terminal(interpreter, op);
         if (!options.title) {
             options.title = 'JQuery Terminal Emulator';
         }

diff --git a/js/jquery.terminal-1.11.1.js b/js/jquery.terminal-1.11.1.js
@@ -32,7 +32,7 @@
  * Copyright (c) 2007-2013 Alexandru Marasteanu <hello at alexei dot ro>
  * licensed under 3 clause BSD license
  *
- * Date: Wed, 27 Dec 2017 20:33:43 +0000
+ * Date: Thu, 28 Dec 2017 08:36:01 +0000
  */
 
 /* TODO:
@@ -2797,7 +2797,7 @@
     }
     $.terminal = {
         version: 'DEV',
-        date: 'Wed, 27 Dec 2017 20:33:43 +0000',
+        date: 'Thu, 28 Dec 2017 08:36:01 +0000',
         // colors from http://www.w3.org/wiki/CSS/Properties/color/keywords
         color_names: [
             'transparent', 'currentcolor', 'black', 'silver', 'gray', 'white',
@@ -4518,8 +4518,6 @@
                 for (i = 0, len = array.length; i < len; ++i) {
                     if (array[i] === '' || array[i] === '\r') {
                         output_buffer.push('<span></span>');
-                    } else if (options.raw) {
-                        output_buffer.push(array[i]);
                     } else {
                         output_buffer.push($.terminal.format(array[i], {
                             linksNoReferrer: settings.linksNoReferrer
@@ -4589,6 +4587,7 @@
                             return string;
                         }
                     }).join('');
+                    // string can be empty after removing extended commands
                     if (string !== '') {
                         if (!line_settings.raw) {
                             if (settings.convertLinks) {
@@ -4604,7 +4603,6 @@
                             }
                             string = $.terminal.encode(string);
                         }
-                        // string can be empty after removing extended commands
                         buffer_line(string, line.index, line_settings);
                     }
                 }
@@ -4623,7 +4621,9 @@
         // ---------------------------------------------------------------------
         function redraw(options) {
             options = $.extend({}, {
+                // should be used when single line is updated
                 update: false,
+                // should be used if you want to scroll to bottom after redraw
                 scroll: true
             }, options || {});
             if (!options.update) {
@@ -4652,26 +4652,11 @@
                     if ($.type(string) !== 'string') {
                         string = String(string);
                     }
-                    if (strlen(string) > num_chars) {
-                        var splitted = $.terminal.split_equal(
-                            string,
-                            num_chars,
-                            options.keepWords
-                        ).map(function(string) {
-                            return {
-                                string: string,
-                                index: index,
-                                options: options
-                            };
-                        });
-                        lines_to_show = lines_to_show.concat(splitted);
-                    } else {
-                        lines_to_show.push({
-                            string: string,
-                            index: index,
-                            options: options
-                        });
-                    }
+                    lines_to_show.push({
+                        string: string,
+                        index: index,
+                        options: options
+                    });
                 });
                 lines_to_show = lines_to_show.slice(lines_to_show.length - limit - 1);
             } else {
@@ -7213,6 +7198,9 @@
                 }
                 var was_enabled = self.enabled();
                 var visible = self.is(':visible');
+                if (visible) {
+                    create_resizers();
+                }
                 visibility_observer = new IntersectionObserver(function() {
                     if (self.is(':visible') && !visible) {
                         visible = true;

diff --git a/js/jquery.terminal-1.11.1.min.js b/js/jquery.terminal-1.11.1.min.js
diff --git a/js/jquery.terminal-src.js b/js/jquery.terminal-src.js
@@ -4518,8 +4518,6 @@
                 for (i = 0, len = array.length; i < len; ++i) {
                     if (array[i] === '' || array[i] === '\r') {
                         output_buffer.push('<span></span>');
-                    } else if (options.raw) {
-                        output_buffer.push(array[i]);
                     } else {
                         output_buffer.push($.terminal.format(array[i], {
                             linksNoReferrer: settings.linksNoReferrer
@@ -4589,6 +4587,7 @@
                             return string;
                         }
                     }).join('');
+                    // string can be empty after removing extended commands
                     if (string !== '') {
                         if (!line_settings.raw) {
                             if (settings.convertLinks) {
@@ -4604,7 +4603,6 @@
                             }
                             string = $.terminal.encode(string);
                         }
-                        // string can be empty after removing extended commands
                         buffer_line(string, line.index, line_settings);
                     }
                 }
@@ -4623,7 +4621,9 @@
         // ---------------------------------------------------------------------
         function redraw(options) {
             options = $.extend({}, {
+                // should be used when single line is updated
                 update: false,
+                // should be used if you want to scroll to bottom after redraw
                 scroll: true
             }, options || {});
             if (!options.update) {
@@ -4652,26 +4652,11 @@
                     if ($.type(string) !== 'string') {
                         string = String(string);
                     }
-                    if (strlen(string) > num_chars) {
-                        var splitted = $.terminal.split_equal(
-                            string,
-                            num_chars,
-                            options.keepWords
-                        ).map(function(string) {
-                            return {
-                                string: string,
-                                index: index,
-                                options: options
-                            };
-                        });
-                        lines_to_show = lines_to_show.concat(splitted);
-                    } else {
-                        lines_to_show.push({
-                            string: string,
-                            index: index,
-                            options: options
-                        });
-                    }
+                    lines_to_show.push({
+                        string: string,
+                        index: index,
+                        options: options
+                    });
                 });
                 lines_to_show = lines_to_show.slice(lines_to_show.length - limit - 1);
             } else {
@@ -7213,6 +7198,9 @@
                 }
                 var was_enabled = self.enabled();
                 var visible = self.is(':visible');
+                if (visible) {
+                    create_resizers();
+                }
                 visibility_observer = new IntersectionObserver(function() {
                     if (self.is(':visible') && !visible) {
                         visible = true;

diff --git a/js/jquery.terminal.js b/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: Wed, 27 Dec 2017 20:33:43 +0000
+ * Date: Thu, 28 Dec 2017 08:36:01 +0000
  */
 
 /* TODO:
@@ -2797,7 +2797,7 @@
     }
     $.terminal = {
         version: 'DEV',
-        date: 'Wed, 27 Dec 2017 20:33:43 +0000',
+        date: 'Thu, 28 Dec 2017 08:36:01 +0000',
         // colors from http://www.w3.org/wiki/CSS/Properties/color/keywords
         color_names: [
             'transparent', 'currentcolor', 'black', 'silver', 'gray', 'white',
@@ -4518,8 +4518,6 @@
                 for (i = 0, len = array.length; i < len; ++i) {
                     if (array[i] === '' || array[i] === '\r') {
                         output_buffer.push('<span></span>');
-                    } else if (options.raw) {
-                        output_buffer.push(array[i]);
                     } else {
                         output_buffer.push($.terminal.format(array[i], {
                             linksNoReferrer: settings.linksNoReferrer
@@ -4589,6 +4587,7 @@
                             return string;
                         }
                     }).join('');
+                    // string can be empty after removing extended commands
                     if (string !== '') {
                         if (!line_settings.raw) {
                             if (settings.convertLinks) {
@@ -4604,7 +4603,6 @@
                             }
                             string = $.terminal.encode(string);
                         }
-                        // string can be empty after removing extended commands
                         buffer_line(string, line.index, line_settings);
                     }
                 }
@@ -4623,7 +4621,9 @@
         // ---------------------------------------------------------------------
         function redraw(options) {
             options = $.extend({}, {
+                // should be used when single line is updated
                 update: false,
+                // should be used if you want to scroll to bottom after redraw
                 scroll: true
             }, options || {});
             if (!options.update) {
@@ -4652,26 +4652,11 @@
                     if ($.type(string) !== 'string') {
                         string = String(string);
                     }
-                    if (strlen(string) > num_chars) {
-                        var splitted = $.terminal.split_equal(
-                            string,
-                            num_chars,
-                            options.keepWords
-                        ).map(function(string) {
-                            return {
-                                string: string,
-                                index: index,
-                                options: options
-                            };
-                        });
-                        lines_to_show = lines_to_show.concat(splitted);
-                    } else {
-                        lines_to_show.push({
-                            string: string,
-                            index: index,
-                            options: options
-                        });
-                    }
+                    lines_to_show.push({
+                        string: string,
+                        index: index,
+                        options: options
+                    });
                 });
                 lines_to_show = lines_to_show.slice(lines_to_show.length - limit - 1);
             } else {
@@ -7213,6 +7198,9 @@
                 }
                 var was_enabled = self.enabled();
                 var visible = self.is(':visible');
+                if (visible) {
+                    create_resizers();
+                }
                 visibility_observer = new IntersectionObserver(function() {
                     if (self.is(':visible') && !visible) {
                         visible = true;

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