Update Composer, update everything

This commit is contained in:
Oliver Davies 2018-11-23 12:29:20 +00:00
parent ea3e94409f
commit dda5c284b6
19527 changed files with 1135420 additions and 351004 deletions

View file

@ -2,8 +2,10 @@
namespace Drupal\webform\Element;
use Drupal\Core\Form\FormStateInterface;
use Drupal\Core\Render\Element\Range;
use Drupal\Core\Render\Element;
use Drupal\webform\Utility\WebformElementHelper;
/**
* Provides a webform element for entering a rating.
@ -23,6 +25,9 @@ class WebformRating extends Range {
'#step' => 1,
'#star_size' => 'medium',
'#reset' => FALSE,
'#process' => [
[$class, 'processWebformRating'],
],
'#pre_render' => [
[$class, 'preRenderWebformRating'],
],
@ -30,6 +35,15 @@ class WebformRating extends Range {
] + parent::getInfo();
}
/**
* Expand rating elements.
*/
public static function processWebformRating(&$element, FormStateInterface $form_state, &$complete_form) {
// Add validate callback.
$element['#element_validate'] = [[get_called_class(), 'validateWebformRating']];
return $element;
}
/**
* Prepares a #type 'webform_rating' render element for input.html.twig.
*
@ -51,7 +65,7 @@ class WebformRating extends Range {
$element['#attributes']['value'] = $element['#attributes']['min'];
}
$element['#children']['rateit'] = self::buildRateIt($element);
$element['#children']['rateit'] = static::buildRateIt($element);
return $element;
}
@ -62,8 +76,8 @@ class WebformRating extends Range {
* @param array $element
* A rating element.
*
* @return string
* The RateIt div tag.
* @return array
* A renderable array containing the RateIt div tag.
*
* @see https://github.com/gjunge/rateit.js/wiki
*/
@ -89,9 +103,9 @@ class WebformRating extends Range {
'data-rateit-readonly' => $is_readonly ? 'true' : 'false',
];
// Set range element's #id.
if (isset($element['#id'])) {
$attributes['data-rateit-backingfld'] = '#' . $element['#id'];
// Set range element's selector based on its parents.
if (isset($element['#attributes']['data-drupal-selector'])) {
$attributes['data-rateit-backingfld'] = '[data-drupal-selector="' . $element['#attributes']['data-drupal-selector'] . '"]';
}
// Set value for HTML preview.
@ -120,7 +134,17 @@ class WebformRating extends Range {
'library' => ['webform/webform.element.rating'],
],
];
}
/**
* Validates a rating element.
*/
public static function validateWebformRating(&$element, FormStateInterface $form_state, &$complete_form) {
$value = $element['#value'];
$has_access = (!isset($element['#access']) || $element['#access'] === TRUE);
if ($has_access && !empty($element['#required']) && ($value === '0' || $value === '')) {
WebformElementHelper::setRequiredError($element, $form_state);
}
}
}