Changeset 28183

Timestamp:

04/22/2014 06:20:54 PM (10 years ago)

Author:

wonderboymusic

Message:

Persisting <track> elements as the body of a [video] shortcode in MCE Views:

• When generating the view's HTML, ensure that the shortcode's content is added to the model
• Add a PostProcess event in the wpview plugin to properly return the shortcode when the editor mode is toggled, ensuring that elements in the body are not dropped.

Props azaozz, wonderboymusic.
See #27915.

Location:

trunk/src/wp-includes/js

Files:

• mce-view.js (modified) (1 diff)
• tinymce/plugins/wpview/plugin.js (modified) (1 diff)

trunk/src/wp-includes/js/mce-view.js

@@ -484 +484 @@
          */
         getHtml: function() {
-            var attrs = _.defaults(
-                this.shortcode.attrs.named,
-                wp.media[ this.shortcode.tag ].defaults
-            );
-            return this.template({ model: attrs });
+            var attrs = this.shortcode.attrs.named;
+            attrs.content = this.shortcode.content;
+
+            return this.template({ model: _.defaults(
+                attrs,
+                wp.media[ this.shortcode.tag ].defaults )
+            });
         },
 

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

@@ -333 +333 @@
             // Empty the wrap node
             if ( 'textContent' in node ) {
-                node.textContent = '';
+                node.textContent = '\u00a0';
             } else {
-                node.innerText = '';
-            }
-
-            // This makes all views into block tags (as we use <div>).
-            // Can use 'PostProcess' and a regex instead.
-            dom.replace( dom.create( 'p', null, window.decodeURIComponent( dom.getAttrib( node, 'data-wpview-text' ) ) ), node );
+                node.innerText = '\u00a0';
+            }
         });
     });
+
+    editor.on( 'PostProcess', function( event ) {
+        if ( event.content ) {
+            event.content = event.content.replace( /<div [^>]*?data-wpview-text="([^"]*)"[^>]*>[\s\S]*?<\/div>/g, function( match, shortcode ) {
+                if ( shortcode ) {
+                    return '<p>' + window.decodeURIComponent( shortcode ) + '</p>';
+                }
+                return ''; // If error, remove the view wrapper
+            });
+        }
+    });
 
     editor.on( 'keydown', function( event ) {