Changeset 30435

Timestamp:

11/20/2014 01:48:20 PM (12 years ago)

Author:

nacin

Message:

TinyMCE: Verify HTML in captions. props azaozz

File:

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

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

@@ -1 +1 @@
 /* global tinymce */
 tinymce.PluginManager.add( 'wpeditimage', function( editor ) {
-        var DOM = tinymce.DOM,
+        var tb, serializer,
+                DOM = tinymce.DOM,
                 settings = editor.settings,
                 Factory = tinymce.ui.Factory,
@@ -7 +8 @@
                 iOS = tinymce.Env.iOS,
                 toolbarIsHidden = true,
-                editorWrapParent = tinymce.$( '#postdivrich' ),
-                tb;
+                editorWrapParent = tinymce.$( '#postdivrich' );
 
         function isPlaceholder( node ) {
@@ -560 +560 @@
         }
 
+        // 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,
@@ -637 +650 @@
 
                 if ( imageData.caption ) {
+                        imageData.caption = verifyHTML( imageData.caption );
 
                         id = imageData.attachment_id ? 'attachment_' + imageData.attachment_id : null;
@@ -859 +873 @@
                                 // Convert remaining line breaks to <br>
                                 caption = caption.replace( /(<br[^>]*>)\s*\n\s*/g, '$1' ).replace( /\s*\n\s*/g, '<br />' );
+                                caption = verifyHTML( caption );
                         }