Merge pull request #6 from dev3k/master

Fix - Can't expand after using 'collapse all' button

Author: cklei-carly

resources/views/tree/scripts.blade.php

@@ -13,28 +13,35 @@
 
         // Custom expand/collapse buttons
         $('#{{ $containerKey }} .dd-item-btns [data-action="expand"]').on('click', function (el) {
-            $(this).addClass('hidden');
             let list = $(this).closest('li');
             if (list.length) {
                 $(this).addClass('hidden');
-                list.find('.dd-item-btns [data-action="collapse"]').removeClass('hidden');
-                list.find('.dd-list').removeClass('hidden');
+                $(this).parent().children('.dd-item-btns [data-action="collapse"]').removeClass('hidden');
+                list.find('> .dd-list').removeClass('hidden').show();
+                list.find('> .dd-list > .dd-item').removeClass('dd-collapsed hidden');
             }
         });
         $('#{{ $containerKey }} .dd-item-btns [data-action="collapse"]').on('click', function (el) {
             let list = $(this).closest('li');
             if (list.length) {
                 $(this).addClass('hidden');
-                list.find('.dd-item-btns [data-action="expand"]').removeClass('hidden');
-                list.find('.dd-list').addClass('hidden');
+                $(this).parent().children('.dd-item-btns [data-action="expand"]').removeClass('hidden');
+                list.find('> .dd-list').addClass('hidden').hide();
+                list.find('> .dd-list > .dd-item').addClass('dd-collapsed hidden');
             }
         });
 
         $('#nestable-menu [data-action="expand-all"]').on('click', function () {
             $('.dd').nestable('expandAll');
+            $('.dd').find('.dd-item-btns [data-action="expand"]').addClass('hidden');
+            $('.dd').find('.dd-item-btns [data-action="collapse"]').removeClass('hidden');
+            $('.dd > ol > li').find('li').removeClass('hidden');
         });
         $('#nestable-menu [data-action="collapse-all"]').on('click', function () {
             $('.dd').nestable('collapseAll');
+            $('.dd').find('.dd-item-btns [data-action="expand"]').removeClass('hidden');
+            $('.dd').find('.dd-item-btns [data-action="collapse"]').addClass('hidden');
+            $('.dd > ol > li').find('li').addClass('hidden');
         });
         $('#nestable-menu [data-action="save"]').on('click', async function (e) {
             let value = $('#{{ $containerKey }}').nestable('serialize');
@@ -46,4 +53,4 @@
             }
         });
     });
-</script>
+</script>