diff options
| author | Angie Byron <webchick@24967.no-reply.drupal.org> | 2010-01-12 06:31:22 +0000 |
|---|---|---|
| committer | Angie Byron <webchick@24967.no-reply.drupal.org> | 2010-01-12 06:31:22 +0000 |
| commit | 319fc2895c5fdfad8fb11bb6c09dd8f1d15e042b (patch) | |
| tree | 257640b701d6d33f6246beab1fc95b42a6288748 /misc/ajax.js | |
| parent | f334620be52804b85081a8b3f33a3d02155f89ee (diff) | |
| download | brdo-319fc2895c5fdfad8fb11bb6c09dd8f1d15e042b.tar.gz brdo-319fc2895c5fdfad8fb11bb6c09dd8f1d15e042b.tar.bz2 | |
#595972 by katbailey, sun, TwoD, quicksketch, merlinofchaos, and dmitrig01: Allow AJAX settings command to extend Drupal.settings.
Diffstat (limited to 'misc/ajax.js')
| -rw-r--r-- | misc/ajax.js | 7 |
1 files changed, 6 insertions, 1 deletions
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; + } }, /** |