Add some refacto for select2 sortable

db306 · Apr 8, 2015 · ea15904 · ea15904
1 parent 00efb83
commit ea15904
Show file tree

Hide file tree

Showing 2 changed files with 38 additions and 41 deletions.
diff --git a/Resources/public/Admin.js b/Resources/public/Admin.js
@@ -74,54 +74,27 @@ var Admin = {
             Admin.log('[core|setup_select2] configure Select2 on', subject);
 
             jQuery('select:not([data-sonata-select2="false"])', subject).each(function() {
-
-                var select = jQuery(this);
+                var select            = jQuery(this);
                 var allowClearEnabled = false;
+                var popover           = select.data('popover');
 
                 select.removeClass('form-control');
 
-                if (select.find('option[value=""]').length) {
-                    allowClearEnabled = true;
-                }
-
-                if (select.attr('data-sonata-select2-allow-clear')==='true') {
+                if (select.find('option[value=""]').length || select.attr('data-sonata-select2-allow-clear')==='true') {
                     allowClearEnabled = true;
                 } else if (select.attr('data-sonata-select2-allow-clear')==='false') {
                     allowClearEnabled = false;
                 }
 
-                ereg = /width:(auto|(([-+]?([0-9]*\.)?[0-9]+)(px|em|ex|%|in|cm|mm|pt|pc)))/i;
                 select.select2({
-                    width: function() {
-
-                    // this code is an adaptation of select2 code (initContainerWidth function)
-                    style = this.element.attr('style');
-                    //console.log("main style", style);
-                    if (style !== undefined) {
-                        attrs = style.split(';');
-                        for (i = 0, l = attrs.length; i < l; i = i + 1) {
-
-                            matches = attrs[i].replace(/\s/g, '').match(ereg);
-
-                            if (matches !== null && matches.length >= 1)
-                                return matches[1];
-                            }
-                        }
-
-                        style = this.element.css('width');
-                        if (style.indexOf("%") > 0) {
-                            return style;
-                        }
-
-                        return '100%';
+                    width: function(){
+                        return Admin.get_select2_width(this.element);
                     },
                     dropdownAutoWidth: true,
                     minimumResultsForSearch: 10,
                     allowClear: allowClearEnabled
                 });
 
-                var popover = select.data('popover');
-
                 if (undefined !== popover) {
                     select
                         .select2('container')
@@ -485,19 +458,44 @@ var Admin = {
         jQuery('ul.js-treeview', subject).treeView();
     },
 
-    /**
-     * Setup sortable multiple select2
-     */
-    setup_sortable_select2: function(subject, data) {
-        Admin.log('[core|setup_sortable_select2] configure sortable Select2 on', subject);
+    /** Return the width for simple and sortable select2 element **/
+    get_select2_width: function(element){
+        var ereg = /width:(auto|(([-+]?([0-9]*\.)?[0-9]+)(px|em|ex|%|in|cm|mm|pt|pc)))/i;
+
+        // this code is an adaptation of select2 code (initContainerWidth function)
+        var style = element.attr('style');
+        //console.log("main style", style);
+
+        if (style !== undefined) {
+            var attrs = style.split(';');
+
+            for (i = 0, l = attrs.length; i < l; i = i + 1) {
+                var matches = attrs[i].replace(/\s/g, '').match(ereg);
+                if (matches !== null && matches.length >= 1)
+                    return matches[1];
+            }
+        }
 
+        style = element.css('width');
+        if (style.indexOf("%") > 0) {
+            return style;
+        }
+
+        return '100%';
+    },
+
+    setup_sortable_select2: function(subject, data) {
         var transformedData = [];
         for (var i = 0 ; i < data.length ; i++) {
             transformedData[i] = {id: data[i].data, text: data[i].label};
         }
 
         subject.select2({
-            data:     transformedData,
+            width: function(){
+                return Admin.get_select2_width(this.element);
+            },
+            dropdownAutoWidth: true,
+            data: transformedData,
             multiple: true
         });
 

diff --git a/Resources/views/Form/form_admin_fields.html.twig b/Resources/views/Form/form_admin_fields.html.twig
@@ -409,11 +409,10 @@ file that was distributed with this source code.
 
 {%  block sonata_type_choice_multiple_sortable %}
     <input type="hidden" name="{{ full_name }}" id="{{ id }}" value="{{ value|join(',') }}" />
+
     <script>
         jQuery(document).ready(function() {
-            var $target = jQuery('#{{ id }}');
-
-            Admin.setup_sortable_select2($target, {{ form.vars.choices|json_encode|raw }});
+            Admin.setup_sortable_select2(jQuery('#{{ id }}'), {{ form.vars.choices|json_encode|raw }});
         });
     </script>
 {% endblock %}