Changeset 41739

Timestamp:

10/04/2017 04:48:50 PM (9 years ago)

Author:

westonruter

Message:

Customize: Fix theme details modal by updating logic in getPreviousTheme and getNextTheme to not rely on DOM traversal and manually constructing control IDs.

Amends [41726].
See #42083, #37661.

File:

• trunk/src/wp-admin/js/customize-controls.js (modified) (2 diffs)

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

@@ -2209 +2209 @@
                  * @since 4.2.0
                  *
-                 * @returns {object|boolean} Next theme.
+                 * @returns {wp.customize.ThemeControl|boolean} Next theme.
                  */
                 getNextTheme: function () {
-                        var section = this, control, next;
-                        control = api.control( section.params.action + '_theme_' + this.currentTheme );
-                        next = control.container.next( 'li.customize-control-theme' );
-                        if ( ! next.length ) {
+                        var section = this, control, nextControl, sectionControls, i;
+                        control = api.control( section.params.action + '_theme_' + section.currentTheme );
+                        sectionControls = section.controls();
+                        i = _.indexOf( sectionControls, control );
+                        if ( -1 === i ) {
                                 return false;
                         }
-                        next = next[0].id.replace( 'customize-control-theme-' + section.params.action, section.params.action + '_theme' );
-                        control = api.control( next );
-
-                        return control.params.theme;
+
+                        nextControl = sectionControls[ i + 1 ];
+                        if ( ! nextControl ) {
+                                return false;
+                        }
+                        return nextControl.params.theme;
                 },
 
@@ -2243 +2246 @@
                  *
                  * @since 4.2.0
-                 * @returns {object|boolean} Previous theme.
+                 * @returns {wp.customize.ThemeControl|boolean} Previous theme.
                  */
                 getPreviousTheme: function () {
-                        var section = this, control, previous;
-                        control = api.control( section.params.action + '_theme_' + this.currentTheme );
-                        previous = control.container.prev( 'li.customize-control-theme' );
-                        if ( ! previous.length ) {
+                        var section = this, control, nextControl, sectionControls, i;
+                        control = api.control( section.params.action + '_theme_' + section.currentTheme );
+                        sectionControls = section.controls();
+                        i = _.indexOf( sectionControls, control );
+                        if ( -1 === i ) {
                                 return false;
                         }
-                        previous = previous[0].id.replace( 'customize-control-theme-' + section.params.action, section.params.action + '_theme' );
-                        control = api.control( previous );
-
-                        return control.params.theme;
+
+                        nextControl = sectionControls[ i - 1 ];
+                        if ( ! nextControl ) {
+                                return false;
+                        }
+                        return nextControl.params.theme;
                 },