From e8503ab54ac8bcf230bd208753a73c47cd15a3b8 Mon Sep 17 00:00:00 2001 From: wpmuguru Date: Thu, 25 Feb 2010 17:10:00 +0000 Subject: [PATCH] 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 --- wp-admin/css/{custom-navigation.css => nav-menu.css} | 0 .../{custom-navigation.dev.css => nav-menu.dev.css} | 0 ...ault-items.dev.js => nav-menu-default-items.dev.js} | 0 ...tion-default-items.js => nav-menu-default-items.js} | 0 ...ctions.dev.js => nav-menu-dynamic-functions.dev.js} | 0 ...amic-functions.js => nav-menu-dynamic-functions.js} | 0 ...-functions.dev.js => nav-menu-php-functions.dev.js} | 0 ...tion-php-functions.js => nav-menu-php-functions.js} | 0 wp-admin/nav-menus.php | 10 +++++----- wp-includes/script-loader.php | 10 +++++----- 10 files changed, 10 insertions(+), 10 deletions(-) rename wp-admin/css/{custom-navigation.css => nav-menu.css} (100%) rename wp-admin/css/{custom-navigation.dev.css => nav-menu.dev.css} (100%) rename wp-admin/js/{custom-navigation-default-items.dev.js => nav-menu-default-items.dev.js} (100%) rename wp-admin/js/{custom-navigation-default-items.js => nav-menu-default-items.js} (100%) rename wp-admin/js/{custom-navigation-dynamic-functions.dev.js => nav-menu-dynamic-functions.dev.js} (100%) rename wp-admin/js/{custom-navigation-dynamic-functions.js => nav-menu-dynamic-functions.js} (100%) rename wp-admin/js/{custom-navigation-php-functions.dev.js => nav-menu-php-functions.dev.js} (100%) rename wp-admin/js/{custom-navigation-php-functions.js => nav-menu-php-functions.js} (100%) diff --git a/wp-admin/css/custom-navigation.css b/wp-admin/css/nav-menu.css similarity index 100% rename from wp-admin/css/custom-navigation.css rename to wp-admin/css/nav-menu.css diff --git a/wp-admin/css/custom-navigation.dev.css b/wp-admin/css/nav-menu.dev.css similarity index 100% rename from wp-admin/css/custom-navigation.dev.css rename to wp-admin/css/nav-menu.dev.css diff --git a/wp-admin/js/custom-navigation-default-items.dev.js b/wp-admin/js/nav-menu-default-items.dev.js similarity index 100% rename from wp-admin/js/custom-navigation-default-items.dev.js rename to wp-admin/js/nav-menu-default-items.dev.js diff --git a/wp-admin/js/custom-navigation-default-items.js b/wp-admin/js/nav-menu-default-items.js similarity index 100% rename from wp-admin/js/custom-navigation-default-items.js rename to wp-admin/js/nav-menu-default-items.js diff --git a/wp-admin/js/custom-navigation-dynamic-functions.dev.js b/wp-admin/js/nav-menu-dynamic-functions.dev.js similarity index 100% rename from wp-admin/js/custom-navigation-dynamic-functions.dev.js rename to wp-admin/js/nav-menu-dynamic-functions.dev.js diff --git a/wp-admin/js/custom-navigation-dynamic-functions.js b/wp-admin/js/nav-menu-dynamic-functions.js similarity index 100% rename from wp-admin/js/custom-navigation-dynamic-functions.js rename to wp-admin/js/nav-menu-dynamic-functions.js diff --git a/wp-admin/js/custom-navigation-php-functions.dev.js b/wp-admin/js/nav-menu-php-functions.dev.js similarity index 100% rename from wp-admin/js/custom-navigation-php-functions.dev.js rename to wp-admin/js/nav-menu-php-functions.dev.js diff --git a/wp-admin/js/custom-navigation-php-functions.js b/wp-admin/js/nav-menu-php-functions.js similarity index 100% rename from wp-admin/js/custom-navigation-php-functions.js rename to wp-admin/js/nav-menu-php-functions.js diff --git a/wp-admin/nav-menus.php b/wp-admin/nav-menus.php index 6b821d410..2f1fb69ac 100644 --- a/wp-admin/nav-menus.php +++ b/wp-admin/nav-menus.php @@ -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 ) { 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 );