Skip to content

Commit

Permalink
merge with devel
Browse files Browse the repository at this point in the history
  • Loading branch information
jcubic committed Mar 19, 2024
2 parents d70b1ed + 541da3a commit 60b277a
Show file tree
Hide file tree
Showing 18 changed files with 229 additions and 114 deletions.
41 changes: 23 additions & 18 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
## 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
* Add support for jQuery 4.0
Expand Down Expand Up @@ -108,7 +113,7 @@
* fix resolving promise from echo typing animation when previous command was async [#797](https://github.com/jcubic/jquery.terminal/issues/797)
* fix double exception in terminal::destroy
* fix double call to finalize function when echo DOM nodes
* fix $.terminal.substring [#792](https://github.com/jcubic/jquery.terminal/issues/792)
* fix `$.terminal.substring` [#792](https://github.com/jcubic/jquery.terminal/issues/792)

## 2.33.3
### Bugfix
Expand Down Expand Up @@ -749,7 +754,7 @@

## 2.3.0
### Features
* add experimental $.terminal.pipe function
* add experimental `$.terminal.pipe` function
* allow to return string from onPaste (not only a promise)
* 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)
* zoom page when using mousewheel + CTRL key (browser default) [#468](https://github.com/jcubic/jquery.terminal/issues/468)
Expand Down Expand Up @@ -847,7 +852,7 @@
* fix escape bracket in command line
* fix relative and absolute urls with default `anyLinks: false`
* fix android and iPhone issues [#443](https://github.com/jcubic/jquery.terminal/issues/443) [#414](https://github.com/jcubic/jquery.terminal/issues/414)
* fix ANSI escapes in unix_formatting [$444](https://github.com/jcubic/jquery.terminal/issues/444)
* fix ANSI escapes in unix_formatting [#444](https://github.com/jcubic/jquery.terminal/issues/444)
* fix jumping cursor when there are no text before cursor line in Chrome
* fix selection menu in latest Android
* fix wrong number of chars per line when insert called after init and scrollbar appear
Expand Down Expand Up @@ -911,7 +916,7 @@
* embed emoji regex by Mathias Bynens for better emoji detection
* allow to execute extended commands including terminal and cmd methods from formatters
* support for true colors (24bit) in unix formatting [#433](https://github.com/jcubic/jquery.terminal/issues/433)
* expose split_characters in $.terminal namespace
* expose split_characters in `$.terminal` namespace
* cmd commands option functions to have cmd as this context

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

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

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

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

## 1.16.0

Expand All @@ -1068,8 +1073,8 @@

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

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

## 0.7.12
* fix terminal when start as invisible, rest property to parseCommand
Expand Down
2 changes: 0 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -114,8 +114,6 @@ eslint:
$(ESLINT) js/pipe.js
$(ESLINT) js/autocomplete_menu.js
$(ESLINT) js/echo_newline.js
$(ESLINT) js/forms.js
$(ESLINT) js/animation.js

skipped_tests:
@! grep -E $(skip_re) __tests__/terminal.spec.js
Expand Down
22 changes: 11 additions & 11 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
<h1 align="center">
<img src="https://github.com/jcubic/jquery.terminal/blob/master/assets/ascii_art.svg?raw=true&ver=2.39.0"
<img src="https://github.com/jcubic/jquery.terminal/blob/devel/assets/ascii_art.svg?raw=true&ver=DEV"
alt="ASCII Art that represent text jQuery Terminal - JavaScript Library for Web Based Terminal Emulators" />
</h1>

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

[![npm](https://img.shields.io/badge/npm-2.39.0-blue.svg)](https://www.npmjs.com/package/jquery.terminal)
![bower](https://img.shields.io/badge/bower-2.39.0-yellow.svg)
[![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)
[![Coverage Status](https://coveralls.io/repos/github/jcubic/jquery.terminal/badge.svg?branch=master&998c1c8b8a57dd88c9cf5a40049e8bf2)](https://coveralls.io/github/jcubic/jquery.terminal?branch=master)
[![npm](https://img.shields.io/badge/npm-DEV-blue.svg)](https://www.npmjs.com/package/jquery.terminal)
![bower](https://img.shields.io/badge/bower-DEV-yellow.svg)
[![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)
[![Coverage Status](https://coveralls.io/repos/github/jcubic/jquery.terminal/badge.svg?branch=devel&998c1c8b8a57dd88c9cf5a40049e8bf2)](https://coveralls.io/github/jcubic/jquery.terminal?branch=devel)
![NPM Downloads](https://img.shields.io/npm/dm/jquery.terminal.svg?style=flat)
[![jsDelivr Downloads](https://data.jsdelivr.com/v1/package/npm/jquery.terminal/badge?style=rounded&n=1)](https://www.jsdelivr.com/package/npm/jquery.terminal)
[![Paid Support](https://img.shields.io/badge/paid-support-354465.svg)](https://support.jcubic.pl/)
Expand Down Expand Up @@ -87,7 +87,7 @@ You can test current version at this URL:

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

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

And development version using:

Expand All @@ -106,20 +106,20 @@ or use jsDelivr:

```

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

You can grab the files from CDN:

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

or

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

If you always want latest version, you can get it from [unpkg](https://unpkg.com/) without specifying version,
Expand Down
2 changes: 1 addition & 1 deletion css/emoji.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

17 changes: 11 additions & 6 deletions css/jquery.terminal-2.39.0.css
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,15 @@
* __ / // // // // // _ // _// // / / // _ // _// // // \/ // _ \/ /
* / / // // // // // ___// / / // / / // ___// / / / / // // /\ // // / /__
* \___//____ \\___//____//_/ _\_ / /_//____//_/ /_/ /_//_//_/ /_/ \__\_\___/
* \/ /____/ version 2.39.0
* \/ /____/ version DEV
* http://terminal.jcubic.pl
*
* This file is part of jQuery Terminal.
*
* Copyright (c) 2011-2023 Jakub T. Jankiewicz <https://jcubic.pl/me>
* Released under the MIT license
*
* Date: Tue, 13 Feb 2024 21:18:13 +0000
* Date: Tue, 19 Mar 2024 18:45:14 +0000
*/
.terminal .terminal-output .format, .cmd .format,
.cmd-prompt, .cmd-prompt div {
Expand All @@ -36,6 +36,7 @@
outline: none !important;
padding: 0 !important;
resize: none !important;
box-shadow: none !important;
z-index: 1000 !important;
overflow: hidden !important;
white-space: pre !important;
Expand Down Expand Up @@ -100,6 +101,11 @@ body.terminal, body.full-screen-terminal {
body.full-screen-terminal .terminal {
height: 100%;
}
body.full-screen-terminal {
height: 100%;
height: 100dvh;
height: calc(var(--terminal-force-height) * 1px);
}
.terminal > div.terminal-fill {
min-height: 100%;
height: 100%;
Expand Down Expand Up @@ -1115,16 +1121,15 @@ terminal .terminal-output > div {
}
.cmd-editable {
position: absolute;
top: 0;
top: calc(var(--terminal-y, var(--cmd-y, 0)) + var(--terminal-scroll, 0) * 1px);
top: calc(var(--cmd-top) * 1px);
bottom: 0;
right: 0;
left: 0;
bottom: 0;
bottom: calc(var(--terminal-scroll, 0) * -1px);
z-index: 500;
color: transparent;
background: transparent;
opacity: 0.01;
outline: 0px solid transparent;
}
/* Scrollbar */
.terminal-scroller::-webkit-scrollbar {
Expand Down

0 comments on commit 60b277a

Please sign in to comment.