<!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>[28094] trunk/src/wp-includes: RTL for 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/28094">28094</a></dd>
<dt>Author</dt> <dd>azaozz</dd>
<dt>Date</dt> <dd>2014-04-13 00:22:56 +0000 (Sun, 13 Apr 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>RTL for TinyMCE:
- Add _dir: 'rtl' to the TinyMCE translation object.
- Fix editor.css for RTL.
- Fix the Edit and Delete buttons position for wpview and images.
- For _mce_set_direction(), update documentation and fix adding the 'ltr' button.
Fixes <a href="http://core.trac.wordpress.org/ticket/27773">#27773</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpincludesclasswpeditorphp">trunk/src/wp-includes/class-wp-editor.php</a></li>
<li><a href="#trunksrcwpincludescsseditorcss">trunk/src/wp-includes/css/editor.css</a></li>
<li><a href="#trunksrcwpincludesfunctionsphp">trunk/src/wp-includes/functions.php</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="#trunksrcwpincludesjstinymceskinswordpresswpcontentcss">trunk/src/wp-includes/js/tinymce/skins/wordpress/wp-content.css</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpincludesclasswpeditorphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-includes/class-wp-editor.php (28093 => 28094)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/class-wp-editor.php 2014-04-12 20:52:35 UTC (rev 28093)
+++ trunk/src/wp-includes/class-wp-editor.php 2014-04-13 00:22:56 UTC (rev 28094)
</span><span class="lines">@@ -982,6 +982,11 @@
</span><span class="cx"> $baseurl = self::$baseurl;
</span><span class="cx"> $mce_locale = self::$mce_locale;
</span><span class="cx">
</span><ins>+ // Set direction
+ if ( is_rtl() ) {
+ $mce_translation['_dir'] = 'rtl';
+ }
+
</ins><span class="cx"> /**
</span><span class="cx"> * Filter translated strings prepared for TinyMCE.
</span><span class="cx"> *
</span></span></pre></div>
<a id="trunksrcwpincludescsseditorcss"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-includes/css/editor.css (28093 => 28094)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/css/editor.css 2014-04-12 20:52:35 UTC (rev 28093)
+++ trunk/src/wp-includes/css/editor.css 2014-04-13 00:22:56 UTC (rev 28094)
</span><span class="lines">@@ -1851,6 +1851,16 @@
</span><span class="cx"> font-family: Tahoma, sans-serif;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+/* @noflip */
+.mce-rtl .mce-flow-layout .mce-flow-layout-item > div {
+ direction: rtl;
+}
+
+/* @noflip */
+.mce-rtl .mce-listbox i.mce-caret {
+ left: 6px;
+}
+
</ins><span class="cx"> html:lang(he-il) .rtl .wp-switch-editor,
</span><span class="cx"> html:lang(he-il) .rtl .quicktags-toolbar input {
</span><span class="cx"> font-family: Arial, sans-serif;
</span></span></pre></div>
<a id="trunksrcwpincludesfunctionsphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-includes/functions.php (28093 => 28094)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/functions.php 2014-04-12 20:52:35 UTC (rev 28093)
+++ trunk/src/wp-includes/functions.php 2014-04-13 00:22:56 UTC (rev 28094)
</span><span class="lines">@@ -2457,20 +2457,21 @@
</span><span class="cx"> * Will only set the direction to 'rtl', if the WordPress locale has the text
</span><span class="cx"> * direction set to 'rtl'.
</span><span class="cx"> *
</span><del>- * Fills in the 'directionality', 'plugins', and 'theme_advanced_button1' array
- * keys. These keys are then returned in the $input array.
</del><ins>+ * Fills in the 'directionality' setting, enables the 'directionality' plugin,
+ * and adds the 'ltr' button to 'toolbar1', formerly 'theme_advanced_buttons1' array
+ * keys. These keys are then returned in the $input (TinyMCE settings) array.
</ins><span class="cx"> *
</span><span class="cx"> * @access private
</span><span class="cx"> * @since 2.1.0
</span><span class="cx"> *
</span><del>- * @param array $input MCE plugin array.
</del><ins>+ * @param array $input MCE settings array.
</ins><span class="cx"> * @return array Direction set for 'rtl', if needed by locale.
</span><span class="cx"> */
</span><span class="cx"> function _mce_set_direction( $input ) {
</span><span class="cx"> if ( is_rtl() ) {
</span><span class="cx"> $input['directionality'] = 'rtl';
</span><span class="cx"> $input['plugins'] .= ',directionality';
</span><del>- $input['theme_advanced_buttons1'] .= ',ltr';
</del><ins>+ $input['toolbar1'] .= ',ltr';
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> return $input;
</span></span></pre></div>
<a id="trunksrcwpincludesjstinymcepluginswordpresspluginjs"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-includes/js/tinymce/plugins/wordpress/plugin.js (28093 => 28094)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/js/tinymce/plugins/wordpress/plugin.js 2014-04-12 20:52:35 UTC (rev 28093)
+++ trunk/src/wp-includes/js/tinymce/plugins/wordpress/plugin.js 2014-04-13 00:22:56 UTC (rev 28094)
</span><span class="lines">@@ -279,6 +279,7 @@
</span><span class="cx">
</span><span class="cx"> if ( editor.getParam( 'directionality' ) === 'rtl' ) {
</span><span class="cx"> bodyClass.push('rtl');
</span><ins>+ dom.setAttrib( doc.documentElement, 'dir', 'rtl' );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if ( env.ie ) {
</span></span></pre></div>
<a id="trunksrcwpincludesjstinymcepluginswpeditimagepluginjs"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-includes/js/tinymce/plugins/wpeditimage/plugin.js (28093 => 28094)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/js/tinymce/plugins/wpeditimage/plugin.js 2014-04-12 20:52:35 UTC (rev 28093)
+++ trunk/src/wp-includes/js/tinymce/plugins/wpeditimage/plugin.js 2014-04-13 00:22:56 UTC (rev 28094)
</span><span class="lines">@@ -403,7 +403,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function addToolbar( node ) {
</span><del>- var rectangle, toolbarHtml, toolbar, toolbarSize,
</del><ins>+ var rectangle, toolbarHtml, toolbar, left,
</ins><span class="cx"> dom = editor.dom;
</span><span class="cx">
</span><span class="cx"> removeToolbar();
</span><span class="lines">@@ -425,12 +425,16 @@
</span><span class="cx"> 'contenteditable': false
</span><span class="cx"> }, toolbarHtml );
</span><span class="cx">
</span><ins>+ if ( editor.rtl ) {
+ left = rectangle.x + rectangle.w - 82;
+ } else {
+ left = rectangle.x;
+ }
+
</ins><span class="cx"> editor.getBody().appendChild( toolbar );
</span><del>- toolbarSize = dom.getSize( toolbar );
-
</del><span class="cx"> dom.setStyles( toolbar, {
</span><span class="cx"> top: rectangle.y,
</span><del>- left: rectangle.x
</del><ins>+ left: left
</ins><span class="cx"> });
</span><span class="cx">
</span><span class="cx"> toolbarActive = true;
</span></span></pre></div>
<a id="trunksrcwpincludesjstinymceskinswordpresswpcontentcss"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-includes/js/tinymce/skins/wordpress/wp-content.css (28093 => 28094)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/js/tinymce/skins/wordpress/wp-content.css 2014-04-12 20:52:35 UTC (rev 28093)
+++ trunk/src/wp-includes/js/tinymce/skins/wordpress/wp-content.css 2014-04-13 00:22:56 UTC (rev 28094)
</span><span class="lines">@@ -453,6 +453,22 @@
</span><span class="cx"> outline: 0;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+/* rtl */
+.rtl .gallery .gallery-item {
+ float: right;
+}
+
+.rtl .wpview-wrap .toolbar {
+ left: auto;
+ right: 0;
+}
+
+.rtl .wpview-wrap .toolbar div,
+.rtl #wp-image-toolbar div {
+ margin-left: auto;
+ margin-right: 7px;
+}
+
</ins><span class="cx"> @media print,
</span><span class="cx"> (-o-min-device-pixel-ratio: 5/4),
</span><span class="cx"> (-webkit-min-device-pixel-ratio: 1.25),
</span></span></pre>
</div>
</div>
</body>
</html>