WordPress.org

Make WordPress Core

Changeset 21717


Ignore:
Timestamp:
09/04/2012 03:17:11 AM (9 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:
3 edited

Legend:

Unmodified
Added
Removed
  • branches/3.4/wp-admin/includes/meta-boxes.php

    r21108 r21717  
    689689            <label class="screen-reader-text" for="newcat"><?php _e( '+ Add New Category' ); ?></label>
    690690            <input type="text" name="newcat" id="newcat" class="form-required form-input-tip" value="<?php esc_attr_e( 'New category name' ); ?>" aria-required="true" />
    691             <input type="button" id="category-add-submit" class="add:categorychecklist:linkcategorydiv button" value="<?php esc_attr_e( 'Add' ); ?>" />
     691            <input type="button" id="link-category-add-submit" class="add:categorychecklist:linkcategorydiv button" value="<?php esc_attr_e( 'Add' ); ?>" />
    692692            <?php wp_nonce_field( 'add-link-category', '_ajax_nonce', false ); ?>
    693693            <span id="category-ajax-response"></span>
  • branches/3.4/wp-admin/js/link.dev.js

    r18027 r21717  
    2424    // Ajax Cat
    2525    newCat = $('#newcat').one( 'focus', function() { $(this).val( '' ).removeClass( 'form-input-tip' ) } );
    26     $('#category-add-submit').click( function() { newCat.focus(); } );
     26    $('#link-category-add-submit').click( function() { newCat.focus(); } );
    2727    syncChecks = function() {
    2828        if ( noSyncChecks )
  • branches/3.4/wp-includes/js/wp-lists.dev.js

    r17981 r21717  
    7979            return false;
    8080
    81         if ( !e.is('[class^="add:' + list.id + ':"]') )
     81        if ( !e.is('[id="' + s.what + '-add-submit"]') )
    8282            return !wpList.add.call( list, e, s );
    8383
Note: See TracChangeset for help on using the changeset viewer.