diff --git a/hwe/ts/battle_simulator.ts b/hwe/ts/battle_simulator.ts index f9958772..29c06159 100644 --- a/hwe/ts/battle_simulator.ts +++ b/hwe/ts/battle_simulator.ts @@ -1,3 +1,4 @@ +import { exportWindow } from './util/exportWindow'; import $ from 'jquery'; import Popper from 'popper.js'; exportWindow(Popper, 'Popper');//XXX: 왜 popper를 이렇게 불러야 하는가? @@ -10,7 +11,6 @@ import { numberWithCommas } from "./util/numberWithCommas"; import { unwrap_any } from './util/unwrap_any'; import { BasicGeneralListResponse, InvalidResponse } from './defs'; import { formatTime } from './util/formatTime'; -import { exportWindow } from './util/exportWindow'; type CityAttackerInfo = { level: number, diff --git a/hwe/ts/bossInfo.ts b/hwe/ts/bossInfo.ts index 034b25f2..58c5d8aa 100644 --- a/hwe/ts/bossInfo.ts +++ b/hwe/ts/bossInfo.ts @@ -1,10 +1,10 @@ +import { exportWindow } from './util/exportWindow'; import $ from 'jquery'; import axios from 'axios'; import { convertFormData } from './util/convertFormData'; import { InvalidResponse } from './defs'; import { unwrap_any } from './util/unwrap_any'; import { setAxiosXMLHttpRequest } from './util/setAxiosXMLHttpRequest'; -import { exportWindow } from './util/exportWindow'; import Popper from 'popper.js'; exportWindow(Popper, 'Popper'); import 'bootstrap'; diff --git a/hwe/ts/build_exports.json b/hwe/ts/build_exports.json index cb6e28be..bab37e61 100644 --- a/hwe/ts/build_exports.json +++ b/hwe/ts/build_exports.json @@ -1,7 +1,6 @@ { "ingame": { "chiefCenter": "chiefCenter.ts", - "common": "common_deprecated.ts", "troop": "troop.ts", "map": "map.ts", "install_db": "install_db.ts", @@ -22,7 +21,8 @@ "history": "history.ts", "join": "join.ts", "select_general_from_pool": "select_general_from_pool.ts", - "extKingdoms": "extKingdoms.ts" + "extKingdoms": "extKingdoms.ts", + "common": "common_deprecated.ts" }, "ingame_vue": { "v_inheritPoint": "v_inheritPoint.ts", diff --git a/hwe/ts/common_deprecated.ts b/hwe/ts/common_deprecated.ts index bf98d673..a9d5a502 100644 --- a/hwe/ts/common_deprecated.ts +++ b/hwe/ts/common_deprecated.ts @@ -1,10 +1,10 @@ +import { exportWindow } from "./util/exportWindow"; import { activateFlip, isBrightColor, getIconPath, errUnknown, errUnknownToast, quickReject, initTooltip } from "./common_legacy"; import { mb_strwidth } from "./util/mb_strwidth"; import { TemplateEngine } from "./util/TemplateEngine"; import { escapeHtml } from "./legacy/escapeHtml"; import { nl2br } from "./util/nl2br"; import jQuery from "jquery"; -import { exportWindow } from "./util/exportWindow"; import Popper from 'popper.js'; exportWindow(Popper, 'Popper');//XXX: 왜 popper를 이렇게 불러야 하는가? import 'bootstrap'; diff --git a/hwe/ts/gateway/admin_member.ts b/hwe/ts/gateway/admin_member.ts index ba74ecf4..bb5847ce 100644 --- a/hwe/ts/gateway/admin_member.ts +++ b/hwe/ts/gateway/admin_member.ts @@ -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'; diff --git a/hwe/ts/gateway/admin_server.ts b/hwe/ts/gateway/admin_server.ts index ff9a2514..2494ad0f 100644 --- a/hwe/ts/gateway/admin_server.ts +++ b/hwe/ts/gateway/admin_server.ts @@ -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; } @@ -218,11 +213,6 @@ export async function loadPlugin(): Promise { 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'); \ No newline at end of file diff --git a/hwe/ts/gateway/common_deprecated.ts b/hwe/ts/gateway/common_deprecated.ts deleted file mode 100644 index 91cef818..00000000 --- a/hwe/ts/gateway/common_deprecated.ts +++ /dev/null @@ -1 +0,0 @@ -export * from '../common_deprecated'; \ No newline at end of file diff --git a/hwe/ts/gateway/entrance.ts b/hwe/ts/gateway/entrance.ts index 6aa9f7da..c8e6c32b 100644 --- a/hwe/ts/gateway/entrance.ts +++ b/hwe/ts/gateway/entrance.ts @@ -1,5 +1,10 @@ -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"; import { InvalidResponse } from '../defs'; @@ -7,6 +12,7 @@ import { getDateTimeNow } from '../util/getDateTimeNow'; import { setAxiosXMLHttpRequest } from '../util/setAxiosXMLHttpRequest'; import { loadPlugin as loadAdminPlugin } from './admin_server'; + declare const isAdmin: boolean; const serverListTemplate = "\ @@ -236,6 +242,14 @@ async function Entrance_drawServerList(serverInfos: ServerResponseItem[]) { continue; } + if(response.reserved){ + $serverHtml.find('.server_down').detach(); + $serverHtml.append( + TemplateEngine(serverReservedTemplate, response.reserved) + ); + initTooltip($serverHtml); + } + if(!response.game){ continue; } diff --git a/hwe/ts/myPage.ts b/hwe/ts/myPage.ts index bc0dc914..055af084 100644 --- a/hwe/ts/myPage.ts +++ b/hwe/ts/myPage.ts @@ -9,7 +9,7 @@ import { unwrap_any } from './util/unwrap_any'; type LogResponse = { result: true; - log: Record; + log: Record; }; $(function ($) { @@ -92,10 +92,11 @@ $(function ($) { } const html: string[] = []; - for (const [key, item] of Object.entries(result.log)) { + for (const key of Object.values(keys)) { if ($(`#log_${logType}_${key}`).length) { return true; } + const item = result.log[key]; html.push(`
${item}
`); } $(`#${logType}Plate`).append(html.join('')); diff --git a/i_entrance/entrance.php b/i_entrance/entrance.php index ce27db18..8744aca5 100644 --- a/i_entrance/entrance.php +++ b/i_entrance/entrance.php @@ -34,9 +34,9 @@ $acl = $session->acl; - - - + + + diff --git a/package.json b/package.json index ed0069d1..f5626f79 100644 --- a/package.json +++ b/package.json @@ -84,8 +84,10 @@ "lint" ], "browserslist": [ + "last 3 versions", "> 0.4%", - "not ie <= 11", - "not op_mini all" + "not dead", + "not op_mini all", + "not ie <= 11" ] -} +} \ No newline at end of file diff --git a/webpack.config.cjs b/webpack.config.cjs index 22c1eeab..48a6b356 100644 --- a/webpack.config.cjs +++ b/webpack.config.cjs @@ -247,7 +247,6 @@ module.exports = (env, argv) => { }, mode, entry: { - common: `${tsDir}/gateway/common_deprecated.ts`, entrance: `${tsDir}/gateway/entrance.ts`, user_info: `${tsDir}/gateway/user_info.ts`, admin_member: `${tsDir}/gateway/admin_member.ts`,