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

Used real theme in creator tests.

Aleksander Nowodzinski 9 лет назад
Родитель
Сommit
6e736d934e

+ 1 - 1
tests/_utils/ui/boxededitorui/boxededitorui.js

@@ -13,7 +13,7 @@ export default class BoxedEditorUI extends EditorUI {
 		super( editor );
 
 		this.collections.add( new ControllerCollection( 'top' ) );
-		this.collections.add( new ControllerCollection( 'main' ) );
+		this.collections.add( new ControllerCollection( 'editable' ) );
 
 		const config = editor.config;
 

+ 5 - 5
tests/_utils/ui/boxededitorui/boxededitoruiview.js

@@ -15,27 +15,27 @@ export default class BoxedEditorUIView extends EditorUIView {
 			tag: 'div',
 
 			attributes: {
-				class: 'ck-box'
+				class: 'ck-reset ck-editor'
 			},
 
 			children: [
 				{
 					tag: 'div',
 					attributes: {
-						class: 'ck-box-region ck-top'
+						class: 'ck-editor-top ck-reset-all'
 					}
 				},
 
 				{
 					tag: 'div',
 					attributes: {
-						class: 'ck-box-region ck-main'
+						class: 'ck-editor-editable ck-reset-all'
 					}
 				}
 			]
 		};
 
-		this.register( 'top', '.ck-top' );
-		this.register( 'main', '.ck-main' );
+		this.register( 'top', '.ck-editor-top' );
+		this.register( 'editable', '.ck-editor-editable' );
 	}
 }

+ 1 - 1
tests/creator/manual/_utils/creator/classiccreator.js

@@ -47,7 +47,7 @@ export default class ClassicCreator extends StandardCreator {
 		// UI.
 		this._replaceElement( editor.firstElement, editor.ui.view.element );
 		this._createToolbar();
-		editor.ui.add( 'main', createEditableUI( editor, editable, FramedEditableUI, FramedEditableUIView ) );
+		editor.ui.add( 'editable', createEditableUI( editor, editable, FramedEditableUI, FramedEditableUIView ) );
 
 		// Init.
 		return super.create()

+ 4 - 2
tests/creator/manual/_utils/imitatefeatures.js

@@ -20,7 +20,8 @@ export function imitateFeatures( editor ) {
 	const boldModel = new Model( {
 		isEnabled: true,
 		isOn: false,
-		label: t( 'Bold' )
+		label: t( 'Bold' ),
+		icon: 'bold'
 	} );
 
 	boldModel.on( 'execute', () => {
@@ -35,7 +36,8 @@ export function imitateFeatures( editor ) {
 	const italicModel = new Model( {
 		isEnabled: true,
 		isOn: false,
-		label: t( 'Italic' )
+		label: t( 'Italic' ),
+		icon: 'italic'
 	} );
 
 	italicModel.on( 'execute', () => {

+ 1 - 1
tests/creator/manual/creator-classic.html

@@ -1,5 +1,5 @@
 <head>
-	<link rel="stylesheet" href="%TEST_DIR%_assets/styles.css">
+	<link rel="stylesheet" href="%APPS_DIR%ckeditor/build/amd/theme/ckeditor.css">
 </head>
 
 <p>