Skip to content

C
check
Commit a7768994 by vietdo
Options

#19267 vtour対応

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