Commit 4b94b12e by Motohisa Nakano

Merge branch 'hotfix/sbb/8375' into sbb

parents 1f629cc2 e718a8f4
......@@ -245,6 +245,9 @@ function getPageObjectsByPageIndex(contentData, nIndexPage) {
if (currentPageObjects[nIndex].mediaType == 1) {/*media type = 1 */
var pageObject = getMediaType1(currentPageObjects[nIndex]);
/*add object to page */
if ( pageObject != null ) {
pageObjects.push(pageObject);
}
pageObjects.push(pageObject);
} else if (currentPageObjects[nIndex].mediaType == 2) { /*mediaType = 2 */
var pageObject = getMediaType2(currentPageObjects[nIndex]);
......@@ -294,7 +297,11 @@ function getMediaType1(iValueObj) {
* Action Type = 10 : content
* 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 = [];
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