Browse Source

Merge branch 'develop'

develop
Guillaume 3 years ago
parent
commit
87d24640ae
2 changed files with 10 additions and 5 deletions
  1. +3
    -2
      Resources/assets/app/adminlte/main/init.js
  2. +7
    -3
      Resources/assets/functions/widgets.js

+ 3
- 2
Resources/assets/app/adminlte/main/init.js View File

window.addEventListener('load', (event) => { window.addEventListener('load', (event) => {


$(document).on('select2:open', () => {
// @TODO : cela met le focus sur le premier select2 du document
/*$(document).on('select2:open', () => {
document.querySelector('.select2-search__field').focus(); document.querySelector('.select2-search__field').focus();
});
});*/


SovNotification.init(); SovNotification.init();



+ 7
- 3
Resources/assets/functions/widgets.js View File

if ($select.data('width')) { if ($select.data('width')) {
options.width = 'auto' options.width = 'auto'
} }
if ($select.find('option[value=""]')) {

// @TODO : génère une erreur
/*if ($select.find('option[value=""]')) {
options.placeholder = $select.find('option[value=""]').html() options.placeholder = $select.find('option[value=""]').html()
}
}*/

options.placeholder = "";


var myselect = $select.select2(options); var myselect = $select.select2(options);


var event = new Event('change'); var event = new Event('change');
e.target.dispatchEvent(event); e.target.dispatchEvent(event);
}); });

myselect.on('select2:unselect', function (e) { myselect.on('select2:unselect', function (e) {
var event = new Event('change'); var event = new Event('change');
e.target.dispatchEvent(event); e.target.dispatchEvent(event);
}); });
SovTools.log(myselect);


myselect.off('select2:open') myselect.off('select2:open')



Loading…
Cancel
Save