Merge pull request #4 from lukesturgeon/master

Added 'for' attribute to checkbox and radio button <label>s
pixelandtonic · Jan 1, 2013 · 1ffa5f3 · 1ffa5f3
2 parents 731c014 + ddc0944
commit 1ffa5f3
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 6 deletions.
diff --git a/ee2/third_party/pt_checkboxes/ft.pt_checkboxes.php b/ee2/third_party/pt_checkboxes/ft.pt_checkboxes.php
@@ -76,9 +76,15 @@ function _display_field($data, $field_name)
 
 		foreach($this->settings['options'] as $option_name => $option_label)
 		{
-			$selected = in_array($option_name, $data) ? 1 : 0;
-			$r .= '<label>'
-			    .   form_checkbox($field_name.'[]', $option_name, $selected)
+			$field_data = array(
+				'name'        => $field_name.'[]',
+				'id'          => $option_name,
+				'value'       => $option_name,
+				'checked'     => in_array($option_name, $data) ? 1 : 0
+			);
+
+			$r .= '<label for="' . $field_data['id'] . '">'
+			    .   form_checkbox($field_data)
 			    .   NBS . $option_label
 			    . '</label> ';
 		}

diff --git a/ee2/third_party/pt_radio_buttons/ft.pt_radio_buttons.php b/ee2/third_party/pt_radio_buttons/ft.pt_radio_buttons.php
@@ -66,9 +66,15 @@ function _display_field($data, $field_name)
 
 		foreach($this->settings['options'] as $option_name => $option)
 		{
-			$selected = ((string) $option_name === (string) $data);
-			$r .= '<label>'
-			    .   form_radio($field_name, $option_name, $selected)
+			$field_data = array(
+				'name'        => $field_name,
+				'id'          => $option_name,
+				'value'       => $option_name,
+				'checked'     => ((string) $option_name === (string) $data)
+			);
+
+			$r .= '<label for="' . $field_data['id'] . '">'
+			    .   form_radio($field_data)
 			    .   NBS . $option
 			    . '</label>';
 		}