From 893fba439bd0fa2d17075715a383a374ff2a4cc6 Mon Sep 17 00:00:00 2001
From: Angie Byron <webchick@24967.no-reply.drupal.org>
Date: Wed, 7 Jul 2010 17:56:42 +0000
Subject: [PATCH] Roll-back of #749748. This broke JavaScript on node add
forms, and probably elsewhere.
---
includes/form.inc | 3 +++
modules/node/node.admin.inc | 2 ++
modules/system/system.module | 5 -----
modules/user/user.admin.inc | 2 ++
4 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/includes/form.inc b/includes/form.inc
index 507767e2d05d..b6732481eed7 100644
--- a/includes/form.inc
+++ b/includes/form.inc
@@ -2852,6 +2852,9 @@ function form_process_fieldset(&$element, &$form_state) {
$form_state['groups'][$group][] = &$element;
}
+ // Contains form element summary functionalities.
+ $element['#attached']['js']['misc/form.js'] = array('weight' => JS_LIBRARY + 1);
+
// The .form-wrapper class is required for #states to treat fieldsets like
// containers.
if (!isset($element['#attributes']['class'])) {
diff --git a/modules/node/node.admin.inc b/modules/node/node.admin.inc
index 5caee7b99487..d20f1983d3f4 100644
--- a/modules/node/node.admin.inc
+++ b/modules/node/node.admin.inc
@@ -196,6 +196,8 @@ function node_filter_form() {
$form['filters']['actions']['reset'] = array('#type' => 'submit', '#value' => t('Reset'));
}
+ drupal_add_js('misc/form.js');
+
return $form;
}
diff --git a/modules/system/system.module b/modules/system/system.module
index bef1427d4c46..23ecb714f9f5 100644
--- a/modules/system/system.module
+++ b/modules/system/system.module
@@ -279,11 +279,6 @@ function system_element_info() {
'#method' => 'post',
'#action' => request_uri(),
'#theme_wrappers' => array('form'),
- '#attached' => array(
- 'js' => array(
- 'misc/form.js' => array('weight' => JS_LIBRARY + 1),
- ),
- ),
);
$types['page'] = array(
'#show_messages' => TRUE,
diff --git a/modules/user/user.admin.inc b/modules/user/user.admin.inc
index be1dd1ea796b..84abde5ed937 100644
--- a/modules/user/user.admin.inc
+++ b/modules/user/user.admin.inc
@@ -92,6 +92,8 @@ function user_filter_form() {
);
}
+ drupal_add_js('misc/form.js');
+
return $form;
}
--
GitLab