From c3ecc1f9cd466203b05194321f2b5c26410170b9 Mon Sep 17 00:00:00 2001
From: catch <catch@35733.no-reply.drupal.org>
Date: Sun, 20 Nov 2011 22:40:42 +0900
Subject: [PATCH] Rollback of #589440 which needs more discussion.
---
core/modules/book/book.admin.inc | 11 ++++++-----
core/modules/book/book.module | 6 ++----
2 files changed, 8 insertions(+), 9 deletions(-)
diff --git a/core/modules/book/book.admin.inc b/core/modules/book/book.admin.inc
index 08ec5ec81fd0..7b9dea390f5b 100644
--- a/core/modules/book/book.admin.inc
+++ b/core/modules/book/book.admin.inc
@@ -174,6 +174,10 @@ function _book_admin_table($node, &$form) {
* @see book_admin_edit()
*/
function _book_admin_table_tree($tree, &$form) {
+ // The delta must be big enough to give each node a distinct value.
+ $count = count($tree);
+ $delta = ($count < 30) ? 15 : intval($count / 2) + 1;
+
foreach ($tree as $data) {
$form['book-admin-' . $data['link']['nid']] = array(
'#item' => $data['link'],
@@ -187,12 +191,9 @@ function _book_admin_table_tree($tree, &$form) {
'#size' => 40,
),
'weight' => array(
- // Using a textfield and a validator instead of a simple weight select
- // to avoid unnecessarily oversized HTML for books with hundreds of
- // pages.
- '#type' => 'textfield',
- '#element_validate' => array('element_validate_integer'),
+ '#type' => 'weight',
'#default_value' => $data['link']['weight'],
+ '#delta' => max($delta, abs($data['link']['weight'])),
'#title' => t('Weight for @title', array('@title' => $data['link']['title'])),
'#title_display' => 'invisible',
),
diff --git a/core/modules/book/book.module b/core/modules/book/book.module
index ce3c9e415803..10809843a850 100644
--- a/core/modules/book/book.module
+++ b/core/modules/book/book.module
@@ -515,12 +515,10 @@ function _book_add_form_elements(&$form, &$form_state, $node) {
// @see _book_admin_table_tree(). The weight may be larger than 15.
$form['book']['weight'] = array(
- // Using a textfield and a validator instead of a simple weight select to
- // avoid unnecessarily oversized HTML for books with hundreds of pages.
- '#type' => 'textfield',
- '#element_validate' => array('element_validate_integer'),
+ '#type' => 'weight',
'#title' => t('Weight'),
'#default_value' => $node->book['weight'],
+ '#delta' => max(15, abs($node->book['weight'])),
'#weight' => 5,
'#description' => t('Pages at a given level are ordered first by weight and then by title.'),
);
--
GitLab