Changeset 35597

Timestamp:

11/10/2015 04:31:04 AM (9 years ago)

Author:

azaozz

Message:

TinyMCE: always remove trailing <br> added by WebKit browsers to the clipboard.

Fixes #34642.

File:

• trunk/src/wp-includes/js/tinymce/plugins/wordpress/plugin.js (modified) (2 diffs)

trunk/src/wp-includes/js/tinymce/plugins/wordpress/plugin.js

@@ -473 +473 @@
 
         if ( editor.getParam( 'wp_paste_filters', true ) ) {
-            if ( ! tinymce.Env.webkit ) {
-                // In WebKit handled by removeWebKitStyles()
-                editor.on( 'PastePreProcess', function( event ) {
+            editor.on( 'PastePreProcess', function( event ) {
+                // Remove trailing <br> added by WebKit browsers to the clipboard
+                event.content = event.content.replace( /<br class="?Apple-interchange-newline"?>/gi, '' );
+
+                // In WebKit this is handled by removeWebKitStyles()
+                if ( ! tinymce.Env.webkit ) {
                     // Remove all inline styles
                     event.content = event.content.replace( /(<[^>]+) style="[^"]*"([^>]*>)/gi, '$1$2' );
@@ -481 +484 @@
                     // Put back the internal styles
                     event.content = event.content.replace(/(<[^>]+) data-mce-style=([^>]+>)/gi, '$1 style=$2' );
-                });
-            }
+                }
+            });
 
             editor.on( 'PastePostProcess', function( event ) {