Skip to content

Commit 9fb8bd2

Browse files
committedMar 18, 2019
fix async exec + no system.describe + fix option describe == false #475
1 parent a3a4339 commit 9fb8bd2

7 files changed

+16
-15
lines changed
 

‎CHANGELOG.md

+1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
### Bugfix
33
* fix selecting whole text of single .cmd line
44
* fix double call of async prompt with async interpreter [#474](https://github.com/jcubic/jquery.terminal/issues/474)
5+
* fix async + RPC + exec + no system.describe [#475](https://github.com/jcubic/jquery.terminal/issues/475)
56

67
## 2.2.0
78
### Features

‎js/jquery.terminal-2.2.0.js

+4-4
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
* emoji regex v7.0.1 by Mathias Bynens
3636
* MIT license
3737
*
38-
* Date: Sat, 16 Mar 2019 14:41:43 +0000
38+
* Date: Mon, 18 Mar 2019 12:39:13 +0000
3939
*/
4040
/* global location, setTimeout, window, global, sprintf, setImmediate,
4141
IntersectionObserver, ResizeObserver, module, require, define,
@@ -3463,7 +3463,7 @@
34633463
// -------------------------------------------------------------------------
34643464
$.terminal = {
34653465
version: 'DEV',
3466-
date: 'Sat, 16 Mar 2019 14:41:43 +0000',
3466+
date: 'Mon, 18 Mar 2019 12:39:13 +0000',
34673467
// colors from https://www.w3.org/wiki/CSS/Properties/color/keywords
34683468
color_names: [
34693469
'transparent', 'currentcolor', 'black', 'silver', 'gray', 'white',
@@ -5332,7 +5332,7 @@
53325332
var procs = response;
53335333
// we check if it's false before we call this function but
53345334
// it don't hurt to be explicit here
5335-
if (settings.describe !== '') {
5335+
if (settings.describe !== false && settings.describe !== '') {
53365336
settings.describe.split('.').forEach(function(field) {
53375337
procs = procs[field];
53385338
});
@@ -5504,7 +5504,7 @@
55045504
});
55055505
});
55065506
} else if (type === 'string') {
5507-
if (settings.ignoreSystemDescribe) {
5507+
if (settings.describe === false) {
55085508
object = {
55095509
interpreter: make_basic_json_rpc(user_intrp, login)
55105510
};

‎js/jquery.terminal-2.2.0.min.js

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

‎js/jquery.terminal-src.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -5332,7 +5332,7 @@
53325332
var procs = response;
53335333
// we check if it's false before we call this function but
53345334
// it don't hurt to be explicit here
5335-
if (settings.describe !== '') {
5335+
if (settings.describe !== false && settings.describe !== '') {
53365336
settings.describe.split('.').forEach(function(field) {
53375337
procs = procs[field];
53385338
});
@@ -5504,7 +5504,7 @@
55045504
});
55055505
});
55065506
} else if (type === 'string') {
5507-
if (settings.ignoreSystemDescribe) {
5507+
if (settings.describe === false) {
55085508
object = {
55095509
interpreter: make_basic_json_rpc(user_intrp, login)
55105510
};

‎js/jquery.terminal.js

+4-4
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
* emoji regex v7.0.1 by Mathias Bynens
3636
* MIT license
3737
*
38-
* Date: Sat, 16 Mar 2019 14:41:43 +0000
38+
* Date: Mon, 18 Mar 2019 12:39:13 +0000
3939
*/
4040
/* global location, setTimeout, window, global, sprintf, setImmediate,
4141
IntersectionObserver, ResizeObserver, module, require, define,
@@ -3463,7 +3463,7 @@
34633463
// -------------------------------------------------------------------------
34643464
$.terminal = {
34653465
version: 'DEV',
3466-
date: 'Sat, 16 Mar 2019 14:41:43 +0000',
3466+
date: 'Mon, 18 Mar 2019 12:39:13 +0000',
34673467
// colors from https://www.w3.org/wiki/CSS/Properties/color/keywords
34683468
color_names: [
34693469
'transparent', 'currentcolor', 'black', 'silver', 'gray', 'white',
@@ -5332,7 +5332,7 @@
53325332
var procs = response;
53335333
// we check if it's false before we call this function but
53345334
// it don't hurt to be explicit here
5335-
if (settings.describe !== '') {
5335+
if (settings.describe !== false && settings.describe !== '') {
53365336
settings.describe.split('.').forEach(function(field) {
53375337
procs = procs[field];
53385338
});
@@ -5504,7 +5504,7 @@
55045504
});
55055505
});
55065506
} else if (type === 'string') {
5507-
if (settings.ignoreSystemDescribe) {
5507+
if (settings.describe === false) {
55085508
object = {
55095509
interpreter: make_basic_json_rpc(user_intrp, login)
55105510
};

‎js/jquery.terminal.min.js

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

‎js/jquery.terminal.min.js.map

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

0 commit comments

Comments
 (0)
Please sign in to comment.