Make widget media property & fix use_default_init

Author: benmurden

intl_tel_input/widgets.py

@@ -12,28 +12,11 @@
 class IntlTelInputWidget(forms.TextInput):
     input_type = 'tel'
 
-    class Media:
-        css = {
-            'all': (
-                'https://cdnjs.cloudflare.com/ajax/libs/intl-tel-input/'
-                '{version}/css/intlTelInput.css'.format(
-                    version=INTL_TEL_INPUT_VERSION
-                ),
-            ),
-        }
-        js = (
-            'https://cdnjs.cloudflare.com/ajax/libs/intl-tel-input/'
-            '{version}/js/intlTelInput-jquery.min.js'.format(
-                version=INTL_TEL_INPUT_VERSION
-            ),
-        )
-
     def __init__(self, attrs=None, allow_dropdown=True,
                  preferred_countries=['us', 'gb'], default_code='us',
                  use_default_init=True):
 
-        if use_default_init:
-            self.Media.js += ('intl_tel_input/init.js',)
+        self.use_default_init = use_default_init
 
         final_attrs = {
             'size': '20',
@@ -47,6 +30,30 @@ def __init__(self, attrs=None, allow_dropdown=True,
 
         super(IntlTelInputWidget, self).__init__(attrs=final_attrs)
 
+    @property
+    def media(self):
+        js = (
+                'https://cdnjs.cloudflare.com/ajax/libs/intl-tel-input/'
+                '{version}/js/intlTelInput-jquery.min.js'.format(
+                    version=INTL_TEL_INPUT_VERSION
+                ),
+            )
+
+        if self.use_default_init:
+            js += ('intl_tel_input/init.js',)
+
+        return forms.Media(
+            css={
+                'all': (
+                    'https://cdnjs.cloudflare.com/ajax/libs/intl-tel-input/'
+                    '{version}/css/intlTelInput.css'.format(
+                        version=INTL_TEL_INPUT_VERSION
+                    ),
+                ),
+            },
+            js=js
+        )
+
     def render(self, name, value, renderer=None, attrs=None):
         if value is None:
             value = ''

testapp/forms.py

@@ -17,3 +17,9 @@ class TelFormAttrs(forms.Form):
 
 class TwoTelForm(TelForm):
     tel_number_2 = forms.CharField(widget=IntlTelInputWidget(), required=True)
+
+
+class TelFormNoInit(forms.Form):
+    tel_number = forms.CharField(widget=IntlTelInputWidget(
+        use_default_init=False
+    ))

testapp/tests.py

@@ -58,6 +58,10 @@ def test_with_initial(self):
         r = self.client.get('/initial-test/')
         self.assertIn('value="+81123456789"', r.content.decode('utf-8'))
 
+    def test_use_default_init(self):
+        r = self.client.get('/no-init-test/')
+        self.assertNotIn('/intl_tel_input/init.js', r.content.decode('utf-8'))
+
 
 class wait_for_utils_script(object):
     def __call__(self, driver):

testapp/urls.py

@@ -1,10 +1,12 @@
 from django.conf.urls import url
 
-from .views import attrs_test, home, initial_test, two_fields_test
+from .views import (attrs_test, home, initial_test, no_init_test,
+                    two_fields_test)
 
 urlpatterns = [
     url(r'^$', home),
     url(r'^attrs-test/$', attrs_test),
     url(r'^initial-test/$', initial_test),
     url(r'^two-field-test/$', two_fields_test),
+    url(r'^no-init-test/$', no_init_test)
 ]

testapp/views.py

@@ -1,7 +1,7 @@
 from django.http import HttpResponseRedirect
 from django.shortcuts import render
 
-from .forms import TelForm, TelFormAttrs, TwoTelForm
+from .forms import TelForm, TelFormAttrs, TwoTelForm, TelFormNoInit
 
 
 def home(request):
@@ -30,3 +30,8 @@ def two_fields_test(request):
     else:
         form = TwoTelForm()
     return render(request, 'home.html', {'form': form})
+
+
+def no_init_test(request):
+    form = TelFormNoInit()
+    return render(request, 'home.html', {'form': form})