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

Changes for manual tests after changes in focus and selection.

Szymon Kupś 9 лет назад
Родитель
Сommit
6f67b98eb1

+ 0 - 2
packages/ckeditor5-engine/tests/view/manual/focusobserver.html

@@ -1,6 +1,4 @@
 <div contenteditable="true" id="editable1" style="border: solid 1px black; background-color: red">
-	<p>First editable.</p>
 </div>
 <div contenteditable="true" id="editable2" style="border: solid 1px black; background-color: red">
-	<p>Second editable.</p>
 </div>

+ 16 - 2
packages/ckeditor5-engine/tests/view/manual/focusobserver.js

@@ -8,20 +8,34 @@
 'use strict';
 
 import Document from '/ckeditor5/engine/view/document.js';
+import MutationObserver from '/ckeditor5/engine/view/observer/mutationobserver.js';
+import SelectionObserver from '/ckeditor5/engine/view/observer/selectionobserver.js';
 import FocusObserver from '/ckeditor5/engine/view/observer/focusobserver.js';
+import { setData } from '/tests/engine/_utils/view.js';
 
 const viewDocument = new Document();
 
 viewDocument.on( 'focus', ( evt, data ) => console.log( 'event:focus', data.domTarget ) );
 viewDocument.on( 'blur', ( evt, data ) => console.log( 'event:blur', data.domTarget ) );
 
-viewDocument.addObserver( FocusObserver );
-
 const domEditable1 = document.getElementById( 'editable1' );
 const domEditable2 = document.getElementById( 'editable2' );
 
 const editable1 = viewDocument.createRoot( domEditable1, 'editable1' );
 const editable2 = viewDocument.createRoot( domEditable2, 'editable2' );
 
+viewDocument.on( 'selectionChange', ( evt, data ) => {
+	viewDocument.selection.setTo( data.newSelection );
+} );
+
+viewDocument.addObserver( MutationObserver );
+viewDocument.addObserver( SelectionObserver );
+viewDocument.addObserver( FocusObserver );
+
+setData( viewDocument, '<p>First editable.</p>', { rootName: 'editable1' } );
+setData( viewDocument, '<p>Second editable.</p>', { rootName: 'editable2' } );
+
 editable1.on( 'change:isFocused', () => domEditable1.style.backgroundColor = editable1.isFocused ? 'green' : 'red' );
 editable2.on( 'change:isFocused', () => domEditable2.style.backgroundColor = editable2.isFocused ? 'green' : 'red' );
+
+viewDocument.render();

+ 2 - 3
packages/ckeditor5-engine/tests/view/manual/inline-filler.js

@@ -12,13 +12,13 @@ import KeyObserver from '/ckeditor5/engine/view/observer/keyobserver.js';
 import { setData } from '/tests/engine/_utils/view.js';
 
 const viewDocument = new Document();
-const viewRoot = viewDocument.createRoot( document.getElementById( 'editor' ) );
+viewDocument.createRoot( document.getElementById( 'editor' ) );
 
 viewDocument.addObserver( MutationObserver );
 viewDocument.addObserver( SelectionObserver );
 viewDocument.addObserver( KeyObserver );
 
-viewDocument.focusedEditable = viewRoot;
+viewDocument.isFocused = true;
 
 setData( viewDocument,
 	'<container:p><attribute:strong>foo</attribute:strong>[]<attribute:strong>bar</attribute:strong></container:p>' );
@@ -28,4 +28,3 @@ viewDocument.on( 'selectionChange', ( evt, data ) => {
 } );
 
 viewDocument.render();
-

+ 3 - 3
packages/ckeditor5-engine/tests/view/manual/selectionobserver.js

@@ -10,15 +10,15 @@
 import Document from '/ckeditor5/engine/view/document.js';
 import MutationObserver from '/ckeditor5/engine/view/observer/mutationobserver.js';
 import SelectionObserver from '/ckeditor5/engine/view/observer/selectionobserver.js';
+import FocusObserver from '/ckeditor5/engine/view/observer/focusobserver.js';
 import { setData } from '/tests/engine/_utils/view.js';
 
 const viewDocument = new Document();
-const viewRoot = viewDocument.createRoot( document.getElementById( 'editor' ) );
+viewDocument.createRoot( document.getElementById( 'editor' ) );
 
 viewDocument.addObserver( MutationObserver );
 viewDocument.addObserver( SelectionObserver );
-
-viewDocument.focusedEditable = viewRoot;
+viewDocument.addObserver( FocusObserver );
 
 setData( viewDocument,
 	'<container:p><attribute:b>foo</attribute:b>bar</container:p>' +

+ 2 - 1
packages/ckeditor5-engine/tests/view/manual/x-index.js

@@ -18,7 +18,8 @@ const viewRoot = viewDocument.createRoot( document.getElementById( 'editor' ) );
 viewDocument.addObserver( MutationObserver );
 viewDocument.addObserver( SelectionObserver );
 
-viewDocument.focusedEditable = viewRoot;
+viewDocument.selectedEditable = viewRoot;
+viewDocument.isFocused = true;
 
 setData( viewDocument,
 	'<container:p>fo{}o</container:p>' +