<!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>[24215] trunk/wp-includes/js/tinymce: TinyMCE: fix for the disappearing placeholders bug in Chrome, see #24177</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/24215">24215</a></dd>
<dt>Author</dt> <dd>azaozz</dd>
<dt>Date</dt> <dd>2013-05-09 00:24:45 +0000 (Thu, 09 May 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>TinyMCE: fix for the disappearing placeholders bug in Chrome, see <a href="http://core.trac.wordpress.org/ticket/24177">#24177</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpincludesjstinymcepluginswordpresseditor_plugin_srcjs">trunk/wp-includes/js/tinymce/plugins/wordpress/editor_plugin_src.js</a></li>
<li><a href="#trunkwpincludesjstinymcepluginswpgalleryeditor_plugin_srcjs">trunk/wp-includes/js/tinymce/plugins/wpgallery/editor_plugin_src.js</a></li>
<li><a href="#trunkwpincludesjstinymcethemesadvancedskinswp_themecontentcss">trunk/wp-includes/js/tinymce/themes/advanced/skins/wp_theme/content.css</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpincludesjstinymcepluginswordpresseditor_plugin_srcjs"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/js/tinymce/plugins/wordpress/editor_plugin_src.js (24214 => 24215)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/js/tinymce/plugins/wordpress/editor_plugin_src.js 2013-05-09 00:22:02 UTC (rev 24214)
+++ trunk/wp-includes/js/tinymce/plugins/wordpress/editor_plugin_src.js 2013-05-09 00:24:45 UTC (rev 24215)
</span><span class="lines">@@ -8,8 +8,8 @@
</span><span class="cx"> tinymce.create('tinymce.plugins.WordPress', {
</span><span class="cx"> init : function(ed, url) {
</span><span class="cx"> var t = this, tbId = ed.getParam('wordpress_adv_toolbar', 'toolbar2'), last = 0, moreHTML, nextpageHTML, closeOnClick, mod_key, style;
</span><del>- moreHTML = '<img src="' + url + '/img/trans.gif" class="mceWPmore mceItemNoResize" title="'+ed.getLang('wordpress.wp_more_alt')+'" />';
- nextpageHTML = '<img src="' + url + '/img/trans.gif" class="mceWPnextpage mceItemNoResize" title="'+ed.getLang('wordpress.wp_page_alt')+'" />';
</del><ins>+ moreHTML = '<img src="' + url + '/img/trans.gif" class="mce-wp-more mceItemNoResize" title="'+ed.getLang('wordpress.wp_more_alt')+'" />';
+ nextpageHTML = '<img src="' + url + '/img/trans.gif" class="mce-wp-nextpage mceItemNoResize" title="'+ed.getLang('wordpress.wp_page_alt')+'" />';
</ins><span class="cx">
</span><span class="cx"> if ( getUserSetting('hidetb', '0') == '1' )
</span><span class="cx"> ed.settings.wordpress_adv_hidden = 0;
</span><span class="lines">@@ -383,17 +383,17 @@
</span><span class="cx"> _handleMoreBreak : function(ed, url) {
</span><span class="cx"> var moreHTML, nextpageHTML;
</span><span class="cx">
</span><del>- moreHTML = '<img src="' + url + '/img/trans.gif" alt="$1" class="mceWPmore mceItemNoResize" title="'+ed.getLang('wordpress.wp_more_alt')+'" />';
- nextpageHTML = '<img src="' + url + '/img/trans.gif" class="mceWPnextpage mceItemNoResize" title="'+ed.getLang('wordpress.wp_page_alt')+'" />';
</del><ins>+ moreHTML = '<img src="' + url + '/img/trans.gif" alt="$1" class="mce-wp-more mceItemNoResize" title="'+ed.getLang('wordpress.wp_more_alt')+'" />';
+ nextpageHTML = '<img src="' + url + '/img/trans.gif" class="mce-wp-nextpage mceItemNoResize" title="'+ed.getLang('wordpress.wp_page_alt')+'" />';
</ins><span class="cx">
</span><span class="cx"> // Display morebreak instead if img in element path
</span><span class="cx"> ed.onPostRender.add(function() {
</span><span class="cx"> if (ed.theme.onResolveName) {
</span><span class="cx"> ed.theme.onResolveName.add(function(th, o) {
</span><span class="cx"> if (o.node.nodeName == 'IMG') {
</span><del>- if ( ed.dom.hasClass(o.node, 'mceWPmore') )
</del><ins>+ if ( ed.dom.hasClass(o.node, 'mce-wp-more') )
</ins><span class="cx"> o.name = 'wpmore';
</span><del>- if ( ed.dom.hasClass(o.node, 'mceWPnextpage') )
</del><ins>+ if ( ed.dom.hasClass(o.node, 'mce-wp-nextpage') )
</ins><span class="cx"> o.name = 'wppage';
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -413,11 +413,11 @@
</span><span class="cx"> ed.onPostProcess.add(function(ed, o) {
</span><span class="cx"> if (o.get)
</span><span class="cx"> o.content = o.content.replace(/<img[^>]+>/g, function(im) {
</span><del>- if (im.indexOf('class="mceWPmore') !== -1) {
</del><ins>+ if (im.indexOf('class="mce-wp-more') !== -1) {
</ins><span class="cx"> var m, moretext = (m = im.match(/alt="(.*?)"/)) ? m[1] : '';
</span><span class="cx"> im = '<!--more'+moretext+'-->';
</span><span class="cx"> }
</span><del>- if (im.indexOf('class="mceWPnextpage') !== -1)
</del><ins>+ if (im.indexOf('class="mce-wp-nextpage') !== -1)
</ins><span class="cx"> im = '<!--nextpage-->';
</span><span class="cx">
</span><span class="cx"> return im;
</span><span class="lines">@@ -426,8 +426,8 @@
</span><span class="cx">
</span><span class="cx"> // Set active buttons if user selected pagebreak or more break
</span><span class="cx"> ed.onNodeChange.add(function(ed, cm, n) {
</span><del>- cm.setActive('wp_page', n.nodeName === 'IMG' && ed.dom.hasClass(n, 'mceWPnextpage'));
- cm.setActive('wp_more', n.nodeName === 'IMG' && ed.dom.hasClass(n, 'mceWPmore'));
</del><ins>+ cm.setActive('wp_page', n.nodeName === 'IMG' && ed.dom.hasClass(n, 'mce-wp-nextpage'));
+ cm.setActive('wp_more', n.nodeName === 'IMG' && ed.dom.hasClass(n, 'mce-wp-more'));
</ins><span class="cx"> });
</span><span class="cx"> }
</span><span class="cx"> });
</span></span></pre></div>
<a id="trunkwpincludesjstinymcepluginswpgalleryeditor_plugin_srcjs"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/js/tinymce/plugins/wpgallery/editor_plugin_src.js (24214 => 24215)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/js/tinymce/plugins/wpgallery/editor_plugin_src.js 2013-05-09 00:22:02 UTC (rev 24214)
+++ trunk/wp-includes/js/tinymce/plugins/wpgallery/editor_plugin_src.js 2013-05-09 00:24:45 UTC (rev 24215)
</span><span class="lines">@@ -23,7 +23,7 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> // Make sure we've selected a gallery node.
</span><del>- if ( el.nodeName != 'IMG' || ed.dom.getAttrib(el, 'class').indexOf('wpGallery') == -1 )
</del><ins>+ if ( el.nodeName != 'IMG' || ed.dom.getAttrib(el, 'class').indexOf('wp-gallery') == -1 )
</ins><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> frame = gallery.edit( '[' + ed.dom.getAttrib( el, 'title' ) + ']' );
</span><span class="lines">@@ -40,7 +40,7 @@
</span><span class="cx"> ed.dom.events.add(ed.getBody(), 'touchstart', function(e){
</span><span class="cx"> var target = e.target;
</span><span class="cx">
</span><del>- if ( target.nodeName == 'IMG' && ed.dom.hasClass(target, 'wpGallery') ) {
</del><ins>+ if ( target.nodeName == 'IMG' && ed.dom.hasClass(target, 'wp-gallery') ) {
</ins><span class="cx"> ed.selection.select(target);
</span><span class="cx"> ed.dom.events.cancel(e);
</span><span class="cx"> ed.plugins.wordpress._hideButtons();
</span><span class="lines">@@ -51,7 +51,7 @@
</span><span class="cx"> });
</span><span class="cx">
</span><span class="cx"> ed.onMouseDown.add(function(ed, e) {
</span><del>- if ( e.target.nodeName == 'IMG' && ed.dom.hasClass(e.target, 'wpGallery') ) {
</del><ins>+ if ( e.target.nodeName == 'IMG' && ed.dom.hasClass(e.target, 'wp-gallery') ) {
</ins><span class="cx"> ed.plugins.wordpress._hideButtons();
</span><span class="cx"> ed.plugins.wordpress._showButtons(e.target, 'wp_gallerybtns');
</span><span class="cx"> }
</span><span class="lines">@@ -69,7 +69,7 @@
</span><span class="cx">
</span><span class="cx"> _do_gallery : function(co) {
</span><span class="cx"> return co.replace(/\[gallery([^\]]*)\]/g, function(a,b){
</span><del>- return '<img src="'+tinymce.baseURL+'/plugins/wpgallery/img/t.gif" class="wpGallery mceItem" title="gallery'+tinymce.DOM.encode(b)+'" />';
</del><ins>+ return '<img src="'+tinymce.baseURL+'/plugins/wpgallery/img/t.gif" class="wp-gallery mceItem" title="gallery'+tinymce.DOM.encode(b)+'" />';
</ins><span class="cx"> });
</span><span class="cx"> },
</span><span class="cx">
</span><span class="lines">@@ -83,7 +83,7 @@
</span><span class="cx"> return co.replace(/(?:<p[^>]*>)*(<img[^>]+>)(?:<\/p>)*/g, function(a,im) {
</span><span class="cx"> var cls = getAttr(im, 'class');
</span><span class="cx">
</span><del>- if ( cls.indexOf('wpGallery') != -1 )
</del><ins>+ if ( cls.indexOf('wp-gallery') != -1 )
</ins><span class="cx"> return '<p>['+tinymce.trim(getAttr(im, 'title'))+']</p>';
</span><span class="cx">
</span><span class="cx"> return a;
</span><span class="lines">@@ -130,7 +130,7 @@
</span><span class="cx"> tinymce.dom.Event.add(dellButton, 'mousedown', function(e) {
</span><span class="cx"> var ed = tinymce.activeEditor, el = ed.selection.getNode();
</span><span class="cx">
</span><del>- if ( el.nodeName == 'IMG' && ed.dom.hasClass(el, 'wpGallery') ) {
</del><ins>+ if ( el.nodeName == 'IMG' && ed.dom.hasClass(el, 'wp-gallery') ) {
</ins><span class="cx"> ed.dom.remove(el);
</span><span class="cx">
</span><span class="cx"> ed.execCommand('mceRepaint');
</span></span></pre></div>
<a id="trunkwpincludesjstinymcethemesadvancedskinswp_themecontentcss"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/js/tinymce/themes/advanced/skins/wp_theme/content.css (24214 => 24215)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/js/tinymce/themes/advanced/skins/wp_theme/content.css 2013-05-09 00:22:02 UTC (rev 24214)
+++ trunk/wp-includes/js/tinymce/themes/advanced/skins/wp_theme/content.css 2013-05-09 00:24:45 UTC (rev 24215)
</span><span class="lines">@@ -99,8 +99,8 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /* Styles for the WordPress plugins */
</span><del>-img.mceWPnextpage,
-img.mceWPmore {
</del><ins>+img.mce-wp-nextpage,
+img.mce-wp-more {
</ins><span class="cx"> border: 0;
</span><span class="cx"> border-top: 1px dotted #cccccc;
</span><span class="cx"> display: block;
</span><span class="lines">@@ -109,15 +109,15 @@
</span><span class="cx"> margin: 15px auto 0;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-img.mceWPmore {
</del><ins>+img.mce-wp-more {
</ins><span class="cx"> background: transparent url("img/more_bug.gif") no-repeat right top;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-img.mceWPnextpage {
</del><ins>+img.mce-wp-nextpage {
</ins><span class="cx"> background: transparent url("img/page_bug.gif") no-repeat right top;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-img.wpGallery {
</del><ins>+img.wp-gallery {
</ins><span class="cx"> border: 1px dashed #888;
</span><span class="cx"> background: #f2f8ff url("img/gallery.png") no-repeat scroll center center;
</span><span class="cx"> width: 99%;
</span></span></pre>
</div>
</div>
</body>
</html>