Skip to content

Commit ed0578d

Browse files
hartworkcodingjoe
authored andcommitted
Enforce https:// for CDN URLs (fixes applegrew#609)
1 parent 2d8a536 commit ed0578d

File tree

3 files changed

+17
-17
lines changed

3 files changed

+17
-17
lines changed

django_select2/conf.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ class Select2Conf(AppConf):
5656
It has set `select2_` as a default value, which you can change if needed.
5757
"""
5858

59-
JS = '//cdnjs.cloudflare.com/ajax/libs/select2/{version}/js/select2.min.js'.format(version=LIB_VERSION)
59+
JS = 'https://cdnjs.cloudflare.com/ajax/libs/select2/{version}/js/select2.min.js'.format(version=LIB_VERSION)
6060
"""
6161
The URI for the Select2 JS file. By default this points to the Cloudflare CDN.
6262
@@ -74,7 +74,7 @@ class Select2Conf(AppConf):
7474
develop without an Internet connection.
7575
"""
7676

77-
CSS = '//cdnjs.cloudflare.com/ajax/libs/select2/{version}/css/select2.min.css'.format(version=LIB_VERSION)
77+
CSS = 'https://cdnjs.cloudflare.com/ajax/libs/select2/{version}/css/select2.min.css'.format(version=LIB_VERSION)
7878
"""
7979
The URI for the Select2 CSS file. By default this points to the Cloudflare CDN.
8080
@@ -92,7 +92,7 @@ class Select2Conf(AppConf):
9292
develop without an Internet connection.
9393
"""
9494

95-
I18N_PATH = '//cdnjs.cloudflare.com/ajax/libs/select2/{version}/js/i18n'.format(version=LIB_VERSION)
95+
I18N_PATH = 'https://cdnjs.cloudflare.com/ajax/libs/select2/{version}/js/i18n'.format(version=LIB_VERSION)
9696
"""
9797
The base URI for the Select2 i18n files. By default this points to the Cloudflare CDN.
9898

tests/test_forms.py

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -102,44 +102,44 @@ def test_empty_option(self, db):
102102
def test_i18n(self):
103103
translation.activate('de')
104104
assert tuple(Select2Widget().media._js) == (
105-
f'//cdnjs.cloudflare.com/ajax/libs/select2/{settings.SELECT2_LIB_VERSION}/js/select2.min.js',
106-
f'//cdnjs.cloudflare.com/ajax/libs/select2/{settings.SELECT2_LIB_VERSION}/js/i18n/de.js',
105+
f'https://cdnjs.cloudflare.com/ajax/libs/select2/{settings.SELECT2_LIB_VERSION}/js/select2.min.js',
106+
f'https://cdnjs.cloudflare.com/ajax/libs/select2/{settings.SELECT2_LIB_VERSION}/js/i18n/de.js',
107107
'django_select2/django_select2.js'
108108
)
109109

110110
translation.activate('en')
111111
assert tuple(Select2Widget().media._js) == (
112-
f'//cdnjs.cloudflare.com/ajax/libs/select2/{settings.SELECT2_LIB_VERSION}/js/select2.min.js',
113-
f'//cdnjs.cloudflare.com/ajax/libs/select2/{settings.SELECT2_LIB_VERSION}/js/i18n/en.js',
112+
f'https://cdnjs.cloudflare.com/ajax/libs/select2/{settings.SELECT2_LIB_VERSION}/js/select2.min.js',
113+
f'https://cdnjs.cloudflare.com/ajax/libs/select2/{settings.SELECT2_LIB_VERSION}/js/i18n/en.js',
114114
'django_select2/django_select2.js'
115115
)
116116

117117
translation.activate('00')
118118
assert tuple(Select2Widget().media._js) == (
119-
f'//cdnjs.cloudflare.com/ajax/libs/select2/{settings.SELECT2_LIB_VERSION}/js/select2.min.js',
119+
f'https://cdnjs.cloudflare.com/ajax/libs/select2/{settings.SELECT2_LIB_VERSION}/js/select2.min.js',
120120
'django_select2/django_select2.js'
121121
)
122122

123123
translation.activate('sr-cyrl')
124124
assert tuple(Select2Widget().media._js) == (
125-
f'//cdnjs.cloudflare.com/ajax/libs/select2/{settings.SELECT2_LIB_VERSION}/js/select2.min.js',
126-
f'//cdnjs.cloudflare.com/ajax/libs/select2/{settings.SELECT2_LIB_VERSION}/js/i18n/sr-Cyrl.js',
125+
f'https://cdnjs.cloudflare.com/ajax/libs/select2/{settings.SELECT2_LIB_VERSION}/js/select2.min.js',
126+
f'https://cdnjs.cloudflare.com/ajax/libs/select2/{settings.SELECT2_LIB_VERSION}/js/i18n/sr-Cyrl.js',
127127
'django_select2/django_select2.js'
128128
)
129129

130130
pytest.importorskip("django", minversion="2.0.4")
131131

132132
translation.activate('zh-hans')
133133
assert tuple(Select2Widget().media._js) == (
134-
f'//cdnjs.cloudflare.com/ajax/libs/select2/{settings.SELECT2_LIB_VERSION}/js/select2.min.js',
135-
f'//cdnjs.cloudflare.com/ajax/libs/select2/{settings.SELECT2_LIB_VERSION}/js/i18n/zh-CN.js',
134+
f'https://cdnjs.cloudflare.com/ajax/libs/select2/{settings.SELECT2_LIB_VERSION}/js/select2.min.js',
135+
f'https://cdnjs.cloudflare.com/ajax/libs/select2/{settings.SELECT2_LIB_VERSION}/js/i18n/zh-CN.js',
136136
'django_select2/django_select2.js'
137137
)
138138

139139
translation.activate('zh-hant')
140140
assert tuple(Select2Widget().media._js) == (
141-
f'//cdnjs.cloudflare.com/ajax/libs/select2/{settings.SELECT2_LIB_VERSION}/js/select2.min.js',
142-
f'//cdnjs.cloudflare.com/ajax/libs/select2/{settings.SELECT2_LIB_VERSION}/js/i18n/zh-TW.js',
141+
f'https://cdnjs.cloudflare.com/ajax/libs/select2/{settings.SELECT2_LIB_VERSION}/js/select2.min.js',
142+
f'https://cdnjs.cloudflare.com/ajax/libs/select2/{settings.SELECT2_LIB_VERSION}/js/i18n/zh-TW.js',
143143
'django_select2/django_select2.js'
144144
)
145145

@@ -148,8 +148,8 @@ class TestSelect2MixinSettings:
148148
def test_default_media(self):
149149
sut = Select2Widget()
150150
result = sut.media.render()
151-
assert f'//cdnjs.cloudflare.com/ajax/libs/select2/{settings.SELECT2_LIB_VERSION}/js/select2.min.js' in result
152-
assert f'//cdnjs.cloudflare.com/ajax/libs/select2/{settings.SELECT2_LIB_VERSION}/css/select2.min.css' in result
151+
assert f'https://cdnjs.cloudflare.com/ajax/libs/select2/{settings.SELECT2_LIB_VERSION}/js/select2.min.js' in result
152+
assert f'https://cdnjs.cloudflare.com/ajax/libs/select2/{settings.SELECT2_LIB_VERSION}/css/select2.min.css' in result
153153
assert 'django_select2/django_select2.js' in result
154154

155155
def test_js_setting(self, settings):

tests/testapp/templates/form.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
{{ form }}
1616
<input type="submit" value="Submit Form"/>
1717
</form>
18-
<script src="//code.jquery.com/jquery-2.1.4.min.js"></script>
18+
<script src="https://code.jquery.com/jquery-2.1.4.min.js"></script>
1919
<script type="text/javascript">
2020
window.onerror = function (msg) {
2121
$("body").attr("JSError", msg);

0 commit comments

Comments
 (0)