Changeset 30437

Timestamp:

11/20/2014 01:51:34 PM (10 years ago)

Author:

nacin

Message:

TinyMCE: Verify HTML in captions. props azaozz

Merges [30435] to the 3.9 branch.

Location:

branches/3.9

Files:

• . (modified) (1 prop)
• src/wp-includes/js/tinymce/plugins/wpeditimage/plugin.js (modified) (4 diffs)

branches/3.9/src/wp-includes/js/tinymce/plugins/wpeditimage/plugin.js

@@ -1 +1 @@
 /* global tinymce */
 tinymce.PluginManager.add( 'wpeditimage', function( editor ) {
-    var toolbarActive = false;
+    var serializer,
+        toolbarActive = false;
 
     function parseShortcode( content ) {
@@ -209 +210 @@
     }
 
+    // Verify HTML in captions
+    function verifyHTML( caption ) {
+        if ( ! caption || ( caption.indexOf( '<' ) === -1 && caption.indexOf( '>' ) === -1 ) ) {
+            return caption;
+        }
+
+        if ( ! serializer ) {
+            serializer = new tinymce.html.Serializer( {}, editor.schema );
+        }
+
+        return serializer.serialize( editor.parser.parse( caption, { forced_root_block: false } ) );
+    }
+
     function updateImage( imageNode, imageData ) {
         var classes, className, node, html, parent, wrap, linkNode,
@@ -286 +300 @@
 
         if ( imageData.caption ) {
+            imageData.caption = verifyHTML( imageData.caption );
 
             id = imageData.attachment_id ? 'attachment_' + imageData.attachment_id : null;
@@ -564 +579 @@
                 // Convert remaining line breaks to <br>
                 caption = caption.replace( /(<br[^>]*>)\s*\n\s*/g, '$1' ).replace( /\s*\n\s*/g, '<br />' );
+                caption = verifyHTML( caption );
             }