Changeset 28273

Timestamp:

05/06/2014 04:50:52 AM (11 years ago)

Author:

nacin

Message:

Fix persistence of <track> elements in the body of a [video] shotcode in TinyMCE views.

Merges [28183] and [28169] to the 3.9 branch.

props azaozz, wonderboymusic.
fixes #27915.

Location:

branches/3.9

Files:

• . (modified) (1 prop)
• src/wp-includes/css/media-views.css (modified) (1 diff)
• src/wp-includes/js/mce-view.js (modified) (1 diff)
• src/wp-includes/js/tinymce/plugins/wpview/plugin.js (modified) (1 diff)

branches/3.9/src/wp-includes/css/media-views.css

@@ -1782 +1782 @@
 }
 
-.media-embed .setting input.hidden {
+.media-embed .setting input.hidden,
+.media-embed .setting textarea.hidden {
     display: none;
 }

branches/3.9/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 )
+            });
         },
 

branches/3.9/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 ) {