diff --git a/src/main/webapp/WEB-INF/jsp/index.jsp b/src/main/webapp/WEB-INF/jsp/index.jsp index a329a643..273a509c 100644 --- a/src/main/webapp/WEB-INF/jsp/index.jsp +++ b/src/main/webapp/WEB-INF/jsp/index.jsp @@ -70,35 +70,7 @@ var MY_INFO = {}; var PARAM_TASK = "${param.taskSeCd}"; - function getBrowserName() { - var agent = navigator.userAgent.toUpperCase(); - if (agent.indexOf('TRIDENT') >= 0) { - return 'IE'; - } else if (agent.indexOf('FIREFOX') >= 0) { - return 'FIREFOX'; - } else if (agent.indexOf('EDG') >= 0) { - return 'EDGE'; - } else if (agent.indexOf('CHROME') >= 0) { - return 'CHROME'; - } else if (agent.indexOf('SAFARI') >= 0) { - return 'SAFARI'; - } else { - return ''; - } - } - const BROWSER_NAME = getBrowserName(); - var VERTICAL_SCROLL_HEIGHT = 14; - switch(BROWSER_NAME){ - case "EDGE" : - VERTICAL_SCROLL_HEIGHT = 14; - break; - case "FIREFOX" : - VERTICAL_SCROLL_HEIGHT = 15; - break; - case "CHROME" : - VERTICAL_SCROLL_HEIGHT = 15; - break; - } + async function fnGetAllTask(){ return new Promise((resolve, reject) => { diff --git a/src/main/webapp/resources/js/fims/framework/cmm/componentization.js b/src/main/webapp/resources/js/fims/framework/cmm/componentization.js index 50d47f9c..3425190f 100644 --- a/src/main/webapp/resources/js/fims/framework/cmm/componentization.js +++ b/src/main/webapp/resources/js/fims/framework/cmm/componentization.js @@ -52,6 +52,36 @@ function fnMakeOptionStyleSelect(selectEl){ /************************************************************************** * 행 위치 이동 가능한 테이블 **************************************************************************/ +function getBrowserName() { + var agent = navigator.userAgent.toUpperCase(); + if (agent.indexOf('TRIDENT') >= 0) { + return 'IE'; + } else if (agent.indexOf('FIREFOX') >= 0) { + return 'FIREFOX'; + } else if (agent.indexOf('EDG') >= 0) { + return 'EDGE'; + } else if (agent.indexOf('CHROME') >= 0) { + return 'CHROME'; + } else if (agent.indexOf('SAFARI') >= 0) { + return 'SAFARI'; + } else { + return ''; + } +} +const BROWSER_NAME = getBrowserName(); +var VERTICAL_SCROLL_HEIGHT = 14; +switch(BROWSER_NAME){ + case "EDGE" : + VERTICAL_SCROLL_HEIGHT = 14; + break; + case "FIREFOX" : + VERTICAL_SCROLL_HEIGHT = 15; + break; + case "CHROME" : + VERTICAL_SCROLL_HEIGHT = 15; + break; +} + function fnMakeRowSpinner(tableRowEl, upBtnEl, downBtnEl, scrollEl, validFunc){ if(validFunc != undefined && validFunc != null){