danoniplus 40.3.1 → 40.4.0
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 +15 -5
- package/js/lib/danoni_constants.js +4 -1
- 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 : 2025/03/
|
|
7
|
+
* Revised : 2025/03/12
|
|
8
8
|
*
|
|
9
9
|
* https://github.com/cwtickle/danoniplus
|
|
10
10
|
*/
|
|
11
|
-
const g_version = `Ver 40.
|
|
12
|
-
const g_revisedDate = `2025/03/
|
|
11
|
+
const g_version = `Ver 40.4.0`;
|
|
12
|
+
const g_revisedDate = `2025/03/12`;
|
|
13
13
|
|
|
14
14
|
// カスタム用バージョン (danoni_custom.js 等で指定可)
|
|
15
15
|
let g_localVersion = ``;
|
|
@@ -58,6 +58,7 @@ Object.freeze(g_reservedDomains);
|
|
|
58
58
|
// 外部参照を許可するドメイン
|
|
59
59
|
const g_referenceDomains = [
|
|
60
60
|
`cwtickle.github.io/danoniplus`,
|
|
61
|
+
`cdn.jsdelivr.net/npm`,
|
|
61
62
|
`support-v\\d+--danoniplus.netlify.app`,
|
|
62
63
|
];
|
|
63
64
|
Object.freeze(g_referenceDomains);
|
|
@@ -1086,7 +1087,7 @@ const loadMultipleFiles2 = async (_fileData, _loadType) => {
|
|
|
1086
1087
|
if (_loadType === `js`) {
|
|
1087
1088
|
await loadScript2(filePath, false);
|
|
1088
1089
|
} else if (_loadType === `css`) {
|
|
1089
|
-
const cssPath = filePath.split(`.js
|
|
1090
|
+
const cssPath = filePath.split(`.js?`).join(`.css?`);
|
|
1090
1091
|
await importCssFile2(cssPath);
|
|
1091
1092
|
}
|
|
1092
1093
|
}));
|
|
@@ -3134,7 +3135,16 @@ const preheaderConvert = _dosObj => {
|
|
|
3134
3135
|
|
|
3135
3136
|
// 外部スキンファイルの指定
|
|
3136
3137
|
const tmpSkinType = _dosObj.skinType ?? g_presetObj.skinType ?? `default`;
|
|
3137
|
-
const tmpSkinTypes = tmpSkinType.split(`,`)
|
|
3138
|
+
const tmpSkinTypes = tmpSkinType.split(`,`).map(file => {
|
|
3139
|
+
|
|
3140
|
+
// スキンタイプを取得（ディレクトリパス、カレント指定(..)を除去）
|
|
3141
|
+
const match = file.match(/.*\/(.+)|\(\.\.\)([^/]+)|(.+)/);
|
|
3142
|
+
const skinName = match[1] || match[2] || match[3];
|
|
3143
|
+
|
|
3144
|
+
// デフォルトセット以外はリモート先のデータを使用しない
|
|
3145
|
+
return g_defaultSkinSet.findIndex(val => val === skinName) < 0 ?
|
|
3146
|
+
convLocalPath(file, `skin`) : file;
|
|
3147
|
+
});
|
|
3138
3148
|
obj.defaultSkinFlg = tmpSkinTypes.includes(`default`) && setBoolVal(_dosObj.bgCanvasUse ?? g_presetObj.bgCanvasUse, true);
|
|
3139
3149
|
setJsFiles(tmpSkinTypes, C_DIR_SKIN, `skin`);
|
|
3140
3150
|
|
|
@@ -5,7 +5,7 @@
|
|
|
5
5
|
*
|
|
6
6
|
* Source by tickle
|
|
7
7
|
* Created : 2019/11/19
|
|
8
|
-
* Revised : 2025/03/
|
|
8
|
+
* Revised : 2025/03/12 (v40.4.0)
|
|
9
9
|
*
|
|
10
10
|
* https://github.com/cwtickle/danoniplus
|
|
11
11
|
*/
|
|
@@ -3202,6 +3202,9 @@ const g_titleLists = {
|
|
|
3202
3202
|
|
|
3203
3203
|
};
|
|
3204
3204
|
|
|
3205
|
+
// デフォルトスキンセット（リモート取得対象）
|
|
3206
|
+
const g_defaultSkinSet = [`default`, `light`, `skyblue`];
|
|
3207
|
+
|
|
3205
3208
|
const g_animationData = [`back`, `mask`, `style`];
|
|
3206
3209
|
const g_animationFunc = {
|
|
3207
3210
|
make: {
|