Skip to content

Commit edd5681

Browse files
Merge pull request #265 from symfony2admingenerator/remove-icheck
Removed iCheck dependency
2 parents ea1781e + d30247f commit edd5681

File tree

1 file changed

+52
-33
lines changed

1 file changed

+52
-33
lines changed

Resources/public/js/main.js

Lines changed: 52 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@
7676
$(this.options.containerSelector).find('*[type=submit]').hide();
7777

7878
this.actionInputSelector.on('change', this.selectedActionChangedHandler.bind(this));
79-
this.allElementsToggleButton.on('ifChecked ifUnchecked', this.allElementsChangedHandler.bind(this));
79+
this.allElementsToggleButton.on('change ifChecked ifUnchecked', this.allElementsChangedHandler.bind(this));
8080
};
8181

8282
S2A.batchActionsManager.prototype = {
@@ -104,9 +104,11 @@
104104
},
105105

106106
allElementsChangedHandler: function(evt){
107-
$(this.options.elementSelector)
108-
.prop('checked', $(evt.currentTarget).is(':checked'))
109-
.iCheck('update');
107+
var $element = $(this.options.elementSelector);
108+
$element.prop('checked', $(evt.currentTarget).is(':checked'));
109+
if(typeof($element.iCheck) == "function"){
110+
$element.iCheck('update');
111+
}
110112
},
111113

112114
isValidActionSelected: function(actionValue){
@@ -138,35 +140,52 @@
138140
$(this.options.tableSelector).treetable({expendable: true});
139141
};
140142

141-
// Force first tab to be displayed
142-
$('.nav-tabs *[data-toggle="tab"]:first').click();
143-
144-
// Display number of errors on tabs
145-
$('.nav.nav-tabs li').each(function(i){
146-
$(this).find('a span.label-danger').remove();
147-
var invalid_items = $('fieldset'+$(this).find('a:first').data('target')).find('.has-error');
148-
if (invalid_items.length > 0) {
149-
$(this).find('a:first').append('<span class="label label-danger">'+invalid_items.length+'</span>');
143+
// Called once the DOM is loaded
144+
$(function(){
145+
// Initializing the iCheck dependency: should be made in AdminLTE dist app.js code...
146+
// However, check if it is loaded. If not, do not crash
147+
var checkboxes = $("input[type='checkbox']:not(.simple), input[type='radio']:not(.simple)");
148+
if(typeof(checkboxes.iCheck) == "function") {
149+
checkboxes.iCheck({
150+
checkboxClass: 'icheckbox_minimal',
151+
radioClass: 'iradio_minimal'
152+
});
153+
// We bind this such that users can use the change event
154+
checkboxes.on('ifChecked ifUnchecked', function () {
155+
$(this).trigger('change');
156+
});
157+
}
158+
159+
// Force first tab to be displayed
160+
$('.nav-tabs *[data-toggle="tab"]:first').click();
161+
162+
// Display number of errors on tabs
163+
$('.nav.nav-tabs li').each(function(i){
164+
$(this).find('a span.label-danger').remove();
165+
var invalid_items = $('fieldset'+$(this).find('a:first').data('target')).find('.has-error');
166+
if (invalid_items.length > 0) {
167+
$(this).find('a:first').append('<span class="label label-danger">'+invalid_items.length+'</span>');
168+
}
169+
});
170+
171+
// Display object actions tooltips
172+
$('a.object-action[data-toggle="tooltip"]').tooltip();
173+
174+
// Object actions
175+
if (S2A.hasOwnProperty('singleActionsAdminOptions')) {
176+
new S2A.singleActionsManager(S2A.singleActionsAdminOptions);
177+
}
178+
// Generic actions
179+
if (S2A.hasOwnProperty('genericActionsAdminOptions')) {
180+
new S2A.singleActionsManager(S2A.genericActionsAdminOptions);
181+
}
182+
// Batch actions
183+
if (S2A.hasOwnProperty('batchActionsAdminOptions')) {
184+
new S2A.batchActionsManager(S2A.batchActionsAdminOptions);
185+
}
186+
// Nested list
187+
if (S2A.hasOwnProperty('nestedTreeAdminOptions')) {
188+
new S2A.nestedListManager(S2A.nestedTreeAdminOptions);
150189
}
151190
});
152-
153-
// Display object actions tooltips
154-
$('a.object-action[data-toggle="tooltip"]').tooltip();
155-
156-
// Object actions
157-
if (S2A.hasOwnProperty('singleActionsAdminOptions')) {
158-
new S2A.singleActionsManager(S2A.singleActionsAdminOptions);
159-
}
160-
// Generic actions
161-
if (S2A.hasOwnProperty('genericActionsAdminOptions')) {
162-
new S2A.singleActionsManager(S2A.genericActionsAdminOptions);
163-
}
164-
// Batch actions
165-
if (S2A.hasOwnProperty('batchActionsAdminOptions')) {
166-
new S2A.batchActionsManager(S2A.batchActionsAdminOptions);
167-
}
168-
// Nested list
169-
if (S2A.hasOwnProperty('nestedTreeAdminOptions')) {
170-
new S2A.nestedListManager(S2A.nestedTreeAdminOptions);
171-
}
172191
})(window, jQuery);

0 commit comments

Comments
 (0)