From 2c7e1f2a41ce1af8e582b540a3b580955c26c0d0 Mon Sep 17 00:00:00 2001
From: Angie Byron <webchick@24967.no-reply.drupal.org>
Date: Tue, 25 Aug 2009 21:16:31 +0000
Subject: #505084 by Rob Loach: Added an #attached_library() FAPI property for
 drupal_add_library(), for consistency with #attached_css and #attached_js.

---
 includes/form.inc | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

(limited to 'includes/form.inc')

diff --git a/includes/form.inc b/includes/form.inc
index e9030efe6..b57b7c816 100644
--- a/includes/form.inc
+++ b/includes/form.inc
@@ -1594,7 +1594,7 @@ function form_get_options($element, $key) {
  */
 function theme_fieldset($element) {
   if (!empty($element['#collapsible'])) {
-    drupal_add_js('misc/collapse.js');
+    $element['#attached_js']['misc/collapse.js'] = array();
 
     if (!isset($element['#attributes']['class'])) {
       $element['#attributes']['class'] = array();
@@ -2215,7 +2215,7 @@ function form_process_fieldset(&$element, &$form_state) {
   $element['#group_members'] = &$form_state['groups'][$parents];
 
   // Contains form element summary functionalities.
-  drupal_add_js('misc/form.js', array('weight' => JS_LIBRARY + 1));
+  $element['#attached_js']['misc/form.js'] = array('weight' => JS_LIBRARY + 1);
 
   return $element;
 }
@@ -2300,8 +2300,7 @@ function form_process_vertical_tabs($element, &$form_state) {
  */
 function theme_vertical_tabs($element) {
   // Add required JavaScript and Stylesheet.
-  drupal_add_js('misc/vertical-tabs.js', array('weight' => JS_DEFAULT - 1));
-  drupal_add_css('misc/vertical-tabs.css');
+  drupal_add_library('system', 'vertical-tabs');
 
   return '<div class="vertical-tabs-panes">' . $element['#children'] . '</div>';
 }
-- 
cgit v1.2.3