Commit b28ed1f5 by abe

#21820 URLリンクを別タブで開く対応

parent 4572291a
...@@ -1898,16 +1898,17 @@ CONTENTVIEW_CREATEOBJECT.linkURL = function (mediaType, actionType, id, imageUrl ...@@ -1898,16 +1898,17 @@ CONTENTVIEW_CREATEOBJECT.linkURL = function (mediaType, actionType, id, imageUrl
CONTENTVIEW_CREATEOBJECT.makeSsoParam(linkUrlTmp, browserType, objectId); CONTENTVIEW_CREATEOBJECT.makeSsoParam(linkUrlTmp, browserType, objectId);
} else { } else {
//DHカスタム //DHカスタム
if( ClientData.serviceOpt_daihatsu() == 'Y'){ //if( ClientData.serviceOpt_daihatsu() == 'Y'){
var apiUrl = AVWEB.getApiUrl(ClientData.userInfo_accountPath()); // var apiUrl = AVWEB.getApiUrl(ClientData.userInfo_accountPath());
linkUrlTmp = linkUrlTmp + "?sid=" + ClientData.userInfo_sid() + "&apiurl=" + apiUrl ; // linkUrlTmp = linkUrlTmp + "?sid=" + ClientData.userInfo_sid() + "&apiurl=" + apiUrl ;
} //}
if( browserType == 0 ){ if( browserType == 0 ){
CONTENTVIEW_CREATEOBJECT.showHtml(linkUrlTmp, objectId ); CONTENTVIEW_CREATEOBJECT.showHtml(linkUrlTmp, objectId );
CONTENTVIEW_GENERAL.showDialog(true); CONTENTVIEW_GENERAL.showDialog(true);
} else { } else {
window.open(linkUrlTmp, "_blank", "new window, scrollbars=yes"); //#21820
//window.open(linkUrlTmp, "_blank", "new window, scrollbars=yes");
window.open(linkUrlTmp);
} }
} }
......
...@@ -1156,29 +1156,10 @@ HEADER.viewLinkContentById = function(contentId){ ...@@ -1156,29 +1156,10 @@ HEADER.viewLinkContentById = function(contentId){
return; return;
} }
window.open(linkUrl, "_blank", "new window, scrollbars=yes"); //#21820
//window.open(linkUrl, "_blank", "new window, scrollbars=yes");
window.open(linkUrl);
/*
//httpで始まる場合は別ウィンドウで開く
if (linkUrl.toLowerCase().indexOf('http') === 0) {
window.open(linkUrl, "_blank", "new window, scrollbars=yes");
}
else if( linkUrl.toLowerCase().indexOf('mailto') === 0 ){
//window.open(linkUrl, "_self");
location.href=linkUrl;
}
else {
// open url to download file
if (HEADER.isSafariNotOnIpad()) {
window.onbeforeunload = null;
window.open(linkUrl, "_self"); // open url to download file on safari not for ipad
var toogleTime = setTimeout(function () { COMMON.ToogleLogoutNortice() }, 200);
}
else {
window.open(linkUrl); //open url to download file on orther browser
}
}
*/
}, },
function (xhr, b, c) { }); function (xhr, b, c) { });
}; };
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment