Skip to content

[4.0] Fields redo, switcher #21227

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 8 commits into from
Aug 10, 2018
Merged

[4.0] Fields redo, switcher #21227

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
0367906
do not recreate child elements on node move
dgrammatiko Jul 23, 2018
10a8353
Change span to fieldset to properly adapt focus
dgrammatiko Jul 23, 2018
2ebf414
label for sould targeting the fieldset
dgrammatiko Jul 23, 2018
b48d9e8
one more try
dgrammatiko Aug 8, 2018
6eb66f9
again
dgrammatiko Aug 9, 2018
6020902
aria-labeledby
dgrammatiko Aug 9, 2018
5aca995
Merge branch '4.0-dev' into fields/redo/switcher
rdeutz Aug 10, 2018
c95390f
Merge branch '4.0-dev' into fields/redo/switcher
wilsonge Aug 10, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion build/media/webcomponents/js/field-switcher/field-switcher.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@
// Set the id to the fieldset
spanFirst.id = this.id;
// Remove the id from the custom Element
this.removeAttribute('id');
// this.removeAttribute('id');

const switchEl = document.createElement('span');
switchEl.classList.add('switch');
Expand Down
1 change: 0 additions & 1 deletion layouts/joomla/form/field/radio/switcher.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,6 @@
}

?>
<label id="<?php echo $id; ?>-lbl"><?php echo $label; ?></label>
<joomla-field-switcher <?php echo implode(' ', $attribs); ?>>
<?php foreach ($options as $i => $option) : ?>
<?php
Expand Down
7 changes: 6 additions & 1 deletion layouts/joomla/form/renderlabel.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@

$id = $for . '-lbl';
$title = '';
$forAttr = '';

if (!empty($description))
{
Expand Down Expand Up @@ -56,7 +57,11 @@
$classes[] = 'required';
}

if(!isset($displayData['field']->skipLabelFor) || $displayData['field']->skipLabelFor !== true)
Copy link
Contributor Author

@dgrammatiko dgrammatiko Aug 9, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@wilsonge @mbabker is this ok for you? We need to control when the for attribute is displayed and this was my take here

{
$forAttr = 'for="' . $for . '"';
}
?>
<label id="<?php echo $id; ?>" for="<?php echo $for; ?>"<?php if (!empty($classes)) echo ' class="' . implode(' ', $classes) . '"'; ?><?php echo $title; ?><?php echo $position; ?>>
<label id="<?php echo $id; ?>" <?php echo $forAttr; ?><?php if (!empty($classes)) echo ' class="' . implode(' ', $classes) . '"'; ?><?php echo $title; ?><?php echo $position; ?>>
<?php echo $text; ?><?php if ($required) : ?><span class="star" aria-hidden="true">&#160;*</span><?php endif; ?>
</label>
2 changes: 1 addition & 1 deletion libraries/src/Form/Field/RadioField.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ public function setup(\SimpleXMLElement $element, $value, $group = null)
if (!$element['layout'] && strpos(trim($this->class), 'switcher') === 0)
{

Copy link
Contributor

@Quy Quy Aug 8, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Remove blank line

$this->renderLabelLayout = '';
$this->skipLabelFor = true;
$this->layout = 'joomla.form.field.radio.switcher';
}

Expand Down