Skip to content

C
check
Commit fffb2ee3 by vietdo
Options

#20090【Web 1.7】コンテンツ間リンクでリンクコンテンツが開けない

parent f60213e6
Showing with 80 additions and 69 deletions
abvw/js/contentview.js
...@@ -6245,7 +6245,7 @@ CONTENTVIEW.panoContentLink = function(targetContentId, page){ ...@@ -6245,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){
...@@ -6259,25 +6259,29 @@ CONTENTVIEW.panoContentLink = function(targetContentId, page){ ...@@ -6259,25 +6259,29 @@ 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){
if(data.contentData.contentType == COMMON.ContentTypeKeys.Type_Link){
ClientData.common_preContentId(targetContentId); HEADER.viewLinkContentById(targetContentId);
ClientData.common_prePageNo(page);
}else{
//古いページを保存する ClientData.common_preContentId(targetContentId);
var oldContent = { oldContentID: CONTENTVIEW_GENERAL.contentID, oldPageIndex: CONTENTVIEW_GENERAL.panoPageNo }; ClientData.common_prePageNo(page);
var dataJump = ClientData.JumpQueue();
dataJump.push(oldContent); //古いページを保存する
ClientData.JumpQueue(dataJump); var oldContent = { oldContentID: CONTENTVIEW_GENERAL.contentID, oldPageIndex: CONTENTVIEW_GENERAL.panoPageNo };
var dataJump = ClientData.JumpQueue();
if (CONTENTVIEW_GENERAL.avwUserEnvObj.isMobile() && ClientData.isGetitsMode()) { dataJump.push(oldContent);
AVWEB.avwScreenMove(COMMON.ScreenIds.ContentViewGetits); ClientData.JumpQueue(dataJump);
} else {
CONTENTVIEW.screenMove(); if (CONTENTVIEW_GENERAL.avwUserEnvObj.isMobile() && ClientData.isGetitsMode()) {
} AVWEB.avwScreenMove(COMMON.ScreenIds.ContentViewGetits);
} else {
CONTENTVIEW.screenMove();
}
}
} }
} }
else{ else{
......
abvw/js/contentview_CreateObjects.js
...@@ -1411,19 +1411,19 @@ CONTENTVIEW_CREATEOBJECT.moveToContent = function (mediaType, actionType, id, im ...@@ -1411,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');
...@@ -1448,30 +1448,33 @@ CONTENTVIEW_CREATEOBJECT.createAlertTypeDialog = function(msg){ ...@@ -1448,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');
...@@ -1521,32 +1524,36 @@ CONTENTVIEW_CREATEOBJECT.createPwdRequiredTypeDialog = function(){ ...@@ -1521,32 +1524,36 @@ 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') {
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();
// update sid id dataJump.push(CONTENTVIEW_CREATEOBJECT.moveContentParam.oldContent);
ClientData.userInfo_sid(data.sid); ClientData.JumpQueue(dataJump);
ClientData.userInfo_sid_local(data.sid);
//バックアップにも保持 // update sid id
ClientData.userInfo_sid_local_bak(data.sid); ClientData.userInfo_sid(data.sid);
ClientData.userInfo_sid_local(data.sid);
if(ClientData.isStreamingMode()){ //バックアップにも保持
//ストリーミングのビューアへ移動 ClientData.userInfo_sid_local_bak(data.sid);
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();
}
}
}
} }
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