<!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>[28626] trunk/src: TinyMCE in iOS:</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/28626">28626</a></dd>
<dt>Author</dt> <dd>azaozz</dd>
<dt>Date</dt> <dd>2014-05-30 02:37:52 +0000 (Fri, 30 May 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>TinyMCE in iOS:
- Fix placing the caret at the bottom of longer posts when the keyboard is open.
- Disable resizing on switching editors and on show/hide the kitchen sink row.
See <a href="http://core.trac.wordpress.org/ticket/28242">#28242</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpadminjseditorjs">trunk/src/wp-admin/js/editor.js</a></li>
<li><a href="#trunksrcwpincludesjstinymcepluginswordpresspluginjs">trunk/src/wp-includes/js/tinymce/plugins/wordpress/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="trunksrcwpadminjseditorjs"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-admin/js/editor.js (28625 => 28626)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-admin/js/editor.js 2014-05-29 23:33:13 UTC (rev 28625)
+++ trunk/src/wp-admin/js/editor.js 2014-05-30 02:37:52 UTC (rev 28626)
</span><span class="lines">@@ -60,7 +60,8 @@
</span><span class="cx"> if ( ed ) {
</span><span class="cx"> ed.show();
</span><span class="cx">
</span><del>- if ( editorHeight ) {
</del><ins>+ // No point resizing the iframe in iOS
+ if ( ! tinymce.Env.iOS && editorHeight ) {
</ins><span class="cx"> toolbarHeight = getToolbarHeight();
</span><span class="cx"> editorHeight = editorHeight - toolbarHeight + 14;
</span><span class="cx">
</span><span class="lines">@@ -84,16 +85,18 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if ( ed ) {
</span><del>- iframe = DOM.get( id + '_ifr' );
- editorHeight = iframe ? parseInt( iframe.style.height, 10 ) : 0;
</del><ins>+ if ( ! tinymce.Env.iOS ) {
+ iframe = DOM.get( id + '_ifr' );
+ editorHeight = iframe ? parseInt( iframe.style.height, 10 ) : 0;
</ins><span class="cx">
</span><del>- if ( editorHeight ) {
- toolbarHeight = getToolbarHeight();
- editorHeight = editorHeight + toolbarHeight - 14;
</del><ins>+ if ( editorHeight ) {
+ toolbarHeight = getToolbarHeight();
+ editorHeight = editorHeight + toolbarHeight - 14;
</ins><span class="cx">
</span><del>- // height cannot be under 50 or over 5000
- if ( editorHeight > 50 && editorHeight < 5000 ) {
- txtarea_el.style.height = editorHeight + 'px';
</del><ins>+ // height cannot be under 50 or over 5000
+ if ( editorHeight > 50 && editorHeight < 5000 ) {
+ txtarea_el.style.height = editorHeight + 'px';
+ }
</ins><span class="cx"> }
</span><span class="cx"> }
</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 (28625 => 28626)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/js/tinymce/plugins/wordpress/plugin.js 2014-05-29 23:33:13 UTC (rev 28625)
+++ trunk/src/wp-includes/js/tinymce/plugins/wordpress/plugin.js 2014-05-30 02:37:52 UTC (rev 28626)
</span><span class="lines">@@ -37,9 +37,12 @@
</span><span class="cx"> }
</span><span class="cx"> });
</span><span class="cx">
</span><del>- if ( pixels && ! initial ) {
- iframe = editor.getContentAreaContainer().firstChild;
- DOM.setStyle( iframe, 'height', iframe.clientHeight + pixels ); // Resize iframe
</del><ins>+ if ( pixels && ! initial ) {
+ // Resize iframe, not needed in iOS
+ if ( ! tinymce.Env.iOS ) {
+ iframe = editor.getContentAreaContainer().firstChild;
+ DOM.setStyle( iframe, 'height', iframe.clientHeight + pixels );
+ }
</ins><span class="cx">
</span><span class="cx"> if ( state === 'hide' ) {
</span><span class="cx"> setUserSetting('hidetb', '0');
</span><span class="lines">@@ -277,6 +280,10 @@
</span><span class="cx"> doc = editor.getDoc(),
</span><span class="cx"> dom = editor.dom;
</span><span class="cx">
</span><ins>+ if ( tinymce.Env.iOS ) {
+ dom.addClass( doc.documentElement, 'ios' );
+ }
+
</ins><span class="cx"> if ( editor.getParam( 'directionality' ) === 'rtl' ) {
</span><span class="cx"> bodyClass.push('rtl');
</span><span class="cx"> dom.setAttrib( doc.documentElement, 'dir', 'rtl' );
</span><span class="lines">@@ -358,6 +365,10 @@
</span><span class="cx"> editor.on( 'preInit', function() {
</span><span class="cx"> // Don't replace <i> with <em> and <b> with <strong> and don't remove them when empty
</span><span class="cx"> editor.schema.addValidElements( '@[id|accesskey|class|dir|lang|style|tabindex|title|contenteditable|draggable|dropzone|hidden|spellcheck|translate],i,b' );
</span><ins>+
+ if ( tinymce.Env.iOS ) {
+ editor.settings.height = 300;
+ }
</ins><span class="cx"> });
</span><span class="cx">
</span><span class="cx"> // Add custom shortcuts
</span></span></pre></div>
<a id="trunksrcwpincludesjstinymceskinswordpresswpcontentcss"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-includes/js/tinymce/skins/wordpress/wp-content.css (28625 => 28626)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/js/tinymce/skins/wordpress/wp-content.css 2014-05-29 23:33:13 UTC (rev 28625)
+++ trunk/src/wp-includes/js/tinymce/skins/wordpress/wp-content.css 2014-05-30 02:37:52 UTC (rev 28626)
</span><span class="lines">@@ -1,4 +1,14 @@
</span><span class="cx"> /* Additional default styles for the editor */
</span><ins>+
+html.ios {
+ height: 100%;
+}
+
+.ios body#tinymce {
+ height: 200%;
+ max-width: none;
+}
+
</ins><span class="cx"> body {
</span><span class="cx"> font-family: Georgia, "Times New Roman", "Bitstream Charter", Times, serif;
</span><span class="cx"> font-size: 13px;
</span></span></pre>
</div>
</div>
</body>
</html>