Skip to content

Commit abb1697

Browse files
authored
Merge pull request #324 from mrholek/v1.0.9-fix-1-static
v1.0.9 with Bootstrap 4.0.0 fix-static-1
2 parents 3c0842d + 729bd2d commit abb1697

File tree

2 files changed

+4
-6
lines changed
  • Static_Full_Project_GULP/src/js
  • Static_Starter_GULP/src/js

2 files changed

+4
-6
lines changed

Static_Full_Project_GULP/src/js/app.js

+2-3
Original file line numberDiff line numberDiff line change
@@ -113,19 +113,18 @@ $(document).ready(function($){
113113
* CARDS ACTIONS
114114
*/
115115

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

119119
if ($(this).hasClass('btn-close')) {
120120
$(this).parent().parent().parent().fadeOut();
121121
} else if ($(this).hasClass('btn-minimize')) {
122-
var $target = $(this).parent().parent().next('.card-body').collapse({toggle: true});
122+
// var $target = $(this).parent().parent().next('.card-body').collapse({toggle: true});
123123
if ($(this).hasClass('collapsed')) {
124124
$('i',$(this)).removeClass($.panelIconOpened).addClass($.panelIconClosed);
125125
} else {
126126
$('i',$(this)).removeClass($.panelIconClosed).addClass($.panelIconOpened);
127127
}
128-
129128
} else if ($(this).hasClass('btn-setting')) {
130129
$('#myModal').modal('show');
131130
}

Static_Starter_GULP/src/js/app.js

+2-3
Original file line numberDiff line numberDiff line change
@@ -113,19 +113,18 @@ $(document).ready(function($){
113113
* CARDS ACTIONS
114114
*/
115115

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

119119
if ($(this).hasClass('btn-close')) {
120120
$(this).parent().parent().parent().fadeOut();
121121
} else if ($(this).hasClass('btn-minimize')) {
122-
var $target = $(this).parent().parent().next('.card-body').collapse({toggle: true});
122+
// var $target = $(this).parent().parent().next('.card-body').collapse({toggle: true});
123123
if ($(this).hasClass('collapsed')) {
124124
$('i',$(this)).removeClass($.panelIconOpened).addClass($.panelIconClosed);
125125
} else {
126126
$('i',$(this)).removeClass($.panelIconClosed).addClass($.panelIconOpened);
127127
}
128-
129128
} else if ($(this).hasClass('btn-setting')) {
130129
$('#myModal').modal('show');
131130
}

0 commit comments

Comments
 (0)