summaryrefslogtreecommitdiff
path: root/misc
diff options
context:
space:
mode:
authorDries Buytaert <dries@buytaert.net>2010-12-17 01:03:58 +0000
committerDries Buytaert <dries@buytaert.net>2010-12-17 01:03:58 +0000
commiteefb872c9416c10a891b0915cd5af32cdd9f4e52 (patch)
treea4958ffb012dc80d7bf804dbc818681b14e702c9 /misc
parentbc3f72a9787768c0efe9b95bc2b4ec4a6b1216c1 (diff)
downloadbrdo-eefb872c9416c10a891b0915cd5af32cdd9f4e52.tar.gz
brdo-eefb872c9416c10a891b0915cd5af32cdd9f4e52.tar.bz2
- Patch #951262 by sun: move #ajax default settings from PHP into JS.
Diffstat (limited to 'misc')
-rw-r--r--misc/ajax.js9
1 files changed, 6 insertions, 3 deletions
diff --git a/misc/ajax.js b/misc/ajax.js
index 96be838b5..4672e3eb3 100644
--- a/misc/ajax.js
+++ b/misc/ajax.js
@@ -25,6 +25,9 @@ Drupal.behaviors.AJAX = {
if (!$('#' + base + '.ajax-processed').length) {
var element_settings = settings.ajax[base];
+ if (typeof element_settings.selector == 'undefined') {
+ element_settings.selector = '#' + base;
+ }
$(element_settings.selector).each(function () {
element_settings.element = this;
Drupal.ajax[base] = new Drupal.ajax(base, this, element_settings);
@@ -100,11 +103,11 @@ Drupal.ajax = function (base, element, element_settings) {
keypress: true,
selector: '#' + base,
effect: 'none',
- speed: 'slow',
+ speed: 'none',
method: 'replaceWith',
progress: {
- type: 'bar',
- message: 'Please wait...'
+ type: 'throbber',
+ message: Drupal.t('Please wait...')
},
submit: {
'js': true