fix: bootstrap4 package order 문제
- vue3 + bootstrap5 적용 전까진 고통 받아야... - 당분간 Popper, jQuery가 제대로 export 되었는지 확인 필요
This commit is contained in:
@@ -1,5 +1,7 @@
|
||||
import axios from 'axios';
|
||||
import $ from 'jquery';
|
||||
import Popper from 'popper.js';
|
||||
exportWindow(Popper, 'Popper');//XXX: 왜 popper를 이렇게 불러야 하는가?
|
||||
import { isNumber } from 'lodash';
|
||||
import { TemplateEngine } from '../util/TemplateEngine';
|
||||
import { InvalidResponse } from '../defs';
|
||||
|
||||
@@ -1,5 +1,4 @@
|
||||
|
||||
import $ from 'jquery';
|
||||
import { exportWindow } from '../util/exportWindow';
|
||||
import axios from 'axios';
|
||||
import { setAxiosXMLHttpRequest } from '../util/setAxiosXMLHttpRequest';
|
||||
import { InvalidResponse } from '../defs';
|
||||
@@ -65,10 +64,6 @@ const serverAdminTemplate = '\
|
||||
|
||||
declare global {
|
||||
interface Window {
|
||||
modifyServerStatus: (caller: HTMLElement, action: string) => void;
|
||||
Entrance_AdminClosedLogin: (caller: HTMLElement) => void;
|
||||
Entrance_AdminOpen119: (caller: HTMLElement) => void;
|
||||
serverUpdate: (caller: HTMLElement) => void;
|
||||
adminGrade: number;
|
||||
aclList: Record<string, string[]>;
|
||||
}
|
||||
@@ -218,11 +213,6 @@ export async function loadPlugin(): Promise<void> {
|
||||
|
||||
Entrance_AdminInit();
|
||||
|
||||
window.modifyServerStatus = modifyServerStatus;
|
||||
window.Entrance_AdminClosedLogin = Entrance_AdminClosedLogin;
|
||||
window.Entrance_AdminOpen119 = Entrance_AdminOpen119;
|
||||
window.serverUpdate = serverUpdate;
|
||||
|
||||
const response = await axios({
|
||||
url: 'j_server_get_admin_status.php',
|
||||
method: 'post',
|
||||
@@ -330,3 +320,8 @@ function Entrance_AdminOpen119(caller: HTMLElement) {
|
||||
const serverDir = $caller.parents('tr').data('server_name');
|
||||
location.href = `../${serverDir}/_119.php`;
|
||||
}
|
||||
|
||||
exportWindow(modifyServerStatus, 'modifyServerStatus');
|
||||
exportWindow(Entrance_AdminClosedLogin, 'Entrance_AdminClosedLogin');
|
||||
exportWindow(Entrance_AdminOpen119, 'Entrance_AdminOpen119');
|
||||
exportWindow(serverUpdate, 'serverUpdate');
|
||||
@@ -1 +0,0 @@
|
||||
export * from '../common_deprecated';
|
||||
@@ -1,7 +1,9 @@
|
||||
import axios from 'axios';
|
||||
import { exportWindow } from '../util/exportWindow';
|
||||
import $ from 'jquery';
|
||||
exportWindow($, '$');
|
||||
import Popper from 'popper.js';
|
||||
exportWindow(Popper, 'Popper');//XXX: 왜 popper를 이렇게 불러야 하는가?
|
||||
import axios from 'axios';
|
||||
import 'bootstrap';
|
||||
import { initTooltip } from '../common_legacy';
|
||||
import { TemplateEngine } from "../util/TemplateEngine";
|
||||
@@ -9,7 +11,7 @@ import { InvalidResponse } from '../defs';
|
||||
import { getDateTimeNow } from '../util/getDateTimeNow';
|
||||
import { setAxiosXMLHttpRequest } from '../util/setAxiosXMLHttpRequest';
|
||||
import { loadPlugin as loadAdminPlugin } from './admin_server';
|
||||
import { exportWindow } from '../util/exportWindow';
|
||||
|
||||
|
||||
declare const isAdmin: boolean;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user