danoniplus 32.7.6 → 32.7.7
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 +14 -13
- 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 : 2023/
|
|
7
|
+
* Revised : 2023/11/05
|
|
8
8
|
*
|
|
9
9
|
* https://github.com/cwtickle/danoniplus
|
|
10
10
|
*/
|
|
11
|
-
const g_version = `Ver 32.7.
|
|
12
|
-
const g_revisedDate = `2023/
|
|
11
|
+
const g_version = `Ver 32.7.7`;
|
|
12
|
+
const g_revisedDate = `2023/11/05`;
|
|
13
13
|
|
|
14
14
|
// カスタム用バージョン (danoni_custom.js 等で指定可)
|
|
15
15
|
let g_localVersion = ``;
|
|
@@ -495,13 +495,14 @@ const nextPos = (_basePos, _num, _length) => (_basePos + _length + _num) % _leng
|
|
|
495
495
|
|
|
496
496
|
/**
|
|
497
497
|
* 特定キーコードを置換する処理
|
|
498
|
-
* @param {
|
|
498
|
+
* @param {object} _evt
|
|
499
499
|
*/
|
|
500
|
-
const transCode =
|
|
501
|
-
|
|
502
|
-
|
|
500
|
+
const transCode = _evt => {
|
|
501
|
+
const evtCode = _evt.code;
|
|
502
|
+
if (evtCode === `` && _evt.key === `Shift`) {
|
|
503
|
+
return `ShiftRight`;
|
|
503
504
|
}
|
|
504
|
-
return
|
|
505
|
+
return evtCode;
|
|
505
506
|
};
|
|
506
507
|
|
|
507
508
|
/**
|
|
@@ -526,7 +527,7 @@ const commonKeyDown = (_evt, _displayName, _func = _code => { }, _dfEvtFlg) => {
|
|
|
526
527
|
if (!_dfEvtFlg) {
|
|
527
528
|
_evt.preventDefault();
|
|
528
529
|
}
|
|
529
|
-
const setCode = _evt
|
|
530
|
+
const setCode = transCode(_evt);
|
|
530
531
|
if (_evt.repeat && (g_unrepeatObj.page.includes(_displayName) || g_unrepeatObj.key.includes(setCode))) {
|
|
531
532
|
return blockCode(setCode);
|
|
532
533
|
}
|
|
@@ -561,7 +562,7 @@ const commonKeyDown = (_evt, _displayName, _func = _code => { }, _dfEvtFlg) => {
|
|
|
561
562
|
const commonKeyUp = _evt => {
|
|
562
563
|
g_inputKeyBuffer[g_kCdNameObj.metaLKey] = false;
|
|
563
564
|
g_inputKeyBuffer[g_kCdNameObj.metaRKey] = false;
|
|
564
|
-
g_inputKeyBuffer[_evt
|
|
565
|
+
g_inputKeyBuffer[transCode(_evt)] = false;
|
|
565
566
|
};
|
|
566
567
|
|
|
567
568
|
/**
|
|
@@ -1315,7 +1316,7 @@ const resetKeyControl = _ => {
|
|
|
1315
1316
|
document.onkeyup = _ => { };
|
|
1316
1317
|
document.onkeydown = evt => {
|
|
1317
1318
|
evt.preventDefault();
|
|
1318
|
-
return blockCode(evt
|
|
1319
|
+
return blockCode(transCode(evt));
|
|
1319
1320
|
};
|
|
1320
1321
|
g_inputKeyBuffer = {};
|
|
1321
1322
|
};
|
|
@@ -8999,7 +9000,7 @@ const mainInit = _ => {
|
|
|
8999
9000
|
// キー操作イベント
|
|
9000
9001
|
document.onkeydown = evt => {
|
|
9001
9002
|
evt.preventDefault();
|
|
9002
|
-
const setCode = evt
|
|
9003
|
+
const setCode = transCode(evt);
|
|
9003
9004
|
|
|
9004
9005
|
if (evt.repeat && !g_mainRepeatObj.key.includes(setCode)) {
|
|
9005
9006
|
return blockCode(setCode);
|
|
@@ -9067,7 +9068,7 @@ const mainInit = _ => {
|
|
|
9067
9068
|
};
|
|
9068
9069
|
|
|
9069
9070
|
document.onkeyup = evt => {
|
|
9070
|
-
const setCode = evt
|
|
9071
|
+
const setCode = transCode(evt);
|
|
9071
9072
|
g_inputKeyBuffer[setCode] = false;
|
|
9072
9073
|
mainKeyUpActFunc[g_stateObj.autoAll]();
|
|
9073
9074
|
};
|