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();
}
}
} }
} }
......
abvw/js/contentview_CreateObjects.js
...@@ -1310,7 +1310,7 @@ CONTENTVIEW_CREATEOBJECT.moveToContent = function (mediaType, actionType, id, im ...@@ -1310,7 +1310,7 @@ CONTENTVIEW_CREATEOBJECT.moveToContent = function (mediaType, actionType, id, im
"GET", "GET",
params, params,
function (data) { function (data) {
/* set end log */ /* set end log */
COMMON.SetEndLog(CONTENTVIEW_GENERAL.contentID); COMMON.SetEndLog(CONTENTVIEW_GENERAL.contentID);
COMMON.RegisterLog(); COMMON.RegisterLog();
...@@ -1328,7 +1328,7 @@ CONTENTVIEW_CREATEOBJECT.moveToContent = function (mediaType, actionType, id, im ...@@ -1328,7 +1328,7 @@ CONTENTVIEW_CREATEOBJECT.moveToContent = function (mediaType, actionType, id, im
'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){
...@@ -1342,28 +1342,32 @@ CONTENTVIEW_CREATEOBJECT.moveToContent = function (mediaType, actionType, id, im ...@@ -1342,28 +1342,32 @@ CONTENTVIEW_CREATEOBJECT.moveToContent = function (mediaType, actionType, id, im
'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(contentId); if(data.contentData.contentType == COMMON.ContentTypeKeys.Type_Link){
ClientData.common_prePageNo(pageNo); HEADER.viewLinkContentById(contentId);
}else{
/* store old page */ ClientData.common_preContentId(contentId);
var oldContent = { oldContentID: CONTENTVIEW_GENERAL.contentID, oldPageIndex: CONTENTVIEW_GETDATA.getPageIndex() }; ClientData.common_prePageNo(pageNo);
var dataJump = ClientData.JumpQueue();
dataJump.push(oldContent); /* store old page */
ClientData.JumpQueue(dataJump); var oldContent = { oldContentID: CONTENTVIEW_GENERAL.contentID, oldPageIndex: CONTENTVIEW_GETDATA.getPageIndex() };
var dataJump = ClientData.JumpQueue();
if(ClientData.isStreamingMode()){ dataJump.push(oldContent);
//ストリーミングのビューアへ移動 ClientData.JumpQueue(dataJump);
AVWEB.avwScreenMove(COMMON.ScreenIds.ContentViewStreaming);
} else { if(ClientData.isStreamingMode()){
if (CONTENTVIEW_GENERAL.avwUserEnvObj.isMobile() && ClientData.isGetitsMode() ) { //ストリーミングのビューアへ移動
AVWEB.avwScreenMove(COMMON.ScreenIds.ContentViewGetits); AVWEB.avwScreenMove(COMMON.ScreenIds.ContentViewStreaming);
} else { } else {
CONTENTVIEW.screenMove(); if (CONTENTVIEW_GENERAL.avwUserEnvObj.isMobile() && ClientData.isGetitsMode() ) {
} AVWEB.avwScreenMove(COMMON.ScreenIds.ContentViewGetits);
} } else {
CONTENTVIEW.screenMove();
}
}
}
} }
} }
//Type 0 //Type 0
...@@ -1407,19 +1411,19 @@ CONTENTVIEW_CREATEOBJECT.moveToContent = function (mediaType, actionType, id, im ...@@ -1407,19 +1411,19 @@ CONTENTVIEW_CREATEOBJECT.moveToContent = function (mediaType, actionType, id, im
CONTENTVIEW_CREATEOBJECT.moveToContent.prototype = new CONTENTVIEW_CREATEOBJECT.PageObject(); CONTENTVIEW_CREATEOBJECT.moveToContent.prototype = new CONTENTVIEW_CREATEOBJECT.PageObject();
//START TRB00033 - EDITOR: Long - Date : 09/12/2013 - Summary : limit content //START TRB00033 - EDITOR: Long - Date : 09/12/2013 - Summary : limit content
CONTENTVIEW_CREATEOBJECT.showContentConfirmDialog = function(type, msg) { CONTENTVIEW_CREATEOBJECT.showContentConfirmDialog = function(type, msg, contentType) {
if(type == CONTENTVIEW_CREATEOBJECT.alertMessageLevel.ShowAlert){ if(type == CONTENTVIEW_CREATEOBJECT.alertMessageLevel.ShowAlert){
CONTENTVIEW_CREATEOBJECT.createAlertTypeDialog(msg); CONTENTVIEW_CREATEOBJECT.createAlertTypeDialog(msg, contentType);
CONTENTVIEW_GENERAL.showDialog(true); CONTENTVIEW_GENERAL.showDialog(true);
} }
else if(type == CONTENTVIEW_CREATEOBJECT.alertMessageLevel.RequirePassword){ else if(type == CONTENTVIEW_CREATEOBJECT.alertMessageLevel.RequirePassword){
CONTENTVIEW_CREATEOBJECT.createPwdRequiredTypeDialog(); CONTENTVIEW_CREATEOBJECT.createPwdRequiredTypeDialog(contentType);
CONTENTVIEW_GENERAL.showDialog(true); CONTENTVIEW_GENERAL.showDialog(true);
} }
}; };
CONTENTVIEW_CREATEOBJECT.createAlertTypeDialog = function(msg){ CONTENTVIEW_CREATEOBJECT.createAlertTypeDialog = function(msg, contentType){
var $container = $('#dialog'); var $container = $('#dialog');
$container.html(''); $container.html('');
$container.addClass('sectionLimitAccess'); $container.addClass('sectionLimitAccess');
...@@ -1444,30 +1448,33 @@ CONTENTVIEW_CREATEOBJECT.createAlertTypeDialog = function(msg){ ...@@ -1444,30 +1448,33 @@ CONTENTVIEW_CREATEOBJECT.createAlertTypeDialog = function(msg){
}); });
$('#dialog a#contentAlertOk').click(function(){ $('#dialog a#contentAlertOk').click(function(){
if(contentType = COMMON.ContentTypeKeys.Type_Link){
ClientData.common_preContentId(CONTENTVIEW_CREATEOBJECT.moveContentParam.preContentId); HEADER.viewLinkContentById(CONTENTVIEW_CREATEOBJECT.moveContentParam.preContentId);
ClientData.common_prePageNo(CONTENTVIEW_CREATEOBJECT.moveContentParam.prePageNo);
}else{
/* store old page */ ClientData.common_preContentId(CONTENTVIEW_CREATEOBJECT.moveContentParam.preContentId);
var dataJump = ClientData.JumpQueue(); ClientData.common_prePageNo(CONTENTVIEW_CREATEOBJECT.moveContentParam.prePageNo);
dataJump.push(CONTENTVIEW_CREATEOBJECT.moveContentParam.oldContent);
ClientData.JumpQueue(dataJump); /* store old page */
var dataJump = ClientData.JumpQueue();
if(ClientData.isStreamingMode()){ dataJump.push(CONTENTVIEW_CREATEOBJECT.moveContentParam.oldContent);
//ストリーミングのビューアへ移動 ClientData.JumpQueue(dataJump);
AVWEB.avwScreenMove(COMMON.ScreenIds.ContentViewStreaming);
} else { if(ClientData.isStreamingMode()){
if (CONTENTVIEW_GENERAL.avwUserEnvObj.isMobile() && ClientData.isGetitsMode()) { //ストリーミングのビューアへ移動
AVWEB.avwScreenMove(COMMON.ScreenIds.ContentViewGetits); AVWEB.avwScreenMove(COMMON.ScreenIds.ContentViewStreaming);
} else { } else {
CONTENTVIEW.screenMove(); if (CONTENTVIEW_GENERAL.avwUserEnvObj.isMobile() && ClientData.isGetitsMode()) {
} AVWEB.avwScreenMove(COMMON.ScreenIds.ContentViewGetits);
} } else {
CONTENTVIEW.screenMove();
}
}
}
}); });
}; };
CONTENTVIEW_CREATEOBJECT.createPwdRequiredTypeDialog = function(){ CONTENTVIEW_CREATEOBJECT.createPwdRequiredTypeDialog = function(contentType){
var $container = $('#dialog'); var $container = $('#dialog');
$container.html(''); $container.html('');
$container.addClass('sectionLimitAccess'); $container.addClass('sectionLimitAccess');
...@@ -1517,30 +1524,35 @@ CONTENTVIEW_CREATEOBJECT.createPwdRequiredTypeDialog = function(){ ...@@ -1517,30 +1524,35 @@ CONTENTVIEW_CREATEOBJECT.createPwdRequiredTypeDialog = function(){
AVWEB.avwCmsApiSyncWithUrl(apiLoginUrl, null, 'webClientLogin', 'GET', params, AVWEB.avwCmsApiSyncWithUrl(apiLoginUrl, null, 'webClientLogin', 'GET', params,
function (data) { function (data) {
if (data.result == 'success') { if (data.result == 'success') {
ClientData.common_preContentId(CONTENTVIEW_CREATEOBJECT.moveContentParam.preContentId); if(contentType == COMMON.ContentTypeKeys.Type_Link){
ClientData.common_prePageNo(CONTENTVIEW_CREATEOBJECT.moveContentParam.prePageNo); HEADER.viewLinkContentById(CONTENTVIEW_CREATEOBJECT.moveContentParam.preContentId);
/* store old page */ }else{
var dataJump = ClientData.JumpQueue(); ClientData.common_preContentId(CONTENTVIEW_CREATEOBJECT.moveContentParam.preContentId);
dataJump.push(CONTENTVIEW_CREATEOBJECT.moveContentParam.oldContent); ClientData.common_prePageNo(CONTENTVIEW_CREATEOBJECT.moveContentParam.prePageNo);
ClientData.JumpQueue(dataJump);
/* store old page */
// update sid id var dataJump = ClientData.JumpQueue();
ClientData.userInfo_sid(data.sid); dataJump.push(CONTENTVIEW_CREATEOBJECT.moveContentParam.oldContent);
ClientData.userInfo_sid_local(data.sid); ClientData.JumpQueue(dataJump);
//バックアップにも保持
ClientData.userInfo_sid_local_bak(data.sid); // update sid id
ClientData.userInfo_sid(data.sid);
if(ClientData.isStreamingMode()){ ClientData.userInfo_sid_local(data.sid);
//ストリーミングのビューアへ移動 //バックアップにも保持
AVWEB.avwScreenMove(COMMON.ScreenIds.ContentViewStreaming); ClientData.userInfo_sid_local_bak(data.sid);
} else {
if (CONTENTVIEW_GENERAL.avwUserEnvObj.isMobile() && ClientData.isGetitsMode()) { if(ClientData.isStreamingMode()){
AVWEB.avwScreenMove(COMMON.ScreenIds.ContentViewGetits); //ストリーミングのビューアへ移動
} else { AVWEB.avwScreenMove(COMMON.ScreenIds.ContentViewStreaming);
CONTENTVIEW.screenMove(); } else {
} if (CONTENTVIEW_GENERAL.avwUserEnvObj.isMobile() && ClientData.isGetitsMode()) {
} AVWEB.avwScreenMove(COMMON.ScreenIds.ContentViewGetits);
} else {
CONTENTVIEW.screenMove();
}
}
}
} }
else { else {
$('#lblMessageLimitError').html(AVWEB.format(I18N.i18nText('msgLoginErrWrong'), data.errorMessage).toString()).show(); $('#lblMessageLimitError').html(AVWEB.format(I18N.i18nText('msgLoginErrWrong'), data.errorMessage).toString()).show();
......
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