diff --git a/ctools.module b/ctools.module index 62fe7844506dd256374ef7f561e4efb1b3e5a40e..3bf67648a799ff984284d6caee4737663f0af84b 100644 --- a/ctools.module +++ b/ctools.module @@ -642,7 +642,7 @@ function ctools_preprocess_page(&$variables) { // For inline Javascript to validate as XHTML, all Javascript containing // XHTML needs to be wrapped in CDATA. To make that backwards compatible // with HTML 4, we need to comment out the CDATA-tag. - $loaded = array('CTools' => array('scripts' => $js_files, 'css' => $css_files)); + $loaded = array('CToolsAJAX' => array('scripts' => $js_files, 'css' => $css_files)); $embed_prefix = "\n\n"; $variables['closure'].= '\n"; diff --git a/js/ajax-responder.js b/js/ajax-responder.js index ec2f82cb1e452dd4a29c7744f0334ef910f906d7..be1ebeabc3fe4b610518fd051af6daa2974d6c88 100644 --- a/js/ajax-responder.js +++ b/js/ajax-responder.js @@ -468,11 +468,11 @@ .change(Drupal.CTools.AJAX.changeAJAX); // Add information about loaded CSS and JS files. - if (Drupal.settings.CTools.css) { - $.extend(Drupal.CTools.AJAX.css, Drupal.settings.CTools.css); + if (Drupal.settings.CToolsAJAX.css) { + $.extend(Drupal.CTools.AJAX.css, Drupal.settings.CToolsAJAX.css); } - if (Drupal.settings.CTools.scripts) { - $.extend(Drupal.CTools.AJAX.scripts, Drupal.settings.CTools.scripts); + if (Drupal.settings.CToolsAJAX.scripts) { + $.extend(Drupal.CTools.AJAX.scripts, Drupal.settings.CToolsAJAX.scripts); } }; })(jQuery);