Skip to content

Commit 9c07162

Browse files
committed
fix handling long prompt #919
1 parent c526ea5 commit 9c07162

4 files changed

+13
-11
lines changed

js/jquery.terminal-src.js

+4-3
Original file line numberDiff line numberDiff line change
@@ -3184,7 +3184,8 @@
31843184
}
31853185
// ---------------------------------------------------------------------
31863186
function is_multiline(str) {
3187-
return strlen(text(str)) > num_chars - prompt_len - 1 ||
3187+
var len = strlen(text(str));
3188+
return len > 0 && len > num_chars - prompt_len - 1 ||
31883189
str.match(/\n/);
31893190
}
31903191
// ---------------------------------------------------------------------
@@ -3516,7 +3517,7 @@
35163517
function format_prompt(prompt) {
35173518
if (!prompt) {
35183519
just_prompt_len = 0;
3519-
prompt_len = just_prompt_len + prompt_offset;
3520+
prompt_len = prompt_offset;
35203521
return prompt;
35213522
}
35223523
var prompt_marker = get_prompt_marker();
@@ -3934,8 +3935,8 @@
39343935
}
39353936
if (num_chars !== new_num_chars || arguments[0] === true) {
39363937
num_chars = new_num_chars;
3937-
redraw();
39383938
draw_prompt();
3939+
redraw();
39393940
}
39403941
return self;
39413942
},

js/jquery.terminal.js

+6-5
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
*
4242
* broken image by Sophia Bai from the Noun Project (CC-BY)
4343
*
44-
* Date: Sun, 07 Apr 2024 17:14:01 +0000
44+
* Date: Tue, 09 Apr 2024 18:42:45 +0000
4545
*/
4646
/* global define, Map, BigInt */
4747
/* eslint-disable */
@@ -3184,7 +3184,8 @@
31843184
}
31853185
// ---------------------------------------------------------------------
31863186
function is_multiline(str) {
3187-
return strlen(text(str)) > num_chars - prompt_len - 1 ||
3187+
var len = strlen(text(str));
3188+
return len > 0 && len > num_chars - prompt_len - 1 ||
31883189
str.match(/\n/);
31893190
}
31903191
// ---------------------------------------------------------------------
@@ -3516,7 +3517,7 @@
35163517
function format_prompt(prompt) {
35173518
if (!prompt) {
35183519
just_prompt_len = 0;
3519-
prompt_len = just_prompt_len + prompt_offset;
3520+
prompt_len = prompt_offset;
35203521
return prompt;
35213522
}
35223523
var prompt_marker = get_prompt_marker();
@@ -3934,8 +3935,8 @@
39343935
}
39353936
if (num_chars !== new_num_chars || arguments[0] === true) {
39363937
num_chars = new_num_chars;
3937-
redraw();
39383938
draw_prompt();
3939+
redraw();
39393940
}
39403941
return self;
39413942
},
@@ -5305,7 +5306,7 @@
53055306
// -------------------------------------------------------------------------
53065307
$.terminal = {
53075308
version: 'DEV',
5308-
date: 'Sun, 07 Apr 2024 17:14:01 +0000',
5309+
date: 'Tue, 09 Apr 2024 18:42:45 +0000',
53095310
// colors from https://www.w3.org/wiki/CSS/Properties/color/keywords
53105311
color_names: [
53115312
'transparent', 'currentcolor', 'black', 'silver', 'gray', 'white',

js/jquery.terminal.min.js

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

js/jquery.terminal.min.js.map

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)