Skip to content

Commit da4b218

Browse files
jcubicjcubic
committed
Merge with devel
2 parents 4c128f2 + cdb469e commit da4b218

21 files changed

+1214
-656
lines changed

‎CHANGELOG.md‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,25 @@
1+
## Next
2+
### Features
3+
* update API method accept options 3rd argument
4+
* speed up refresh on resize by checking character size in font resizer (reported by @artursOs)
5+
* change command line num chars on resize + settings.numChars (reported by @artursOs [#353](https://github.com/jcubic/jquery.terminal/issues/353))
6+
* add remove api method that call update(line, null);
7+
* don't call scroll to bottom on resize/refresh/update/remove
8+
* improve scroll_element plugin by using document.scrollingElement if present and cache the value
9+
* resizer plugin use ResizeObserver if defined
10+
* remove fake call to finalize in echo to catch potential error
11+
* silent boolean 3rd argument to cmd::set and 2nd to terminal::set_command
12+
* handy classed to change cursor animation in IE
13+
### Bugs
14+
* don't prevent default scroll when terminal have no scrollbar
15+
* restart cursor animation on keydown (requested by @theMeow on chat)
16+
* don't redraw whole terminal in update api method
17+
* show exception from onAfterRedraw on terminal
18+
* don't show first argument to method in help command when login is used
19+
* allow to call disable/focus(false) from command + fix focus(false) with single terminal
20+
(reported by Eric Lindgren [#359](https://github.com/jcubic/jquery.terminal/issues/359))
21+
* fix autofocus on init
22+
123
## 1.10.1
224
* fix scroll to bottom on scrolling when terminal is disabled (reported by @RomanPerin [#355](https://github.com/jcubic/jquery.terminal/issues/355))
325

‎Makefile‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ Makefile: Makefile.in
5959
$(SED) -e "s/{{VER""SION}}/"$(VERSION)"/" Makefile.in > Makefile
6060

6161
import.html: import.in
62-
$(GIT) branch | grep '* devel' > /dev/null || $(SED) -e "s/{{VER}}/$(VERSION)/g" import.in > import.html
62+
$(SED) -e "s/{{BRANCH}}/$(BRANCH)/g" import.in > import.html
6363

6464
js/terminal.widget.js: js/terminal.widget.in
6565
$(GIT) branch | grep '* devel' > /dev/null || $(SED) -e "s/{{VER}}/$(VERSION)/g" js/terminal.widget.in > js/terminal.widget.js
@@ -79,6 +79,9 @@ cover:
7979
coveralls:
8080
$(ISTANBUL) cover node_modules/jasmine/bin/jasmine.js --captureExceptions; cat ./coverage/lcov.info | ./node_modules/.bin/coveralls -v
8181

82+
lint.src:
83+
$(ESLINT) js/jquery.terminal-src.js
84+
8285
eslint:
8386
$(ESLINT) js/jquery.terminal-src.js
8487
$(ESLINT) js/dterm.js

‎Makefile.in‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ Makefile: Makefile.in
5959
$(SED) -e "s/{{VER""SION}}/"$(VERSION)"/" Makefile.in > Makefile
6060

6161
import.html: import.in
62-
$(GIT) branch | grep '* devel' > /dev/null || $(SED) -e "s/{{VER}}/$(VERSION)/g" import.in > import.html
62+
$(SED) -e "s/{{BRANCH}}/$(BRANCH)/g" import.in > import.html
6363

6464
js/terminal.widget.js: js/terminal.widget.in
6565
$(GIT) branch | grep '* devel' > /dev/null || $(SED) -e "s/{{VER}}/$(VERSION)/g" js/terminal.widget.in > js/terminal.widget.js
@@ -79,6 +79,9 @@ cover:
7979
coveralls:
8080
$(ISTANBUL) cover node_modules/jasmine/bin/jasmine.js --captureExceptions; cat ./coverage/lcov.info | ./node_modules/.bin/coveralls -v
8181

82+
lint.src:
83+
$(ESLINT) js/jquery.terminal-src.js
84+
8285
eslint:
8386
$(ESLINT) js/jquery.terminal-src.js
8487
$(ESLINT) js/dterm.js

‎README.md‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,15 @@
44
__ / // // // // // _ // _// // / / // _ // _// // // \/ // _ \/ /
55
/ / // // // // // ___// / / // / / // ___// / / / / // // /\ // // / /__
66
\___//____ \\___//____//_/ _\_ / /_//____//_/ /_/ /_//_//_/ /_/ \__\_\___/
7-
\/ /____/ version 1.10.1
7+
\/ /____/ version DEV
88
```
99
http://terminal.jcubic.pl
1010

11-
[![npm](https://img.shields.io/badge/npm-1.10.1-blue.svg)](https://www.npmjs.com/package/jquery.terminal)
12-
![bower](https://img.shields.io/badge/bower-1.10.1-yellow.svg)
13-
[![travis](https://travis-ci.org/jcubic/jquery.terminal.svg?branch=master)](https://travis-ci.org/jcubic/jquery.terminal)
11+
[![npm](https://img.shields.io/badge/npm-DEV-blue.svg)](https://www.npmjs.com/package/jquery.terminal)
12+
![bower](https://img.shields.io/badge/bower-DEV-yellow.svg)
13+
[![travis](https://travis-ci.org/jcubic/jquery.terminal.svg?branch=devel)](https://travis-ci.org/jcubic/jquery.terminal)
1414
[![Known Vulnerabilities](https://snyk.io/test/npm/jquery.terminal/badge.svg)](https://snyk.io/test/npm/jquery.terminal)
15-
[![Coverage Status](https://coveralls.io/repos/github/jcubic/jquery.terminal/badge.svg?branch=master&da612e1d75fe037566e431fd381c135c)](https://coveralls.io/github/jcubic/jquery.terminal?branch=master)
15+
[![Coverage Status](https://coveralls.io/repos/github/jcubic/jquery.terminal/badge.svg?branch=devel&a5d5e31e60f437ec7098a886ab4bc6d8)](https://coveralls.io/github/jcubic/jquery.terminal?branch=devel)
1616
![downloads](https://img.shields.io/npm/dm/jquery.terminal.svg?style=flat)
1717
[![package quality](http://npm.packagequality.com/shield/jquery.terminal.svg)](http://packagequality.com/#?package=jquery.terminal)
1818

@@ -67,20 +67,20 @@ Include jQuery library, you can use cdn from http://jquery.com/download/
6767
```
6868

6969

70-
Then include js/jquery.terminal-1.10.1.min.js and css/jquery.terminal-1.10.1.min.css
70+
Then include js/jquery.terminal-DEV.min.js and css/jquery.terminal-DEV.min.css
7171

7272
You can grab the files from CDN:
7373

7474
```html
75-
<script src="https://cdnjs.cloudflare.com/ajax/libs/jquery.terminal/1.10.1/js/jquery.terminal.min.js"></script>
76-
<link href="https://cdnjs.cloudflare.com/ajax/libs/jquery.terminal/1.10.1/css/jquery.terminal.min.css" rel="stylesheet"/>
75+
<script src="https://cdnjs.cloudflare.com/ajax/libs/jquery.terminal/DEV/js/jquery.terminal.min.js"></script>
76+
<link href="https://cdnjs.cloudflare.com/ajax/libs/jquery.terminal/DEV/css/jquery.terminal.min.css" rel="stylesheet"/>
7777
```
7878

7979
or
8080

8181
```html
82-
<script src="https://cdn.jsdelivr.net/npm/jquery.terminal@1.10.1/js/jquery.terminal.min.js"></script>
83-
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/jquery.terminal@1.10.1/css/jquery.terminal.min.css">
82+
<script src="https://cdn.jsdelivr.net/npm/jquery.terminal@DEV/js/jquery.terminal.min.js"></script>
83+
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/jquery.terminal@DEV/css/jquery.terminal.min.css">
8484
```
8585

8686
**NOTE:** From version 1.0.0 if you want to support old browsers then you'll need to use [key event property polyfill](https://rawgit.com/inexorabletash/polyfill/master/keyboard.js). You can check the support for it on [can I use](https://caniuse.com/#feat=keyboardevent-key).

‎css/jquery.terminal-1.10.1.css‎

Lines changed: 28 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,15 @@
44
* __ / // // // // // _ // _// // / / // _ // _// // // \/ // _ \/ /
55
* / / // // // // // ___// / / // / / // ___// / / / / // // /\ // // / /__
66
* \___//____ \\___//____//_/ _\_ / /_//____//_/ /_/ /_//_//_/ /_/ \__\_\___/
7-
* \/ /____/ version 1.10.1
7+
* \/ /____/ version DEV
88
* http://terminal.jcubic.pl
99
*
1010
* This file is part of jQuery Terminal.
1111
*
1212
* Copyright (c) 2011-2017 Jakub Jankiewicz <http://jcubic.pl>
1313
* Released under the MIT license
1414
*
15-
* Date: Thu, 09 Nov 2017 16:40:29 +0000
15+
* Date: Sat, 09 Dec 2017 13:17:33 +0000
1616
*/
1717
.terminal .terminal-output .format, .cmd .format,
1818
.cmd .prompt, .cmd .prompt div, .terminal .terminal-output div div{
@@ -259,6 +259,14 @@ terminal .terminal-output > div {
259259
width: 100%;
260260
z-index: 1100;
261261
}
262+
.ui-dialog-content .terminal {
263+
width: 100%;
264+
height: 100%;
265+
box-sizing: border-box;
266+
}
267+
.ui-dialog-content .terminal, .ui-dialog-content .terminal .terminal-fill {
268+
padding: 0;
269+
}
262270
.clear {
263271
clear: both;
264272
}
@@ -433,11 +441,29 @@ terminal .terminal-output > div {
433441
margin-left: 0;
434442
}
435443
}
444+
/* shorthand classes for IE */
445+
.underline-animation .cursor.blink {
446+
border-left: none;
447+
-webkit-animation-name: terminal-underline;
448+
-moz-animation-name: terminal-underline;
449+
-ms-animation-name: terminal-underline;
450+
animation-name: terminal-underline;
451+
}
452+
.bar-animation .cursor.blink {
453+
-webkit-animation-name: terminal-bar;
454+
-moz-animation-name: terminal-bar;
455+
-ms-animation-name: terminal-bar;
456+
animation-name: terminal-bar;
457+
}
436458
@supports (--css: variables) {
437459
.terminal, .cmd {
438460
color: var(--color, #aaa);
439461
background-color: var(--background, #000);
440462
}
463+
.terminal .font {
464+
width: calc(var(--size) * 1em);
465+
height: calc(var(--size) * 1em);
466+
}
441467
.terminal span[style*="--length"] {
442468
width: calc(var(--length, 1) * var(--char-width) * 1px);
443469
display: inline-block;

‎css/jquery.terminal-1.10.1.min.css‎

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎css/jquery.terminal-src.css‎

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -259,6 +259,15 @@ terminal .terminal-output > div {
259259
width: 100%;
260260
z-index: 1100;
261261
}
262+
.ui-dialog-content .terminal {
263+
width: 100%;
264+
height: 100%;
265+
box-sizing: border-box;
266+
padding: 0;
267+
}
268+
.ui-dialog-content .terminal, .ui-dialog-content .terminal .terminal-fill {
269+
padding: 0;
270+
}
262271
.clear {
263272
clear: both;
264273
}
@@ -433,11 +442,29 @@ terminal .terminal-output > div {
433442
margin-left: 0;
434443
}
435444
}
445+
/* shorthand classes for IE */
446+
.underline-animation .cursor.blink {
447+
border-left: none;
448+
-webkit-animation-name: terminal-underline;
449+
-moz-animation-name: terminal-underline;
450+
-ms-animation-name: terminal-underline;
451+
animation-name: terminal-underline;
452+
}
453+
.bar-animation .cursor.blink {
454+
-webkit-animation-name: terminal-bar;
455+
-moz-animation-name: terminal-bar;
456+
-ms-animation-name: terminal-bar;
457+
animation-name: terminal-bar;
458+
}
436459
@supports (--css: variables) {
437460
.terminal, .cmd {
438461
color: var(--color, #aaa);
439462
background-color: var(--background, #000);
440463
}
464+
.terminal .font {
465+
width: calc(var(--size) * 1em);
466+
height: calc(var(--size) * 1em);
467+
}
441468
.terminal span[style*="--length"] {
442469
width: calc(var(--length, 1) * var(--char-width) * 1px);
443470
display: inline-block;

‎css/jquery.terminal.css‎

Lines changed: 28 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,15 @@
44
* __ / // // // // // _ // _// // / / // _ // _// // // \/ // _ \/ /
55
* / / // // // // // ___// / / // / / // ___// / / / / // // /\ // // / /__
66
* \___//____ \\___//____//_/ _\_ / /_//____//_/ /_/ /_//_//_/ /_/ \__\_\___/
7-
* \/ /____/ version 1.10.1
7+
* \/ /____/ version DEV
88
* http://terminal.jcubic.pl
99
*
1010
* This file is part of jQuery Terminal.
1111
*
1212
* Copyright (c) 2011-2017 Jakub Jankiewicz <http://jcubic.pl>
1313
* Released under the MIT license
1414
*
15-
* Date: Thu, 09 Nov 2017 16:40:29 +0000
15+
* Date: Sat, 09 Dec 2017 13:17:33 +0000
1616
*/
1717
.terminal .terminal-output .format, .cmd .format,
1818
.cmd .prompt, .cmd .prompt div, .terminal .terminal-output div div{
@@ -259,6 +259,14 @@ terminal .terminal-output > div {
259259
width: 100%;
260260
z-index: 1100;
261261
}
262+
.ui-dialog-content .terminal {
263+
width: 100%;
264+
height: 100%;
265+
box-sizing: border-box;
266+
}
267+
.ui-dialog-content .terminal, .ui-dialog-content .terminal .terminal-fill {
268+
padding: 0;
269+
}
262270
.clear {
263271
clear: both;
264272
}
@@ -433,11 +441,29 @@ terminal .terminal-output > div {
433441
margin-left: 0;
434442
}
435443
}
444+
/* shorthand classes for IE */
445+
.underline-animation .cursor.blink {
446+
border-left: none;
447+
-webkit-animation-name: terminal-underline;
448+
-moz-animation-name: terminal-underline;
449+
-ms-animation-name: terminal-underline;
450+
animation-name: terminal-underline;
451+
}
452+
.bar-animation .cursor.blink {
453+
-webkit-animation-name: terminal-bar;
454+
-moz-animation-name: terminal-bar;
455+
-ms-animation-name: terminal-bar;
456+
animation-name: terminal-bar;
457+
}
436458
@supports (--css: variables) {
437459
.terminal, .cmd {
438460
color: var(--color, #aaa);
439461
background-color: var(--background, #000);
440462
}
463+
.terminal .font {
464+
width: calc(var(--size) * 1em);
465+
height: calc(var(--size) * 1em);
466+
}
441467
.terminal span[style*="--length"] {
442468
width: calc(var(--length, 1) * var(--char-width) * 1px);
443469
display: inline-block;

0 commit comments

Comments
 (0)