Commit 112674f4 by Kim Eunchul

#39415 【KDDIオーサリングHTML5 CMS 1.8.5.1】プレビュー画面で特定のページを開こうとすると、表示待ちになる

parent 2850e4cb
...@@ -3106,6 +3106,32 @@ CONTENTVIEW.ContentPage.prototype.addPageObjects = function (pageObjects) { ...@@ -3106,6 +3106,32 @@ CONTENTVIEW.ContentPage.prototype.addPageObjects = function (pageObjects) {
obj.enquete, obj.enquete,
obj.objectId obj.objectId
); );
}else if(obj.actionType == 22){
pageObj = new CONTENTVIEW_CREATEOBJECT.backToPage(
obj.mediaType,
obj.actionType,
obj.id,
obj.imageUrl,
obj.x,
obj.y,
obj.width,
obj.height,
obj.visible,
obj.objectId
);
}else if(obj.actionType == 23){
pageObj = new CONTENTVIEW_CREATEOBJECT.backToContent(
obj.mediaType,
obj.actionType,
obj.id,
obj.imageUrl,
obj.x,
obj.y,
obj.width,
obj.height,
obj.visible,
obj.objectId
);
} }
break; break;
case 2: case 2:
......
...@@ -1522,6 +1522,53 @@ CONTENTVIEW_CREATEOBJECT.moveToContent = function (mediaType, actionType, id, im ...@@ -1522,6 +1522,53 @@ 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
/* mediaType = 1 and actionType = 22 backToPage object*/
CONTENTVIEW_CREATEOBJECT.backToPage = function (mediaType, actionType, id, imageUrl, x, y, w, h, visible, objectId) {
this.setup(mediaType, actionType, id, imageUrl, x, y, w, h, visible, null, null, objectId);
this.action = function () {
//詳細ログ作成
var objectLog = new ObjectLogEntity();
objectLog.contentid = CONTENTVIEW_GENERAL.contentID;
objectLog.pageNo = CONTENTVIEW_GETDATA.getPageIndex() + 1; //0始まりのページ番号
objectLog.objectId = objectId;
objectLog.resourceId = "";
objectLog.mediaType = mediaType;
objectLog.actionType = actionType;
objectLog.actionTime = "0";
objectLog.locationX = x;
objectLog.locationY = y;
objectLog.locationHeight = h;
objectLog.locationWidth = w;
COMMON.SetObjectLog(CONTENTVIEW_GENERAL.contentID, objectLog);
};
};
CONTENTVIEW_CREATEOBJECT.backToPage.prototype = new CONTENTVIEW_CREATEOBJECT.PageObject();
/* mediaType = 1 and actionType = 23 backToContent object*/
CONTENTVIEW_CREATEOBJECT.backToContent = function (mediaType, actionType, id, imageUrl, x, y, w, h, visible, objectId) {
this.setup(mediaType, actionType, id, imageUrl, x, y, w, h, visible, null, null, objectId);
this.action = function () {
//詳細ログ作成
var objectLog = new ObjectLogEntity();
objectLog.contentid = CONTENTVIEW_GENERAL.contentID;
objectLog.pageNo = CONTENTVIEW_GETDATA.getPageIndex() + 1; //0始まりのページ番号
objectLog.objectId = objectId;
objectLog.resourceId = "";
objectLog.mediaType = mediaType;
objectLog.actionType = actionType;
objectLog.actionTime = "0";
objectLog.locationX = x;
objectLog.locationY = y;
objectLog.locationHeight = h;
objectLog.locationWidth = w;
COMMON.SetObjectLog(CONTENTVIEW_GENERAL.contentID, objectLog);
};
};
CONTENTVIEW_CREATEOBJECT.backToContent.prototype = new CONTENTVIEW_CREATEOBJECT.PageObject();
CONTENTVIEW_CREATEOBJECT.showContentConfirmDialog = function(type, msg, contentType) { CONTENTVIEW_CREATEOBJECT.showContentConfirmDialog = function(type, msg, contentType) {
if(type == CONTENTVIEW_CREATEOBJECT.alertMessageLevel.ShowAlert){ if(type == CONTENTVIEW_CREATEOBJECT.alertMessageLevel.ShowAlert){
......
...@@ -389,6 +389,26 @@ CONTENTVIEW_GETDATA.getMediaType1 = function(iValueObj) { ...@@ -389,6 +389,26 @@ CONTENTVIEW_GETDATA.getMediaType1 = function(iValueObj) {
pageObject["enquete"] = iValueObj.action.enquete; pageObject["enquete"] = iValueObj.action.enquete;
//pageObject["objectId"] = iValueObj.action.objectId; //pageObject["objectId"] = iValueObj.action.objectId;
} }
else if(iValueObj.action.actionType == 22){
/*get mediaInfo */
if (iValueObj.mediaInfo.resourceId) {
/* get image from Json */
pageObject['imageUrl'] = AVWEB.getURL("webResourceDownload") + "&sid=" + CONTENTVIEW.getSessionId() + "&resourceId=" + iValueObj.mediaInfo.resourceId;
} else {
pageObject['imageUrl'] = null;
}
}
else if(iValueObj.action.actionType == 23){
/*get mediaInfo */
if (iValueObj.mediaInfo.resourceId) {
/* get image from Json */
pageObject['imageUrl'] = AVWEB.getURL("webResourceDownload") + "&sid=" + CONTENTVIEW.getSessionId() + "&resourceId=" + iValueObj.mediaInfo.resourceId;
} else {
pageObject['imageUrl'] = null;
}
}
//End Function : No.9 - Editor : Long - Date: 08/16/2013 - Summary : //End Function : No.9 - Editor : Long - Date: 08/16/2013 - Summary :
return pageObject; return pageObject;
}; };
......
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