select2ajax: use requirejs

abilian · Jun 16, 2015 · b3dd2f5 · b3dd2f5
1 parent ff9d0d4
commit b3dd2f5
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 4 deletions.
diff --git a/abilian/web/forms/widgets.py b/abilian/web/forms/widgets.py
@@ -1281,6 +1281,9 @@ def process_formdata(self, valuelist):
     return valuelist
 
   def __call__(self, field, **kwargs):
+    """
+    Render widget
+    """
     if self.multiple:
       kwargs['multiple'] = True
 

diff --git a/abilian/web/templates/widgets/select2ajax.html b/abilian/web/templates/widgets/select2ajax.html
@@ -2,7 +2,7 @@
 
 {%- deferJS %}
 <script type="text/javascript">
-(function() {
+ function initWidget($) {
    var init_params = {
      minimumInputLength: 2,
      containerCssClass: 'form-control',
@@ -14,8 +14,8 @@
        var data = [{% for oid, label in values %}
                    {id: {{ oid|tojson }}, text: {{ label|tojson }}}{% if not loop.last %},{%- endif %}{% endfor %}
        ];
-       if (data.length > 1) debugger;
-       if (data.length > 0) {
+       if (data.length > 1) { /* debugger; */ } 
+       else if (data.length > 0) {
          callback(data{%- if not s2_params.multiple %}[0]{%- endif %});
        }
      },
@@ -37,6 +37,12 @@
   $('input[name="{{ id }}"]').data({'init-with': 'select2',
                                     'init-params': init_params}
   );
-})();
+ }
+
+ require(['Abilian', 'jquery'],
+         function(Abilian, $) {
+             console.log('register onAppInit');
+             Abilian.fn.onAppInit(function() { initWidget($); });
+         });
 </script>
 {%- enddeferJS %}