diff --git a/src/main/resources/static/js/budget/assign.js b/src/main/resources/static/js/budget/assign.js index f46d1a9c..7961f2b9 100644 --- a/src/main/resources/static/js/budget/assign.js +++ b/src/main/resources/static/js/budget/assign.js @@ -18,7 +18,7 @@ $(document).ready(function(){ if ($("#ResultRow").text().trim() == "") { assignSearch(); } else { - WithoutMask(); + contentFade("out"); } }); @@ -49,7 +49,7 @@ function assignSearch() { $("#year").val(stDate.getFullYear()); - LoadingWithMask(); + contentFade("in"); location.href = "/budget/assign?year=" + $("#year").val() + "&stDate=" + $("#stDate").val() + "&edDate=" + $("#edDate").val() + "&code=" + $("#code").val(); } $(document).on('click', '#deleteBtn', function (){ diff --git a/src/main/resources/static/js/common.js b/src/main/resources/static/js/common.js index 000ecf11..759b677d 100644 --- a/src/main/resources/static/js/common.js +++ b/src/main/resources/static/js/common.js @@ -356,38 +356,4 @@ function ajaxErrorAction(e){ location.href="/"; } } -} - -function LoadingWithMask() { - //화면의 높이와 너비를 구합니다. - let maskHeight = $(document).height(); - let maskWidth = window.document.body.clientWidth; - - //화면에 출력할 마스크를 설정해줍니다. - let mask = "
"; - - //화면에 레이어 추가 - $("body") - .append(mask) - - //마스크의 높이와 너비를 화면 것으로 만들어 전체 화면을 채웁니다. - $("#mask").css({ - 'width' : maskWidth, - 'height': maskHeight, - 'opacity' : '0.7' - }); - $("#loadingImg").css({ - 'position' : 'absolute', - 'z-index' : '100', - 'top' : '50%', //parseInt(maskHeight)/2-20 - 'left' : '50%', //parseInt(maskWidth)/2-20, - }); - - //마스크 표시 - $("#mask").show(); -} - -function WithoutMask() { - $("#mask, #loadingImg").hide(); - $("#mask, #loadingImg").remove(); } \ No newline at end of file