Changeset 20804

Timestamp:

05/16/2012 07:02:55 AM (12 years ago)

Author:

azaozz

Message:

DFW: another attempt to get auto-resize working right, see #20608, see #20684

Location:

trunk/wp-includes/js/tinymce/plugins/wpfullscreen

Files:

• css/wp-fullscreen.css (modified) (1 diff)
• editor_plugin_src.js (modified) (3 diffs)

trunk/wp-includes/js/tinymce/plugins/wpfullscreen/css/wp-fullscreen.css

@@ -3 +3 @@
 */
 
-html, body {
+html,
+body {
     background: transparent;
     width: auto !important;
     max-width: none !important;
-    margin: 0;
-    padding: 0;
+    margin: 0 !important;
+    padding: 0 !important;
+    min-height: 0 !important;
 }

trunk/wp-includes/js/tinymce/plugins/wpfullscreen/editor_plugin_src.js

@@ -9 +9 @@
 
         init : function(ed, url) {
-            var t = this, oldHeight = 0, s = {}, DOM = tinymce.DOM, resized = false;
+            var t = this, oldHeight = 0, s = {}, DOM = tinymce.DOM;
 
             // Register commands
@@ -113 +113 @@
              */
             function resize() {
-                if ( resized )
-                    return;
-
                 var d = ed.getDoc(), DOM = tinymce.DOM, resizeHeight, myHeight;
 
                 // Get height differently depending on the browser used
-                if ( tinymce.isIE || tinymce.isWebKit )
+                if ( tinymce.isWebKit )
+                    myHeight = d.body.offsetHeight;
+                else
                     myHeight = d.body.scrollHeight;
-                else
-                    myHeight = d.body.offsetHeight;
 
                 // Don't make it smaller than 300px
@@ -129 +126 @@
                 // Resize content element
                 if ( oldHeight != resizeHeight ) {
-                    resized = true;
-                    setTimeout(function(){ resized = false; }, 100);
                     DOM.setStyle(DOM.get(ed.id + '_ifr'), 'height', resizeHeight + 'px');
                     oldHeight = resizeHeight;
+                    ed.getWin().scrollTo(0,0);
                 }
             };