Changeset 13730

Timestamp:

03/17/2010 04:13:16 PM (15 years ago)

Author:

markjaquith

Message:

No need for three separate JS files if they are only ever enqueued together. see #11817

Location:

trunk

Files:

• wp-admin/js/nav-menu-default-items.dev.js (deleted)
• wp-admin/js/nav-menu-default-items.js (deleted)
• wp-admin/js/nav-menu-dynamic-functions.dev.js (deleted)
• wp-admin/js/nav-menu-dynamic-functions.js (deleted)
• wp-admin/js/nav-menu-php-functions.dev.js (deleted)
• wp-admin/js/nav-menu-php-functions.js (deleted)
• wp-admin/js/nav-menu.dev.js (added)
• wp-admin/js/nav-menu.js (added)
• wp-admin/nav-menus.php (modified) (1 diff)
• wp-includes/script-loader.php (modified) (2 diffs)

trunk/wp-admin/nav-menus.php

@@ -28 +28 @@
 
 // Nav Menu functions
-wp_enqueue_script( 'nav-menu-dynamic-functions' );
-wp_enqueue_script( 'nav-menu-default-items' );
-wp_enqueue_script( 'nav-menu-php-functions' );
+wp_enqueue_script( 'nav-menu' );
 
 // Metaboxes

trunk/wp-includes/script-loader.php

@@ -398 +398 @@
 
         // Custom Navigation
-        $scripts->add( 'nav-menu-default-items', "/wp-admin/js/nav-menu-default-items$suffix.js", false, '20100315' );
-        $scripts->add( 'nav-menu-dynamic-functions', "/wp-admin/js/nav-menu-dynamic-functions$suffix.js", false, '20100315' );
-        $scripts->localize( 'nav-menu-dynamic-functions', 'navMenuL10n', array(
+        $scripts->add( 'nav-menu', "/wp-admin/js/nav-menu$suffix.js", false, '20100315' );
+        $scripts->localize( 'nav-menu', 'navMenuL10n', array(
             'custom' => _x('Custom', 'menu nav item type'),
             'page' => _x('Page', 'menu nav item type'),
@@ -408 +407 @@
             'warnDelete' => __( "You are about to permanently delete this menu. \n 'Cancel' to stop, 'OK' to delete." ),
         ) );
-        
-        $scripts->add( 'nav-menu-php-functions', "/wp-admin/js/nav-menu-php-functions$suffix.js", false, '20100220' );
     }
 }