diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/popup/qustnrPopList.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/popup/qustnrPopList.jsp
index fbd699a8..33355b58 100644
--- a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/popup/qustnrPopList.jsp
+++ b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/popup/qustnrPopList.jsp
@@ -220,11 +220,19 @@ $(document).ready(function(){
btnLast.attr('data-focus','sub36_pop02_close');
*/
// 레이어팝업 포커싱 이동 수정
- $(".tooltip-close").click(function(){
+ /* $(".tooltip-close").click(function(){
var activeTarget = $('[data-tooltip-con="sub37_pop20"]');
activeTarget.hide();
//$('[data-tooltip="sub37_pop20"]:first-child').focus();
$('[data-info="${chasiInfo.eduChasiOrd}"]').focus();
+ }); */
+
+ $(".tooltip-close").click(function(e){
+ e.stopPropagation();
+ $(this).closest(".popup_wrap").hide();
+ $(".mask").hide();
+ $(".focusPopBtn").focus();
+ $(".focusPopBtn").removeClass("focusPopBtn");
});
})
diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/popup/qustnrPrintPopList.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/popup/qustnrPrintPopList.jsp
index 87d59dbd..3b80d4ce 100644
--- a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/popup/qustnrPrintPopList.jsp
+++ b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/popup/qustnrPrintPopList.jsp
@@ -219,6 +219,14 @@ $(document).ready(function(){
btnLast.attr('data-focus-next','sub36_pop02');
btnLast.attr('data-focus','sub36_pop02_close');
*/
+
+ $(".tooltip-close").click(function(e){
+ e.stopPropagation();
+ $(this).closest(".popup_wrap").hide();
+ $(".mask").hide();
+ $(".focusPopBtn").focus();
+ $(".focusPopBtn").removeClass("focusPopBtn");
+ });
})
diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/popup/qustnrQRPrintPopList.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/popup/qustnrQRPrintPopList.jsp
index 631f8e6f..b97ea735 100644
--- a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/popup/qustnrQRPrintPopList.jsp
+++ b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/popup/qustnrQRPrintPopList.jsp
@@ -220,10 +220,13 @@ $(document).ready(function(){
btnLast.attr('data-focus','sub36_pop02_close');
*/
// 레이어팝업 포커싱 이동 수정
- $(".tooltip-close").click(function(){
- var activeTarget = $('[data-tooltip-con="sub37_pop20"]');
- activeTarget.hide();
- $('[data-tooltip="sub37_pop20"]:last-child').focus();
+
+ $(".tooltip-close").click(function(e){
+ e.stopPropagation();
+ $(this).closest(".popup_wrap").hide();
+ $(".mask").hide();
+ $(".focusPopBtn").focus();
+ $(".focusPopBtn").removeClass("focusPopBtn");
});
})
diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/tngrVisitEdu/eduEnd/eduEndDetail.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/tngrVisitEdu/eduEnd/eduEndDetail.jsp
index d653cd6b..2518a12b 100644
--- a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/tngrVisitEdu/eduEnd/eduEndDetail.jsp
+++ b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/tngrVisitEdu/eduEnd/eduEndDetail.jsp
@@ -46,6 +46,19 @@
$(document).ready(function () {
setNumberOnly();
+
+ // 팝업 오픈 버튼
+ $(".popupOpenBtn").click(function(){
+ $(this).addClass("focusPopBtn");
+ });
+
+ $(".tooltip-close").click(function(e){
+ e.stopPropagation();
+ $(this).closest(".popup_wrap").hide();
+ $(".mask").hide();
+ $(".focusPopBtn").focus();
+ $(".focusPopBtn").removeClass("focusPopBtn");
+ });
});
function setNumberOnly(){ //숫자만 입력
@@ -1173,7 +1186,7 @@
-