Ticket #42849: 42849.diff

src/wp-admin/js/widgets/custom-html-widgets.js

@@ -116 +116 @@
                  * Show linting error notice.
                  *
                  * @param {Array} errorAnnotations - Error annotations.
+                 * @param {Object} onChangeLintingErrors - codeEditorSettings.onChangeLintingErrors
                  * @returns {void}
                  */
-                updateErrorNotice: function( errorAnnotations ) {
+                updateErrorNotice: function( errorAnnotations, onChangeLintingErrors ) {
                         var control = this, errorNotice, message = '', customizeSetting;
 
                         if ( 1 === errorAnnotations.length ) {
@@ -142 +143 @@
                                 }
                         } else if ( 0 !== errorAnnotations.length ) {
                                 errorNotice = $( '<div class="inline notice notice-error notice-alt"></div>' );
-                                errorNotice.append( $( '<p></p>', {
-                                        text: message
-                                } ) );
+                                errorNotice.append(
+                                        $( '<p>', { text: message } ),
+                                        $( '<p><input type="checkbox"></p>' ).append(
+                                                $( '<label>', { text: component.l10n.dismissError } )
+                                        )
+                                );
                                 control.errorNoticeContainer.empty();
                                 control.errorNoticeContainer.append( errorNotice );
                                 control.errorNoticeContainer.slideDown( 'fast' );
                                 wp.a11y.speak( message );
+
+                                control.errorNoticeContainer.find( 'input[type=checkbox]' ).on( 'click', function() {
+                                        control.errorNoticeContainer.slideUp( 'fast' );
+                                        control.errorNoticeContainer.empty();
+                                        onChangeLintingErrors( [] );
+                                        if ( control.fields.content[0].setCustomValidity ) {
+                                                control.fields.content[0].setCustomValidity( '' );
+                                        }
+                                } );
                         } else {
                                 control.errorNoticeContainer.slideUp( 'fast' );
                         }
@@ -195 +208 @@
                                  */
                                 onChangeLintingErrors: function onChangeLintingErrors( errorAnnotations ) {
                                         control.currentErrorAnnotations = errorAnnotations;
+
+                                        if ( 0 === errorAnnotations.length ) {
+                                                control.saveButton.toggleClass( 'validation-blocked disabled', false );
+                                        }
                                 },
 
                                 /**
@@ -204 +221 @@
                                  * @returns {void}
                                  */
                                 onUpdateErrorNotice: function onUpdateErrorNotice( errorAnnotations ) {
-                                        control.saveButton.toggleClass( 'validation-blocked disabled', errorAnnotations.length );
-                                        control.updateErrorNotice( errorAnnotations );
+                                        control.saveButton.toggleClass( 'validation-blocked disabled', errorAnnotations.length > 0 );
+
+                                        // TODO: find a way to not pass down settings.onChangeLintingErrors
+                                        control.updateErrorNotice( errorAnnotations, settings.onChangeLintingErrors );
                                 }
                         });
 

src/wp-includes/widgets/class-wp-widget-custom-html.php

@@ -222 +222 @@
                                 /* translators: %d: error count */
                                 'plural'   => _n( 'There is %d error which must be fixed before you can save.', 'There are %d errors which must be fixed before you can save.', 2 ), // @todo This is lacking, as some languages have a dedicated dual form. For proper handling of plurals in JS, see #20491.
                         ),
+                        'dismissError' => _( 'Update anyway, even though it might break your site?' ),
                 );
                 wp_add_inline_script( 'custom-html-widgets', sprintf( 'jQuery.extend( wp.customHtmlWidgets.l10n, %s );', wp_json_encode( $l10n ) ), 'after' );
         }