<!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>[29380] trunk/src/wp-includes/js/tinymce/plugins/wpeditimage/plugin.js: TinyMCE: add support for `class` attribute on the caption shortcode.</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/29380">29380</a></dd>
<dt>Author</dt> <dd>azaozz</dd>
<dt>Date</dt> <dd>2014-08-06 00:57:12 +0000 (Wed, 06 Aug 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>TinyMCE: add support for `class` attribute on the caption shortcode. Part props knutsp, kadamwhite, fixes <a href="http://core.trac.wordpress.org/ticket/28951">#28951</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpincludesjstinymcepluginswpeditimagepluginjs">trunk/src/wp-includes/js/tinymce/plugins/wpeditimage/plugin.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpincludesjstinymcepluginswpeditimagepluginjs"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-includes/js/tinymce/plugins/wpeditimage/plugin.js (29379 => 29380)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/js/tinymce/plugins/wpeditimage/plugin.js 2014-08-05 19:36:41 UTC (rev 29379)
+++ trunk/src/wp-includes/js/tinymce/plugins/wpeditimage/plugin.js 2014-08-06 00:57:12 UTC (rev 29380)
</span><span class="lines">@@ -4,7 +4,7 @@
</span><span class="cx">
</span><span class="cx"> function parseShortcode( content ) {
</span><span class="cx"> return content.replace( /(?:<p>)?\[(?:wp_)?caption([^\]]+)\]([\s\S]+?)\[\/(?:wp_)?caption\](?:<\/p>)?/g, function( a, b, c ) {
</span><del>- var id, cls, w, cap, img, width,
</del><ins>+ var id, align, classes, caption, img, width,
</ins><span class="cx"> trim = tinymce.trim;
</span><span class="cx">
</span><span class="cx"> id = b.match( /id=['"]([^'"]*)['"] ?/ );
</span><span class="lines">@@ -12,50 +12,56 @@
</span><span class="cx"> b = b.replace( id[0], '' );
</span><span class="cx"> }
</span><span class="cx">
</span><del>- cls = b.match( /align=['"]([^'"]*)['"] ?/ );
- if ( cls ) {
- b = b.replace( cls[0], '' );
</del><ins>+ align = b.match( /align=['"]([^'"]*)['"] ?/ );
+ if ( align ) {
+ b = b.replace( align[0], '' );
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- w = b.match( /width=['"]([0-9]*)['"] ?/ );
- if ( w ) {
- b = b.replace( w[0], '' );
</del><ins>+ classes = b.match( /class=['"]([^'"]*)['"] ?/ );
+ if ( classes ) {
+ b = b.replace( classes[0], '' );
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+ width = b.match( /width=['"]([0-9]*)['"] ?/ );
+ if ( width ) {
+ b = b.replace( width[0], '' );
+ }
+
</ins><span class="cx"> c = trim( c );
</span><span class="cx"> img = c.match( /((?:<a [^>]+>)?<img [^>]+>(?:<\/a>)?)([\s\S]*)/i );
</span><span class="cx">
</span><span class="cx"> if ( img && img[2] ) {
</span><del>- cap = trim( img[2] );
</del><ins>+ caption = trim( img[2] );
</ins><span class="cx"> img = trim( img[1] );
</span><span class="cx"> } else {
</span><span class="cx"> // old captions shortcode style
</span><del>- cap = trim( b ).replace( /caption=['"]/, '' ).replace( /['"]$/, '' );
</del><ins>+ caption = trim( b ).replace( /caption=['"]/, '' ).replace( /['"]$/, '' );
</ins><span class="cx"> img = c;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- id = ( id && id[1] ) ? id[1] : '';
- cls = ( cls && cls[1] ) ? cls[1] : 'alignnone';
</del><ins>+ id = ( id && id[1] ) ? id[1].replace( /[<>&]+/g, '' ) : '';
+ align = ( align && align[1] ) ? align[1] : 'alignnone';
+ classes = ( classes && classes[1] ) ? ' ' + classes[1].replace( /[<>&]+/g, '' ) : '';
</ins><span class="cx">
</span><del>- if ( ! w && img ) {
- w = img.match( /width=['"]([0-9]*)['"]/ );
</del><ins>+ if ( ! width && img ) {
+ width = img.match( /width=['"]([0-9]*)['"]/ );
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- if ( w && w[1] ) {
- w = w[1];
</del><ins>+ if ( width && width[1] ) {
+ width = width[1];
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- if ( ! w || ! cap ) {
</del><ins>+ if ( ! width || ! caption ) {
</ins><span class="cx"> return c;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- width = parseInt( w, 10 );
</del><ins>+ width = parseInt( width, 10 );
</ins><span class="cx"> if ( ! editor.getParam( 'wpeditimage_html5_captions' ) ) {
</span><span class="cx"> width += 10;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- return '<div class="mceTemp"><dl id="'+ id +'" class="wp-caption '+ cls +'" style="width: '+ width +'px">' +
- '<dt class="wp-caption-dt">'+ img +'</dt><dd class="wp-caption-dd">'+ cap +'</dd></dl></div>';
</del><ins>+ return '<div class="mceTemp"><dl id="' + id + '" class="wp-caption ' + align + classes + '" style="width: ' + width + 'px">' +
+ '<dt class="wp-caption-dt">'+ img +'</dt><dd class="wp-caption-dd">'+ caption +'</dd></dl></div>';
</ins><span class="cx"> });
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -75,32 +81,38 @@
</span><span class="cx"> return '';
</span><span class="cx"> }
</span><span class="cx">
</span><del>- out = b.replace( /<dl ([^>]+)>\s*<dt [^>]+>([\s\S]+?)<\/dt>\s*<dd [^>]+>([\s\S]*?)<\/dd>\s*<\/dl>/gi, function( a, b, c, cap ) {
- var id, cls, w;
</del><ins>+ out = b.replace( /<dl ([^>]+)>\s*<dt [^>]+>([\s\S]+?)<\/dt>\s*<dd [^>]+>([\s\S]*?)<\/dd>\s*<\/dl>/gi, function( a, b, c, caption ) {
+ var id, classes, align, width;
</ins><span class="cx">
</span><del>- w = c.match( /width="([0-9]*)"/ );
- w = ( w && w[1] ) ? w[1] : '';
</del><ins>+ width = c.match( /width="([0-9]*)"/ );
+ width = ( width && width[1] ) ? width[1] : '';
</ins><span class="cx">
</span><del>- if ( ! w || ! cap ) {
</del><ins>+ if ( ! width || ! caption ) {
</ins><span class="cx"> return c;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> id = b.match( /id="([^"]*)"/ );
</span><span class="cx"> id = ( id && id[1] ) ? id[1] : '';
</span><span class="cx">
</span><del>- cls = b.match( /class="([^"]*)"/ );
- cls = ( cls && cls[1] ) ? cls[1] : '';
- cls = cls.match( /align[a-z]+/ ) || 'alignnone';
</del><ins>+ classes = b.match( /class="([^"]*)"/ );
+ classes = ( classes && classes[1] ) ? classes[1] : '';
</ins><span class="cx">
</span><del>- cap = cap.replace( /\r\n|\r/g, '\n' ).replace( /<[a-zA-Z0-9]+( [^<>]+)?>/g, function( a ) {
</del><ins>+ align = classes.match( /align[a-z]+/i ) || 'alignnone';
+ classes = classes.replace( /wp-caption ?|align[a-z]+ ?/gi, '' );
+
+ if ( classes ) {
+ classes = ' class="' + classes + '"';
+ }
+
+ caption = caption.replace( /\r\n|\r/g, '\n' ).replace( /<[a-zA-Z0-9]+( [^<>]+)?>/g, function( a ) {
</ins><span class="cx"> // no line breaks inside HTML tags
</span><span class="cx"> return a.replace( /[\r\n\t]+/, ' ' );
</span><span class="cx"> });
</span><span class="cx">
</span><span class="cx"> // convert remaining line breaks to <br>
</span><del>- cap = cap.replace( /\s*\n\s*/g, '<br />' );
</del><ins>+ caption = caption.replace( /\s*\n\s*/g, '<br />' );
</ins><span class="cx">
</span><del>- return '[caption id="'+ id +'" align="'+ cls +'" width="'+ w +'"]'+ c +' '+ cap +'[/caption]';
</del><ins>+ return '[caption id="' + id + '" align="' + align + '" width="' + width + '"' + classes + ']' + c + ' ' + caption + '[/caption]';
</ins><span class="cx"> });
</span><span class="cx">
</span><span class="cx"> if ( out.indexOf('[caption') !== 0 ) {
</span><span class="lines">@@ -115,6 +127,7 @@
</span><span class="cx">
</span><span class="cx"> function extractImageData( imageNode ) {
</span><span class="cx"> var classes, extraClasses, metadata, captionBlock, caption, link, width, height,
</span><ins>+ captionClassName = [],
</ins><span class="cx"> dom = editor.dom,
</span><span class="cx"> isIntRegExp = /^\d+$/;
</span><span class="cx">
</span><span class="lines">@@ -180,9 +193,13 @@
</span><span class="cx"> tinymce.each( classes, function( name ) {
</span><span class="cx"> if ( /^align/.test( name ) ) {
</span><span class="cx"> metadata.align = name.replace( 'align', '' );
</span><ins>+ } else if ( name && name !== 'wp-caption' ) {
+ captionClassName.push( name );
</ins><span class="cx"> }
</span><span class="cx"> } );
</span><span class="cx">
</span><ins>+ metadata.captionClassName = captionClassName.join( ' ' );
+
</ins><span class="cx"> caption = dom.select( 'dd.wp-caption-dd', captionBlock );
</span><span class="cx"> if ( caption.length ) {
</span><span class="cx"> caption = caption[0];
</span><span class="lines">@@ -210,7 +227,7 @@
</span><span class="cx">
</span><span class="cx"> function updateImage( imageNode, imageData ) {
</span><span class="cx"> var classes, className, node, html, parent, wrap, linkNode,
</span><del>- captionNode, dd, dl, id, attrs, linkAttrs, width, height,
</del><ins>+ captionNode, dd, dl, id, attrs, linkAttrs, width, height, align,
</ins><span class="cx"> dom = editor.dom;
</span><span class="cx">
</span><span class="cx"> classes = tinymce.explode( imageData.extraClasses, ' ' );
</span><span class="lines">@@ -287,8 +304,13 @@
</span><span class="cx"> if ( imageData.caption ) {
</span><span class="cx">
</span><span class="cx"> id = imageData.attachment_id ? 'attachment_' + imageData.attachment_id : null;
</span><del>- className = 'wp-caption align' + ( imageData.align || 'none' );
</del><ins>+ align = 'align' + ( imageData.align || 'none' );
+ className = 'wp-caption ' + align;
</ins><span class="cx">
</span><ins>+ if ( imageData.captionClassName ) {
+ className += ' ' + imageData.captionClassName.replace( /[<>&]+/g, '' );
+ }
+
</ins><span class="cx"> if ( ! editor.getParam( 'wpeditimage_html5_captions' ) ) {
</span><span class="cx"> width = parseInt( width, 10 );
</span><span class="cx"> width += 10;
</span></span></pre>
</div>
</div>
</body>
</html>