Bladeren bron

Merge branch 'master' into t/627

Piotrek Koszuliński 9 jaren geleden
bovenliggende
commit
8fda08c15f

+ 5 - 1
packages/ckeditor5-engine/tests/tickets/401/1.js

@@ -6,9 +6,13 @@
 /* globals console, document, window */
 
 import ClassicEditor from '/ckeditor5/editor-classic/classic.js';
+import Enter from '/ckeditor5/enter/enter.js';
+import Typing from '/ckeditor5/typing/typing.js';
+import Paragraph from '/ckeditor5/paragraph/paragraph.js';
+import Bold from '/ckeditor5/basic-styles/bold.js';
 
 ClassicEditor.create( document.getElementById( 'editor' ), {
-	features: [ 'enter', 'typing', 'paragraph', 'basic-styles/bold' ],
+	features: [ Enter, Typing, Paragraph, Bold ],
 	toolbar: [ 'bold' ]
 } )
 .then( editor => {

+ 12 - 4
packages/ckeditor5-engine/tests/tickets/462/1.js

@@ -6,9 +6,14 @@
 /* globals console, window, document, setInterval */
 
 import ClassicEditor from '/ckeditor5/editor-classic/classic.js';
+import Enter from '/ckeditor5/enter/enter.js';
+import Typing from '/ckeditor5/typing/typing.js';
+import Paragraph from '/ckeditor5/paragraph/paragraph.js';
+import Bold from '/ckeditor5/basic-styles/bold.js';
+import Italic from '/ckeditor5/basic-styles/italic.js';
 
 ClassicEditor.create( document.querySelector( '#editor' ), {
-	features: [ 'enter', 'typing', 'paragraph', 'basic-styles/bold', 'basic-styles/italic' ],
+	features: [ Enter, Typing, Paragraph, Bold, Italic ],
 	toolbar: [ 'bold', 'italic' ]
 } )
 .then( editor => {
@@ -17,10 +22,13 @@ ClassicEditor.create( document.querySelector( '#editor' ), {
 	setInterval( () => {
 		console.clear();
 
+		const domSelection = document.getSelection();
+		const selectionExists = domSelection && domSelection.anchorNode;
+
 		console.log( editor.editing.view.getDomRoot().innerHTML.replace( /\u200b/g, '@' ) );
-		console.log( 'selection.hasAttribute( italic )', editor.document.selection.hasAttribute( 'italic' ) );
-		console.log( 'selection.hasAttribute( bold )', editor.document.selection.hasAttribute( 'bold' ) );
-		console.log( 'selection anchor\'s parentNode', document.getSelection().anchorNode.parentNode );
+		console.log( 'selection.hasAttribute( italic ):', editor.document.selection.hasAttribute( 'italic' ) );
+		console.log( 'selection.hasAttribute( bold ):', editor.document.selection.hasAttribute( 'bold' ) );
+		console.log( 'selection anchor\'s parentNode:', selectionExists ? domSelection.anchorNode.parentNode : 'no DOM selection' );
 	}, 2000 );
 } )
 .catch( err => {

+ 6 - 1
packages/ckeditor5-engine/tests/tickets/475/1.js

@@ -19,6 +19,11 @@ import buildViewConverter from '/ckeditor5/engine/conversion/buildviewconverter.
 
 import AttributeElement from '/ckeditor5/engine/view/attributeelement.js';
 
+import Enter from '/ckeditor5/enter/enter.js';
+import Typing from '/ckeditor5/typing/typing.js';
+import Paragraph from '/ckeditor5/paragraph/paragraph.js';
+import Undo from '/ckeditor5/undo/undo.js';
+
 class Link extends Feature {
 	init() {
 		const editor = this.editor;
@@ -87,6 +92,6 @@ function _getLastPathPart( path ) {
 }
 
 ClassicEditor.create( document.querySelector( '#editor' ), {
-	features: [ 'enter', 'typing', 'paragraph', 'undo', Link, AutoLinker ],
+	features: [ Enter, Typing, Paragraph, Undo, Link, AutoLinker ],
 	toolbar: [ 'undo', 'redo' ]
 } );

+ 7 - 1
packages/ckeditor5-engine/tests/tickets/603/1.js

@@ -6,9 +6,15 @@
 /* globals console, window, document */
 
 import ClassicEditor from '/ckeditor5/editor-classic/classic.js';
+import Enter from '/ckeditor5/enter/enter.js';
+import Typing from '/ckeditor5/typing/typing.js';
+import Heading from '/ckeditor5/heading/heading.js';
+import Paragraph from '/ckeditor5/paragraph/paragraph.js';
+import Bold from '/ckeditor5/basic-styles/bold.js';
+import Italic from '/ckeditor5/basic-styles/italic.js';
 
 ClassicEditor.create( document.querySelector( '#editor' ), {
-	features: [ 'enter', 'typing', 'paragraph', 'heading', 'basic-styles/bold', 'basic-styles/italic' ],
+	features: [ Enter, Typing, Paragraph, Heading, Bold, Italic ],
 	toolbar: [ 'headings', 'bold', 'italic' ]
 } )
 .then( editor => {