Changeset 21717

Timestamp:

09/04/2012 03:17:11 AM (12 years ago)

Author:

nacin

Message:

Merge [21205] and [21688] to the 3.4 branch. props SergeyBiryukov, yoavf. fixes #21590. see #21106.

Location:

branches/3.4

Files:

• wp-admin/includes/meta-boxes.php (modified) (1 diff)
• wp-admin/js/link.dev.js (modified) (1 diff)
• wp-includes/js/wp-lists.dev.js (modified) (1 diff)

branches/3.4/wp-admin/includes/meta-boxes.php

@@ -689 +689 @@
             <label class="screen-reader-text" for="newcat"><?php _e( '+ Add New Category' ); ?></label>
             <input type="text" name="newcat" id="newcat" class="form-required form-input-tip" value="<?php esc_attr_e( 'New category name' ); ?>" aria-required="true" />
-            <input type="button" id="category-add-submit" class="add:categorychecklist:linkcategorydiv button" value="<?php esc_attr_e( 'Add' ); ?>" />
+            <input type="button" id="link-category-add-submit" class="add:categorychecklist:linkcategorydiv button" value="<?php esc_attr_e( 'Add' ); ?>" />
             <?php wp_nonce_field( 'add-link-category', '_ajax_nonce', false ); ?>
             <span id="category-ajax-response"></span>

branches/3.4/wp-admin/js/link.dev.js

@@ -24 +24 @@
     // Ajax Cat
     newCat = $('#newcat').one( 'focus', function() { $(this).val( '' ).removeClass( 'form-input-tip' ) } );
-    $('#category-add-submit').click( function() { newCat.focus(); } );
+    $('#link-category-add-submit').click( function() { newCat.focus(); } );
     syncChecks = function() {
         if ( noSyncChecks )

branches/3.4/wp-includes/js/wp-lists.dev.js

@@ -79 +79 @@
             return false;
 
-        if ( !e.is('[class^="add:' + list.id + ':"]') )
+        if ( !e.is('[id="' + s.what + '-add-submit"]') )
             return !wpList.add.call( list, e, s );