diff --git includes/ajax.inc includes/ajax.inc index 74b4e73..48aaad7 100644 --- includes/ajax.inc +++ includes/ajax.inc @@ -193,11 +193,66 @@ * functions. */ function ajax_render($commands = array()) { - // Automatically extract any 'settings' added via drupal_add_js() and make - // them the first command. - $scripts = drupal_add_js(NULL, NULL); + // AJAX responses aren't rendered with html.tpl.php, so we have to call + // drupal_get_css() and drupal_get_js() here, in order to have new files added + // during this request to be loaded by the page. We only want to send back + // files that the page hasn't already loaded, so we implement simple diffing + // logic using array_diff_key(). + foreach (array('css', 'js') as $type) { + // It is highly suspicious if $_POST['ajax_page_state'][$type] is empty, + // since the base page ought to have at least one JS file and one CSS file + // loaded. It probably indicates an error, and rather than making the page + // reload all of the files, instead we return no new files. + if (empty($_POST['ajax_page_state'][$type])) { + $items[$type] = array(); + } + else { + $function = 'drupal_add_' . $type; + $items[$type] = $function(); + drupal_alter($type, $items[$type]); + // @todo Inline CSS and JS items are indexed numerically. These can't be + // reliably diffed with array_diff_key(), since the number can change + // due to factors unrelated to the inline content, so for now, we strip + // the inline items from AJAX responses, and can add support for them + // when drupal_add_css() and drupal_add_js() are changed to using md5() + // or some other hash of the inline content. + foreach ($items[$type] as $key => $item) { + if (is_numeric($key)) { + unset($items[$type][$key]); + } + } + // Ensure that the page doesn't reload what it already has. + $items[$type] = array_diff_key($items[$type], $_POST['ajax_page_state'][$type]); + } + } + + // Render the HTML to load these files, and add AJAX commands to insert this + // HTML in the page. We pass TRUE as second argument to prevent the data from + // being altered again, as we already altered it above. + $styles = drupal_get_css($items['css'], TRUE); + $scripts_footer = drupal_get_js('footer', $items['js'], TRUE); + $scripts_header = drupal_get_js('header', $items['js'], TRUE); + + $extra_commands = array(); + if (!empty($styles)) { + $extra_commands[] = ajax_command_prepend('head', $styles); + } + if (!empty($scripts_header)) { + $extra_commands[] = ajax_command_prepend('head', $scripts_header); + } + if (!empty($scripts_footer)) { + $extra_commands[] = ajax_command_append('body', $scripts_footer); + } + if (!empty($extra_commands)) { + $commands = array_merge($extra_commands, $commands); + } + + $scripts = drupal_add_js(); if (!empty($scripts['settings'])) { - array_unshift($commands, ajax_command_settings(call_user_func_array('array_merge_recursive', $scripts['settings']['data']))); + $settings = $scripts['settings']; + // Automatically extract any settings added via drupal_add_js() and make + // them the first command. + array_unshift($commands, ajax_command_settings(call_user_func_array('array_merge_recursive', $settings['data']), TRUE)); } // Allow modules to alter any AJAX response. @@ -284,6 +339,31 @@ function ajax_form_callback() { } /** + * Theme callback for AJAX requests. + * + * Many different pages can invoke an AJAX request to system/ajax or another + * generic AJAX path. It is almost always desired for an AJAX response to be + * rendered using the same theme as the base page, and it is therefore + * recommended for all AJAX paths to list this function for its 'theme + * callback', as is done in system_menu() for the 'system/ajax' path. + */ +function ajax_base_page_theme() { + if (!empty($_POST['ajax_page_state']['theme']) && !empty($_POST['ajax_page_state']['theme_token'])) { + $theme = $_POST['ajax_page_state']['theme']; + $token = $_POST['ajax_page_state']['theme_token']; + + // Prevent a request forgery from giving a person access to a theme they + // shouldn't be otherwise allowed to see. However, since everyone is allowed + // to see the default theme, token validation isn't required for that, and + // bypassing it allows most use-cases to work even when accessed from the + // page cache. + if ($theme === variable_get('theme_default', 'bartik') || drupal_valid_token($token, $theme)) { + return $theme; + } + } +} + +/** * Package and send the result of a page callback to the browser as an AJAX response. * * @param $page_callback_result diff --git includes/common.inc includes/common.inc index ba2f7ae..97b03bb 100644 --- includes/common.inc +++ includes/common.inc @@ -2822,16 +2822,22 @@ function drupal_add_css($data = NULL, $options = NULL) { * @param $css * (optional) An array of CSS files. If no array is provided, the default * stylesheets array is used instead. + * @param $skip_alter + * (optional) If set to TRUE, this function skips calling drupal_alter() on + * $css, useful when the calling function passes a $css array that has already + * been altered. * @return * A string of XHTML CSS tags. */ -function drupal_get_css($css = NULL) { +function drupal_get_css($css = NULL, $skip_alter = FALSE) { if (!isset($css)) { $css = drupal_add_css(); } // Allow modules and themes to alter the CSS items. - drupal_alter('css', $css); + if (!$skip_alter) { + drupal_alter('css', $css); + } // Sort CSS items according to their weights. uasort($css, 'drupal_sort_weight'); @@ -2855,6 +2861,12 @@ function drupal_get_css($css = NULL) { '#type' => 'styles', '#items' => $css, ); + + // Provide the page with information about the individual CSS files used, + // information not otherwise available when CSS aggregation is enabled. + $setting['ajaxPageState']['css'] = array_fill_keys(array_keys($css), 1); + $styles['#attached']['js'][] = array('type' => 'setting', 'data' => $setting); + return drupal_render($styles); } @@ -3791,13 +3803,17 @@ function drupal_js_defaults($data = NULL) { * @param $javascript * (optional) An array with all JavaScript code. Defaults to the default * JavaScript array for the given scope. + * @param $skip_alter + * (optional) If set to TRUE, this function skips calling drupal_alter() on + * $javascript, useful when the calling function passes a $javascript array + * that has already been altered. * @return * All JavaScript code segments and includes for the scope as HTML tags. * @see drupal_add_js() * @see locale_js_alter() * @see drupal_js_defaults() */ -function drupal_get_js($scope = 'header', $javascript = NULL) { +function drupal_get_js($scope = 'header', $javascript = NULL, $skip_alter = FALSE) { if (!isset($javascript)) { $javascript = drupal_add_js(); } @@ -3806,13 +3822,15 @@ function drupal_get_js($scope = 'header', $javascript = NULL) { } // Allow modules to alter the JavaScript. - drupal_alter('js', $javascript); + if (!$skip_alter) { + drupal_alter('js', $javascript); + } // Filter out elements of the given scope. $items = array(); - foreach ($javascript as $item) { + foreach ($javascript as $key => $item) { if ($item['scope'] == $scope) { - $items[] = $item; + $items[$key] = $item; } } @@ -3845,6 +3863,22 @@ function drupal_get_js($scope = 'header', $javascript = NULL) { // Sort the JavaScript by weight so that it appears in the correct order. uasort($items, 'drupal_sort_weight'); + // Provide the page with information about the individual JavaScript files + // used, information not otherwise available when aggregation is enabled. + $setting['ajaxPageState']['js'] = array_fill_keys(array_keys($items), 1); + unset($setting['ajaxPageState']['js']['settings']); + drupal_add_js($setting, 'setting'); + + // If we're outputting the header scope, then this might be the final time + // that drupal_get_js() is running, so add the setting to this output as well + // as to the drupal_add_js() cache. If $items['settings'] doesn't exist, it's + // because drupal_get_js() was intentionally passed a $javascript argument + // stripped off settings, potentially in order to override how settings get + // output, so in this case, do not add the setting to this output. + if ($scope == 'header' && isset($items['settings'])) { + $items['settings']['data'][] = $setting; + } + // Loop through the JavaScript to construct the rendered output. $element = array( '#tag' => 'script', diff --git includes/theme.inc includes/theme.inc index 3a83824..af7d402 100644 --- includes/theme.inc +++ includes/theme.inc @@ -102,6 +102,15 @@ function drupal_theme_initialize() { // Themes can have alter functions, so reset the drupal_alter() cache. drupal_static_reset('drupal_alter'); + + // Provide the page with information about the theme that's used, so that a + // later AJAX request can be rendered using the same theme. + // @see ajax_base_page_theme() + $setting['ajaxPageState'] = array( + 'theme' => $theme_key, + 'themeToken' => drupal_get_token($theme_key), + ); + drupal_add_js($setting, 'setting'); } /** diff --git misc/ajax.js misc/ajax.js index 553d2cc..d4f2d22 100644 --- misc/ajax.js +++ misc/ajax.js @@ -212,6 +212,17 @@ Drupal.ajax.prototype.beforeSubmit = function (form_values, element, options) { form_values.push({ name: 'ajax_html_ids[]', value: this.id }); }); + // Allow Drupal to return new JavaScript and CSS files to load without + // returning the ones already loaded. + form_values.push({ name: 'ajax_page_state[theme]', value: Drupal.settings.ajaxPageState.theme }); + form_values.push({ name: 'ajax_page_state[theme_token]', value: Drupal.settings.ajaxPageState.themeToken }); + for (var key in Drupal.settings.ajaxPageState.css) { + form_values.push({ name: 'ajax_page_state[css][' + key + ']', value: 1 }); + } + for (var key in Drupal.settings.ajaxPageState.js) { + form_values.push({ name: 'ajax_page_state[js][' + key + ']', value: 1 }); + } + // Insert progressbar or throbber. if (this.progress.type == 'bar') { var progressBar = new Drupal.progressBar('ajax-progress-' + this.element.id, eval(this.progress.update_callback), this.progress.method, eval(this.progress.error_callback)); diff --git modules/file/file.module modules/file/file.module index 5b75caa..746c916 100644 --- modules/file/file.module +++ modules/file/file.module @@ -41,12 +41,14 @@ function file_menu() { 'page callback' => 'file_ajax_upload', 'delivery callback' => 'ajax_deliver', 'access arguments' => array('access content'), + 'theme callback' => 'ajax_base_page_theme', 'type' => MENU_CALLBACK, ); $items['file/progress'] = array( 'page callback' => 'file_ajax_progress', 'delivery callback' => 'ajax_deliver', 'access arguments' => array('access content'), + 'theme callback' => 'ajax_base_page_theme', 'type' => MENU_CALLBACK, ); diff --git modules/simpletest/tests/ajax.test modules/simpletest/tests/ajax.test index 232074f..5393dab 100644 --- modules/simpletest/tests/ajax.test +++ modules/simpletest/tests/ajax.test @@ -1,5 +1,6 @@ $value) { + //compare both key and value towards our data that was given + if (isset($item[$key]) && ($item[$key] == $value)) { + $count_success++; + } + } + if(sizeof($conditions) == $count_success) { + $found = TRUE; + } + } + return $found; + } } /** @@ -42,27 +79,45 @@ class AJAXFrameworkTestCase extends AJAXTestCase { * Test proper passing of JavaScript settings via ajax_render(). */ function testAJAXRender() { - $result = $this->drupalGetAJAX('ajax-test/render'); - // Verify that JavaScript settings are contained (always first). - $this->assertIdentical($result[0]['command'], 'settings', t('drupal_add_js() settings are contained first.')); - // Verify that basePath is contained in JavaScript settings. - $this->assertEqual($result[0]['settings']['basePath'], base_path(), t('Base path is contained in JavaScript settings.')); + $commands = $this->drupalGetAJAX('ajax-test/render'); + + // Verify that there is a command to load settings added with + // drupal_add_js(). + $result = $this->findJSONKey(array('command' => 'settings'), $commands); + $this->assertTrue($result, t('ajax_render() added a settings command to load settings added with drupal_add_js().')); + $result = $this->findJSONKey(array('settings' => array('basePath' => base_path(), 'ajax' => 'test')), $commands); + $this->assertTrue($result, t('The %setting setting is included.', array('%setting' => 'basePath'))); + + $file = file_create_url('misc/drupal.js'); + + //find the files array + foreach ($commands as $command) { + if($command['command'] == 'scripts') { + //Verify that our file is included in the list + $this->assertEqual($command['files'][$file], $file, t('The %file file is included.', array('%file' => 'misc/drupal.js'))); + } + } } /** * Test behavior of ajax_render_error(). */ function testAJAXRenderError() { - $result = $this->discardSettings($this->drupalGetAJAX('ajax-test/render-error')); + $commands = $this->discardSettings($this->drupalGetAJAX('ajax-test/render-error')); // Verify default error message. - $this->assertEqual($result[0]['command'], 'alert', t('ajax_render_error() invokes alert command.')); - $this->assertEqual($result[0]['text'], t('An error occurred while handling the request: The server received invalid input.'), t('Default error message is output.')); + $result = $this->findJSONKey(array('command' => 'alert', 'text' => t('An error occurred while handling the request: The server received invalid input.')), $commands); + $this->assertTrue($result, t('ajax_render_error() invokes alert command.')); + + //$this->assertEqual($result[0]['command'], 'alert', t('ajax_render_error() invokes alert command.')); + //$this->assertEqual($result[0]['text'], t('An error occurred while handling the request: The server received invalid input.'), t('Default error message is output.')); // Verify custom error message. $edit = array( 'message' => 'Custom error message.', ); - $result = $this->discardSettings($this->drupalGetAJAX('ajax-test/render-error', array('query' => $edit))); - $this->assertEqual($result[0]['text'], $edit['message'], t('Custom error message is output.')); + $commands = $this->discardSettings($this->drupalGetAJAX('ajax-test/render-error', array('query' => $edit))); + $result = $this->findJSONKey(array('text' => $edit['message']), $commands); + $this->assertTrue($result, t('Custom error message is output.')); + //$this->assertEqual($result[0]['text'], $edit['message'], t('Custom error message is output.')); } } @@ -84,11 +139,12 @@ class AJAXCommandsTestCase extends AJAXTestCase { function testAJAXRender() { $commands = array(); $commands[] = ajax_command_settings(array('foo' => 42)); - $result = $this->drupalGetAJAX('ajax-test/render', array('query' => array('commands' => $commands))); - // Verify that JavaScript settings are contained (always first). - $this->assertIdentical($result[0]['command'], 'settings', t('drupal_add_js() settings are contained first.')); + // discardSettings() discards only what is automatically added by + // ajax_render(), not the one added by the ajax-test/render callback. + $result = $this->discardSettings($this->drupalGetAJAX('ajax-test/render', array('query' => array('commands' => $commands)))); // Verify that the custom setting is contained. - $this->assertEqual($result[1]['settings']['foo'], 42, t('Custom setting is output.')); + $result = $this->findJSONKey(array('settings' => array('foo' => 42)), $commands); + $this->assertTrue($result, t('Custom setting is output.')); } /** @@ -103,68 +159,69 @@ class AJAXCommandsTestCase extends AJAXTestCase { // Tests the 'after' command. $commands = $this->discardSettings($this->drupalPostAJAX($form_path, $edit, array('op' => t("AJAX 'After': Click to put something after the div")))); - $command = $commands[0]; - $this->assertTrue($command['command'] == 'insert' && $command['method'] == 'after' && $command['data'] == 'This will be placed after', "'after' AJAX command issued with correct data"); + $result = $this->findJSONKey(array('command' => 'insert', 'method' => 'after', 'data' => 'This will be placed after'), $commands); + $this->assertTrue($result, "'after' AJAX command issued with correct data"); // Tests the 'alert' command. $commands = $this->discardSettings($this->drupalPostAJAX($form_path, $edit, array('op' => t("AJAX 'Alert': Click to alert")))); - $command = $commands[0]; - $this->assertTrue($command['command'] == 'alert' && $command['text'] == 'Alert', "'alert' AJAX Command issued with correct text"); + $result = $this->findJSONKey(array('command' => 'alert', 'text' => 'Alert'), $commands); + $this->assertTrue($result, "'alert' AJAX Command issued with correct text"); // Tests the 'append' command. $commands = $this->discardSettings($this->drupalPostAJAX($form_path, $edit, array('op' => t("AJAX 'Append': Click to append something")))); - $command = $commands[0]; - $this->assertTrue($command['command'] == 'insert' && $command['method'] == 'append' && $command['data'] == 'Appended text', "'append' AJAX command issued with correct data"); + $result = $this->findJSONKey(array('command' => 'insert', 'method' => 'append', 'data' => 'Appended text'), $commands); + $this->assertTrue($result, "'append' AJAX command issued with correct data"); // Tests the 'before' command. $commands = $this->discardSettings($this->drupalPostAJAX($form_path, $edit, array('op' => t("AJAX 'before': Click to put something before the div")))); - $command = $commands[0]; - $this->assertTrue($command['command'] == 'insert' && $command['method'] == 'before' && $command['data'] == 'Before text', "'before' AJAX command issued with correct data"); + $result = $this->findJSONKey(array('command' => 'insert', 'method' => 'before', 'data' => 'Before text'), $commands); + $this->assertTrue($result, "'before' AJAX command issued with correct data"); // Tests the 'changed' command. $commands = $this->discardSettings($this->drupalPostAJAX($form_path, $edit, array('op' => t("AJAX changed: Click to mark div changed.")))); - $command = $commands[0]; - $this->assertTrue($command['command'] == 'changed' && $command['selector'] == '#changed_div', "'changed' AJAX command issued with correct selector"); + $result = $this->findJSONKey(array('command' => 'changed', 'selector' => '#changed_div'), $commands); + $this->assertTrue($result, "'changed' AJAX command issued with correct selector"); // Tests the 'changed' command using the second argument. $commands = $this->discardSettings($this->drupalPostAJAX($form_path, $edit, array('op' => t("AJAX changed: Click to mark div changed with asterisk.")))); - $command = $commands[0]; - $this->assertTrue($command['command'] == 'changed' && $command['selector'] == '#changed_div' && $command['asterisk'] == '#changed_div_mark_this', "'changed' AJAX command (with asterisk) issued with correct selector"); + $result = $this->findJSONKey(array('command' => 'changed', 'selector' => '#changed_div', 'asterisk' => '#changed_div_mark_this'), $commands); + $this->assertTrue($result, "'changed' AJAX command (with asterisk) issued with correct selector"); // Tests the 'css' command. $commands = $this->discardSettings($this->drupalPostAJAX($form_path, $edit, array('op' => t("Set the the '#box' div to be blue.")))); - $command = $commands[0]; - $this->assertTrue($command['command'] == 'css' && $command['selector'] == '#css_div' && $command['argument']['background-color'] == 'blue', "'css' AJAX command issued with correct selector"); + + $result = $this->findJSONKey(array('command' => 'css', 'selector' => '#css_div', 'argument' => array('background-color' => 'blue')), $commands); + $this->assertTrue($result, "'css' AJAX command issued with correct selector"); // Tests the 'data' command. $commands = $this->discardSettings($this->drupalPostAJAX($form_path, $edit, array('op' => t("AJAX data command: Issue command.")))); - $command = $commands[0]; - $this->assertTrue($command['command'] == 'data' && $command['name'] == 'testkey' && $command['value'] == 'testvalue', "'data' AJAX command issued with correct key and value"); + $result = $this->findJSONKey(array('command' => 'data', 'name' => 'testkey', 'value' => 'testvalue'), $commands); + $this->assertTrue($result, "'data' AJAX command issued with correct key and value"); // Tests the 'html' command. $commands = $this->discardSettings($this->drupalPostAJAX($form_path, $edit, array('op' => t("AJAX html: Replace the HTML in a selector.")))); - $command = $commands[0]; - $this->assertTrue($command['command'] == 'insert' && $command['method'] == 'html' && $command['data'] == 'replacement text', "'html' AJAX command issued with correct data"); + $result = $this->findJSONKey(array('command' => 'insert', 'method' => 'html', 'data' => 'replacement text'), $commands); + $this->assertTrue($result, "'html' AJAX command issued with correct data"); // Tests the 'insert' command. $commands = $this->discardSettings($this->drupalPostAJAX($form_path, $edit, array('op' => t("AJAX insert: Let client insert based on #ajax['method'].")))); - $command = $commands[0]; - $this->assertTrue($command['command'] == 'insert' && $command['method'] == NULL && $command['data'] == 'insert replacement text', "'insert' AJAX command issued with correct data"); + $result = $this->findJSONKey(array('command' => 'insert', 'data' => 'insert replacement text'), $commands); + $this->assertTrue($result, "'insert' AJAX command issued with correct data"); // Tests the 'prepend' command. $commands = $this->discardSettings($this->drupalPostAJAX($form_path, $edit, array('op' => t("AJAX 'prepend': Click to prepend something")))); - $command = $commands[0]; - $this->assertTrue($command['command'] == 'insert' && $command['method'] == 'prepend' && $command['data'] == 'prepended text', "'prepend' AJAX command issued with correct data"); + $result = $this->findJSONKey(array('command' => 'insert', 'method' => 'prepend', 'data' => 'prepended text'), $commands); + $this->assertTrue($result, "'prepend' AJAX command issued with correct data"); // Tests the 'remove' command. $commands = $this->discardSettings($this->drupalPostAJAX($form_path, $edit, array('op' => t("AJAX 'remove': Click to remove text")))); - $command = $commands[0]; - $this->assertTrue($command['command'] == 'remove' && $command['selector'] == '#remove_text', "'remove' AJAX command issued with correct command and selector"); + $result = $this->findJSONKey(array('command' => 'remove', 'selector' => '#remove_text'), $commands); + $this->assertTrue($result, "'remove' AJAX command issued with correct command and selector"); // Tests the 'restripe' command. $commands = $this->discardSettings($this->drupalPostAJAX($form_path, $edit, array('op' => t("AJAX 'restripe' command")))); - $command = $commands[0]; - $this->assertTrue($command['command'] == 'restripe' && $command['selector'] == '#restripe_table', "'restripe' AJAX command issued with correct selector"); + $result = $this->findJSONKey(array('command' => 'restripe', 'selector' => '#restripe_table'), $commands); + $this->assertTrue($result, "'restripe' AJAX command issued with correct selector"); } } @@ -197,8 +254,8 @@ class AJAXFormValuesTestCase extends AJAXTestCase { 'select' => $item, ); $commands = $this->discardSettings($this->drupalPostAJAX('ajax_forms_test_get_form', $edit, 'select')); - $data_command = $commands[1]; - $this->assertEqual($data_command['value'], $item); + $result = $this->findJSONKey(array('value' => $item), $commands); + $this->assertTrue($result, "verification of AJAX form values from a selectbox issued with a correct value"); } // Verify form values of a checkbox element. @@ -207,8 +264,8 @@ class AJAXFormValuesTestCase extends AJAXTestCase { 'checkbox' => $item, ); $commands = $this->discardSettings($this->drupalPostAJAX('ajax_forms_test_get_form', $edit, 'checkbox')); - $data_command = $commands[1]; - $this->assertEqual((int) $data_command['value'], (int) $item); + $result = $this->findJSONKey(array('value' => (int)$item), $commands); + $this->assertTrue($result, "verification of AJAX form values from a checkbox issued with a correct value"); } } } @@ -281,12 +338,17 @@ class AJAXMultiFormTestCase extends AJAXTestCase { // does for Drupal.settings. preg_match('/jQuery\.extend\(Drupal\.settings, (.*?)\);/', $this->content, $matches); $settings = drupal_json_decode($matches[1]); + foreach ($field_xpaths as $form_id => $field_xpath) { for ($i=0; $i<2; $i++) { $button = $this->xpath($field_xpath . $button_xpath_suffix); $button_id = (string) $button[0]['id']; $commands = $this->drupalPostAJAX(NULL, array(), array($button_name => $button_value), 'system/ajax', array(), array(), $form_id, $settings['ajax'][$button_id]); - $settings = array_merge_recursive($settings, $commands[0]['settings']); + foreach($commands as $key => $command) { + if(isset($command['settings']) && $command['command'] == 'settings') { + $settings = array_merge_recursive($settings, $command['settings']); + } + } $this->assert(count($this->xpath($field_xpath . $field_items_xpath_suffix)) == $i+2, t('Found the correct number of field items after an AJAX submission.')); $this->assertFieldByXPath($field_xpath . $button_xpath_suffix, NULL, t('Found the "add more" button after an AJAX submission.')); $this->assertNoDuplicateIds(t('Updated page contains unique IDs'), 'Other'); @@ -327,3 +389,4 @@ class AJAXElementValidation extends AJAXTestCase { } } + diff --git modules/simpletest/tests/ajax_test.module modules/simpletest/tests/ajax_test.module index 46d36b0..09b9ba2 100644 --- modules/simpletest/tests/ajax_test.module +++ modules/simpletest/tests/ajax_test.module @@ -31,7 +31,8 @@ function ajax_test_menu() { * Menu callback; Returns $_GET['commands'] suitable for use by ajax_deliver(). * * Additionally ensures that ajax_render() incorporates JavaScript settings - * by invoking drupal_add_js() with a dummy setting. + * and files by invoking drupal_add_js() with a dummy setting, which causes + * drupal_add_js() to also automatically add "misc/drupal.js". */ function ajax_test_render() { // Prepare AJAX commands. diff --git modules/system/system.module modules/system/system.module index bbb5d59..1f03f1f 100644 --- modules/system/system.module +++ modules/system/system.module @@ -509,6 +509,7 @@ function system_menu() { 'page callback' => 'ajax_form_callback', 'delivery callback' => 'ajax_deliver', 'access callback' => TRUE, + 'theme callback' => 'ajax_base_page_theme', 'type' => MENU_CALLBACK, 'file path' => 'includes', 'file' => 'form.inc',