summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEarl Miles2010-07-05 23:59:21 (GMT)
committer Earl Miles2010-07-05 23:59:21 (GMT)
commitd39b9d389ca96c58a6a90fa31873f434aee0db5a (patch)
tree77085a1cdb4428714e066d72c570b437342c0707
parentaccd03506bc45fe9b15d6fa27105d4e667c9a11d (diff)
Change namespace on AJAX css and scripts so as not to overwrite the existing CTools namespace.
-rw-r--r--ctools.module2
-rw-r--r--js/ajax-responder.js8
2 files changed, 5 insertions, 5 deletions
diff --git a/ctools.module b/ctools.module
index 62fe784..3bf6764 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<!--//--><![CDATA[//><!--\n";
$embed_suffix = "\n//--><!]]>\n";
$variables['closure'].= '<script type="text/javascript">' . $embed_prefix . 'jQuery.extend(Drupal.settings, ' . drupal_to_js($loaded) . ");" . $embed_suffix . "</script>\n";
diff --git a/js/ajax-responder.js b/js/ajax-responder.js
index ec2f82c..be1ebea 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);