Pārlūkot izejas kodu

Merge remote-tracking branch 'origin/style' into jsh77b

jsh77b 4 gadi atpakaļ
vecāks
revīzija
03afcab14c

+ 1 - 1
src/main/webapp/ux/pc/css/main.css

@@ -391,7 +391,7 @@
 .fy_nav .btn_shape.active span {position:relative; color:#ffffff;}
 .fy_nav .btn_shape.active + a {display:inline-block; font-size:14px; text-align:right;position:absolute;top:50%;right:45px;transform:translateY(-50%);color:#888888;z-index:10;}
 .fy_nav .btn_shape.active + a::after {content:'';width:7px;height: 14px;display:inline-block;position:absolute;top:50%;right: -13px;transform:translateY(-50%);background:url('//image.istyle24.com/Style24/images/pc/ico_more_lg.png');background-repeat:no-repeat;background-position: 0px 50%;}
-.fy_item {display:none; position:relative; width:100%; min-height:490px; background:rgba(0,0,0,0.5);}
+.fy_item {display:none; position:relative; width:100%; min-height:490px; background:rgba(255,255,255);}
 .fy_item::after {content:'';display:block;clear:both;}
 .fy_item.active {display:block;}
 .fy_item .part {float:left; position:relative; min-height:1px;}

+ 14 - 4
src/main/webapp/ux/style24_link.js

@@ -1582,12 +1582,22 @@ function sendSns(sns, url, txt, media, description)
 	switch(sns)
 	{
 		case 'facebook':
-			var faceUrl = _isApp == 'true' ? 'public://?link=http://www.facebook.com/sharer/sharer.php?u=' : 'http://www.facebook.com/sharer/sharer.php?u=';
-			window.open(faceUrl + _url, "_blank", 'width=600,height=400,resizable=yes,scrollbars=yes');
+			var faceUrl = 'http://www.facebook.com/sharer/sharer.php?u=';
+
+			if (_isApp != null && _isApp == 'true') {
+				location.href = 'public://?link=' + faceUrl + _url;
+			} else {
+				window.open(faceUrl + _url, "_blank", 'width=600,height=400,resizable=yes,scrollbars=yes');
+			}
 			break;
 		case 'twitter':
-			var twitUrl = _isApp == 'true' ? 'public://?link=http://twitter.com/intent/tweet?text=' : 'http://twitter.com/intent/tweet?text=';
-			window.open(twitUrl + _txt + '&url=' + _url, "_blank", 'width=600,height=400,resizable=yes,scrollbars=yes');
+			var twitUrl = 'http://twitter.com/intent/tweet?text=';
+
+			if (_isApp != null && _isApp == 'true') {
+				location.href = 'public://?link=' + twitUrl + _txt;
+			} else {
+				window.open(faceUrl + _txt + '&url=' + _url, "_blank", 'width=600,height=400,resizable=yes,scrollbars=yes');
+			}
 			break;
 		default:
 			mcxDialog.alert('지원하지 않는 SNS입니다.');