Browse Source

fixed nested card collapse/expand icon bug

REJack 5 years ago
parent
commit
ce486267c4

+ 3 - 2
build/js/CardWidget.js

@@ -70,7 +70,8 @@ const CardWidget = (($) => {
         .slideUp(this._settings.animationSpeed, () => {
           this._parent.addClass(ClassName.COLLAPSED)
         })
-      this._parent.find(this._settings.collapseTrigger + ' .' + this._settings.collapseIcon)
+
+      this._parent.find('> ' + Selector.CARD_HEADER + ' ' + this._settings.collapseTrigger + ' .' + this._settings.collapseIcon)
         .addClass(this._settings.expandIcon)
         .removeClass(this._settings.collapseIcon)
 
@@ -85,7 +86,7 @@ const CardWidget = (($) => {
           this._parent.removeClass(ClassName.COLLAPSED)
         })
 
-      this._parent.find(this._settings.collapseTrigger + ' .' + this._settings.expandIcon)
+      this._parent.find('> ' + Selector.CARD_HEADER + ' ' + this._settings.collapseTrigger + ' .' + this._settings.expandIcon)
         .addClass(this._settings.collapseIcon)
         .removeClass(this._settings.expandIcon)
 

+ 2 - 2
dist/js/adminlte.js

@@ -1173,7 +1173,7 @@
           _this._parent.addClass(ClassName.COLLAPSED);
         });
 
-        this._parent.find(this._settings.collapseTrigger + ' .' + this._settings.collapseIcon).addClass(this._settings.expandIcon).removeClass(this._settings.collapseIcon);
+        this._parent.find('> ' + Selector.CARD_HEADER + ' ' + this._settings.collapseTrigger + ' .' + this._settings.collapseIcon).addClass(this._settings.expandIcon).removeClass(this._settings.collapseIcon);
 
         var collapsed = $.Event(Event.COLLAPSED);
 
@@ -1187,7 +1187,7 @@
           _this2._parent.removeClass(ClassName.COLLAPSED);
         });
 
-        this._parent.find(this._settings.collapseTrigger + ' .' + this._settings.expandIcon).addClass(this._settings.collapseIcon).removeClass(this._settings.expandIcon);
+        this._parent.find('> ' + Selector.CARD_HEADER + ' ' + this._settings.collapseTrigger + ' .' + this._settings.expandIcon).addClass(this._settings.collapseIcon).removeClass(this._settings.expandIcon);
 
         var expanded = $.Event(Event.EXPANDED);
 

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