#29962 【SmartLink CMS 1.9.0】Getits共有アクションを配置したPDFをプレビューするとローディングが消えず操作できない

3411759a · tsushima · 265804dd · 3411759a
Commit 3411759a authored Aug 08, 2018 by tsushima
Show whitespace changes
Inline Side-by-side

Showing with 3 additions and 3 deletions

abvw/js/contentview_GetData.js
+3 -3

No files found.
--- a/abvw/js/contentview_GetData.js
+++ b/abvw/js/contentview_GetData.js
@@ -48,7 +48,7 @@ CONTENTVIEW_GETDATA.getPageObjectsByPageIndex = function(contentData, nIndexPage
            if (currentPageObjects[nIndex].mediaType == 1) {/*media type = 1 */
                var pageObject = CONTENTVIEW_GETDATA.getMediaType1(currentPageObjects[nIndex]);
                /*add object to page */
-                CONTENTVIEW_GENERAL.pageObjects.push(pageObject);
+                if (currentPageObjects[nIndex].action.actionType != 13) CONTENTVIEW_GENERAL.pageObjects.push(pageObject);
            } else if (currentPageObjects[nIndex].mediaType == 2) { /*mediaType = 2 */
                var pageObject = CONTENTVIEW_GETDATA.getMediaType2(currentPageObjects[nIndex]);
                /*add object to page */
@@ -1476,7 +1476,7 @@ CONTENTVIEW_GETDATA.getNextPageObjectsByPageIndex = function(contentData, nIndex
            if (currentPageObjects[nIndex].mediaType == 1) {/*media type = 1 */
                var pageObject = CONTENTVIEW_GETDATA.getMediaType1(currentPageObjects[nIndex]);
                /*add object to page */
-                CONTENTVIEW_GENERAL.nextPageObjects.push(pageObject);
+                if (currentPageObjects[nIndex].action.actionType != 13) CONTENTVIEW_GENERAL.nextPageObjects.push(pageObject);
            } else if (currentPageObjects[nIndex].mediaType == 2) { /*mediaType = 2 */
                var pageObject = CONTENTVIEW_GETDATA.getMediaType2(currentPageObjects[nIndex]);
                /*add object to page */
@@ -1556,7 +1556,7 @@ CONTENTVIEW_GETDATA.getPrevPageObjectsByPageIndex = function(contentData, nIndex
            if (currentPageObjects[nIndex].mediaType == 1) {/*media type = 1 */
                var pageObject = CONTENTVIEW_GETDATA.getMediaType1(currentPageObjects[nIndex]);
                /*add object to page */
-                CONTENTVIEW_GENERAL.prevPageObjects.push(pageObject);
+                if (currentPageObjects[nIndex].action.actionType != 13) CONTENTVIEW_GENERAL.prevPageObjects.push(pageObject);
            } else if (currentPageObjects[nIndex].mediaType == 2) { /*mediaType = 2 */
                var pageObject = CONTENTVIEW_GETDATA.getMediaType2(currentPageObjects[nIndex]);
                /*add object to page */