Commit af897b63 by Motohisa Nakano

hotfix of #8375

parent d39fda18
...@@ -5,3 +5,4 @@ _config/ ...@@ -5,3 +5,4 @@ _config/
ob/ ob/
*.gz *.gz
*.zip *.zip
patch/
...@@ -245,7 +245,9 @@ function getPageObjectsByPageIndex(contentData, nIndexPage) { ...@@ -245,7 +245,9 @@ function getPageObjectsByPageIndex(contentData, nIndexPage) {
if (currentPageObjects[nIndex].mediaType == 1) {/*media type = 1 */ if (currentPageObjects[nIndex].mediaType == 1) {/*media type = 1 */
var pageObject = getMediaType1(currentPageObjects[nIndex]); var pageObject = getMediaType1(currentPageObjects[nIndex]);
/*add object to page */ /*add object to page */
pageObjects.push(pageObject); if ( pageObject != null ) {
pageObjects.push(pageObject);
}
} else if (currentPageObjects[nIndex].mediaType == 2) { /*mediaType = 2 */ } else if (currentPageObjects[nIndex].mediaType == 2) { /*mediaType = 2 */
var pageObject = getMediaType2(currentPageObjects[nIndex]); var pageObject = getMediaType2(currentPageObjects[nIndex]);
/*add object to page */ /*add object to page */
...@@ -295,6 +297,11 @@ function getMediaType1(iValueObj) { ...@@ -295,6 +297,11 @@ function getMediaType1(iValueObj) {
* Action Type = 11 : html * Action Type = 11 : html
*/ */
if ( iValueObj.action != null ) {
if ( iValueObj.action.actionType == 10 || iValueObj.action.actionType == 11 || iValueObj.action.actionType == 12 || iValueObj.action.actionType == 13 ) {
return null;
}
}
var pageObject = []; var pageObject = [];
pageObject['mediaType'] = iValueObj.mediaType; pageObject['mediaType'] = iValueObj.mediaType;
......
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