prevent dashes in javascript variable names

This commit is contained in:
Thomas Schreiber 2014-09-13 15:14:11 +02:00
parent e0686628d7
commit 8d76a61791

View file

@ -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