#19267 vtour対応

abvw/js/contentview.js

@@ -6232,7 +6232,6 @@ CONTENTVIEW.panoContentLink = function(targetContentId, page){
              //既存ログを送信する
              COMMON.SetEndLog(CONTENTVIEW_GENERAL.contentID);
              COMMON.RegisterLog();
-             console.log("data.contentData.alertMessageLevel:"+data.contentData.alertMessageLevel);
              if(data.contentData.alertMessageLevel){
 
                  if(data.contentData.alertMessageLevel == CONTENTVIEW_CREATEOBJECT.alertMessageLevel.ShowAlert){
@@ -6246,7 +6245,7 @@ CONTENTVIEW.panoContentLink = function(targetContentId, page){
                             'oldContent' : oldContent
                         };
 
-                        CONTENTVIEW_CREATEOBJECT.showContentConfirmDialog(data.contentData.alertMessageLevel, data.contentData.alertMessage);
+                        CONTENTVIEW_CREATEOBJECT.showContentConfirmDialog(data.contentData.alertMessageLevel, data.contentData.alertMessage, data.contentData.contentType);
                      }
                  }
                  else if(data.contentData.alertMessageLevel == CONTENTVIEW_CREATEOBJECT.alertMessageLevel.RequirePassword){
@@ -6260,23 +6259,28 @@ CONTENTVIEW.panoContentLink = function(targetContentId, page){
                             'oldContent' : oldContent
                         };
 
-                        CONTENTVIEW_CREATEOBJECT.showContentConfirmDialog(data.contentData.alertMessageLevel);
+                        CONTENTVIEW_CREATEOBJECT.showContentConfirmDialog(data.contentData.alertMessageLevel, data.contentData.contentType);
                  }
                  else if(data.contentData.alertMessageLevel == CONTENTVIEW_CREATEOBJECT.alertMessageLevel.None){
-                        ClientData.common_preContentId(targetContentId);
-                        ClientData.common_prePageNo(page);
-
-                        //古いページを保存する
-                        var oldContent = { oldContentID: CONTENTVIEW_GENERAL.contentID, oldPageIndex: CONTENTVIEW_GENERAL.panoPageNo };
-                        var dataJump = ClientData.JumpQueue();
-                        dataJump.push(oldContent);
-                        ClientData.JumpQueue(dataJump);
-                        
-                    	if (CONTENTVIEW_GENERAL.avwUserEnvObj.isMobile() && ClientData.isGetitsMode()) {
-                    		AVWEB.avwScreenMove(COMMON.ScreenIds.ContentViewGetits);
-                    	} else {
-                    		CONTENTVIEW.screenMove();
-                    	}
+                	 if(data.contentData.contentType == COMMON.ContentTypeKeys.Type_Link){
+                		 HEADER.viewLinkContentById(targetContentId);
+                		 
+                	 }else{
+                		 ClientData.common_preContentId(targetContentId);
+                         ClientData.common_prePageNo(page);
+
+                         //古いページを保存する
+                         var oldContent = { oldContentID: CONTENTVIEW_GENERAL.contentID, oldPageIndex: CONTENTVIEW_GENERAL.panoPageNo };
+                         var dataJump = ClientData.JumpQueue();
+                         dataJump.push(oldContent);
+                         ClientData.JumpQueue(dataJump);
+                         
+                     	if (CONTENTVIEW_GENERAL.avwUserEnvObj.isMobile() && ClientData.isGetitsMode()) {
+                     		AVWEB.avwScreenMove(COMMON.ScreenIds.ContentViewGetits);
+                     	} else {
+                     		CONTENTVIEW.screenMove();
+                     	}
+                	 }
                         
                  }
              }