<!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>[22578] trunk/wp-includes: Media: Convert templates to use a data variable instead of with statements.</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/22578">22578</a></dd>
<dt>Author</dt> <dd>koopersmith</dd>
<dt>Date</dt> <dd>2012-11-14 21:51:41 +0000 (Wed, 14 Nov 2012)</dd>
</dl>
<h3>Log Message</h3>
<pre>Media: Convert templates to use a data variable instead of with statements. 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 (22577 => 22578)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/js/media-models.js 2012-11-14 21:38:34 UTC (rev 22577)
+++ trunk/wp-includes/js/media-models.js 2012-11-14 21:51:41 UTC (rev 22578)
</span><span class="lines">@@ -80,7 +80,8 @@
</span><span class="cx"> options = {
</span><span class="cx"> evaluate: /<#([\s\S]+?)#>/g,
</span><span class="cx"> interpolate: /\{\{\{([\s\S]+?)\}\}\}/g,
</span><del>- escape: /\{\{([^\}]+?)\}\}(?!\})/g
</del><ins>+ escape: /\{\{([^\}]+?)\}\}(?!\})/g,
+ variable: 'data'
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> return function( data ) {
</span></span></pre></div>
<a id="trunkwpincludesmediaphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/media.php (22577 => 22578)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/media.php 2012-11-14 21:38:34 UTC (rev 22577)
+++ trunk/wp-includes/media.php 2012-11-14 21:51:41 UTC (rev 22578)
</span><span class="lines">@@ -1390,7 +1390,7 @@
</span><span class="cx"> ?>
</span><span class="cx"> <script type="text/html" id="tmpl-media-modal">
</span><span class="cx"> <div class="media-modal">
</span><del>- <h3 class="media-modal-title">{{ title }}</h3>
</del><ins>+ <h3 class="media-modal-title">{{ data.title }}</h3>
</ins><span class="cx"> <a class="media-modal-close" href="" title="<?php esc_attr_e('Close'); ?>">&times;</a>
</span><span class="cx"> </div>
</span><span class="cx"> <div class="media-modal-backdrop">
</span><span class="lines">@@ -1424,39 +1424,39 @@
</span><span class="cx"> </script>
</span><span class="cx">
</span><span class="cx"> <script type="text/html" id="tmpl-attachment">
</span><del>- <div class="attachment-preview type-{{ type }} subtype-{{ subtype }} {{ orientation }}">
- <# if ( uploading ) { #>
</del><ins>+ <div class="attachment-preview type-{{ data.type }} subtype-{{ data.subtype }} {{ data.orientation }}">
+ <# if ( data.uploading ) { #>
</ins><span class="cx"> <div class="media-progress-bar"><div></div></div>
</span><del>- <# } else if ( 'image' === type ) { #>
</del><ins>+ <# } else if ( 'image' === data.type ) { #>
</ins><span class="cx"> <div class="thumbnail">
</span><span class="cx"> <div class="centered">
</span><del>- <img src="{{ url }}" draggable="false" />
</del><ins>+ <img src="{{ data.url }}" draggable="false" />
</ins><span class="cx"> </div>
</span><span class="cx"> </div>
</span><span class="cx"> <# } else { #>
</span><del>- <img src="{{ icon }}" class="icon" draggable="false" />
- <div class="filename">{{ filename }}</div>
</del><ins>+ <img src="{{ data.icon }}" class="icon" draggable="false" />
+ <div class="filename">{{ data.filename }}</div>
</ins><span class="cx"> <# } #>
</span><span class="cx">
</span><del>- <# if ( buttons.close ) { #>
</del><ins>+ <# if ( data.buttons.close ) { #>
</ins><span class="cx"> <a class="close button" href="#">&times;</a>
</span><span class="cx"> <# } #>
</span><span class="cx"> </div>
</span><del>- <# if ( describe ) { #>
- <# if ( 'image' === type ) { #>
</del><ins>+ <# if ( data.describe ) { #>
+ <# if ( 'image' === data.type ) { #>
</ins><span class="cx"> <textarea class="describe"
</span><span class="cx"> placeholder="<?php esc_attr_e('Describe this image&hellip;'); ?>"
</span><del>- >{{ caption }}</textarea>
</del><ins>+ >{{ data.caption }}</textarea>
</ins><span class="cx"> <# } else { #>
</span><span class="cx"> <textarea class="describe"
</span><del>- <# if ( 'video' === type ) { #>
</del><ins>+ <# if ( 'video' === data.type ) { #>
</ins><span class="cx"> placeholder="<?php esc_attr_e('Describe this video&hellip;'); ?>"
</span><del>- <# } else if ( 'audio' === type ) { #>
</del><ins>+ <# } else if ( 'audio' === data.type ) { #>
</ins><span class="cx"> placeholder="<?php esc_attr_e('Describe this audio file&hellip;'); ?>"
</span><span class="cx"> <# } else { #>
</span><span class="cx"> placeholder="<?php esc_attr_e('Describe this media file&hellip;'); ?>"
</span><span class="cx"> <# } #>
</span><del>- >{{ title }}</textarea>
</del><ins>+ >{{ data.title }}</textarea>
</ins><span class="cx"> <# } #>
</span><span class="cx"> <# } #>
</span><span class="cx"> </script>
</span><span class="lines">@@ -1465,50 +1465,50 @@
</span><span class="cx"> <h3><?php _e('Attachment Details'); ?></h3>
</span><span class="cx"> <div class="attachment-info">
</span><span class="cx"> <div class="thumbnail">
</span><del>- <# if ( uploading ) { #>
</del><ins>+ <# if ( data.uploading ) { #>
</ins><span class="cx"> <div class="media-progress-bar"><div></div></div>
</span><del>- <# } else if ( 'image' === type ) { #>
- <img src="{{ url }}" draggable="false" />
</del><ins>+ <# } else if ( 'image' === data.type ) { #>
+ <img src="{{ data.url }}" draggable="false" />
</ins><span class="cx"> <# } else { #>
</span><del>- <img src="{{ icon }}" class="icon" draggable="false" />
</del><ins>+ <img src="{{ data.icon }}" class="icon" draggable="false" />
</ins><span class="cx"> <# } #>
</span><span class="cx"> </div>
</span><span class="cx"> <div class="details">
</span><del>- <div class="filename">{{ filename }}</div>
- <div class="uploaded">{{ dateFormatted }}</div>
- <# if ( 'image' === type && ! uploading ) { #>
- <div class="dimensions">{{ width }} &times; {{ height }}</div>
</del><ins>+ <div class="filename">{{ data.filename }}</div>
+ <div class="uploaded">{{ data.dateFormatted }}</div>
+ <# if ( 'image' === data.type && ! data.uploading ) { #>
+ <div class="dimensions">{{ data.width }} &times; {{ data.height }}</div>
</ins><span class="cx"> <# } #>
</span><span class="cx"> </div>
</span><span class="cx"> <div class="compat-meta">
</span><del>- <# if ( compat && compat.meta ) { #>
- {{{ compat.meta }}}
</del><ins>+ <# if ( data.compat && data.compat.meta ) { #>
+ {{{ data.compat.meta }}}
</ins><span class="cx"> <# } #>
</span><span class="cx"> </div>
</span><span class="cx"> </div>
</span><span class="cx">
</span><del>- <# if ( 'image' === type ) { #>
</del><ins>+ <# if ( 'image' === data.type ) { #>
</ins><span class="cx"> <label class="setting" data-setting="title">
</span><span class="cx"> <span><?php _e('Title'); ?></span>
</span><del>- <input type="text" value="{{ title }}" />
</del><ins>+ <input type="text" value="{{ data.title }}" />
</ins><span class="cx"> </label>
</span><span class="cx"> <label class="setting" data-setting="caption">
</span><span class="cx"> <span><?php _e('Caption'); ?></span>
</span><span class="cx"> <textarea
</span><span class="cx"> placeholder="<?php esc_attr_e('Describe this image&hellip;'); ?>"
</span><del>- >{{ caption }}</textarea>
</del><ins>+ >{{ data.caption }}</textarea>
</ins><span class="cx"> </label>
</span><span class="cx"> <label class="setting" data-setting="alt">
</span><span class="cx"> <span><?php _e('Alt Text'); ?></span>
</span><del>- <input type="text" value="{{ alt }}" />
</del><ins>+ <input type="text" value="{{ data.alt }}" />
</ins><span class="cx"> </label>
</span><span class="cx"> <# } else { #>
</span><span class="cx"> <label class="setting" data-setting="title">
</span><span class="cx"> <span><?php _e('Title'); ?></span>
</span><del>- <input type="text" value="{{ title }}"
- <# if ( 'video' === type ) { #>
</del><ins>+ <input type="text" value="{{ data.title }}"
+ <# if ( 'video' === data.type ) { #>
</ins><span class="cx"> placeholder="<?php esc_attr_e('Describe this video&hellip;'); ?>"
</span><del>- <# } else if ( 'audio' === type ) { #>
</del><ins>+ <# } else if ( 'audio' === data.type ) { #>
</ins><span class="cx"> placeholder="<?php esc_attr_e('Describe this audio file&hellip;'); ?>"
</span><span class="cx"> <# } else { #>
</span><span class="cx"> placeholder="<?php esc_attr_e('Describe this media file&hellip;'); ?>"
</span><span class="lines">@@ -1520,7 +1520,7 @@
</span><span class="cx"> <script type="text/html" id="tmpl-media-selection">
</span><span class="cx"> <div class="selection-info">
</span><span class="cx"> <span class="count"></span>
</span><del>- <# if ( clearable ) { #>
</del><ins>+ <# if ( data.clearable ) { #>
</ins><span class="cx"> <a class="clear-selection" href="#"><?php _e('Clear'); ?></a>
</span><span class="cx"> <# } #>
</span><span class="cx"> </div>
</span><span class="lines">@@ -1528,14 +1528,14 @@
</span><span class="cx"> </script>
</span><span class="cx">
</span><span class="cx"> <script type="text/html" id="tmpl-media-selection-preview">
</span><del>- <div class="selected-img selected-count-{{ count }}">
- <# if ( thumbnail ) { #>
- <img src="{{ thumbnail }}" draggable="false" />
</del><ins>+ <div class="selected-img selected-count-{{ data.count }}">
+ <# if ( data.thumbnail ) { #>
+ <img src="{{ data.thumbnail }}" draggable="false" />
</ins><span class="cx"> <# } #>
</span><span class="cx">
</span><del>- <span class="count">{{ count }}</span>
</del><ins>+ <span class="count">{{ data.count }}</span>
</ins><span class="cx"> </div>
</span><del>- <# if ( clearable ) { #>
</del><ins>+ <# if ( data.clearable ) { #>
</ins><span class="cx"> <a class="clear-selection" href="#"><?php _e('Clear selection'); ?></a>
</span><span class="cx"> <# } #>
</span><span class="cx"> </script>
</span><span class="lines">@@ -1547,7 +1547,7 @@
</span><span class="cx"> <span><?php _e('Alignment'); ?></span>
</span><span class="cx"> <select class="alignment"
</span><span class="cx"> data-setting="align"
</span><del>- <# if ( userSettings ) { #>
</del><ins>+ <# if ( data.userSettings ) { #>
</ins><span class="cx"> data-user-setting="align"
</span><span class="cx"> <# } #>>
</span><span class="cx">
</span><span class="lines">@@ -1571,7 +1571,7 @@
</span><span class="cx"> <span><?php _e('Link To'); ?></span>
</span><span class="cx"> <select class="link-to"
</span><span class="cx"> data-setting="link"
</span><del>- <# if ( userSettings ) { #>
</del><ins>+ <# if ( data.userSettings ) { #>
</ins><span class="cx"> data-user-setting="urlbutton"
</span><span class="cx"> <# } #>>
</span><span class="cx">
</span><span class="lines">@@ -1592,12 +1592,12 @@
</span><span class="cx"> <input type="text" class="link-to-custom" data-setting="linkUrl" />
</span><span class="cx"> </div>
</span><span class="cx">
</span><del>- <# if ( 'undefined' !== typeof sizes ) { #>
</del><ins>+ <# if ( 'undefined' !== typeof data.sizes ) { #>
</ins><span class="cx"> <label class="setting">
</span><span class="cx"> <span><?php _e('Size'); ?></span>
</span><span class="cx"> <select class="size" name="size"
</span><span class="cx"> data-setting="size"
</span><del>- <# if ( userSettings ) { #>
</del><ins>+ <# if ( data.userSettings ) { #>
</ins><span class="cx"> data-user-setting="imgsize"
</span><span class="cx"> <# } #>>
</span><span class="cx"> <?php
</span><span class="lines">@@ -1613,7 +1613,7 @@
</span><span class="cx"> if ( 'full' === $name )
</span><span class="cx"> continue;
</span><span class="cx"> ?>
</span><del>- <# if ( sizes['<?php echo esc_js( $value ); ?>'] ) { #>
</del><ins>+ <# if ( data.sizes['<?php echo esc_js( $value ); ?>'] ) { #>
</ins><span class="cx"> <option value="<?php echo esc_attr( $value ); ?>" <?php selected( $value, 'medium' ); ?>>
</span><span class="cx"> <?php echo esc_html( $name ); ?>
</span><span class="cx"> </option>
</span><span class="lines">@@ -1637,7 +1637,7 @@
</span><span class="cx"> <span><?php _e('Link To'); ?></span>
</span><span class="cx"> <select class="link-to"
</span><span class="cx"> data-setting="link"
</span><del>- <# if ( userSettings ) { #>
</del><ins>+ <# if ( data.userSettings ) { #>
</ins><span class="cx"> data-user-setting="urlbutton"
</span><span class="cx"> <# } #>>
</span><span class="cx">
</span><span class="lines">@@ -1672,7 +1672,7 @@
</span><span class="cx">
</span><span class="cx"> <script type="text/html" id="tmpl-embed-image-settings">
</span><span class="cx"> <div class="thumbnail">
</span><del>- <img src="{{ model.url }}" draggable="false" />
</del><ins>+ <img src="{{ data.model.url }}" draggable="false" />
</ins><span class="cx"> </div>
</span><span class="cx">
</span><span class="cx"> <label class="setting caption">
</span><span class="lines">@@ -1720,58 +1720,31 @@
</span><span class="cx"> </div>
</span><span class="cx"> </script>
</span><span class="cx">
</span><del>- <script type="text/html" id="tmpl-editor-attachment">
- <div class="editor-attachment-preview">
- <# if ( url ) { #>
- <img src="{{ url }}" width="{{ width }}" height="{{ height }}" draggable="false" />
- <# } #>
-
- <# if ( uploading ) { #>
- <div class="media-progress-bar"><div></div></div>
- <# } #>
- <div class="overlay">
- <div class="button close">&times;</div>
- </div>
- </div>
- <div class="describe"></div>
- </script>
-
- <script type="text/html" id="tmpl-editor-gallery">
- <# if ( url ) { #>
- <img src="{{ url }}" draggable="false" />
- <# } #>
-
- <div class="overlay">
- <div class="button close">&times;</div>
- <div class="button edit"><?php _e('Edit'); ?></div>
- </div>
- </script>
-
</del><span class="cx"> <script type="text/html" id="tmpl-attachments-css">
</span><del>- <style type="text/css" id="{{ id }}-css">
- #{{ id }} {
- padding: 0 {{ gutter }}px;
</del><ins>+ <style type="text/css" id="{{ data.id }}-css">
+ #{{ data.id }} {
+ padding: 0 {{ data.gutter }}px;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- #{{ id }} .attachment {
- margin: {{ gutter }}px;
- width: {{ edge }}px;
</del><ins>+ #{{ data.id }} .attachment {
+ margin: {{ data.gutter }}px;
+ width: {{ data.edge }}px;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- #{{ id }} .attachment-preview,
- #{{ id }} .attachment-preview .thumbnail {
- width: {{ edge }}px;
- height: {{ edge }}px;
</del><ins>+ #{{ data.id }} .attachment-preview,
+ #{{ data.id }} .attachment-preview .thumbnail {
+ width: {{ data.edge }}px;
+ height: {{ data.edge }}px;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- #{{ id }} .portrait .thumbnail img {
- width: {{ edge }}px;
</del><ins>+ #{{ data.id }} .portrait .thumbnail img {
+ width: {{ data.edge }}px;
</ins><span class="cx"> height: auto;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- #{{ id }} .landscape .thumbnail img {
</del><ins>+ #{{ data.id }} .landscape .thumbnail img {
</ins><span class="cx"> width: auto;
</span><del>- height: {{ edge }}px;
</del><ins>+ height: {{ data.edge }}px;
</ins><span class="cx"> }
</span><span class="cx"> </style>
</span><span class="cx"> </script>
</span></span></pre>
</div>
</div>
</body>
</html>