Add selectize.js as select components widget.

z127 · Nov 15, 2013 · 2adbed5 · 2adbed5
1 parent 3cd17ef
commit 2adbed5
Show file tree

Hide file tree

Showing 14 changed files with 5,006 additions and 10 deletions.
diff --git a/.gitignore b/.gitignore
@@ -38,6 +38,7 @@ nosetests.xml
 .c9revisions
 .settings
 xadmin/static/xadmin/components/
+xadmin/static/xadmin/bower_components/
 
 .idea
 *~

diff --git a/xadmin/plugins/filters.py b/xadmin/plugins/filters.py
@@ -186,7 +186,7 @@ def get_media(self, media):
                                         'xadmin.widget.datetime.js')
         if bool(filter(lambda s: isinstance(s, RelatedFieldSearchFilter), self.filter_specs)):
             media = media + self.vendor(
-                'select2.js', 'select2.css', 'xadmin.widget.select.js')
+                'select.js', 'select.css', 'xadmin.widget.select.js')
         return media + self.vendor('xadmin.plugin.filters.js')
 
     # Block Views

diff --git a/xadmin/plugins/relfield.py b/xadmin/plugins/relfield.py
@@ -48,7 +48,7 @@ def label_for_value(self, value):
 
     @property
     def media(self):
-        return vendor('select2.js', 'select2.css', 'xadmin.widget.select.js')
+        return vendor('select.js', 'select.css', 'xadmin.widget.select.js')
 
 
 class RelateFieldPlugin(BaseAdminPlugin):

diff --git a/xadmin/static/xadmin/component.json b/xadmin/static/xadmin/component.json
@@ -13,6 +13,7 @@
     "load-image": "blueimp/JavaScript-Load-Image",
     "bootstrap-image-gallery": "blueimp/Bootstrap-Image-Gallery",
     "select2": ">=3.3.2",
+    "selectize": ">=0.8.4",
     "datejs": "datejs/Datejs",
     "bootstrap-multiselect": "davidstutz/bootstrap-multiselect"
   }

diff --git a/xadmin/static/xadmin/css/xadmin.form.css b/xadmin/static/xadmin/css/xadmin.form.css
@@ -100,7 +100,7 @@ select.selectmultiple {
   select.selectmultiple {
     max-width: 350px;
   }
-  .select2-container{
+  .select2-container, .selectize-control{
     max-width: 300px;
   }
 

diff --git a/xadmin/static/xadmin/js/xadmin.widget.select.js b/xadmin/static/xadmin/js/xadmin.widget.select.js
@@ -2,8 +2,8 @@
     // add select2 render
     if(!window.__admin_ismobile__){
         $.fn.exform.renders.push(function(f){
-          if($.fn.select2){
-            f.find('select:not(.select-search):not([multiple=multiple])').select2();
+          if($.fn.selectize){
+            f.find('select:not(.select-search):not([multiple=multiple])').selectize();
             f.find('.select-search').each(function(){
                 var $el = $(this);
                 $el.select2({