Changeset 6597

Timestamp:

01/10/2008 10:42:49 PM (17 years ago)

Author:

matt

Message:

Fixes to category list saving. Hat tip: mdawaffe. Fixes #5631

Location:

trunk/wp-admin

Files:

• edit-form-advanced.php (modified) (3 diffs)
• includes/template.php (modified) (1 diff)
• js/common.js (modified) (1 diff)
• js/post.js (modified) (3 diffs)
• wp-admin.css (modified) (2 diffs)

trunk/wp-admin/edit-form-advanced.php

@@ -128 +128 @@
         <input type="text" name="newcat" id="newcat" class="form-required form-input-tip" value="<?php _e( 'New category name' ); ?>" />
         <?php wp_dropdown_categories( array( 'hide_empty' => 0, 'name' => 'newcat_parent', 'orderby' => 'name', 'hierarchical' => 1, 'show_option_none' => __('Parent category') ) ); ?>
-        <a id="category-add-sumbit" class="add:categorychecklist:categorydiv button" href="<?php echo wp_nonce_url( '', 'add-category' ); ?>"><?php _e( 'Add' ); ?></a>
+        <input type="button" id="category-add-sumbit" class="add:categorychecklist:categorydiv button" value="<?php _e( 'Add' ); ?>" />
+        <?php wp_nonce_field( 'add-category', '_ajax_nonce', false ); ?>
         <span id="category-ajax-response"></span>
     </p>
@@ -135 +136 @@
 <ul id="category-tabs">
     <li class="ui-tabs-selected"><a href="#categories-all"><?php _e( 'All Categories' ); ?></a></li>
-    <li><a href="#categories-pop"><?php _e( 'Most Used' ); ?></a></li>
+    <li class="wp-no-js-hidden"><a href="#categories-pop"><?php _e( 'Most Used' ); ?></a></li>
 </ul>
 
@@ -144 +145 @@
 </div>
 
-<div id="categories-pop" class="ui-tabs-panel">
+<div id="categories-pop" class="ui-tabs-panel" style="display: none;">
     <ul id="categorychecklist-pop" class="categorychecklist form-no-clear">
         <?php wp_popular_categories_checklist(); ?>

trunk/wp-admin/includes/template.php

@@ -189 +189 @@
 
 function wp_popular_categories_checklist( $default = 0, $number = 10 ) {
-    global $checked_categories;
-
-    wp_set_checked_post_categories( $default );
-
     $categories = get_categories( array( 'orderby' => 'count', 'order' => 'DESC', 'number' => $number ) );
 
     foreach ( (array) $categories as $category ) {
         $id = "popular-category-$category->term_id";
-        $checked = in_array( $category->term_id, $checked_categories ) ? ' checked="checked"' : '';     
         ?>
 
         <li id="<?php echo $id; ?>">
             <label class="selectit" for="in-<?php echo $id; ?>">
-                <input id="in-<?php echo $id; ?>" type="checkbox" name="post_category[]" value="<?php echo (int) $category->term_id; ?>"<?php echo $checked; ?> />
+                <input id="in-<?php echo $id; ?>" type="checkbox" value="<?php echo (int) $category->term_id; ?>" />
                 <?php echo wp_specialchars( apply_filters( 'the_category', $category->name ) ); ?>
             </label>

trunk/wp-admin/js/common.js

@@ -2 +2 @@
     // pulse
     jQuery('.fade').animate( { backgroundColor: '#ffffe0' }, 300).animate( { backgroundColor: '#fffbcc' }, 300).animate( { backgroundColor: '#ffffe0' }, 300).animate( { backgroundColor: '#fffbcc' }, 300); 
+
+    jQuery('.wp-no-js-hidden').removeClass( 'wp-no-js-hidden' );
 });

trunk/wp-admin/js/post.js

@@ -96 +96 @@
     var newCatParent = false;
     var newCatParentOption = false;
+    var noSyncChecks = false; // prophylactic. necessary?
+    var syncChecks = function() {
+        if ( noSyncChecks )
+            return;
+        noSyncChecks = true;
+        var th = jQuery(this);
+        var c = th.is(':checked');
+        var id = th.val().toString();
+        jQuery('#in-category-' + id + ', #in-popular-category-' + id).attr( 'checked', c );
+        noSyncChecks = false;
+    };
     var catAddAfter = function( r, s ) {
         if ( !newCatParent ) newCatParent = jQuery('#newcat_parent');
@@ -103 +114 @@
             t.find( 'label' ).each( function() {
                 var th = jQuery(this);
-                var id = th.find('input').val();
-                if ( newCatParent.find( 'option[value=' + id + ']' ).size() )
+                var val = th.find('input').val();
+                var id = th.find('input')[0].id
+                jQuery('#' + id).change( syncChecks );
+                if ( newCatParent.find( 'option[value=' + val + ']' ).size() )
                     return;
                 var name = jQuery.trim( th.text() );
-                var o = jQuery( '<option value="' +  parseInt( id, 10 ) + '"></option>' ).text( name );
+                var o = jQuery( '<option value="' +  parseInt( val, 10 ) + '"></option>' ).text( name );
                 newCatParent.prepend( o );
-                newCatParentOption.attr( 'selected', true );
             } );
+            newCatParentOption.attr( 'selected', true );
         } );
     };
@@ -123 +136 @@
         return false;
     } );
+    jQuery('.categorychecklist :checkbox').change( syncChecks ).filter( ':checked' ).change();
 });

trunk/wp-admin/wp-admin.css

@@ -1238 +1238 @@
 }
 
+#category-add input#category-add-sumbit {
+    width: auto;
+}
+
 #categorydiv ul#category-tabs {
     float: left;
@@ -1280 +1284 @@
 /* Global classes */
 .wp-hidden-children .wp-hidden-child { display: none; }
+.wp-no-js-hidden { display: none; }
 .ui-tabs-hide { display: none; }
 .form-input-tip { color: #999; }