danoniplus 37.3.1 → 37.4.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/js/danoni_main.js +12 -6
- package/js/lib/danoni_constants.js +4 -1
- package/package.json +1 -1
package/js/danoni_main.js
CHANGED
|
@@ -4,12 +4,12 @@
|
|
|
4
4
|
*
|
|
5
5
|
* Source by tickle
|
|
6
6
|
* Created : 2018/10/08
|
|
7
|
-
* Revised : 2024/
|
|
7
|
+
* Revised : 2024/08/14
|
|
8
8
|
*
|
|
9
9
|
* https://github.com/cwtickle/danoniplus
|
|
10
10
|
*/
|
|
11
|
-
const g_version = `Ver 37.
|
|
12
|
-
const g_revisedDate = `2024/
|
|
11
|
+
const g_version = `Ver 37.4.0`;
|
|
12
|
+
const g_revisedDate = `2024/08/14`;
|
|
13
13
|
|
|
14
14
|
// カスタム用バージョン (danoni_custom.js 等で指定可)
|
|
15
15
|
let g_localVersion = ``;
|
|
@@ -475,8 +475,8 @@ const fuzzyListMatching = (_str, _headerList, _footerList) =>
|
|
|
475
475
|
* @param {array} _pairs
|
|
476
476
|
*/
|
|
477
477
|
const replaceStr = (_str, _pairs) => {
|
|
478
|
-
let tmpStr = _str
|
|
479
|
-
_pairs.forEach(pair => tmpStr = tmpStr
|
|
478
|
+
let tmpStr = _str || ``;
|
|
479
|
+
_pairs.forEach(pair => tmpStr = tmpStr.split(pair[0]).join(pair[1]));
|
|
480
480
|
return tmpStr;
|
|
481
481
|
};
|
|
482
482
|
|
|
@@ -493,11 +493,17 @@ const escapeHtml = (_str, _escapeList = g_escapeStr.escape) => escapeHtmlForEnab
|
|
|
493
493
|
*/
|
|
494
494
|
const escapeHtmlForEnabledTag = _str => replaceStr(_str, g_escapeStr.escapeTag);
|
|
495
495
|
|
|
496
|
+
/**
|
|
497
|
+
* HTML Entityから元の文字に戻す
|
|
498
|
+
* @param {string} _str
|
|
499
|
+
*/
|
|
500
|
+
const unEscapeEmoji = _str => _str?.replace(/&#(.*?);/g, (_, p1) => String.fromCodePoint(`0${p1}`));
|
|
501
|
+
|
|
496
502
|
/**
|
|
497
503
|
* エスケープ文字を元の文字に戻す
|
|
498
504
|
* @param {string} _str
|
|
499
505
|
*/
|
|
500
|
-
const unEscapeHtml = _str => replaceStr(_str, g_escapeStr.unEscapeTag);
|
|
506
|
+
const unEscapeHtml = _str => unEscapeEmoji(replaceStr(_str, g_escapeStr.unEscapeTag));
|
|
501
507
|
|
|
502
508
|
/**
|
|
503
509
|
* 配列の中身を全てエスケープ処理
|
|
@@ -5,7 +5,7 @@
|
|
|
5
5
|
*
|
|
6
6
|
* Source by tickle
|
|
7
7
|
* Created : 2019/11/19
|
|
8
|
-
* Revised : 2024/
|
|
8
|
+
* Revised : 2024/08/14 (v37.4.0)
|
|
9
9
|
*
|
|
10
10
|
* https://github.com/cwtickle/danoniplus
|
|
11
11
|
*/
|
|
@@ -1958,12 +1958,15 @@ const g_keyObj = {
|
|
|
1958
1958
|
color9B_2_0: [0, 0, 0, 0, 2, 1, 1, 1, 1],
|
|
1959
1959
|
|
|
1960
1960
|
// ColorGroup - 2
|
|
1961
|
+
color9A_0_1: [0, 0, 3, 0, 2, 0, 0, 3, 0],
|
|
1961
1962
|
color9B_0_1: [4, 3, 1, 0, 2, 0, 1, 3, 4],
|
|
1962
1963
|
color17_0_1: [0, 1, 0, 1, 0, 1, 0, 1, 2, 3, 4, 3, 4, 3, 4, 3, 4],
|
|
1963
1964
|
|
|
1965
|
+
color9B_1_1: [0, 0, 1, 0, 2, 0, 0, 1, 0],
|
|
1964
1966
|
color17_1_1: [1, 1, 1, 1, 2, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0],
|
|
1965
1967
|
|
|
1966
1968
|
color9A_2_1: [4, 1, 3, 0, 2, 0, 3, 1, 4],
|
|
1969
|
+
color9B_2_1: [0, 0, 1, 0, 2, 0, 0, 1, 0],
|
|
1967
1970
|
|
|
1968
1971
|
// ColorGroup - 3
|
|
1969
1972
|
color17_0_2: [1, 4, 0, 3, 1, 4, 0, 3, 2, 3, 0, 4, 1, 3, 0, 4, 1],
|