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

Widget Customizer: Use Underscores indexOf for IE8 compatibility.

Browse Source 
props adamsilverstein.
see #27485.

git-svn-id: https://develop.svn.wordpress.org/trunk@27654 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Dominik Schilling (ocean90) 2014-03-22 21:21:36 +00:00
parent 2a1899e319
commit 7ad1e0f1bb
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -223,8 +223,8 @@ var WidgetCustomizer = ( function ($) {
// Sort widget controls to their new positions // Sort widget controls to their new positions
widget_form_controls.sort( function ( a, b ) { widget_form_controls.sort( function ( a, b ) {
var a_index = new_widget_ids.indexOf( a.params.widget_id ), var a_index = _.indexOf( new_widget_ids, a.params.widget_id ),
b_index = new_widget_ids.indexOf( b.params.widget_id ); b_index = _.indexOf( new_widget_ids, b.params.widget_id );
if ( a_index === b_index ) { if ( a_index === b_index ) {
return 0; return 0;
} }
@ -261,12 +261,12 @@ var WidgetCustomizer = ( function ($) {
// Check if the widget is in another sidebar // Check if the widget is in another sidebar
wp.customize.each( function ( other_setting ) { wp.customize.each( function ( other_setting ) {
if ( other_setting.id === control.setting.id || 0 !== other_setting.id.indexOf( 'sidebars_widgets[' ) || other_setting.id === 'sidebars_widgets[wp_inactive_widgets]' ) { if ( other_setting.id === control.setting.id || 0 !== _.indexOf( other_setting.id, 'sidebars_widgets[' ) || other_setting.id === 'sidebars_widgets[wp_inactive_widgets]' ) {
return; return;
} }
var other_sidebar_widgets = other_setting(), i; var other_sidebar_widgets = other_setting(), i;
i = other_sidebar_widgets.indexOf( removed_widget_id ); i = _.indexOf( other_sidebar_widgets, removed_widget_id );
if ( -1 !== i ) { if ( -1 !== i ) {
is_present_in_another_sidebar = true; is_present_in_another_sidebar = true;
} }
@ -571,11 +571,11 @@ var WidgetCustomizer = ( function ($) {
if ( other_setting.id === control.setting.id ) { if ( other_setting.id === control.setting.id ) {
return; return;
} }
if ( 0 !== other_setting.id.indexOf( 'sidebars_widgets[' ) ) { if ( 0 !== _.indexOf( other_setting.id, 'sidebars_widgets[' ) ) {
return; return;
} }
var other_sidebar_widgets = other_setting().slice(), i; var other_sidebar_widgets = other_setting().slice(), i;
i = other_sidebar_widgets.indexOf( widget_id ); i = _.indexOf( other_sidebar_widgets, widget_id );
if ( -1 !== i ) { if ( -1 !== i ) {
other_sidebar_widgets.splice( i ); other_sidebar_widgets.splice( i );
other_setting( other_sidebar_widgets ); other_setting( other_sidebar_widgets );
@ -584,7 +584,7 @@ var WidgetCustomizer = ( function ($) {
// Add widget to this sidebar // Add widget to this sidebar
sidebar_widgets = control.setting().slice(); sidebar_widgets = control.setting().slice();
if ( -1 === sidebar_widgets.indexOf( widget_id ) ) { if ( -1 === _.indexOf( sidebar_widgets, widget_id ) ) {
sidebar_widgets.push( widget_id ); sidebar_widgets.push( widget_id );
control.setting( sidebar_widgets ); control.setting( sidebar_widgets );
} }
@ -754,7 +754,7 @@ var WidgetCustomizer = ( function ($) {
// Reposition whenever a sidebar's widgets are changed // Reposition whenever a sidebar's widgets are changed
wp.customize.each( function ( setting ) { wp.customize.each( function ( setting ) {
if ( 0 === setting.id.indexOf( 'sidebars_widgets[' ) ) { if ( 0 === _.indexOf( setting.id, 'sidebars_widgets[' ) ) {
setting.bind( function () { setting.bind( function () {
if ( control.container.hasClass( 'expanded' ) ) { if ( control.container.hasClass( 'expanded' ) ) {
position_widget(); position_widget();
@ -1054,7 +1054,7 @@ var WidgetCustomizer = ( function ($) {
throw new Error( 'Unable to find sidebars_widgets_control' ); throw new Error( 'Unable to find sidebars_widgets_control' );
} }
sidebar_widget_ids = sidebars_widgets_control.setting().slice(); sidebar_widget_ids = sidebars_widgets_control.setting().slice();
i = sidebar_widget_ids.indexOf( control.params.widget_id ); i = _.indexOf( sidebar_widget_ids, control.params.widget_id );
if ( -1 === i ) { if ( -1 === i ) {
throw new Error( 'Widget is not in sidebar' ); throw new Error( 'Widget is not in sidebar' );
} }
@ -1438,7 +1438,7 @@ var WidgetCustomizer = ( function ($) {
position; position;
sidebar_widget_ids = control.getSidebarWidgetsControl().setting(); sidebar_widget_ids = control.getSidebarWidgetsControl().setting();
position = sidebar_widget_ids.indexOf( control.params.widget_id ); position = _.indexOf( sidebar_widget_ids, control.params.widget_id );
if ( position === -1 ) { if ( position === -1 ) {
throw new Error( 'Widget was unexpectedly not present in the sidebar.' ); throw new Error( 'Widget was unexpectedly not present in the sidebar.' );
} }
@ -1578,7 +1578,7 @@ var WidgetCustomizer = ( function ($) {
var found_control = null; var found_control = null;
// @todo this can use widget_id_to_setting_id(), then pass into wp.customize.control( x ).getSidebarWidgetsControl() // @todo this can use widget_id_to_setting_id(), then pass into wp.customize.control( x ).getSidebarWidgetsControl()
wp.customize.control.each( function ( control ) { wp.customize.control.each( function ( control ) {
if ( control.params.type === 'sidebar_widgets' && -1 !== control.setting().indexOf( widget_id ) ) { if ( control.params.type === 'sidebar_widgets' && -1 !== _.indexOf( control.setting(), widget_id ) ) {
found_control = control; found_control = control;
} }
} ); } );