From b698913b10922f6b99df697309a0252d05e1ee29 Mon Sep 17 00:00:00 2001
From: nacin <nacin@1a063a9b-81f0-0310-95a4-ce76da25c4cd>
Date: Wed, 30 May 2012 20:11:04 +0000
Subject: [PATCH] Move customize-controls CSS and JS to wp-admin. fixes #20785.

git-svn-id: http://core.svn.wordpress.org/trunk@20960 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 {wp-includes => wp-admin}/css/customize-controls.css     | 0
 {wp-includes => wp-admin}/css/customize-controls.dev.css | 0
 {wp-includes => wp-admin}/js/customize-controls.dev.js   | 0
 {wp-includes => wp-admin}/js/customize-controls.js       | 0
 wp-includes/script-loader.php                            | 4 ++--
 5 files changed, 2 insertions(+), 2 deletions(-)
 rename {wp-includes => wp-admin}/css/customize-controls.css (100%)
 rename {wp-includes => wp-admin}/css/customize-controls.dev.css (100%)
 rename {wp-includes => wp-admin}/js/customize-controls.dev.js (100%)
 rename {wp-includes => wp-admin}/js/customize-controls.js (100%)

diff --git a/wp-includes/css/customize-controls.css b/wp-admin/css/customize-controls.css
similarity index 100%
rename from wp-includes/css/customize-controls.css
rename to wp-admin/css/customize-controls.css
diff --git a/wp-includes/css/customize-controls.dev.css b/wp-admin/css/customize-controls.dev.css
similarity index 100%
rename from wp-includes/css/customize-controls.dev.css
rename to wp-admin/css/customize-controls.dev.css
diff --git a/wp-includes/js/customize-controls.dev.js b/wp-admin/js/customize-controls.dev.js
similarity index 100%
rename from wp-includes/js/customize-controls.dev.js
rename to wp-admin/js/customize-controls.dev.js
diff --git a/wp-includes/js/customize-controls.js b/wp-admin/js/customize-controls.js
similarity index 100%
rename from wp-includes/js/customize-controls.js
rename to wp-admin/js/customize-controls.js
diff --git a/wp-includes/script-loader.php b/wp-includes/script-loader.php
index 7ce9c698d..84a367102 100644
--- a/wp-includes/script-loader.php
+++ b/wp-includes/script-loader.php
@@ -300,7 +300,7 @@ function wp_default_scripts( &$scripts ) {
 	$scripts->add( 'customize-base',     "/wp-includes/js/customize-base$suffix.js",     array( 'jquery', 'json2' ), false, 1 );
 	$scripts->add( 'customize-loader',   "/wp-includes/js/customize-loader$suffix.js",   array( 'customize-base' ), false, 1 );
 	$scripts->add( 'customize-preview',  "/wp-includes/js/customize-preview$suffix.js",  array( 'customize-base' ), false, 1 );
-	$scripts->add( 'customize-controls', "/wp-includes/js/customize-controls$suffix.js", array( 'customize-base' ), false, 1 );
+	$scripts->add( 'customize-controls', "/wp-admin/js/customize-controls$suffix.js", array( 'customize-base' ), false, 1 );
 	$scripts->localize( 'customize-controls', '_wpCustomizeControlsL10n', array(
 		'activate'  => __( 'Save &amp; Activate' ),
 		'save'      => __( 'Save &amp; Publish' ),
@@ -486,7 +486,7 @@ function wp_default_styles( &$styles ) {
 	$styles->add( 'wp-jquery-ui-dialog', "/wp-includes/css/jquery-ui-dialog$suffix.css" );
 	$styles->add( 'editor-buttons', "/wp-includes/css/editor$suffix.css" );
 	$styles->add( 'wp-pointer', "/wp-includes/css/wp-pointer$suffix.css" );
-	$styles->add( 'customize-controls', "/wp-includes/css/customize-controls$suffix.css", array( 'wp-admin', 'colors', 'ie' ) );
+	$styles->add( 'customize-controls', "/wp-admin/css/customize-controls$suffix.css", array( 'wp-admin', 'colors', 'ie' ) );
 
 	foreach ( $rtl_styles as $rtl_style ) {
 		$styles->add_data( $rtl_style, 'rtl', true );