Merge branch 'gagamel_autologin' of http://112.172.147.34:4936/style24/style24.front into gagamel_autologin

src/main/webapp/biz/mypage.js

@@ -55,7 +55,7 @@ var fnSetNoMemberLocation = function(depth3, depth4) {
 var fnGoToOrderDetail = function(param, noMember) {
 	// 이전 페이지 정보 세션 저장
 	fnSetPrePageInfo()
-	
+
 	if (noMember == 'noMember') {
 		cfnGoToPage(_PAGE_NOMEMBER_ORDER_DETAIL);
 	} else {
@@ -68,7 +68,7 @@ var fnGoToOrderDetail = function(param, noMember) {
 var fnGoToGoodsDetail = function(param) {
 	// 이전 페이지 정보 세션 저장
 	fnSetPrePageInfo()
-	
+
 	let goodsCd = $(param).attr('goodsCd');
 	let colorCd = $(param).attr('optCd1');
 	let ithrCd = $(param).attr('ithrCd');
@@ -79,7 +79,7 @@ var fnGoToGoodsDetail = function(param) {
 var fnGoToOneToOnePage = function(param) {
 	// 이전 페이지 정보 세션 저장
 	fnSetPrePageInfo()
-	
+
 	cfnGoToPage(_PAGE_ONETOONE_QNA);
 }
 
@@ -87,9 +87,9 @@ var fnGoToOneToOnePage = function(param) {
 var fnGoToDelivery = function(param, noMember) {
 	// 이전 페이지 정보 등록
 	fnSetPrePageInfo();
-	
+
 	let url = '';
-	
+
 	if (noMember == 'noMember') {
 		url = '/noMember/delivery/info/form';
 	} else {
@@ -99,7 +99,7 @@ var fnGoToDelivery = function(param, noMember) {
 	url += '&ordDtlNo=' + $(param).attr('ordDtlNo');
 	url += '&invoiceNo=' + $(param).attr('invoiceNo');
 	url += '&shipCompCd=' + $(param).attr('shipCompCd');
-	
+
 	cfnGoToPage(_frontUrl + url);
 }
 
@@ -121,10 +121,10 @@ var fnDecideOrder = function(param) {
 		sureBtnText: "확인",
 		sureBtnClick: function(){
 			let data = {};
-			
+
 			data.ordNo = ordNo;
 			data.ordDtlNoArr = orderDecisionArr;
-			
+
 			var jsonData = JSON.stringify(data);
 			gagajf.ajaxJsonSubmit('/mypage/order/decision'
 				, jsonData
@@ -143,7 +143,7 @@ var fnDecideOrder = function(param) {
 var fnCreateReview = function(param) {
 	// 이전 페이지 정보 세션 저장
 	fnSetPrePageInfo()
-	
+
 	let ordNo = $(param).attr('ordNo');
 	let ordDtlNo = $(param).attr('ordDtlNo');
 	let goodsCd = $(param).attr('goodsCd');
@@ -162,19 +162,19 @@ var fnCreateCart = function(param) {
 	}
 
 	let data = {};
-	
+
 	data.ordNo = ordNo;
 	data.ordDtlNo = ordDtlNo;
-	
+
 	var jsonData = JSON.stringify(data);
-	
+
 	gagajf.ajaxJsonSubmit(url, jsonData, fnAddCart);
 }
 
 //장바구니담기
 var fnAddCart = function(param){
 	let data = [];
-	
+
 	$.each(param, function(idx, item) {
 		let obj = {};
 		obj.goodsCd = item.goodsCd;
@@ -189,7 +189,7 @@ var fnAddCart = function(param){
 
 		data.push(obj);
 	});
-	
+
 	cfnAddCart(data);
 }
 
@@ -199,9 +199,9 @@ var fnReSendSms = function(param) {
 	let url = '/mypage/gift/kakao/resend';
 	let data = {};
 	data.ordNo = ordNo;
-	
+
 	let jsonData = JSON.stringify(data);
-	
+
 	gagajf.ajaxJsonSubmit(url, jsonData, function(result) {
 		console.log(result);
 	}, true);
@@ -211,7 +211,7 @@ var fnReSendSms = function(param) {
 var fnCreateChange = function(param, gubun, noMember) {
 	// 이전 페이지 정보 세션 저장
 	fnSetPrePageInfo()
-	
+
 	let ordCanChgQty = $(param).attr('ordCanChgQty');
 	let str = '';
 	let url = '';
@@ -252,7 +252,7 @@ var fnCreateChange = function(param, gubun, noMember) {
 	if (noMember != 'noMember') {
 		url += '&ordNo=' + $(param).attr('ordNo');
 	}
-	
+
 	cfnGoToPage(_frontUrl + url);
 }
 
@@ -263,7 +263,7 @@ var fnDeleteOrder = function(noMember) {
 		sureBtnText: "확인",
 		sureBtnClick: function(){
 			let url = '';
-			
+
 			if (noMember == 'noMember') {
 				url = '/noMember/order/delete';
 			} else {
@@ -364,7 +364,7 @@ var fnReceipt = function(param) {
 		if (!gagajf.isNull(paymentInfo.ordChgSq)) {
 			order_no = 'C' + paymentInfo.ordChgSq;
 		}
-		
+
 		// URL 설정
 		receiptWin += '?cmd=card_bill';
 		receiptWin += '&tno=' + paymentInfo.pgTid;
@@ -379,7 +379,7 @@ var fnReceipt = function(param) {
 		receiptWin += '&cash_no=' + paymentInfo.cashTradeNo;
 		receiptWin += '&order_id=' + ordNo;
 		receiptWin += '&trade_mony=' + (orderAmtInfo.realOrdAmt + orderAmtInfo.realDelvAmt);
-		
+
 		// 팝업 크기 설정
 		option = 'width=370, height=625';
 	} else if (param == 'cancel') {
@@ -393,7 +393,7 @@ var fnReceipt = function(param) {
 			mcxDialog.alert('아직 전표생성이 되지 않았습니다.');
 			return false;
 		}
-		
+
 		// 팝업 크기 설정
 		option = 'width=455, height=815';
 	} else if (param == 'delivery') {
@@ -402,7 +402,7 @@ var fnReceipt = function(param) {
 		receiptWin += '&tno=' + oneData.pgTid;
 		receiptWin += '&order_no=' + oneData.ordNo;
 		receiptWin += '&trade_mony=' + oneData.addPayCost;
-		
+
 		// 팝업 크기 설정
 		option = 'width=455, height=815';
 	}
@@ -422,7 +422,7 @@ var fnGetTextLength = function(obj, maxLen) {
 	//	$(obj).val(content.substring(0, maxLen));
 	//	$('.txt_cnt').html('<span id="review_cnt" class="c_primary">'+maxLen+'</span>/'+maxLen);
 	//}
-	
+
 	var content = $(obj).val();
 	$('.txt_cnt').html('<span id="review_cnt" class="c_primary">'+content.length+'</span>/'+maxLen);
 };
@@ -433,12 +433,12 @@ var fnReviewCreate = function(obj1,obj2,obj3) {
 	let ordDtlNo = obj2;
 	let goodsCd = obj3;
 	let reviewStat = 'c';
-	
+
 	$('#createReview input[name=ordNo]').val(ordNo);
 	$('#createReview input[name=ordDtlNo]').val(ordDtlNo);
 	$('#createReview input[name=goodsCd]').val(goodsCd);
 	$('#createReview input[name=reviewStat]').val(reviewStat);
-	
+
 	document.createReview.submit();
 }
 
@@ -471,9 +471,9 @@ var fnCreCancel = function(param, noMember) {
 	let data = {};
 	data.ordNo = ordNo;
 	data.ordChgSq = ordChgSq;
-	
+
 	let jsonData = JSON.stringify(data);
-	
+
 	mcxDialog.confirm(msg, {
 		cancelBtnText: "취소",
 		sureBtnText: "확인",
@@ -537,11 +537,11 @@ function getFormatDate(date) {
 	if (day > lastDay) {
 		day = lastDay;
 	}
-	
+
 	month = month >= 10 ? month : '0' + month;
-	
+
 	day = day >= 10 ? day : '0' + day;
-	
+
 	return year + '-' + month + '-' + day;
 }
 
@@ -549,10 +549,10 @@ function getFormatDate(date) {
 var fnSetInitPeriod = function() {
 	let date 		= new Date();
 	let edDate 		= getFormatDate(date);
-	
+
 	date.setDate(date.getDate() - 7);
 	let stDate 		= getFormatDate(date);
-	
+
 	$('#edDate').val(edDate);
 	$('#searchForm input[name=edDate]').val(edDate);
 	$('#stDate').val(stDate);
@@ -564,7 +564,8 @@ var fnSetPrePageInfo = function() {
 	// 인피니스크롤위치이동
 	let scrollpos = $(window).scrollTop();
 	localStorage.setItem('scrollpos', scrollpos);
-	
+	gagajf.setCookie('scrollpos', scrollpos);
+
 	// PageNo 저장
 	let pageNo = $("#searchForm input[name=pageNo]").val();
 	localStorage.setItem('pageNo', pageNo);
@@ -587,7 +588,7 @@ var fnSetPrePageInfo = function() {
 // 캐쉬페이징 정보 설정
 var fnGetPrePageInfo = function() {
 	pageNo = localStorage.getItem('pageNo');
-	
+
 	var period = localStorage.getItem('period');
 	$.each($('#odDatePop button'), function(idx, item) {
 		if ($(item).attr('period') == period) {
@@ -597,7 +598,7 @@ var fnGetPrePageInfo = function() {
 			$(item).removeClass('on');
 		}
 	});
-	
+
 	var code = localStorage.getItem('code');
 	$.each($('#odStatusPop button'), function(idx, item) {
 		if ($(item).attr('code') == code) {

src/main/webapp/biz/search.js

@@ -520,6 +520,7 @@ var fnSortingChange = function (obj, sortingType, stat, appGb){
 var fnClickGoodsCd = function (goodsCd, mainColorCd, keyWord , searchId){
 	let scrollpos = $(window).scrollTop();
 	localStorage.setItem('scrollpos', scrollpos);
+	gagajf.setCookie('scrollpos',scrollpos);
 	cfnGoToGoodsDetail(goodsCd, mainColorCd,'','','','', keyWord , searchId);
 }
 

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

@@ -63,7 +63,7 @@ var gagaInfiniteScroll = {
 	},
 	scrollCheck : function() {
 		var obj = this.obj, stat = this.pageStatus;
-		
+
 		if ($('[data-id="layer_infinite"]').scrollTop() + $('[data-id="layer_infinite"]').height() >= $('[data-id="layer_infinite_item"]').height() ) { // 더보기
 			if (stat.loadAlign == 'not') {
 				var pageLen = this.pageStatus.pageNum.length - 1;
@@ -72,7 +72,7 @@ var gagaInfiniteScroll = {
 				this.pageStatus.loadPage = nextPageNum;
 				stat.loadAlign = 'next';
 				this.getDataList();
-				
+
 			};
 		}
 	},
@@ -111,7 +111,7 @@ var gagaInfiniteScroll = {
 //		$(window).on('scroll', function() {
 //			gagaInfiniteScroll.scrollCheck();
 //		});
-		
+
 		$('[data-id="layer_infinite"]').on('scroll', function() {
 			gagaInfiniteScroll.scrollCheck();
 		});
@@ -164,6 +164,10 @@ var gagaInfiniteScroll = {
 			// Append HTML
 			this.obj.$ajaxBox.append($addHtm);
 
+			if(gagajf.getCookie('scrollpos')){
+				scrollTop = gagajf.getCookie('scrollpos');
+				gagajf.setCookie('scrollpos', null);
+			}
 			if (scrollTop && containerHeight) {
 				gagaInfiniteScroll.obj.$window.scrollTop.scrollTop(0).scrollTop(scrollTop);
 			} else {

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

@@ -86,6 +86,7 @@ var gagaInfiniteScroll = {
 		if ( pos != null && $(window).scrollTop() < pos ) {
 			$("html, body").scrollTop(pos);
 			localStorage.removeItem('scrollpos');
+			gagajf.setCookie('scrollpos',null);
 		}
 	},
 	getDataList : function() {