Skip to content

C
check
Commit 5a33db74 by Masaru Abe
Options

Merge remote-tracking branch 'origin/feature/1.2.1' into feature/1.2.2

parents a6848708 531a6b54
Showing with 12 additions and 2 deletions
abvw/js/contentview_GetData.js
...@@ -340,7 +340,13 @@ function getMediaType1(iValueObj) { ...@@ -340,7 +340,13 @@ function getMediaType1(iValueObj) {
var tempData = iValueObj.contentDataSub[i]; var tempData = iValueObj.contentDataSub[i];
if(tempData.resourceId == resourceId){ if(tempData.resourceId == resourceId){
resourceUrl = tempData.resourceUrl; resourceUrl = tempData.resourceUrl;
//DHカスタム
if( ClientData.serviceOpt_daihatsu() == 'Y'){
var apiUrl = getApiUrl(ClientData.userInfo_accountPath());
resourceUrl = resourceUrl + "?sid=" + ClientData.userInfo_sid() + "&apiurl=" + apiUrl ;
}
break; break;
} }
} }
...@@ -750,6 +756,11 @@ function getMediaType9(iValueObj) { ...@@ -750,6 +756,11 @@ function getMediaType9(iValueObj) {
if(tempData.resourceId == resourceId){ if(tempData.resourceId == resourceId){
resourceUrl = tempData.resourceUrl; resourceUrl = tempData.resourceUrl;
//DHカスタム
if( ClientData.serviceOpt_daihatsu() == 'Y'){
var apiUrl = getApiUrl(ClientData.userInfo_accountPath());
resourceUrl = resourceUrl + "?sid=" + ClientData.userInfo_sid() + "&apiurl=" + apiUrl ;
}
break; break;
} }
} }
...@@ -1589,4 +1600,4 @@ function getPageTransitionConfig(){ ...@@ -1589,4 +1600,4 @@ function getPageTransitionConfig(){
animateType = ClientData.userOpt_pageTransition(); animateType = ClientData.userOpt_pageTransition();
animatePeriod = eval(ClientData.userOpt_pageTransitionPeriod()) * 1000; animatePeriod = eval(ClientData.userOpt_pageTransitionPeriod()) * 1000;
}; };
//End Function: No.4 - Editor : Long - Summary : Render Next Page Content //End Function: No.4 - Editor : Long - Summary : Render Next Page Content
\ No newline at end of file
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