Skip to content

Commit

Permalink
fix deepscan issues #842
Browse files Browse the repository at this point in the history
  • Loading branch information
jcubic committed Jan 5, 2025
1 parent 441e7a2 commit 9d930ae
Show file tree
Hide file tree
Showing 5 changed files with 20 additions and 30 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
[![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&e31addf398172b261ad412bde3188469)](https://coveralls.io/github/jcubic/jquery.terminal?branch=devel)
[![Coverage Status](https://coveralls.io/repos/github/jcubic/jquery.terminal/badge.svg?branch=devel&ebc29d989f87a0ee59f902130a83c6a9)](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
19 changes: 7 additions & 12 deletions js/jquery.terminal-src.js
Original file line number Diff line number Diff line change
Expand Up @@ -6317,10 +6317,7 @@
var ret = formatter(input[0], options);
if (typeof ret === 'string') {
test_lengths(formatter, i - 1, ret, input[0]);
if (typeof ret === 'string') {
return [ret, options.position];
}
return input;
return [ret, options.position];
} else if (is_array(ret) && ret.length === 2) {
return ret;
} else {
Expand Down Expand Up @@ -7415,14 +7412,12 @@
'></div></div><div class="terminal-pixel"></div></div>')
.appendTo('body');
temp.addClass(term.attr('class')).attr('id', term.attr('id'));
if (term) {
var style = term.attr('style');
if (style) {
style = style.split(/\s*;\s*/).filter(function(s) {
return !s.match(/display\s*:\s*none/i);
}).join(';');
temp.attr('style', style);
}
var style = term.attr('style');
if (style) {
style = style.split(/\s*;\s*/).filter(function(s) {
return !s.match(/display\s*:\s*none/i);
}).join(';');
temp.attr('style', style);
}
var node = temp.find('.terminal-line');
result = {
Expand Down
23 changes: 9 additions & 14 deletions js/jquery.terminal.js
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
*
* broken image by Sophia Bai from the Noun Project (CC-BY)
*
* Date: Fri, 13 Dec 2024 15:04:35 +0000
* Date: Sun, 05 Jan 2025 16:45:09 +0000
*/
/* global define, Map, BigInt */
/* eslint-disable */
Expand Down Expand Up @@ -5407,7 +5407,7 @@
// -------------------------------------------------------------------------
$.terminal = {
version: 'DEV',
date: 'Fri, 13 Dec 2024 15:04:35 +0000',
date: 'Sun, 05 Jan 2025 16:45:09 +0000',
// colors from https://www.w3.org/wiki/CSS/Properties/color/keywords
color_names: [
'transparent', 'currentcolor', 'black', 'silver', 'gray', 'white',
Expand Down Expand Up @@ -6317,10 +6317,7 @@
var ret = formatter(input[0], options);
if (typeof ret === 'string') {
test_lengths(formatter, i - 1, ret, input[0]);
if (typeof ret === 'string') {
return [ret, options.position];
}
return input;
return [ret, options.position];
} else if (is_array(ret) && ret.length === 2) {
return ret;
} else {
Expand Down Expand Up @@ -7415,14 +7412,12 @@
'></div></div><div class="terminal-pixel"></div></div>')
.appendTo('body');
temp.addClass(term.attr('class')).attr('id', term.attr('id'));
if (term) {
var style = term.attr('style');
if (style) {
style = style.split(/\s*;\s*/).filter(function(s) {
return !s.match(/display\s*:\s*none/i);
}).join(';');
temp.attr('style', style);
}
var style = term.attr('style');
if (style) {
style = style.split(/\s*;\s*/).filter(function(s) {
return !s.match(/display\s*:\s*none/i);
}).join(';');
temp.attr('style', style);
}
var node = temp.find('.terminal-line');
result = {
Expand Down
4 changes: 2 additions & 2 deletions js/jquery.terminal.min.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion js/jquery.terminal.min.js.map

Large diffs are not rendered by default.

0 comments on commit 9d930ae

Please sign in to comment.