Changeset 21963

Timestamp:

09/24/2012 03:08:31 AM (13 years ago)

Author:

azaozz

Message:

DFW: add scroll locking to prevent scrolling to top in WebKit on paste, add auto-resize throttling to 0.5 sec, only compare scrollHeight values (works well in all supported browsers), fixes #21979

File:

• trunk/wp-includes/js/tinymce/plugins/wpfullscreen/editor_plugin_src.js (modified) (3 diffs)

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

@@ -7 +7 @@
 (function() {
     tinymce.create('tinymce.plugins.wpFullscreenPlugin', {
+        resize_timeout: false,
 
         init : function(ed, url) {
@@ -120 +121 @@
              * This method gets executed each time the editor needs to resize.
              */
-            function resize() {
-                var d = ed.getDoc(), DOM = tinymce.DOM, resizeHeight, myHeight;
+            function resize(editor, e) {
+                var DOM = tinymce.DOM, body = ed.getBody(), ifr = DOM.get(ed.id + '_ifr'), height, y = ed.dom.win.scrollY;
 
-                // Get height differently depending on the browser used
-                if ( tinymce.isWebKit )
-                    myHeight = d.body.offsetHeight;
-                else
-                    myHeight = d.body.scrollHeight;
+                if ( t.resize_timeout )
+                    return;
 
-                // Don't make it smaller than 300px
-                resizeHeight = (myHeight > 300) ? myHeight : 300;
+                // sometimes several events are fired few ms apart, trottle down resizing a little
+                t.resize_timeout = true;
+                setTimeout(function(){
+                    t.resize_timeout = false;
+                }, 500);
 
-                // Resize content element
-                if ( oldHeight != resizeHeight ) {
-                    DOM.setStyle(DOM.get(ed.id + '_ifr'), 'height', resizeHeight + 'px');
-                    oldHeight = resizeHeight;
-                    ed.getWin().scrollTo(0,0);
+                height = body.scrollHeight > 300 ? body.scrollHeight : 300;
+
+                if ( height != ifr.scrollHeight ) {
+                    DOM.setStyle(ifr, 'height', height + 'px');
+                    ed.getWin().scrollTo(0, 0); // iframe window object, make sure there's no scrolling
+                }
+
+                // WebKit scrolls to top on paste...
+                if ( e && e.type == 'paste' && tinymce.isWebKit ) {
+                    setTimeout(function(){
+                        ed.dom.win.scrollTo(0, y);
+                    }, 40);
                 }
             };
@@ -151 +159 @@
             });
 
-            if (ed.getParam('autoresize_on_init', true)) {
+            if ( ed.getParam('autoresize_on_init', true) ) {
                 ed.onLoadContent.add(function(ed, l) {
                     // Because the content area resizes when its content CSS loads,