Commit 005e8d8b by Masaru Abe

#25861 オーサリング機能のプレビュー機能が無反応となる

parent cda12f58
...@@ -286,7 +286,11 @@ CONTENTVIEW_CALLAPI.getDataJsonFileDone = function(data) { ...@@ -286,7 +286,11 @@ CONTENTVIEW_CALLAPI.getDataJsonFileDone = function(data) {
} }
//Start : Function : No.12 - Editor : Long - Date: 08/27/2013 - Summary : Get Page Object for content type none //Start : Function : No.12 - Editor : Long - Date: 08/27/2013 - Summary : Get Page Object for content type none
else{ else{
CONTENTVIEW_GENERAL.pageObjectsData = JsonFile.content.pages;
//#25861 オーサリング機能のプレビュー機能が無反応となる
if (JsonFile.content) {
CONTENTVIEW_GENERAL.pageObjectsData = JsonFile.content.pages;
}
if(data.contentDataSub != null && data.contentDataSub.length > 0){ if(data.contentDataSub != null && data.contentDataSub.length > 0){
for(var i = 0; i < CONTENTVIEW_GENERAL.pageObjectsData.length; i++){ for(var i = 0; i < CONTENTVIEW_GENERAL.pageObjectsData.length; i++){
...@@ -300,15 +304,35 @@ CONTENTVIEW_CALLAPI.getDataJsonFileDone = function(data) { ...@@ -300,15 +304,35 @@ CONTENTVIEW_CALLAPI.getDataJsonFileDone = function(data) {
if(CONTENTVIEW_GENERAL.contentType == COMMON.ContentTypeKeys.Type_NoFile){ if(CONTENTVIEW_GENERAL.contentType == COMMON.ContentTypeKeys.Type_NoFile){
var pageDataInfo = []; var pageDataInfo = [];
pageDataInfo["height"] = JsonFile.height; if(JsonFile.height){
pageDataInfo["width"] = JsonFile.width; pageDataInfo["height"] = JsonFile.height;
pageDataInfo["alpha"] = JsonFile.backgroundAlpha; } else {
pageDataInfo["color"] = JsonFile.backgroundColor; pageDataInfo["height"] = "1004";
CONTENTVIEW_GENERAL.totalPage = parseInt(JsonFile.totalPageNum); }
if(JsonFile.width){
pageDataInfo["width"] = JsonFile.width;
} else {
pageDataInfo["width"] = "710";
}
if(JsonFile.backgroundAlpha){
pageDataInfo["alpha"] = JsonFile.backgroundAlpha;
} else {
pageDataInfo["alpha"] = "1";
}
if(JsonFile.backgroundColor){
pageDataInfo["color"] = JsonFile.backgroundColor;
} else {
pageDataInfo["color"] = "ffffff";
}
if(JsonFile.totalPageNum){
CONTENTVIEW_GENERAL.totalPage = parseInt(JsonFile.totalPageNum);
} else {
CONTENTVIEW_GENERAL.totalPage = 1;
}
CONTENTVIEW_GENERAL.pageImages = CONTENTVIEW_CONTENTTYPENONE.returnImageString(pageDataInfo); CONTENTVIEW_GENERAL.pageImages = CONTENTVIEW_CONTENTTYPENONE.returnImageString(pageDataInfo);
CONTENTVIEW_GENERAL.widthContentImage = JsonFile.width; CONTENTVIEW_GENERAL.widthContentImage = pageDataInfo["width"];
CONTENTVIEW_GENERAL.heightContentImage = JsonFile.height; CONTENTVIEW_GENERAL.heightContentImage = pageDataInfo["height"];
} }
//End : Function : No.12 - Editor : Long - Date: 08/27/2013 - Summary : Get Page Object for content type none //End : Function : No.12 - Editor : Long - Date: 08/27/2013 - Summary : Get Page Object for content type none
......
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