ダイハツカスタム対応

abvw/common/js/avweb.js

@@ -834,3 +834,15 @@ function avwLog(msg) {
 		console.log(msg);		
 		console.log(msg);		
 	}
 	}
 };
 };
+
+function getApiUrl(accountPath) {
+
+	// url 構築
+	var sysSettings = avwSysSetting();
+	var apiUrl = sysSettings.apiUrl;
+	if(accountPath) {
+		apiUrl = format(apiUrl, accountPath);
+	}
+	return apiUrl;
+	
+};
\ No newline at end of file

abvw/common/js/common.js

@@ -187,6 +187,8 @@ var Keys = {
     serviceOpt_catalog_edition: 'catalog_edition',
     serviceOpt_catalog_edition: 'catalog_edition',
     // Session :事業者オプション(serviceOpt)_日比谷カスタム:Char(Y：可能, N：不可)
     // Session :事業者オプション(serviceOpt)_日比谷カスタム:Char(Y：可能, N：不可)
     serviceOpt_hibiyakadan_catalog: 'hibiyakadan_catalog',
     serviceOpt_hibiyakadan_catalog: 'hibiyakadan_catalog',
+    // Session :事業者オプション(serviceOpt)_DHカスタム:Char(Y：可能, N：不可)
+    serviceOpt_daihatsu: 'daihatsu',
     
     
     // Session :共通(common)_コンテンツID:Integer
     // Session :共通(common)_コンテンツID:Integer
     common_contentId: 'common_contentId',
     common_contentId: 'common_contentId',
@@ -1345,6 +1347,14 @@ var ClientData = {
             return SessionStorageUtils.get(Keys.serviceOpt_hibiyakadan_catalog);
             return SessionStorageUtils.get(Keys.serviceOpt_hibiyakadan_catalog);
         }
         }
     },
     },
+    // Session :事業者オプション(serviceOpt)_DH対応:Char(Y：可能, N：不可)
+    serviceOpt_daihatsu: function (data) {
+        if (arguments.length > 0) {
+            SessionStorageUtils.set(Keys.serviceOpt_daihatsu, data);
+        } else {
+            return SessionStorageUtils.get(Keys.serviceOpt_daihatsu);
+        }
+    },
 
 
     // Session :共通(common)_コンテンツID:Integer
     // Session :共通(common)_コンテンツID:Integer
     common_contentId: function (data) {
     common_contentId: function (data) {

abvw/js/contentview.js

@@ -1005,9 +1005,9 @@ function showErrorScreen() {
 
 
     // エラーメッセージの表示
     // エラーメッセージの表示
     var errMes = i18nText('msgPageImgErr');
     var errMes = i18nText('msgPageImgErr');
-    if( errMsg == undefined || errMsg == "" ){
-        errMes = i18nText('msgPageImgErr');
-    }
+    //if( errMsg == undefined || errMsg == "" ){
+    //    errMes = i18nText('msgPageImgErr');
+    //}
     $('#divImageLoading').css('display', 'none');
     $('#divImageLoading').css('display', 'none');
     lockLayout();
     lockLayout();
     /* show error messages */
     /* show error messages */
@@ -2174,7 +2174,15 @@ function displayOverlayForSpecifyContentType(){
         handleForContentTypeVideo(resourceUrl);
         handleForContentTypeVideo(resourceUrl);
     }
     }
     else if(contentType == ContentTypeKeys.Type_Html){
     else if(contentType == ContentTypeKeys.Type_Html){
-        handleForContentTypeHTML(resourceUrl);
+    
+        //DHカスタム
+        var linkUrlTmp = resourceUrl;
+        //DHカスタム
+        if( ClientData.serviceOpt_daihatsu() == 'Y'){
+            var apiUrl = getApiUrl(ClientData.userInfo_accountPath());
+            linkUrlTmp = linkUrlTmp + "?sid=" + ClientData.userInfo_sid() + "&apiurl=" + apiUrl ;
+        }
+        handleForContentTypeHTML(linkUrlTmp);
     }
     }
     
     
     if (isTouchDevice() == true) {
     if (isTouchDevice() == true) {
@@ -2382,7 +2390,6 @@ function handleForContentTypeHTML(resourceUrl){
     $container.css('left','0%');
     $container.css('left','0%');
     $container.css('width','100%');
     $container.css('width','100%');
     $container.css('background-color','white');
     $container.css('background-color','white');
-
     
     
     //START TRB00076 - EDITOR : Long - Date : 09/24/2013 - Summary : Fix for scrolling on ipad
     //START TRB00076 - EDITOR : Long - Date : 09/24/2013 - Summary : Fix for scrolling on ipad
     if(avwUserEnvObj.os == "ipad"){
     if(avwUserEnvObj.os == "ipad"){

abvw/js/contentview_CreateObjects.js

@@ -1324,6 +1324,7 @@ var linkURL = function (mediaType, actionType, id, imageUrl, x, y, w, h, visible
     
     
         //abe
         //abe
         //alert("linkURL");
         //alert("linkURL");
+        
         //詳細ログ作成
         //詳細ログ作成
         var objectLog = new ObjectLogEntity();
         var objectLog = new ObjectLogEntity();
         objectLog.contentid = contentID;
         objectLog.contentid = contentID;
@@ -1340,8 +1341,21 @@ var linkURL = function (mediaType, actionType, id, imageUrl, x, y, w, h, visible
         objectLog.locationWidth = w;
         objectLog.locationWidth = w;
         SetObjectLog(contentID, objectLog);
         SetObjectLog(contentID, objectLog);
         //---
         //---
-    
-        window.open(linkUrl, "_blank", "new window, scrollbars=yes");
+        
+        var linkUrlTmp = linkUrl;
+        //DHカスタム
+        if( ClientData.serviceOpt_daihatsu() == 'Y'){
+            var apiUrl = getApiUrl(ClientData.userInfo_accountPath());
+            linkUrlTmp = linkUrlTmp + "?sid=" + ClientData.userInfo_sid() + "&apiurl=" + apiUrl ;
+        }
+        
+        if( browserType == 0 ){
+            showHtml(linkUrlTmp, objectId );
+            showDialog(true);
+        } else {
+            window.open(linkUrlTmp, "_blank", "new window, scrollbars=yes");
+        }
+        
     };
     };
 };
 };
 linkURL.prototype = new PageObject();
 linkURL.prototype = new PageObject();
@@ -2320,4 +2334,3 @@ function createPageBGM(){
     }                
     }                
 };
 };
 //END : TRB00028 - Editor: Long - Date: 09/10/2013 - Summary : Fix For Page BGM
 //END : TRB00028 - Editor: Long - Date: 09/10/2013 - Summary : Fix For Page BGM
-

abvw/js/login.js

@@ -499,7 +499,9 @@ function saveServiceUserOption(){
         else if( option.serviceName == 'usable_readinglog_object' ) {
         else if( option.serviceName == 'usable_readinglog_object' ) {
             ClientData.serviceOpt_usable_readinglog_object(option.value);
             ClientData.serviceOpt_usable_readinglog_object(option.value);
         }
         }
-        
+        else if( option.serviceName == 'daihatsu' ) {
+            ClientData.serviceOpt_daihatsu(option.value);
+        }
     });
     });
 };
 };