Changeset 27525

Timestamp:

03/13/2014 07:40:15 PM (11 years ago)

Author:

ocean90

Message:

Widget Customizer: Move style/script registration to script loader. Update Gruntfile.js.

fixes #27356.

Location:

trunk

Files:

• Gruntfile.js (modified) (1 diff)
• src/wp-includes/class-wp-customize-widgets.php (modified) (2 diffs)
• src/wp-includes/script-loader.php (modified) (3 diffs)

trunk/Gruntfile.js

@@ -116 +116 @@
         cssmin: {
             options: {
-                'wp-admin': ['wp-admin', 'color-picker', 'customize-controls', 'ie', 'install', 'login', 'deprecated-*']
+                'wp-admin': ['wp-admin', 'color-picker', 'customize-controls', 'customize-widgets', 'ie', 'install', 'login', 'deprecated-*']
             },
             core: {

trunk/src/wp-includes/class-wp-customize-widgets.php

@@ -458 +458 @@
      */
     static function customize_controls_enqueue_deps() {
-        wp_enqueue_script( 'jquery-ui-sortable' );
-        wp_enqueue_script( 'jquery-ui-droppable' );
-        wp_enqueue_style(
-            'widget-customizer',
-            admin_url( 'css/customize-widgets.css' )
-        );
-        wp_enqueue_script(
-            'widget-customizer',
-            admin_url( 'js/customize-widgets.js' ),
-            array( 'jquery', 'wp-backbone', 'wp-util', 'customize-controls' )
-        );
+        wp_enqueue_style( 'customize-widgets' );
+        wp_enqueue_script( 'customize-widgets' );
 
         // Export available widgets with control_tpl removed from model
@@ -534 +525 @@
 
         $wp_scripts->add_data(
-            'widget-customizer',
+            'customize-widgets',
             'data',
             sprintf( 'var WidgetCustomizer_exports = %s;', json_encode( $exports ) )

trunk/src/wp-includes/script-loader.php

@@ -378 +378 @@
         'allowedFiles' => __( 'Allowed Files' ),
     ) );
+
+    $scripts->add( 'customize-widgets', "/wp-admin/js/customize-widgets$suffix.js", array( 'jquery', 'jquery-ui-sortable', 'jquery-ui-droppable', 'wp-backbone', 'customize-controls' ), false, 1 );
 
     $scripts->add( 'accordion', "/wp-admin/js/accordion$suffix.js", array( 'jquery' ), false, 1 );
@@ -592 +594 @@
     $styles->add( 'wp-color-picker',    "/wp-admin/css/color-picker$suffix.css" );
     $styles->add( 'customize-controls', "/wp-admin/css/customize-controls$suffix.css", array( 'wp-admin', 'colors', 'ie', 'imgareaselect' ) );
+    $styles->add( 'customize-widgets',  "/wp-admin/css/customize-widgets$suffix.css", array( 'wp-admin', 'colors' ) );
     $styles->add( 'ie',                 "/wp-admin/css/ie$suffix.css" );
 
@@ -624 +627 @@
     $rtl_styles = array(
         // wp-admin
-        'wp-admin', 'install', 'wp-color-picker', 'customize-controls', 'ie',
+        'wp-admin', 'install', 'wp-color-picker', 'customize-controls', 'customize-widgets', 'ie',
         // wp-includes
         'buttons', 'admin-bar', 'wp-auth-check', 'editor-buttons', 'media-views', 'wp-pointer',