Skip to content

Commit

Permalink
fix when CSS is loaded after creation of the terminal
Browse files Browse the repository at this point in the history 
When CSS was loaded after the init of the terminal, The pixel
density css property was overwritten with the old value.
The value of that property was width of the terminal.
This make the content of the terminal disappear.
  • Loading branch information
@jcubic
jcubic committed Mar 19, 2024
1 parent 67dd723 commit 541da3a
Show file tree
Hide file tree
Showing 12 changed files with 52 additions and 43 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
@@ -1,6 +1,7 @@
## 2.39.1
### Bugfix
* fix visible CMD textarea when page use box-shadow
* fix when CSS is loaded after creation of the terminal

## 2.39.0
### Features
Expand Down
8 changes: 4 additions & 4 deletions css/jquery.terminal-2.39.0.css
View file
Expand Up @@ -12,7 +12,7 @@
* Copyright (c) 2011-2023 Jakub T. Jankiewicz <https://jcubic.pl/me>
* Released under the MIT license
*
* Date: Wed, 13 Mar 2024 13:11:10 +0000
* Date: Tue, 19 Mar 2024 18:45:14 +0000
*/
.terminal .terminal-output .format, .cmd .format,
.cmd-prompt, .cmd-prompt div {
Expand Down Expand Up @@ -1120,11 +1120,11 @@ terminal .terminal-output > div {
display: inline-block;
}
.cmd-editable {
position: fixed;
top: 0;
position: absolute;
top: calc(var(--cmd-top) * 1px);
bottom: 0;
right: 0;
left: 0;
bottom: 0;
z-index: 500;
color: transparent;
background: transparent;
Expand Down
4 changes: 2 additions & 2 deletions css/jquery.terminal-2.39.0.min.css
View file

Large diffs are not rendered by default.

8 changes: 4 additions & 4 deletions css/jquery.terminal.css
View file
Expand Up @@ -12,7 +12,7 @@
* Copyright (c) 2011-2023 Jakub T. Jankiewicz <https://jcubic.pl/me>
* Released under the MIT license
*
* Date: Wed, 13 Mar 2024 13:11:10 +0000
* Date: Tue, 19 Mar 2024 18:45:14 +0000
*/
.terminal .terminal-output .format, .cmd .format,
.cmd-prompt, .cmd-prompt div {
Expand Down Expand Up @@ -1120,11 +1120,11 @@ terminal .terminal-output > div {
display: inline-block;
}
.cmd-editable {
position: fixed;
top: 0;
position: absolute;
top: calc(var(--cmd-top) * 1px);
bottom: 0;
right: 0;
left: 0;
bottom: 0;
z-index: 500;
color: transparent;
background: transparent;
Expand Down
4 changes: 2 additions & 2 deletions css/jquery.terminal.min.css
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion css/jquery.terminal.min.css.map
View file

Large diffs are not rendered by default.

24 changes: 14 additions & 10 deletions js/jquery.terminal-2.39.0.js
View file
Expand Up @@ -41,7 +41,7 @@
*
* broken image by Sophia Bai from the Noun Project (CC-BY)
*
* Date: Wed, 13 Mar 2024 13:11:10 +0000
* Date: Tue, 19 Mar 2024 18:45:14 +0000
*/
/* global define, Map, BigInt */
/* eslint-disable */
Expand Down Expand Up @@ -1260,7 +1260,7 @@
})();
// -------------------------------------------------------------------------
var is_css_variables_supported = root.CSS && root.CSS.supports &&
root.CSS.supports('--fake-var', 0);
root.CSS.supports('(--fake-var: 0)');
// -------------------------------------------------------------------------
var is_android = navigator.userAgent.toLowerCase().indexOf('android') !== -1;
// -------------------------------------------------------------------------
Expand Down Expand Up @@ -5305,7 +5305,7 @@
// -------------------------------------------------------------------------
$.terminal = {
version: 'DEV',
date: 'Wed, 13 Mar 2024 13:11:10 +0000',
date: 'Tue, 19 Mar 2024 18:45:14 +0000',
// colors from https://www.w3.org/wiki/CSS/Properties/color/keywords
color_names: [
'transparent', 'currentcolor', 'black', 'silver', 'gray', 'white',
Expand Down Expand Up @@ -10644,12 +10644,16 @@
var cmd_cursor = self.find('.cmd-cursor');
var offset = self.find('.cmd').offset();
var self_offset = self.offset();
self.stopTime('flush').oneTime(1, 'flush', function() {
self.stopTime('flush').oneTime(10, 'flush', function() {
var top = output.height();
var height = command_line.height();
css(self[0], {
'--terminal-height': self.height(),
'--terminal-x': offset.left - self_offset.left,
'--terminal-y': offset.top - self_offset.top,
'--terminal-scroll': scroller.prop('scrollTop')
'--terminal-scroll': scroller.prop('scrollTop'),
'--cmd-top': top,
'--cmd-height': height
});
if (enabled && !is_mobile) {
// Firefox won't reflow the cursor automatically, so
Expand Down Expand Up @@ -11666,7 +11670,7 @@
var in_login = false;// some Methods should not be called when login
// TODO: Try to use mutex like counter for pause/resume
var onPause = $.noop;// used to indicate that user call pause onInit
var old_width, old_height;
var old_width, old_height, old_pixel_density;
var delayed_commands = []; // used when exec commands while paused
var settings = $.extend(
{},
Expand Down Expand Up @@ -12261,9 +12265,9 @@
if (self.is(':visible')) {
var width = scroller.width();
var height = filler.height();
var new_pixel_density = get_pixel_size();
pixel_density = get_pixel_size();
css(self[0], {
'--pixel-density': new_pixel_density
'--pixel-density': pixel_density
});
if (need_char_size_recalculate) {
need_char_size_recalculate = !terminal_ready(self);
Expand All @@ -12275,12 +12279,12 @@
// prevent too many calculations in IE
if (old_height !== height ||
old_width !== width ||
pixel_density !== new_pixel_density) {
pixel_density !== old_pixel_density) {
self.resize();
}
old_height = height;
old_width = width;
pixel_density = new_pixel_density;
old_pixel_density = pixel_density;
}
}
function create_resizers() {
Expand Down
4 changes: 2 additions & 2 deletions js/jquery.terminal-2.39.0.min.js
View file

Large diffs are not rendered by default.

10 changes: 5 additions & 5 deletions js/jquery.terminal-src.js
View file
Expand Up @@ -11670,7 +11670,7 @@
var in_login = false;// some Methods should not be called when login
// TODO: Try to use mutex like counter for pause/resume
var onPause = $.noop;// used to indicate that user call pause onInit
var old_width, old_height;
var old_width, old_height, old_pixel_density;
var delayed_commands = []; // used when exec commands while paused
var settings = $.extend(
{},
Expand Down Expand Up @@ -12265,9 +12265,9 @@
if (self.is(':visible')) {
var width = scroller.width();
var height = filler.height();
var new_pixel_density = get_pixel_size();
pixel_density = get_pixel_size();
css(self[0], {
'--pixel-density': new_pixel_density
'--pixel-density': pixel_density
});
if (need_char_size_recalculate) {
need_char_size_recalculate = !terminal_ready(self);
Expand All @@ -12279,12 +12279,12 @@
// prevent too many calculations in IE
if (old_height !== height ||
old_width !== width ||
pixel_density !== new_pixel_density) {
pixel_density !== old_pixel_density) {
self.resize();
}
old_height = height;
old_width = width;
pixel_density = new_pixel_density;
old_pixel_density = pixel_density;
}
}
function create_resizers() {
Expand Down
24 changes: 14 additions & 10 deletions js/jquery.terminal.js
View file
Expand Up @@ -41,7 +41,7 @@
*
* broken image by Sophia Bai from the Noun Project (CC-BY)
*
* Date: Wed, 13 Mar 2024 13:11:10 +0000
* Date: Tue, 19 Mar 2024 18:45:14 +0000
*/
/* global define, Map, BigInt */
/* eslint-disable */
Expand Down Expand Up @@ -1260,7 +1260,7 @@
})();
// -------------------------------------------------------------------------
var is_css_variables_supported = root.CSS && root.CSS.supports &&
root.CSS.supports('--fake-var', 0);
root.CSS.supports('(--fake-var: 0)');
// -------------------------------------------------------------------------
var is_android = navigator.userAgent.toLowerCase().indexOf('android') !== -1;
// -------------------------------------------------------------------------
Expand Down Expand Up @@ -5305,7 +5305,7 @@
// -------------------------------------------------------------------------
$.terminal = {
version: 'DEV',
date: 'Wed, 13 Mar 2024 13:11:10 +0000',
date: 'Tue, 19 Mar 2024 18:45:14 +0000',
// colors from https://www.w3.org/wiki/CSS/Properties/color/keywords
color_names: [
'transparent', 'currentcolor', 'black', 'silver', 'gray', 'white',
Expand Down Expand Up @@ -10644,12 +10644,16 @@
var cmd_cursor = self.find('.cmd-cursor');
var offset = self.find('.cmd').offset();
var self_offset = self.offset();
self.stopTime('flush').oneTime(1, 'flush', function() {
self.stopTime('flush').oneTime(10, 'flush', function() {
var top = output.height();
var height = command_line.height();
css(self[0], {
'--terminal-height': self.height(),
'--terminal-x': offset.left - self_offset.left,
'--terminal-y': offset.top - self_offset.top,
'--terminal-scroll': scroller.prop('scrollTop')
'--terminal-scroll': scroller.prop('scrollTop'),
'--cmd-top': top,
'--cmd-height': height
});
if (enabled && !is_mobile) {
// Firefox won't reflow the cursor automatically, so
Expand Down Expand Up @@ -11666,7 +11670,7 @@
var in_login = false;// some Methods should not be called when login
// TODO: Try to use mutex like counter for pause/resume
var onPause = $.noop;// used to indicate that user call pause onInit
var old_width, old_height;
var old_width, old_height, old_pixel_density;
var delayed_commands = []; // used when exec commands while paused
var settings = $.extend(
{},
Expand Down Expand Up @@ -12261,9 +12265,9 @@
if (self.is(':visible')) {
var width = scroller.width();
var height = filler.height();
var new_pixel_density = get_pixel_size();
pixel_density = get_pixel_size();
css(self[0], {
'--pixel-density': new_pixel_density
'--pixel-density': pixel_density
});
if (need_char_size_recalculate) {
need_char_size_recalculate = !terminal_ready(self);
Expand All @@ -12275,12 +12279,12 @@
// prevent too many calculations in IE
if (old_height !== height ||
old_width !== width ||
pixel_density !== new_pixel_density) {
pixel_density !== old_pixel_density) {
self.resize();
}
old_height = height;
old_width = width;
pixel_density = new_pixel_density;
old_pixel_density = pixel_density;
}
}
function create_resizers() {
Expand Down
4 changes: 2 additions & 2 deletions js/jquery.terminal.min.js
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion js/jquery.terminal.min.js.map
View file

Large diffs are not rendered by default.

0 comments on commit 541da3a

Please sign in to comment.