danoniplus 26.6.0 → 26.7.1

package/js/danoni_main.js

@@ -4,12 +4,12 @@
  * 
  * Source by tickle
  * Created : 2018/10/08
- * Revised : 2022/03/05
+ * Revised : 2022/04/10
  * 
  * https://github.com/cwtickle/danoniplus
  */
-const g_version = `Ver 26.6.0`;
-const g_revisedDate = `2022/03/05`;
+const g_version = `Ver 26.7.1`;
+const g_revisedDate = `2022/04/10`;
 const g_alphaVersion = ``;
 
 // カスタム用バージョン (danoni_custom.js 等で指定可)
@@ -41,11 +41,11 @@ let g_localVersion2 = ``;
  */
 const current = _ => {
 	if (document.currentScript) {
-		return document.currentScript.src;
+		return encodeURI(document.currentScript.src);
 	}
 	const scripts = document.getElementsByTagName(`script`);
 	const targetScript = scripts[scripts.length - 1];
-	return targetScript.src;
+	return encodeURI(targetScript.src);
 };
 const g_rootPath = current().match(/(^.*\/)/)[0];
 const g_remoteFlg = g_rootPath.match(`^https://cwtickle.github.io/danoniplus/`) !== null;
@@ -2003,7 +2003,8 @@ const loadChartFile = async (_scoreId = g_stateObj.scoreId) => {
 
 	const dosInput = document.querySelector(`#dos`);
 	const divRoot = document.querySelector(`#divRoot`);
-	const queryDos = getQueryParamVal(`dos`) !== null ? `dos/${getQueryParamVal('dos')}.txt` : (document.querySelector(`#externalDos`)?.value ?? ``);
+	const queryDos = getQueryParamVal(`dos`) !== null ?
+		`dos/${getQueryParamVal('dos')}.txt` : encodeURI(document.querySelector(`#externalDos`)?.value ?? ``);
 
 	if (dosInput === null && queryDos === ``) {
 		makeWarningWindow(g_msgInfoObj.E_0023);
@@ -3017,16 +3018,14 @@ const headerConvert = _dosObj => {
  * 曲名（1行）の取得
  * @param {string} _musicName 
  */
-const getMusicNameSimple = _musicName => {
-	return _musicName.split(`<br>`).join(` `).split(`<nbr>`).join(``).split(`<dbr>`).join(`　`);
-};
+const getMusicNameSimple = _musicName => replaceStr(_musicName, g_escapeStr.musicNameSimple);
 
 /**
  * 曲名（複数行）の取得
  * @param {string} _musicName 
  */
 const getMusicNameMultiLine = _musicName => {
-	const tmpName = _musicName.split(`<nbr>`).join(`<br>`).split(`<dbr>`).join(`<br>`).split(`<br>`);
+	const tmpName = replaceStr(_musicName, g_escapeStr.musicNameMultiLine).split(`<br>`);
 	return tmpName.length === 1 ? [tmpName[0], ``] : tmpName;
 };
 
@@ -6722,17 +6721,7 @@ const scoreConvert = (_dosObj, _scoreId, _preblankFrame, _dummyNo = ``,
 		}
 
 		// 矢印名からフリーズアロー名への変換
-		let frzName = g_keyObj[`chara${_keyCtrlPtn}`][j].replace(`leftdia`, `frzLdia`);
-		frzName = frzName.replace(`rightdia`, `frzRdia`);
-		frzName = frzName.replace(`left`, `frzLeft`);
-		frzName = frzName.replace(`down`, `frzDown`);
-		frzName = frzName.replace(`up`, `frzUp`);
-		frzName = frzName.replace(`right`, `frzRight`);
-		frzName = frzName.replace(`space`, `frzSpace`);
-		frzName = frzName.replace(`iyo`, `frzIyo`);
-		frzName = frzName.replace(`gor`, `frzGor`);
-		frzName = frzName.replace(`oni`, `foni`);
-
+		let frzName = replaceStr(g_keyObj[`chara${_keyCtrlPtn}`][j], g_escapeStr.frzName);
 		if (frzName.indexOf(`frz`) === -1 && frzName.indexOf(`foni`) === -1) {
 			if ((frzName.startsWith(`s`)) || frzName.startsWith(`t`) ||
 				(frzName.startsWith(`a`) && !frzName.startsWith(`arrow`))) {
@@ -8684,22 +8673,10 @@ const MainInit = _ => {
 	 * @param _j 矢印の位置
 	 */
 	const checkKeyUpFunc = {
-
-		frzOFF: (_j) => {
-			return g_workObj.keyHitFlg[_j].find(flg => flg);
-		},
-
-		frzON: (_j) => {
-			return true;
-		},
-
-		dummyFrzOFF: (_j) => {
-			return true;
-		},
-
-		dummyFrzON: (_j) => {
-			return true;
-		},
+		frzOFF: (_j) => g_workObj.keyHitFlg[_j].find(flg => flg),
+		frzON: (_j) => true,
+		dummyFrzOFF: (_j) => true,
+		dummyFrzON: (_j) => true,
 	};
 
 	/**
@@ -9571,7 +9548,7 @@ const judgeMatari = _difFrame => {
 	changeJudgeCharacter(`matari`, g_lblNameObj.j_matari);
 	comboJ.textContent = ``;
 
-	displayDiff(difFrame, g_headerObj.justFrames);
+	displayDiff(_difFrame, g_headerObj.justFrames);
 	finishViewing();
 
 	g_customJsObj.judg_matari.forEach(func => func(_difFrame));
@@ -9780,10 +9757,7 @@ const resultInit = _ => {
 	}
 
 	const keyCtrlPtn = `${g_keyObj.currentKey}_${g_keyObj.currentPtn}`;
-	let transKeyData = ``;
-	if (hasVal(g_keyObj[`transKey${keyCtrlPtn}`])) {
-		transKeyData = `(` + g_keyObj[`transKey${keyCtrlPtn}`] + `)`;
-	}
+	const transKeyData = hasVal(g_keyObj[`transKey${keyCtrlPtn}`]) ? `(` + g_keyObj[`transKey${keyCtrlPtn}`] + `)` : ``;
 
 	/**
 	 * プレイスタイルのカスタム有無
@@ -10027,18 +10001,19 @@ const resultInit = _ => {
 		tweetMaxCombo += `-${g_resultObj.fmaxCombo}`;
 	}
 
-	let tweetResultTmp = g_headerObj.resultFormat.split(`[hashTag]`).join(`${hashTag}`)
-		.split(`[musicTitle]`).join(`${musicTitle}`)
-		.split(`[keyLabel]`).join(`${tweetDifData}`)
-		.split(`[maker]`).join(`${g_headerObj.tuning}`)
-		.split(`[rank]`).join(`${rankMark}`)
-		.split(`[score]`).join(`${g_resultObj.score}`)
-		.split(`[playStyle]`).join(`${playStyleData}`)
-		.split(`[arrowJdg]`).join(`${g_resultObj.ii}-${g_resultObj.shakin}-${g_resultObj.matari}-${g_resultObj.shobon}-${g_resultObj.uwan}`)
-		.split(`[frzJdg]`).join(tweetFrzJdg)
-		.split(`[maxCombo]`).join(tweetMaxCombo)
-		.split(`[url]`).join(`${twiturl.toString()}`.replace(/[\t\n]/g, ``));
-
+	let tweetResultTmp = replaceStr(g_headerObj.resultFormat, [
+		[`[hashTag]`, hashTag],
+		[`[musicTitle]`, musicTitle],
+		[`[keyLabel]`, tweetDifData],
+		[`[maker]`, g_headerObj.tuning],
+		[`[rank]`, rankMark],
+		[`[score]`, g_resultObj.score],
+		[`[playStyle]`, playStyleData],
+		[`[arrowJdg]`, `${g_resultObj.ii}-${g_resultObj.shakin}-${g_resultObj.matari}-${g_resultObj.shobon}-${g_resultObj.uwan}`],
+		[`[frzJdg]`, tweetFrzJdg],
+		[`[maxCombo]`, tweetMaxCombo],
+		[`[url]`, g_isLocal ? `` : `${twiturl.toString()}`.replace(/[\t\n]/g, ``)]
+	]);
 	if (g_presetObj.resultVals !== undefined) {
 		Object.keys(g_presetObj.resultVals).forEach(key => {
 			tweetResultTmp = tweetResultTmp.split(`[${key}]`).join(g_resultObj[g_presetObj.resultVals[key]]);

package/js/lib/danoni_constants.js

@@ -5,7 +5,7 @@
  *
  * Source by tickle
  * Created : 2019/11/19
- * Revised : 2022/02/23 (v26.3.1)
+ * Revised : 2022/03/12 (v26.7.0)
  *
  * https://github.com/cwtickle/danoniplus
  */
@@ -2393,6 +2393,10 @@ const g_dfColorLightObj = {
     ],
 };
 
+/**
+ * 特殊文字列の置き換えリスト
+ * (置き換え元、置き換え先の組で二次元配列として定義。主にreplaceStr関数で使用)
+ */
 const g_escapeStr = {
     escape: [[`&`, `&amp;`], [`<`, `&lt;`], [`>`, `&gt;`], [`"`, `&quot;`]],
     escapeTag: [
@@ -2407,6 +2411,17 @@ const g_escapeStr = {
     escapeCode: [
         [`<script>`, ``], [`</script>`, ``],
     ],
+    musicNameSimple: [
+        [`<br>`, ` `], [`<nbr>`, ``], [`<dbr>`, `　`],
+    ],
+    musicNameMultiLine: [
+        [`<nbr>`, `<br>`], [`<dbr>`, `<br>`],
+    ],
+    frzName: [
+        [`leftdia`, `frzLdia`], [`rightdia`, `frzRdia`],
+        [`left`, `frzLeft`], [`down`, `frzDown`], [`up`, `frzUp`], [`right`, `frzRight`],
+        [`space`, `frzSpace`], [`iyo`, `frzIyo`], [`gor`, `frzGor`], [`oni`, `foni`],
+    ],
 };
 
 /**

package/package.json

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