From 8d76a6179180018001cfd90eb37347ad48f9edfa Mon Sep 17 00:00:00 2001 From: Thomas Schreiber Date: Sat, 13 Sep 2014 15:14:11 +0200 Subject: [PATCH] prevent dashes in javascript variable names --- django_select2/widgets.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/django_select2/widgets.py b/django_select2/widgets.py index 52dea5b..8d331bc 100644 --- a/django_select2/widgets.py +++ b/django_select2/widgets.py @@ -629,7 +629,7 @@ class AutoHeavySelect2Mixin(object): super(AutoHeavySelect2Mixin, self).__init__(*args, **kwargs) def render_inner_js_code(self, id_, *args): - fieldset_compatible_id = re.sub(r'-\d+-', '_', id_) + fieldset_id = re.sub(r'-\d+-', '_', id_).replace('-', '_') if '__prefix__' in id_: return '' else: @@ -637,10 +637,10 @@ class AutoHeavySelect2Mixin(object): window.django_select2.%s = function (selector, fieldID) { var hashedSelector = "#" + selector; $(hashedSelector).data("field_id", fieldID); - ''' % (fieldset_compatible_id) - js += super(AutoHeavySelect2Mixin, self).render_inner_js_code(id_, *args) + ''' % (fieldset_id) + js += super(AutoHeavySelect2Mixin, self).render_inner_js_code(id_.replace('-', '_'), *args) js += '};' - js += 'django_select2.%s("%s", "%s");' % (fieldset_compatible_id, id_, self.field_id) + js += 'django_select2.%s("%s", "%s");' % (fieldset_id, id_.replace('-', '_'), self.field_id) return js