Merge branch 'eskim' into develop

src/main/webapp/WEB-INF/views/mob/goods/GoodsDetailQnaFormMob.html

@@ -17,7 +17,7 @@
 <!-- 상품문의 리스트 내용 -->
 <form id="goodsQnaForm" name="goodsQnaForm" action="#" th:action="@{'/goods/qna/list'}">
 <input type="hidden" name="pageNo"  value ="1"/>
-<input type="hidden" name="pageSize" value ="3"/>
+<input type="hidden" name="pageSize" value ="20"/>
 <input type="hidden" name="relGoodsCd" th:value ="${goodsInfo.goodsCd}"/>
 <div class="pd_qnalist">
 	<div class="info_txt">
@@ -62,10 +62,12 @@
 </div>
 </form>
 <script src="/ux/plugins/jquery/jquery.history.min.js"></script>
-<script src="/ux/plugins/gaga/gaga.infinite.scroll.js"></script>
+<script src="/ux/plugins/gaga/gaga.infinite.scrollLayer.js"></script>
 <script th:inline="javascript">
 /*<![CDATA[*/
 	
+	$(function() { gagaInfiniteScroll.getHistory(); });
+	
 	// 상품 검색
 	var fnGetInfiniteScrollDataList = function(pageNum) {
 	
@@ -171,9 +173,10 @@
 	}
 	
 	$(document).ready( function() {
-		fnGoodsQnaListSearch();
+		//fnGoodsQnaListSearch();
 	});
 	
+	
 /*]]>*/
 </script>	
  </html>

src/main/webapp/WEB-INF/views/mob/goods/GoodsQnaFormMob.html

@@ -33,7 +33,7 @@
 			</div>
 			<!-- //해당상품 -->
 		</div>
-		<div class="modal-body" id="goodsDealQna">
+		<div class="modal-body" id="goodsDealQna" data-id="layer_infinite_item" >
 		</div>
 		<div class="modal-footer">
 			

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

@@ -9,17 +9,21 @@
  *
  * 사용 예)
  * 		// HTML 태그는 다음과 같은 구조로 되어 있어야 하며
- * 		// id 명칭은 infiniteContainer, listBoxOuter, listBox 가 필요하다.
- * 		<section id="infiniteContainer">
- * 			<div id="listBoxOuter">
- * 				<ul id="listBox">
- * 				</ul>
+ * 		// data-id는 layer_infinite,layer_infinite_item 가 필요하고  id 명칭은 infiniteContainer, listBoxOuter, listBox 가 필요하다.
+ * 		<div id="layer_goods_qna" data-id="" > 레어팝업
+ * 			<div class="modal-body" id="goodsDealQna" data-id="layer_infinite_item" >
+ * 				<section id="infiniteContainer">
+ * 					<div id="listBoxOuter">
+ * 						<ul id="listBox">
+ * 						</ul>
+ *					</div>
+ *				</section>
  *			</div>
- *		</section>
+ *		</div>
  *
  * 		// JQUERY History 파일과 인피니트 스크롤 관련 자바스크립트 파일을 import 되어 있어야 한다.
  * 		<script type="text/javascript" src="/ux/plugins/jquery.history.min.js"></script>
- * 		<script type="text/javascript" src="/ux/plugins/gaga.infinite.scroll.js"></script>
+ * 		<script type="text/javascript" src="/ux/plugins/gaga.infinite.scrollLyer.js"></script>
  *
  * 		<script type="text/javascript">
  * 			// 인피니트 스크롤에 대한 History 정보를 가져오기 위해 함수를 호출한다.
@@ -59,8 +63,7 @@ var gagaInfiniteScroll = {
 	},
 	scrollCheck : function() {
 		var obj = this.obj, stat = this.pageStatus;
-
-		if (obj.$window.scrollTop() >= obj.$ajaxBox.offset().top + obj.$ajaxBox.height() - obj.$window.height()) { // 더보기
+		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;
 				var nextPageNum = this.pageStatus.pageNum[pageLen] + 1;
@@ -68,6 +71,7 @@ var gagaInfiniteScroll = {
 				this.pageStatus.loadPage = nextPageNum;
 				stat.loadAlign = 'next';
 				this.getDataList();
+				
 			};
 		}
 	},
@@ -103,7 +107,11 @@ var gagaInfiniteScroll = {
 			gagaInfiniteScroll.draw(historyData.data.htm);
 		};
 
-		$(window).on('scroll', function() {
+//		$(window).on('scroll', function() {
+//			gagaInfiniteScroll.scrollCheck();
+//		});
+		
+		$('[data-id="layer_infinite"]').on('scroll', function() {
 			gagaInfiniteScroll.scrollCheck();
 		});
 	},

src/main/webapp/ux/style24_link.js

@@ -682,7 +682,7 @@ function cfGoodsQng(goodsCd) {
 	var Param = new Object();
 	var str = '<div class="pd_pop full_pop pd_qnalist_pop" id="layer_goods_qna"></div>';
 	if ("P" != _frontGb){
-		str = '<div class="modal pop_full fade pd_pop pd_qnalist_pop" id="layer_goods_qna" tabindex="-1" role="dialog" aria-labelledby="exampleFullLabel" aria-hidden="true"></div>';
+		str = '<div class="modal pop_full fade pd_pop pd_qnalist_pop"  data-id="layer_infinite" id="layer_goods_qna" tabindex="-1" role="dialog" aria-labelledby="exampleFullLabel" aria-hidden="true"></div>';
 	}
 
 	if ($('#layer_goods_qna').length == 0) {