Changeset 28626

Timestamp:

05/30/2014 02:37:52 AM (11 years ago)

Author:

azaozz

Message:

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 #28242

Location:

trunk/src

Files:

• wp-admin/js/editor.js (modified) (2 diffs)
• wp-includes/js/tinymce/plugins/wordpress/plugin.js (modified) (3 diffs)
• wp-includes/js/tinymce/skins/wordpress/wp-content.css (modified) (1 diff)

trunk/src/wp-admin/js/editor.js

@@ -61 +61 @@
                 ed.show();
 
-                if ( editorHeight ) {
+                // No point resizing the iframe in iOS
+                if ( ! tinymce.Env.iOS && editorHeight ) {
                     toolbarHeight = getToolbarHeight();
                     editorHeight = editorHeight - toolbarHeight + 14;
@@ -85 +86 @@
 
             if ( ed ) {
-                iframe = DOM.get( id + '_ifr' );
-                editorHeight = iframe ? parseInt( iframe.style.height, 10 ) : 0;
-
-                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';
+                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;
+
+                        // height cannot be under 50 or over 5000
+                        if ( editorHeight > 50 && editorHeight < 5000 ) {
+                            txtarea_el.style.height = editorHeight + 'px';
+                        }
                     }
                 }

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

@@ -38 +38 @@
         });
 
-        if ( pixels && ! initial ) {
-            iframe = editor.getContentAreaContainer().firstChild;
-            DOM.setStyle( iframe, 'height', iframe.clientHeight + pixels ); // Resize iframe
+        if (  pixels && ! initial ) {
+            // Resize iframe, not needed in iOS
+            if ( ! tinymce.Env.iOS ) {
+                iframe = editor.getContentAreaContainer().firstChild;
+                DOM.setStyle( iframe, 'height', iframe.clientHeight + pixels );
+            }
 
             if ( state === 'hide' ) {
@@ -278 +281 @@
             dom = editor.dom;
 
+        if ( tinymce.Env.iOS ) {
+            dom.addClass( doc.documentElement, 'ios' );
+        }
+
         if ( editor.getParam( 'directionality' ) === 'rtl' ) {
             bodyClass.push('rtl');
@@ -359 +366 @@
         // 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;
+        }
     });
 

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

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