<!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>[26880] trunk/src/wp-includes: TinyMCE:</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/26880">26880</a></dd>
<dt>Author</dt> <dd>azaozz</dd>
<dt>Date</dt> <dd>2013-12-30 01:53:25 +0000 (Mon, 30 Dec 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>TinyMCE:
- Fix toolbar icons in IE9.
- Remove background gradients in IE < 10.
- Lint our plugins.
- Add draggable attribute to the caption wrapper and make the captioned images non-draggable in Chrome.
See <a href="http://core.trac.wordpress.org/ticket/24067">#24067</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpincludescsseditorcss">trunk/src/wp-includes/css/editor.css</a></li>
<li><a href="#trunksrcwpincludesjstinymcepluginswordpresspluginjs">trunk/src/wp-includes/js/tinymce/plugins/wordpress/plugin.js</a></li>
<li><a href="#trunksrcwpincludesjstinymcepluginswpeditimagepluginjs">trunk/src/wp-includes/js/tinymce/plugins/wpeditimage/plugin.js</a></li>
<li><a href="#trunksrcwpincludesjstinymcepluginswpfullscreenpluginjs">trunk/src/wp-includes/js/tinymce/plugins/wpfullscreen/plugin.js</a></li>
<li><a href="#trunksrcwpincludesjstinymcepluginswpgallerypluginjs">trunk/src/wp-includes/js/tinymce/plugins/wpgallery/plugin.js</a></li>
<li><a href="#trunksrcwpincludesjstinymcepluginswpviewpluginjs">trunk/src/wp-includes/js/tinymce/plugins/wpview/plugin.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="trunksrcwpincludescsseditorcss"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-includes/css/editor.css (26879 => 26880)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/css/editor.css 2013-12-29 08:22:08 UTC (rev 26879)
+++ trunk/src/wp-includes/css/editor.css 2013-12-30 01:53:25 UTC (rev 26880)
</span><span class="lines">@@ -2,12 +2,13 @@
</span><span class="cx"> TinyMCE and Quicklinks toolbars
</span><span class="cx"> ------------------------------------------------------------------------------*/
</span><span class="cx">
</span><del>-.mce-panel {
</del><ins>+div.mce-panel {
</ins><span class="cx"> border: 0;
</span><span class="cx"> background: #fff;
</span><ins>+ filter: none;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-.mce-toolbar-grp {
</del><ins>+div.mce-toolbar-grp {
</ins><span class="cx"> border-bottom: 1px solid #dedede;
</span><span class="cx"> background: #f5f5f5;
</span><span class="cx"> }
</span><span class="lines">@@ -40,6 +41,7 @@
</span><span class="cx"> margin: 0 1px;
</span><span class="cx"> -webkit-border-radius: 2px;
</span><span class="cx"> border-radius: 2px;
</span><ins>+ filter: none;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #wp-fullscreen-buttons .mce-btn:hover,
</span><span class="lines">@@ -107,37 +109,37 @@
</span><span class="cx"> color: #333;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-.mce-i-bold,
-.mce-i-italic,
-.mce-i-bullist,
-.mce-i-numlist,
-.mce-i-blockquote,
-.mce-i-alignleft,
-.mce-i-aligncenter,
-.mce-i-alignright,
-.mce-i-link,
-.mce-i-unlink,
-.mce-i-wp_more,
-.mce-i-strikethrough,
-.mce-i-spellchecker,
-.mce-i-fullscreen,
-.mce-i-wp_fullscreen,
-.mce-i-wp_adv,
-.mce-i-underline,
-.mce-i-alignjustify,
-.mce-i-forecolor,
-.mce-i-pastetext,
-.mce-i-pasteword,
-.mce-i-removeformat,
-.mce-i-charmap,
-.mce-i-outdent,
-.mce-i-indent,
-.mce-i-undo,
-.mce-i-redo,
-.mce-i-help,
-.mce-i-wp_help,
-.mce-i-wp-media-library,
-.mce-i-ltr {
</del><ins>+i.mce-i-bold,
+i.mce-i-italic,
+i.mce-i-bullist,
+i.mce-i-numlist,
+i.mce-i-blockquote,
+i.mce-i-alignleft,
+i.mce-i-aligncenter,
+i.mce-i-alignright,
+i.mce-i-link,
+i.mce-i-unlink,
+i.mce-i-wp_more,
+i.mce-i-strikethrough,
+i.mce-i-spellchecker,
+i.mce-i-fullscreen,
+i.mce-i-wp_fullscreen,
+i.mce-i-wp_adv,
+i.mce-i-underline,
+i.mce-i-alignjustify,
+i.mce-i-forecolor,
+i.mce-i-pastetext,
+i.mce-i-pasteword,
+i.mce-i-removeformat,
+i.mce-i-charmap,
+i.mce-i-outdent,
+i.mce-i-indent,
+i.mce-i-undo,
+i.mce-i-redo,
+i.mce-i-help,
+i.mce-i-wp_help,
+i.mce-i-wp-media-library,
+i.mce-i-ltr {
</ins><span class="cx"> font: normal 20px/1 'dashicons';
</span><span class="cx"> padding: 0;
</span><span class="cx"> vertical-align: top;
</span><span class="lines">@@ -146,116 +148,117 @@
</span><span class="cx"> -moz-osx-font-smoothing: grayscale;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-.mce-i-bold:before {
</del><ins>+i.mce-i-bold:before {
</ins><span class="cx"> content: '\f200';
</span><span class="cx"> }
</span><span class="cx">
</span><del>-.mce-i-italic:before {
</del><ins>+i.mce-i-italic:before {
</ins><span class="cx"> content: '\f201';
</span><span class="cx"> }
</span><span class="cx">
</span><del>-.mce-i-bullist:before {
</del><ins>+i.mce-i-bullist:before {
</ins><span class="cx"> content: '\f203';
</span><span class="cx"> }
</span><span class="cx">
</span><del>-.mce-i-numlist:before {
</del><ins>+i.mce-i-numlist:before {
</ins><span class="cx"> content: '\f204';
</span><span class="cx"> }
</span><span class="cx">
</span><del>-.mce-i-blockquote:before {
</del><ins>+i.mce-i-blockquote:before {
</ins><span class="cx"> content: '\f205';
</span><span class="cx"> }
</span><span class="cx">
</span><del>-.mce-i-alignleft:before {
</del><ins>+i.mce-i-alignleft:before {
</ins><span class="cx"> content: '\f206';
</span><span class="cx"> }
</span><span class="cx">
</span><del>-.mce-i-aligncenter:before {
</del><ins>+i.mce-i-aligncenter:before {
</ins><span class="cx"> content: '\f207';
</span><span class="cx"> }
</span><span class="cx">
</span><del>-.mce-i-alignright:before {
</del><ins>+i.mce-i-alignright:before {
</ins><span class="cx"> content: '\f208';
</span><span class="cx"> }
</span><span class="cx">
</span><del>-.mce-i-link:before {
</del><ins>+i.mce-i-link:before {
</ins><span class="cx"> content: '\f103';
</span><span class="cx"> }
</span><span class="cx">
</span><del>-.mce-i-unlink:before {
</del><ins>+i.mce-i-unlink:before {
</ins><span class="cx"> content: '\f225';
</span><span class="cx"> }
</span><span class="cx">
</span><del>-.mce-i-wp_more:before {
</del><ins>+i.mce-i-wp_more:before {
</ins><span class="cx"> content: '\f209';
</span><span class="cx"> }
</span><span class="cx">
</span><del>-.mce-i-strikethrough:before {
</del><ins>+i.mce-i-strikethrough:before {
</ins><span class="cx"> content: '\f224';
</span><span class="cx"> }
</span><span class="cx">
</span><del>-.mce-i-spellchecker:before {
</del><ins>+i.mce-i-spellchecker:before {
</ins><span class="cx"> content: '\f210';
</span><span class="cx"> }
</span><span class="cx">
</span><del>-.mce-i-fullscreen:before,
-.mce-i-wp_fullscreen:before {
</del><ins>+i.mce-i-fullscreen:before,
+i.mce-i-wp_fullscreen:before {
</ins><span class="cx"> content: '\f211';
</span><span class="cx"> }
</span><span class="cx">
</span><del>-.mce-i-wp_adv:before {
</del><ins>+i.mce-i-wp_adv:before {
</ins><span class="cx"> content: '\f212';
</span><span class="cx"> }
</span><del>-.mce-i-underline:before {
</del><ins>+
+i.mce-i-underline:before {
</ins><span class="cx"> content: '\f213';
</span><span class="cx"> }
</span><span class="cx">
</span><del>-.mce-i-alignjustify:before {
</del><ins>+i.mce-i-alignjustify:before {
</ins><span class="cx"> content: '\f214';
</span><span class="cx"> }
</span><span class="cx">
</span><del>-.mce-i-forecolor:before {
</del><ins>+i.mce-i-forecolor:before {
</ins><span class="cx"> content: '\f215';
</span><span class="cx"> }
</span><span class="cx">
</span><del>-.mce-i-pastetext:before {
</del><ins>+i.mce-i-pastetext:before {
</ins><span class="cx"> content: '\f217';
</span><span class="cx"> }
</span><span class="cx">
</span><del>-.mce-i-removeformat:before {
</del><ins>+i.mce-i-removeformat:before {
</ins><span class="cx"> content: '\f218';
</span><span class="cx"> }
</span><span class="cx">
</span><del>-.mce-i-charmap:before {
</del><ins>+i.mce-i-charmap:before {
</ins><span class="cx"> content: '\f220';
</span><span class="cx"> }
</span><span class="cx">
</span><del>-.mce-i-outdent:before {
</del><ins>+i.mce-i-outdent:before {
</ins><span class="cx"> content: '\f221';
</span><span class="cx"> }
</span><span class="cx">
</span><del>-.mce-i-indent:before {
</del><ins>+i.mce-i-indent:before {
</ins><span class="cx"> content: '\f222';
</span><span class="cx"> }
</span><span class="cx">
</span><del>-.mce-i-undo:before {
</del><ins>+i.mce-i-undo:before {
</ins><span class="cx"> content: '\f171';
</span><span class="cx"> }
</span><span class="cx">
</span><del>-.mce-i-redo:before {
</del><ins>+i.mce-i-redo:before {
</ins><span class="cx"> content: '\f172';
</span><span class="cx"> }
</span><span class="cx">
</span><del>-.mce-i-help:before,
-.mce-i-wp_help:before {
</del><ins>+i.mce-i-help:before,
+i.mce-i-wp_help:before {
</ins><span class="cx"> content: '\f223';
</span><span class="cx"> }
</span><span class="cx">
</span><del>-.mce-i-wp-media-library:before {
</del><ins>+i.mce-i-wp-media-library:before {
</ins><span class="cx"> content: '\f104';
</span><span class="cx"> }
</span><span class="cx">
</span><del>-.mce-i-ltr:before {
</del><ins>+i.mce-i-ltr:before {
</ins><span class="cx"> content: '\f320';
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -299,8 +302,7 @@
</span><span class="cx"> box-shadow: none;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-.quicktags-toolbar,
-.wp_themeSkin tr.mceFirst td.mceToolbar {
</del><ins>+.quicktags-toolbar {
</ins><span class="cx"> border-bottom: 1px solid #dedede;
</span><span class="cx"> background: #f5f5f5;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunksrcwpincludesjstinymcepluginswordpresspluginjs"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-includes/js/tinymce/plugins/wordpress/plugin.js (26879 => 26880)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/js/tinymce/plugins/wordpress/plugin.js 2013-12-29 08:22:08 UTC (rev 26879)
+++ trunk/src/wp-includes/js/tinymce/plugins/wordpress/plugin.js 2013-12-30 01:53:25 UTC (rev 26880)
</span><span class="lines">@@ -4,11 +4,15 @@
</span><span class="cx"> last = 0;
</span><span class="cx">
</span><span class="cx"> function toggleToolbars( state ) {
</span><del>- var iframe,
- pixels = 0,
- initial = state === 'hide',
- toolbars = editor.theme.panel && editor.theme.panel.find('.toolbar');
</del><ins>+ var iframe, initial, toolbars,
+ pixels = 0;
</ins><span class="cx">
</span><ins>+ initial = ( state === 'hide' );
+
+ if ( editor.theme.panel ) {
+ toolbars = editor.theme.panel.find('.toolbar');
+ }
+
</ins><span class="cx"> if ( ! toolbars || toolbars.length < 2 || ( state === 'hide' && ! toolbars[1].visible() ) ) {
</span><span class="cx"> return;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunksrcwpincludesjstinymcepluginswpeditimagepluginjs"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-includes/js/tinymce/plugins/wpeditimage/plugin.js (26879 => 26880)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/js/tinymce/plugins/wpeditimage/plugin.js 2013-12-29 08:22:08 UTC (rev 26879)
+++ trunk/src/wp-includes/js/tinymce/plugins/wpeditimage/plugin.js 2013-12-30 01:53:25 UTC (rev 26880)
</span><span class="lines">@@ -49,6 +49,11 @@
</span><span class="cx">
</span><span class="cx"> function getShortcode( content ) {
</span><span class="cx"> return content.replace( /<div (?:id="attachment_|class="mceTemp)[^>]*>([\s\S]+?)<\/div>/g, function( a, b ) {
</span><ins>+ if ( b.indexOf('<img ') === -1 ) {
+ // Broken caption. The user dragged the image out?
+ return '';
+ }
+
</ins><span class="cx"> var ret = b.replace( /<dl ([^>]+)>\s*<dt [^>]+>([\s\S]+?)<\/dt>\s*<dd [^>]+>([\s\S]*?)<\/dd>\s*<\/dl>/gi, function( a, b, c, cap ) {
</span><span class="cx"> var id, cls, w;
</span><span class="cx">
</span><span class="lines">@@ -129,7 +134,7 @@
</span><span class="cx"> captionId = '',
</span><span class="cx"> captionAlign = '',
</span><span class="cx"> captionWidth = '',
</span><del>- wrap, parent, html, P, imgId;
</del><ins>+ wrap, parent, node, html, imgId;
</ins><span class="cx">
</span><span class="cx"> // Temp image id so we can find the node later
</span><span class="cx"> data.id = '__wp-temp-img-id';
</span><span class="lines">@@ -178,7 +183,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if ( parent && parent.nodeName === 'P' ) {
</span><del>- wrap = dom.create( 'div', { 'class': 'mceTemp' }, html );
</del><ins>+ wrap = dom.create( 'div', { 'class': 'mceTemp', 'draggable': 'true' }, html );
</ins><span class="cx"> dom.insertAfter( wrap, parent );
</span><span class="cx"> editor.selection.select( wrap );
</span><span class="cx"> editor.nodeChanged();
</span><span class="lines">@@ -187,7 +192,7 @@
</span><span class="cx"> dom.remove( parent );
</span><span class="cx"> }
</span><span class="cx"> } else {
</span><del>- editor.selection.setContent( '<div class="mceTemp">' + html + '</div>' );
</del><ins>+ editor.selection.setContent( '<div class="mceTemp" draggable="true">' + html + '</div>' );
</ins><span class="cx"> }
</span><span class="cx"> } else {
</span><span class="cx"> editor.selection.setContent( html );
</span><span class="lines">@@ -244,7 +249,7 @@
</span><span class="cx"> '<dt class="wp-caption-dt">'+ html +'</dt><dd class="wp-caption-dd">'+ caption +'</dd></dl>';
</span><span class="cx">
</span><span class="cx"> if ( parent = dom.getParent( imgNode, 'p' ) ) {
</span><del>- wrap = dom.create( 'div', { 'class': 'mceTemp' }, html );
</del><ins>+ wrap = dom.create( 'div', { 'class': 'mceTemp', 'draggable': 'true' }, html );
</ins><span class="cx"> dom.insertAfter( wrap, parent );
</span><span class="cx"> editor.selection.select( wrap );
</span><span class="cx"> editor.nodeChanged();
</span><span class="lines">@@ -256,7 +261,7 @@
</span><span class="cx"> dom.remove( parent );
</span><span class="cx"> }
</span><span class="cx"> } else {
</span><del>- editor.selection.setContent( '<div class="mceTemp">' + html + '</div>' );
</del><ins>+ editor.selection.setContent( '<div class="mceTemp" draggable="true">' + html + '</div>' );
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> } else {
</span><span class="lines">@@ -284,7 +289,7 @@
</span><span class="cx">
</span><span class="cx"> editor.on( 'wpLoadImageData', function( e ) {
</span><span class="cx"> var parent,
</span><del>- data = e.imgData.data
</del><ins>+ data = e.imgData.data,
</ins><span class="cx"> imgNode = e.imgData.node;
</span><span class="cx">
</span><span class="cx"> if ( parent = dom.getParent( imgNode, 'dl.wp-caption' ) ) {
</span></span></pre></div>
<a id="trunksrcwpincludesjstinymcepluginswpfullscreenpluginjs"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-includes/js/tinymce/plugins/wpfullscreen/plugin.js (26879 => 26880)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/js/tinymce/plugins/wpfullscreen/plugin.js 2013-12-29 08:22:08 UTC (rev 26879)
+++ trunk/src/wp-includes/js/tinymce/plugins/wpfullscreen/plugin.js 2013-12-30 01:53:25 UTC (rev 26880)
</span><span class="lines">@@ -10,11 +10,10 @@
</span><span class="cx"> var deltaSize, myHeight,
</span><span class="cx"> d = editor.getDoc(),
</span><span class="cx"> body = d.body,
</span><del>- de = d.documentElement,
- DOM = tinymce.DOM
</del><ins>+ DOM = tinymce.DOM,
</ins><span class="cx"> resizeHeight = 250;
</span><span class="cx">
</span><del>- if ( ( e && e.type == 'setcontent' && e.initial ) || editor.settings.inline ) {
</del><ins>+ if ( ( e && e.type === 'setcontent' && e.initial ) || editor.settings.inline ) {
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunksrcwpincludesjstinymcepluginswpgallerypluginjs"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-includes/js/tinymce/plugins/wpgallery/plugin.js (26879 => 26880)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/js/tinymce/plugins/wpgallery/plugin.js 2013-12-29 08:22:08 UTC (rev 26879)
+++ trunk/src/wp-includes/js/tinymce/plugins/wpgallery/plugin.js 2013-12-30 01:53:25 UTC (rev 26880)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /* global tinymce */
</span><del>-tinymce.PluginManager.add('wpgallery', function( editor, url ) {
</del><ins>+tinymce.PluginManager.add('wpgallery', function( editor ) {
</ins><span class="cx">
</span><span class="cx"> function parseGallery( content ) {
</span><span class="cx"> return content.replace( /\[gallery([^\]]*)\]/g, function( match, attr ) {
</span><span class="lines">@@ -69,7 +69,7 @@
</span><span class="cx"> });
</span><span class="cx"> */
</span><span class="cx"> editor.on( 'mouseup', function( e ) {
</span><del>- if ( e.target.nodeName == 'IMG' && editor.dom.hasClass( e.target, 'wp-gallery' ) ) {
</del><ins>+ if ( e.target.nodeName === 'IMG' && editor.dom.hasClass( e.target, 'wp-gallery' ) ) {
</ins><span class="cx"> // Don't trigger on right-click
</span><span class="cx"> if ( e.button !== 2 ) {
</span><span class="cx"> if ( editor.dom.hasClass( e.target, 'wp-gallery-selected' ) ) {
</span></span></pre></div>
<a id="trunksrcwpincludesjstinymcepluginswpviewpluginjs"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-includes/js/tinymce/plugins/wpview/plugin.js (26879 => 26880)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/js/tinymce/plugins/wpview/plugin.js 2013-12-29 08:22:08 UTC (rev 26879)
+++ trunk/src/wp-includes/js/tinymce/plugins/wpview/plugin.js 2013-12-30 01:53:25 UTC (rev 26880)
</span><span class="lines">@@ -13,8 +13,9 @@
</span><span class="cx"> var wpView = this;
</span><span class="cx">
</span><span class="cx"> // Check if the `wp.mce` API exists.
</span><del>- if ( typeof wp === 'undefined' || ! wp.mce )
</del><ins>+ if ( typeof wp === 'undefined' || ! wp.mce ) {
</ins><span class="cx"> return;
</span><ins>+ }
</ins><span class="cx">
</span><span class="cx"> editor.on( 'PreInit', function() {
</span><span class="cx"> // Add elements so we can set `contenteditable` to false.
</span><span class="lines">@@ -26,8 +27,9 @@
</span><span class="cx"> // view wrappers. Since the editor's DOM is outdated at this point,
</span><span class="cx"> // we'll wait to render the views.
</span><span class="cx"> editor.on( 'BeforeSetContent', function( e ) {
</span><del>- if ( ! e.content )
</del><ins>+ if ( ! e.content ) {
</ins><span class="cx"> return;
</span><ins>+ }
</ins><span class="cx">
</span><span class="cx"> e.content = wp.mce.view.toViews( e.content );
</span><span class="cx"> });
</span><span class="lines">@@ -42,13 +44,14 @@
</span><span class="cx"> var selection = editor.selection;
</span><span class="cx"> // When a view is selected, ensure content that is being pasted
</span><span class="cx"> // or inserted is added to a text node (instead of the view).
</span><del>- editor.on( 'BeforeSetContent', function( e ) {
</del><ins>+ editor.on( 'BeforeSetContent', function() {
</ins><span class="cx"> var walker, target,
</span><span class="cx"> view = wpView.getParentView( selection.getNode() );
</span><span class="cx">
</span><span class="cx"> // If the selection is not within a view, bail.
</span><del>- if ( ! view )
</del><ins>+ if ( ! view ) {
</ins><span class="cx"> return;
</span><ins>+ }
</ins><span class="cx">
</span><span class="cx"> // If there are no additional nodes or the next node is a
</span><span class="cx"> // view, create a text node after the current view.
</span><span class="lines">@@ -72,13 +75,15 @@
</span><span class="cx"> //
</span><span class="cx"> // Runs on paste and on inserting nodes/html.
</span><span class="cx"> editor.on( 'SetContent', function( e ) {
</span><del>- if ( ! e.context )
</del><ins>+ if ( ! e.context ) {
</ins><span class="cx"> return;
</span><ins>+ }
</ins><span class="cx">
</span><span class="cx"> var node = selection.getNode();
</span><span class="cx">
</span><del>- if ( ! node.innerHTML )
</del><ins>+ if ( ! node.innerHTML ) {
</ins><span class="cx"> return;
</span><ins>+ }
</ins><span class="cx">
</span><span class="cx"> node.innerHTML = wp.mce.view.toViews( node.innerHTML );
</span><span class="cx"> wp.mce.view.render( node );
</span><span class="lines">@@ -88,8 +93,9 @@
</span><span class="cx"> // When the editor's contents are being accessed as a string,
</span><span class="cx"> // transform any views back to their text representations.
</span><span class="cx"> editor.on( 'PostProcess', function( e ) {
</span><del>- if ( ( ! e.get && ! e.save ) || ! e.content )
</del><ins>+ if ( ( ! e.get && ! e.save ) || ! e.content ) {
</ins><span class="cx"> return;
</span><ins>+ }
</ins><span class="cx">
</span><span class="cx"> e.content = wp.mce.view.toText( e.content );
</span><span class="cx"> });
</span><span class="lines">@@ -97,7 +103,7 @@
</span><span class="cx"> // Triggers when the selection is changed.
</span><span class="cx"> // Add the event handler to the top of the stack.
</span><span class="cx"> editor.on( 'NodeChange', function( e ) {
</span><del>- var view = wpView.getParentView( node );
</del><ins>+ var view = wpView.getParentView( e.element );
</ins><span class="cx">
</span><span class="cx"> // Update the selected view.
</span><span class="cx"> if ( view ) {
</span><span class="lines">@@ -117,12 +123,13 @@
</span><span class="cx"> view, instance;
</span><span class="cx">
</span><span class="cx"> // If a view isn't selected, let the event go on its merry way.
</span><del>- if ( ! selected )
</del><ins>+ if ( ! selected ) {
</ins><span class="cx"> return;
</span><ins>+ }
</ins><span class="cx">
</span><span class="cx"> // If the caret is not within the selected view, deselect the
</span><span class="cx"> // view and bail.
</span><del>- view = wpView.getParentView( selection.getNode() );
</del><ins>+ view = wpView.getParentView( editor.selection.getNode() );
</ins><span class="cx"> if ( view !== selected ) {
</span><span class="cx"> wpView.deselect();
</span><span class="cx"> return;
</span><span class="lines">@@ -138,8 +145,9 @@
</span><span class="cx">
</span><span class="cx"> // Let keypresses that involve the command or control keys through.
</span><span class="cx"> // Also, let any of the F# keys through.
</span><del>- if ( event.metaKey || event.ctrlKey || ( keyCode >= 112 && keyCode <= 123 ) )
</del><ins>+ if ( event.metaKey || event.ctrlKey || ( keyCode >= 112 && keyCode <= 123 ) ) {
</ins><span class="cx"> return;
</span><ins>+ }
</ins><span class="cx">
</span><span class="cx"> event.preventDefault();
</span><span class="cx"> });
</span><span class="lines">@@ -147,8 +155,9 @@
</span><span class="cx">
</span><span class="cx"> getParentView : function( node ) {
</span><span class="cx"> while ( node ) {
</span><del>- if ( this.isView( node ) )
</del><ins>+ if ( this.isView( node ) ) {
</ins><span class="cx"> return node;
</span><ins>+ }
</ins><span class="cx">
</span><span class="cx"> node = node.parentNode;
</span><span class="cx"> }
</span><span class="lines">@@ -159,8 +168,9 @@
</span><span class="cx"> },
</span><span class="cx">
</span><span class="cx"> select : function( view ) {
</span><del>- if ( view === selected )
</del><ins>+ if ( view === selected ) {
</ins><span class="cx"> return;
</span><ins>+ }
</ins><span class="cx">
</span><span class="cx"> this.deselect();
</span><span class="cx"> selected = view;
</span><span class="lines">@@ -168,8 +178,10 @@
</span><span class="cx"> },
</span><span class="cx">
</span><span class="cx"> deselect : function() {
</span><del>- if ( selected )
</del><ins>+ if ( selected ) {
</ins><span class="cx"> wp.mce.view.deselect( selected );
</span><ins>+ }
+
</ins><span class="cx"> selected = null;
</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 (26879 => 26880)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/js/tinymce/skins/wordpress/wp-content.css 2013-12-29 08:22:08 UTC (rev 26879)
+++ trunk/src/wp-includes/js/tinymce/skins/wordpress/wp-content.css 2013-12-30 01:53:25 UTC (rev 26880)
</span><span class="lines">@@ -50,8 +50,12 @@
</span><span class="cx"> border: 0 none;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-.wp-caption img,
-.wp-caption a {
</del><ins>+div.mceTemp {
+ -ms-user-select: element;
+}
+
+dl.wp-caption,
+dl.wp-caption * {
</ins><span class="cx"> -webkit-user-drag: none;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>