Drupal
/
drupal
mirror of https://git.drupalcode.org/project/drupal.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Issue #2002474 by heddn, brennanmh: Rename Views method element_label_type() to elementLabelType().

8.0.x
Alex Pott 2013-06-10 14:54:59 +01:00
parent 081a59c764
commit 4c40f8212d
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/modules/views/lib/Drupal/views/Plugin/views/field/FieldPluginBase.php
View File

@ -226,7 +226,7 @@ abstract class FieldPluginBase extends HandlerBase {
/** /**
* Return an HTML element for the label based upon the field's element type. * Return an HTML element for the label based upon the field's element type.
*/ */
function element_label_type($none_supported = FALSE, $default_empty = FALSE) { public function elementLabelType($none_supported = FALSE, $default_empty = FALSE) {
if ($none_supported) { if ($none_supported) {
if ($this->options['element_label_type'] === '0') { if ($this->options['element_label_type'] === '0') {
return ''; return '';

10
core/modules/views/views.theme.inc
View File

@ -290,8 +290,8 @@ function template_preprocess_views_view_fields(&$vars) {
$object->label_html .= ': '; $object->label_html .= ': ';
} }
$object->element_label_type = $object->handler->element_label_type(TRUE, !$vars['options']['default_field_elements']); $object->elementLabelType = $object->handler->elementLabelType(TRUE, !$vars['options']['default_field_elements']);
if ($object->element_label_type) { if ($object->elementLabelType) {
$attributes = array(); $attributes = array();
if ($object->handler->options['element_default_classes']) { if ($object->handler->options['element_default_classes']) {
$attributes['class'][] = 'views-label'; $attributes['class'][] = 'views-label';
@ -304,11 +304,11 @@ function template_preprocess_views_view_fields(&$vars) {
} }
$attributes = new Attribute($attributes); $attributes = new Attribute($attributes);
$pre = '<' . $object->element_label_type; $pre = '<' . $object->elementLabelType;
$pre .= $attributes; $pre .= $attributes;
$pre .= '>'; $pre .= '>';
$object->label_html = $pre . $object->label_html . '</' . $object->element_label_type . '>'; $object->label_html = $pre . $object->label_html . '</' . $object->elementLabelType . '>';
} }
} }
@ -626,7 +626,7 @@ function template_preprocess_views_view_table(&$vars) {
} }
// Add a header label wrapper if one was selected. // Add a header label wrapper if one was selected.
if ($vars['header'][$field]) { if ($vars['header'][$field]) {
$element_label_type = $fields[$field]->element_label_type(TRUE, TRUE); $element_label_type = $fields[$field]->elementLabelType(TRUE, TRUE);
if ($element_label_type) { if ($element_label_type) {
$vars['header'][$field] = '<' . $element_label_type . '>' . $vars['header'][$field] . '</' . $element_label_type . '>'; $vars['header'][$field] = '<' . $element_label_type . '>' . $vars['header'][$field] . '</' . $element_label_type . '>';
} }