Ticket #28242: 28242.patch

src/wp-admin/js/editor.js

@@ -60 +60 @@
                         if ( ed ) {
                                 ed.show();
 
-                                if ( editorHeight ) {
+                                if ( ! tinymce.Env.iOS && editorHeight ) {
                                         toolbarHeight = getToolbarHeight();
                                         editorHeight = editorHeight - toolbarHeight + 14;
 
@@ -84 +84 @@
                         }
 
                         if ( ed ) {
-                                iframe = DOM.get( id + '_ifr' );
-                                editorHeight = iframe ? parseInt( iframe.style.height, 10 ) : 0;
+                                if ( ! tinymce.Env.iOS ) {
+                                        iframe = DOM.get( id + '_ifr' );
+                                        editorHeight = iframe ? parseInt( iframe.style.height, 10 ) : 0;
 
-                                if ( editorHeight ) {
-                                        toolbarHeight = getToolbarHeight();
-                                        editorHeight = editorHeight + toolbarHeight - 14;
+                                        if ( editorHeight ) {
+                                                toolbarHeight = getToolbarHeight();
+                                                editorHeight = editorHeight + toolbarHeight - 14;
 
-                                        // height cannot be under 50 or over 5000
-                                        if ( editorHeight > 50 && editorHeight < 5000 ) {
-                                                txtarea_el.style.height = editorHeight + 'px';
+                                                // height cannot be under 50 or over 5000
+                                                if ( editorHeight > 50 && editorHeight < 5000 ) {
+                                                        txtarea_el.style.height = editorHeight + 'px';
+                                                }
                                         }
                                 }
 

src/wp-includes/js/tinymce/plugins/wordpress/plugin.js

@@ -292 +292 @@
                         }
                 }
 
+                if ( tinymce.Env.iOS ) {
+                        bodyClass.push('ios');
+                }
+
                 bodyClass.push('wp-editor');
 
                 tinymce.each( bodyClass, function( cls ) {
@@ -358 +362 @@
         editor.on( 'preInit', function() {
                 // Don't replace <i> with <em> and <b> with <strong> and don't remove them when empty
                 editor.schema.addValidElements( '@[id|accesskey|class|dir|lang|style|tabindex|title|contenteditable|draggable|dropzone|hidden|spellcheck|translate],i,b' );
+
+                if ( tinymce.Env.iOS ) {
+                        editor.settings.height = 300;
+                }
         });
 
         // Add custom shortcuts

src/wp-includes/js/tinymce/skins/wordpress/wp-content.css

@@ -1 +1 @@
 /* Additional default styles for the editor */
+
+html {
+        height: 100%;
+}
+
+body#tinymce.ios {
+        height: 200%;
+        max-width: none;
+}
+
 body {
         font-family: Georgia, "Times New Roman", "Bitstream Charter", Times, serif;
         font-size: 13px;