diff options
| author | Dries Buytaert <dries@buytaert.net> | 2010-11-30 17:16:37 +0000 |
|---|---|---|
| committer | Dries Buytaert <dries@buytaert.net> | 2010-11-30 17:16:37 +0000 |
| commit | b1177ba603e3fe62c568a9a236cc371aefafc2dc (patch) | |
| tree | 89f4d9f843eb500c6754edc1e8cd5358da2695e5 /includes/ajax.inc | |
| parent | 732b57d10d0b344510e35d6223f36eecf62c0821 (diff) | |
| download | brdo-b1177ba603e3fe62c568a9a236cc371aefafc2dc.tar.gz brdo-b1177ba603e3fe62c568a9a236cc371aefafc2dc.tar.bz2 | |
- Patch #954804 by ksenzee, merlinofchaos: all .js in /misc should be registered as a library.
Diffstat (limited to 'includes/ajax.inc')
| -rw-r--r-- | includes/ajax.inc | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/includes/ajax.inc b/includes/ajax.inc index 24824a63f..899ab4547 100644 --- a/includes/ajax.inc +++ b/includes/ajax.inc @@ -604,8 +604,8 @@ function ajax_pre_render_element($element) { // Attach JavaScript settings to the element. if (isset($element['#ajax']['event'])) { - $element['#attached']['library'][] = array('system', 'form'); - $element['#attached']['js']['misc/ajax.js'] = array('group' => JS_LIBRARY, 'weight' => 2); + $element['#attached']['library'][] = array('system', 'jquery.form'); + $element['#attached']['library'][] = array('system', 'drupal.ajax'); $settings = $element['#ajax']; @@ -667,10 +667,6 @@ function ajax_pre_render_element($element) { $settings['progress']['url'] = url($settings['progress']['path']); unset($settings['progress']['path']); } - // Add progress.js if we're doing a bar display. - if ($settings['progress']['type'] == 'bar') { - $element['#attached']['js']['misc/progress.js'] = array('cache' => FALSE); - } $element['#attached']['js'][] = array( 'type' => 'setting', |