<!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>[22415] trunk/wp-includes: Use Mustache-insipired template tags.</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/22415">22415</a></dd>
<dt>Author</dt> <dd>koopersmith</dd>
<dt>Date</dt> <dd>2012-11-07 08:41:17 +0000 (Wed, 07 Nov 2012)</dd>
</dl>

<h3>Log Message</h3>
<pre>Use Mustache-insipired template tags.

Underscore's default ERB-style templates are incompatible with PHP when asp_tags is enabled. As a result, we've settled on an alternative syntax that should be familiar to devs: Mustache-inspired for interpolating and escaping content, and ERB-inspired for execution.

        `{{{a}}}` - interpolating
        `{{ a }}` - escaping
        `&lt;# a #&gt;` - execution

props rmccue. fixes <a href="http://core.trac.wordpress.org/ticket/22344">#22344</a>, see <a href="http://core.trac.wordpress.org/ticket/21390">#21390</a>.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpincludesjsmediamodelsjs">trunk/wp-includes/js/media-models.js</a></li>
<li><a href="#trunkwpincludesmediaphp">trunk/wp-includes/media.php</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpincludesjsmediamodelsjs"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/js/media-models.js (22414 => 22415)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/js/media-models.js        2012-11-07 07:59:46 UTC (rev 22414)
+++ trunk/wp-includes/js/media-models.js        2012-11-07 08:41:17 UTC (rev 22415)
</span><span class="lines">@@ -58,9 +58,15 @@
</span><span class="cx">                  * @return {function}    A function that lazily-compiles the template requested.
</span><span class="cx">                  */
</span><span class="cx">                 template: _.memoize( function( id ) {
</span><del>-                        var compiled;
</del><ins>+                        var compiled,
+                                options = {
+                                        evaluate:    /&lt;#([\s\S]+?)#&gt;/g,
+                                        interpolate: /\{\{\{([\s\S]+?)\}\}\}/g,
+                                        escape:      /\{\{([\s\S]+?)\}\}/g
+                                };
+
</ins><span class="cx">                         return function( data ) {
</span><del>-                                compiled = compiled || _.template( $( '#tmpl-' + id ).html() );
</del><ins>+                                compiled = compiled || _.template( $( '#tmpl-' + id ).html(), null, options );
</ins><span class="cx">                                 return compiled( data );
</span><span class="cx">                         };
</span><span class="cx">                 }),
</span></span></pre></div>
<a id="trunkwpincludesmediaphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/media.php (22414 => 22415)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/media.php        2012-11-07 07:59:46 UTC (rev 22414)
+++ trunk/wp-includes/media.php        2012-11-07 08:41:17 UTC (rev 22415)
</span><span class="lines">@@ -1296,7 +1296,7 @@
</span><span class="cx">         ?&gt;
</span><span class="cx">         &lt;script type=&quot;text/html&quot; id=&quot;tmpl-media-modal&quot;&gt;
</span><span class="cx">                 &lt;div class=&quot;media-modal&quot;&gt;
</span><del>-                        &lt;h3 class=&quot;media-modal-title&quot;&gt;&lt;%- title %&gt;&lt;/h3&gt;
</del><ins>+                        &lt;h3 class=&quot;media-modal-title&quot;&gt;{{ title }}&lt;/h3&gt;
</ins><span class="cx">                         &lt;a class=&quot;media-modal-close&quot; href=&quot;&quot; title=&quot;&lt;?php esc_attr_e('Close'); ?&gt;&quot;&gt;&amp;times;&lt;/a&gt;
</span><span class="cx">                 &lt;/div&gt;
</span><span class="cx">                 &lt;div class=&quot;media-modal-backdrop&quot;&gt;
</span><span class="lines">@@ -1319,98 +1319,98 @@
</span><span class="cx">         &lt;/script&gt;
</span><span class="cx"> 
</span><span class="cx">         &lt;script type=&quot;text/html&quot; id=&quot;tmpl-attachment&quot;&gt;
</span><del>-                &lt;div class=&quot;attachment-preview type-&lt;%- type %&gt; subtype-&lt;%- subtype %&gt; &lt;%- orientation %&gt;&quot;&gt;
-                        &lt;% if ( uploading ) { %&gt;
</del><ins>+                &lt;div class=&quot;attachment-preview type-{{ type }} subtype-{{ subtype }} {{ orientation }}&quot;&gt;
+                        &lt;# if ( uploading ) { #&gt;
</ins><span class="cx">                                 &lt;div class=&quot;media-progress-bar&quot;&gt;&lt;div&gt;&lt;/div&gt;&lt;/div&gt;
</span><del>-                        &lt;% } else if ( 'image' === type ) { %&gt;
</del><ins>+                        &lt;# } else if ( 'image' === type ) { #&gt;
</ins><span class="cx">                                 &lt;div class=&quot;thumbnail&quot;&gt;
</span><span class="cx">                                         &lt;div class=&quot;centered&quot;&gt;
</span><del>-                                                &lt;img src=&quot;&lt;%- url %&gt;&quot; draggable=&quot;false&quot; /&gt;
</del><ins>+                                                &lt;img src=&quot;{{ url }}&quot; draggable=&quot;false&quot; /&gt;
</ins><span class="cx">                                         &lt;/div&gt;
</span><span class="cx">                                 &lt;/div&gt;
</span><del>-                        &lt;% } else { %&gt;
-                                &lt;img src=&quot;&lt;%- icon %&gt;&quot; class=&quot;icon&quot; draggable=&quot;false&quot; /&gt;
-                                &lt;div class=&quot;filename&quot;&gt;&lt;%- filename %&gt;&lt;/div&gt;
-                        &lt;% } %&gt;
</del><ins>+                        &lt;# } else { #&gt;
+                                &lt;img src=&quot;{{ icon }}&quot; class=&quot;icon&quot; draggable=&quot;false&quot; /&gt;
+                                &lt;div class=&quot;filename&quot;&gt;{{ filename }}&lt;/div&gt;
+                        &lt;# } #&gt;
</ins><span class="cx"> 
</span><del>-                        &lt;% if ( buttons.close ) { %&gt;
</del><ins>+                        &lt;# if ( buttons.close ) { #&gt;
</ins><span class="cx">                                 &lt;a class=&quot;close button&quot; href=&quot;#&quot;&gt;&amp;times;&lt;/a&gt;
</span><del>-                        &lt;% } %&gt;
</del><ins>+                        &lt;# } #&gt;
</ins><span class="cx">                 &lt;/div&gt;
</span><del>-                &lt;% if ( describe ) { %&gt;
-                        &lt;% if ( 'image' === type ) { %&gt;
</del><ins>+                &lt;# if ( describe ) { #&gt;
+                        &lt;# if ( 'image' === type ) { #&gt;
</ins><span class="cx">                                 &lt;textarea class=&quot;describe&quot;
</span><span class="cx">                                         placeholder=&quot;&lt;?php esc_attr_e('Describe this image&amp;hellip;'); ?&gt;&quot;
</span><del>-                                        &gt;&lt;%- caption %&gt;&lt;/textarea&gt;
-                        &lt;% } else { %&gt;
</del><ins>+                                        &gt;{{ caption }}&lt;/textarea&gt;
+                        &lt;# } else { #&gt;
</ins><span class="cx">                                 &lt;textarea class=&quot;describe&quot;
</span><del>-                                        &lt;% if ( 'video' === type ) { %&gt;
</del><ins>+                                        &lt;# if ( 'video' === type ) { #&gt;
</ins><span class="cx">                                                 placeholder=&quot;&lt;?php esc_attr_e('Describe this video&amp;hellip;'); ?&gt;&quot;
</span><del>-                                        &lt;% } else if ( 'audio' === type ) { %&gt;
</del><ins>+                                        &lt;# } else if ( 'audio' === type ) { #&gt;
</ins><span class="cx">                                                 placeholder=&quot;&lt;?php esc_attr_e('Describe this audio file&amp;hellip;'); ?&gt;&quot;
</span><del>-                                        &lt;% } else { %&gt;
</del><ins>+                                        &lt;# } else { #&gt;
</ins><span class="cx">                                                 placeholder=&quot;&lt;?php esc_attr_e('Describe this media file&amp;hellip;'); ?&gt;&quot;
</span><del>-                                        &lt;% } %&gt;
-                                        &gt;&lt;%- title %&gt;&lt;/textarea&gt;
-                        &lt;% } %&gt;
-                &lt;% } %&gt;
</del><ins>+                                        &lt;# } #&gt;
+                                        &gt;{{ title }}&lt;/textarea&gt;
+                        &lt;# } #&gt;
+                &lt;# } #&gt;
</ins><span class="cx">         &lt;/script&gt;
</span><span class="cx"> 
</span><span class="cx">         &lt;script type=&quot;text/html&quot; id=&quot;tmpl-attachment-details&quot;&gt;
</span><span class="cx">                 &lt;h3&gt;&lt;?php _e('Edit Attachment Details'); ?&gt;&lt;/h3&gt;
</span><del>-                &lt;div class=&quot;attachment-preview attachment-details-preview type-&lt;%- type %&gt; subtype-&lt;%- subtype %&gt; &lt;%- orientation %&gt;&quot;&gt;
-                        &lt;% if ( uploading ) { %&gt;
</del><ins>+                &lt;div class=&quot;attachment-preview attachment-details-preview type-{{ type }} subtype-{{ subtype }} {{ orientation }}&quot;&gt;
+                        &lt;# if ( uploading ) { #&gt;
</ins><span class="cx">                                 &lt;div class=&quot;media-progress-bar&quot;&gt;&lt;div&gt;&lt;/div&gt;&lt;/div&gt;
</span><del>-                        &lt;% } else if ( 'image' === type ) { %&gt;
</del><ins>+                        &lt;# } else if ( 'image' === type ) { #&gt;
</ins><span class="cx">                                 &lt;div class=&quot;thumbnail&quot;&gt;
</span><del>-                                        &lt;img src=&quot;&lt;%- url %&gt;&quot; draggable=&quot;false&quot; /&gt;
</del><ins>+                                        &lt;img src=&quot;{{ url }}&quot; draggable=&quot;false&quot; /&gt;
</ins><span class="cx">                                 &lt;/div&gt;
</span><del>-                        &lt;% } else { %&gt;
</del><ins>+                        &lt;# } else { #&gt;
</ins><span class="cx">                                 &lt;div class=&quot;icon-thumbnail&quot;&gt;
</span><del>-                                        &lt;img src=&quot;&lt;%- icon %&gt;&quot; class=&quot;icon&quot; draggable=&quot;false&quot; /&gt;
-                                        &lt;div class=&quot;filename&quot;&gt;&lt;%- filename %&gt;&lt;/div&gt;
</del><ins>+                                        &lt;img src=&quot;{{ icon }}&quot; class=&quot;icon&quot; draggable=&quot;false&quot; /&gt;
+                                        &lt;div class=&quot;filename&quot;&gt;{{ filename }}&lt;/div&gt;
</ins><span class="cx">                                 &lt;/div&gt;
</span><del>-                        &lt;% } %&gt;
</del><ins>+                        &lt;# } #&gt;
</ins><span class="cx">                 &lt;/div&gt;
</span><span class="cx"> 
</span><del>-                &lt;% if ( 'image' === type ) { %&gt;
</del><ins>+                &lt;# if ( 'image' === type ) { #&gt;
</ins><span class="cx">                         &lt;textarea class=&quot;describe&quot;
</span><span class="cx">                                 placeholder=&quot;&lt;?php esc_attr_e('Describe this image&amp;hellip;'); ?&gt;&quot;
</span><del>-                                &gt;&lt;%- caption %&gt;&lt;/textarea&gt;
-                &lt;% } else { %&gt;
</del><ins>+                                &gt;{{ caption }}&lt;/textarea&gt;
+                &lt;# } else { #&gt;
</ins><span class="cx">                         &lt;textarea class=&quot;describe&quot;
</span><del>-                                &lt;% if ( 'video' === type ) { %&gt;
</del><ins>+                                &lt;# if ( 'video' === type ) { #&gt;
</ins><span class="cx">                                         placeholder=&quot;&lt;?php esc_attr_e('Describe this video&amp;hellip;'); ?&gt;&quot;
</span><del>-                                &lt;% } else if ( 'audio' === type ) { %&gt;
</del><ins>+                                &lt;# } else if ( 'audio' === type ) { #&gt;
</ins><span class="cx">                                         placeholder=&quot;&lt;?php esc_attr_e('Describe this audio file&amp;hellip;'); ?&gt;&quot;
</span><del>-                                &lt;% } else { %&gt;
</del><ins>+                                &lt;# } else { #&gt;
</ins><span class="cx">                                         placeholder=&quot;&lt;?php esc_attr_e('Describe this media file&amp;hellip;'); ?&gt;&quot;
</span><del>-                                &lt;% } %&gt;
-                                &gt;&lt;%- title %&gt;&lt;/textarea&gt;
-                &lt;% } %&gt;
</del><ins>+                                &lt;# } #&gt;
+                                &gt;{{ title }}&lt;/textarea&gt;
+                &lt;# } #&gt;
</ins><span class="cx">         &lt;/script&gt;
</span><span class="cx"> 
</span><span class="cx">         &lt;script type=&quot;text/html&quot; id=&quot;tmpl-media-selection&quot;&gt;
</span><span class="cx">                 &lt;div class=&quot;selection-info&quot;&gt;
</span><span class="cx">                         &lt;span class=&quot;count&quot;&gt;&lt;/span&gt;
</span><del>-                        &lt;% if ( clearable ) { %&gt;
</del><ins>+                        &lt;# if ( clearable ) { #&gt;
</ins><span class="cx">                                 &lt;a class=&quot;clear-selection&quot; href=&quot;#&quot;&gt;&lt;?php _e('Clear'); ?&gt;&lt;/a&gt;
</span><del>-                        &lt;% } %&gt;
</del><ins>+                        &lt;# } #&gt;
</ins><span class="cx">                 &lt;/div&gt;
</span><span class="cx">                 &lt;div class=&quot;selection-view&quot;&gt;&lt;/div&gt;
</span><span class="cx">         &lt;/script&gt;
</span><span class="cx"> 
</span><span class="cx">         &lt;script type=&quot;text/html&quot; id=&quot;tmpl-media-selection-preview&quot;&gt;
</span><del>-                &lt;div class=&quot;selected-img selected-count-&lt;%- count %&gt;&quot;&gt;
-                        &lt;% if ( thumbnail ) { %&gt;
-                                &lt;img src=&quot;&lt;%- thumbnail %&gt;&quot; draggable=&quot;false&quot; /&gt;
-                        &lt;% } %&gt;
</del><ins>+                &lt;div class=&quot;selected-img selected-count-{{ count }}&quot;&gt;
+                        &lt;# if ( thumbnail ) { #&gt;
+                                &lt;img src=&quot;{{ thumbnail }}&quot; draggable=&quot;false&quot; /&gt;
+                        &lt;# } #&gt;
</ins><span class="cx"> 
</span><del>-                        &lt;span class=&quot;count&quot;&gt;&lt;%- count %&gt;&lt;/span&gt;
</del><ins>+                        &lt;span class=&quot;count&quot;&gt;{{ count }}&lt;/span&gt;
</ins><span class="cx">                 &lt;/div&gt;
</span><del>-                &lt;% if ( clearable ) { %&gt;
</del><ins>+                &lt;# if ( clearable ) { #&gt;
</ins><span class="cx">                         &lt;a class=&quot;clear-selection&quot; href=&quot;#&quot;&gt;&lt;?php _e('Clear selection'); ?&gt;&lt;/a&gt;
</span><del>-                &lt;% } %&gt;
</del><ins>+                &lt;# } #&gt;
</ins><span class="cx">         &lt;/script&gt;
</span><span class="cx"> 
</span><span class="cx">         &lt;script type=&quot;text/html&quot; id=&quot;tmpl-attachment-display-settings&quot;&gt;
</span><span class="lines">@@ -1458,21 +1458,23 @@
</span><span class="cx">                 &lt;h4&gt;&lt;?php _e('Gallery Columns'); ?&gt;&lt;/h4&gt;
</span><span class="cx"> 
</span><span class="cx">                 &lt;select class=&quot;columns&quot; name=&quot;columns&quot; data-setting=&quot;columns&quot;&gt;
</span><del>-                        &lt;% _.times( 9, function( i ) { %&gt;
-                                &lt;option value=&quot;&lt;%- i %&gt;&quot;&gt;&lt;%- i %&gt;&lt;/option&gt;
-                        &lt;% }); %&gt;
</del><ins>+                        &lt;?php for( $i = 1; $i &lt;= 9; $i++ ) : ?&gt;
+                                &lt;option value=&quot;&lt;?php echo esc_attr( $i ); ?&gt;&quot;&gt;
+                                        &lt;?php echo esc_html( $i ); ?&gt;
+                                &lt;/option&gt;
+                        &lt;?php endfor; ?&gt;
</ins><span class="cx">                 &lt;/select&gt;
</span><span class="cx">         &lt;/script&gt;
</span><span class="cx"> 
</span><span class="cx">         &lt;script type=&quot;text/html&quot; id=&quot;tmpl-editor-attachment&quot;&gt;
</span><span class="cx">                 &lt;div class=&quot;editor-attachment-preview&quot;&gt;
</span><del>-                        &lt;% if ( url ) { %&gt;
-                                &lt;img src=&quot;&lt;%- url %&gt;&quot; width=&quot;&lt;%- width %&gt;&quot; height=&quot;&lt;%- height %&gt;&quot; draggable=&quot;false&quot; /&gt;
-                        &lt;% } %&gt;
</del><ins>+                        &lt;# if ( url ) { #&gt;
+                                &lt;img src=&quot;{{ url }}&quot; width=&quot;{{ width }}&quot; height=&quot;{{ height }}&quot; draggable=&quot;false&quot; /&gt;
+                        &lt;# } #&gt;
</ins><span class="cx"> 
</span><del>-                        &lt;% if ( uploading ) { %&gt;
</del><ins>+                        &lt;# if ( uploading ) { #&gt;
</ins><span class="cx">                                 &lt;div class=&quot;media-progress-bar&quot;&gt;&lt;div&gt;&lt;/div&gt;&lt;/div&gt;
</span><del>-                        &lt;% } %&gt;
</del><ins>+                        &lt;# } #&gt;
</ins><span class="cx">                         &lt;div class=&quot;overlay&quot;&gt;
</span><span class="cx">                                 &lt;div class=&quot;button close&quot;&gt;&amp;times;&lt;/div&gt;
</span><span class="cx">                         &lt;/div&gt;
</span><span class="lines">@@ -1481,9 +1483,9 @@
</span><span class="cx">         &lt;/script&gt;
</span><span class="cx"> 
</span><span class="cx">         &lt;script type=&quot;text/html&quot; id=&quot;tmpl-editor-gallery&quot;&gt;
</span><del>-                &lt;% if ( url ) { %&gt;
-                        &lt;img src=&quot;&lt;%- url %&gt;&quot; draggable=&quot;false&quot; /&gt;
-                &lt;% } %&gt;
</del><ins>+                &lt;# if ( url ) { #&gt;
+                        &lt;img src=&quot;{{ url }}&quot; draggable=&quot;false&quot; /&gt;
+                &lt;# } #&gt;
</ins><span class="cx"> 
</span><span class="cx">                 &lt;div class=&quot;overlay&quot;&gt;
</span><span class="cx">                         &lt;div class=&quot;button close&quot;&gt;&amp;times;&lt;/div&gt;
</span><span class="lines">@@ -1492,30 +1494,30 @@
</span><span class="cx">         &lt;/script&gt;
</span><span class="cx"> 
</span><span class="cx">         &lt;script type=&quot;text/html&quot; id=&quot;tmpl-attachments-css&quot;&gt;
</span><del>-                &lt;style type=&quot;text/css&quot; id=&quot;&lt;%- id %&gt;-css&quot;&gt;
-                        #&lt;%- id %&gt; {
-                                padding: 0 &lt;%- gutter %&gt;px;
</del><ins>+                &lt;style type=&quot;text/css&quot; id=&quot;{{ id }}-css&quot;&gt;
+                        #{{ id }} {
+                                padding: 0 {{ gutter }}px;
</ins><span class="cx">                         }
</span><span class="cx"> 
</span><del>-                        #&lt;%- id %&gt; .attachment {
-                                margin: &lt;%- gutter %&gt;px;
-                                width: &lt;%- edge %&gt;px;
</del><ins>+                        #{{ id }} .attachment {
+                                margin: {{ gutter }}px;
+                                width: {{ edge }}px;
</ins><span class="cx">                         }
</span><span class="cx"> 
</span><del>-                        #&lt;%- id %&gt; .attachment-preview,
-                        #&lt;%- id %&gt; .attachment-preview .thumbnail {
-                                width: &lt;%- edge %&gt;px;
-                                height: &lt;%- edge %&gt;px;
</del><ins>+                        #{{ id }} .attachment-preview,
+                        #{{ id }} .attachment-preview .thumbnail {
+                                width: {{ edge }}px;
+                                height: {{ edge }}px;
</ins><span class="cx">                         }
</span><span class="cx"> 
</span><del>-                        #&lt;%- id %&gt; .portrait .thumbnail img {
-                                width: &lt;%- edge %&gt;px;
</del><ins>+                        #{{ id }} .portrait .thumbnail img {
+                                width: {{ edge }}px;
</ins><span class="cx">                                 height: auto;
</span><span class="cx">                         }
</span><span class="cx"> 
</span><del>-                        #&lt;%- id %&gt; .landscape .thumbnail img {
</del><ins>+                        #{{ id }} .landscape .thumbnail img {
</ins><span class="cx">                                 width: auto;
</span><del>-                                height: &lt;%- edge %&gt;px;
</del><ins>+                                height: {{ edge }}px;
</ins><span class="cx">                         }
</span><span class="cx">                 &lt;/style&gt;
</span><span class="cx">         &lt;/script&gt;
</span></span></pre>
</div>
</div>

</body>
</html>