Browse Source

Merge pull request #1707 from EmmanuelVella/patch-13

Improve select2
Thomas 11 years ago
parent
commit
07d9a03e91
1 changed files with 17 additions and 3 deletions
  1. 17 3
      Resources/public/base.js

+ 17 - 3
Resources/public/base.js

@@ -18,9 +18,23 @@ var Admin = {
 
     setup_select2: function(subject) {
         if (window.SONATA_CONFIG && window.SONATA_CONFIG.USE_SELECT2 && window.Select2) {
-            jQuery("select", subject).select2({
-                width: 'resolve',
-                minimumResultsForSearch: 10
+            jQuery('select', subject).each(function() {
+                var select = $(this);
+
+                select.select2({
+                    width: 'resolve',
+                    minimumResultsForSearch: 10,
+                    allowClear: select.find('option[value=""]').length ? true : false
+                });
+
+                var popover = select.data('popover');
+
+                if (undefined !== popover) {
+                    select
+                        .select2('container')
+                        .popover(popover.options)
+                    ;
+                }
             });
         }
     },