Changeset 27654

Timestamp:

03/22/2014 09:21:36 PM (11 years ago)

Author:

ocean90

Message:

Widget Customizer: Use Underscores indexOf for IE8 compatibility.

props adamsilverstein.
see #27485.

File:

• trunk/src/wp-admin/js/customize-widgets.js (modified) (8 diffs)

trunk/src/wp-admin/js/customize-widgets.js

@@ -224 +224 @@
                 // Sort widget controls to their new positions
                 widget_form_controls.sort( function ( a, b ) {
-                    var a_index = new_widget_ids.indexOf( a.params.widget_id ),
-                        b_index = new_widget_ids.indexOf( b.params.widget_id );
+                    var a_index = _.indexOf( new_widget_ids, a.params.widget_id ),
+                        b_index = _.indexOf( new_widget_ids, b.params.widget_id );
                     if ( a_index === b_index ) {
                         return 0;
@@ -262 +262 @@
                         // Check if the widget is in another sidebar
                         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;
                             }
                             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 ) {
                                 is_present_in_another_sidebar = true;
@@ -572 +572 @@
                     return;
                 }
-                if ( 0 !== other_setting.id.indexOf( 'sidebars_widgets[' ) ) {
+                if ( 0 !== _.indexOf( other_setting.id, 'sidebars_widgets[' ) ) {
                     return;
                 }
                 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 ) {
                     other_sidebar_widgets.splice( i );
@@ -585 +585 @@
             // Add widget to this sidebar
             sidebar_widgets = control.setting().slice();
-            if ( -1 === sidebar_widgets.indexOf( widget_id ) ) {
+            if ( -1 === _.indexOf( sidebar_widgets, widget_id ) ) {
                 sidebar_widgets.push( widget_id );
                 control.setting( sidebar_widgets );
@@ -755 +755 @@
             // Reposition whenever a sidebar's widgets are changed
             wp.customize.each( function ( setting ) {
-                if ( 0 === setting.id.indexOf( 'sidebars_widgets[' ) ) {
+                if ( 0 === _.indexOf( setting.id, 'sidebars_widgets[' ) ) {
                     setting.bind( function () {
                         if ( control.container.hasClass( 'expanded' ) ) {
@@ -1055 +1055 @@
                     }
                     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 ) {
                         throw new Error( 'Widget is not in sidebar' );
@@ -1439 +1439 @@
 
             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 ) {
                 throw new Error( 'Widget was unexpectedly not present in the sidebar.' );
@@ -1579 +1579 @@
         // @todo this can use widget_id_to_setting_id(), then pass into wp.customize.control( x ).getSidebarWidgetsControl()
         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;
             }