Skip to content

Commit

Permalink
Merge pull request #324 from mrholek/v1.0.9-fix-1-static
Browse files Browse the repository at this point in the history
v1.0.9 with Bootstrap 4.0.0 fix-static-1
  • Loading branch information
xidedix authored Jan 20, 2018
2 parents 3c0842d + 729bd2d commit abb1697
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 6 deletions.
5 changes: 2 additions & 3 deletions Static_Full_Project_GULP/src/js/app.js
Original file line number Diff line number Diff line change
Expand Up @@ -113,19 +113,18 @@ $(document).ready(function($){
* CARDS ACTIONS
*/

$(document).on('click', '.card-actions a, button', function(e){
$('.card-actions').on('click', 'a, button', function(e){
e.preventDefault();

if ($(this).hasClass('btn-close')) {
$(this).parent().parent().parent().fadeOut();
} else if ($(this).hasClass('btn-minimize')) {
var $target = $(this).parent().parent().next('.card-body').collapse({toggle: true});
// var $target = $(this).parent().parent().next('.card-body').collapse({toggle: true});
if ($(this).hasClass('collapsed')) {
$('i',$(this)).removeClass($.panelIconOpened).addClass($.panelIconClosed);
} else {
$('i',$(this)).removeClass($.panelIconClosed).addClass($.panelIconOpened);
}

} else if ($(this).hasClass('btn-setting')) {
$('#myModal').modal('show');
}
Expand Down
5 changes: 2 additions & 3 deletions Static_Starter_GULP/src/js/app.js
Original file line number Diff line number Diff line change
Expand Up @@ -113,19 +113,18 @@ $(document).ready(function($){
* CARDS ACTIONS
*/

$(document).on('click', '.card-actions a, button', function(e){
$('.card-actions').on('click', 'a, button', function(e){
e.preventDefault();

if ($(this).hasClass('btn-close')) {
$(this).parent().parent().parent().fadeOut();
} else if ($(this).hasClass('btn-minimize')) {
var $target = $(this).parent().parent().next('.card-body').collapse({toggle: true});
// var $target = $(this).parent().parent().next('.card-body').collapse({toggle: true});
if ($(this).hasClass('collapsed')) {
$('i',$(this)).removeClass($.panelIconOpened).addClass($.panelIconClosed);
} else {
$('i',$(this)).removeClass($.panelIconClosed).addClass($.panelIconOpened);
}

} else if ($(this).hasClass('btn-setting')) {
$('#myModal').modal('show');
}
Expand Down

0 comments on commit abb1697

Please sign in to comment.