Skip to content

Commit

Permalink
Issue #2848230 - Ensure state select field has an empty option
Browse files Browse the repository at this point in the history
  • Loading branch information
colemanw committed Feb 14, 2017
1 parent 146aef0 commit 5382a28
Showing 1 changed file with 1 addition and 10 deletions.
11 changes: 1 addition & 10 deletions js/webform_civicrm_forms.js
Original file line number Diff line number Diff line change
Expand Up @@ -282,20 +282,14 @@ var wfCivi = (function ($, D) {
if (!$.isEmptyObject(data || [])) {
if (!data['']) {
var text = $el.hasClass('required') ? Drupal.t('- Select -') : Drupal.t('- None -');
if ($el.hasClass('has-default')) {
$el.removeClass('has-default');
}
else {
$el.append('<option value="">'+text+'</option>');
}
$el.append('<option value="">'+text+'</option>');
}
$.each(data, function(key, val) {
$el.append('<option value="'+key+'">'+val+'</option>');
});
$el.val(value);
}
else {
$el.removeClass('has-default');
$el.append('<option value="-">'+Drupal.t('- N/A -')+'</option>');
}
$el.removeAttr('disabled').trigger('change', 'webform_civicrm:chainselect');
Expand Down Expand Up @@ -340,9 +334,6 @@ var wfCivi = (function ($, D) {
classes = $el.attr('class').replace('text', 'select'),
id = $el.attr('id'),
$form = $el.closest('form');
if (value !== '') {
classes = classes + ' has-default';
}
$el.replaceWith('<select id="'+$el.attr('id')+'" name="'+$el.attr('name')+'"' + ' class="' + classes + ' civicrm-processed" data-val="' + value + '"></select>');
return $('#' + id, $form).change(function() {
$(this).attr('data-val', '');
Expand Down

0 comments on commit 5382a28

Please sign in to comment.