Ver código fonte

gaga.summernote.js 변경에 따른 참조 파일 날짜 수정

eskim 5 anos atrás
pai
commit
22c617ebf5

+ 1 - 1
src/main/webapp/WEB-INF/views/board/FaqDetailForm.html

@@ -162,7 +162,7 @@
 </div>
 
 <script type="text/javascript" src="/ux/plugins/summernote/summernote.js?v=2020103001"></script>
-<script type="text/javascript" src="/ux/plugins/gaga/gaga.summernote.js?v=2021053001"></script>
+<script type="text/javascript" src="/ux/plugins/gaga/gaga.summernote.js?v=2021053101"></script>
 <script th:inline="javascript">
 /*<![CDATA[*/
 	// 저장

+ 1 - 1
src/main/webapp/WEB-INF/views/board/NoticeForm.html

@@ -216,7 +216,7 @@
 	</div>
 
 <script type="text/javascript" src="/ux/plugins/summernote/summernote.js?v=2020103001"></script>
-<script type="text/javascript" src="/ux/plugins/gaga/gaga.summernote.js?v=2021053001"></script>
+<script type="text/javascript" src="/ux/plugins/gaga/gaga.summernote.js?v=2021053101"></script>
 <script th:inline="javascript">
 /*<![CDATA[*/
 	// 공지사항유형(10:사이트공지, 20:내부공지)

+ 1 - 1
src/main/webapp/WEB-INF/views/display/MainContentsPopupForm.html

@@ -39,7 +39,7 @@
 </div>
 
 <script type="text/javascript" src="/ux/plugins/summernote/summernote.js?v=2020103001"></script>
-<script type="text/javascript" src="/ux/plugins/gaga/gaga.summernote.js?v=2021053001"></script>
+<script type="text/javascript" src="/ux/plugins/gaga/gaga.summernote.js?v=2021053101"></script>
 <script type="text/javascript" src="/ux/plugins/gaga/gaga.kollus.js"></script>
 <script th:inline="javascript">
 	/*<![CDATA[*/

+ 11 - 1
src/main/webapp/WEB-INF/views/goods/GoodsDetailForm.html

@@ -662,7 +662,7 @@
 		</div>	<!--  class=panelStyle -->
 	</div> <!--  class=modalPopup -->
 <script type="text/javascript" src="/ux/plugins/summernote/summernote.js?v=2020103001"></script>
-<script type="text/javascript" src="/ux/plugins/gaga/gaga.summernote.js?v=2021053001"></script>
+<script type="text/javascript" src="/ux/plugins/gaga/gaga.summernote.js?v=2021053101"></script>
 <script th:inline="javascript">
 /*<![CDATA[*/
 
@@ -2543,6 +2543,16 @@
 
 		fnGoodsDeailSearch();
 		
+		// Create a summernote
+		var snOptions = gagaSn.getToolbarOptions('media');
+		gagaSn.createSummernote(snOptions, '#goodsContentsDesc');
+		gagaSn.createSummernote(snOptions, '#goodsCharacterDesc');
+		gagaSn.createSummernote(snOptions, '#goodsDesc');
+		gagaSn.createSummernote(snOptions, '#goodsPcTopDesc');
+		gagaSn.createSummernote(snOptions, '#goodsMobileTopDesc');
+		gagaSn.createSummernote(snOptions, '#goodsPcDownDesc');
+		gagaSn.createSummernote(snOptions, '#goodsMobileDownDesc');
+		
 	});
 	
 /*]]>*/

+ 1 - 1
src/main/webapp/WEB-INF/views/goods/GoodsNoticeForm.html

@@ -189,7 +189,7 @@
 	</div>
 
 <script type="text/javascript" src="/ux/plugins/summernote/summernote.js?v=2020103001"></script>
-<script type="text/javascript" src="/ux/plugins/gaga/gaga.summernote.js?v=2021053001"></script>
+<script type="text/javascript" src="/ux/plugins/gaga/gaga.summernote.js?v=2021053101"></script>
 <script th:inline="javascript">
 /*<![CDATA[*/
 

+ 1 - 1
src/main/webapp/WEB-INF/views/goods/GoodsSizeInfoForm.html

@@ -135,7 +135,7 @@
 		</form>
 	</div>
 <script type="text/javascript" src="/ux/plugins/summernote/summernote.js?v=2020103001"></script>
-<script type="text/javascript" src="/ux/plugins/gaga/gaga.summernote.js?v=2021053001"></script>
+<script type="text/javascript" src="/ux/plugins/gaga/gaga.summernote.js?v=2021053101"></script>
 <script th:inline="javascript">
 /*<![CDATA[*/
 	var sizeGbList = { "1":"표준사이즈", "2":"측정가이드" };

+ 1 - 1
src/main/webapp/WEB-INF/views/marketing/CardInterestPopupForm.html

@@ -117,7 +117,7 @@
 		</div>
 	</div>
 <script type="text/javascript" src="/ux/plugins/summernote/summernote.js?v=2020103001"></script>
-<script type="text/javascript" src="/ux/plugins/gaga/gaga.summernote.js?v=2021053001"></script>	
+<script type="text/javascript" src="/ux/plugins/gaga/gaga.summernote.js?v=2021053101"></script>	
 <script th:inline="javascript">
 /*<![CDATA[*/
 	

+ 1 - 1
src/main/webapp/WEB-INF/views/marketing/MailHeaderFooterDetailForm.html

@@ -78,7 +78,7 @@
 </div>
 
 <script type="text/javascript" src="/ux/plugins/summernote/summernote.js?v=2020103001"></script>
-<script type="text/javascript" src="/ux/plugins/gaga/gaga.summernote.js?v=2021053001"></script>
+<script type="text/javascript" src="/ux/plugins/gaga/gaga.summernote.js?v=2021053101"></script>
 <script th:inline="javascript">
 /*<![CDATA[*/
 	// 저장

+ 1 - 1
src/main/webapp/WEB-INF/views/marketing/MailTemplateDetailForm.html

@@ -420,7 +420,7 @@
 </div>
 
 <script type="text/javascript" src="/ux/plugins/summernote/summernote.js?v=2020103001"></script>
-<script type="text/javascript" src="/ux/plugins/gaga/gaga.summernote.js?v=2021053001"></script>
+<script type="text/javascript" src="/ux/plugins/gaga/gaga.summernote.js?v=2021053101"></script>
 <script th:inline="javascript">
 /*<![CDATA[*/
 	var goodsStatList = gagajf.convertToArray([[${goodsStatList}]]);

+ 1 - 1
src/main/webapp/WEB-INF/views/marketing/PlanDetailPopupForm.html

@@ -758,7 +758,7 @@
 </div>
 
 <script type="text/javascript" src="/ux/plugins/summernote/summernote.js?v=2020103001"></script>
-<script type="text/javascript" src="/ux/plugins/gaga/gaga.summernote.js?v=2021053001"></script>
+<script type="text/javascript" src="/ux/plugins/gaga/gaga.summernote.js?v=2021053101"></script>
 <script th:inline="javascript">
 /*<![CDATA[*/
 

+ 1 - 1
src/main/webapp/WEB-INF/views/marketing/PlanTemplatePopupForm.html

@@ -1072,7 +1072,7 @@
 	</div>
 </div>
 <script type="text/javascript" src="/ux/plugins/summernote/summernote.js?v=2020103001"></script>
-<script type="text/javascript" src="/ux/plugins/gaga/gaga.summernote.js?v=2021053001"></script>
+<script type="text/javascript" src="/ux/plugins/gaga/gaga.summernote.js?v=2021053101"></script>
 <script th:inline="javascript">
 /*<![CDATA[*/
 	

+ 1 - 1
src/main/webapp/ux/js/admin.common.js

@@ -472,7 +472,7 @@ function cfnChangeCalendar(diff, obj1, obj2, dateFormat) {
 		sdt.setDate(1);
 		edt.setMonth(emonth + 1);
 		edt.setDate(0);
-	} else if (diff == 'lm') {
+	} else if (diff == 'pm') {
 		sdt.setMonth(smonth - 1);
 		sdt.setDate(1);
 		edt.setMonth(emonth);

+ 2 - 2
src/main/webapp/ux/plugins/gaga/gaga.summernote.js

@@ -126,7 +126,7 @@ var gagaSn = {
 		$.ajax({
 			data : formData,
 			type : 'POST',
-			url : '/common/file/upload?subDir=/Upload/editor',
+			url : '/common/file/upload?subDir=/editor',
 			cache : false,
 			contentType : false,
 			enctype : 'multipart/form-data',
@@ -135,7 +135,7 @@ var gagaSn = {
 				console.log("================== EDITOR FILE UPLOAD ===================");
 				console.log(data);
 				console.log("================== // EDITOR FILE UPLOAD ===================");
-				$(editorId).summernote('insertImage', data.viewUrl + "/Upload/editor/" + data.newFileName);
+				$(editorId).summernote('insertImage', data.viewUrl + "/editor/" + data.newFileName);
 			}
 		});
 	}

+ 2 - 1
src/main/webapp/ux/plugins/gaga/gaga.validation.js

@@ -961,7 +961,8 @@ var gagajf = {
 			$(tgtId +' #' + fromObj).val(date.format("YYYY-MM-") + '01');
 			$(tgtId +' #' + toObj).val((date.format('YYYY-MM-') + '01').toDate('YYYY-MM-DD').after(0, 1, 0).before(0, 0, 1).format("YYYY-MM-DD"));
 		} else if (type == 'pm') { // 지난달
-			$(tgtId +' #' + fromObj).val(date.before(0, 1, 0).format("YYYY-MM-")  + '01');
+			//$(tgtId +' #' + fromObj).val(date.before(0, 1, 0).format("YYYY-MM-")  + '01');
+			$(tgtId +' #' + fromObj).val((date.format('YYYY-MM-') + '01').toDate('YYYY-MM-DD').before(0, 1, 0).format("YYYY-MM-")  + '01');
 			$(tgtId +' #' + toObj).val((date.format('YYYY-MM-') + '01').toDate('YYYY-MM-DD').before(0, 0, 1).format("YYYY-MM-DD"));
 		} else if (type == '3m') { // 최근3개월
 			$(tgtId +' #' + fromObj).val(date.before(0, 3, 0).after(0, 0, 1).format("YYYY-MM-DD"));