From a247452cbba48f69b12f7b8fe10c1448536a2487 Mon Sep 17 00:00:00 2001
From: "Dominik Schilling (ocean90)" <ocean90@git.wordpress.org>
Date: Thu, 13 Mar 2014 19:40:15 +0000
Subject: [PATCH] Widget Customizer: Move style/script registration to script
 loader. Update Gruntfile.js.

fixes #27356.

git-svn-id: https://develop.svn.wordpress.org/trunk@27525 602fd350-edb4-49c9-b593-d223f7449a82
---
 Gruntfile.js                                   |  2 +-
 src/wp-includes/class-wp-customize-widgets.php | 15 +++------------
 src/wp-includes/script-loader.php              |  5 ++++-
 3 files changed, 8 insertions(+), 14 deletions(-)

diff --git a/Gruntfile.js b/Gruntfile.js
index 94ad316b00..04731e8140 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -115,7 +115,7 @@ module.exports = function(grunt) {
 		},
 		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: {
 				expand: true,
diff --git a/src/wp-includes/class-wp-customize-widgets.php b/src/wp-includes/class-wp-customize-widgets.php
index 98f023e937..2182ca1638 100644
--- a/src/wp-includes/class-wp-customize-widgets.php
+++ b/src/wp-includes/class-wp-customize-widgets.php
@@ -457,17 +457,8 @@ class WP_Customize_Widgets {
 	 * @action customize_controls_enqueue_scripts
 	 */
 	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
 		// since plugins need templates to be in the DOM
@@ -533,7 +524,7 @@ class WP_Customize_Widgets {
 		}
 
 		$wp_scripts->add_data(
-			'widget-customizer',
+			'customize-widgets',
 			'data',
 			sprintf( 'var WidgetCustomizer_exports = %s;', json_encode( $exports ) )
 		);
diff --git a/src/wp-includes/script-loader.php b/src/wp-includes/script-loader.php
index b8dfa714f1..b212d9048e 100644
--- a/src/wp-includes/script-loader.php
+++ b/src/wp-includes/script-loader.php
@@ -378,6 +378,8 @@ function wp_default_scripts( &$scripts ) {
 		'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 );
 
 	$scripts->add( 'shortcode', "/wp-includes/js/shortcode$suffix.js", array( 'underscore' ), false, 1 );
@@ -591,6 +593,7 @@ function wp_default_styles( &$styles ) {
 	$styles->add( 'install',            "/wp-admin/css/install$suffix.css", array( 'buttons', 'open-sans' ) );
 	$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" );
 
 	$styles->add_data( 'ie', 'conditional', 'lte IE 7' );
@@ -623,7 +626,7 @@ function wp_default_styles( &$styles ) {
 	// RTL CSS
 	$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',
 		'wp-jquery-ui-dialog',