Merge branch 'develop' of http://112.172.147.34:4936/style24/style24.admin.git into develop

src/main/java/com/style24/admin/biz/web/TsaGoodsController.java

@@ -1022,7 +1022,7 @@ public class TsaGoodsController extends TsaBaseController {
 				goodsImageYn = tmpGoods.getGoodsImageYn();
 			}
 			if ("N".equals(goodsImageYn)) {
-				throw new IllegalStateException("필수 이미지나 고시정보가 등록되지 않은 상품은 <br/>'승인대기'나 '승인완료' 상태로 변경할 수 없습니다.");
+				throw new IllegalStateException("필수 이미지나 고시정보가 등록되지 않은 상품은 '승인대기'나 '승인완료' 상태로 변경할 수 없습니다.");
 			}
 		}
 

src/main/webapp/ux/js/admin.popup.js

@@ -222,10 +222,11 @@ var cfnOpenGoodsVideoPopup = function(id, objId, formid, type, fullUrl) {
 	var str = '';
 	str += '<div class="videoPopup"  style="width:700px; height:350px"  id="'+id+'">';
 	str += '<button type="button" class="close" onclick="uifnPopupClose(\''+id+'\')"><i class="fa fa-times"></i></button>';
-	if(src.indexOf('http://')!=-1 || src.indexOf('https://')!=-1 && src.indexOf('youtube')==-1){
-		str += '<video id="video" autoplay></video>';
+	//if(src.indexOf('http://')!=-1 || src.indexOf('https://')!=-1 && src.indexOf('youtube')==-1){
+	if ("M" == type){
+		str += '<iframe id="video" frameborder="0" allowfullscreen webkitallowfullscreen mozallowfullscreen></iframe>';
 	}else{
-		str +='<iframe id="video" frameborder="0" allow="autoplay; encrypted-media" allowfullscreen></iframe>';
+		str +='<iframe id="video" frameborder="0" allow="encrypted-media" allowfullscreen></iframe>';
 	}
 	str += '</div>';
 
@@ -236,9 +237,11 @@ var cfnOpenGoodsVideoPopup = function(id, objId, formid, type, fullUrl) {
 	var $thisId = $("#"+id + ">.videoPopup");
 	var popW = parseInt( $thisId.attr("data-width") );
 	var popH = parseInt( $thisId.attr("data-height") );
-	if(src.indexOf('//')!=-1 || src.indexOf('//')!=-1 && src.indexOf('youtube')==-1){
-		$("#video").css({height:500, width:500});
-		$("#video").attr("src", src);
+	//if(src.indexOf('//')!=-1 || src.indexOf('//')!=-1 && src.indexOf('youtube')==-1){
+	if ("M" == type){
+		//$("#video").css({height:500, width:500});
+		src = 'https://v.kr.kollus.com/' + src;
+		$("#video").attr("src", src+"?player_version=html5");
 	}else{
 		$("#video").css({width:popW, height:popH});
 		if (typeof(fullUrl) != 'undefined' && fullUrl != ""){