Changeset 13269

Timestamp:

02/21/2010 12:10:20 AM (15 years ago)

Author:

ryan

Message:

Use core jQuery UI. see #11817

Location:

trunk

Files:

• wp-admin/custom-navigation.php (modified) (1 diff)
• wp-admin/js/custom-navigation-custom-jquery-ui-1.7.2.dev.js (deleted)
• wp-admin/js/custom-navigation-custom-jquery-ui-1.7.2.js (deleted)
• wp-includes/script-loader.php (modified) (1 diff)

trunk/wp-admin/custom-navigation.php

@@ -15 +15 @@
 wp_admin_css( 'custom-navigation' );
 wp_enqueue_script( 'jquery' );
-wp_enqueue_script( 'custom-navigation-ui-custom' );
+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( 'jquery-autocomplete' );
 wp_enqueue_script( 'custom-navigation-php-functions' );
-wp_enqueue_script( 'jquery-ui-dialog' );
+
 
 require_once('admin-header.php');

trunk/wp-includes/script-loader.php

@@ -397 +397 @@
         ) );
 
+        // Custom Navigation
+        $scripts->add( 'custom-navigation-default-items', "/wp-admin/js/custom-navigation-default-items$suffix.js", false, '20100220' );
+        $scripts->add( 'custom-navigation-dynamic-functions', "/wp-admin/js/custom-navigation-dynamic-functions$suffix.js", false, '20100220' );
+        $scripts->add( 'custom-navigation-php-functions', "/wp-admin/js/custom-navigation-php-functions$suffix.js", false, '20100220' );
     }
-
-    //Custom Navigation
-
-    $scripts->add( 'custom-navigation-ui-custom', '/wp-admin/js/custom-navigation-custom-jquery-ui-1.7.2.js', array('jquery'), '1.7.2' );
-    $scripts->add_data( 'custom-navigation-ui-custom', 'group', 1 );
-
-    $scripts->add( 'custom-navigation-default-items', "/wp-admin/js/custom-navigation-default-items$suffix.js", false, '20100220' );
-    $scripts->add( 'custom-navigation-dynamic-functions', "/wp-admin/js/custom-navigation-dynamic-functions$suffix.js", false, '20100220' );
-    $scripts->add( 'custom-navigation-php-functions', "/wp-admin/js/custom-navigation-php-functions$suffix.js", false, '20100220' );
-
 }