Ticket #32856: 32856.patch

src/wp-admin/js/color-picker.js

@@ -160 +160 @@
                         $( 'body' ).trigger( 'click.wpcolorpicker' ).on( 'click.wpcolorpicker', this.close );
                 },
                 close: function() {
-                        this.element.hide().iris( 'toggle' );
+                        this.element.hide();
+                        // if iris hasn't already been destroyed
+                        if ( this.element.iris( 'instance' ) ) {
+                                this.element.iris( 'toggle' );
+                        }
                         this.button.addClass( 'hidden' );
                         this.wrap.removeClass( 'wp-picker-active' );
                         this.toggler.removeClass( 'wp-picker-open' );

tests/qunit/index.html

@@ -50 +50 @@
                 <script type='text/javascript' src='../../src/wp-includes/js/jquery/ui/sortable.js'></script>
                 <script type='text/javascript' src='../../src/wp-includes/js/jquery/ui/draggable.js'></script>
                 <script type='text/javascript' src='../../src/wp-includes/js/jquery/ui/droppable.js'></script>
+                <script type='text/javascript' src='../../src/wp-includes/js/jquery/ui/slider.js'></script>
 
                 <script src="../../src/wp-admin/js/nav-menu.js"></script>
                 <script src="../../src/wp-admin/js/customize-nav-menus.js"></script>
                 <script src="../../src/wp-admin/js/customize-widgets.js"></script>
                 <script src="../../src/wp-admin/js/word-count.js"></script>
+                <script src="../../src/wp-admin/js/iris.min.js"></script>
+                <script src="../../src/wp-admin/js/color-picker.js"></script>
 
                 <!-- Unit tests -->
                 <script src="wp-admin/js/password-strength-meter.js"></script>
@@ -66 +69 @@
                 <script src="wp-admin/js/customize-nav-menus.js"></script>
                 <script src="wp-admin/js/customize-widgets.js"></script>
                 <script src="wp-admin/js/word-count.js"></script>
+                <script src="wp-admin/js/color-picker.js"></script>
 
                 <!-- Customizer templates for sections -->
                 <script type="text/html" id="tmpl-customize-section-default">

tests/qunit/wp-admin/js/color-picker.js

@@ +1 @@
+/* global jQuery */
+jQuery( function() {
+        module( 'color-picker', {
+                setup: function() {
+                        window.wpColorPickerL10n = window.wpColorPickerL10n || {
+                                clear: 'Clear',
+                                defaultString: 'Default',
+                                pick: 'Select Color',
+                                current: 'Current Color'
+                        };
+                        jQuery( document.body ).append( '<div id="color-picker-container" style="position:absolute; left:-1000px;"><input id="color-picker" name="color-picker" type="text"></div>' );
+                },
+                teardown: function() {
+                        jQuery( '#color-picker-container' ).remove();
+                }
+        } );
+
+        // #32856
+        test( 'close should check that iris hasn\'t been destroyed before toggling it', function() {
+
+                var $input = jQuery( 'input#color-picker' );
+                $input.wpColorPicker();
+
+                $input.iris( 'destroy' );
+                notOk( $input.iris( 'instance' ) );
+
+                $input.wpColorPicker( 'close' );
+                notOk( $input.wpColorPicker( 'instance' ).toggler.hasClass( 'wp-picker-open' ), 'close completed' );
+        });
+});