tcjlj/JHS-enhance
1
0
Fork 0
mirror of https://github.com/fireinrain/JHS-enhance.git synced 2026-10-13 21:06:37 +08:00
Code Issues Packages Projects Releases Wiki Activity

修复115固有jq导致加载冲突

Browse Source
This commit is contained in:
lzyme.dev@gmail.com
2026-08-30 20:10:07 +08:00
parent 50581be5a6
commit 06b2497ee1
4 changed files with 48 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files
dist/jhs-enhance.user.js
Vendored
+3 -1
View File
@@ -1100,7 +1100,7 @@
); );
insertStyle(mainCss); insertStyle(mainCss);
insertStyle(subtitleModalCss); insertStyle(subtitleModalCss);
window.jQuery = $$1; window.$ = window.jQuery = $$1;
if (typeof $$1.trim !== "function") { if (typeof $$1.trim !== "function") {
$$1.trim = function (text) { $$1.trim = function (text) {
return text == null ? "" : (text + "").trim(); return text == null ? "" : (text + "").trim();
@@ -16944,6 +16944,7 @@ ${err.stack}` : "");
var el; var el;
})); }));
})(); })();
if (typeof layer !== "undefined") {
const originalLayerClose = layer.close; const originalLayerClose = layer.close;
layer.close = function (index) { layer.close = function (index) {
const result = originalLayerClose.call(this, index); const result = originalLayerClose.call(this, index);
@@ -16964,6 +16965,7 @@ ${err.stack}` : "");
}; };
return originalLayerOpen.call(this, options); return originalLayerOpen.call(this, options);
}; };
}
utils.importResource("https://cdn.jsdelivr.net/npm/layui-layer@1.0.9/layer.min.css"); utils.importResource("https://cdn.jsdelivr.net/npm/layui-layer@1.0.9/layer.min.css");
utils.importResource("https://cdn.jsdelivr.net/npm/toastify-js@1.12.0/src/toastify.min.css"); utils.importResource("https://cdn.jsdelivr.net/npm/toastify-js@1.12.0/src/toastify.min.css");
utils.importResource("https://cdn.jsdelivr.net/npm/viewerjs@1.11.1/dist/viewer.min.css"); utils.importResource("https://cdn.jsdelivr.net/npm/viewerjs@1.11.1/dist/viewer.min.css");
src/core/globals.js
+1 -3
View File
@@ -6,7 +6,7 @@ import Viewer from 'viewerjs';
import QRCode from 'qrcodejs'; import QRCode from 'qrcodejs';
import { currentHref, isJavDb, isJavBus, isSearchPage, Status_RUNNING, Status_SUCCESS, Status_FAIL, Status_LOADING, Status_FILTER, Status_FAVORITE, Status_HAS_DOWN, Status_HAS_WATCH, NO, YES } from './constants.js'; import { currentHref, isJavDb, isJavBus, isSearchPage, Status_RUNNING, Status_SUCCESS, Status_FAIL, Status_LOADING, Status_FILTER, Status_FAVORITE, Status_HAS_DOWN, Status_HAS_WATCH, NO, YES } from './constants.js';
window.jQuery = $; window.$ = window.jQuery = $;
if (typeof $.trim !== 'function') { if (typeof $.trim !== 'function') {
$.trim = function (text) { $.trim = function (text) {
return text == null ? '' : (text + '').trim(); return text == null ? '' : (text + '').trim();
@@ -32,5 +32,3 @@ window.Status_HAS_DOWN = Status_HAS_DOWN;
window.Status_HAS_WATCH = Status_HAS_WATCH; window.Status_HAS_WATCH = Status_HAS_WATCH;
window.NO = NO; window.NO = NO;
window.YES = YES; window.YES = YES;
import 'layui-layer';
src/main.js
+2
View File
@@ -820,6 +820,7 @@ window.ImageHoverPreview = class {
})); }));
}(); }();
if (typeof layer !== 'undefined') {
const originalLayerClose = layer.close; const originalLayerClose = layer.close;
layer.close = function (index) { layer.close = function (index) {
@@ -843,6 +844,7 @@ layer.open = function(options) {
}; };
return originalLayerOpen.call(this, options); return originalLayerOpen.call(this, options);
}; };
}
utils.importResource("https://cdn.jsdelivr.net/npm/layui-layer@1.0.9/layer.min.css"); utils.importResource("https://cdn.jsdelivr.net/npm/layui-layer@1.0.9/layer.min.css");
vite.config.mjs
-15
View File
@@ -99,23 +99,8 @@ export default defineConfig({
'tabulator-tables': 'Tabulator', 'tabulator-tables': 'Tabulator',
'viewerjs': 'Viewer', 'viewerjs': 'Viewer',
'qrcodejs': 'QRCode', 'qrcodejs': 'QRCode',
'layui-layer': 'layer',
}, },
}, },
}), }),
{
name: 'layui-layer-dev-shim',
apply: 'serve',
resolveId(id) {
if (id === 'layui-layer') {
return '\0layui-layer-shim';
}
},
load(id) {
if (id === '\0layui-layer-shim') {
return 'export default window.layer;';
}
},
},
], ],
}); });