Commit 80aaccb9 authored by Marcelo Vani's avatar Marcelo Vani
Browse files

#3166935 Allow Captcha Keypad to work on more than one form on the page.

parent 164a70f9
Loading
Loading
Loading
Loading
+2 −21
Changes for captcha_keypad.module: 2 added lines, 21 removed lines.
Original line number Diff line number Diff line
@@ -95,10 +95,10 @@ function captcha_keypad_form_alter(&$form, FormStateInterface $form_state, $form

  array_unshift($form['#validate'], 'captcha_keypad_form_validate');

  $form['#attached']['library'][] = 'captcha_keypad/captcha_keypad';

  // Rebuild form.
  $form_state->setRebuild();

  _captcha_keypad_add_js_css($form);
}

/**
@@ -120,7 +120,6 @@ function captcha_keypad_form_validate(array &$form, FormStateInterface $form_sta
  }

  if ($captcha_keypad_input != $captcha_keypad_hidden || $captcha_keypad_keypad_used != 'Yes') {
    _captcha_keypad_add_js_css($form);
    $form_state->setErrorByName('captcha_keypad_input', t('Invalid security code.'));
  }
}
@@ -144,21 +143,3 @@ function _captcha_keypad_get_code($digits) {

  return $code;
}

/**
 * Helper to add css and javascript.
 */
function _captcha_keypad_add_js_css(&$form) {
    $code = $form['captcha_keypad']['captcha_keypad_hidden']['#value'];
    $form['#attached']['html_head'][] = [
    [
      '#type' => 'html_tag',
      '#tag' => 'script',
      '#value' => "window.captchaKeypad = window.captchaKeypad || []; captchaKeypad.push($code);",
      '#attributes' => array('type' => 'text/javascript')
    ],
    'captcha-keypad',
  ];

  $form['#attached']['library'][] = 'captcha_keypad/captcha_keypad';
}
+1 −4
Changes for js/captcha_keypad.js: 1 added line, 4 removed lines.
Original line number Diff line number Diff line
@@ -2,10 +2,7 @@
  Drupal.behaviors.captchaKeypad = {
    attach: function (context, settings) {
      var clear = '<span class="clear">' + Drupal.t('Clear') + '</span><br/>' + '<span class="message"></span>';
      var selectors = window.captchaKeypad.map(function(i) {
        return '.captcha-keypad-' + i;
      }).join(', ');
      $(selectors, context).once('captcha-keypad').each(function() {
      $('.captcha-keypad-wrapper', context).once('captcha-keypad').each(function() {
        $(this).find('.form-item-captcha-keypad-input').append(clear);
        $(this).find('.captcha-keypad-keypad-used').val('');
        $(this).find('.captcha-keypad-input').val('').keyup(function () {