Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
C
check
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
abook_web
check
Commits
b28ed1f5
Commit
b28ed1f5
authored
Sep 12, 2016
by
abe
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
#21820 URLリンクを別タブで開く対応
parent
4572291a
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
10 additions
and
28 deletions
+10
-28
abvw/js/contentview_CreateObjects.js
+7
-6
abvw/js/header.js
+3
-22
No files found.
abvw/js/contentview_CreateObjects.js
View file @
b28ed1f5
...
...
@@ -1898,16 +1898,17 @@ CONTENTVIEW_CREATEOBJECT.linkURL = function (mediaType, actionType, id, imageUrl
CONTENTVIEW_CREATEOBJECT
.
makeSsoParam
(
linkUrlTmp
,
browserType
,
objectId
);
}
else
{
//DHカスタム
if
(
ClientData
.
serviceOpt_daihatsu
()
==
'Y'
){
var
apiUrl
=
AVWEB
.
getApiUrl
(
ClientData
.
userInfo_accountPath
());
linkUrlTmp
=
linkUrlTmp
+
"?sid="
+
ClientData
.
userInfo_sid
()
+
"&apiurl="
+
apiUrl
;
}
//if( ClientData.serviceOpt_daihatsu() == 'Y'){
// var apiUrl = AVWEB.getApiUrl(ClientData.userInfo_accountPath());
// linkUrlTmp = linkUrlTmp + "?sid=" + ClientData.userInfo_sid() + "&apiurl=" + apiUrl ;
//}
if
(
browserType
==
0
){
CONTENTVIEW_CREATEOBJECT
.
showHtml
(
linkUrlTmp
,
objectId
);
CONTENTVIEW_GENERAL
.
showDialog
(
true
);
}
else
{
window
.
open
(
linkUrlTmp
,
"_blank"
,
"new window, scrollbars=yes"
);
//#21820
//window.open(linkUrlTmp, "_blank", "new window, scrollbars=yes");
window
.
open
(
linkUrlTmp
);
}
}
...
...
abvw/js/header.js
View file @
b28ed1f5
...
...
@@ -1156,29 +1156,10 @@ HEADER.viewLinkContentById = function(contentId){
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
)
{
});
};
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment