github
/
AdminLTE
mirror of https://github.com/ColorlibHQ/AdminLTE
1
0
Fork 0
Code Issues Releases Wiki Activity

fixed nested card collapse/expand icon bug

pull/2501/head
REJack 2020-01-17 07:37:39 +01:00
parent 1ea675c50d
commit ce486267c4
No known key found for this signature in database
GPG Key ID: 9F3976CC630CC888
5 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
build/js/CardWidget.js
View File

@ -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)

4
dist/js/adminlte.js vendored
View File

@ -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);

2
dist/js/adminlte.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
dist/js/adminlte.min.js vendored
View File

File diff suppressed because one or more lines are too long

2
dist/js/adminlte.min.js.map vendored
View File

File diff suppressed because one or more lines are too long