Commit 0c5081c7 by vietdo

コンテンツ間リンクのバッグを対応する

parent c7c941af
...@@ -6196,7 +6196,6 @@ CONTENTVIEW.panoLog = function(log, scheme){ ...@@ -6196,7 +6196,6 @@ CONTENTVIEW.panoLog = function(log, scheme){
CONTENTVIEW.receivePanoLog = function(e) { CONTENTVIEW.receivePanoLog = function(e) {
var log = JSON.parse(e.data); var log = JSON.parse(e.data);
console.log("log.scheme"+log.scheme);
if(log.hasOwnProperty('scheme')){ if(log.hasOwnProperty('scheme')){
...@@ -6223,7 +6222,7 @@ CONTENTVIEW.panoContentLink = function(targetContentId, page){ ...@@ -6223,7 +6222,7 @@ CONTENTVIEW.panoContentLink = function(targetContentId, page){
"GET", "GET",
params, params,
function (data) { function (data) {
//既存ログを送信する //既存ログを送信する
COMMON.SetEndLog(CONTENTVIEW_GENERAL.contentID); COMMON.SetEndLog(CONTENTVIEW_GENERAL.contentID);
COMMON.RegisterLog(); COMMON.RegisterLog();
...@@ -6256,7 +6255,7 @@ CONTENTVIEW.panoContentLink = function(targetContentId, page){ ...@@ -6256,7 +6255,7 @@ CONTENTVIEW.panoContentLink = function(targetContentId, page){
CONTENTVIEW_CREATEOBJECT.showContentConfirmDialog(data.contentData.alertMessageLevel, data.contentData.contentType); CONTENTVIEW_CREATEOBJECT.showContentConfirmDialog(data.contentData.alertMessageLevel, data.contentData.contentType);
} }
else if(data.contentData.alertMessageLevel == CONTENTVIEW_CREATEOBJECT.alertMessageLevel.None){console.log("contentType:"+data.contentData.contentType); else if(data.contentData.alertMessageLevel == CONTENTVIEW_CREATEOBJECT.alertMessageLevel.None){
if(data.contentData.contentType == COMMON.ContentTypeKeys.Type_Link){ if(data.contentData.contentType == COMMON.ContentTypeKeys.Type_Link){
HEADER.viewLinkContentById(targetContentId); HEADER.viewLinkContentById(targetContentId);
...@@ -6280,6 +6279,22 @@ CONTENTVIEW.panoContentLink = function(targetContentId, page){ ...@@ -6280,6 +6279,22 @@ CONTENTVIEW.panoContentLink = function(targetContentId, page){
} }
} }
}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();
}
} }
}, },
......
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