8
0
Просмотр исходного кода

Enabled the #951 fix for all web browsers to avoid code branching.

Aleksander Nowodzinski 8 лет назад
Родитель
Сommit
1d1682954a

+ 3 - 8
packages/ckeditor5-engine/src/view/domconverter.js

@@ -19,8 +19,6 @@ import ViewTreeWalker from './treewalker';
 import { BR_FILLER, INLINE_FILLER_LENGTH, isBlockFiller, isInlineFiller, startsWithFiller, getDataWithoutFiller } from './filler';
 import { BR_FILLER, INLINE_FILLER_LENGTH, isBlockFiller, isInlineFiller, startsWithFiller, getDataWithoutFiller } from './filler';
 
 
 import global from '@ckeditor/ckeditor5-utils/src/dom/global';
 import global from '@ckeditor/ckeditor5-utils/src/dom/global';
-import env from '@ckeditor/ckeditor5-utils/src/env';
-
 import indexOf from '@ckeditor/ckeditor5-utils/src/dom/indexof';
 import indexOf from '@ckeditor/ckeditor5-utils/src/dom/indexof';
 import getAncestors from '@ckeditor/ckeditor5-utils/src/dom/getancestors';
 import getAncestors from '@ckeditor/ckeditor5-utils/src/dom/getancestors';
 import getCommonAncestor from '@ckeditor/ckeditor5-utils/src/dom/getcommonancestor';
 import getCommonAncestor from '@ckeditor/ckeditor5-utils/src/dom/getcommonancestor';
@@ -743,12 +741,9 @@ export default class DomConverter {
 			domEditable.focus();
 			domEditable.focus();
 
 
 			// https://github.com/ckeditor/ckeditor5-engine/issues/951
 			// https://github.com/ckeditor/ckeditor5-engine/issues/951
-			if ( env.webkit ) {
-				domEditable.scrollLeft = scrollLeft;
-				domEditable.scrollTop = scrollTop;
-
-				global.window.scrollTo( scrollX, scrollY );
-			}
+			domEditable.scrollLeft = scrollLeft;
+			domEditable.scrollTop = scrollTop;
+			global.window.scrollTo( scrollX, scrollY );
 		}
 		}
 	}
 	}
 
 

+ 0 - 12
packages/ckeditor5-engine/tests/view/domconverter/domconverter.js

@@ -10,9 +10,7 @@ import ViewEditable from '../../../src/view/editableelement';
 import ViewDocument from '../../../src/view/document';
 import ViewDocument from '../../../src/view/document';
 import { BR_FILLER, NBSP_FILLER } from '../../../src/view/filler';
 import { BR_FILLER, NBSP_FILLER } from '../../../src/view/filler';
 import testUtils from '@ckeditor/ckeditor5-core/tests/_utils/utils';
 import testUtils from '@ckeditor/ckeditor5-core/tests/_utils/utils';
-
 import global from '@ckeditor/ckeditor5-utils/src/dom/global';
 import global from '@ckeditor/ckeditor5-utils/src/dom/global';
-import env from '@ckeditor/ckeditor5-utils/src/env';
 
 
 testUtils.createSinonSandbox();
 testUtils.createSinonSandbox();
 
 
@@ -73,7 +71,6 @@ describe( 'DomConverter', () => {
 		// https://github.com/ckeditor/ckeditor5-engine/issues/951
 		// https://github.com/ckeditor/ckeditor5-engine/issues/951
 		it( 'should actively prevent window scroll in WebKit', () => {
 		it( 'should actively prevent window scroll in WebKit', () => {
 			const scrollToSpy = testUtils.sinon.stub( global.window, 'scrollTo' );
 			const scrollToSpy = testUtils.sinon.stub( global.window, 'scrollTo' );
-			const initialEnvWebkit = env.webkit;
 			const scrollLeftSpy = sinon.spy();
 			const scrollLeftSpy = sinon.spy();
 			const scrollTopSpy = sinon.spy();
 			const scrollTopSpy = sinon.spy();
 
 
@@ -88,8 +85,6 @@ describe( 'DomConverter', () => {
 				}
 				}
 			} );
 			} );
 
 
-			env.webkit = true;
-
 			global.window.scrollX = 10;
 			global.window.scrollX = 10;
 			global.window.scrollY = 100;
 			global.window.scrollY = 100;
 
 
@@ -97,13 +92,6 @@ describe( 'DomConverter', () => {
 			sinon.assert.calledWithExactly( scrollToSpy, 10, 100 );
 			sinon.assert.calledWithExactly( scrollToSpy, 10, 100 );
 			sinon.assert.calledWithExactly( scrollLeftSpy, 20 );
 			sinon.assert.calledWithExactly( scrollLeftSpy, 20 );
 			sinon.assert.calledWithExactly( scrollTopSpy, 200 );
 			sinon.assert.calledWithExactly( scrollTopSpy, 200 );
-
-			env.webkit = false;
-
-			converter.focus( viewEditable );
-			sinon.assert.calledOnce( scrollToSpy );
-
-			env.webkit = initialEnvWebkit;
 		} );
 		} );
 	} );
 	} );