Changeset 27941

Timestamp:

04/04/2014 01:30:11 AM (12 years ago)

Author:

azaozz

Message:

TinyMCE: better calculation for editor height when switching Text to Visual and back. Add stopping of editor resizing when the mouse leaves the browser window. See #27279

Location:

trunk/src/wp-admin/js

Files:

• editor.js (modified) (5 diffs)
• post.js (modified) (3 diffs)

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

@@ -14 +14 @@
     // mode can be 'html', 'tmce', or 'toggle'; 'html' is used for the 'Text' editor tab.
     go: function( id, mode ) {
-        var t = this, ed, wrap_id, txtarea_el, editorHeight, toolbarHeight,
+        var t = this, ed, wrap_id, txtarea_el, iframe, editorHeight, toolbarHeight,
             DOM = tinymce.DOM; //DOMUtils outside the editor iframe
 
@@ -33 +33 @@
 
         function getToolbarHeight() {
-            var height;
-
-            try {
-                height = DOM.getSize( DOM.select( '.mce-toolbar-grp', ed.getContainer() )[0] );
-            } catch(e){}
-
-            if ( height && height.h && height.h > 10 && height.h < 100 ) {
-                return height.h;
-            }
-
-            return 0;
+            var node = DOM.select( '.mce-toolbar-grp', ed.getContainer() )[0],
+                height = node && node.clientHeight;
+
+            if ( height && height > 10 && height < 200 ) {
+                return parseInt( height, 10 );
+            }
+
+            return 30;
         }
 
@@ -64 +61 @@
                 ed.show();
 
-                if ( editorHeight && ( toolbarHeight = getToolbarHeight() ) ) {
-                    editorHeight = editorHeight - toolbarHeight + 11;
+                if ( editorHeight ) {
+                    toolbarHeight = getToolbarHeight();
+                    editorHeight = editorHeight - toolbarHeight + 14;
 
                     // height cannot be under 50 or over 5000
@@ -74 +72 @@
             } else {
                 tinymce.init( tinyMCEPreInit.mceInit[id] );
-
-        //      ed = tinymce.createEditor( id, tinyMCEPreInit.mceInit[id] );
-        //      ed.render();
             }
 
@@ -90 +85 @@
 
             if ( ed ) {
-                editorHeight = DOM.get( id + '_ifr' );
-                editorHeight = editorHeight ? parseInt( editorHeight.style.height, 10 ) : 0;
-
-                if ( editorHeight && ( toolbarHeight = getToolbarHeight() ) ) {
-                    editorHeight = editorHeight + toolbarHeight - 11;
+                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

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

@@ -1015 +1015 @@
                 editor.focus();
                 toolbarHeight = $( '#wp-content-editor-container .mce-toolbar-grp' ).height();
+
+                if ( toolbarHeight < 10 || toolbarHeight > 200 ) {
+                    toolbarHeight = 30;
+                }
+
                 height = parseInt( $('#content_ifr').css('height'), 10 ) + toolbarHeight - 28;
             } else {
@@ -1021 +1026 @@
             }
 
-            $document.off( 'mousemove.wp-editor-resize mouseup.wp-editor-resize' );
+            $document.off( '.wp-editor-resize' );
 
             // sanity check
@@ -1046 +1051 @@
 
             $document.on( 'mousemove.wp-editor-resize', dragging )
-                .on( 'mouseup.wp-editor-resize', endDrag );
-
-            event.preventDefault();
-        });
+                .on( 'mouseup.wp-editor-resize mouseleave.wp-editor-resize', endDrag );
+
+            event.preventDefault();
+        }).on( 'mouseup.wp-editor-resize', endDrag );
     })();