current state of the "lazy" hack. the thumbnails and buttons should b…

…e properly rendered. (#4091)
IQSS · Sep 22, 2017 · 9a5a051 · 9a5a051
1 parent 75bc45e
commit 9a5a051
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 9 deletions.
diff --git a/src/main/java/edu/harvard/iq/dataverse/DatasetPage.java b/src/main/java/edu/harvard/iq/dataverse/DatasetPage.java
@@ -687,8 +687,8 @@ public boolean isThumbnailAvailable(FileMetadata fileMetadata) {
             return false;
         }
 
-
-
+        //logger.info("isThumbnailAvailable() called on file "+dataFileId);
+        //try{Thread.sleep(1000L);}catch(Exception e){}
         String thumbnailAsBase64 = ImageThumbConverter.getImageThumbnailAsBase64(fileMetadata.getDataFile(), ImageThumbConverter.DEFAULT_THUMBNAIL_SIZE);
 
 
@@ -703,12 +703,13 @@ public boolean isThumbnailAvailable(FileMetadata fileMetadata) {
     }
 
     public String getDataFileThumbnailAsBase64(FileMetadata fileMetadata) {
+        //logger.info("THUMBNAIL REQUESTED FOR DATAFILE "+fileMetadata.getDataFile().getId());
         return datafileThumbnailsMap.get(fileMetadata.getDataFile().getId());
     }
 
     public void enableThumbnails() {
         pageLoadInProgress = false;
-        logger.fine("ENABLED thumbnails on the page.");
+        //logger.info("ENABLED thumbnails on the page.");
     }
 
     public boolean isPageLoadInProgress() {

diff --git a/src/main/webapp/file-download-button-fragment.xhtml b/src/main/webapp/file-download-button-fragment.xhtml
@@ -138,6 +138,7 @@
     <p:commandLink rendered="#{ fileDownloadHelper.canDownloadFile(fileMetadata) and !(fileMetadata.dataFile.tabularData) and !(downloadPopupRequired) }"
                    type="button" styleClass="btn btn-default"
                    disabled="#{DatasetPage.pageLoadInProgress}"
+                   update="@none"
                    actionListener="#{fileDownloadService.startFileDownload(guestbookResponse, fileMetadata, 'Download')}">
         <!-- non-tabular data file: -->
         <!-- no guest book/terms of use/etc. - straight to the download API url: -->

diff --git a/src/main/webapp/filesFragment.xhtml b/src/main/webapp/filesFragment.xhtml
@@ -374,16 +374,17 @@
 
 
         <h:inputHidden value="#{DatasetPage.pageLoadInProgress}" id="pageLoadInProgress" />
+
 
-        <p:remoteCommand name="enableThumbnails" immediate="true" process="@this" update=":datasetForm:tabView:filesTable" actionListener="#{DatasetPage.enableThumbnails}"/>
+        <p:remoteCommand name="enableThumbnails" immediate="true" process="@this" update=":datasetForm:tabView:filesTable,:datasetForm:tabView:pageLoadInProgress" actionListener="#{DatasetPage.enableThumbnails}"/>
 
 
     <script type="text/javascript">
-                                $(document).ready(function () {
-                                    if ($('input[id$="pageLoadInProgress"]').val() === 'true') {
-                                        enableThumbnails();
-                                    }
-                                });
+        $(this).ready(function () {
+            //if ($('input[id$="pageLoadInProgress"]').val() === 'true') {
+            enableThumbnails();
+            //}
+        });
     </script>
 
 </ui:composition>