Avoid scrolling on Chrome when opening dropdowns.

ckeditor · Oct 7, 2013 · 61f7511 · 61f7511
1 parent 3a780a0
commit 61f7511
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 8 deletions.
diff --git a/plugins/floatpanel/plugin.js b/plugins/floatpanel/plugin.js
@@ -364,12 +364,18 @@ CKEDITOR.plugins.add( 'floatpanel', {
 					panel.isLoaded ? panelLoad() : panel.onLoad = panelLoad;
 
 					CKEDITOR.tools.setTimeout( function() {
+						var scrollTop = CKEDITOR.document.getWindow().getScrollPosition().y;
+
 						// Focus the panel frame first, so blur gets fired.
 						this.focus();
 
 						// Focus the block now.
 						block.element.focus();
 
+						// #10623, #10951 - restore the viewport's scroll position after focusing list element.
+						if ( CKEDITOR.env.webkit )
+							CKEDITOR.document.getBody().$.scrollTop = scrollTop;
+
 						// We need this get fired manually because of unfired focus() function.
 						this.allowBlur( true );
 						this._.editor.fire( 'panelShow', this );

diff --git a/plugins/listblock/plugin.js b/plugins/listblock/plugin.js
@@ -223,16 +223,9 @@ CKEDITOR.plugins.add( 'listblock', {
 							}
 						}
 					}
-					else {
-						var scrollTop = CKEDITOR.document.getWindow().getScrollPosition().y;
-
+					else
 						this.element.focus();
 
-						// #10623 - restore the viewport's scroll position after focusing list element.
-						if ( CKEDITOR.env.webkit )
-							CKEDITOR.document[ CKEDITOR.env.webkit ? 'getBody' : 'getDocumentElement' ]().$.scrollTop = scrollTop;
-					}
-
 					selected && setTimeout( function() {
 						selected.focus();
 					}, 0 );