<!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>[27899] trunk/src/wp-includes: Gallery preview: add a "No items found" state which is displayed when rendering the gallery wpview and no attachments are found.</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/27899">27899</a></dd>
<dt>Author</dt> <dd>azaozz</dd>
<dt>Date</dt> <dd>2014-04-02 02:17:39 +0000 (Wed, 02 Apr 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Gallery preview: add a "No items found" state which is displayed when rendering the gallery wpview and no attachments are found. Props gcorne, fixes <a href="http://core.trac.wordpress.org/ticket/27558">#27558</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpincludesjsmceviewjs">trunk/src/wp-includes/js/mce-view.js</a></li>
<li><a href="#trunksrcwpincludesjstinymceskinswordpresswpcontentcss">trunk/src/wp-includes/js/tinymce/skins/wordpress/wp-content.css</a></li>
<li><a href="#trunksrcwpincludesmediatemplatephp">trunk/src/wp-includes/media-template.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpincludesjsmceviewjs"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-includes/js/mce-view.js (27898 => 27899)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/js/mce-view.js 2014-04-02 01:53:56 UTC (rev 27898)
+++ trunk/src/wp-includes/js/mce-view.js 2014-04-02 02:17:39 UTC (rev 27899)
</span><span class="lines">@@ -26,7 +26,7 @@
</span><span class="cx">
</span><span class="cx"> _.extend( wp.mce.View.prototype, {
</span><span class="cx"> initialize: function() {},
</span><del>- html: function() {},
</del><ins>+ getHtml: function() {},
</ins><span class="cx"> render: function() {
</span><span class="cx"> var html = this.getHtml();
</span><span class="cx"> // Search all tinymce editor instances and update the placeholders
</span><span class="lines">@@ -267,27 +267,30 @@
</span><span class="cx">
</span><span class="cx"> fetch: function() {
</span><span class="cx"> this.attachments = wp.media.gallery.attachments( this.shortcode, this.postID );
</span><del>- this.attachments.more().done( _.bind( this.render, this ) );
</del><ins>+ this.dfd = this.attachments.more().done( _.bind( this.render, this ) );
</ins><span class="cx"> },
</span><span class="cx">
</span><span class="cx"> getHtml: function() {
</span><span class="cx"> var attrs = this.shortcode.attrs.named,
</span><del>- options,
- attachments;
</del><ins>+ attachments = false,
+ options;
</ins><span class="cx">
</span><del>- if ( ! this.attachments.length ) {
</del><ins>+ // Don't render errors while still fetching attachments
+ if ( this.dfd && 'pending' === this.dfd.state() && ! this.attachments.length ) {
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- attachments = this.attachments.toJSON();
</del><ins>+ if ( this.attachments.length ) {
+ attachments = this.attachments.toJSON();
</ins><span class="cx">
</span><del>- _.each( attachments, function( attachment ) {
- if ( attachment.sizes.thumbnail ) {
- attachment.thumbnail = attachment.sizes.thumbnail;
- } else {
- attachment.thumbnail = attachment.sizes.full;
- }
- } );
</del><ins>+ _.each( attachments, function( attachment ) {
+ if ( attachment.sizes.thumbnail ) {
+ attachment.thumbnail = attachment.sizes.thumbnail;
+ } else {
+ attachment.thumbnail = attachment.sizes.full;
+ }
+ } );
+ }
</ins><span class="cx">
</span><span class="cx"> options = {
</span><span class="cx"> attachments: attachments,
</span></span></pre></div>
<a id="trunksrcwpincludesjstinymceskinswordpresswpcontentcss"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-includes/js/tinymce/skins/wordpress/wp-content.css (27898 => 27899)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/js/tinymce/skins/wordpress/wp-content.css 2014-04-02 01:53:56 UTC (rev 27898)
+++ trunk/src/wp-includes/js/tinymce/skins/wordpress/wp-content.css 2014-04-02 02:17:39 UTC (rev 27899)
</span><span class="lines">@@ -328,6 +328,30 @@
</span><span class="cx"> overflow-x: hidden;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+.gallery-error {
+ border: 1px solid #dedede;
+ padding: 20px 0;
+ margin: 0;
+}
+
+.selected .gallery-error {
+ border-color: transparent;
+}
+
+.gallery-error .dashicons {
+ display: block;
+ margin: 0 auto;
+ width: 32px;
+ height: 32px;
+ font-size: 32px;
+}
+
+.gallery-error p {
+ margin: 0;
+ text-align: center;
+ font-family: 'Open Sans', sans-serif;
+}
+
</ins><span class="cx"> .gallery .gallery-item {
</span><span class="cx"> float: left;
</span><span class="cx"> margin: 0;
</span></span></pre></div>
<a id="trunksrcwpincludesmediatemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-includes/media-template.php (27898 => 27899)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/media-template.php 2014-04-02 01:53:56 UTC (rev 27898)
+++ trunk/src/wp-includes/media-template.php 2014-04-02 02:17:39 UTC (rev 27899)
</span><span class="lines">@@ -970,26 +970,32 @@
</span><span class="cx"> </div>
</span><span class="cx"> </div>
</span><span class="cx"> </script>
</span><ins>+
</ins><span class="cx"> <script type="text/html" id="tmpl-editor-gallery">
</span><span class="cx"> <div class="toolbar">
</span><span class="cx"> <div class="dashicons dashicons-edit edit"></div><div class="dashicons dashicons-no-alt remove"></div>
</span><span class="cx"> </div>
</span><del>- <div class="gallery gallery-columns-{{ data.columns }}">
- <# _.each( data.attachments, function( attachment, index ) { #>
- <dl class="gallery-item">
- <dt class="gallery-icon">
- <img src="{{ attachment.thumbnail.url }}" width="{{ attachment.thumbnail.width }}" height="{{ attachment.thumbnail.height }}" />
- </dt>
- <dd class="wp-caption-text gallery-caption">
- {{ attachment.caption }}
- </dd>
- </dl>
- <# if ( index % data.columns === data.columns - 1 ) { #>
- <br style="clear: both;">
- <# } #>
-
- <# } ); #>
- </div>
</del><ins>+ <# if ( data.attachments ) { #>
+ <div class="gallery gallery-columns-{{{ data.columns }}}">
+ <# _.each( data.attachments, function( attachment, index ) { #>
+ <dl class="gallery-item">
+ <dt class="gallery-icon">
+ <img src="{{{ attachment.thumbnail.url }}}" width="{{ attachment.thumbnail.width }}" height="{{ attachment.thumbnail.height }}" />
+ </dt>
+ <dd class="wp-caption-text gallery-caption">
+ {{ attachment.caption }}
+ </dd>
+ </dl>
+ <# if ( index % data.columns === data.columns - 1 ) { #>
+ <br style="clear: both;">
+ <# } #>
+ <# } ); #>
+ </div>
+ <# } else { #>
+ <div class="gallery-error">
+ <div class="dashicons dashicons-format-gallery"></div><p><?php _e( 'No items found.' ); ?></p>
+ </div>
+ <# } #>
</ins><span class="cx"> </script>
</span><span class="cx">
</span><span class="cx"> <script type="text/html" id="tmpl-editor-audio">
</span></span></pre>
</div>
</div>
</body>
</html>