Ticket #7946: 7946.patch

element.js

@@ -1401 +1401 @@
                         // Get the element window.
                         var win = this.getWindow(),
                                 winHeight = win.getViewPaneSize().height;
+                                
+                        // Get the browser window.
+                        var browserWindow = new CKEDITOR.dom.window (window),
+                                browserWinHeight = browserWindow.getViewPaneSize().height;
+                                
+                        // Get the editor document
+                        var editorDocument = this.getDocument();
+                        
+                        //Find the current instance of the editor  - is there an easier way to get the current editor instance?
+                        var ckInstances = CKEDITOR.instances;
+                        var currentInstance;
+                        for (var i in ckInstances){
+                                if (ckInstances[i].document.equals(editorDocument)){
+                                        currentInstance = i;
+                                        break;
+                                }                               
+                        }
+                        
+                        //find the iframe element of the current instance and gets it's document position i.e. the position of the iframe in the HTML page - is there a better way to get the iframe element?
+                        var iframePosition = ckInstances[currentInstance].container.getElementsByTag('iframe').getItem(0).getDocumentPosition(); 
 
                         // Starts from the offset that will be scrolled with the negative value of
                         // the visible window height.
@@ -1422 +1442 @@
                         // Append the offsets for the entire element hierarchy.
                         var elementPosition = this.getDocumentPosition();
                         offset += elementPosition.y;
-
-                        // offset value might be out of range(nagative), fix it(#3692).
-                        offset = offset < 0 ? 0 : offset;
-
+                        
                         // Scroll the window to the desired position, if not already visible(#3795).
                         var currentScroll = win.getScrollPosition().y;
                         if ( offset > currentScroll || offset < currentScroll - winHeight )
-                                win.$.scrollTo( 0, offset );
+                                win.$.scrollTo( 0, offset > 0 ? offset : 0  );  // offset value might be out of range(nagative), fix it(#3692).
+                        
+                        
+                        // Scroll the browser window to the desired position, if not already visible
+                        var browserOffset = iframePosition.y + (elementPosition.y - win.getScrollPosition().y);                 
+                        var currentBrowserScroll = browserWindow.getScrollPosition().y;
+                        if (browserOffset < currentBrowserScroll || browserOffset > (currentBrowserScroll + browserWinHeight))
+                                browserWindow.$.scrollTo( 0, browserOffset);                    
+                        
                 },
 
                 setState : function( state )