danoniplus 40.4.0 → 40.4.2
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 +7 -3
- package/package.json +1 -1
package/js/danoni_main.js
CHANGED
|
@@ -8,7 +8,7 @@
|
|
|
8
8
|
*
|
|
9
9
|
* https://github.com/cwtickle/danoniplus
|
|
10
10
|
*/
|
|
11
|
-
const g_version = `Ver 40.4.
|
|
11
|
+
const g_version = `Ver 40.4.2`;
|
|
12
12
|
const g_revisedDate = `2025/03/12`;
|
|
13
13
|
|
|
14
14
|
// カスタム用バージョン (danoni_custom.js 等で指定可)
|
|
@@ -2430,7 +2430,11 @@ const initialControl = async () => {
|
|
|
2430
2430
|
await loadChartFile(0);
|
|
2431
2431
|
|
|
2432
2432
|
// 共通設定ファイルの指定
|
|
2433
|
-
let
|
|
2433
|
+
let tmpSettingType = g_rootObj.settingType ?? ``;
|
|
2434
|
+
if (g_remoteFlg && hasVal(tmpSettingType) && !tmpSettingType.includes(`(..)`)) {
|
|
2435
|
+
tmpSettingType = `(..)../js/${tmpSettingType}`;
|
|
2436
|
+
};
|
|
2437
|
+
let [settingType, settingRoot] = getFilePath(tmpSettingType);
|
|
2434
2438
|
if (settingType !== ``) {
|
|
2435
2439
|
settingType = `_${settingType}`;
|
|
2436
2440
|
}
|
|
@@ -3131,7 +3135,7 @@ const preheaderConvert = _dosObj => {
|
|
|
3131
3135
|
});
|
|
3132
3136
|
|
|
3133
3137
|
const convLocalPath = (_file, _type) =>
|
|
3134
|
-
g_remoteFlg && !_file.includes(`(..)`) ? `(..)../${_type}/${_file}` : _file;
|
|
3138
|
+
g_remoteFlg && hasVal(_file) && !_file.includes(`(..)`) ? `(..)../${_type}/${_file}` : _file;
|
|
3135
3139
|
|
|
3136
3140
|
// 外部スキンファイルの指定
|
|
3137
3141
|
const tmpSkinType = _dosObj.skinType ?? g_presetObj.skinType ?? `default`;
|