From 757ee74776627e0af32fc35b178f7aec22e72fa1 Mon Sep 17 00:00:00 2001 From: JSYOO Date: Mon, 22 Nov 2021 10:56:03 +0900 Subject: [PATCH] =?UTF-8?q?=EA=B3=B5=EC=9C=A0=ED=95=98=EA=B8=B0=20INTERFAC?= =?UTF-8?q?EID=20=EC=97=86=EC=9D=84=EC=8B=9C=20=EC=B2=98=EB=A6=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/nlib/col/web/InterestController.java | 2 +- .../nlib/sch/web/NlibSearchController.java | 2 -- .../jsp/nlib/collection/searchItemDetail.jsp | 2 +- src/main/webapp/js/nlib.js | 36 +++++++++++-------- 4 files changed, 23 insertions(+), 19 deletions(-) diff --git a/src/main/java/nlib/col/web/InterestController.java b/src/main/java/nlib/col/web/InterestController.java index ad3d1ace..b31f1572 100644 --- a/src/main/java/nlib/col/web/InterestController.java +++ b/src/main/java/nlib/col/web/InterestController.java @@ -137,7 +137,7 @@ public class InterestController extends NlibCommonController totalCount = interestService.countListInterests(searchCollectionVO); String mbInfoId = getMbInfoId(request); - operList = collectionService.setDetailInfoForList(interestList, getMbInfoId(request), NlibProperty.getString("thumbnail.image.url.small")); + operList = collectionService.setDetailInfoForList(interestList, getMbInfoId(request)); //------------------------------- // JSON변환 응답 처리 //------------------------------- diff --git a/src/main/java/nlib/sch/web/NlibSearchController.java b/src/main/java/nlib/sch/web/NlibSearchController.java index 1a9ce04c..5a965cc9 100644 --- a/src/main/java/nlib/sch/web/NlibSearchController.java +++ b/src/main/java/nlib/sch/web/NlibSearchController.java @@ -205,7 +205,6 @@ public class NlibSearchController extends NlibCommonController { //로그인 상태인지 확인 model.addAttribute("loginVO", loginVO); - model.addAttribute("pdfUri", NlibProperty.getProperty("pdf.uri")); searchVO.setQuery(searchVO.getQuery().replaceAll("\\\"", """)); return "nlib/collection/searchList"; } @@ -320,7 +319,6 @@ public class NlibSearchController extends NlibCommonController { model.addAttribute("result", vo); model.addAttribute("searchVO", searchVO); model.addAttribute("loginVO", loginVO); - model.addAttribute("pdfUri", NlibProperty.getProperty("pdf.uri")); return "nlib/collection/searchItemDetail"; } diff --git a/src/main/webapp/WEB-INF/jsp/nlib/collection/searchItemDetail.jsp b/src/main/webapp/WEB-INF/jsp/nlib/collection/searchItemDetail.jsp index b22e1f3a..5e631b9c 100644 --- a/src/main/webapp/WEB-INF/jsp/nlib/collection/searchItemDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/nlib/collection/searchItemDetail.jsp @@ -128,7 +128,7 @@ function goList(){ - +
diff --git a/src/main/webapp/js/nlib.js b/src/main/webapp/js/nlib.js index faa4b4a9..e8ff3335 100644 --- a/src/main/webapp/js/nlib.js +++ b/src/main/webapp/js/nlib.js @@ -406,8 +406,26 @@ function gfn_showDocPdf(interfaceId,masterId,typeDivCd,dtlsTypeDivCd) { var openNewWindow = window.open(url + interfaceId, "_blank"); } - -function snsShare(snsType, url) { +function gfn_setSnsShare(interfaceId,masterId,typeDivCd,dtlsTypeDivCd){ + var url=window.location.protocol + "//" + window.location.host + window.location.pathname + "?masterId=" + masterId; + + if(interfaceId != null && interfaceId != '') + { + if(typeDivCd == "IT_PHOTO" && (dtlsTypeDivCd == "C199" || dtlsTypeDivCd == "C01")){ + url = IMAGE_VIEW_URL; + }else if((typeDivCd == "IT_VIDEO") && (dtlsTypeDivCd == "C290" || dtlsTypeDivCd == "C02" || dtlsTypeDivCd == "C03")){ + url = VIDEO_VIEW_URL; + }else{ + url = DOC_VIEW_URL; + } + } + + $('#div_pop-sharing img').attr('data-cUrl',url); // url 모두 맵핑 + if(url != null && url != ''){ + getShortUrlData(url); + } +} +function gfn_snsShare(snsType, url) { var url,name,specs,changedUrl,title; if(document.title.indexOf("|") > -1){ title = encodeURIComponent($.trim(document.title.split("|")[1])); @@ -438,22 +456,10 @@ function snsShare(snsType, url) { window.open(url, name, specs); } -$( document ).on('click' , 'button.share', function (e) { - //e.preventDefault(); - var tUrl = $(this).attr('data-cUrl'); - $('#div_pop-sharing img').attr('data-cUrl',tUrl); // url 모두 맵핑 - if(tUrl != null && tUrl != ''){ - /*if(tUrl.indexOf(location.host) == -1){ - tUrl = location.protocol + '//' + location.host + tUrl; - }*/ - getShortUrlData(tUrl); - } -}); - $( document ) .on('click', '#div_pop-sharing img.sns-pop', function(e) { e.preventDefault(); - snsShare($(this).attr('data-sType'),$(this).attr('data-cUrl')); + gfn_snsShare($(this).attr('data-sType'),$(this).attr('data-cUrl')); }) .on('click', '#div_pop-sharing button.btn-close-pop', function(e) { e.preventDefault();