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

src/main/webapp/WEB-INF/views/mob/display/BrandMainFormMob.html

@@ -609,10 +609,10 @@
 
 	// 스크립트 제거
 	function fnRemoveHTML(text){
-		text = text.replace(/(<br>|<br\/>|<br \/>)/g, "\n");
-		text = text.replace(/<(\/)?([a-zA-Z]*)(\s[a-zA-Z]*=[^>]*)?(\s)*(\/)?>/ig, "");
-		text = text.replace(/(?:\r\n|\r|\n)/g, '<br/>');
-		return text;
+		var reText = text.replace(/(<br>|<br\/>|<br \/>)/g, "\n");
+		reText = reText.replace(/<(\/)?([a-zA-Z]*)(\s[a-zA-Z]*=[^>]*)?(\s)*(\/)?>/ig, "");
+		reText = reText.replace(/(?:\r\n|\r|\n)/g, '<br/>');
+		return reText;
 	}
 
 	// 브랜드메인 배너 <br> 처리

src/main/webapp/WEB-INF/views/mob/display/CategoryMainFormMob.html

@@ -201,10 +201,10 @@
 
 		// 스크립트 제거
 		function fnRemoveHTML(text){
-			text = text.replace(/(<br>|<br\/>|<br \/>)/g, "\n");
-			text = text.replace(/<(\/)?([a-zA-Z]*)(\s[a-zA-Z]*=[^>]*)?(\s)*(\/)?>/ig, "");
-			text = text.replace(/(?:\r\n|\r|\n)/g, '<br/>');
-			return text;
+			var reText = text.replace(/(<br>|<br\/>|<br \/>)/g, "\n");
+			reText = reText.replace(/<(\/)?([a-zA-Z]*)(\s[a-zA-Z]*=[^>]*)?(\s)*(\/)?>/ig, "");
+			reText = reText.replace(/(?:\r\n|\r|\n)/g, '<br/>');
+			return reText;
 		}
 
 		// 배너 슬라이더 <br> 처리

src/main/webapp/WEB-INF/views/mob/display/MallMainFormMob.html

@@ -42,7 +42,7 @@
 																<input type="hidden" name="mainTitlee" th:value="${ContentsData.strTitle1}"/>
 															</dd>
 															<!--													<dd>NEW ARRIVAL</dd>-->
-															<dd class="txt_xs mainSubTitle" th:text="${ContentsData.subText1}">
+															<dd class="txt_xs mainSubTitle">
 																<input type="hidden" name="mainSubTitlee" th:value="${ContentsData.subText1}"/>
 															</dd>
 														</dl>
@@ -798,10 +798,10 @@
 
 		// 스크립트 제거
 		function fnRemoveHTML(text){
-			text = text.replace(/(<br>|<br\/>|<br \/>)/g, "\n");
-			text = text.replace(/<(\/)?([a-zA-Z]*)(\s[a-zA-Z]*=[^>]*)?(\s)*(\/)?>/ig, "");
-			text = text.replace(/(?:\r\n|\r|\n)/g, '<br/>');
-			return text;
+			var reText = text.replace(/(<br>|<br\/>|<br \/>)/g, "\n");
+			reText = reText.replace(/<(\/)?([a-zA-Z]*)(\s[a-zA-Z]*=[^>]*)?(\s)*(\/)?>/ig, "");
+			reText = reText.replace(/(?:\r\n|\r|\n)/g, '<br/>');
+			return reText;
 		}
 		// 컨텐츠 호출
 		$(document).ready(function() {

src/main/webapp/WEB-INF/views/mob/display/OutletMainFormMob.html

@@ -188,10 +188,10 @@
 
 		// 스크립트 제거
 		function fnRemoveHTML(text){
-			text = text.replace(/(<br>|<br\/>|<br \/>)/g, "\n");
-			text = text.replace(/<(\/)?([a-zA-Z]*)(\s[a-zA-Z]*=[^>]*)?(\s)*(\/)?>/ig, "");
-			text = text.replace(/(?:\r\n|\r|\n)/g, '<br/>');
-			return text;
+			var reText = text.replace(/(<br>|<br\/>|<br \/>)/g, "\n");
+			reText = reText.replace(/<(\/)?([a-zA-Z]*)(\s[a-zA-Z]*=[^>]*)?(\s)*(\/)?>/ig, "");
+			reText = reText.replace(/(?:\r\n|\r|\n)/g, '<br/>');
+			return reText;
 		}
 
 		$('.subject').each(function (){

src/main/webapp/WEB-INF/views/web/display/BrandMainFormWeb.html

@@ -838,10 +838,10 @@ $(document).ready( function() {
 
 	// 스크립트 제거
 	function fnRemoveHTML(text){
-		text = text.replace(/(<br>|<br\/>|<br \/>)/g, "\n");
-		text = text.replace(/<(\/)?([a-zA-Z]*)(\s[a-zA-Z]*=[^>]*)?(\s)*(\/)?>/ig, "");
-		text = text.replace(/(?:\r\n|\r|\n)/g, '<br/>');
-		return text;
+		var reText = text.replace(/(<br>|<br\/>|<br \/>)/g, "\n");
+		reText = reText.replace(/<(\/)?([a-zA-Z]*)(\s[a-zA-Z]*=[^>]*)?(\s)*(\/)?>/ig, "");
+		reText = reText.replace(/(?:\r\n|\r|\n)/g, '<br/>');
+		return reText;
 	}
 
 	// 브랜드메인 배너 <br> 처리

src/main/webapp/WEB-INF/views/web/display/CategoryMainFormWeb.html

@@ -255,10 +255,10 @@
 
 	// 스크립트 제거
 	function fnRemoveHTML(text){
-		text = text.replace(/(<br>|<br\/>|<br \/>)/g, "\n");
-		text = text.replace(/<(\/)?([a-zA-Z]*)(\s[a-zA-Z]*=[^>]*)?(\s)*(\/)?>/ig, "");
-		text = text.replace(/(?:\r\n|\r|\n)/g, '<br/>');
-		return text;
+		var reText = text.replace(/(<br>|<br\/>|<br \/>)/g, "\n");
+		reText = reText.replace(/<(\/)?([a-zA-Z]*)(\s[a-zA-Z]*=[^>]*)?(\s)*(\/)?>/ig, "");
+		reText = reText.replace(/(?:\r\n|\r|\n)/g, '<br/>');
+		return reText;
 	}
 
 	// 배너 슬라이더 <br> 처리

src/main/webapp/WEB-INF/views/web/display/MallMainFormWeb.html

@@ -1477,10 +1477,10 @@ if (mainTvLength < 2) {
 
 // 스크립트 제거
 function fnRemoveHTML(text){
-	text = text.replace(/(<br>|<br\/>|<br \/>)/g, "\n");
-	text = text.replace(/<(\/)?([a-zA-Z]*)(\s[a-zA-Z]*=[^>]*)?(\s)*(\/)?>/ig, "");
-	text = text.replace(/(?:\r\n|\r|\n)/g, '<br/>');
-	return text;
+	var reText = text.replace(/(<br>|<br\/>|<br \/>)/g, "\n");
+	reText = reText.replace(/<(\/)?([a-zA-Z]*)(\s[a-zA-Z]*=[^>]*)?(\s)*(\/)?>/ig, "");
+	reText = reText.replace(/(?:\r\n|\r|\n)/g, '<br/>');
+	return reText;
 }
 
 $(document).ready(function() {

src/main/webapp/WEB-INF/views/web/display/OutletMainFormWeb.html

@@ -249,10 +249,10 @@
 
 		// 스크립트 제거
 		function fnRemoveHTML(text){
-			text = text.replace(/(<br>|<br\/>|<br \/>)/g, "\n");
-			text = text.replace(/<(\/)?([a-zA-Z]*)(\s[a-zA-Z]*=[^>]*)?(\s)*(\/)?>/ig, "");
-			text = text.replace(/(?:\r\n|\r|\n)/g, '<br/>');
-			return text;
+			var reText = text.replace(/(<br>|<br\/>|<br \/>)/g, "\n");
+			reText = reText.replace(/<(\/)?([a-zA-Z]*)(\s[a-zA-Z]*=[^>]*)?(\s)*(\/)?>/ig, "");
+			reText = reText.replace(/(?:\r\n|\r|\n)/g, '<br/>');
+			return reText;
 		}
 
 		$('.subject').each(function (){