Merge pull request #2391 from toshiba/release/fix-license-clearing-table

fix(Project): Fix bug Expand Next Level and Collapse All button are hidden when click on sort icon Reviewed by: [email protected] Tested by: [email protected]
eclipse-sw360 · Apr 11, 2024 · 3746fa1 · 3746fa1
2 parents e75ef6c + 3beff04
commit 3746fa1
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/...c/main/resources/META-INF/resources/html/projects/includes/projects/dependencyNetwork.jsp b/...c/main/resources/META-INF/resources/html/projects/includes/projects/dependencyNetwork.jsp
@@ -76,7 +76,7 @@
                 <tr>
                     <th style="width:36%; cursor: pointer" class="sort">
                         <div id="expandAllWarning" class="alert alert-warning alert-dismissible mb-0 p-2" style="display:none">
-                            <button type="button" class="close pb-3" data-dismiss="alert">�</button>
+                            <button type="button" class="close pb-3" data-dismiss="alert">x</button>
                              <liferay-ui:message key="all.the.levels.are.expanded" />
                         </div>
                         <div class="row px-2">

diff --git a/frontend/sw360-portlet/src/main/resources/META-INF/resources/js/modules/expandCollapse.js b/frontend/sw360-portlet/src/main/resources/META-INF/resources/js/modules/expandCollapse.js
@@ -12,11 +12,15 @@ define('modules/expandCollapse', [ 'jquery' ], function($) {
         toggleIcon: function toggleIcon(element){
 
             if (element.closest('thead').hasClass('collapsed')) {
-                element.find("div").eq(3).children().css('display', 'none');
-                element.find("div").eq(2).children().css('display', 'inline');
+                element.find('.lexicon-icon-caret-bottom').hide();
+                element.find('.lexicon-icon-caret-bottom').parent().hide();
+                element.find('.lexicon-icon-caret-top').show();
+                element.find('.lexicon-icon-caret-top').parent().show();
             }else{
-                element.find("div").eq(3).children().css('display', 'inline');
-                element.find("div").eq(2).children().css('display', 'none');
+                element.find('.lexicon-icon-caret-bottom').show();
+                element.find('.lexicon-icon-caret-bottom').parent().show();
+                element.find('.lexicon-icon-caret-top').hide();
+                element.find('.lexicon-icon-caret-top').parent().hide();
             }
         }
     }