Changeset 6591

Timestamp:

01/10/08 20:19:58 (1 year ago)

Author:

ryan

Message:

Fixes for new categories interface from mdawaffe. fixes #5618

Files:

• trunk/wp-admin/admin-ajax.php (modified) (1 diff)
• trunk/wp-admin/edit-form-advanced.php (modified) (1 diff)
• trunk/wp-admin/includes/template.php (modified) (1 diff)
• trunk/wp-admin/js/post.js (modified) (2 diffs)
• trunk/wp-admin/wp-admin.css (modified) (2 diffs)
• trunk/wp-includes/js/wp-lists.js (modified) (5 diffs)
• trunk/wp-includes/script-loader.php (modified) (2 diffs)

trunk/wp-admin/admin-ajax.php

@@ -174 +174 @@
-            continue;
-        $category = get_category( $cat_id );
-ategory->_is_checked = true
+hecked_categories[] = $cat_id
-        ob_start();
-            dropdown_categories( 0, $category );

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

@@ -126 +126 @@
-    <h4><a id="category-add-toggle" href="#category-add"><?php _e( '+ Add New Category' ); ?></a></h4>
-    <p id="category-add" class="wp-hidden-child">
-
+ form-input-tip
-        <?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>

trunk/wp-admin/includes/template.php

@@ -145 +145 @@
-            'children' => get_nested_categories( $default, $parent->term_id ),
-            'cat_ID' => $parent->term_id,
-sset($parent->_is_checked) && $parent->_is_checked
+n_array( $parent->term_id, $checked_categories )
-            'cat_name' => get_the_category_by_ID( $parent->term_id )
-        );

trunk/wp-admin/js/post.js

@@ -70 +70 @@
-    tag_update_quickclicks();
-    // add the quickadd form
-
+class="form-input-tip" 
-    jQuery('#tagadd').click( tag_flush_to_text );
-//  jQuery('#newtag').keydown( tag_press_key );
-    jQuery('#newtag').focus(function() {
-
-
-
-
+
+
-    });
-    jQuery('#newtag').blur(function() {
-
-
-
-
+
+
-    });
-
@@ -96 +92 @@
-
-    // Ajax Cat
-
+.removeClass( 'form-input-tip' )
-    jQuery('#category-add-sumbit').click( function() { newCat.focus(); } );
+    var newCatParent = false;
+    var newCatParentOption = false;
-    var catAddAfter = function( r, s ) {
+        if ( !newCatParent ) newCatParent = jQuery('#newcat_parent');
+        if ( !newCatParentOption ) newCatParentOption = newCatParent.find( 'option[value=-1]' );
-        jQuery(s.what + ' response_data', r).each( function() {
-            var t = jQuery(jQuery(this).text());
-
-
-
+
+
+
+
+
+
+
+
+
+
-        } );
-    };

trunk/wp-admin/wp-admin.css

@@ -1089 +1089 @@
-#tagchecklist span a:hover {
-    background: url(images/xit.gif) no-repeat -10px 0;
-}
-
-#newtag {
-    color: #999;
-}
-
@@ -1285 +1281 @@
-.wp-hidden-children .wp-hidden-child { display: none; }
-.ui-tabs-hide { display: none; }
+.form-input-tip { color: #999; }

trunk/wp-includes/js/wp-lists.js

@@ -268 +268 @@
-        e = $(e);
-
- var next = false;
+
-        var _s = { pos: 0, id: 0, oldId: null };
-        if ( 'string' == typeof s ) { s = { what: s }; }
@@ -274 +274 @@
-
-        if ( !e.size() || !s.what ) { return false; }
-
-
-
-
-
-
+
+
-
-        if ( old && old.size() ) {
-
-
-
-
-
+
-        } else if ( isNaN(s.pos) ) {
-            var ba = 'after';
@@ -332 +324 @@
-    process: function(el) {
-        var list = this;
-        var bl = function() { currentFormEl = false; };
-        var fo = function() { currentFormEl = this; };
-        var a = $("[@class^=add:" + list.id + ":]", el || null)
-            .filter('form').submit( function() { return list.wpList.add(this); } ).end()
@@ -341 +331 @@
-                if ( !c ) { return; }
-                var forms = []; var ins = [];
-click( function() { $(this).unbind( 'blur', bl ).unbind( 'focus', fo ).blur( bl ).focus( fo ).focus()
+focus( function() { currentFormEl = this; } ).blur( function() { currentFormEl = false
-                    ins.push(this);
-                    $.merge(forms,$(this).parents('form'));
@@ -347 +337 @@
-                } );
-                $(forms).submit( function() {
-
-
+
-                        $(addEl).trigger( 'click' );
-e
+currentFormEl
-                        return false;
-                    }

trunk/wp-includes/script-loader.php

@@ -61 +61 @@
-        ) );
-
-09
+10
-        $this->localize( 'wp-lists', 'wpListL10n', array(
-            'url' => get_option( 'siteurl' ) . '/wp-admin/admin-ajax.php'
@@ -109 +109 @@
-            $this->add( 'xfn', '/wp-admin/js/xfn.js', false, '3517' );
-            $this->add( 'upload', '/wp-admin/js/upload.js', array('jquery'), '20070518' );
-09
+10
-            $this->localize( 'post', 'postL10n', array(
-                'tagsUsed' =>  __('Tags used on this post:'),