From 7f7df4022760982f8a98264e5e61948b676cc9d4 Mon Sep 17 00:00:00 2001 From: Angie Byron Date: Sun, 22 Nov 2009 02:48:37 +0000 Subject: #623310 by rfay: Fixed AJAX 'changed' command asterisk argument. --- modules/simpletest/tests/ajax_forms_test.module | 25 +++++++++++++++++-------- 1 file changed, 17 insertions(+), 8 deletions(-) (limited to 'modules/simpletest/tests/ajax_forms_test.module') diff --git a/modules/simpletest/tests/ajax_forms_test.module b/modules/simpletest/tests/ajax_forms_test.module index ceb03dcc1..a0dcfc0e0 100644 --- a/modules/simpletest/tests/ajax_forms_test.module +++ b/modules/simpletest/tests/ajax_forms_test.module @@ -130,7 +130,7 @@ function ajax_forms_test_ajax_commands_form($form, &$form_state) { '#suffix' => '
Insert something before this.
', ); - // Shows the 'changed' command. + // Shows the 'changed' command without asterisk. $form['changed_command_example'] = array( '#value' => t("AJAX changed: Click to mark div changed."), '#type' => 'submit', @@ -139,6 +139,14 @@ function ajax_forms_test_ajax_commands_form($form, &$form_state) { ), '#suffix' => '
This div can be marked as changed or not.
', ); + // Shows the 'changed' command adding the asterisk. + $form['changed_command_asterisk_example'] = array( + '#value' => t("AJAX changed: Click to mark div changed with asterisk."), + '#type' => 'submit', + '#ajax' => array( + 'callback' => 'ajax_forms_test_advanced_commands_changed_asterisk_callback', + ), + ); // Shows the AJAX 'css' command. // @todo Note that this won't work until http://drupal.org/node/623320 lands. @@ -264,14 +272,15 @@ function ajax_forms_test_advanced_commands_before_callback($form, $form_state) { * AJAX callback for 'changed'. */ function ajax_forms_test_advanced_commands_changed_callback($form, $form_state) { - $checkbox_value = $form_state['values']['changed_command_example']; - $checkbox_value_string = $checkbox_value ? "TRUE" : "FALSE"; + $commands[] = ajax_command_changed('#changed_div'); + return array('#type' => 'ajax_commands', '#ajax_commands' => $commands); +} +/** + * AJAX callback for 'changed' with asterisk marking inner div. + */ +function ajax_forms_test_advanced_commands_changed_asterisk_callback($form, $form_state) { $commands = array(); - if ($checkbox_value) { - // @todo This does not yet exercise the 2nd arg (asterisk) so that should - // be added when it works. - $commands[] = ajax_command_changed( '#changed_div'); - } + $commands[] = ajax_command_changed('#changed_div', '#changed_div_mark_this'); return array('#type' => 'ajax_commands', '#ajax_commands' => $commands); } -- cgit v1.2.3