Skip to content

Commit 60b277a

Browse files
committed
merge with devel
2 parents d70b1ed + 541da3a commit 60b277a

18 files changed

+229
-114
lines changed

CHANGELOG.md

Lines changed: 23 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
## 2.39.1
2+
### Bugfix
3+
* fix visible CMD textarea when page use box-shadow
4+
* fix when CSS is loaded after creation of the terminal
5+
16
## 2.39.0
27
### Features
38
* Add support for jQuery 4.0
@@ -108,7 +113,7 @@
108113
* fix resolving promise from echo typing animation when previous command was async [#797](https://github.com/jcubic/jquery.terminal/issues/797)
109114
* fix double exception in terminal::destroy
110115
* fix double call to finalize function when echo DOM nodes
111-
* fix $.terminal.substring [#792](https://github.com/jcubic/jquery.terminal/issues/792)
116+
* fix `$.terminal.substring` [#792](https://github.com/jcubic/jquery.terminal/issues/792)
112117

113118
## 2.33.3
114119
### Bugfix
@@ -749,7 +754,7 @@
749754

750755
## 2.3.0
751756
### Features
752-
* add experimental $.terminal.pipe function
757+
* add experimental `$.terminal.pipe` function
753758
* allow to return string from onPaste (not only a promise)
754759
* add CTRL+Home and CTRL+End keys + HOME and END move cursor to the end and beginning of the line [#479](https://github.com/jcubic/jquery.terminal/issues/479)
755760
* zoom page when using mousewheel + CTRL key (browser default) [#468](https://github.com/jcubic/jquery.terminal/issues/468)
@@ -847,7 +852,7 @@
847852
* fix escape bracket in command line
848853
* fix relative and absolute urls with default `anyLinks: false`
849854
* fix android and iPhone issues [#443](https://github.com/jcubic/jquery.terminal/issues/443) [#414](https://github.com/jcubic/jquery.terminal/issues/414)
850-
* fix ANSI escapes in unix_formatting [$444](https://github.com/jcubic/jquery.terminal/issues/444)
855+
* fix ANSI escapes in unix_formatting [#444](https://github.com/jcubic/jquery.terminal/issues/444)
851856
* fix jumping cursor when there are no text before cursor line in Chrome
852857
* fix selection menu in latest Android
853858
* fix wrong number of chars per line when insert called after init and scrollbar appear
@@ -911,7 +916,7 @@
911916
* embed emoji regex by Mathias Bynens for better emoji detection
912917
* allow to execute extended commands including terminal and cmd methods from formatters
913918
* support for true colors (24bit) in unix formatting [#433](https://github.com/jcubic/jquery.terminal/issues/433)
914-
* expose split_characters in $.terminal namespace
919+
* expose split_characters in `$.terminal` namespace
915920
* cmd commands option functions to have cmd as this context
916921

917922
### Bugfix
@@ -995,7 +1000,7 @@
9951000
### Features
9961001
* add TypeScript definition file
9971002
* update formatters API to have a way to return position after replace from function formatter
998-
* regex formatters and $.tracking_replace now accept function as replacement
1003+
* regex formatters and `$.tracking_replace` now accept function as replacement
9991004
* update unix formatters to use new API so they work with command line
10001005
* set exit to false if no login provided
10011006

@@ -1009,8 +1014,8 @@
10091014
## 1.18.0
10101015
### Feature
10111016
* looping regex formatters that replace until they don't match the regex
1012-
* add tracking_replace to $.terminal namespace
1013-
* $.terminal.syntax helper
1017+
* add tracking_replace to `$.terminal` namespace
1018+
* `$.terminal.syntax` helper
10141019
* new language for prism: "website" that handle html, javascript and css syntax
10151020

10161021
### Bugs
@@ -1023,10 +1028,10 @@
10231028
### Features
10241029
* add ascii_table utility in separated file
10251030
* per user command line history
1026-
* add $.terminal.parse_options which return same object as yargs parser
1027-
* $.jrpc helper now return its own created promise instead of $.ajax
1031+
* add `$.terminal.parse_options` which return same object as yargs parser
1032+
* `$.jrpc` helper now return its own created promise instead of `$.ajax`
10281033
* add wcwidth as dependency so it will always show wider characters correctly (in browsers will work the same as optional)
1029-
* expose terminal exception in $.terminal namespace
1034+
* expose terminal exception in `$.terminal` namespace
10301035
* new API option doubleTab [#405](https://github.com/jcubic/jquery.terminal/issues/405)
10311036

10321037
### Bugfix
@@ -1051,7 +1056,7 @@
10511056
### Bugs
10521057
* fix paste/select all when click below .cmd
10531058
* second fix to jumping on right click (context menu) [#399](https://github.com/jcubic/jquery.terminal/issues/399)
1054-
* change $.terminal.prism_formatting to $.terminal.prism
1059+
* change `$.terminal.prism_formatting` to `$.terminal.prism`
10551060

10561061
## 1.16.0
10571062

@@ -1068,8 +1073,8 @@
10681073

10691074
### Bugs
10701075
* fix resizer in Firefox [#395](https://github.com/jcubic/jquery.terminal/issues/395)
1071-
* fix $.terminal.columns and echo array [#394](https://github.com/jcubic/jquery.terminal/issues/394)
1072-
* fix $.terminal.columns for wider characters and terminal formatting
1076+
* fix `$.terminal.columns` and echo array [#394](https://github.com/jcubic/jquery.terminal/issues/394)
1077+
* fix `$.terminal.columns` for wider characters and terminal formatting
10731078
* fix rows() when using --size [#398](https://github.com/jcubic/jquery.terminal/issues/398)
10741079
* fix null in JSON hash
10751080
* fix jumping on right click (context menu) [#399](https://github.com/jcubic/jquery.terminal/issues/399)
@@ -1216,7 +1221,7 @@
12161221

12171222
## 1.9.0
12181223
### Features
1219-
* new api utils $.terminal.length and $.terminal.columns
1224+
* new api utils `$.terminal.length` and `$.terminal.columns`
12201225
* echo array (resizable in columns that fit the width, using settings.tabs as pad right)
12211226
* callback function parseObject that's called on object different then string (on render)
12221227
* calling option method with numRows or numChars redraw terminal output (for testing)
@@ -1277,7 +1282,7 @@
12771282
## 1.7.0
12781283
### Features
12791284
* add option caseSensitiveAutocomplete default to true [#332](https://github.com/jcubic/jquery.terminal/issues/332)
1280-
* expose Stack/Cycle/History in $.terminal so they can be tested
1285+
* expose Stack/Cycle/History in `$.terminal` so they can be tested
12811286
* make `:focus-within .prompt` selector work with terminal (work also on codepen)
12821287
### Bugs
12831288
* fix jumping of terminal when created one after another and changing the one that have focus in Edge
@@ -1501,7 +1506,7 @@
15011506
* add option softPause to control pause visible option - it don't hide the prompt when set to true
15021507
* add wordAutocomplete option (default true)
15031508
* add complete and `before_cursor` api methods and use it for autocomplete
1504-
* formatting for command line (you can't type formatting but you can use $.terminal.formatters to
1509+
* formatting for command line (you can't type formatting but you can use `$.terminal.formatters` to
15051510
* format command you're writing)
15061511
* new option formatters for echo (error method by default disable formatters)
15071512
* interpeter and terminal accept extra option that can be use in onPop or onPush
@@ -1769,8 +1774,8 @@
17691774
* paste text from selection using middle mouse button
17701775
* fix login, history and exec
17711776
* disable few things when in login function
1772-
* all Strings are in $.terminal.defaults.strings
1773-
* more functions in $.terminal object
1777+
* all Strings are in `$.terminal.defaults.strings`
1778+
* more functions in `$.terminal` object
17741779

17751780
## 0.7.12
17761781
* fix terminal when start as invisible, rest property to parseCommand

Makefile

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -114,8 +114,6 @@ eslint:
114114
$(ESLINT) js/pipe.js
115115
$(ESLINT) js/autocomplete_menu.js
116116
$(ESLINT) js/echo_newline.js
117-
$(ESLINT) js/forms.js
118-
$(ESLINT) js/animation.js
119117

120118
skipped_tests:
121119
@! grep -E $(skip_re) __tests__/terminal.spec.js

README.md

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
<h1 align="center">
2-
<img src="https://github.com/jcubic/jquery.terminal/blob/master/assets/ascii_art.svg?raw=true&ver=2.39.0"
2+
<img src="https://github.com/jcubic/jquery.terminal/blob/devel/assets/ascii_art.svg?raw=true&ver=DEV"
33
alt="ASCII Art that represent text jQuery Terminal - JavaScript Library for Web Based Terminal Emulators" />
44
</h1>
55

66
[JavaScript Library for Web Based Terminal Emulators](https://terminal.jcubic.pl)
77

8-
[![npm](https://img.shields.io/badge/npm-2.39.0-blue.svg)](https://www.npmjs.com/package/jquery.terminal)
9-
![bower](https://img.shields.io/badge/bower-2.39.0-yellow.svg)
10-
[![Build and test](https://github.com/jcubic/jquery.terminal/actions/workflows/build.yaml/badge.svg?branch=master&event=push)](https://github.com/jcubic/jquery.terminal/actions/workflows/build.yaml)
11-
[![Coverage Status](https://coveralls.io/repos/github/jcubic/jquery.terminal/badge.svg?branch=master&998c1c8b8a57dd88c9cf5a40049e8bf2)](https://coveralls.io/github/jcubic/jquery.terminal?branch=master)
8+
[![npm](https://img.shields.io/badge/npm-DEV-blue.svg)](https://www.npmjs.com/package/jquery.terminal)
9+
![bower](https://img.shields.io/badge/bower-DEV-yellow.svg)
10+
[![Build and test](https://github.com/jcubic/jquery.terminal/actions/workflows/build.yaml/badge.svg?branch=devel&event=push)](https://github.com/jcubic/jquery.terminal/actions/workflows/build.yaml)
11+
[![Coverage Status](https://coveralls.io/repos/github/jcubic/jquery.terminal/badge.svg?branch=devel&998c1c8b8a57dd88c9cf5a40049e8bf2)](https://coveralls.io/github/jcubic/jquery.terminal?branch=devel)
1212
![NPM Downloads](https://img.shields.io/npm/dm/jquery.terminal.svg?style=flat)
1313
[![jsDelivr Downloads](https://data.jsdelivr.com/v1/package/npm/jquery.terminal/badge?style=rounded&n=1)](https://www.jsdelivr.com/package/npm/jquery.terminal)
1414
[![Paid Support](https://img.shields.io/badge/paid-support-354465.svg)](https://support.jcubic.pl/)
@@ -87,7 +87,7 @@ You can test current version at this URL:
8787

8888
or if it doesn't use latest version (because of jsDelivr cache) you can force it with this URL:
8989

90-
* [https://jcubic.github.io/jquery.terminal/?ver=2.39.0](https://jcubic.github.io/jquery.terminal/?ver=2.39.0)
90+
* [https://jcubic.github.io/jquery.terminal/?ver=DEV](https://jcubic.github.io/jquery.terminal/?ver=DEV)
9191

9292
And development version using:
9393

@@ -106,20 +106,20 @@ or use jsDelivr:
106106

107107
```
108108

109-
Then include js/jquery.terminal-2.39.0.min.js and css/jquery.terminal-2.39.0.min.css
109+
Then include js/jquery.terminal-DEV.min.js and css/jquery.terminal-DEV.min.css
110110

111111
You can grab the files from CDN:
112112

113113
```html
114-
<script src="https://cdnjs.cloudflare.com/ajax/libs/jquery.terminal/2.39.0/js/jquery.terminal.min.js"></script>
115-
<link href="https://cdnjs.cloudflare.com/ajax/libs/jquery.terminal/2.39.0/css/jquery.terminal.min.css" rel="stylesheet"/>
114+
<script src="https://cdnjs.cloudflare.com/ajax/libs/jquery.terminal/DEV/js/jquery.terminal.min.js"></script>
115+
<link href="https://cdnjs.cloudflare.com/ajax/libs/jquery.terminal/DEV/css/jquery.terminal.min.css" rel="stylesheet"/>
116116
```
117117

118118
or
119119

120120
```html
121-
<script src="https://cdn.jsdelivr.net/npm/jquery.terminal@2.39.0/js/jquery.terminal.min.js"></script>
122-
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/jquery.terminal@2.39.0/css/jquery.terminal.min.css"/>
121+
<script src="https://cdn.jsdelivr.net/npm/jquery.terminal@DEV/js/jquery.terminal.min.js"></script>
122+
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/jquery.terminal@DEV/css/jquery.terminal.min.css"/>
123123
```
124124

125125
If you always want latest version, you can get it from [unpkg](https://unpkg.com/) without specifying version,

css/emoji.css

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

css/jquery.terminal-2.39.0.css

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,15 @@
44
* __ / // // // // // _ // _// // / / // _ // _// // // \/ // _ \/ /
55
* / / // // // // // ___// / / // / / // ___// / / / / // // /\ // // / /__
66
* \___//____ \\___//____//_/ _\_ / /_//____//_/ /_/ /_//_//_/ /_/ \__\_\___/
7-
* \/ /____/ version 2.39.0
7+
* \/ /____/ version DEV
88
* http://terminal.jcubic.pl
99
*
1010
* This file is part of jQuery Terminal.
1111
*
1212
* Copyright (c) 2011-2023 Jakub T. Jankiewicz <https://jcubic.pl/me>
1313
* Released under the MIT license
1414
*
15-
* Date: Tue, 13 Feb 2024 21:18:13 +0000
15+
* Date: Tue, 19 Mar 2024 18:45:14 +0000
1616
*/
1717
.terminal .terminal-output .format, .cmd .format,
1818
.cmd-prompt, .cmd-prompt div {
@@ -36,6 +36,7 @@
3636
outline: none !important;
3737
padding: 0 !important;
3838
resize: none !important;
39+
box-shadow: none !important;
3940
z-index: 1000 !important;
4041
overflow: hidden !important;
4142
white-space: pre !important;
@@ -100,6 +101,11 @@ body.terminal, body.full-screen-terminal {
100101
body.full-screen-terminal .terminal {
101102
height: 100%;
102103
}
104+
body.full-screen-terminal {
105+
height: 100%;
106+
height: 100dvh;
107+
height: calc(var(--terminal-force-height) * 1px);
108+
}
103109
.terminal > div.terminal-fill {
104110
min-height: 100%;
105111
height: 100%;
@@ -1115,16 +1121,15 @@ terminal .terminal-output > div {
11151121
}
11161122
.cmd-editable {
11171123
position: absolute;
1118-
top: 0;
1119-
top: calc(var(--terminal-y, var(--cmd-y, 0)) + var(--terminal-scroll, 0) * 1px);
1124+
top: calc(var(--cmd-top) * 1px);
1125+
bottom: 0;
11201126
right: 0;
11211127
left: 0;
1122-
bottom: 0;
1123-
bottom: calc(var(--terminal-scroll, 0) * -1px);
11241128
z-index: 500;
11251129
color: transparent;
11261130
background: transparent;
11271131
opacity: 0.01;
1132+
outline: 0px solid transparent;
11281133
}
11291134
/* Scrollbar */
11301135
.terminal-scroller::-webkit-scrollbar {

0 commit comments

Comments
 (0)