<!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>[31548] trunk/src/wp-includes/js: TinyMCE: wpView improvements: remove the (obsolete) get/setViewText methods.</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" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="https://core.trac.wordpress.org/changeset/31548">31548</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"https://core.trac.wordpress.org/changeset/31548","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>azaozz</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2015-02-26 00:30:35 +0000 (Thu, 26 Feb 2015)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>TinyMCE: wpView improvements: remove the (obsolete) get/setViewText methods. Update stopping/pausing of multiple ME media players. Props iseulde. See <a href="https://core.trac.wordpress.org/ticket/31412">#31412</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpincludesjsmceviewjs">trunk/src/wp-includes/js/mce-view.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 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/js/mce-view.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/js/mce-view.js 2015-02-25 23:48:27 UTC (rev 31547)
+++ trunk/src/wp-includes/js/mce-view.js 2015-02-26 00:30:35 UTC (rev 31548)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -651,7 +651,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> var media = wp.media[ this.type ],
</span><span class="cx" style="display: block; padding: 0 10px"> frame = media.edit( text );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- this.stopPlayers && this.stopPlayers();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ this.pausePlayers && this.pausePlayers();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> _.each( this.state, function( state ) {
</span><span class="cx" style="display: block; padding: 0 10px"> frame.state( state ).on( 'update', function( selection ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -728,7 +728,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> self.render();
</span><span class="cx" style="display: block; padding: 0 10px"> } )
</span><span class="cx" style="display: block; padding: 0 10px"> .fail( function( response ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( self.type === 'embedURL' ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( self.url ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> self.removeMarkers();
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> self.setError( response.message || response.statusText, 'admin-media' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -737,19 +737,19 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> this.getEditors( function( editor ) {
</span><span class="cx" style="display: block; padding: 0 10px"> editor.on( 'wpview-selected', function() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- self.stopPlayers();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ self.pausePlayers();
</ins><span class="cx" style="display: block; padding: 0 10px"> } );
</span><span class="cx" style="display: block; padding: 0 10px"> } );
</span><span class="cx" style="display: block; padding: 0 10px"> },
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- stopPlayers: function( remove ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ pausePlayers: function() {
</ins><span class="cx" style="display: block; padding: 0 10px"> this.getNodes( function( editor, node, content ) {
</span><span class="cx" style="display: block; padding: 0 10px"> var win = $( 'iframe.wpview-sandbox', content ).get( 0 );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( win && ( win = win.contentWindow ) && win.mejs ) {
</span><span class="cx" style="display: block; padding: 0 10px"> _.each( win.mejs.players, function( player ) {
</span><span class="cx" style="display: block; padding: 0 10px"> try {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- player[ remove ? 'remove' : 'pause' ]();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ player.pause();
</ins><span class="cx" style="display: block; padding: 0 10px"> } catch ( e ) {}
</span><span class="cx" style="display: block; padding: 0 10px"> } );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -762,10 +762,10 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> edit: function( text, update ) {
</span><span class="cx" style="display: block; padding: 0 10px"> var media = wp.media.embed,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- isURL = 'embedURL' === this.type,
- frame = media.edit( text, isURL );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ frame = media.edit( text, !! this.url ),
+ self = this;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- this.stopPlayers();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ this.pausePlayers();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> frame.state( 'embed' ).props.on( 'change:url', function( model, url ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( url ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -774,7 +774,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> } );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> frame.state( 'embed' ).on( 'select', function() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( isURL ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( self.url ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> update( frame.state( 'embed' ).metadata.url );
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> update( media.shortcode( frame.state( 'embed' ).metadata ).string() );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -808,7 +808,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> views.register( 'embedURL', _.extend( {}, embed, {
</span><span class="cx" style="display: block; padding: 0 10px"> match: function( content ) {
</span><span class="cx" style="display: block; padding: 0 10px"> var re = /(^|<p>)(https?:\/\/[^\s"]+?)(<\/p>\s*|$)/gi,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- match = re.exec( tinymce.trim( content ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ match = re.exec( content );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( match ) {
</span><span class="cx" style="display: block; padding: 0 10px"> return {
</span></span></pre></div>
<a id="trunksrcwpincludesjstinymcepluginswpviewpluginjs"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/js/tinymce/plugins/wpview/plugin.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/js/tinymce/plugins/wpview/plugin.js 2015-02-25 23:48:27 UTC (rev 31547)
+++ trunk/src/wp-includes/js/tinymce/plugins/wpview/plugin.js 2015-02-26 00:30:35 UTC (rev 31548)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -34,37 +34,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> return false;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /**
- * Get the text/shortcode string for a view.
- *
- * @param view The view wrapper's node
- * @returns string The text/shoercode string of the view
- */
- function getViewText( view ) {
- if ( view = getView( view ) ) {
- return window.decodeURIComponent( editor.dom.getAttrib( view, 'data-wpview-text' ) || '' );
- }
-
- return '';
- }
-
- /**
- * Set the view's original text/shortcode string
- *
- * @param view The view wrapper's HTML id or node
- * @param text The text string to be set
- */
- function setViewText( view, text ) {
- view = getView( view );
-
- if ( view ) {
- editor.dom.setAttrib( view, 'data-wpview-text', window.encodeURIComponent( text || '' ) );
- return true;
- }
-
- return false;
- }
-
</del><span class="cx" style="display: block; padding: 0 10px"> function _stop( event ) {
</span><span class="cx" style="display: block; padding: 0 10px"> event.stopPropagation();
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -138,7 +107,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> clipboard = dom.create( 'div', {
</span><span class="cx" style="display: block; padding: 0 10px"> 'class': 'wpview-clipboard',
</span><span class="cx" style="display: block; padding: 0 10px"> 'contenteditable': 'true'
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- }, getViewText( viewNode ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ }, decodeURIComponent( editor.dom.getAttrib( viewNode, 'data-wpview-text' ) ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> editor.dom.select( '.wpview-body', viewNode )[0].appendChild( clipboard );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -197,8 +166,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // Check if the `wp.mce` API exists.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( typeof wp === 'undefined' || ! wp.mce ) {
</span><span class="cx" style="display: block; padding: 0 10px"> return {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- getViewText: _noop,
- setViewText: _noop,
</del><span class="cx" style="display: block; padding: 0 10px"> getView: _noop
</span><span class="cx" style="display: block; padding: 0 10px"> };
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -721,8 +688,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> });
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> return {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- getViewText: getViewText,
- setViewText: setViewText,
</del><span class="cx" style="display: block; padding: 0 10px"> getView: getView
</span><span class="cx" style="display: block; padding: 0 10px"> };
</span><span class="cx" style="display: block; padding: 0 10px"> });
</span></span></pre>
</div>
</div>
</body>
</html>