<!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>[22023] trunk/wp-includes/js/mce-view.js: Remove internal TinyMCE attributes when generating the HTML for attachment views.</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, #logmsg > ol { margin-left: 0; 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/22023">22023</a></dd>
<dt>Author</dt> <dd>koopersmith</dd>
<dt>Date</dt> <dd>2012-09-26 22:20:15 +0000 (Wed, 26 Sep 2012)</dd>
</dl>

<h3>Log Message</h3>
<pre>Remove internal TinyMCE attributes when generating the HTML for attachment views.

Moves the HTML utility functions to the top of `mce-views.js`. Also adds `wp.mce.view.removeInternalAttrs( attrs )` and `wp.mce.view.attrs( content )`.

see <a href="http://core.trac.wordpress.org/ticket/21390">#21390</a>, <a href="http://core.trac.wordpress.org/ticket/21812">#21812</a>, <a href="http://core.trac.wordpress.org/ticket/21813">#21813</a>.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpincludesjsmceviewjs">trunk/wp-includes/js/mce-view.js</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpincludesjsmceviewjs"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/js/mce-view.js (22022 => 22023)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/js/mce-view.js        2012-09-26 21:40:02 UTC (rev 22022)
+++ trunk/wp-includes/js/mce-view.js        2012-09-26 22:20:15 UTC (rev 22023)
</span><span class="lines">@@ -2,6 +2,72 @@
</span><span class="cx"> if ( typeof wp === 'undefined' )
</span><span class="cx">         var wp = {};
</span><span class="cx"> 
</span><ins>+// HTML utility functions
+// ----------------------
+(function(){
+        wp.html = _.extend( wp.html || {}, {
+                // ### Parse HTML attributes.
+                //
+                // Converts `content` to a set of parsed HTML attributes.
+                // Utilizes `wp.shortcode.attrs( content )`, which is a valid superset of
+                // the HTML attribute specification. Reformats the attributes into an
+                // object that contains the `attrs` with `key:value` mapping, and a record
+                // of the attributes that were entered using `empty` attribute syntax (i.e.
+                // with no value).
+                attrs: function( content ) {
+                        var result, attrs;
+
+                        // If `content` ends in a slash, strip it.
+                        if ( '/' === content[ content.length - 1 ] )
+                                content = content.slice( 0, -1 );
+
+                        result = wp.shortcode.attrs( content );
+                        attrs  = result.named;
+
+                        _.each( result.numeric, function( key ) {
+                                if ( /\s/.test( key ) )
+                                        return;
+
+                                attrs[ key ] = '';
+                        });
+
+                        return attrs;
+                },
+
+                // ### Convert an HTML-representation of an object to a string.
+                string: function( options ) {
+                        var text = '&lt;' + options.tag,
+                                content = options.content || '';
+
+                        _.each( options.attrs, function( value, attr ) {
+                                text += ' ' + attr;
+
+                                // Use empty attribute notation where possible.
+                                if ( '' === value )
+                                        return;
+
+                                // Convert boolean values to strings.
+                                if ( _.isBoolean( value ) )
+                                        value = value ? 'true' : 'false';
+
+                                text += '=&quot;' + value + '&quot;';
+                        });
+
+                        // Return the result if it is a self-closing tag.
+                        if ( options.single )
+                                return text + ' /&gt;';
+
+                        // Complete the opening tag.
+                        text += '&gt;';
+
+                        // If `content` is an object, recursively call this function.
+                        text += _.isObject( content ) ? wp.html.string( content ) : content;
+
+                        return text + '&lt;/' + options.tag + '&gt;';
+                }
+        });
+}());
+
</ins><span class="cx"> (function($){
</span><span class="cx">         var views = {},
</span><span class="cx">                 instances = {};
</span><span class="lines">@@ -11,7 +77,6 @@
</span><span class="cx"> 
</span><span class="cx">         // wp.mce.view
</span><span class="cx">         // -----------
</span><del>-        //
</del><span class="cx">         // A set of utilities that simplifies adding custom UI within a TinyMCE editor.
</span><span class="cx">         // At its core, it serves as a series of converters, transforming text to a
</span><span class="cx">         // custom UI, and back again.
</span><span class="lines">@@ -270,6 +335,21 @@
</span><span class="cx">                         });
</span><span class="cx">                 },
</span><span class="cx"> 
</span><ins>+                // ### Remove internal TinyMCE attributes.
+                removeInternalAttrs: function( attrs ) {
+                        var result = {};
+                        _.each( attrs, function( value, attr ) {
+                                if ( -1 === attr.indexOf('data-mce') )
+                                        result[ attr ] = value;
+                        });
+                        return result;
+                },
+
+                // ### Parse an attribute string and removes internal TinyMCE attributes.
+                attrs: function( content ) {
+                        return wp.mce.view.removeInternalAttrs( wp.html.attrs( content ) );
+                },
+
</ins><span class="cx">                 // Link any localized strings.
</span><span class="cx">                 l10n: _.isUndefined( _wpMceViewL10n ) ? {} : _wpMceViewL10n
</span><span class="cx">         };
</span><span class="lines">@@ -280,69 +360,8 @@
</span><span class="cx"> // ---------------------
</span><span class="cx"> (function($){
</span><span class="cx">         var mceview = wp.mce.view,
</span><del>-                attrs;
</del><ins>+                mceFreeAttrs;
</ins><span class="cx"> 
</span><del>-        wp.html = _.extend( wp.html || {}, {
-                // ### Parse HTML attributes.
-                //
-                // Converts `content` to a set of parsed HTML attributes.
-                // Utilizes `wp.shortcode.attrs( content )`, which is a valid superset of
-                // the HTML attribute specification. Reformats the attributes into an
-                // object that contains the `attrs` with `key:value` mapping, and a record
-                // of the attributes that were entered using `empty` attribute syntax (i.e.
-                // with no value).
-                attrs: function( content ) {
-                        var result, attrs;
-
-                        // If `content` ends in a slash, strip it.
-                        if ( '/' === content[ content.length - 1 ] )
-                                content = content.slice( 0, -1 );
-
-                        result = wp.shortcode.attrs( content );
-                        attrs  = result.named;
-
-                        _.each( result.numeric, function( key ) {
-                                if ( /\s/.test( key ) )
-                                        return;
-
-                                attrs[ key ] = '';
-                        });
-
-                        return attrs;
-                },
-
-                string: function( options ) {
-                        var text = '&lt;' + options.tag,
-                                content = options.content || '';
-
-                        _.each( options.attrs, function( value, attr ) {
-                                text += ' ' + attr;
-
-                                // Use empty attribute notation where possible.
-                                if ( '' === value )
-                                        return;
-
-                                // Convert boolean values to strings.
-                                if ( _.isBoolean( value ) )
-                                        value = value ? 'true' : 'false';
-
-                                text += '=&quot;' + value + '&quot;';
-                        });
-
-                        // Return the result if it is a self-closing tag.
-                        if ( options.single )
-                                return text + ' /&gt;';
-
-                        // Complete the opening tag.
-                        text += '&gt;';
-
-                        // If `content` is an object, recursively call this function.
-                        text += _.isObject( content ) ? wp.html.string( content ) : content;
-
-                        return text + '&lt;/' + options.tag + '&gt;';
-                }
-        });
-
</del><span class="cx">         mceview.add( 'attachment', {
</span><span class="cx">                 pattern: new RegExp( '(?:&lt;a([^&gt;]*)&gt;)?&lt;img([^&gt;]*class=(?:&quot;[^&quot;]*|\'[^\']*)\\bwp-image-(\\d+)[^&gt;]*)&gt;(?:&lt;/a&gt;)?' ),
</span><span class="cx"> 
</span><span class="lines">@@ -398,9 +417,9 @@
</span><span class="cx">                                 this.model = wp.media.model.Attachment.get( id );
</span><span class="cx"> 
</span><span class="cx">                                 if ( results[1] )
</span><del>-                                        this.anchor = wp.html.attrs( results[1] );
</del><ins>+                                        this.anchor = mceview.attrs( results[1] );
</ins><span class="cx"> 
</span><del>-                                this.img = wp.html.attrs( results[2] );
</del><ins>+                                this.img  = mceview.attrs( results[2] );
</ins><span class="cx">                                 className = this.img['class'];
</span><span class="cx"> 
</span><span class="cx">                                 // Strip ID class.
</span></span></pre>
</div>
</div>

</body>
</html>