fix(WIP): bootstrap4 잔여 코드 수정 중

- 이상하게도 ingame에서 bootstrap이 충돌 중

hwe/ts/build_exports.json

@@ -20,8 +20,7 @@
         "history": "history.ts",
         "select_general_from_pool": "select_general_from_pool.ts",
         "extKingdoms": "extKingdoms.ts",
-        "common": "common_deprecated.ts",
-        "main": "main.ts"
+        "common": "common_deprecated.ts"
     },
     "ingame_vue": {
         "v_inheritPoint": "v_inheritPoint.ts",

hwe/ts/common_deprecated.ts

@@ -7,7 +7,6 @@ import { TemplateEngine } from "@util/TemplateEngine";
 import { escapeHtml } from "@/legacy/escapeHtml";
 import { nl2br } from "@util/nl2br";
 import jQuery from "jquery";
-import 'bootstrap';
 
 import "@scss/common_legacy.scss";
 

hwe/ts/common_legacy.ts

@@ -1,5 +1,5 @@
 import $ from "jquery";
-import {  Tooltip } from "bootstrap";
+import { Tooltip } from "bootstrap";
 import { trim } from "lodash";
 
 /**
@@ -170,7 +170,7 @@ export function initTooltip($obj?: JQuery<HTMLElement>): void {
             }
             const template = `<div class="tooltip ${tooltipClassText}" role="tooltip"><div class="tooltip-arrow"></div><div class="tooltip-inner"></div></div>`;
 
-            const oTooltip = new Tooltip(this, {
+            const oTooltip = Tooltip.getOrCreateInstance(this, {
                 title: function(){
                     return trim(this.querySelector('.tooltiptext')?.innerHTML);
                 },

hwe/ts/gateway/entrance.ts

@@ -10,12 +10,11 @@ import { setAxiosXMLHttpRequest } from '@util/setAxiosXMLHttpRequest';
 import { loadPlugin as loadAdminPlugin } from '@/gateway/admin_server';
 import '@/gateway/common';
 
-
 declare const isAdmin: boolean;
 
 const serverListTemplate = "\
 <tr class='server_item bg0 server_name_<%name%>' data-server='<%name%>'>\
-    <td class='server_name obj_tooltip' data-toggle='tooltip' data-placement='bottom'>\
+    <td class='server_name obj_tooltip' data-bs-toggle='tooltip' data-placement='bottom'>\
         <span style='font-weight:bold;font-size:1.4em;color:<%color%>'><%korName%>섭</span><br>\
         <span class='n_country'></span>\
         <span class='tooltiptext server_date'></span>\

hwe/ts/legacy/main.ts

@@ -1,18 +1,10 @@
 import $ from 'jquery';
-import 'bootstrap';
 import { activateFlip, initTooltip } from '@/common_legacy';
 import '@/msg.ts';
 import '@/map.ts';
-import { exportWindow } from '@util/exportWindow';
-
-import { scrollHardTo } from '@util/scrollHardTo';
-
-exportWindow(scrollHardTo, 'scrollHardTo');
-exportWindow($, '$');
 
 import '@scss/main.scss';
 import { unwrap } from '@util/unwrap';
-import { auto500px } from '@util/auto500px';
 import { htmlReady } from '@util/htmlReady';
 
 htmlReady(() => {
@@ -39,9 +31,9 @@ htmlReady(() => {
 
     const customCSS = localStorage.getItem('sam_customCSS');
     if (customCSS) {
-        const $style = $('<style type="text/css"></style>');
-        $style.text(customCSS);
-        $style.appendTo($('head'));
+        const styleEl = document.createElement('style');
+        styleEl.innerHTML = customCSS;
+        document.head.appendChild(styleEl);
     }
 });
 
@@ -91,5 +83,3 @@ htmlReady(() => {
         window.addEventListener('orientationchange', onScroll, true);
     });
 })();
-
-auto500px();

hwe/ts/select_general_from_pool.ts

@@ -64,7 +64,7 @@ const templateGeneralCard = '<div class="general_card">\
 </div>';
 
 const templateSpecial =
-    '<span class="obj_tooltip" data-toggle="tooltip" data-placement="top"><%text%>\
+    '<span class="obj_tooltip" data-bs-toggle="tooltip" data-placement="top"><%text%>\
     <span class="tooltiptext">\
         <%info%>\
     </span>\

hwe/ts/select_npc.ts

@@ -104,7 +104,7 @@ const templateGeneralCard =
 </div>';
 
 const templateSpecial =
-    '<span class="obj_tooltip" data-toggle="tooltip" data-placement="top"><%text%>\
+    '<span class="obj_tooltip" data-bs-toggle="tooltip" data-placement="top"><%text%>\
     <span class="tooltiptext">\
         <%info%>\
     </span>\

hwe/ts/v_main.ts

@@ -1,9 +1,22 @@
+
+import $ from 'jquery';
+
+exportWindow(scrollHardTo, 'scrollHardTo');
+exportWindow($, '$');
+
+import { exportWindow } from '@util/exportWindow';
+import { scrollHardTo } from '@util/scrollHardTo';
 import { createApp } from 'vue'
 import ReservedCommand from '@/ReservedCommand.vue';
 import BootstrapVue3 from 'bootstrap-vue-3'
 import { setAxiosXMLHttpRequest } from '@util/setAxiosXMLHttpRequest';
 import Multiselect from 'vue-multiselect';
 
+import "@/legacy/main";
+import { auto500px } from './util/auto500px';
+
 setAxiosXMLHttpRequest();
 
-createApp(ReservedCommand).use(BootstrapVue3).component('v-multiselect', Multiselect).mount('#reservedCommandList')
+createApp(ReservedCommand).use(BootstrapVue3).component('v-multiselect', Multiselect).mount('#reservedCommandList');
+
+auto500px();