sergiotarxz/Wordpress
sergiotarxz/Wordpress
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Widget Customizer: Move WidgetCustomizer to wp.customize.Widgets. First pass.

Browse Source 
see #27690.

git-svn-id: https://develop.svn.wordpress.org/trunk@27985 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Dominik Schilling (ocean90) 2014-04-07 09:03:18 +00:00
parent b0ba84a25c
commit da677f34aa
6 changed files with 618 additions and 660 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/wp-admin/css/customize-controls.css
View File

@ -490,6 +490,7 @@ body {
overflow: hidden; overflow: hidden;
-webkit-border-radius: 2px; -webkit-border-radius: 2px;
border: 1px solid #eee; border: 1px solid #eee;
-webkit-border-radius: 2px;
border-radius: 2px; border-radius: 2px;
} }

9
src/wp-admin/css/customize-widgets.css
View File

@ -108,13 +108,6 @@
display: none; display: none;
} }
/* MP6-compat */
#customize-theme-controls .accordion-section-content .widget {
color: black;
}
/** /**
* Widget reordering styles * Widget reordering styles
**/ **/
@ -326,7 +319,7 @@
body.adding-widget .add-new-widget, body.adding-widget .add-new-widget,
body.adding-widget .add-new-widget:hover { body.adding-widget .add-new-widget:hover {
background: #EEE; background: #eee;
border-color: #999; border-color: #999;
color: #333; color: #333;
-webkit-box-shadow: inset 0 2px 5px -3px rgba(0, 0, 0, 0.5); -webkit-box-shadow: inset 0 2px 5px -3px rgba(0, 0, 0, 0.5);

1205
src/wp-admin/js/customize-widgets.js
View File

File diff suppressed because it is too large Load Diff

9
src/wp-includes/class-wp-customize-control.php
View File

@ -917,12 +917,12 @@ class WP_Widget_Area_Customize_Control extends WP_Customize_Control {
public function render_content() { public function render_content() {
?> ?>
<span class="button-secondary add-new-widget" tabindex="0"> <span class="button-secondary add-new-widget" tabindex="0">
<?php esc_html_e( 'Add a Widget' ); ?> <?php _e( 'Add a Widget' ); ?>
</span> </span>
<span class="reorder-toggle" tabindex="0"> <span class="reorder-toggle" tabindex="0">
<span class="reorder"><?php esc_html_e( 'Reorder' ); ?></span> <span class="reorder"><?php _ex( 'Reorder', 'Reorder widgets in Customizer' ); ?></span>
<span class="reorder-done"><?php esc_html_e( 'Done' ); ?></span> <span class="reorder-done"><?php _ex( 'Done', 'Cancel reordering widgets in Customizer' ); ?></span>
</span> </span>
<?php <?php
} }
@ -940,11 +940,10 @@ class WP_Widget_Form_Customize_Control extends WP_Customize_Control {
public $width; public $width;
public $height; public $height;
public $is_wide = false; public $is_wide = false;
public $is_live_previewable = false;
public function to_json() { public function to_json() {
parent::to_json(); parent::to_json();
$exported_properties = array( 'widget_id', 'widget_id_base', 'sidebar_id', 'width', 'height', 'is_wide', 'is_live_previewable' ); $exported_properties = array( 'widget_id', 'widget_id_base', 'sidebar_id', 'width', 'height', 'is_wide' );
foreach ( $exported_properties as $key ) { foreach ( $exported_properties as $key ) {
$this->json[ $key ] = $this->$key; $this->json[ $key ] = $this->$key;
} }

50
src/wp-includes/class-wp-customize-widgets.php
View File

@ -406,8 +406,6 @@ final class WP_Customize_Widgets {
$setting_id = $this->get_setting_id( $widget_id ); $setting_id = $this->get_setting_id( $widget_id );
$id_base = $GLOBALS['wp_registered_widget_controls'][$widget_id]['id_base']; $id_base = $GLOBALS['wp_registered_widget_controls'][$widget_id]['id_base'];
assert( false !== is_active_widget( $registered_widget['callback'], $registered_widget['id'], false, false ) );
$control = new WP_Widget_Form_Customize_Control( $this->manager, $setting_id, array( $control = new WP_Widget_Form_Customize_Control( $this->manager, $setting_id, array(
'label' => $registered_widget['name'], 'label' => $registered_widget['name'],
'section' => $section_id, 'section' => $section_id,
@ -599,8 +597,8 @@ final class WP_Customize_Widgets {
$move_widget_area_tpl = str_replace( $move_widget_area_tpl = str_replace(
array( '{description}', '{btn}' ), array( '{description}', '{btn}' ),
array( array(
( 'Select an area to move this widget into:' ), // @todo translate __( 'Select an area to move this widget into:' ),
esc_html_x( 'Move', 'move widget' ), _x( 'Move', 'Move widget' ),
), ),
'<div class="move-widget-area"> '<div class="move-widget-area">
<p class="description">{description}</p> <p class="description">{description}</p>
@ -615,39 +613,34 @@ final class WP_Customize_Widgets {
</div>' </div>'
); );
/*
* Why not wp_localize_script? Because we're not localizing,
* and it forces values into strings.
*/
global $wp_scripts; global $wp_scripts;
$exports = array( $settings = array(
'nonce' => wp_create_nonce( 'update-widget' ), 'nonce' => wp_create_nonce( 'update-widget' ),
'registered_sidebars' => array_values( $GLOBALS['wp_registered_sidebars'] ), 'registeredSidebars' => array_values( $GLOBALS['wp_registered_sidebars'] ),
'registered_widgets' => $GLOBALS['wp_registered_widgets'], 'registeredWidgets' => $GLOBALS['wp_registered_widgets'],
'available_widgets' => $available_widgets, // @todo Merge this with registered_widgets 'availableWidgets' => $available_widgets, // @todo Merge this with registered_widgets
'i18n' => array( 'l10n' => array(
'save_btn_label' => __( 'Apply' ), 'saveBtnLabel' => __( 'Apply' ),
// @todo translate? do we want these tooltips? 'saveBtnTooltip' => __( 'Save and preview changes before publishing them.' ),
'save_btn_tooltip' => ( 'Save and preview changes before publishing them.' ), 'removeBtnLabel' => __( 'Remove' ),
'remove_btn_label' => __( 'Remove' ), 'removeBtnTooltip' => __( 'Trash widget by moving it to the inactive widgets sidebar.' ),
'remove_btn_tooltip' => ( 'Trash widget by moving it to the inactive widgets sidebar.' ), 'error' => __( 'An error has occurred. Please reload the page and try again.' ),
'error' => __( 'An error has occurred. Please reload the page and try again.' ),
), ),
'tpl' => array( 'tpl' => array(
'widget_reorder_nav' => $widget_reorder_nav_tpl, 'widgetReorderNav' => $widget_reorder_nav_tpl,
'move_widget_area' => $move_widget_area_tpl, 'moveWidgetArea' => $move_widget_area_tpl,
), ),
); );
foreach ( $exports['registered_widgets'] as &$registered_widget ) { foreach ( $settings['registeredWidgets'] as &$registered_widget ) {
unset( $registered_widget['callback'] ); // may not be JSON-serializeable unset( $registered_widget['callback'] ); // may not be JSON-serializeable
} }
$wp_scripts->add_data( $wp_scripts->add_data(
'customize-widgets', 'customize-widgets',
'data', 'data',
sprintf( 'var WidgetCustomizer_exports = %s;', json_encode( $exports ) ) sprintf( 'var _wpCustomizeWidgetsSettings = %s;', json_encode( $settings ) )
); );
} }
@ -662,12 +655,12 @@ final class WP_Customize_Widgets {
<div id="widgets-left"><!-- compatibility with JS which looks for widget templates here --> <div id="widgets-left"><!-- compatibility with JS which looks for widget templates here -->
<div id="available-widgets"> <div id="available-widgets">
<div id="available-widgets-filter"> <div id="available-widgets-filter">
<label class="screen-reader-text" for="widgets-search"><?php _e( 'Find Widgets' ); ?></label> <label class="screen-reader-text" for="widgets-search"><?php _e( 'Search Widgets' ); ?></label>
<input type="search" id="widgets-search" placeholder="<?php esc_attr_e( 'Find widgets&hellip;' ) ?>" /> <input type="search" id="widgets-search" placeholder="<?php esc_attr_e( 'Search widgets&hellip;' ) ?>" />
</div> </div>
<?php foreach ( $this->get_available_widgets() as $available_widget ): ?> <?php foreach ( $this->get_available_widgets() as $available_widget ): ?>
<div id="widget-tpl-<?php echo esc_attr( $available_widget['id'] ) ?>" data-widget-id="<?php echo esc_attr( $available_widget['id'] ) ?>" class="widget-tpl <?php echo esc_attr( $available_widget['id'] ) ?>" tabindex="0"> <div id="widget-tpl-<?php echo esc_attr( $available_widget['id'] ) ?>" data-widget-id="<?php echo esc_attr( $available_widget['id'] ) ?>" class="widget-tpl <?php echo esc_attr( $available_widget['id'] ) ?>" tabindex="0">
<?php echo $available_widget['control_tpl']; // xss ok ?> <?php echo $available_widget['control_tpl']; ?>
</div> </div>
<?php endforeach; ?> <?php endforeach; ?>
</div><!-- #available-widgets --> </div><!-- #available-widgets -->
@ -826,6 +819,7 @@ final class WP_Customize_Widgets {
$available_widgets[] = $available_widget; $available_widgets[] = $available_widget;
} }
return $available_widgets; return $available_widgets;
} }

4
src/wp-includes/js/customize-preview-widgets.js
View File

@ -1,4 +1,4 @@
(function( $, wp ){ (function( wp, $ ){
if ( ! wp || ! wp.customize ) { return; } if ( ! wp || ! wp.customize ) { return; }
@ -124,4 +124,4 @@
api.WidgetCustomizerPreview.init(); api.WidgetCustomizerPreview.init();
}); });
})( jQuery, window.wp ); })( window.wp, jQuery );