diff --git a/handlers/views_handler_area_text.inc b/handlers/views_handler_area_text.inc
index f17511d08d57015eed3a58e01b90b4bc52419509..51815c046aa8bd311ada821918b793b4aad5d188 100644
--- a/handlers/views_handler_area_text.inc
+++ b/handlers/views_handler_area_text.inc
@@ -73,11 +73,11 @@ function options_form(&$form, &$form_state) {
'#collapsed' => TRUE,
'#value' => $output,
'#id' => 'edit-options-token-help',
- '#dependency' => array(
- 'edit-options-tokenize' => array(1),
+ '#states' => array(
+ 'visible' => array(
+ ':input[name="options[tokenize]"]' => array('checked' => TRUE),
+ ),
),
- '#prefix' => '<div>',
- '#suffix' => '</div>',
);
}
}
diff --git a/handlers/views_handler_argument.inc b/handlers/views_handler_argument.inc
index 8e46bf37f0ceaeb781518df6146b4f8f3ecac4fb..526b765753e10bfd81fac31e449648a08e5563e8 100644
--- a/handlers/views_handler_argument.inc
+++ b/handlers/views_handler_argument.inc
@@ -269,8 +269,10 @@ function options_form(&$form, &$form_state) {
'#size' => 20,
'#default_value' => $this->options['exception']['title'],
'#description' => t('Override the view and other argument titles. Use "%1" for the first argument, "%2" for the second, etc.'),
- '#dependency' => array(
- 'edit-options-exception-title-enable' => array('1'),
+ '#states' => array(
+ 'visible' => array(
+ ':input[name="options[exception][title_enable]"]' => array('checked' => TRUE),
+ ),
),
);
@@ -304,8 +306,10 @@ function options_form(&$form, &$form_state) {
'#title_display' => 'invisible',
'#default_value' => $this->options['title'],
'#description' => t('Override the view and other argument titles. Use "%1" for the first argument, "%2" for the second, etc.'),
- '#dependency' => array(
- 'edit-options-title-enable' => array('1'),
+ '#states' => array(
+ 'visible' => array(
+ ':input[name="options[title_enable]"]' => array('checked' => TRUE),
+ ),
),
'#fieldset' => 'argument_present',
);
@@ -322,8 +326,10 @@ function options_form(&$form, &$form_state) {
'#title_display' => 'invisible',
'#default_value' => $this->options['breadcrumb'],
'#description' => t('Enter a breadcrumb name you would like to use. See "Title" for percent substitutions.'),
- '#dependency' => array(
- 'edit-options-breadcrumb-enable' => array('1'),
+ '#states' => array(
+ 'visible' => array(
+ ':input[name="options[breadcrumb_enable]"]' => array('checked' => TRUE),
+ ),
),
'#fieldset' => 'argument_present',
);
@@ -345,8 +351,10 @@ function options_form(&$form, &$form_state) {
'#type' => 'select',
'#title' => t('Validator'),
'#default_value' => $this->options['validate']['type'],
- '#dependency' => array(
- 'edit-options-specify-validation' => array('1'),
+ '#states' => array(
+ 'visible' => array(
+ ':input[name="options[specify_validation]"]' => array('checked' => TRUE),
+ ),
),
);
@@ -382,11 +390,12 @@ function options_form(&$form, &$form_state) {
'#type' => 'item',
// Even if the plugin has no options add the key to the form_state.
'#input' => TRUE, // trick it into checking input to make #process run
- '#dependency' => array(
- 'edit-options-specify-validation' => array('1'),
- 'edit-options-validate-type' => array($id),
+ '#states' => array(
+ 'visible' => array(
+ ':input[name="options[specify_validation]"]' => array('checked' => TRUE),
+ ':input[name="options[validate][type]"]' => array('value' => $id),
+ ),
),
- '#dependency_count' => 2,
'#id' => 'edit-options-validate-options-' . $id,
);
$plugin->options_form($form['validate']['options'][$id], $form_state);
@@ -404,8 +413,10 @@ function options_form(&$form, &$form_state) {
'#title' => t('Action to take if filter value does not validate'),
'#default_value' => $this->options['validate']['fail'],
'#options' => $validate_options,
- '#dependency' => array(
- 'edit-options-specify-validation' => array('1'),
+ '#states' => array(
+ 'visible' => array(
+ ':input[name="options[specify_validation]"]' => array('checked' => TRUE),
+ ),
),
'#fieldset' => 'argument_present',
);
@@ -560,8 +571,11 @@ function default_argument_form(&$form, &$form_state) {
'#id' => 'edit-options-default-argument-type',
'#title' => t('Type'),
'#default_value' => $this->options['default_argument_type'],
-
- '#dependency' => array('radio:options[default_action]' => array('default')),
+ '#states' => array(
+ 'visible' => array(
+ ':input[name="options[default_action]"]' => array('value' => 'default'),
+ ),
+ ),
// Views custom key, moves this element to the appropriate container
// under the radio button.
'#argument_option' => 'default',
@@ -582,11 +596,12 @@ function default_argument_form(&$form, &$form_state) {
'#type' => 'item',
// Even if the plugin has no options add the key to the form_state.
'#input' => TRUE,
- '#dependency' => array(
- 'radio:options[default_action]' => array('default'),
- 'edit-options-default-argument-type' => array($id)
+ '#states' => array(
+ 'visible' => array(
+ ':input[name="options[default_action]"]' => array('value' => 'default'),
+ ':input[name="options[default_argument_type]"]' => array('value' => $id),
+ ),
),
- '#dependency_count' => 2,
);
$options[$id] = $info['title'];
$plugin->options_form($form['argument_default'][$id], $form_state);
@@ -623,7 +638,11 @@ function default_summary_form(&$form, &$form_state) {
'#title' => t('Sort order'),
'#options' => array('asc' => t('Ascending'), 'desc' => t('Descending')),
'#default_value' => $this->options['summary']['sort_order'],
- '#dependency' => array('radio:options[default_action]' => array('summary')),
+ '#states' => array(
+ 'visible' => array(
+ ':input[name="options[default_action]"]' => array('value' => 'summary'),
+ ),
+ ),
);
$form['summary']['number_of_records'] = array(
'#type' => 'radios',
@@ -633,7 +652,11 @@ function default_summary_form(&$form, &$form_state) {
0 => $this->get_sort_name(),
1 => t('Number of records')
),
- '#dependency' => array('radio:options[default_action]' => array('summary')),
+ '#states' => array(
+ 'visible' => array(
+ ':input[name="options[default_action]"]' => array('value' => 'summary'),
+ ),
+ ),
);
$form['summary']['format'] = array(
@@ -641,7 +664,11 @@ function default_summary_form(&$form, &$form_state) {
'#title' => t('Format'),
'#options' => $format_options,
'#default_value' => $this->options['summary']['format'],
- '#dependency' => array('radio:options[default_action]' => array('summary')),
+ '#states' => array(
+ 'visible' => array(
+ ':input[name="options[default_action]"]' => array('value' => 'summary'),
+ ),
+ ),
);
foreach ($summary_plugins as $id => $info) {
@@ -656,11 +683,12 @@ function default_summary_form(&$form, &$form_state) {
'#id' => 'edit-options-summary-options-' . $id,
'#type' => 'item',
'#input' => TRUE, // trick it into checking input to make #process run
- '#dependency' => array(
- 'radio:options[default_action]' => array('summary'),
- 'radio:options[summary][format]' => array($id),
+ '#states' => array(
+ 'visible' => array(
+ ':input[name="options[default_action]"]' => array('value' => 'summary'),
+ ':input[name="options[summary][format]"]' => array('value' => $id),
+ ),
),
- '#dependency_count' => 2,
);
$options[$id] = $info['title'];
$plugin->options_form($form['summary']['options'][$id], $form_state);
diff --git a/handlers/views_handler_argument_string.inc b/handlers/views_handler_argument_string.inc
index dbb98fef446ef9b2abfdcc555cf6a4e086ddf73f..fbe54696e4e4de0328d1be0758c106099fc58369 100644
--- a/handlers/views_handler_argument_string.inc
+++ b/handlers/views_handler_argument_string.inc
@@ -57,7 +57,11 @@ function options_form(&$form, &$form_state) {
'#title' => t('Character limit'),
'#description' => t('How many characters of the filter value to filter against. If set to 1, all fields starting with the first letter in the filter value would be matched.'),
'#default_value' => $this->options['limit'],
- '#dependency' => array('edit-options-glossary' => array(TRUE)),
+ '#states' => array(
+ 'visible' => array(
+ ':input[name="options[glossary]"]' => array('checked' => TRUE),
+ ),
+ ),
'#fieldset' => 'more',
);
diff --git a/handlers/views_handler_field.inc b/handlers/views_handler_field.inc
index 5a5c4b7d7c4caa5ad237676c71fabde240fb42ad..6104c12b0a0e21b87e68ca1688f83e44879409a0 100644
--- a/handlers/views_handler_field.inc
+++ b/handlers/views_handler_field.inc
@@ -471,17 +471,22 @@ function options_form(&$form, &$form_state) {
'#type' => 'textfield',
'#title' => t('Label'),
'#default_value' => $label,
- '#dependency' => array(
- 'edit-options-custom-label' => array(1),
+ '#states' => array(
+ 'visible' => array(
+ ':input[name="options[custom_label]"]' => array('checked' => TRUE),
+ ),
),
+
'#weight' => -102,
);
$form['element_label_colon'] = array(
'#type' => 'checkbox',
'#title' => t('Place a colon after the label'),
'#default_value' => $this->options['element_label_colon'],
- '#dependency' => array(
- 'edit-options-custom-label' => array(1),
+ '#states' => array(
+ 'visible' => array(
+ ':input[name="options[custom_label]"]' => array('checked' => TRUE),
+ ),
),
'#weight' => -101,
);
@@ -514,8 +519,10 @@ function options_form(&$form, &$form_state) {
'#type' => 'select',
'#default_value' => $this->options['element_type'],
'#description' => t('Choose the HTML element to wrap around this field, e.g. H1, H2, etc.'),
- '#dependency' => array(
- 'edit-options-element-type-enable' => array(1),
+ '#states' => array(
+ 'visible' => array(
+ ':input[name="options[element_type_enable]"]' => array('checked' => TRUE),
+ ),
),
'#fieldset' => 'style_settings',
);
@@ -523,8 +530,10 @@ function options_form(&$form, &$form_state) {
$form['element_class_enable'] = array(
'#type' => 'checkbox',
'#title' => t('Create a CSS class'),
- '#dependency' => array(
- 'edit-options-element-type-enable' => array(1),
+ '#states' => array(
+ 'visible' => array(
+ ':input[name="options[element_type_enable]"]' => array('checked' => TRUE),
+ ),
),
'#default_value' => !empty($this->options['element_class']) || (string) $this->options['element_class'] == '0',
'#fieldset' => 'style_settings',
@@ -534,11 +543,12 @@ function options_form(&$form, &$form_state) {
'#description' => t('You may use token substitutions from the rewriting section in this class.'),
'#type' => 'textfield',
'#default_value' => $this->options['element_class'],
- '#dependency' => array(
- 'edit-options-element-class-enable' => array(1),
- 'edit-options-element-type-enable' => array(1),
+ '#states' => array(
+ 'visible' => array(
+ ':input[name="options[element_type_enable]"]' => array('checked' => TRUE),
+ ':input[name="options[element_class_enable]"]' => array('checked' => TRUE),
+ ),
),
- '#dependency_count' => 2,
'#fieldset' => 'style_settings',
);
@@ -554,16 +564,20 @@ function options_form(&$form, &$form_state) {
'#type' => 'select',
'#default_value' => $this->options['element_label_type'],
'#description' => t('Choose the HTML element to wrap around this label, e.g. H1, H2, etc.'),
- '#dependency' => array(
- 'edit-options-element-label-type-enable' => array(1),
+ '#states' => array(
+ 'visible' => array(
+ ':input[name="options[element_label_type_enable]"]' => array('checked' => TRUE),
+ ),
),
'#fieldset' => 'style_settings',
);
$form['element_label_class_enable'] = array(
'#type' => 'checkbox',
'#title' => t('Create a CSS class'),
- '#dependency' => array(
- 'edit-options-element-label-type-enable' => array(1)
+ '#states' => array(
+ 'visible' => array(
+ ':input[name="options[element_label_type_enable]"]' => array('checked' => TRUE),
+ ),
),
'#default_value' => !empty($this->options['element_label_class']) || (string) $this->options['element_label_class'] == '0',
'#fieldset' => 'style_settings',
@@ -573,11 +587,12 @@ function options_form(&$form, &$form_state) {
'#description' => t('You may use token substitutions from the rewriting section in this class.'),
'#type' => 'textfield',
'#default_value' => $this->options['element_label_class'],
- '#dependency' => array(
- 'edit-options-element-label-class-enable' => array(1),
- 'edit-options-element-label-type-enable' => array(1),
+ '#states' => array(
+ 'visible' => array(
+ ':input[name="options[element_label_type_enable]"]' => array('checked' => TRUE),
+ ':input[name="options[element_label_class_enable]"]' => array('checked' => TRUE),
+ ),
),
- '#dependency_count' => 2,
'#fieldset' => 'style_settings',
);
@@ -593,8 +608,10 @@ function options_form(&$form, &$form_state) {
'#type' => 'select',
'#default_value' => $this->options['element_wrapper_type'],
'#description' => t('Choose the HTML element to wrap around this field and label, e.g. H1, H2, etc. This may not be used if the field and label are not rendered together, such as with a table.'),
- '#dependency' => array(
- 'edit-options-element-wrapper-type-enable' => array(1),
+ '#states' => array(
+ 'visible' => array(
+ ':input[name="options[element_wrapper_type_enable]"]' => array('checked' => TRUE),
+ ),
),
'#fieldset' => 'style_settings',
);
@@ -602,8 +619,10 @@ function options_form(&$form, &$form_state) {
$form['element_wrapper_class_enable'] = array(
'#type' => 'checkbox',
'#title' => t('Create a CSS class'),
- '#dependency' => array(
- 'edit-options-element-wrapper-type-enable' => array(1),
+ '#states' => array(
+ 'visible' => array(
+ ':input[name="options[element_wrapper_type_enable]"]' => array('checked' => TRUE),
+ ),
),
'#default_value' => !empty($this->options['element_wrapper_class']) || (string) $this->options['element_wrapper_class'] == '0',
'#fieldset' => 'style_settings',
@@ -613,11 +632,12 @@ function options_form(&$form, &$form_state) {
'#description' => t('You may use token substitutions from the rewriting section in this class.'),
'#type' => 'textfield',
'#default_value' => $this->options['element_wrapper_class'],
- '#dependency' => array(
- 'edit-options-element-wrapper-class-enable' => array(1),
- 'edit-options-element-wrapper-type-enable' => array(1),
+ '#states' => array(
+ 'visible' => array(
+ ':input[name="options[element_wrapper_class_enable]"]' => array('checked' => TRUE),
+ ':input[name="options[element_wrapper_type_enable]"]' => array('checked' => TRUE),
+ ),
),
- '#dependency_count' => 2,
'#fieldset' => 'style_settings',
);
@@ -651,8 +671,10 @@ function options_form(&$form, &$form_state) {
'#type' => 'textarea',
'#default_value' => $this->options['alter']['text'],
'#description' => t('The text to display for this field. You may include HTML. You may enter data from this view as per the "Replacement patterns" below.'),
- '#dependency' => array(
- 'edit-options-alter-alter-text' => array(1),
+ '#states' => array(
+ 'visible' => array(
+ ':input[name="options[alter][alter_text]"]' => array('checked' => TRUE),
+ ),
),
);
@@ -667,8 +689,10 @@ function options_form(&$form, &$form_state) {
'#type' => 'textfield',
'#default_value' => $this->options['alter']['path'],
'#description' => t('The Drupal path or absolute URL for this link. You may enter data from this view as per the "Replacement patterns" below.'),
- '#dependency' => array(
- 'edit-options-alter-make-link' => array(1),
+ '#states' => array(
+ 'visible' => array(
+ ':input[name="options[alter][make_link]"]' => array('checked' => TRUE),
+ ),
),
'#maxlength' => 255,
);
@@ -676,16 +700,20 @@ function options_form(&$form, &$form_state) {
'#type' => 'checkbox',
'#title' => t('Use absolute path'),
'#default_value' => $this->options['alter']['absolute'],
- '#dependency' => array(
- 'edit-options-alter-make-link' => array(1),
+ '#states' => array(
+ 'visible' => array(
+ ':input[name="options[alter][make_link]"]' => array('checked' => TRUE),
+ ),
),
);
$form['alter']['replace_spaces'] = array(
'#type' => 'checkbox',
'#title' => t('Replace spaces with dashes'),
'#default_value' => $this->options['alter']['replace_spaces'],
- '#dependency' => array(
- 'edit-options-alter-make-link' => array(1)
+ '#states' => array(
+ 'visible' => array(
+ ':input[name="options[alter][make_link]"]' => array('checked' => TRUE),
+ ),
),
);
$form['alter']['external'] = array(
@@ -693,16 +721,20 @@ function options_form(&$form, &$form_state) {
'#title' => t('External server URL'),
'#default_value' => $this->options['alter']['external'],
'#description' => t("Links to an external server using a full URL: e.g. 'http://www.example.com' or 'www.example.com'."),
- '#dependency' => array(
- 'edit-options-alter-make-link' => array(1),
+ '#states' => array(
+ 'visible' => array(
+ ':input[name="options[alter][make_link]"]' => array('checked' => TRUE),
+ ),
),
);
$form['alter']['path_case'] = array(
'#type' => 'select',
'#title' => t('Transform the case'),
'#description' => t('When printing url paths, how to transform the case of the filter value.'),
- '#dependency' => array(
- 'edit-options-alter-make-link' => array(1),
+ '#states' => array(
+ 'visible' => array(
+ ':input[name="options[alter][make_link]"]' => array('checked' => TRUE),
+ ),
),
'#options' => array(
'none' => t('No transform'),
@@ -718,8 +750,10 @@ function options_form(&$form, &$form_state) {
'#type' => 'textfield',
'#default_value' => $this->options['alter']['link_class'],
'#description' => t('The CSS class to apply to the link.'),
- '#dependency' => array(
- 'edit-options-alter-make-link' => array(1),
+ '#states' => array(
+ 'visible' => array(
+ ':input[name="options[alter][make_link]"]' => array('checked' => TRUE),
+ ),
),
);
$form['alter']['alt'] = array(
@@ -727,8 +761,10 @@ function options_form(&$form, &$form_state) {
'#type' => 'textfield',
'#default_value' => $this->options['alter']['alt'],
'#description' => t('Text to place as "title" text which most browsers display as a tooltip when hovering over the link.'),
- '#dependency' => array(
- 'edit-options-alter-make-link' => array(1),
+ '#states' => array(
+ 'visible' => array(
+ ':input[name="options[alter][make_link]"]' => array('checked' => TRUE),
+ ),
),
);
$form['alter']['rel'] = array(
@@ -736,8 +772,10 @@ function options_form(&$form, &$form_state) {
'#type' => 'textfield',
'#default_value' => $this->options['alter']['rel'],
'#description' => t('Include Rel attribute for use in lightbox2 or other javascript utility.'),
- '#dependency' => array(
- 'edit-options-alter-make-link' => array(1),
+ '#states' => array(
+ 'visible' => array(
+ ':input[name="options[alter][make_link]"]' => array('checked' => TRUE),
+ ),
),
);
$form['alter']['prefix'] = array(
@@ -745,8 +783,10 @@ function options_form(&$form, &$form_state) {
'#type' => 'textfield',
'#default_value' => $this->options['alter']['prefix'],
'#description' => t('Any text to display before this link. You may include HTML.'),
- '#dependency' => array(
- 'edit-options-alter-make-link' => array(1),
+ '#states' => array(
+ 'visible' => array(
+ ':input[name="options[alter][make_link]"]' => array('checked' => TRUE),
+ ),
),
);
$form['alter']['suffix'] = array(
@@ -754,8 +794,10 @@ function options_form(&$form, &$form_state) {
'#type' => 'textfield',
'#default_value' => $this->options['alter']['suffix'],
'#description' => t('Any text to display after this link. You may include HTML.'),
- '#dependency' => array(
- 'edit-options-alter-make-link' => array(1),
+ '#states' => array(
+ 'visible' => array(
+ ':input[name="options[alter][make_link]"]' => array('checked' => TRUE),
+ ),
),
);
$form['alter']['target'] = array(
@@ -763,8 +805,10 @@ function options_form(&$form, &$form_state) {
'#type' => 'textfield',
'#default_value' => $this->options['alter']['target'],
'#description' => t("Target of the link, such as _blank, _parent or an iframe's name. This field is rarely used."),
- '#dependency' => array(
- 'edit-options-alter-make-link' => array(1),
+ '#states' => array(
+ 'visible' => array(
+ ':input[name="options[alter][make_link]"]' => array('checked' => TRUE),
+ ),
),
);
@@ -816,10 +860,18 @@ function options_form(&$form, &$form_state) {
'#collapsible' => TRUE,
'#collapsed' => TRUE,
'#value' => $output,
- '#dependency' => array(
- 'edit-options-alter-make-link' => array(1),
- 'edit-options-alter-alter-text' => array(1),
- 'edit-options-alter-more-link' => array(1),
+ '#states' => array(
+ 'visible' => array(
+ array(
+ ':input[name="options[alter][make_link]"]' => array('checked' => TRUE),
+ ),
+ array(
+ ':input[name="options[alter][alter_text]"]' => array('checked' => TRUE),
+ ),
+ array(
+ ':input[name="options[alter][more_link]"]' => array('checked' => TRUE),
+ ),
+ ),
),
);
@@ -835,8 +887,10 @@ function options_form(&$form, &$form_state) {
'#type' => 'textfield',
'#default_value' => $this->options['alter']['max_length'],
'#description' => t('The maximum number of characters this field can be.'),
- '#dependency' => array(
- 'edit-options-alter-trim' => array(1),
+ '#states' => array(
+ 'visible' => array(
+ ':input[name="options[alter][trim]"]' => array('checked' => TRUE),
+ ),
),
);
@@ -845,8 +899,10 @@ function options_form(&$form, &$form_state) {
'#title' => t('Trim only on a word boundary'),
'#description' => t('If checked, this field be trimmed only on a word boundary. This is guaranteed to be the maximum characters stated or less. If there are no word boundaries this could trim a field to nothing.'),
'#default_value' => $this->options['alter']['word_boundary'],
- '#dependency' => array(
- 'edit-options-alter-trim' => array(1),
+ '#states' => array(
+ 'visible' => array(
+ ':input[name="options[alter][trim]"]' => array('checked' => TRUE),
+ ),
),
);
@@ -855,8 +911,10 @@ function options_form(&$form, &$form_state) {
'#title' => t('Add an ellipsis'),
'#description' => t('If checked, a "..." will be added if a field was trimmed.'),
'#default_value' => $this->options['alter']['ellipsis'],
- '#dependency' => array(
- 'edit-options-alter-trim' => array(1),
+ '#states' => array(
+ 'visible' => array(
+ ':input[name="options[alter][trim]"]' => array('checked' => TRUE),
+ ),
),
);
@@ -865,8 +923,10 @@ function options_form(&$form, &$form_state) {
'#title' => t('Add a read-more link if output is trimmed.'),
'#description' => t('If checked, a read-more link will be added at the end of the trimmed output'),
'#default_value' => $this->options['alter']['more_link'],
- '#dependency' => array(
- 'edit-options-alter-trim' => array(1),
+ '#states' => array(
+ 'visible' => array(
+ ':input[name="options[alter][trim]"]' => array('checked' => TRUE),
+ ),
),
);
@@ -875,10 +935,11 @@ function options_form(&$form, &$form_state) {
'#title' => t('More link text'),
'#default_value' => $this->options['alter']['more_link_text'],
'#description' => t('The text which will be displayed on the more link. You may enter data from this view as per the "Replacement patterns" above.'),
- '#dependency_count' => 2,
- '#dependency' => array(
- 'edit-options-alter-trim' => array(1),
- 'edit-options-alter-more-link' => array(1),
+ '#states' => array(
+ 'visible' => array(
+ ':input[name="options[alter][trim]"]' => array('checked' => TRUE),
+ ':input[name="options[alter][more_link]"]' => array('checked' => TRUE),
+ ),
),
);
$form['alter']['more_link_path'] = array(
@@ -886,10 +947,11 @@ function options_form(&$form, &$form_state) {
'#title' => t('More link path'),
'#default_value' => $this->options['alter']['more_link_path'],
'#description' => t('The path which is used for the more link. You may enter data from this view as per the "Replacement patterns" above.'),
- '#dependency_count' => 2,
- '#dependency' => array(
- 'edit-options-alter-trim' => array(1),
- 'edit-options-alter-more-link' => array(1),
+ '#states' => array(
+ 'visible' => array(
+ ':input[name="options[alter][trim]"]' => array('checked' => TRUE),
+ ':input[name="options[alter][more_link]"]' => array('checked' => TRUE),
+ ),
),
);
@@ -898,8 +960,10 @@ function options_form(&$form, &$form_state) {
'#title' => t('Field can contain HTML'),
'#description' => t('If checked, HTML corrector will be run to ensure tags are properly closed after trimming.'),
'#default_value' => $this->options['alter']['html'],
- '#dependency' => array(
- 'edit-options-alter-trim' => array(1),
+ '#states' => array(
+ 'visible' => array(
+ ':input[name="options[alter][trim]"]' => array('checked' => TRUE),
+ ),
),
);
@@ -915,8 +979,10 @@ function options_form(&$form, &$form_state) {
'#title' => t('Preserve certain tags'),
'#description' => t('List the tags that need to be preserved during the stripping process. example "<p> <br>" which will preserve all p and br elements'),
'#default_value' => $this->options['alter']['preserve_tags'],
- '#dependency' => array(
- 'edit-options-alter-strip-tags' => array(1),
+ '#states' => array(
+ 'visible' => array(
+ ':input[name="options[alter][strip_tags]"]' => array('checked' => TRUE),
+ ),
),
);
diff --git a/handlers/views_handler_field_custom.inc b/handlers/views_handler_field_custom.inc
index 66586de235e718da78f18a2af85abef4bfe813a8..7d3459ead4d156ecdc4e047829dbc82914da3ebd 100644
--- a/handlers/views_handler_field_custom.inc
+++ b/handlers/views_handler_field_custom.inc
@@ -29,10 +29,8 @@ function options_form(&$form, &$form_state) {
// Remove the checkbox
unset($form['alter']['alter_text']);
- unset($form['alter']['text']['#dependency']);
- unset($form['alter']['text']['#process']);
- unset($form['alter']['help']['#dependency']);
- unset($form['alter']['help']['#process']);
+ unset($form['alter']['text']['#states']);
+ unset($form['alter']['help']['#states']);
$form['#pre_render'][] = 'views_handler_field_custom_pre_render_move_text';
}
diff --git a/handlers/views_handler_field_date.inc b/handlers/views_handler_field_date.inc
index 8f3fe3923b044a1ff54576ffaecdb87628084693..3d4fb2e3df8bb459844a39cd023cfe906ec7bf74 100644
--- a/handlers/views_handler_field_date.inc
+++ b/handlers/views_handler_field_date.inc
@@ -48,8 +48,13 @@ function options_form(&$form, &$form_state) {
'#title' => t('Custom date format'),
'#description' => t('If "Custom", see <a href="http://us.php.net/manual/en/function.date.php" target="_blank">the PHP docs</a> for date formats. Otherwise, enter the number of different time units to display, which defaults to 2.'),
'#default_value' => isset($this->options['custom_date_format']) ? $this->options['custom_date_format'] : '',
- '#dependency' => array('edit-options-date-format' => array('custom', 'raw time ago', 'time ago', 'raw time hence', 'time hence', 'raw time span', 'time span', 'raw time span', 'inverse time span', 'time span')),
);
+ // Setup #states for all possible date_formats on the custom_date_format form element.
+ foreach (array('custom', 'raw time ago', 'time ago', 'raw time hence', 'time hence', 'raw time span', 'time span', 'raw time span', 'inverse time span', 'time span') as $custom_date_possible) {
+ $form['custom_date_format']['#states']['visible'][] = array(
+ ':input[name="options[date_format]"]' => array('value' => $custom_date_possible),
+ );
+ }
parent::options_form($form, $form_state);
}
diff --git a/handlers/views_handler_field_math.inc b/handlers/views_handler_field_math.inc
index 08fba0602d5aea4f3d1af0bd8576774e482dcef7..3172be9bc443fa4f1e2f946ad4276a548307ce8e 100644
--- a/handlers/views_handler_field_math.inc
+++ b/handlers/views_handler_field_math.inc
@@ -36,7 +36,7 @@ function options_form(&$form, &$form_state) {
// Then move the existing help:
$form['expression_help'] = $form['alter']['help'];
- unset($form['expression_help']['#dependency']);
+ unset($form['expression_help']['#states']);
unset($form['alter']['help']);
}
diff --git a/handlers/views_handler_field_numeric.inc b/handlers/views_handler_field_numeric.inc
index d10d3d0b3601d0de8c2d41ef8e39b0165f815d3b..eb2a53b5f06cbb1ff7129ffafc71d3e0e13254c8 100644
--- a/handlers/views_handler_field_numeric.inc
+++ b/handlers/views_handler_field_numeric.inc
@@ -44,7 +44,11 @@ function options_form(&$form, &$form_state) {
'#title' => t('Precision'),
'#default_value' => $this->options['precision'],
'#description' => t('Specify how many digits to print after the decimal point.'),
- '#dependency' => array('edit-options-set-precision' => array(TRUE)),
+ '#states' => array(
+ 'visible' => array(
+ ':input[name="options[set_precision]"]' => array('checked' => TRUE),
+ ),
+ ),
'#size' => 2,
);
$form['decimal'] = array(
@@ -80,14 +84,22 @@ function options_form(&$form, &$form_state) {
'#title' => t('Singular form'),
'#default_value' => $this->options['format_plural_singular'],
'#description' => t('Text to use for the singular form.'),
- '#dependency' => array('edit-options-format-plural' => array(TRUE)),
+ '#states' => array(
+ 'visible' => array(
+ ':input[name="options[format_plural]"]' => array('checked' => TRUE),
+ ),
+ ),
);
$form['format_plural_plural'] = array(
'#type' => 'textfield',
'#title' => t('Plural form'),
'#default_value' => $this->options['format_plural_plural'],
'#description' => t('Text to use for the plural form, @count will be replaced with the value.'),
- '#dependency' => array('edit-options-format-plural' => array(TRUE)),
+ '#states' => array(
+ 'visible' => array(
+ ':input[name="options[format_plural]"]' => array('checked' => TRUE),
+ ),
+ ),
);
$form['prefix'] = array(
'#type' => 'textfield',
diff --git a/handlers/views_handler_field_prerender_list.inc b/handlers/views_handler_field_prerender_list.inc
index 00a571aa6f2799d7725cae2e73ecb6024e6ee5b9..53e1f99e9808ca9120fef4c5f5a53fcf2faa4608 100644
--- a/handlers/views_handler_field_prerender_list.inc
+++ b/handlers/views_handler_field_prerender_list.inc
@@ -51,7 +51,11 @@ function options_form(&$form, &$form_state) {
'#type' => 'textfield',
'#title' => t('Separator'),
'#default_value' => $this->options['separator'],
- '#dependency' => array('radio:options[type]' => array('separator')),
+ '#states' => array(
+ 'visible' => array(
+ ':input[name="options[type]"]' => array('value' => 'separator'),
+ ),
+ ),
);
parent::options_form($form, $form_state);
}
diff --git a/handlers/views_handler_field_serialized.inc b/handlers/views_handler_field_serialized.inc
index 1579fce71f916ef3db29c258d4fa74a505cbbf15..ef432b456be3aeef7dd30020fbc916accc90c263 100644
--- a/handlers/views_handler_field_serialized.inc
+++ b/handlers/views_handler_field_serialized.inc
@@ -38,7 +38,11 @@ function options_form(&$form, &$form_state) {
'#type' => 'textfield',
'#title' => t('Which key should be displayed'),
'#default_value' => $this->options['key'],
- '#dependency' => array('edit-options-format' => array('key')),
+ '#states' => array(
+ 'visible' => array(
+ ':input[name="options[format]"]' => array('value' => 'key'),
+ ),
+ ),
);
}
diff --git a/handlers/views_handler_filter.inc b/handlers/views_handler_filter.inc
index b8c6ac10eef4a54992b8697d80a1725ae481b68f..90e6b73b0b39840e0a8d8c45c0de21041262cbbc 100644
--- a/handlers/views_handler_filter.inc
+++ b/handlers/views_handler_filter.inc
@@ -357,8 +357,10 @@ function expose_form(&$form, &$form_state) {
'#title' => t('Operator identifier'),
'#size' => 40,
'#description' => t('This will appear in the URL after the ? to identify this operator.'),
- '#dependency' => array(
- 'edit-options-expose-use-operator' => array(1)
+ '#states' => array(
+ 'visible' => array(
+ ':input[name="options[expose][use_operator]"]' => array('checked' => TRUE),
+ ),
),
'#fieldset' => 'more',
);
diff --git a/handlers/views_handler_filter_in_operator.inc b/handlers/views_handler_filter_in_operator.inc
index a801badf9b429c9628031097fb8d897691730b0c..86570f0fc95865ff744e506690559384d2991d0a 100644
--- a/handlers/views_handler_filter_in_operator.inc
+++ b/handlers/views_handler_filter_in_operator.inc
@@ -166,7 +166,7 @@ function value_form(&$form, &$form_state) {
$which = 'all';
if (!empty($form['operator'])) {
- $source = ($form['operator']['#type'] == 'radios') ? 'radio:options[operator]' : 'edit-options-operator';
+ $source = ':input[name="options[operator]"]';
}
if (!empty($form_state['exposed'])) {
$identifier = $this->options['expose']['identifier'];
@@ -176,7 +176,7 @@ function value_form(&$form, &$form_state) {
$which = in_array($this->operator, $this->operator_values(1)) ? 'value' : 'none';
}
else {
- $source = 'edit-' . drupal_html_id($this->options['expose']['operator_id']);
+ $source = ':input[name="' . $this->options['expose']['operator_id'] . '"]';
}
if (!empty($this->options['expose']['reduce'])) {
@@ -221,7 +221,12 @@ function value_form(&$form, &$form_state) {
$form['value']['#prefix'] = '<div id="edit-options-value-wrapper">';
$form['value']['#suffix'] = '</div>';
}
- $form['value']['#dependency'] = array($source => $this->operator_values(1));
+ // Setup #states for all operators with one value.
+ foreach ($this->operator_values(1) as $operator) {
+ $form['value']['#states']['visible'][] = array(
+ $source => array('value' => $operator),
+ );
+ }
}
}
}
diff --git a/handlers/views_handler_filter_numeric.inc b/handlers/views_handler_filter_numeric.inc
index 6400f357941eea5fb4aeae60354644797a1a76fd..3e979964482bc3aa5badecddd38ebee445adefc5 100644
--- a/handlers/views_handler_filter_numeric.inc
+++ b/handlers/views_handler_filter_numeric.inc
@@ -147,7 +147,7 @@ function value_form(&$form, &$form_state) {
// render the form items we need.
$which = 'all';
if (!empty($form['operator'])) {
- $source = ($form['operator']['#type'] == 'radios') ? 'radio:options[operator]' : 'edit-options-operator';
+ $source = ':input[name="options[operator]"]';
}
if (!empty($form_state['exposed'])) {
@@ -158,7 +158,7 @@ function value_form(&$form, &$form_state) {
$which = in_array($this->operator, $this->operator_values(2)) ? 'minmax' : 'value';
}
else {
- $source = 'edit-' . drupal_html_id($this->options['expose']['operator_id']);
+ $source = ':input[name="' . $this->options['expose']['operator_id'] . '"]';
}
}
@@ -168,8 +168,13 @@ function value_form(&$form, &$form_state) {
'#title' => empty($form_state['exposed']) ? t('Value') : '',
'#size' => 30,
'#default_value' => $this->value['value'],
- '#dependency' => array($source => $this->operator_values(1)),
);
+ // Setup #states for all operators with one value.
+ foreach ($this->operator_values(1) as $operator) {
+ $form['value']['value']['#states']['visible'][] = array(
+ $source => array('value' => $operator),
+ );
+ }
if (!empty($form_state['exposed']) && !isset($form_state['input'][$identifier]['value'])) {
$form_state['input'][$identifier]['value'] = $this->value['value'];
}
@@ -202,11 +207,15 @@ function value_form(&$form, &$form_state) {
'#default_value' => $this->value['max'],
);
if ($which == 'all') {
- $dependency = array(
- '#dependency' => array($source => $this->operator_values(2)),
- );
- $form['value']['min'] += $dependency;
- $form['value']['max'] += $dependency;
+ $states = array();
+ // Setup #states for all operators with two values.
+ foreach ($this->operator_values(2) as $operator) {
+ $states['#states']['visible'][] = array(
+ $source => array('value' => $operator),
+ );
+ }
+ $form['value']['min'] += $states;
+ $form['value']['max'] += $states;
}
if (!empty($form_state['exposed']) && !isset($form_state['input'][$identifier]['min'])) {
$form_state['input'][$identifier]['min'] = $this->value['min'];
diff --git a/handlers/views_handler_filter_string.inc b/handlers/views_handler_filter_string.inc
index c7494d0e2e70dca05e58638d931d656dd7c5cec3..4c9177d8ad0bf303d6f3228a5569b0f8abcb869b 100644
--- a/handlers/views_handler_filter_string.inc
+++ b/handlers/views_handler_filter_string.inc
@@ -186,7 +186,7 @@ function value_form(&$form, &$form_state) {
// render the form items we need.
$which = 'all';
if (!empty($form['operator'])) {
- $source = ($form['operator']['#type'] == 'radios') ? 'radio:options[operator]' : 'edit-options-operator';
+ $source = ':input[name="options[operator]"]';
}
if (!empty($form_state['exposed'])) {
$identifier = $this->options['expose']['identifier'];
@@ -196,7 +196,7 @@ function value_form(&$form, &$form_state) {
$which = in_array($this->operator, $this->operator_values(1)) ? 'value' : 'none';
}
else {
- $source = 'edit-' . drupal_html_id($this->options['expose']['operator_id']);
+ $source = ':input[name="' . $this->options['expose']['operator_id'] . '"]';
}
}
@@ -212,9 +212,12 @@ function value_form(&$form, &$form_state) {
}
if ($which == 'all') {
- $form['value'] += array(
- '#dependency' => array($source => $this->operator_values(1)),
- );
+ // Setup #states for all operators with one value.
+ foreach ($this->operator_values(1) as $operator) {
+ $form['value']['#states']['visible'][] = array(
+ $source => array('value' => $operator),
+ );
+ }
}
}
diff --git a/includes/admin.inc b/includes/admin.inc
index 69403488fd3c9d3245c28869d25cf8bf3c343449..cc85d264f2eac61178e13f26f69242af7830526e 100644
--- a/includes/admin.inc
+++ b/includes/admin.inc
@@ -333,8 +333,10 @@ function views_ui_add_form($form, &$form_state) {
'#title_display' => 'invisible',
'#size' => 64,
'#default_value' => !empty($form_state['view']) ? $form_state['view']->description : '',
- '#dependency' => array(
- 'edit-description-enable' => array(1),
+ '#states' => array(
+ 'visible' => array(
+ ':input[name="description_enable"]' => array('checked' => TRUE),
+ ),
),
);
@@ -4755,24 +4757,37 @@ function views_ui_admin_settings_basic() {
'above' => t('Above the preview'),
'below' => t('Below the preview'),
),
- '#id' => 'edit-show-sql',
+// '#id' => 'edit-show-sql',
'#default_value' => variable_get('views_ui_show_sql_query_where', 'above'),
- '#dependency' => array('edit-views-ui-show-preview-information' => array(TRUE)),
- '#prefix' => '<div id="edit-show-sql-wrapper" class="views-dependent">',
- '#suffix' => '</div>',
+// '#dependency' => array('edit-views-ui-show-preview-information' => array(TRUE)),
+ '#states' => array(
+ 'visible' => array(
+ ':input[name="views_ui_show_preview_information"]' => array('checked' => TRUE),
+ ),
+ ),
+// '#prefix' => '<div id="edit-show-sql-wrapper" class="views-dependent">',
+// '#suffix' => '</div>',
);
$form['live_preview']['views_ui_show_sql_query'] = array(
'#type' => 'checkbox',
'#title' => t('Show the SQL query'),
'#default_value' => variable_get('views_ui_show_sql_query', FALSE),
- '#dependency' => array('edit-views-ui-show-preview-information' => array(TRUE)),
+ '#states' => array(
+ 'visible' => array(
+ ':input[name="views_ui_show_preview_information"]' => array('checked' => TRUE),
+ ),
+ ),
);
$form['live_preview']['views_ui_show_performance_statistics'] = array(
'#type' => 'checkbox',
'#title' => t('Show performance statistics'),
'#default_value' => variable_get('views_ui_show_performance_statistics', FALSE),
- '#dependency' => array('edit-views-ui-show-preview-information' => array(TRUE)),
+ '#states' => array(
+ 'visible' => array(
+ ':input[name="views_ui_show_preview_information"]' => array('checked' => TRUE),
+ ),
+ ),
);
$form['live_preview']['views_show_additional_queries'] = array(
@@ -4780,7 +4795,11 @@ function views_ui_admin_settings_basic() {
'#title' => t('Show other queries run during render during live preview'),
'#description' => t("Drupal has the potential to run many queries while a view is being rendered. Checking this box will display every query run during view render as part of the live preview."),
'#default_value' => variable_get('views_show_additional_queries', FALSE),
- '#dependency' => array('edit-views-ui-show-preview-information' => array(TRUE)),
+ '#states' => array(
+ 'visible' => array(
+ ':input[name="views_ui_show_preview_information"]' => array('checked' => TRUE),
+ ),
+ ),
);
// $form['live_preview']['views_ui_show_performance_statistics_where'] = array(
@@ -4865,7 +4884,11 @@ function views_ui_admin_settings_advanced() {
'#title' => t('Page region to output performance statistics/debug messages'),
'#default_value' => variable_get('views_devel_region', 'footer'),
'#options' => $regions,
- '#dependency' => array('edit-views-devel-output' => array(1)),
+ '#states' => array(
+ 'visible' => array(
+ ':input[name="views_devel_output"]' => array('checked' => TRUE),
+ ),
+ ),
);
$options = views_fetch_plugin_names('display_extender');
diff --git a/modules/field/views_handler_argument_field_list.inc b/modules/field/views_handler_argument_field_list.inc
index e0f7abe830e326e1e9284af99cf5c983ad377270..965bd1857bf7413282de3d4479f6bef46715a73c 100644
--- a/modules/field/views_handler_argument_field_list.inc
+++ b/modules/field/views_handler_argument_field_list.inc
@@ -39,7 +39,11 @@ function options_form(&$form, &$form_state) {
'#title' => t('Display list value as human readable'),
'#type' => 'checkbox',
'#default_value' => $this->options['summary']['human'],
- '#dependency' => array('radio:options[default_action]' => array('summary')),
+ '#states' => array(
+ 'visible' => array(
+ ':input[name="options[default_action]"]' => array('value' => 'summary'),
+ ),
+ ),
);
}
diff --git a/modules/field/views_handler_argument_field_list_string.inc b/modules/field/views_handler_argument_field_list_string.inc
index 67a9f2d9998972405db8564251b6e957c0094674..c3537f33c1598aaf6e459e5d9bf5b9d5cc3d219d 100644
--- a/modules/field/views_handler_argument_field_list_string.inc
+++ b/modules/field/views_handler_argument_field_list_string.inc
@@ -40,7 +40,11 @@ function options_form(&$form, &$form_state) {
'#title' => t('Display list value as human readable'),
'#type' => 'checkbox',
'#default_value' => $this->options['summary']['human'],
- '#dependency' => array('radio:options[default_action]' => array('summary')),
+ '#states' => array(
+ 'visible' => array(
+ ':input[name="options[default_action]"]' => array('value' => 'summary'),
+ ),
+ ),
);
}
diff --git a/modules/field/views_handler_field_field.inc b/modules/field/views_handler_field_field.inc
index 60208542b75b3f61aa28259ccaf0032bc1ac7b67..e4dd7fdc4bb1318f6bca6218a40267fe187cf102 100644
--- a/modules/field/views_handler_field_field.inc
+++ b/modules/field/views_handler_field_field.inc
@@ -503,7 +503,11 @@ function multiple_options_form(&$form, &$form_state) {
'ol' => t('Ordered list'),
'separator' => t('Simple separator'),
),
- '#dependency' => array('edit-options-group-rows' => array(TRUE)),
+ '#states' => array(
+ 'visible' => array(
+ ':input[name="options[group_rows]"]' => array('checked' => TRUE),
+ ),
+ ),
'#default_value' => $this->options['multi_type'],
'#fieldset' => 'multiple_field_settings',
);
@@ -512,11 +516,12 @@ function multiple_options_form(&$form, &$form_state) {
'#type' => 'textfield',
'#title' => t('Separator'),
'#default_value' => $this->options['separator'],
- '#dependency' => array(
- 'radio:options[multi_type]' => array('separator'),
- 'edit-options-group-rows' => array(TRUE),
+ '#states' => array(
+ 'visible' => array(
+ ':input[name="options[group_rows]"]' => array('checked' => TRUE),
+ ':input[name="options[multi_type]"]' => array('value' => 'separator'),
+ ),
),
- '#dependency_count' => 2,
'#fieldset' => 'multiple_field_settings',
);
@@ -528,7 +533,11 @@ function multiple_options_form(&$form, &$form_state) {
'#options' => $options,
'#default_value' => $this->options['delta_limit'],
'#prefix' => '<div class="container-inline">',
- '#dependency' => array('edit-options-group-rows' => array(TRUE)),
+ '#states' => array(
+ 'visible' => array(
+ ':input[name="options[group_rows]"]' => array('checked' => TRUE),
+ ),
+ ),
'#fieldset' => 'multiple_field_settings',
);
@@ -539,7 +548,11 @@ function multiple_options_form(&$form, &$form_state) {
'#field_prefix' => $prefix,
'#field_suffix' => $suffix,
'#default_value' => $this->options['delta_offset'],
- '#dependency' => array('edit-options-group-rows' => array(TRUE)),
+ '#states' => array(
+ 'visible' => array(
+ ':input[name="options[group_rows]"]' => array('checked' => TRUE),
+ ),
+ ),
'#description' => t('(first item is 0)'),
'#fieldset' => 'multiple_field_settings',
);
@@ -548,7 +561,11 @@ function multiple_options_form(&$form, &$form_state) {
'#type' => 'checkbox',
'#default_value' => $this->options['delta_reversed'],
'#suffix' => $suffix,
- '#dependency' => array('edit-options-group-rows' => array(TRUE)),
+ '#states' => array(
+ 'visible' => array(
+ ':input[name="options[group_rows]"]' => array('checked' => TRUE),
+ ),
+ ),
'#description' => t('(start from last values)'),
'#fieldset' => 'multiple_field_settings',
);
@@ -557,7 +574,11 @@ function multiple_options_form(&$form, &$form_state) {
'#type' => 'checkbox',
'#default_value' => $this->options['delta_first_last'],
'#suffix' => '</div>',
- '#dependency' => array('edit-options-group-rows' => array(TRUE)),
+ '#states' => array(
+ 'visible' => array(
+ ':input[name="options[group_rows]"]' => array('checked' => TRUE),
+ ),
+ ),
'#fieldset' => 'multiple_field_settings',
);
}
diff --git a/modules/node/views_plugin_argument_validate_node.inc b/modules/node/views_plugin_argument_validate_node.inc
index 018965da236fde743d8c4b772c94643c9b39c1c5..868a621dcde17a3518f6f71ea32947af7bace222 100644
--- a/modules/node/views_plugin_argument_validate_node.inc
+++ b/modules/node/views_plugin_argument_validate_node.inc
@@ -44,7 +44,11 @@ function options_form(&$form, &$form_state) {
'#title' => t('Access operation to check'),
'#options' => array('view' => t('View'), 'update' => t('Edit'), 'delete' => t('Delete')),
'#default_value' => $this->options['access_op'],
- '#dependency' => array('edit-options-validate-options-node-access' => array(TRUE)),
+ '#states' => array(
+ 'visible' => array(
+ ':input[name="options[validate][options][node][access]"]' => array('checked' => TRUE),
+ ),
+ ),
);
$form['nid_type'] = array(
diff --git a/modules/taxonomy/views_handler_argument_term_node_tid_depth.inc b/modules/taxonomy/views_handler_argument_term_node_tid_depth.inc
index 116a4dedebe8e2229ab71458b372c6763bb8e3d4..5b0b34d8f78c336f8ea95f2d964ee6ed3858d27c 100644
--- a/modules/taxonomy/views_handler_argument_term_node_tid_depth.inc
+++ b/modules/taxonomy/views_handler_argument_term_node_tid_depth.inc
@@ -52,7 +52,11 @@ function options_form(&$form, &$form_state) {
'#title' => t("Use Drupal's taxonomy term path to create breadcrumb links"),
'#description' => t('If selected, the links in the breadcrumb trail will be created using the standard drupal method instead of the custom views method. This is useful if you are using modules like taxonomy redirect to modify your taxonomy term links.'),
'#default_value' => !empty($this->options['use_taxonomy_term_path']),
- '#dependency' => array('edit-options-set-breadcrumb' => array(TRUE)),
+ '#states' => array(
+ 'visible' => array(
+ ':input[name="options[set_breadcrumb]"]' => array('checked' => TRUE),
+ ),
+ ),
);
parent::options_form($form, $form_state);
}
diff --git a/modules/taxonomy/views_handler_field_term_node_tid.inc b/modules/taxonomy/views_handler_field_term_node_tid.inc
index 6b9c93ac91209bd079a187d38641b38b1a4509cf..ca46c1d7bed591e65d311f3e701fadea75a110b1 100644
--- a/modules/taxonomy/views_handler_field_term_node_tid.inc
+++ b/modules/taxonomy/views_handler_field_term_node_tid.inc
@@ -65,13 +65,16 @@ function options_form(&$form, &$form_state) {
}
$form['vocabularies'] = array(
- '#prefix' => '<div><div id="edit-options-vocabularies">',
- '#suffix' => '</div></div>',
'#type' => 'checkboxes',
'#title' => t('Vocabularies'),
'#options' => $options,
'#default_value' => $this->options['vocabularies'],
- '#dependency' => array('edit-options-limit' => array(TRUE)),
+ '#states' => array(
+ 'visible' => array(
+ ':input[name="options[limit]"]' => array('checked' => TRUE),
+ ),
+ ),
+
);
parent::options_form($form, $form_state);
diff --git a/modules/taxonomy/views_handler_filter_term_node_tid.inc b/modules/taxonomy/views_handler_filter_term_node_tid.inc
index e0dd0f9dd315f782461c55b317326d7e8584d9cc..8945edc0d941a6c0abe1075d244e9f51aa528cf0 100644
--- a/modules/taxonomy/views_handler_filter_term_node_tid.inc
+++ b/modules/taxonomy/views_handler_filter_term_node_tid.inc
@@ -82,7 +82,11 @@ function extra_options_form(&$form, &$form_state) {
'#type' => 'checkbox',
'#title' => t('Show hierarchy in dropdown'),
'#default_value' => !empty($this->options['hierarchy']),
- '#dependency' => array('radio:options[type]' => array('select')),
+ '#states' => array(
+ 'visible' => array(
+ ':input[name="options[type]"]' => array('value' => 'select'),
+ ),
+ ),
);
}
diff --git a/modules/taxonomy/views_plugin_argument_default_taxonomy_tid.inc b/modules/taxonomy/views_plugin_argument_default_taxonomy_tid.inc
index 65d427bbc9a7d7ed713d942fd06fac31b29b3bf7..7ffb595efe383ecbc754c7cf99aa7732314c2e40 100644
--- a/modules/taxonomy/views_plugin_argument_default_taxonomy_tid.inc
+++ b/modules/taxonomy/views_plugin_argument_default_taxonomy_tid.inc
@@ -51,9 +51,10 @@ function options_form(&$form, &$form_state) {
'#type' => 'checkbox',
'#title' => t('Limit terms by vocabulary'),
'#default_value'=> $this->options['limit'],
- '#process' => array('form_process_checkbox', 'ctools_dependent_process'),
- '#dependency' => array(
- 'edit-options-argument-default-taxonomy-tid-node' => array(1),
+ '#states' => array(
+ 'visible' => array(
+ ':input[name="options[argument_default][taxonomy_tid][node]"]' => array('checked' => TRUE),
+ ),
),
);
@@ -64,16 +65,15 @@ function options_form(&$form, &$form_state) {
}
$form['vocabularies'] = array(
- '#prefix' => '<div><div id="edit-options-vids">',
- '#suffix' => '</div></div>',
'#type' => 'checkboxes',
'#title' => t('Vocabularies'),
'#options' => $options,
'#default_value' => $this->options['vocabularies'],
- '#process' => array('form_process_checkboxes', 'ctools_dependent_process'),
- '#dependency' => array(
- 'edit-options-argument-default-taxonomy-tid-limit' => array(1),
- 'edit-options-argument-default-taxonomy-tid-node' => array(1),
+ '#states' => array(
+ 'visible' => array(
+ ':input[name="options[argument_default][taxonomy_tid][limit]"]' => array('checked' => TRUE),
+ ':input[name="options[argument_default][taxonomy_tid][node]"]' => array('checked' => TRUE),
+ ),
),
);
@@ -86,8 +86,10 @@ function options_form(&$form, &$form_state) {
',' => t('Filter to items that share all terms'),
'+' => t('Filter to items that share any term'),
),
- '#dependency' => array(
- 'edit-options-argument-default-taxonomy-tid-node' => array(1),
+ '#states' => array(
+ 'visible' => array(
+ ':input[name="options[argument_default][taxonomy_tid][node]"]' => array('checked' => TRUE),
+ ),
),
);
}
diff --git a/modules/user/views_handler_field_user_name.inc b/modules/user/views_handler_field_user_name.inc
index 5c9bd25f04099eb31bcdd7138f9d4d0b0196f6f9..8947db1aa21e9d494a7b420c2fdfb35dba5d08ce 100644
--- a/modules/user/views_handler_field_user_name.inc
+++ b/modules/user/views_handler_field_user_name.inc
@@ -50,8 +50,10 @@ function options_form(&$form, &$form_state) {
'#title' => t('Text to display for anonymous users'),
'#type' => 'textfield',
'#default_value' => $this->options['anonymous_text'],
- '#dependency' => array(
- 'edit-options-overwrite-anonymous' => array(1),
+ '#states' => array(
+ 'visible' => array(
+ ':input[name="options[overwrite_anonymous]"]' => array('checked' => TRUE),
+ ),
),
'#fieldset' => 'more',
);
diff --git a/modules/user/views_plugin_argument_validate_user.inc b/modules/user/views_plugin_argument_validate_user.inc
index f47960925ce4af0d81457072331b46954ee40b1b..99f33aabb9b94aa96d4fe85bb51404b2bb71bbae 100644
--- a/modules/user/views_plugin_argument_validate_user.inc
+++ b/modules/user/views_plugin_argument_validate_user.inc
@@ -42,14 +42,14 @@ function options_form(&$form, &$form_state) {
$form['roles'] = array(
'#type' => 'checkboxes',
- '#prefix' => '<div id="edit-options-validate-options-user-roles-wrapper">',
- '#suffix' => '</div>',
'#title' => t('Restrict to the selected roles'),
'#options' => array_map('check_plain', user_roles(TRUE)),
'#default_value' => $this->options['roles'],
'#description' => t('If no roles are selected, users from any role will be allowed.'),
- '#dependency' => array(
- 'edit-options-validate-options-user-restrict-roles' => array(1),
+ '#states' => array(
+ 'visible' => array(
+ ':input[name="options[validate][options][user][restrict_roles]"]' => array('checked' => TRUE),
+ ),
),
);
}
diff --git a/plugins/views_plugin_cache_time.inc b/plugins/views_plugin_cache_time.inc
index 53123a3fa0f49dab61881b32818043836fa16620..8a28108dad4f462058168827eb6290202085a9b5 100644
--- a/plugins/views_plugin_cache_time.inc
+++ b/plugins/views_plugin_cache_time.inc
@@ -41,9 +41,10 @@ function options_form(&$form, &$form_state) {
'#maxlength' => '30',
'#description' => t('Length of time in seconds raw query results should be cached.'),
'#default_value' => $this->options['results_lifespan_custom'],
- '#process' => array('form_process_select','ctools_dependent_process'),
- '#dependency' => array(
- 'edit-cache-options-results-lifespan' => array('custom'),
+ '#states' => array(
+ 'visible' => array(
+ ':input[name="cache_options[results_lifespan]"]' => array('value' => 'custom'),
+ ),
),
);
$form['output_lifespan'] = array(
@@ -60,9 +61,10 @@ function options_form(&$form, &$form_state) {
'#maxlength' => '30',
'#description' => t('Length of time in seconds rendered HTML output should be cached.'),
'#default_value' => $this->options['output_lifespan_custom'],
- '#process' => array('form_process_select','ctools_dependent_process'),
- '#dependency' => array(
- 'edit-cache-options-output-lifespan' => array('custom'),
+ '#states' => array(
+ 'visible' => array(
+ ':input[name="cache_options[output_lifespan]"]' => array('value' => 'custom'),
+ ),
),
);
}
diff --git a/plugins/views_plugin_display.inc b/plugins/views_plugin_display.inc
index d937c4be021b014d8f382be8a5d4572c34b98003..8de7f80eb30d9c993d01402b88e041c5993b73e3 100644
--- a/plugins/views_plugin_display.inc
+++ b/plugins/views_plugin_display.inc
@@ -1477,17 +1477,21 @@ function options_form(&$form, &$form_state) {
'#title' => t("Display 'more' link only if there is more content"),
'#description' => t("Leave this unchecked to display the 'more' link even if there are no more items to display."),
'#default_value' => !$this->get_option('use_more_always'),
- '#dependency' => array(
- 'edit-use-more' => array(TRUE),
+ '#states' => array(
+ 'visible' => array(
+ ':input[name="use_more"]' => array('checked' => TRUE),
),
+ ),
);
$form['use_more_text'] = array(
'#type' => 'textfield',
'#title' => t('More link text'),
'#description' => t("The text to display for the more link."),
'#default_value' => $this->get_option('use_more_text'),
- '#dependency' => array(
- 'edit-use-more' => array(TRUE),
+ '#states' => array(
+ 'visible' => array(
+ ':input[name="use_more"]' => array('checked' => TRUE),
+ ),
),
);
break;
@@ -1767,7 +1771,11 @@ function options_form(&$form, &$form_state) {
'#title' => t('Custom URL'),
'#default_value' => $this->get_option('link_url'),
'#description' => t('A Drupal path or external URL the more link will point to. Note that this will override the link display setting above.') . $output,
- '#dependency' => array('radio:link_display' => array('custom_url')),
+ '#states' => array(
+ 'visible' => array(
+ ':input[name="link_display"]' => array('value' => 'custom_url'),
+ ),
+ ),
);
break;
case 'analyze-theme':
diff --git a/plugins/views_plugin_display_feed.inc b/plugins/views_plugin_display_feed.inc
index 37d0ae4e291fd48f1cf9ab538719bad418e2fe54..0965fc18abd7bc8bfa3e1ced1714c06db5588f14 100644
--- a/plugins/views_plugin_display_feed.inc
+++ b/plugins/views_plugin_display_feed.inc
@@ -154,7 +154,11 @@ function options_form(&$form, &$form_state) {
'#default_value' => $this->get_option('sitename_title'),
);
$form['title'] = $title;
- $form['title']['#dependency'] = array('edit-sitename-title' => array(FALSE));
+ $form['title']['#states'] = array(
+ 'visible' => array(
+ ':input[name="sitename_title"]' => array('checked' => FALSE),
+ ),
+ );
break;
case 'displays':
$form['#title'] .= t('Attach to');
diff --git a/plugins/views_plugin_display_page.inc b/plugins/views_plugin_display_page.inc
index f077a63e42a884ca0f7973d324212cff05807a4d..5c4146315a2eff9b7f370fcf9dcec27d06a700ce 100644
--- a/plugins/views_plugin_display_page.inc
+++ b/plugins/views_plugin_display_page.inc
@@ -339,20 +339,45 @@ function options_form(&$form, &$form_state) {
),
'#default_value' => $menu['type'],
);
+
$form['menu']['title'] = array(
'#prefix' => '<div class="views-left-50">',
'#title' => t('Title'),
'#type' => 'textfield',
'#default_value' => $menu['title'],
'#description' => t('If set to normal or tab, enter the text to use for the menu item.'),
- '#dependency' => array('radio:menu[type]' => array('normal', 'tab', 'default tab')),
+ '#states' => array(
+ 'visible' => array(
+ array(
+ ':input[name="menu[type]"]' => array('value' => 'normal'),
+ ),
+ array(
+ ':input[name="menu[type]"]' => array('value' => 'tab'),
+ ),
+ array(
+ ':input[name="menu[type]"]' => array('value' => 'default tab'),
+ ),
+ ),
+ ),
);
$form['menu']['description'] = array(
'#title' => t('Description'),
'#type' => 'textfield',
'#default_value' => $menu['description'],
'#description' => t("If set to normal or tab, enter the text to use for the menu item's description."),
- '#dependency' => array('radio:menu[type]' => array('normal', 'tab', 'default tab')),
+ '#states' => array(
+ 'visible' => array(
+ array(
+ ':input[name="menu[type]"]' => array('value' => 'normal'),
+ ),
+ array(
+ ':input[name="menu[type]"]' => array('value' => 'tab'),
+ ),
+ array(
+ ':input[name="menu[type]"]' => array('value' => 'default tab'),
+ ),
+ ),
+ ),
);
// Only display the menu selector if menu module is enabled.
@@ -363,7 +388,16 @@ function options_form(&$form, &$form_state) {
'#options' => menu_get_menus(),
'#default_value' => $menu['name'],
'#description' => t('Insert item into an available menu.'),
- '#dependency' => array('radio:menu[type]' => array('normal', 'tab')),
+ '#states' => array(
+ 'visible' => array(
+ array(
+ ':input[name="menu[type]"]' => array('value' => 'normal'),
+ ),
+ array(
+ ':input[name="menu[type]"]' => array('value' => 'tab'),
+ ),
+ ),
+ ),
);
}
else {
@@ -380,7 +414,19 @@ function options_form(&$form, &$form_state) {
'#type' => 'textfield',
'#default_value' => isset($menu['weight']) ? $menu['weight'] : 0,
'#description' => t('The lower the weight the higher/further left it will appear.'),
- '#dependency' => array('radio:menu[type]' => array('normal', 'tab', 'default tab')),
+ '#states' => array(
+ 'visible' => array(
+ array(
+ ':input[name="menu[type]"]' => array('value' => 'normal'),
+ ),
+ array(
+ ':input[name="menu[type]"]' => array('value' => 'tab'),
+ ),
+ array(
+ ':input[name="menu[type]"]' => array('value' => 'default tab'),
+ ),
+ ),
+ ),
);
$form['menu']['context'] = array(
'#title' => t('Context'),
@@ -388,7 +434,11 @@ function options_form(&$form, &$form_state) {
'#type' => 'checkbox',
'#default_value' => !empty($menu['context']),
'#description' => t('Displays the link in contextual links'),
- '#dependency' => array('radio:menu[type]' => array('tab')),
+ '#states' => array(
+ 'visible' => array(
+ ':input[name="menu[type]"]' => array('value' => 'tab'),
+ ),
+ ),
);
break;
case 'tab_options':
@@ -421,14 +471,32 @@ function options_form(&$form, &$form_state) {
'#type' => 'textfield',
'#default_value' => $tab_options['title'],
'#description' => t('If creating a parent menu item, enter the title of the item.'),
- '#dependency' => array('radio:tab_options[type]' => array('normal', 'tab')),
+ '#states' => array(
+ 'visible' => array(
+ array(
+ ':input[name="tab_options[type]"]' => array('value' => 'normal'),
+ ),
+ array(
+ ':input[name="tab_options[type]"]' => array('value' => 'tab'),
+ ),
+ ),
+ ),
);
$form['tab_options']['description'] = array(
'#title' => t('Description'),
'#type' => 'textfield',
'#default_value' => $tab_options['description'],
'#description' => t('If creating a parent menu item, enter the description of the item.'),
- '#dependency' => array('radio:tab_options[type]' => array('normal', 'tab')),
+ '#states' => array(
+ 'visible' => array(
+ array(
+ ':input[name="tab_options[type]"]' => array('value' => 'normal'),
+ ),
+ array(
+ ':input[name="tab_options[type]"]' => array('value' => 'tab'),
+ ),
+ ),
+ ),
);
// Only display the menu selector if menu module is enabled.
if (module_exists('menu')) {
@@ -438,7 +506,11 @@ function options_form(&$form, &$form_state) {
'#options' => menu_get_menus(),
'#default_value' => $tab_options['name'],
'#description' => t('Insert item into an available menu.'),
- '#dependency' => array('radio:tab_options[type]' => array('normal')),
+ '#states' => array(
+ 'visible' => array(
+ ':input[name="tab_options[type]"]' => array('value' => 'normal'),
+ ),
+ ),
);
}
else {
@@ -457,7 +529,11 @@ function options_form(&$form, &$form_state) {
'#default_value' => $tab_options['weight'],
'#size' => 5,
'#description' => t('If the parent menu item is a tab, enter the weight of the tab. The lower the number, the more to the left it will be.'),
- '#dependency' => array('radio:tab_options[type]' => array('tab')),
+ '#states' => array(
+ 'visible' => array(
+ ':input[name="tab_options[type]"]' => array('value' => 'tab'),
+ ),
+ ),
);
break;
}
diff --git a/plugins/views_plugin_exposed_form.inc b/plugins/views_plugin_exposed_form.inc
index 287dd8906005d12db2472f42fa25985731aca4ba..8ba59197278a3bb8664c1072de277391c2d9011f 100644
--- a/plugins/views_plugin_exposed_form.inc
+++ b/plugins/views_plugin_exposed_form.inc
@@ -71,8 +71,10 @@ function options_form(&$form, &$form_state) {
'#description' => t('Text to display in the reset button of the exposed form.'),
'#default_value' => $this->options['reset_button_label'],
'#required' => TRUE,
- '#dependency' => array(
- 'edit-exposed-form-options-reset-button' => array(1)
+ '#states' => array(
+ 'invisible' => array(
+ 'input[name="exposed_form_options[reset_button]"]' => array('checked' => FALSE),
+ ),
),
);
@@ -112,8 +114,10 @@ function options_form(&$form, &$form_state) {
'#title' => t('Hide submit button'),
'#description' => t('Hide submit button if javascript is enabled.'),
'#default_value' => $this->options['autosubmit_hide'],
- '#dependency' => array(
- 'edit-exposed-form-options-autosubmit' => array(1),
+ '#states' => array(
+ 'invisible' => array(
+ 'input[name="exposed_form_options[autosubmit]"]' => array('checked' => FALSE),
+ ),
),
);
}
diff --git a/plugins/views_plugin_pager_full.inc b/plugins/views_plugin_pager_full.inc
index d4c2203824a2a1d3d4e48c6754903b3f113511c9..dc3072a3961524852a4799524812cfc4812e2e27 100644
--- a/plugins/views_plugin_pager_full.inc
+++ b/plugins/views_plugin_pager_full.inc
@@ -151,8 +151,10 @@ function options_form(&$form, &$form_state) {
'#required' => TRUE,
'#description' => t('Label to use in the exposed items per page form element.'),
'#default_value' => $this->options['expose']['items_per_page_label'],
- '#dependency' => array(
- 'edit-pager-options-expose-items-per-page' => array(1)
+ '#states' => array(
+ 'invisible' => array(
+ 'input[name="pager_options[expose][items_per_page]"]' => array('checked' => FALSE),
+ ),
),
);
@@ -162,8 +164,10 @@ function options_form(&$form, &$form_state) {
'#required' => TRUE,
'#description' => t('Set between which values the user can choose when determining the items per page. Separated by comma.'),
'#default_value' => $this->options['expose']['items_per_page_options'],
- '#dependency' => array(
- 'edit-pager-options-expose-items-per-page' => array(1)
+ '#states' => array(
+ 'invisible' => array(
+ 'input[name="pager_options[expose][items_per_page]"]' => array('checked' => FALSE),
+ ),
),
);
@@ -180,8 +184,10 @@ function options_form(&$form, &$form_state) {
'#title' => t('All items label'),
'#description' => t('Which label will be used to display all items'),
'#default_value' => $this->options['expose']['items_per_page_options_all_label'],
- '#dependency' => array(
- 'edit-items-per-page-options-all' => array(1),
+ '#states' => array(
+ 'invisible' => array(
+ 'input[name="pager_options[expose][items_per_page_options_all]"]' => array('checked' => FALSE),
+ ),
),
);
@@ -198,8 +204,10 @@ function options_form(&$form, &$form_state) {
'#required' => TRUE,
'#description' => t('Label to use in the exposed offset form element.'),
'#default_value' => $this->options['expose']['offset_label'],
- '#dependency' => array(
- 'edit-pager-options-expose-offset' => array(1)
+ '#states' => array(
+ 'invisible' => array(
+ 'input[name="pager_options[expose][offset]"]' => array('checked' => FALSE),
+ ),
),
);
}
diff --git a/plugins/views_plugin_query_default.inc b/plugins/views_plugin_query_default.inc
index aa8e7db3cc3620bcb42c062b07b0d284fc10e725..dc8e3d53cbbe41fe6bfced184978c7ca6a83e5d6 100644
--- a/plugins/views_plugin_query_default.inc
+++ b/plugins/views_plugin_query_default.inc
@@ -260,7 +260,11 @@ function options_form(&$form, &$form_state) {
'#title' => t('Pure Distinct'),
'#description' => t('This will prevent views from adding the base column to the distinct field. If this is not selected and the base column is a primary key, then a non-pure distinct will not function properly because the primary key is always unique.'),
'#default_value' => !empty($this->options['pure_distinct']),
- '#dependency' => array('edit-query-options-distinct' => '1'),
+ '#states' => array(
+ 'visible' => array(
+ ':input[name="query[options][distinct]"]' => array('checked' => TRUE),
+ ),
+ ),
);
$form['slave'] = array(
'#type' => 'checkbox',
diff --git a/plugins/views_plugin_row_fields.inc b/plugins/views_plugin_row_fields.inc
index b1c02e1fd111e378194d38eaf438a7df3bd2a6f4..c39b40b59dc790ed6be83382033d840f30a55018 100644
--- a/plugins/views_plugin_row_fields.inc
+++ b/plugins/views_plugin_row_fields.inc
@@ -48,12 +48,11 @@ function options_form(&$form, &$form_state) {
'#options' => $options,
'#default_value' => $this->options['inline'],
'#description' => t('Inline fields will be displayed next to each other rather than one after another. Note that some fields will ignore this if they are block elements, particularly body fields and other formatted HTML.'),
- '#dependency' => array(
- 'edit-row-options-default-field-elements' => array(1),
+ '#states' => array(
+ 'visible' => array(
+ ':input[name="row_options[default_field_elements]"]' => array('checked' => TRUE),
+ ),
),
- '#prefix' => '<div id="edit-row-options-inline-wrapper"><div>',
- '#suffix' => '</div></div>',
-
);
$form['separator'] = array(
@@ -62,8 +61,10 @@ function options_form(&$form, &$form_state) {
'#size' => 10,
'#default_value' => isset($this->options['separator']) ? $this->options['separator'] : '',
'#description' => t('The separator may be placed between inline fields to keep them from squishing up next to each other. You can use HTML in this field.'),
- '#dependency' => array(
- 'edit-row-options-default-field-elements' => array(1),
+ '#states' => array(
+ 'visible' => array(
+ ':input[name="row_options[default_field_elements]"]' => array('checked' => TRUE),
+ ),
),
);
diff --git a/plugins/views_plugin_style.inc b/plugins/views_plugin_style.inc
index 4b8d9e72dbad9c245967bfe1d8284dbb6748f2bc..831ba369349a255292585147ee93f8541acfe821 100644
--- a/plugins/views_plugin_style.inc
+++ b/plugins/views_plugin_style.inc
@@ -220,17 +220,21 @@ function options_form(&$form, &$form_state) {
'#title' => t('Use rendered output to group rows'),
'#default_value' => $grouping['rendered'],
'#description' => t('If enabled the rendered output of the grouping field is used to group the rows.'),
- '#dependency' => array(
- 'edit-style-options-grouping-' . $i . '-field' => array_keys($field_labels),
- )
+ '#states' => array(
+ 'invisible' => array(
+ ':input[name="style_options[grouping][' . $i . '][field]"]' => array('value' => ''),
+ ),
+ ),
);
$form['grouping'][$i]['rendered_strip'] = array(
'#type' => 'checkbox',
'#title' => t('Remove tags from rendered output'),
'#default_value' => $grouping['rendered_strip'],
- '#dependency' => array(
- 'edit-style-options-grouping-' . $i . '-field' => array_keys($field_labels),
- )
+ '#states' => array(
+ 'invisible' => array(
+ ':input[name="style_options[grouping][' . $i . '][field]"]' => array('value' => ''),
+ ),
+ ),
);
}
}
diff --git a/plugins/views_plugin_style_summary.inc b/plugins/views_plugin_style_summary.inc
index 5081dd62eecc4cd86116815fcb6ecee93fec7328..256c0e341612df5f8b9d930aaaad7eeca12a453c 100644
--- a/plugins/views_plugin_style_summary.inc
+++ b/plugins/views_plugin_style_summary.inc
@@ -54,8 +54,10 @@ function options_form(&$form, &$form_state) {
'#type' => 'textfield',
'#title' => t('Items to display'),
'#default_value' => $this->options['items_per_page'],
- '#dependency' => array(
- 'edit-options-summary-options-' . str_replace('_', '-', $this->definition['name']) . '-override' => array(1)
+ '#states' => array(
+ 'visible' => array(
+ ':input[name="options[summary][options][' . $this->definition['name'] . '][override]"]' => array('checked' => TRUE),
+ ),
),
);
}
diff --git a/plugins/views_plugin_style_table.inc b/plugins/views_plugin_style_table.inc
index 98919ab4017c64d41094299988c8f553a4ab640d..b4aa6a9eef6720d5de1999244d75ac4845aa6352 100644
--- a/plugins/views_plugin_style_table.inc
+++ b/plugins/views_plugin_style_table.inc
@@ -207,9 +207,7 @@ function options_form(&$form, &$form_state) {
}
foreach ($columns as $field => $column) {
- $safe = str_replace(array('][', '_', ' '), '-', $field);
- // the $id of the column for dependency checking.
- $id = 'edit-style-options-columns-' . $safe;
+ $column_selector = ':input[name="style_options[columns][' . $field . ']"]';
$form['columns'][$field] = array(
'#type' => 'select',
@@ -220,14 +218,22 @@ function options_form(&$form, &$form_state) {
$form['info'][$field]['sortable'] = array(
'#type' => 'checkbox',
'#default_value' => !empty($this->options['info'][$field]['sortable']),
- '#dependency' => array($id => array($field)),
+ '#states' => array(
+ 'visible' => array(
+ $column_selector => array('value' => $field),
+ ),
+ ),
);
$form['info'][$field]['default_sort_order'] = array(
'#type' => 'select',
'#options' => array('asc' => t('Ascending'), 'desc' => t('Descending')),
'#default_value' => !empty($this->options['info'][$field]['default_sort_order']) ? $this->options['info'][$field]['default_sort_order'] : 'asc',
- '#dependency_count' => 2,
- '#dependency' => array($id => array($field), 'edit-style-options-info-' . $safe . '-sortable' => array(1)),
+ '#states' => array(
+ 'visible' => array(
+ $column_selector => array('value' => $field),
+ ':input[name="style_options[info][' . $field . '][sortable]"]' => array('checked' => TRUE),
+ ),
+ ),
);
// Provide an ID so we can have such things.
$radio_id = drupal_html_id('edit-default-' . $field);
@@ -239,7 +245,11 @@ function options_form(&$form, &$form_state) {
// because 'radio' doesn't fully support '#id' =(
'#attributes' => array('id' => $radio_id),
'#default_value' => $default,
- '#dependency' => array($id => array($field)),
+ '#states' => array(
+ 'visible' => array(
+ $column_selector => array('value' => $field),
+ ),
+ ),
);
}
$form['info'][$field]['align'] = array(
@@ -251,18 +261,30 @@ function options_form(&$form, &$form_state) {
'views-align-center' => t('Center'),
'views-align-right' => t('Right'),
),
- '#dependency' => array($id => array($field)),
+ '#states' => array(
+ 'visible' => array(
+ $column_selector => array('value' => $field),
+ ),
+ ),
);
$form['info'][$field]['separator'] = array(
'#type' => 'textfield',
'#size' => 10,
'#default_value' => isset($this->options['info'][$field]['separator']) ? $this->options['info'][$field]['separator'] : '',
- '#dependency' => array($id => array($field)),
+ '#states' => array(
+ 'visible' => array(
+ $column_selector => array('value' => $field),
+ ),
+ ),
);
$form['info'][$field]['empty_column'] = array(
'#type' => 'checkbox',
'#default_value' => isset($this->options['info'][$field]['empty_column']) ? $this->options['info'][$field]['empty_column'] : FALSE,
- '#dependency' => array($id => array($field)),
+ '#states' => array(
+ 'visible' => array(
+ $column_selector => array('value' => $field),
+ ),
+ ),
);
// markup for the field name
diff --git a/plugins/views_wizard/views_ui_base_views_wizard.class.php b/plugins/views_wizard/views_ui_base_views_wizard.class.php
index 8893ab8170af9d6c5f9e70cea152050ad264f91d..224d3170426a4de5ba93ed43c8c09e0948d522c0 100644
--- a/plugins/views_wizard/views_ui_base_views_wizard.class.php
+++ b/plugins/views_wizard/views_ui_base_views_wizard.class.php
@@ -103,8 +103,10 @@ function build_form($form, &$form_state) {
$form['displays']['page']['options'] = array(
'#type' => 'container',
'#attributes' => array('class' => array('options-set'),),
- '#dependency' => array(
- 'edit-page-create' => array(1),
+ '#states' => array(
+ 'visible' => array(
+ ':input[name="page[create]"]' => array('checked' => TRUE),
+ ),
),
'#pre_render' => array('ctools_dependent_pre_render'),
'#prefix' => '<div><div id="edit-page-wrapper">',
@@ -147,7 +149,7 @@ function build_form($form, &$form_state) {
'#size' => 5,
'#element_validate' => array('views_element_validate_integer'),
);
- $form['displays']['page']['options']['pager'] = array(
+ $form['displays']['page']['options']['pagerz'] = array(
'#title' => t('Use a pager'),
'#type' => 'checkbox',
'#default_value' => TRUE,
@@ -159,10 +161,11 @@ function build_form($form, &$form_state) {
);
$form['displays']['page']['options']['link_properties'] = array(
'#type' => 'container',
- '#dependency' => array(
- 'edit-page-link' => array(1),
+ '#states' => array(
+ 'visible' => array(
+ ':input[name="page[link]"]' => array('checked' => TRUE),
+ ),
),
- '#pre_render' => array('ctools_dependent_pre_render'),
'#prefix' => '<div id="edit-page-link-properties-wrapper">',
'#suffix' => '</div>',
);
@@ -194,10 +197,11 @@ function build_form($form, &$form_state) {
);
$form['displays']['page']['options']['feed_properties'] = array(
'#type' => 'container',
- '#dependency' => array(
- 'edit-page-feed' => array(1),
+ '#states' => array(
+ 'visible' => array(
+ ':input[name="page[feed]"]' => array('checked' => TRUE),
+ ),
),
- '#pre_render' => array('ctools_dependent_pre_render'),
'#prefix' => '<div id="edit-page-feed-properties-wrapper">',
'#suffix' => '</div>',
);
@@ -213,8 +217,10 @@ function build_form($form, &$form_state) {
'#options' => $feed_row_options,
'#default_value' => key($feed_row_options),
'#access' => (count($feed_row_options) > 1),
- '#dependency' => array(
- 'edit-page-feed' => array(1),
+ '#states' => array(
+ 'visible' => array(
+ ':input[name="page[feed]"]' => array('checked' => TRUE),
+ ),
),
'#pre_render' => array('ctools_dependent_pre_render'),
'#prefix' => '<div id="edit-page-feed-properties-row-plugin-wrapper">',
@@ -239,8 +245,10 @@ function build_form($form, &$form_state) {
$form['displays']['block']['options'] = array(
'#type' => 'container',
'#attributes' => array('class' => array('options-set'),),
- '#dependency' => array(
- 'edit-block-create' => array(1),
+ '#states' => array(
+ 'visible' => array(
+ ':input[name="block[create]"]' => array('checked' => TRUE),
+ ),
),
'#pre_render' => array('ctools_dependent_pre_render'),
'#prefix' => '<div id="edit-block-wrapper">',