golem
/
twentyGOLEM
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

move nav menu css/js to nav-menu prefix, See #11817 

git-svn-id: http://svn.automattic.com/wordpress/trunk@13402 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
wpmuguru 2010-02-25 17:10:00 +00:00
parent b61d45fa11
commit e8503ab54a
10 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
wp-admin/css/custom-navigation.css → wp-admin/css/nav-menu.css
View File

0
wp-admin/css/custom-navigation.dev.css → wp-admin/css/nav-menu.dev.css
View File

0
wp-admin/js/custom-navigation-default-items.dev.js → wp-admin/js/nav-menu-default-items.dev.js
View File

0
wp-admin/js/custom-navigation-default-items.js → wp-admin/js/nav-menu-default-items.js
View File

0
wp-admin/js/custom-navigation-dynamic-functions.dev.js → wp-admin/js/nav-menu-dynamic-functions.dev.js
View File

0
wp-admin/js/custom-navigation-dynamic-functions.js → wp-admin/js/nav-menu-dynamic-functions.js
View File

0
wp-admin/js/custom-navigation-php-functions.dev.js → wp-admin/js/nav-menu-php-functions.dev.js
View File

0
wp-admin/js/custom-navigation-php-functions.js → wp-admin/js/nav-menu-php-functions.js
View File

10
wp-admin/nav-menus.php
View File

@ -14,16 +14,16 @@ require_once('admin.php');
if ( ! current_user_can('switch_themes') )
wp_die( __( 'Cheatin’ uh?' ));
wp_admin_css( 'custom-navigation' );
wp_admin_css( 'nav-menu' );
wp_enqueue_script( 'jquery' );
wp_enqueue_script( 'jquery-ui-draggable' );
wp_enqueue_script( 'jquery-ui-droppable' );
wp_enqueue_script( 'jquery-ui-sortable' );
wp_enqueue_script( 'jquery-ui-dialog' );
wp_enqueue_script( 'custom-navigation-dynamic-functions' );
wp_enqueue_script( 'custom-navigation-default-items' );
wp_enqueue_script( 'nav-menu-dynamic-functions' );
wp_enqueue_script( 'nav-menu-default-items' );
wp_enqueue_script( 'jquery-autocomplete' );
wp_enqueue_script( 'custom-navigation-php-functions' );
wp_enqueue_script( 'nav-menu-php-functions' );
require_once( 'admin-header.php' );
require_once( ABSPATH . 'wp-admin/includes/nav-menu.php' );
@ -393,4 +393,4 @@ if ( $post_counter > 0 && $menu_selected_id > 0 && ! $updated ) {
<?php
include( 'admin-footer.php' );
include( 'admin-footer.php' );

10
wp-includes/script-loader.php
View File

@ -397,15 +397,15 @@ function wp_default_scripts( &$scripts ) {
) );
// Custom Navigation
$scripts->add( 'custom-navigation-default-items', "/wp-admin/js/custom-navigation-default-items$suffix.js", false, '20100223' );
$scripts->add( 'custom-navigation-dynamic-functions', "/wp-admin/js/custom-navigation-dynamic-functions$suffix.js", false, '20100224b' );
$scripts->localize( 'custom-navigation-dynamic-functions', 'navMenuL10n', array(
$scripts->add( 'nav-menu-default-items', "/wp-admin/js/nav-menu-default-items$suffix.js", false, '20100223' );
$scripts->add( 'nav-menu-dynamic-functions', "/wp-admin/js/nav-menu-dynamic-functions$suffix.js", false, '20100224b' );
$scripts->localize( 'nav-menu-dynamic-functions', 'navMenuL10n', array(
'custom' => _x('Custom', 'menu nav item type'),
'page' => _x('Page', 'menu nav item type'),
'category' => _x('Category', 'menu nav item type')
) );
$scripts->add( 'custom-navigation-php-functions', "/wp-admin/js/custom-navigation-php-functions$suffix.js", false, '20100220' );
$scripts->add( 'nav-menu-php-functions', "/wp-admin/js/nav-menu-php-functions$suffix.js", false, '20100220' );
}
}
@ -474,7 +474,7 @@ function wp_default_styles( &$styles ) {
$styles->add( 'farbtastic', '/wp-admin/css/farbtastic.css', array(), '1.2' );
$styles->add( 'jcrop', '/wp-includes/js/jcrop/jquery.Jcrop.css', array(), '0.9.8' );
$styles->add( 'imgareaselect', '/wp-includes/js/imgareaselect/imgareaselect.css', array(), '0.9.1' );
$styles->add( 'custom-navigation', "/wp-admin/css/custom-navigation$suffix.css", array(), '20100225' );
$styles->add( 'nav-menu', "/wp-admin/css/nav-menu$suffix.css", array(), '20100225' );
foreach ( $rtl_styles as $rtl_style ) {
$styles->add_data( $rtl_style, 'rtl', true );