WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Media: Convert templates to use a data variable instead of with statements. see #21390. 

git-svn-id: http://core.svn.wordpress.org/trunk@22578 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Daryl Koopersmith 2012-11-14 21:51:41 +00:00
parent 6abb3eed64
commit cf50d92087
2 changed files with 60 additions and 86 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
wp-includes/js/media-models.js
View File

@ -80,7 +80,8 @@ window.wp = window.wp || {};
options = { options = {
evaluate: /<#([\s\S]+?)#>/g, evaluate: /<#([\s\S]+?)#>/g,
interpolate: /\{\{\{([\s\S]+?)\}\}\}/g, interpolate: /\{\{\{([\s\S]+?)\}\}\}/g,
escape: /\{\{([^\}]+?)\}\}(?!\})/g escape: /\{\{([^\}]+?)\}\}(?!\})/g,
variable: 'data'
}; };
return function( data ) { return function( data ) {

143
wp-includes/media.php
View File

@ -1390,7 +1390,7 @@ function wp_print_media_templates( $attachment ) {
?> ?>
<script type="text/html" id="tmpl-media-modal"> <script type="text/html" id="tmpl-media-modal">
<div class="media-modal"> <div class="media-modal">
<h3 class="media-modal-title">{{ title }}</h3> <h3 class="media-modal-title">{{ data.title }}</h3>
<a class="media-modal-close" href="" title="<?php esc_attr_e('Close'); ?>">&times;</a> <a class="media-modal-close" href="" title="<?php esc_attr_e('Close'); ?>">&times;</a>
</div> </div>
<div class="media-modal-backdrop"> <div class="media-modal-backdrop">
@ -1424,39 +1424,39 @@ function wp_print_media_templates( $attachment ) {
</script> </script>
<script type="text/html" id="tmpl-attachment"> <script type="text/html" id="tmpl-attachment">
<div class="attachment-preview type-{{ type }} subtype-{{ subtype }} {{ orientation }}"> <div class="attachment-preview type-{{ data.type }} subtype-{{ data.subtype }} {{ data.orientation }}">
<# if ( uploading ) { #> <# if ( data.uploading ) { #>
<div class="media-progress-bar"><div></div></div> <div class="media-progress-bar"><div></div></div>
<# } else if ( 'image' === type ) { #> <# } else if ( 'image' === data.type ) { #>
<div class="thumbnail"> <div class="thumbnail">
<div class="centered"> <div class="centered">
<img src="{{ url }}" draggable="false" /> <img src="{{ data.url }}" draggable="false" />
</div> </div>
</div> </div>
<# } else { #> <# } else { #>
<img src="{{ icon }}" class="icon" draggable="false" /> <img src="{{ data.icon }}" class="icon" draggable="false" />
<div class="filename">{{ filename }}</div> <div class="filename">{{ data.filename }}</div>
<# } #> <# } #>
<# if ( buttons.close ) { #> <# if ( data.buttons.close ) { #>
<a class="close button" href="#">&times;</a> <a class="close button" href="#">&times;</a>
<# } #> <# } #>
</div> </div>
<# if ( describe ) { #> <# if ( data.describe ) { #>
<# if ( 'image' === type ) { #> <# if ( 'image' === data.type ) { #>
<textarea class="describe" <textarea class="describe"
placeholder="<?php esc_attr_e('Describe this image&hellip;'); ?>" placeholder="<?php esc_attr_e('Describe this image&hellip;'); ?>"
>{{ caption }}</textarea> >{{ data.caption }}</textarea>
<# } else { #> <# } else { #>
<textarea class="describe" <textarea class="describe"
<# if ( 'video' === type ) { #> <# if ( 'video' === data.type ) { #>
placeholder="<?php esc_attr_e('Describe this video&hellip;'); ?>" placeholder="<?php esc_attr_e('Describe this video&hellip;'); ?>"
<# } else if ( 'audio' === type ) { #> <# } else if ( 'audio' === data.type ) { #>
placeholder="<?php esc_attr_e('Describe this audio file&hellip;'); ?>" placeholder="<?php esc_attr_e('Describe this audio file&hellip;'); ?>"
<# } else { #> <# } else { #>
placeholder="<?php esc_attr_e('Describe this media file&hellip;'); ?>" placeholder="<?php esc_attr_e('Describe this media file&hellip;'); ?>"
<# } #> <# } #>
>{{ title }}</textarea> >{{ data.title }}</textarea>
<# } #> <# } #>
<# } #> <# } #>
</script> </script>
@ -1465,50 +1465,50 @@ function wp_print_media_templates( $attachment ) {
<h3><?php _e('Attachment Details'); ?></h3> <h3><?php _e('Attachment Details'); ?></h3>
<div class="attachment-info"> <div class="attachment-info">
<div class="thumbnail"> <div class="thumbnail">
<# if ( uploading ) { #> <# if ( data.uploading ) { #>
<div class="media-progress-bar"><div></div></div> <div class="media-progress-bar"><div></div></div>
<# } else if ( 'image' === type ) { #> <# } else if ( 'image' === data.type ) { #>
<img src="{{ url }}" draggable="false" /> <img src="{{ data.url }}" draggable="false" />
<# } else { #> <# } else { #>
<img src="{{ icon }}" class="icon" draggable="false" /> <img src="{{ data.icon }}" class="icon" draggable="false" />
<# } #> <# } #>
</div> </div>
<div class="details"> <div class="details">
<div class="filename">{{ filename }}</div> <div class="filename">{{ data.filename }}</div>
<div class="uploaded">{{ dateFormatted }}</div> <div class="uploaded">{{ data.dateFormatted }}</div>
<# if ( 'image' === type && ! uploading ) { #> <# if ( 'image' === data.type && ! data.uploading ) { #>
<div class="dimensions">{{ width }} &times; {{ height }}</div> <div class="dimensions">{{ data.width }} &times; {{ data.height }}</div>
<# } #> <# } #>
</div> </div>
<div class="compat-meta"> <div class="compat-meta">
<# if ( compat && compat.meta ) { #> <# if ( data.compat && data.compat.meta ) { #>
{{{ compat.meta }}} {{{ data.compat.meta }}}
<# } #> <# } #>
</div> </div>
</div> </div>
<# if ( 'image' === type ) { #> <# if ( 'image' === data.type ) { #>
<label class="setting" data-setting="title"> <label class="setting" data-setting="title">
<span><?php _e('Title'); ?></span> <span><?php _e('Title'); ?></span>
<input type="text" value="{{ title }}" /> <input type="text" value="{{ data.title }}" />
</label> </label>
<label class="setting" data-setting="caption"> <label class="setting" data-setting="caption">
<span><?php _e('Caption'); ?></span> <span><?php _e('Caption'); ?></span>
<textarea <textarea
placeholder="<?php esc_attr_e('Describe this image&hellip;'); ?>" placeholder="<?php esc_attr_e('Describe this image&hellip;'); ?>"
>{{ caption }}</textarea> >{{ data.caption }}</textarea>
</label> </label>
<label class="setting" data-setting="alt"> <label class="setting" data-setting="alt">
<span><?php _e('Alt Text'); ?></span> <span><?php _e('Alt Text'); ?></span>
<input type="text" value="{{ alt }}" /> <input type="text" value="{{ data.alt }}" />
</label> </label>
<# } else { #> <# } else { #>
<label class="setting" data-setting="title"> <label class="setting" data-setting="title">
<span><?php _e('Title'); ?></span> <span><?php _e('Title'); ?></span>
<input type="text" value="{{ title }}" <input type="text" value="{{ data.title }}"
<# if ( 'video' === type ) { #> <# if ( 'video' === data.type ) { #>
placeholder="<?php esc_attr_e('Describe this video&hellip;'); ?>" placeholder="<?php esc_attr_e('Describe this video&hellip;'); ?>"
<# } else if ( 'audio' === type ) { #> <# } else if ( 'audio' === data.type ) { #>
placeholder="<?php esc_attr_e('Describe this audio file&hellip;'); ?>" placeholder="<?php esc_attr_e('Describe this audio file&hellip;'); ?>"
<# } else { #> <# } else { #>
placeholder="<?php esc_attr_e('Describe this media file&hellip;'); ?>" placeholder="<?php esc_attr_e('Describe this media file&hellip;'); ?>"
@ -1520,7 +1520,7 @@ function wp_print_media_templates( $attachment ) {
<script type="text/html" id="tmpl-media-selection"> <script type="text/html" id="tmpl-media-selection">
<div class="selection-info"> <div class="selection-info">
<span class="count"></span> <span class="count"></span>
<# if ( clearable ) { #> <# if ( data.clearable ) { #>
<a class="clear-selection" href="#"><?php _e('Clear'); ?></a> <a class="clear-selection" href="#"><?php _e('Clear'); ?></a>
<# } #> <# } #>
</div> </div>
@ -1528,14 +1528,14 @@ function wp_print_media_templates( $attachment ) {
</script> </script>
<script type="text/html" id="tmpl-media-selection-preview"> <script type="text/html" id="tmpl-media-selection-preview">
<div class="selected-img selected-count-{{ count }}"> <div class="selected-img selected-count-{{ data.count }}">
<# if ( thumbnail ) { #> <# if ( data.thumbnail ) { #>
<img src="{{ thumbnail }}" draggable="false" /> <img src="{{ data.thumbnail }}" draggable="false" />
<# } #> <# } #>
<span class="count">{{ count }}</span> <span class="count">{{ data.count }}</span>
</div> </div>
<# if ( clearable ) { #> <# if ( data.clearable ) { #>
<a class="clear-selection" href="#"><?php _e('Clear selection'); ?></a> <a class="clear-selection" href="#"><?php _e('Clear selection'); ?></a>
<# } #> <# } #>
</script> </script>
@ -1547,7 +1547,7 @@ function wp_print_media_templates( $attachment ) {
<span><?php _e('Alignment'); ?></span> <span><?php _e('Alignment'); ?></span>
<select class="alignment" <select class="alignment"
data-setting="align" data-setting="align"
<# if ( userSettings ) { #> <# if ( data.userSettings ) { #>
data-user-setting="align" data-user-setting="align"
<# } #>> <# } #>>
@ -1571,7 +1571,7 @@ function wp_print_media_templates( $attachment ) {
<span><?php _e('Link To'); ?></span> <span><?php _e('Link To'); ?></span>
<select class="link-to" <select class="link-to"
data-setting="link" data-setting="link"
<# if ( userSettings ) { #> <# if ( data.userSettings ) { #>
data-user-setting="urlbutton" data-user-setting="urlbutton"
<# } #>> <# } #>>
@ -1592,12 +1592,12 @@ function wp_print_media_templates( $attachment ) {
<input type="text" class="link-to-custom" data-setting="linkUrl" /> <input type="text" class="link-to-custom" data-setting="linkUrl" />
</div> </div>
<# if ( 'undefined' !== typeof sizes ) { #> <# if ( 'undefined' !== typeof data.sizes ) { #>
<label class="setting"> <label class="setting">
<span><?php _e('Size'); ?></span> <span><?php _e('Size'); ?></span>
<select class="size" name="size" <select class="size" name="size"
data-setting="size" data-setting="size"
<# if ( userSettings ) { #> <# if ( data.userSettings ) { #>
data-user-setting="imgsize" data-user-setting="imgsize"
<# } #>> <# } #>>
<?php <?php
@ -1613,7 +1613,7 @@ function wp_print_media_templates( $attachment ) {
if ( 'full' === $name ) if ( 'full' === $name )
continue; continue;
?> ?>
<# if ( sizes['<?php echo esc_js( $value ); ?>'] ) { #> <# if ( data.sizes['<?php echo esc_js( $value ); ?>'] ) { #>
<option value="<?php echo esc_attr( $value ); ?>" <?php selected( $value, 'medium' ); ?>> <option value="<?php echo esc_attr( $value ); ?>" <?php selected( $value, 'medium' ); ?>>
<?php echo esc_html( $name ); ?> <?php echo esc_html( $name ); ?>
</option> </option>
@ -1637,7 +1637,7 @@ function wp_print_media_templates( $attachment ) {
<span><?php _e('Link To'); ?></span> <span><?php _e('Link To'); ?></span>
<select class="link-to" <select class="link-to"
data-setting="link" data-setting="link"
<# if ( userSettings ) { #> <# if ( data.userSettings ) { #>
data-user-setting="urlbutton" data-user-setting="urlbutton"
<# } #>> <# } #>>
@ -1672,7 +1672,7 @@ function wp_print_media_templates( $attachment ) {
<script type="text/html" id="tmpl-embed-image-settings"> <script type="text/html" id="tmpl-embed-image-settings">
<div class="thumbnail"> <div class="thumbnail">
<img src="{{ model.url }}" draggable="false" /> <img src="{{ data.model.url }}" draggable="false" />
</div> </div>
<label class="setting caption"> <label class="setting caption">
@ -1720,58 +1720,31 @@ function wp_print_media_templates( $attachment ) {
</div> </div>
</script> </script>
<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>
<script type="text/html" id="tmpl-attachments-css"> <script type="text/html" id="tmpl-attachments-css">
<style type="text/css" id="{{ id }}-css"> <style type="text/css" id="{{ data.id }}-css">
#{{ id }} { #{{ data.id }} {
padding: 0 {{ gutter }}px; padding: 0 {{ data.gutter }}px;
} }
#{{ id }} .attachment { #{{ data.id }} .attachment {
margin: {{ gutter }}px; margin: {{ data.gutter }}px;
width: {{ edge }}px; width: {{ data.edge }}px;
} }
#{{ id }} .attachment-preview, #{{ data.id }} .attachment-preview,
#{{ id }} .attachment-preview .thumbnail { #{{ data.id }} .attachment-preview .thumbnail {
width: {{ edge }}px; width: {{ data.edge }}px;
height: {{ edge }}px; height: {{ data.edge }}px;
} }
#{{ id }} .portrait .thumbnail img { #{{ data.id }} .portrait .thumbnail img {
width: {{ edge }}px; width: {{ data.edge }}px;
height: auto; height: auto;
} }
#{{ id }} .landscape .thumbnail img { #{{ data.id }} .landscape .thumbnail img {
width: auto; width: auto;
height: {{ edge }}px; height: {{ data.edge }}px;
} }
</style> </style>
</script> </script>