Fixed truncate and ajax update issues [ref #6685, #7565]

IQSS · Mar 5, 2021 · 8093d2f · 8093d2f
1 parent 2a2f7bf
commit 8093d2f
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 14 deletions.
diff --git a/src/main/webapp/dataset.xhtml b/src/main/webapp/dataset.xhtml
@@ -1653,19 +1653,29 @@
                     <!-- END: Publish/Submit for Review Dialogs -->
                 </h:form>
                 <script>
-                    //<![CDATA[                   
+                    //<![CDATA[
+
+                    // make sure to only truncate on load and not every ajax update
+                    var truncactionHappened = false;
+
                     $(document).ready(function () {
                         popoverHTML('#{bundle.htmlAllowedTitle}', '#{bundle.htmlAllowedTags}');
-
+                    });
+                    function summaryDescTruncation() {
                         // truncate summary description, contentTruncate function in dv_rebind_bootstrap_ui.js
                         // add summary desc row id to pass as function selector
                         var descId = 'dsDescription';
                         // add metadata dynamic label text to button and tooltip text from bundle
                         var truncMoreBtn = '#{of:format1(bundle.truncateMoreBtn, DatasetPage.datasetVersionUI.description.datasetFieldType.localeTitle)}';
                         var truncMoreTip = '#{of:format1(bundle.truncateMoreTip, DatasetPage.datasetVersionUI.description.datasetFieldType.localeTitle)}';
-                        // pass text params to function
-                        contentTruncate(descId, truncMoreBtn, truncMoreTip);
-                    });
+
+                        if (!truncactionHappened) {
+                            // pass text params to function
+                            contentTruncate(descId, truncMoreBtn, truncMoreTip);
+
+                            truncactionHappened = true;
+                        }
+                    }
                     function openDialog() {
                         PF('details').show();
                     }
@@ -1679,8 +1689,7 @@
                         } else {
                             $('button[id$="compareVersions"]').trigger('click');
                         }
-                    }
-
+                    }             
                     function testFilesSelected() {
                         var count = PF('filesTable').getSelectedRowsCount();
                         if (count == 0) {
@@ -1689,7 +1698,6 @@
                             return true;
                         }                        
                     }
-
                     function updateTemplate() {
                         $('button[id$="updateTemplate"]').trigger('click');
                     }
@@ -1701,6 +1709,7 @@
                     }
                     //]]>
                 </script>
+                <o:onloadScript>summaryDescTruncation();</o:onloadScript>
             </ui:define>
         </ui:composition>
     </h:body>

diff --git a/src/main/webapp/dataverse_template.xhtml b/src/main/webapp/dataverse_template.xhtml
@@ -79,14 +79,13 @@
             </f:facet>
         </p:ajaxStatus>
         <ui:include src="contactFormFragment.xhtml"></ui:include>
+        <script src="#{resource['js/dv_rebind_bootstrap_ui.js']}?version=#{systemConfig.getVersion()}"></script>
         <script defer="defer" src="#{resource['bs/js/bootstrap.min.js']}?version=#{systemConfig.getVersion()}"></script>
         <script defer="defer" src="#{resource['js/ie-compat.js']}?version=#{systemConfig.getVersion()}"></script>
-        <script defer="defer" src="#{resource['js/dv_rebind_bootstrap_ui.js']}?version=#{systemConfig.getVersion()}"></script>
         <script defer="defer" src="#{resource['js/owl.carousel.js']}?version=#{systemConfig.getVersion()}"></script>
         <script defer="defer" src="#{resource['js/jquery.matchHeight.js']}?version=#{systemConfig.getVersion()}"></script>
-        <script defer="defer" src="#{resource['js/jquery.sharrre.js']}?version=#{systemConfig.getVersion()}"></script>   
-        <script defer="defer" src="#{resource['js/jquery.truncate.js']}?version=#{systemConfig.getVersion()}"></script> 
-        <script defer="defer" src="#{resource['js/clipboard.min.js']}?version=#{systemConfig.getVersion()}"></script>          
+        <script defer="defer" src="#{resource['js/jquery.sharrre.js']}?version=#{systemConfig.getVersion()}"></script>
+        <script defer="defer" src="#{resource['js/clipboard.min.js']}?version=#{systemConfig.getVersion()}"></script>
         <ui:fragment rendered="#{systemConfig.isShibPassiveLoginEnabled()}">
             <script defer="defer" src="#{resource['js/shib/isPassive.js']}"></script>
         </ui:fragment>
@@ -105,7 +104,7 @@
                     }
                     ;
                 });
-
+                
                 // Rebind bootstrap UI components
                 bind_bsui_components();
             });

diff --git a/src/main/webapp/resources/js/dv_rebind_bootstrap_ui.js b/src/main/webapp/resources/js/dv_rebind_bootstrap_ui.js
@@ -163,7 +163,8 @@ function sharrre(){
  */
 function contentTruncate(truncSelector, truncMoreBtn, truncMoreTip){
     // SELECTOR ID FROM PARAMETERS
-    $('#' + truncSelector + ' td div').each(function () {
+    $('#' + truncSelector + ' td > div:first-child').each(function () {
+
         // add responsive img class to limit width to that of container
         $(this).find('img').attr('class', 'img-responsive');