From 7357a4300fc8ed69cd2cd5a76c40fc95ba895513 Mon Sep 17 00:00:00 2001
From: Ted Cooper <elc@784944.no-reply.drupal.org>
Date: Wed, 6 Dec 2023 12:01:31 +1000
Subject: [PATCH] Fix indenting. Minor CS.
---
js/facets-views-ajax.js | 5 +-
src/Controller/FacetBlockAjaxController.php | 2 +-
src/Plugin/Block/FacetBlock.php | 103 ++++++++++----------
3 files changed, 56 insertions(+), 54 deletions(-)
diff --git a/js/facets-views-ajax.js b/js/facets-views-ajax.js
index 375a620f..8b4983ac 100644
--- a/js/facets-views-ajax.js
+++ b/js/facets-views-ajax.js
@@ -3,7 +3,6 @@
* Facets views AJAX handling.
*/
-
(function ($, Drupal, once) {
'use strict';
@@ -39,7 +38,7 @@
return;
}
- // Update view on range slider stop event
+ // Update view on range slider stop event.
if (typeof settings.facets !== "undefined" && settings.facets.sliders && settings.facets.sliders[facetId]) {
settings.facets.sliders[facetId].stop = function (e, ui) {
const sliderSettings = settings.facets.sliders[facetId];
@@ -73,7 +72,7 @@
for (let paramName in newQueryParams) {
if (paramName.substr(0, 1) === 'f') {
value = newQueryParams[paramName];
- // replace
+ // Replace.
facetKey = value.substr(0, value.indexOf(':'));
if (typeof facetPositions[facetKey] !== 'undefined') {
paramKey = 'f[' + facetPositions[facetKey] + ']';
diff --git a/src/Controller/FacetBlockAjaxController.php b/src/Controller/FacetBlockAjaxController.php
index 8c6edf31..68b3ae69 100644
--- a/src/Controller/FacetBlockAjaxController.php
+++ b/src/Controller/FacetBlockAjaxController.php
@@ -155,7 +155,7 @@ class FacetBlockAjaxController extends ControllerBase {
$container = \Drupal::getContainer();
$container->set('request_stack', $request_stack);
- foreach ($facets_blocks as $block_selector => $block_id) {
+ foreach ($facets_blocks as $block_selector => $block_id) {
// Facet block render array.
$block_view = NULL;
// Re prepare from css standarts.
diff --git a/src/Plugin/Block/FacetBlock.php b/src/Plugin/Block/FacetBlock.php
index 11520812..304e598c 100644
--- a/src/Plugin/Block/FacetBlock.php
+++ b/src/Plugin/Block/FacetBlock.php
@@ -2,14 +2,14 @@
namespace Drupal\facets\Plugin\Block;
+use Drupal\Component\Utility\Html;
use Drupal\Core\Access\AccessResult;
use Drupal\Core\Block\BlockBase;
-use Drupal\Component\Utility\Html;
use Drupal\Core\Cache\Cache;
use Drupal\Core\Cache\CacheableMetadata;
use Drupal\Core\Entity\EntityStorageInterface;
-use Drupal\Core\Plugin\ContainerFactoryPluginInterface;
use Drupal\Core\Form\FormStateInterface;
+use Drupal\Core\Plugin\ContainerFactoryPluginInterface;
use Drupal\Core\Session\AccountInterface;
use Drupal\facets\FacetInterface;
use Drupal\facets\FacetManager\DefaultFacetManager;
@@ -40,6 +40,8 @@ class FacetBlock extends BlockBase implements ContainerFactoryPluginInterface {
protected $facetStorage;
/**
+ * The facet entity.
+ *
* @var \Drupal\facets\FacetInterface
*/
protected $facet;
@@ -93,56 +95,57 @@ class FacetBlock extends BlockBase implements ContainerFactoryPluginInterface {
// Let the facet_manager build the facets.
$facet_build = $this->facetManager->build($facet);
- if ($facet_build) {
- CacheableMetadata::createFromObject($this)->applyTo($build);
-
- // Add extra elements from facet source, for example, ajax scripts.
- // @see Drupal\facets\Plugin\facets\facet_source\SearchApiDisplay
- /** @var \Drupal\facets\FacetSource\FacetSourcePluginInterface $facet_source */
- $facet_source = $facet->getFacetSource();
- $facet_build += $facet_source->buildFacet();
-
- $build = [
- '#type' => 'container',
- '#contextual_links' => [
- 'facets_facet' => [
- 'route_parameters' => ['facets_facet' => $facet->id()],
- ],
- ],
- '#attributes' => [
- 'class' => ['block-facet__wrapper'],
- ],
- $facet_build,
- ];
-
- // Add css classes.
- if (!empty($facet_build[0]['#attributes']['class'])) {
- $css_classes = $facet_build[0]['#attributes']['class'];
- // Active/inactive css classes.
- if (in_array('facet-active', $css_classes)) {
- $build['#attributes']['class'][] = 'facet-active';
- } else {
- $build['#attributes']['class'][] = 'facet-inactive';
- }
- // Whether it is necessary to add hide css class.
- if (in_array('facet-hidden', $css_classes)) {
- $build['#attributes']['class'][] = 'hidden';
- }
+ if ($facet_build) {
+ CacheableMetadata::createFromObject($this)->applyTo($build);
+
+ // Add extra elements from facet source, for example, ajax scripts.
+ // @see Drupal\facets\Plugin\facets\facet_source\SearchApiDisplay
+ /** @var \Drupal\facets\FacetSource\FacetSourcePluginInterface $facet_source */
+ $facet_source = $facet->getFacetSource();
+ $facet_build += $facet_source->buildFacet();
+
+ $build = [
+ '#type' => 'container',
+ '#contextual_links' => [
+ 'facets_facet' => [
+ 'route_parameters' => ['facets_facet' => $facet->id()],
+ ],
+ ],
+ '#attributes' => [
+ 'class' => ['block-facet__wrapper'],
+ ],
+ 0 => $facet_build,
+ ];
+
+ // Add css classes.
+ if (!empty($facet_build[0]['#attributes']['class'])) {
+ $css_classes = $facet_build[0]['#attributes']['class'];
+ // Active/inactive css classes.
+ if (in_array('facet-active', $css_classes)) {
+ $build['#attributes']['class'][] = 'facet-active';
}
-
- // Add classes needed for ajax.
- if (!empty($facet_build['#use_ajax'])) {
- $build['#attributes']['class'][] = 'block-facets-ajax';
- $block_id = str_replace(':', '--', $this->pluginId);
- $block_id = Html::cleanCssIdentifier($block_id);
- $build['#attributes']['class'][] = 'js-facet-block-id-' . $block_id;
- $build['#attributes']['id'] = Html::getUniqueId($block_id);
+ else {
+ $build['#attributes']['class'][] = 'facet-inactive';
}
-
- // To render correctly in different situations.
- $build = [
- 'facet_block' => $build,
- ];
+ // Whether it is necessary to add hide css class.
+ if (in_array('facet-hidden', $css_classes)) {
+ $build['#attributes']['class'][] = 'hidden';
+ }
+ }
+
+ // Add classes needed for ajax.
+ if (!empty($facet_build['#use_ajax'])) {
+ $build['#attributes']['class'][] = 'block-facets-ajax';
+ $block_id = str_replace(':', '--', $this->pluginId);
+ $block_id = Html::cleanCssIdentifier($block_id);
+ $build['#attributes']['class'][] = 'js-facet-block-id-' . $block_id;
+ $build['#attributes']['id'] = Html::getUniqueId($block_id);
+ }
+
+ // To render correctly in different situations.
+ $build = [
+ 'facet_block' => $build,
+ ];
}
return $build;
}
--
GitLab