danoniplus 40.0.1 → 40.2.0

package/js/danoni_main.js

@@ -4,12 +4,12 @@
  * 
  * Source by tickle
  * Created : 2018/10/08
- * Revised : 2025/03/01
+ * Revised : 2025/03/07
  * 
  * https://github.com/cwtickle/danoniplus
  */
-const g_version = `Ver 40.0.1`;
-const g_revisedDate = `2025/03/01`;
+const g_version = `Ver 40.2.0`;
+const g_revisedDate = `2025/03/07`;
 
 // カスタム用バージョン (danoni_custom.js 等で指定可)
 let g_localVersion = ``;
@@ -37,13 +37,41 @@ const current = () => {
 	const targetScript = scripts.find(file => file.src.endsWith(`danoni_main.js`));
 	return targetScript.src;
 };
+
+/**
+ * 現在URLのクエリパラメータから指定した値を取得
+ * @param {string} _name
+ * @returns {string}
+ */
+const getQueryParamVal = _name => {
+	const param = new URL(location.href).searchParams.get(_name);
+	return param !== null ? decodeURIComponent(param.replace(/\+/g, ` `)) : null;
+};
+
+// 常時デバッグを許可するドメイン
+const g_reservedDomains = [
+	`danonicw.skr.jp`,
+	`tickle.cloudfree.jp`,
+];
+Object.freeze(g_reservedDomains);
+
+// 外部参照を許可するドメイン
+const g_referenceDomains = [
+	`cwtickle.github.io/danoniplus`,
+	`support-v\\d+--danoniplus.netlify.app`,
+];
+Object.freeze(g_referenceDomains);
+
 const g_rootPath = current().match(/(^.*\/)/)[0];
 const g_workPath = new URL(location.href).href.match(/(^.*\/)/)[0];
-const g_remoteFlg = g_rootPath.match(`^https://cwtickle.github.io/danoniplus/`) !== null ||
-	g_rootPath.match(/danoniplus.netlify.app/) !== null;
+const g_remoteFlg = g_referenceDomains.some(domain => g_rootPath.match(`^https://${domain}/`) !== null);
+
 const g_randTime = Date.now();
 const g_isFile = location.href.match(/^file/);
 const g_isLocal = location.href.match(/^file/) || location.href.indexOf(`localhost`) !== -1;
+const g_isDebug = g_isLocal ||
+	g_reservedDomains.some(domain => location.href.match(`^https://${domain}/`) !== null) ||
+	getQueryParamVal(`debug`) === `true`;
 const isLocalMusicFile = _scoreId => g_isFile && !listMatching(getMusicUrl(_scoreId), [`.js`, `.txt`], { suffix: `$` });
 
 window.onload = async () => {
@@ -468,44 +496,53 @@ const viewKeyStorage = (_name, _key = ``) => {
  * オブジェクトのネスト表示処理
  * @param {Object} _obj 
  * @param {Number} _indent 
- * @param {WeakSet} [seen=new WeakSet()]
- * @param {boolean} [colorFmt=true]
- * @param {string} [key='']
+ * @param {boolean} [colorFmt=true] フォーマット加工フラグ
+ * @param {string} [rootKey=''] オブジェクトの最上位プロパティ名
  * @param {Object} [_parent=null]
  * @returns {string}
  */
-const formatObject = (_obj, _indent = 0, { seen = new WeakSet(), colorFmt = true, key = `` } = {}, _parent = null) => {
+const formatObject = (_obj, _indent = 0, { colorFmt = true, rootKey = `` } = {}) => {
 	if (_obj === null || typeof _obj !== 'object') {
 		return JSON.stringify(_obj);
 	}
-	if (seen.has(_obj)) {
-		return '[Circular]';
-	}
-	seen.add(_obj);
 	const baseIndent = getIndent(_indent);
 	const nestedIndent = getIndent(_indent + 1);
 
-	// カラーコード、対応キーの色付け処理
-	const colorCodePattern = /(#|0x)(?:[A-Fa-f0-9]{6}(?:[A-Fa-f0-9]{2})?|[A-Fa-f0-9]{4}|[A-Fa-f0-9]{3})/g;
-	const formatValue = (_value, _parent) => {
+	/**
+	 * データの装飾処理
+	 * @param {string|boolean|number|Object} _value 
+	 * @param {string} _rootKey
+	 * @returns {string}
+	 */
+	const formatValue = (_value, _rootKey) => {
 		if (colorFmt) {
-			if (typeof _value === 'string') {
-				_value = escapeHtml(_value);
+			if (typeof _value === C_TYP_STRING) {
+
+				// カラーコードの色付け処理
+				_value = escapeHtml(_value).replaceAll(`\n`, `<br>`);
+				const colorCodePattern = /(#|0x)(?:[A-Fa-f0-9]{6}(?:[A-Fa-f0-9]{2})?|[A-Fa-f0-9]{4}|[A-Fa-f0-9]{3})/g;
 				if (colorCodePattern.test(_value)) {
 					return _value.replace(colorCodePattern, (match) =>
 						`<span style="color:${match.replace(`0x`, `#`)}">◆</span>${match.replace(`0x`, `#`)}`);
 				}
-			}
-			if (Array.isArray(_value)) {
-				let formattedArray = _value.map(item => formatValue(item, _value));
-				if (key.startsWith(`keyCtrl`)) {
-					formattedArray = formattedArray.filter(item => item !== `0`)
-						.map(item => g_kCd[item] ? `${item}|<span style="color:#ffff66">${g_kCd[item]}</span>` : item);
+			} else if (typeof _value === C_TYP_BOOLEAN) {
+
+				// boolean値の色付け処理
+				return (_value ? `<span style="color:#66ff66">&#x2714; true</span>` :
+					`<span style="color:#ff9999">&#x274c; false</span>`);
+
+			} else if (typeof _value === C_TYP_NUMBER) {
+
+				if (_rootKey.startsWith(`scrollDir`)) {
+					// scrollDirXのスクロール方向表示処理
+					return _value === 1 ? `1|<span style="color:#ff9999">↑</span>` : `-1|<span style="color:#66ff66">↓</span>`;
+
+				} else if (_rootKey.startsWith(`keyCtrl`) && !_rootKey.startsWith(`keyCtrlPtn`)) {
+					// keyCtrlXの対応キー表示処理
+					return (g_kCd[_value] && _value !== 0) ? `${_value}|<span style="color:#ffff66">${g_kCd[_value]}</span>` : `----`;
 				}
-				return `[${formattedArray.join(`, `)}]`;
-			}
-			if (typeof _value === 'object' && _value !== null) {
-				return formatObject(_value, _indent + 1, { seen, colorFmt, key }, _parent);
+			} else if (typeof _value === C_TYP_OBJECT && _value !== null) {
+				return formatObject(_value, _indent + 1, { colorFmt, rootKey: _rootKey });
 			}
 		}
 		return JSON.stringify(_value);
@@ -519,7 +556,7 @@ const formatObject = (_obj, _indent = 0, { seen = new WeakSet(), colorFmt = true
 		if (colorFmt && _obj.length > 100) {
 			const filteredArray = _obj.reduce((result, value, index) => {
 				if (hasVal(value)) {
-					result.push(`${index}: ${formatValue(value, _obj)}`);
+					result.push(`${index}: ${formatValue(value, rootKey)}`);
 				}
 				return result;
 			}, []);
@@ -530,11 +567,11 @@ const formatObject = (_obj, _indent = 0, { seen = new WeakSet(), colorFmt = true
 			.map(value => {
 				const isNestedObject = typeof value === 'object' && value !== null;
 				return isArrayOfArrays
-					? `${nestedIndent}${formatValue(value, _obj)}`
+					? `${nestedIndent}${formatValue(value, rootKey)}`
 					: isNestedObject
-						? formatObject(value, _indent + 1, { seen, colorFmt }, _obj)
-						: formatValue(value, _obj)
-			}).join(isArrayOfArrays ? `,<br>` : `, `);
+						? formatObject(value, _indent + 1, { colorFmt, rootKey })
+						: formatValue(value, rootKey)
+			}).filter(val => !hasVal(val) || val !== `----`).join(isArrayOfArrays ? `,<br>` : `, `);
 
 		return `[${isArrayOfArrays ? `<br>` : ``}${formattedArray}${isArrayOfArrays ? `<br>${baseIndent}` : ''}]`;
 	}
@@ -543,12 +580,12 @@ const formatObject = (_obj, _indent = 0, { seen = new WeakSet(), colorFmt = true
 	const formattedEntries = Object.entries(_obj)
 		.map(([key, value]) => {
 			const isNestedObject = typeof value === 'object' && value !== null;
-			const seenNew = _parent ? seen : new WeakSet();
+			const baseKey = rootKey === `` ? key : rootKey;
 			const formattedValue = isNestedObject
-				? formatObject(value, _indent + 1, { seen: seenNew, colorFmt, key }, _obj)
-				: formatValue(value, _obj);
+				? formatObject(value, _indent + 1, { colorFmt, rootKey: baseKey }, _obj)
+				: formatValue(value, baseKey);
 			return `<br>${nestedIndent}"${key}": ${formattedValue}`;
-		}).join(`,`);
+		}).filter(val => !hasVal(val) || val !== `----`).join(`,`);
 
 	let result = `{${formattedEntries}<br>${baseIndent}}`;
 	if (!colorFmt) {
@@ -825,14 +862,17 @@ const createScText = (_obj, _settingLabel, { displayName = `option`, dfLabel = `
  * 各画面の汎用ショートカットキー表示
  * @param {string} _displayName 
  */
-const createScTextCommon = _displayName =>
-	Object.keys(g_btnPatterns[_displayName]).filter(target => document.getElementById(`btn${target}`) !== null)
-		.forEach(target =>
-			createScText(document.getElementById(`btn${target}`), target, {
-				displayName: _displayName, targetLabel: `btn${target}`,
-				dfLabel: g_lblNameObj[`sc_${_displayName}${target}`] ?? ``,
-				x: g_btnPatterns[_displayName][target],
-			}));
+const createScTextCommon = _displayName => {
+	if (g_btnPatterns[_displayName]) {
+		Object.keys(g_btnPatterns[_displayName]).filter(target => document.getElementById(`btn${target}`) !== null)
+			.forEach(target =>
+				createScText(document.getElementById(`btn${target}`), target, {
+					displayName: _displayName, targetLabel: `btn${target}`,
+					dfLabel: g_lblNameObj[`sc_${_displayName}${target}`] ?? ``,
+					x: g_btnPatterns[_displayName][target],
+				}));
+	}
+};
 
 /**
  * ショートカットキー有効化
@@ -849,7 +889,9 @@ const setShortcutEvent = (_displayName, _func = () => true, { displayFlg = true,
 		document.onkeydown = evt => commonKeyDown(evt, _displayName, _func, dfEvtFlg);
 		document.onkeyup = evt => commonKeyUp(evt);
 	};
-	if (g_initialFlg && g_btnWaitFrame[_displayName].initial) {
+	if (!g_btnWaitFrame[_displayName] ||
+		g_btnWaitFrame[_displayName].s_frame === 0 ||
+		(g_initialFlg && g_btnWaitFrame[_displayName].initial)) {
 		evList();
 	} else {
 		setTimeout(() => {
@@ -1588,7 +1630,9 @@ const createCss2Button = (_id, _text, _func = () => true, {
 
 	// ボタン有効化操作
 	if (initDisabledFlg) {
-		if (g_initialFlg && g_btnWaitFrame[groupName].initial) {
+		if (!g_btnWaitFrame[groupName] ||
+			g_btnWaitFrame[groupName].b_frame === 0 ||
+			(g_initialFlg && g_btnWaitFrame[groupName].initial)) {
 		} else {
 			style.pointerEvents = C_DIS_NONE;
 			setTimeout(() => style.pointerEvents = rest.pointerEvents ?? C_DIS_AUTO,
@@ -2263,16 +2307,6 @@ const copyTextToClipboard = async (_textVal, _msg) => {
 	}
 };
 
-/**
- * 現在URLのクエリパラメータから指定した値を取得
- * @param {string} _name
- * @returns {string}
- */
-const getQueryParamVal = _name => {
-	const param = new URL(location.href).searchParams.get(_name);
-	return param !== null ? decodeURIComponent(param.replace(/\+/g, ` `)) : null;
-};
-
 /**
  * ローディング文字用ラベルの作成
  * @returns {HTMLDivElement}
@@ -5005,7 +5039,7 @@ const dataMgtInit = () => {
 	multiAppend(divRoot,
 		createCss2Button(`btnBack`, g_lblNameObj.b_back, () => true,
 			Object.assign(g_lblPosObj.btnResetBack, {
-				resetFunc: () => prevPage === `title` ? titleInit() : g_moveSettingWindow(false),
+				resetFunc: () => [`title`, `precondition`].includes(prevPage) ? titleInit() : g_moveSettingWindow(false),
 			}), g_cssObj.button_Back),
 
 		createCss2Button(`btnPrecond`, g_lblNameObj.b_precond, () => true,
@@ -5160,6 +5194,12 @@ const preconditionInit = () => {
 	g_customJsObj.precondition.forEach(func => func());
 
 	multiAppend(divRoot,
+
+		// データ管理画面へ移動
+		createCss2Button(`btnReset`, g_lblNameObj.dataReset, () => {
+			dataMgtInit();
+		}, g_lblPosObj.btnReset, g_cssObj.button_Reset),
+
 		createCss2Button(`btnBack`, g_lblNameObj.b_back, () => true,
 			Object.assign(g_lblPosObj.btnPrecond, {
 				resetFunc: () => {
@@ -6853,7 +6893,8 @@ const getKeyCtrl = (_localStorage, _extraKeyName = ``) => {
 		const isUpdate = prevPtn !== -1 && g_keyObj.prevKey !== g_keyObj.currentKey;
 		g_keyCopyLists.multiple.filter(header => g_keyObj[`${header}${basePtn}`] !== undefined && isUpdate)
 			.forEach(header => g_keyObj[`${header}${copyPtn}`] = structuredClone(g_keyObj[`${header}${basePtn}`]));
-		g_keyCopyLists.simple.forEach(header => g_keyObj[`${header}${copyPtn}`] = g_keyObj[`${header}${basePtn}`]);
+		g_keyCopyLists.simple.filter(header => g_keyObj[`${header}${basePtn}`] !== undefined && isUpdate)
+			.forEach(header => g_keyObj[`${header}${copyPtn}`] = g_keyObj[`${header}${basePtn}`]);
 
 		g_keycons.groups.forEach(type => {
 			let maxPtn = 0;
@@ -10791,8 +10832,8 @@ const mainInit = () => {
 		[`lblCredit`, `lblDifName`].forEach(labelName => changeStyle(labelName, g_lblPosObj.musicInfoOFF));
 	}
 
-	// ローカル時のみフレーム数を残す
-	if (!g_isLocal) {
+	// デバッグ時のみフレーム数を残す
+	if (!g_isDebug) {
 		lblframe.style.display = C_DIS_NONE;
 	}
 

package/js/lib/danoni_constants.js

@@ -5,7 +5,7 @@
  *
  * Source by tickle
  * Created : 2019/11/19
- * Revised : 2025/03/01 (v40.0.1)
+ * Revised : 2025/03/02 (v40.1.0)
  *
  * https://github.com/cwtickle/danoniplus
  */
@@ -248,7 +248,7 @@ const updateWindowSiz = () => {
         },
         btnPrecond: {
             x: g_btnX(1 / 4), y: g_sHeight - 20, w: g_btnWidth(1 / 4), h: 16, siz: 12,
-            visibility: getQueryParamVal(`debug`) === `true` ? `visible` : `hidden`,
+            visibility: g_isDebug ? `visible` : `hidden`,
         },
         btnSafeMode: {
             x: g_btnX(), siz: 18,
@@ -2326,22 +2326,32 @@ const g_shortcutObj = {
 // b_frame: ボタンの有効化フレーム数、s_frame: ショートカットキーの有効化フレーム数
 // initial: 初回のみ有効化時間を設定する場合、trueを設定
 const g_btnWaitFrame = {
-    initial: { b_frame: 0, s_frame: 0 },
-    title: { b_frame: 0, s_frame: 0 },
-    dataMgt: { b_frame: 0, s_frame: 0 },
-    precondition: { b_frame: 0, s_frame: 0 },
-    option: { b_frame: 0, s_frame: 0, initial: true },
-    difSelector: { b_frame: 0, s_frame: 0 },
-    settingsDisplay: { b_frame: 0, s_frame: 0 },
-    exSetting: { b_frame: 0, s_frame: 0 },
-    keyConfig: { b_frame: 0, s_frame: 30 },
-    loading: { b_frame: 0, s_frame: 0 },
-    loadingIos: { b_frame: 0, s_frame: 0 },
-    main: { b_frame: 0, s_frame: 0 },
-    result: { b_frame: 0, s_frame: 120 },
+    initial: {},
+    title: {},
+    dataMgt: {},
+    precondition: {},
+    option: { initial: true },
+    difSelector: {},
+    settingsDisplay: {},
+    exSetting: {},
+    keyConfig: { s_frame: 30 },
+    loading: {},
+    loadingIos: {},
+    main: {},
+    result: { s_frame: 120 },
 };
+Object.keys(g_btnWaitFrame).forEach(key => {
+    if (!g_btnWaitFrame[key].b_frame) {
+        g_btnWaitFrame[key].b_frame = 0;
+    }
+    if (!g_btnWaitFrame[key].s_frame) {
+        g_btnWaitFrame[key].s_frame = 0;
+    }
+});
 
 // 主要ボタンのリスト
+// - btn + プロパティ名に合致するボタンid名に対して、
+//   どの位置(X方向)にショートカット名を表示するかを設定
 const g_btnPatterns = {
     title: { Start: 0, Comment: -10 },
     dataMgt: { Back: 0, Environment: -35, Highscores: -35, CustomKey: -35, Others: -35 },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "danoniplus",
-  "version": "40.0.1",
+  "version": "40.2.0",
   "description": "Dancing☆Onigiri (CW Edition) - Web-based Rhythm Game",
   "main": "index.js",
   "scripts": {