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
5a33db74
Commit
5a33db74
authored
May 16, 2014
by
Masaru Abe
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/feature/1.2.1' into feature/1.2.2
parents
a6848708
531a6b54
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
12 additions
and
2 deletions
+12
-2
abvw/js/contentview_GetData.js
+12
-2
No files found.
abvw/js/contentview_GetData.js
View file @
5a33db74
...
...
@@ -340,7 +340,13 @@ function getMediaType1(iValueObj) {
var
tempData
=
iValueObj
.
contentDataSub
[
i
];
if
(
tempData
.
resourceId
==
resourceId
){
resourceUrl
=
tempData
.
resourceUrl
;
//DHカスタム
if
(
ClientData
.
serviceOpt_daihatsu
()
==
'Y'
){
var
apiUrl
=
getApiUrl
(
ClientData
.
userInfo_accountPath
());
resourceUrl
=
resourceUrl
+
"?sid="
+
ClientData
.
userInfo_sid
()
+
"&apiurl="
+
apiUrl
;
}
break
;
}
}
...
...
@@ -750,6 +756,11 @@ function getMediaType9(iValueObj) {
if
(
tempData
.
resourceId
==
resourceId
){
resourceUrl
=
tempData
.
resourceUrl
;
//DHカスタム
if
(
ClientData
.
serviceOpt_daihatsu
()
==
'Y'
){
var
apiUrl
=
getApiUrl
(
ClientData
.
userInfo_accountPath
());
resourceUrl
=
resourceUrl
+
"?sid="
+
ClientData
.
userInfo_sid
()
+
"&apiurl="
+
apiUrl
;
}
break
;
}
}
...
...
@@ -1589,4 +1600,4 @@ function getPageTransitionConfig(){
animateType
=
ClientData
.
userOpt_pageTransition
();
animatePeriod
=
eval
(
ClientData
.
userOpt_pageTransitionPeriod
())
*
1000
;
};
//End Function: No.4 - Editor : Long - Summary : Render Next Page Content
\ No newline at end of file
//End Function: No.4 - Editor : Long - Summary : Render Next Page Content
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