Skip to content

Commit c66e0dd

Browse files
committed
fix async errors #546 + allow to return string from greetings function
1 parent d13b25e commit c66e0dd

16 files changed

+161
-107
lines changed

CHANGELOG.md

+5
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
## 2.9.1
2+
### Bugfix
3+
* fix throw/reject in async function/promise [#546](https://github.com/jcubic/jquery.terminal/issues/546)
4+
* allow to return string from greetings function
5+
16
## 2.9.0
27
### Features
38
* allow to return a promise from greetings function [#531](https://github.com/jcubic/jquery.terminal/issues/531)

README.md

+10-10
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,14 @@
44
__ / / // / // / _ / _/ // / / / _ / _/ / / \/ / _ \/ /
55
/ / / // / // / ___/ // // / / / ___/ // / / / / /\ / // / /__
66
\___/____ \\__/____/_/ \__ / /_/____/_//_/_/_/_/_/ \/\__\_\___/
7-
\/ /____/ version 2.9.0
7+
\/ /____/ version DEV
88
```
99
http://terminal.jcubic.pl
1010

11-
[![npm](https://img.shields.io/badge/npm-2.9.0-blue.svg)](https://www.npmjs.com/package/jquery.terminal)
12-
![bower](https://img.shields.io/badge/bower-2.9.0-yellow.svg)
13-
[![travis](https://travis-ci.org/jcubic/jquery.terminal.svg?branch=master&7feeda2bfddf6d43f58f50a44c8e490a0a3c1662)](https://travis-ci.org/jcubic/jquery.terminal)
14-
[![Coverage Status](https://coveralls.io/repos/github/jcubic/jquery.terminal/badge.svg?branch=master&c70d585dbba6db77c1f789398ddfea22)](https://coveralls.io/github/jcubic/jquery.terminal?branch=master)
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&d13b25e57fc08f1924494bf2d0f72edeb28de40d)](https://travis-ci.org/jcubic/jquery.terminal)
14+
[![Coverage Status](https://coveralls.io/repos/github/jcubic/jquery.terminal/badge.svg?branch=devel&4c15739bc87aafa1f51747c176dc5209)](https://coveralls.io/github/jcubic/jquery.terminal?branch=devel)
1515
![downloads](https://img.shields.io/npm/dm/jquery.terminal.svg?style=flat)
1616
[![package quality](http://npm.packagequality.com/shield/jquery.terminal.svg)](http://packagequality.com/#?package=jquery.terminal)
1717
[![](https://data.jsdelivr.com/v1/package/npm/jquery.terminal/badge?style=rounded)](https://www.jsdelivr.com/package/npm/jquery.terminal)
@@ -75,20 +75,20 @@ Include jQuery library, you can use cdn from https://jquery.com/download/
7575
```
7676

7777

78-
Then include js/jquery.terminal-2.9.0.min.js and css/jquery.terminal-2.9.0.min.css
78+
Then include js/jquery.terminal-DEV.min.js and css/jquery.terminal-DEV.min.css
7979

8080
You can grab the files from CDN:
8181

8282
```html
83-
<script src="https://cdnjs.cloudflare.com/ajax/libs/jquery.terminal/2.9.0/js/jquery.terminal.min.js"></script>
84-
<link href="https://cdnjs.cloudflare.com/ajax/libs/jquery.terminal/2.9.0/css/jquery.terminal.min.css" rel="stylesheet"/>
83+
<script src="https://cdnjs.cloudflare.com/ajax/libs/jquery.terminal/DEV/js/jquery.terminal.min.js"></script>
84+
<link href="https://cdnjs.cloudflare.com/ajax/libs/jquery.terminal/DEV/css/jquery.terminal.min.css" rel="stylesheet"/>
8585
```
8686

8787
or
8888

8989
```html
90-
<script src="https://cdn.jsdelivr.net/npm/jquery.terminal@2.9.0/js/jquery.terminal.min.js"></script>
91-
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/jquery.terminal@2.9.0/css/jquery.terminal.min.css">
90+
<script src="https://cdn.jsdelivr.net/npm/jquery.terminal@DEV/js/jquery.terminal.min.js"></script>
91+
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/jquery.terminal@DEV/css/jquery.terminal.min.css">
9292
```
9393

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

__tests__/terminal.spec.js

+3-1
Original file line numberDiff line numberDiff line change
@@ -2161,6 +2161,8 @@ describe('Terminal utils', function() {
21612161
var term = $('<div/>').terminal($.terminal.pipe({
21622162
output: function() {
21632163
this.echo('foo');
2164+
this.echo('bar');
2165+
this.echo('baz');
21642166
},
21652167
grep: function(re) {
21662168
return this.read('').then((str) => {
@@ -2180,7 +2182,7 @@ describe('Terminal utils', function() {
21802182
}));
21812183
return term.exec('output | grep /foo/').then(function() {
21822184
expect(get_lines(term)).toEqual(['foo']);
2183-
});
2185+
}).catch(e => console.log(e));
21842186
});
21852187
it('should escape pipe', async function() {
21862188
var term = $('<div/>').terminal($.terminal.pipe({

css/emoji.css

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

css/jquery.terminal-2.9.0.css

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,15 @@
44
* __ / // // // // // _ // _// // / / // _ // _// // // \/ // _ \/ /
55
* / / // // // // // ___// / / // / / // ___// / / / / // // /\ // // / /__
66
* \___//____ \\___//____//_/ _\_ / /_//____//_/ /_/ /_//_//_/ /_/ \__\_\___/
7-
* \/ /____/ version 2.9.0
7+
* \/ /____/ version DEV
88
* http://terminal.jcubic.pl
99
*
1010
* This file is part of jQuery Terminal.
1111
*
1212
* Copyright (c) 2011-2019 Jakub Jankiewicz <https://jcubic.pl/me>
1313
* Released under the MIT license
1414
*
15-
* Date: Sun, 24 Nov 2019 19:15:35 +0000
15+
* Date: Sun, 15 Dec 2019 14:42:04 +0000
1616
*/
1717
.terminal .terminal-output .format, .cmd .format,
1818
.cmd-prompt, .cmd-prompt div {

0 commit comments

Comments
 (0)