Skip to content

Commit 31d46fe

Browse files
committed
merge with devel
2 parents c4db4a2 + f538912 commit 31d46fe

39 files changed

+2602
-2598
lines changed

CHANGELOG.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,11 @@
1+
## 2.42.1
2+
### Bugfix
3+
* fix line wrapping when calling multiple echo `newline:false` [#952](https://github.com/jcubic/jquery.terminal/issues/952)
4+
* fix cursor position when echo `newline:false` fill the line
5+
* fix running typing animation on empty terminal [#950](https://github.com/jcubic/jquery.terminal/issues/950)
6+
* get rid of canvas warning from images in less [#955](https://github.com/jcubic/jquery.terminal/issues/955)
7+
* fix update with newline after echo without it [#954](https://github.com/jcubic/jquery.terminal/issues/954)
8+
19
## 2.42.0
210
### Features
311
* add reverse style to formatting and XML [#943](https://github.com/jcubic/jquery.terminal/issues/943)

LICENSE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
The MIT License (MIT)
22

3-
Copyright (c) 2011-2023 Jakub T. Jankiewicz
3+
Copyright (c) 2011-2024 Jakub T. Jankiewicz
44

55
Permission is hereby granted, free of charge, to any person obtaining a copy
66
of this software and associated documentation files (the "Software"), to deal

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ assets/ascii_art.svg: templates/ascii_art.svg .$(VERSION)
9595
$(SED) -e "s/{{VER}}/$(VERSION)/g" templates/ascii_art.svg > assets/ascii_art.svg
9696

9797
test-accept-snapshots:
98-
$(JEST) --coverage --env=jsdom --updateSnapshot --testMatch '**/__tests__/*.spec.js'
98+
$(JEST) --coverage --updateSnapshot
9999

100100
coveralls:
101101
$(CAT) ./coverage/lcov.info | ./node_modules/coveralls/bin/coveralls.js

README.md

Lines changed: 13 additions & 13 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.42.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.42.0-blue.svg)](https://www.npmjs.com/package/jquery.terminal)
9-
![bower](https://img.shields.io/badge/bower-2.42.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&8832f5d73ccc73e4fe752536d99609c2)](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&178e403b5b01bf07acdcbd8a0f64c147)](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.42.0](https://jcubic.github.io/jquery.terminal/?ver=2.42.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.42.0.min.js and css/jquery.terminal-2.42.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.42.0/js/jquery.terminal.min.js"></script>
115-
<link href="https://cdnjs.cloudflare.com/ajax/libs/jquery.terminal/2.42.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.42.0/js/jquery.terminal.min.js"></script>
122-
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/jquery.terminal@2.42.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,
@@ -401,10 +401,10 @@ You can request paid support, you can find details at [support.jcubic.pl](https:
401401

402402
### Star History
403403

404-
[![Star History Chart](https://api.star-history.com/svg?repos=jcubic/jquery.terminal&type=Date&branch=master)](https://star-history.com/#jcubic/jquery.terminal&Date)
404+
[![Star History Chart](https://api.star-history.com/svg?repos=jcubic/jquery.terminal&type=Date&branch=devel)](https://star-history.com/#jcubic/jquery.terminal&Date)
405405

406406
### License
407407

408408
Licensed under [MIT](http://opensource.org/licenses/MIT) license
409409

410-
Copyright (c) 2011-2023 [Jakub T. Jankiewicz](https://jcubic.pl/me)
410+
Copyright (c) 2011-2024 [Jakub T. Jankiewicz](https://jcubic.pl/me)

0 commit comments

Comments
 (0)