Few minor code clean up edits for desc truncation [ref #6685]

IQSS · Mar 2, 2021 · e3e5cbe · e3e5cbe
1 parent d46f6a7
commit e3e5cbe
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 12 deletions.
diff --git a/src/main/java/propertyFiles/Bundle.properties b/src/main/java/propertyFiles/Bundle.properties
@@ -61,8 +61,6 @@ delete=Delete
 copyClipboard=Copy to Clipboard
 truncateMoreBtn=Read More
 truncateMoreTip=Click to read the full
-truncateLessBtn=Read Less
-truncateLessTip=Click to collapse the
 yes=Yes
 no=No
 previous=Previous

diff --git a/src/main/webapp/dataset.xhtml b/src/main/webapp/dataset.xhtml
@@ -1656,8 +1656,10 @@
                     $(document).ready(function () {
                         popoverHTML('#{bundle.htmlAllowedTitle}', '#{bundle.htmlAllowedTags}');
 
-                        // TO-DO MAKE DYNAMIC
-                        contentTruncate('dsDescription', 'Description', '#{bundle.truncateMoreBtn}', '#{bundle.truncateMoreTip}', '#{bundle.truncateLessBtn}', '#{bundle.truncateLessTip}');
+                        // truncate summary description, contentTruncate function in dv_rebind_bootstrap_ui.js
+                        var  = 'dsDescription'
+                        var descLabel = $('#' + descId + ' th').text();
+                        contentTruncate(descId, descLabel, '#{bundle.truncateMoreBtn}', '#{bundle.truncateMoreTip}');
                     });
                     function openDialog() {
                         PF('details').show();

diff --git a/src/main/webapp/resources/js/dv_rebind_bootstrap_ui.js b/src/main/webapp/resources/js/dv_rebind_bootstrap_ui.js
@@ -23,9 +23,6 @@ function bind_bsui_components(){
     $('.bootstrap-button-tooltip, [data-toggle="tooltip"]').tooltip("hide");
     $("[data-toggle='popover']").popover("hide");
 
-    // Truncate content
-    contentTruncate();
-
     // Truncate checksums
     checksumTruncate();
 
@@ -162,13 +159,10 @@ function sharrre(){
 }
 
 /*
- * Truncate any metadata content
+ * Truncate dataset description content
  */
-function contentTruncate(truncSelector, truncMetaLabel, truncMoreBtn, truncMoreTip, truncLessBtn, truncLessTip){
-
-    // I MADE IT MYSELF...
+function contentTruncate(truncSelector, truncMetaLabel, truncMoreBtn, truncMoreTip){
 
-    // WHAT ARE WE TRUNCATING
     // SELECTOR ID FROM PARAMETERS
     $('#' + truncSelector + ' td div').each(function () {