From 64adbaf8c223c43c10c62da5233c8e0d443b5e3e Mon Sep 17 00:00:00 2001 From: florenttorregrosa Date: Sat, 20 May 2017 11:18:08 +0200 Subject: [PATCH] Issue #2877263 by hkirsman, Grimreaper: Search button broken when glyph icons are disabled --- src/Plugin/Form/SearchBlockForm.php | 6 ++++-- src/Plugin/Form/SearchForm.php | 6 ++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/src/Plugin/Form/SearchBlockForm.php b/src/Plugin/Form/SearchBlockForm.php index 46202b4..c3096b6 100644 --- a/src/Plugin/Form/SearchBlockForm.php +++ b/src/Plugin/Form/SearchBlockForm.php @@ -6,7 +6,7 @@ namespace Drupal\bootstrap\Plugin\Form; -use Drupal\bootstrap\Annotation\BootstrapForm; +use Drupal\bootstrap\Bootstrap; use Drupal\bootstrap\Utility\Element; use Drupal\Core\Form\FormStateInterface; @@ -23,7 +23,9 @@ class SearchBlockForm extends FormBase { * {@inheritdoc} */ public function alterFormElement(Element $form, FormStateInterface $form_state, $form_id = NULL) { - $form->actions->submit->setProperty('icon_only', TRUE); + if (Bootstrap::getTheme()->getSetting('button_iconize')) { + $form->actions->submit->setProperty('icon_only', TRUE); + } $form->keys->setProperty('input_group_button', TRUE); } diff --git a/src/Plugin/Form/SearchForm.php b/src/Plugin/Form/SearchForm.php index 9a821ab..a7b2121 100644 --- a/src/Plugin/Form/SearchForm.php +++ b/src/Plugin/Form/SearchForm.php @@ -6,7 +6,7 @@ namespace Drupal\bootstrap\Plugin\Form; -use Drupal\bootstrap\Annotation\BootstrapForm; +use Drupal\bootstrap\Bootstrap; use Drupal\bootstrap\Utility\Element; use Drupal\Core\Form\FormStateInterface; @@ -26,7 +26,9 @@ class SearchForm extends FormBase { $form->advanced->setProperty('collapsible', TRUE); $form->advanced->setProperty('collapsed', TRUE); $form->basic->removeClass('container-inline'); - $form->basic->submit->setProperty('icon_only', TRUE); + if (Bootstrap::getTheme()->getSetting('button_iconize')) { + $form->basic->submit->setProperty('icon_only', TRUE); + } $form->basic->keys->setProperty('input_group_button', TRUE); } -- 2.1.4