Merge branch 'sbb' of gitlab.agentec.jp:abook_web/web-viewer into sbb

abvw/js/contentview.js

@@ -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 */
@@ -294,7 +296,11 @@ function getMediaType1(iValueObj) {
     * Action Type = 10 : content
     * Action Type = 10 : content
     * 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;