Browse Source

fixed submenu expand bug

REJack 5 years ago
parent
commit
2b0e4aa843

+ 2 - 2
build/js/Treeview.js

@@ -91,12 +91,12 @@ const Treeview = (($) => {
       const $relativeTarget = $(event.currentTarget)
       const $relativeTarget = $(event.currentTarget)
       const $parent = $relativeTarget.parent()
       const $parent = $relativeTarget.parent()
 
 
-      let treeviewMenu = $parent.find(Selector.TREEVIEW_MENU)
+      let treeviewMenu = $parent.find('> ' + Selector.TREEVIEW_MENU)
 
 
       if (!treeviewMenu.is(Selector.TREEVIEW_MENU)) {
       if (!treeviewMenu.is(Selector.TREEVIEW_MENU)) {
 
 
         if (!$parent.is(Selector.LI)) {
         if (!$parent.is(Selector.LI)) {
-          treeviewMenu = $parent.parent().find(Selector.TREEVIEW_MENU)
+          treeviewMenu = $parent.parent().find('> ' + Selector.TREEVIEW_MENU)
         }
         }
 
 
         if (!treeviewMenu.is(Selector.TREEVIEW_MENU)) {
         if (!treeviewMenu.is(Selector.TREEVIEW_MENU)) {

+ 2 - 2
dist/js/adminlte.js

@@ -747,11 +747,11 @@
       _proto.toggle = function toggle(event) {
       _proto.toggle = function toggle(event) {
         var $relativeTarget = $(event.currentTarget);
         var $relativeTarget = $(event.currentTarget);
         var $parent = $relativeTarget.parent();
         var $parent = $relativeTarget.parent();
-        var treeviewMenu = $parent.find(Selector.TREEVIEW_MENU);
+        var treeviewMenu = $parent.find('> ' + Selector.TREEVIEW_MENU);
 
 
         if (!treeviewMenu.is(Selector.TREEVIEW_MENU)) {
         if (!treeviewMenu.is(Selector.TREEVIEW_MENU)) {
           if (!$parent.is(Selector.LI)) {
           if (!$parent.is(Selector.LI)) {
-            treeviewMenu = $parent.parent().find(Selector.TREEVIEW_MENU);
+            treeviewMenu = $parent.parent().find('> ' + Selector.TREEVIEW_MENU);
           }
           }
 
 
           if (!treeviewMenu.is(Selector.TREEVIEW_MENU)) {
           if (!treeviewMenu.is(Selector.TREEVIEW_MENU)) {

File diff suppressed because it is too large
+ 0 - 0
dist/js/adminlte.js.map


File diff suppressed because it is too large
+ 0 - 0
dist/js/adminlte.min.js


File diff suppressed because it is too large
+ 0 - 0
dist/js/adminlte.min.js.map


Some files were not shown because too many files changed in this diff