<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[28084] trunk/src/wp-includes/js: TinyMCE wpViews:</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://core.trac.wordpress.org/changeset/28084">28084</a></dd>
<dt>Author</dt> <dd>azaozz</dd>
<dt>Date</dt> <dd>2014-04-12 00:45:48 +0000 (Sat, 12 Apr 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>TinyMCE wpViews:
- Prevent undo steps from being added when the body of a wpview changes.
- Add unbind() to handle cleanup on DOM rebuilding in TinyMCE.
- Ensure that MediaElement's cleanup routine is run on every player in all instances of the editor.
- Initialize the players after some delay to ensure CSS is loaded.
Props gcorne and wonderboymusic, fixes <a href="http://core.trac.wordpress.org/ticket/27389">#27389</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpincludesjsmceviewjs">trunk/src/wp-includes/js/mce-view.js</a></li>
<li><a href="#trunksrcwpincludesjsmediaaudiovideojs">trunk/src/wp-includes/js/media-audiovideo.js</a></li>
<li><a href="#trunksrcwpincludesjstinymcepluginswpviewpluginjs">trunk/src/wp-includes/js/tinymce/plugins/wpview/plugin.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpincludesjsmceviewjs"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-includes/js/mce-view.js (28083 => 28084)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/js/mce-view.js 2014-04-12 00:00:32 UTC (rev 28083)
+++ trunk/src/wp-includes/js/mce-view.js 2014-04-12 00:45:48 UTC (rev 28084)
</span><span class="lines">@@ -41,12 +41,15 @@
</span><span class="cx"> doc = editor.getDoc();
</span><span class="cx"> $( doc ).find( '[data-wpview-text="' + this.encodedText + '"]' ).each(function (i, elem) {
</span><span class="cx"> var node = $( elem );
</span><del>- node.html( html );
</del><ins>+ // The <ins> is used to mark the end of the wrapper div. Needed when comparing
+ // the content as string for preventing extra undo levels.
+ node.html( html ).append( '<ins data-wpview-end="1"></ins>' );
</ins><span class="cx"> $( self ).trigger( 'ready', elem );
</span><span class="cx"> });
</span><span class="cx"> }
</span><span class="cx"> }, this );
</span><del>- }
</del><ins>+ },
+ unbind: function() {}
</ins><span class="cx"> } );
</span><span class="cx">
</span><span class="cx"> // take advantage of the Backbone extend method
</span><span class="lines">@@ -93,6 +96,17 @@
</span><span class="cx"> },
</span><span class="cx">
</span><span class="cx"> /**
</span><ins>+ * wp.mce.views.unbind( editor )
+ *
+ * The editor DOM is being rebuilt, run cleanup.
+ */
+ unbind: function() {
+ _.each( instances, function( instance ) {
+ instance.unbind();
+ } );
+ },
+
+ /**
</ins><span class="cx"> * toViews( content )
</span><span class="cx"> * Scans a `content` string for each view's pattern, replacing any
</span><span class="cx"> * matches with wrapper elements, and creates a new instance for
</span><span class="lines">@@ -339,6 +353,7 @@
</span><span class="cx"> * @mixin
</span><span class="cx"> */
</span><span class="cx"> wp.mce.media = {
</span><ins>+ loaded: false,
</ins><span class="cx"> /**
</span><span class="cx"> * @global wp.shortcode
</span><span class="cx"> *
</span><span class="lines">@@ -410,6 +425,7 @@
</span><span class="cx"> */
</span><span class="cx"> wp.mce.media.View = wp.mce.View.extend({
</span><span class="cx"> initialize: function( options ) {
</span><ins>+ this.players = [];
</ins><span class="cx"> this.shortcode = options.shortcode;
</span><span class="cx"> _.bindAll( this, 'setPlayer' );
</span><span class="cx"> $(this).on( 'ready', this.setPlayer );
</span><span class="lines">@@ -460,8 +476,9 @@
</span><span class="cx"> media = wp.media.view.MediaDetails.prepareSrc( media.get(0) );
</span><span class="cx">
</span><span class="cx"> setTimeout( function() {
</span><del>- self.player = new MediaElementPlayer( media, this.mejsSettings );
- }, 75 );
</del><ins>+ wp.mce.media.loaded = true;
+ self.players.push( new MediaElementPlayer( media, self.mejsSettings ) );
+ }, wp.mce.media.loaded ? 10 : 500 );
</ins><span class="cx"> },
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="lines">@@ -475,6 +492,15 @@
</span><span class="cx"> wp.media[ this.shortcode.tag ].defaults
</span><span class="cx"> );
</span><span class="cx"> return this.template({ model: attrs });
</span><ins>+ },
+
+ unbind: function() {
+ var self = this;
+ this.pauseAllPlayers();
+ _.each( this.players, function (player) {
+ self.removePlayer( player );
+ } );
+ this.players = [];
</ins><span class="cx"> }
</span><span class="cx"> });
</span><span class="cx"> _.extend( wp.mce.media.View.prototype, wp.media.mixin );
</span></span></pre></div>
<a id="trunksrcwpincludesjsmediaaudiovideojs"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-includes/js/media-audiovideo.js (28083 => 28084)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/js/media-audiovideo.js 2014-04-12 00:00:32 UTC (rev 28083)
+++ trunk/src/wp-includes/js/media-audiovideo.js 2014-04-12 00:45:48 UTC (rev 28084)
</span><span class="lines">@@ -128,8 +128,8 @@
</span><span class="cx"> * MediaElement tries to pull the audio/video tag out of
</span><span class="cx"> * its container and re-add it to the DOM.
</span><span class="cx"> */
</span><del>- removePlayer: function() {
- var t = this.player, featureIndex, feature;
</del><ins>+ removePlayer: function(t) {
+ var featureIndex, feature;
</ins><span class="cx">
</span><span class="cx"> // invoke features cleanup
</span><span class="cx"> for ( featureIndex in t.options.features ) {
</span><span class="lines">@@ -165,7 +165,7 @@
</span><span class="cx"> unsetPlayer : function() {
</span><span class="cx"> if ( this.player ) {
</span><span class="cx"> wp.media.mixin.pauseAllPlayers();
</span><del>- wp.media.mixin.removePlayer.apply( this );
</del><ins>+ wp.media.mixin.removePlayer( this.player );
</ins><span class="cx"> this.player = false;
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -914,4 +914,4 @@
</span><span class="cx">
</span><span class="cx"> $( init );
</span><span class="cx">
</span><del>-}(jQuery, _, Backbone));
</del><span class="cx">\ No newline at end of file
</span><ins>+}(jQuery, _, Backbone));
</ins></span></pre></div>
<a id="trunksrcwpincludesjstinymcepluginswpviewpluginjs"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-includes/js/tinymce/plugins/wpview/plugin.js (28083 => 28084)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/js/tinymce/plugins/wpview/plugin.js 2014-04-12 00:00:32 UTC (rev 28083)
+++ trunk/src/wp-includes/js/tinymce/plugins/wpview/plugin.js 2014-04-12 00:45:48 UTC (rev 28084)
</span><span class="lines">@@ -80,11 +80,12 @@
</span><span class="cx"> 'contenteditable': 'true'
</span><span class="cx"> }, getViewText( viewNode ) );
</span><span class="cx">
</span><del>- viewNode.appendChild( clipboard );
</del><ins>+ // Prepend inside the wrapper
+ viewNode.insertBefore( clipboard, viewNode.firstChild );
</ins><span class="cx">
</span><span class="cx"> // Both of the following are necessary to prevent manipulating the selection/focus
</span><del>- editor.dom.bind( clipboard, 'beforedeactivate focusin focusout', _stop );
- editor.dom.bind( selected, 'beforedeactivate focusin focusout', _stop );
</del><ins>+ dom.bind( clipboard, 'beforedeactivate focusin focusout', _stop );
+ dom.bind( selected, 'beforedeactivate focusin focusout', _stop );
</ins><span class="cx">
</span><span class="cx"> // Make sure that the editor is focused.
</span><span class="cx"> // It is possible that the editor is not focused when the mouse event fires
</span><span class="lines">@@ -140,8 +141,14 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ // Remove the content of view wrappers from HTML string
+ function emptyViews( content ) {
+ return content.replace(/(<div[^>]+wpview-wrap[^>]+>)[\s\S]+?data-wpview-end[^>]*><\/ins><\/div>/g, '$1</div>' );
+ }
+
+ // Prevent adding undo levels on changes inside a view wrapper
</ins><span class="cx"> editor.on( 'BeforeAddUndo', function( event ) {
</span><del>- if ( selected && ! toRemove ) {
</del><ins>+ if ( event.lastLevel && emptyViews( event.level.content ) === emptyViews( event.lastLevel.content ) ) {
</ins><span class="cx"> event.preventDefault();
</span><span class="cx"> }
</span><span class="cx"> });
</span><span class="lines">@@ -149,12 +156,16 @@
</span><span class="cx"> // When the editor's content changes, scan the new content for
</span><span class="cx"> // matching view patterns, and transform the matches into
</span><span class="cx"> // view wrappers.
</span><del>- editor.on( 'BeforeSetContent', function( e ) {
- if ( ! e.content ) {
</del><ins>+ editor.on( 'BeforeSetContent', function( event ) {
+ if ( ! event.content ) {
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- e.content = wp.mce.views.toViews( e.content );
</del><ins>+ if ( ! event.initial ) {
+ wp.mce.views.unbind( editor );
+ }
+
+ event.content = wp.mce.views.toViews( event.content );
</ins><span class="cx"> });
</span><span class="cx">
</span><span class="cx"> // When the editor's content has been updated and the DOM has been
</span><span class="lines">@@ -162,11 +173,7 @@
</span><span class="cx"> editor.on( 'SetContent', function( event ) {
</span><span class="cx"> var body, padNode;
</span><span class="cx">
</span><del>- // don't (re-)render views if the format of the content is raw
- // to avoid adding additional undo levels on undo/redo
- if ( event.format !== 'raw' ) {
- wp.mce.views.render();
- }
</del><ins>+ wp.mce.views.render();
</ins><span class="cx">
</span><span class="cx"> // Add padding <p> if the noneditable node is last
</span><span class="cx"> if ( event.load || ! event.set ) {
</span><span class="lines">@@ -175,7 +182,10 @@
</span><span class="cx"> if ( isView( body.lastChild ) ) {
</span><span class="cx"> padNode = createPadNode();
</span><span class="cx"> body.appendChild( padNode );
</span><del>- editor.selection.setCursorLocation( padNode, 0 );
</del><ins>+
+ if ( ! event.initial ) {
+ editor.selection.setCursorLocation( padNode, 0 );
+ }
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> });
</span></span></pre>
</div>
</div>
</body>
</html>