Merge remote-tracking branch 'origin/develop' into jsh77b

src/main/webapp/WEB-INF/views/web/common/fragments/FooterWeb.html

@@ -49,7 +49,7 @@
 				</div>
 				<div class="sns_box clear">
 					<a href="https://www.facebook.com/istyle24" class="fbook clickable fl mr5" target="_blank" title="새창 열림"><span class="sr-only">STYLE24 페이스북</span></a>
-					<a href="https://instagram.com/istyle24.official?igshid=o3nzm9tydg9n" class="insta clickable fl" target="_blank" title="새창 열림"><span class="sr-only">STYLE24 인스타그램</span></a>
+					<a href="https://www.instagram.com/style24.official" class="insta clickable fl" target="_blank" title="새창 열림"><span class="sr-only">STYLE24 인스타그램</span></a>
 				</div>
 <!--				<div class="isms_box mt30">-->
 <!--					<a href="http://www.yes24.com/notice/pop_isms.html" onclick="window.open(this.href, '_blank','width=500,height=708,toolbars=no,scrollbars=no'); return false;">-->

src/main/webapp/biz/goods.js

@@ -1121,6 +1121,8 @@ var fnClickGoodsCd = function (goodsCd, mainColorCd){
 	// gagaInfiniteScroll.pageStatus.backScroll = scrollTop;
 	let scrollpos = $(window).scrollTop();
 	localStorage.setItem('scrollpos', scrollpos);
+	gagajf.setCookie("scrollpos", scrollpos);
+
 	// fnPushHistory();
 	cfnGoToGoodsDetail(goodsCd, mainColorCd);
 }

src/main/webapp/ux/plugins/gaga/gaga.infinite.scrollSession.js

@@ -79,10 +79,14 @@ var gagaInfiniteScroll = {
 
 		// 히스토리백 스크롤 위치
 		let pos = localStorage.getItem('scrollpos');
+		if( gagajf.isNull(pos) ){
+			pos = gagajf.getCookie("scrollpos");
+			gagajf.setCookie("scrollpos", null);
+		}
 		if ( pos != null && $(window).scrollTop() < pos ) {
 			$("html, body").scrollTop(pos);
 			localStorage.removeItem('scrollpos');
-		};
+		}
 	},
 	getDataList : function() {
 		/*if (this.pageStatus.loadAlign == 'prev') {
@@ -185,6 +189,10 @@ var gagaInfiniteScroll = {
 
 			// 히스토리백 스크롤 위치
 			let pos = localStorage.getItem('scrollpos');
+			if( gagajf.isNull(pos) ){
+				pos = gagajf.getCookie("scrollpos");
+				gagajf.setCookie("scrollpos", null);
+			}
 			if ( pos != null && $(window).scrollTop() < pos ) {
 				$("html, body").scrollTop(pos);
 				// localStorage.clear();