From 319fc2895c5fdfad8fb11bb6c09dd8f1d15e042b Mon Sep 17 00:00:00 2001
From: Angie Byron <webchick@24967.no-reply.drupal.org>
Date: Tue, 12 Jan 2010 06:31:22 +0000
Subject: #595972 by katbailey, sun, TwoD, quicksketch, merlinofchaos, and
 dmitrig01: Allow AJAX settings command to extend Drupal.settings.

---
 misc/ajax.js | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'misc/ajax.js')

diff --git a/misc/ajax.js b/misc/ajax.js
index d61af3ec8..1ded01ca8 100644
--- a/misc/ajax.js
+++ b/misc/ajax.js
@@ -406,7 +406,12 @@ Drupal.ajax.prototype.commands = {
    * Command to set the settings that will be used for other commands in this response.
    */
   settings: function (ajax, response, status) {
-    ajax.settings = response.settings;
+    if (response.merge) {
+      $.extend(true, Drupal.settings, response.settings);
+    }
+    else {
+      ajax.settings = response.settings;
+    }
   },
 
   /**
-- 
cgit v1.2.3