<!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>[29019] trunk/src/wp-includes/js: TinyMCE wpView:</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/29019">29019</a></dd>
<dt>Author</dt> <dd>azaozz</dd>
<dt>Date</dt> <dd>2014-07-07 22:40:33 +0000 (Mon, 07 Jul 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>TinyMCE wpView:
- Add loadingPlaceholder() that returns some html to use as placeholder while the view is loading. Includes a subtle CSS based loading animation.
- Fix setContent(), it should empty the element before appending the new node.
- Change getHtml() to always return a string.
Fixes <a href="http://core.trac.wordpress.org/ticket/28761">#28761</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>
</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 (29018 => 29019)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/js/mce-view.js 2014-07-07 21:48:50 UTC (rev 29018)
+++ trunk/src/wp-includes/js/mce-view.js 2014-07-07 22:40:33 UTC (rev 29019)
</span><span class="lines">@@ -36,8 +36,19 @@
</span><span class="cx">
</span><span class="cx"> _.extend( wp.mce.View.prototype, {
</span><span class="cx"> initialize: function() {},
</span><del>- getHtml: function() {},
</del><ins>+ getHtml: function() {
+ return '';
+ },
+ loadingPlaceholder: function() {
+ return '' +
+ '<div class="loading-placeholder">' +
+ '<div class="dashicons dashicons-admin-media"></div>' +
+ '<div class="wpview-loading"><ins></ins></div>' +
+ '</div>';
+ },
</ins><span class="cx"> render: function() {
</span><ins>+ var html = this.getHtml() || this.loadingPlaceholder();
+
</ins><span class="cx"> this.setContent(
</span><span class="cx"> '<p class="wpview-selection-before">\u00a0</p>' +
</span><span class="cx"> '<div class="wpview-body" contenteditable="false">' +
</span><span class="lines">@@ -46,7 +57,7 @@
</span><span class="cx"> '<div class="dashicons dashicons-no-alt remove"></div>' +
</span><span class="cx"> '</div>' +
</span><span class="cx"> '<div class="wpview-content wpview-type-' + this.type + '">' +
</span><del>- this.getHtml() +
</del><ins>+ html +
</ins><span class="cx"> '</div>' +
</span><span class="cx"> ( this.overlay ? '<div class="wpview-overlay"></div>' : '' ) +
</span><span class="cx"> '</div>' +
</span><span class="lines">@@ -82,7 +93,7 @@
</span><span class="cx"> if ( option === 'replace' ) {
</span><span class="cx"> element = editor.dom.replace( html, wrap );
</span><span class="cx"> } else {
</span><del>- element.appendChild( html );
</del><ins>+ $( element ).empty().append( html );
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -359,7 +370,7 @@
</span><span class="cx">
</span><span class="cx"> // Don't render errors while still fetching attachments
</span><span class="cx"> if ( this.dfd && 'pending' === this.dfd.state() && ! this.attachments.length ) {
</span><del>- return;
</del><ins>+ return '';
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if ( this.attachments.length ) {
</span><span class="lines">@@ -605,7 +616,7 @@
</span><span class="cx">
</span><span class="cx"> // Don't render errors while still fetching attachments
</span><span class="cx"> if ( this.dfd && 'pending' === this.dfd.state() && ! this.attachments.length ) {
</span><del>- return;
</del><ins>+ return '';
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> _.each( model.defaults, function( value, key ) {
</span><span class="lines">@@ -813,9 +824,6 @@
</span><span class="cx"> $( '.wp-audio-shortcode, .wp-video-shortcode', this.node ).each( function ( i, element ) {
</span><span class="cx"> self.players.push( new MediaElementPlayer( element, self.mejsSettings ) );
</span><span class="cx"> } );
</span><del>- },
- getHtml: function() {
- return '';
</del><span class="cx"> }
</span><span class="cx"> } );
</span><span class="cx">
</span></span></pre></div>
<a id="trunksrcwpincludesjstinymceskinswordpresswpcontentcss"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-includes/js/tinymce/skins/wordpress/wp-content.css (29018 => 29019)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/js/tinymce/skins/wordpress/wp-content.css 2014-07-07 21:48:50 UTC (rev 29018)
+++ trunk/src/wp-includes/js/tinymce/skins/wordpress/wp-content.css 2014-07-07 22:40:33 UTC (rev 29019)
</span><span class="lines">@@ -311,6 +311,52 @@
</span><span class="cx"> display: block;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+.wpview-wrap .loading-placeholder {
+ border: 1px dashed #ccc;
+ padding: 10px;
+}
+
+.wpview-wrap[data-mce-selected] .loading-placeholder {
+ border-color: transparent;
+}
+
+/* A little "loading" animation, not showing in IE < 10 */
+.wpview-wrap .wpview-loading {
+ width: 60px;
+ height: 5px;
+ overflow: hidden;
+ background-color: transparent;
+ margin: 10px auto 0;
+}
+
+.wpview-wrap .wpview-loading ins {
+ background-color: #333;
+ margin: 0 0 0 -60px;
+ width: 60px;
+ height: 5px;
+ display: block;
+ -webkit-animation: wpview-loading 1.3s infinite 1s linear;
+ animation: wpview-loading 1.3s infinite 1s linear;
+}
+
+@-webkit-keyframes wpview-loading {
+ 0% {
+ margin-left: -60px;
+ }
+ 100% {
+ margin-left: 60px;
+ }
+}
+
+@keyframes wpview-loading {
+ 0% {
+ margin-left: -60px;
+ }
+ 100% {
+ margin-left: 60px;
+ }
+}
+
</ins><span class="cx"> #wp-image-toolbar {
</span><span class="cx"> position: absolute;
</span><span class="cx"> margin: 0;
</span><span class="lines">@@ -360,7 +406,8 @@
</span><span class="cx"> border-color: transparent;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-.wpview-error .dashicons {
</del><ins>+.wpview-error .dashicons,
+.loading-placeholder .dashicons {
</ins><span class="cx"> display: block;
</span><span class="cx"> margin: 0 auto;
</span><span class="cx"> width: 32px;
</span></span></pre>
</div>
</div>
</body>
</html>