Ticket #40974: 40974.3.diff

src/wp-admin/js/widgets.js

@@ -41 +41 @@
                 $(document.body).bind('click.widgets-toggle', function(e) {
                         var target = $(e.target),
                                 css = { 'z-index': 100 },
-                                widget, inside, targetWidth, widgetWidth, margin,
+                                inside, targetWidth, widgetWidth, margin,
+                                widget = target.closest('div.widget'),
                                 toggleBtn = target.closest( '.widget' ).find( '.widget-top button.widget-action' );
 
                         if ( target.parents('.widget-top').length && ! target.parents('#available-widgets').length ) {
-                                widget = target.closest('div.widget');
                                 inside = widget.children('.widget-inside');
                                 targetWidth = parseInt( widget.find('input.widget-width').val(), 10 ),
                                 widgetWidth = widget.parent().width();
@@ -82 +82 @@
                                 }
                                 e.preventDefault();
                         } else if ( target.hasClass('widget-control-save') ) {
+                                $document.trigger( 'wp-widget-before-save', widget );
                                 wpWidgets.save( target.closest('div.widget'), 0, 1, 0 );
                                 e.preventDefault();
                         } else if ( target.hasClass('widget-control-remove') ) {

src/wp-admin/js/widgets/text-widgets.js

@@ -230 +230 @@
 
                                         // If a prior mce instance was replaced, and it was in text mode, toggle to text mode.
                                         if ( restoreTextMode ) {
-                                                switchEditors.go( id, 'toggle' );
+                                                switchEditors.go( id, 'html' );
                                         }
 
                                         // Show the pointer.
@@ -269 +269 @@
                                 }
 
                                 control.editorFocused = false;
-                                triggerChangeIfDirty = function() {
+
+                                triggerChangeIfDirty = function( event ) {
                                         var updateWidgetBuffer = 300; // See wp.customize.Widgets.WidgetControl._setupUpdateUI() which uses 250ms for updateWidgetDebounced.
-                                        if ( editor.isDirty() ) {
+                                        if ( editor.isDirty() || ( event && event.type === 'paste' ) ) {
 
                                                 /*
                                                  * Account for race condition in customizer where user clicks Save & Publish while
@@ -296 +297 @@
                                                 textarea.trigger( 'change' );
                                         }
                                 };
-                                editor.on( 'focus', function() {
+                                editor.on( 'focus', function onEditorFocus() {
                                         control.editorFocused = true;
                                 });
+                                editor.on( 'paste', function onEditorPaste( event ) {
+                                        triggerChangeIfDirty( event );
+                                });
                                 editor.on( 'NodeChange', _.debounce( triggerChangeIfDirty, changeDebounceDelay ) );
-                                editor.on( 'blur', function() {
+                                editor.on( 'blur hide', function onEditorBlur( event ) {
                                         control.editorFocused = false;
-                                        triggerChangeIfDirty();
+                                        triggerChangeIfDirty( event );
                                 });
 
                                 control.editor = editor;
@@ -309 +313 @@
                         }
 
                         buildEditor();
+
+                        // Force-update the hidden input fields.
+                        $( document ).on( 'wp-widget-before-save', function( event, widget ) {
+                                var $widget = $( widget );
+
+                                $widget.find( '.widget-content input.title' ).val( control.fields.title.val() );
+                                $widget.find( '.widget-content input.text' ).val( control.fields.text.val() );
+                        });
                 }
         });