Merge pull request #1082 from cwtickle/develop

[ver22.3.2] シャッフルグループ番号の一時変更、9A/11ikeyのシャッフルグループ追加　他
cwtickle · May 13, 2021 · 2ea37e5 · 2ea37e5
2 parents dd18dae + dc17e80
commit 2ea37e5
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 15 deletions.
diff --git a/SECURITY.md b/SECURITY.md
@@ -15,7 +15,7 @@ v14, 20の対応終了時期はv23リリース開始時を予定しています
 
 | Version | Supported          | Latest Version | First Release | End of Support |
 | ------- | ------------------ |----------------|---------------|----------------|
-| v22     | :heavy_check_mark: |[v22.3.1](https://github.com/cwtickle/danoniplus/releases/tag/v22.3.1)          |2021-04-28|-|
+| v22     | :heavy_check_mark: |[v22.3.2](https://github.com/cwtickle/danoniplus/releases/tag/v22.3.2)          |2021-04-28|-|
 | v21     | :heavy_check_mark: |[v21.5.0](https://github.com/cwtickle/danoniplus/releases/tag/v21.5.0)          |2021-03-12|(At Release v24)|
 | v20     | :warning:          |[v20.5.3](https://github.com/cwtickle/danoniplus/releases/tag/v20.5.3)          |2021-02-12|(At Release v23)|
 | v19     | :heavy_check_mark: |[v19.5.7](https://github.com/cwtickle/danoniplus/releases/tag/v19.5.7)          |2021-01-17|-|

diff --git a/js/danoni_main.js b/js/danoni_main.js
@@ -4,12 +4,12 @@
  * 
  * Source by tickle
  * Created : 2018/10/08
- * Revised : 2021/05/12
+ * Revised : 2021/05/13
  * 
  * https://github.com/cwtickle/danoniplus
  */
-const g_version = `Ver 22.3.1`;
-const g_revisedDate = `2021/05/12`;
+const g_version = `Ver 22.3.2`;
+const g_revisedDate = `2021/05/13`;
 const g_alphaVersion = ``;
 
 // カスタム用バージョン (danoni_custom.js 等で指定可)
@@ -5370,17 +5370,15 @@ function keyConfigInit(_kcType = g_kcType) {
 	 * @param {number} _scrollNum 
 	 */
 	const changeTmpShuffleNum = (_j, _scrollNum = 1) => {
-		if (g_settings.shuffles.filter(val => val.endsWith(`+`)).length > 0) {
-			const baseKeyCtrlPtn = !g_stateObj.extraKeyFlg ? g_localKeyStorage.keyCtrlPtn : g_localStorage[`keyCtrlPtn${g_keyObj.currentKey}`];
-			const basePtn = `${g_keyObj.currentKey}_${baseKeyCtrlPtn}`;
+		const baseKeyCtrlPtn = !g_stateObj.extraKeyFlg ? g_localKeyStorage.keyCtrlPtn : g_localStorage[`keyCtrlPtn${g_keyObj.currentKey}`];
+		const basePtn = `${g_keyObj.currentKey}_${baseKeyCtrlPtn}`;
 
-			const tmpShuffle = nextPos(g_keyObj[`shuffle${keyCtrlPtn}`][_j], _scrollNum, 10);
-			document.getElementById(`sArrow${_j}`).textContent = tmpShuffle + 1;
-			g_keyObj[`shuffle${keyCtrlPtn}`][_j] = g_keyObj[`shuffle${basePtn}`][_j] = tmpShuffle;
-			if (g_keyObj[`shuffle${keyCtrlPtn}_1`] !== undefined) {
-				g_keyObj[`shuffle${keyCtrlPtn}_${g_keycons.shuffleGroupNum}`][_j] =
-					g_keyObj[`shuffle${basePtn}_${g_keycons.shuffleGroupNum}`][_j] = tmpShuffle;
-			}
+		const tmpShuffle = nextPos(g_keyObj[`shuffle${keyCtrlPtn}`][_j], _scrollNum, 10);
+		document.getElementById(`sArrow${_j}`).textContent = tmpShuffle + 1;
+		g_keyObj[`shuffle${keyCtrlPtn}`][_j] = g_keyObj[`shuffle${basePtn}`][_j] = tmpShuffle;
+		if (g_keyObj[`shuffle${keyCtrlPtn}_1`] !== undefined) {
+			g_keyObj[`shuffle${keyCtrlPtn}_${g_keycons.shuffleGroupNum}`][_j] =
+				g_keyObj[`shuffle${basePtn}_${g_keycons.shuffleGroupNum}`][_j] = tmpShuffle;
 		}
 	};
 
@@ -5416,6 +5414,7 @@ function keyConfigInit(_kcType = g_kcType) {
 			keyconSprite.appendChild(
 				createCss2Button(`sArrow${j}`, ``, _ => changeTmpShuffleNum(j), {
 					x: keyconX, y: keyconY - 12, w: C_ARW_WIDTH, h: 15, siz: 12, fontWeight: `bold`,
+					pointerEvents: (g_settings.shuffles.filter(val => val.endsWith(`+`)).length > 0 ? `auto` : `none`),
 					cxtFunc: _ => changeTmpShuffleNum(j, -1),
 				}, g_cssObj.button_Default_NoColor, g_cssObj.title_base)
 			);

diff --git a/js/lib/danoni_constants.js b/js/lib/danoni_constants.js
@@ -5,7 +5,7 @@
  *
  * Source by tickle
  * Created : 2019/11/19
- * Revised : 2021/05/12 (v22.3.1)
+ * Revised : 2021/05/13 (v22.3.2)
  *
  * https://github.com/cwtickle/danoniplus
  */