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

Merge branch 'master' into t/41

Piotrek Koszuliński 9 лет назад
Родитель
Сommit
391f7ae69c

+ 8 - 1
packages/ckeditor5-typing/tests/manual/delete.js

@@ -6,6 +6,13 @@
 /* globals console, window, document */
 /* globals console, window, document */
 
 
 import ClassicEditor from '/ckeditor5/editor-classic/classic.js';
 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 Undo from '/ckeditor5/undo/undo.js';
+import Bold from '/ckeditor5/basic-styles/bold.js';
+import Italic from '/ckeditor5/basic-styles/italic.js';
 import { getData } from '/ckeditor5/engine/dev-utils/model.js';
 import { getData } from '/ckeditor5/engine/dev-utils/model.js';
 
 
 window.getData = getData;
 window.getData = getData;
@@ -15,7 +22,7 @@ window.setInterval( function() {
 }, 3000 );
 }, 3000 );
 
 
 ClassicEditor.create( document.querySelector( '#editor' ), {
 ClassicEditor.create( document.querySelector( '#editor' ), {
-	features: [ 'enter', 'typing', 'paragraph', 'undo', 'basic-styles/bold', 'basic-styles/italic', 'heading' ],
+	features: [ Enter, Typing, Paragraph, Undo, Bold, Italic, Heading ],
 	toolbar: [ 'headings', 'bold', 'italic', 'undo', 'redo' ]
 	toolbar: [ 'headings', 'bold', 'italic', 'undo', 'redo' ]
 } )
 } )
 .then( editor => {
 .then( editor => {

+ 8 - 1
packages/ckeditor5-typing/tests/manual/input.js

@@ -6,6 +6,13 @@
 /* globals console, window, document */
 /* globals console, window, document */
 
 
 import ClassicEditor from '/ckeditor5/editor-classic/classic.js';
 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 Undo from '/ckeditor5/undo/undo.js';
+import Bold from '/ckeditor5/basic-styles/bold.js';
+import Italic from '/ckeditor5/basic-styles/italic.js';
 import { getData } from '/ckeditor5/engine/dev-utils/model.js';
 import { getData } from '/ckeditor5/engine/dev-utils/model.js';
 
 
 window.setInterval( function() {
 window.setInterval( function() {
@@ -13,7 +20,7 @@ window.setInterval( function() {
 }, 3000 );
 }, 3000 );
 
 
 ClassicEditor.create( document.querySelector( '#editor' ), {
 ClassicEditor.create( document.querySelector( '#editor' ), {
-	features: [ 'enter', 'typing', 'paragraph', 'undo', 'basic-styles/bold', 'basic-styles/italic', 'heading' ],
+	features: [ Enter, Typing, Paragraph, Undo, Bold, Italic, Heading ],
 	toolbar: [ 'headings', 'bold', 'italic', 'undo', 'redo' ]
 	toolbar: [ 'headings', 'bold', 'italic', 'undo', 'redo' ]
 } )
 } )
 .then( editor => {
 .then( editor => {

+ 8 - 1
packages/ckeditor5-typing/tests/manual/rtl.js

@@ -6,10 +6,17 @@
 /* globals console, window, document */
 /* globals console, window, document */
 
 
 import ClassicEditor from '/ckeditor5/editor-classic/classic.js';
 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 Undo from '/ckeditor5/undo/undo.js';
+import Bold from '/ckeditor5/basic-styles/bold.js';
+import Italic from '/ckeditor5/basic-styles/italic.js';
 import { getData } from '/ckeditor5/engine/dev-utils/model.js';
 import { getData } from '/ckeditor5/engine/dev-utils/model.js';
 
 
 const config = {
 const config = {
-	features: [ 'enter', 'typing', 'paragraph', 'undo', 'basic-styles/bold', 'basic-styles/italic', 'heading' ],
+	features: [ Enter, Typing, Paragraph, Undo, Bold, Italic, Heading ],
 	toolbar: [ 'headings', 'bold', 'italic', 'undo', 'redo' ]
 	toolbar: [ 'headings', 'bold', 'italic', 'undo', 'redo' ]
 };
 };
 
 

+ 5 - 1
packages/ckeditor5-typing/tests/manual/selection.js

@@ -6,9 +6,13 @@
 /* globals console, document, window */
 /* globals console, document, window */
 
 
 import ClassicEditor from '/ckeditor5/editor-classic/classic.js';
 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 Undo from '/ckeditor5/undo/undo.js';
 
 
 ClassicEditor.create( document.querySelector( '#editor' ), {
 ClassicEditor.create( document.querySelector( '#editor' ), {
-	features: [ 'enter', 'typing', 'paragraph', 'undo' ],
+	features: [ Enter, Typing, Paragraph, Undo ],
 	toolbar: []
 	toolbar: []
 } )
 } )
 .then( editor => {
 .then( editor => {

+ 4 - 1
packages/ckeditor5-typing/tests/tickets/40/1.js

@@ -6,9 +6,12 @@
 /* globals console:false, document, window */
 /* globals console:false, document, window */
 
 
 import ClassicEditor from '/ckeditor5/editor-classic/classic.js';
 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';
 
 
 ClassicEditor.create( document.querySelector( '#editor' ), {
 ClassicEditor.create( document.querySelector( '#editor' ), {
-	features: [ 'enter', 'typing', 'heading' ],
+	features: [ Enter, Typing, Heading ],
 	toolbar: [ 'headings' ]
 	toolbar: [ 'headings' ]
 } )
 } )
 .then( editor => {
 .then( editor => {

+ 4 - 1
packages/ckeditor5-typing/tests/tickets/49/1.js

@@ -6,11 +6,14 @@
 /* globals console:false, document, window */
 /* globals console:false, document, window */
 
 
 import ClassicEditor from '/ckeditor5/editor-classic/classic.js';
 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 { getData as getModelData } from '/ckeditor5/engine/dev-utils/model.js';
 import { getData as getModelData } from '/ckeditor5/engine/dev-utils/model.js';
 import { getData as getViewData } from '/ckeditor5/engine/dev-utils/view.js';
 import { getData as getViewData } from '/ckeditor5/engine/dev-utils/view.js';
 
 
 ClassicEditor.create( document.querySelector( '#editor' ), {
 ClassicEditor.create( document.querySelector( '#editor' ), {
-	features: [ 'enter', 'typing', 'paragraph' ],
+	features: [ Enter, Typing, Paragraph ],
 	toolbar: []
 	toolbar: []
 } )
 } )
 .then( editor => {
 .then( editor => {