浏览代码

Merge branch 'master' into t/ckeditor5-ui-default/12

Piotrek Koszuliński 9 年之前
父节点
当前提交
b6e6f4cd7b

+ 11 - 32
packages/ckeditor5-editor-classic/src/classiccreator.js

@@ -5,22 +5,22 @@
 
 'use strict';
 
-import StandardCreator from '/ckeditor5/creator/standardcreator.js';
+import StandardCreator from '../creator/standardcreator.js';
 
-import HtmlDataProcessor from '/ckeditor5/engine/dataprocessor/htmldataprocessor.js';
-import Editable from '/ckeditor5/editable.js';
+import HtmlDataProcessor from '../engine/dataprocessor/htmldataprocessor.js';
+import Editable from '../editable.js';
 
-import { createEditableUI, createEditorUI } from '/ckeditor5/ui/creator-utils.js';
+import { createEditableUI, createEditorUI } from '../ui/creator-utils.js';
 
-import BoxedEditorUI from '/ckeditor5/ui/editorui/boxed/boxededitorui.js';
-import BoxedEditorUIView from '/ckeditor5/ui/editorui/boxed/boxededitoruiview.js';
+import BoxedEditorUI from '../ui/editorui/boxed/boxededitorui.js';
+import BoxedEditorUIView from '../ui/editorui/boxed/boxededitoruiview.js';
 
-import EditableUI from '/ckeditor5/ui/editableui/editableui.js';
-import InlineEditableUIView from '/ckeditor5/ui/editableui/inline/inlineeditableuiview.js';
+import EditableUI from '../ui/editableui/editableui.js';
+import InlineEditableUIView from '../ui/editableui/inline/inlineeditableuiview.js';
 
-import Model from '/ckeditor5/ui/model.js';
-import StickyToolbar from '/ckeditor5/ui/bindings/stickytoolbar.js';
-import StickyToolbarView from '/ckeditor5/ui/stickytoolbar/stickytoolbarview.js';
+import Model from '../ui/model.js';
+import StickyToolbar from '../ui/bindings/stickytoolbar.js';
+import StickyToolbarView from '../ui/stickytoolbar/stickytoolbarview.js';
 
 import { imitateFeatures, imitateDestroyFeatures } from './utils/imitatefeatures.js';
 
@@ -46,9 +46,6 @@ export default class ClassicCreator extends StandardCreator {
 
 		// UI.
 		createEditorUI( editor, BoxedEditorUI, BoxedEditorUIView );
-
-		// Data controller mock.
-		this._mockDataController();
 	}
 
 	/**
@@ -109,22 +106,4 @@ export default class ClassicCreator extends StandardCreator {
 
 		this.editor.ui.add( 'top', toolbar );
 	}
-
-	/**
-	 * TEMP: Mocks basic data IO for the purposes of the creator.
-	 * TODO: To be replaced with actual engine bindings.
-	 *
-	 * @protected
-	 */
-	_mockDataController() {
-		const editor = this.editor;
-
-		editor.data.get = ( rootName ) => {
-			return editor.editables.get( rootName ).domElement.innerHTML + `<p>getData( '${ rootName }' )</p>`;
-		};
-
-		this.editor.data.set = ( rootName, data ) => {
-			editor.editables.get( rootName ).domElement.innerHTML = data + `<p>setData( '${ rootName }' )</p>`;
-		};
-	}
 }

+ 3 - 3
packages/ckeditor5-editor-classic/src/utils/imitatefeatures.js

@@ -5,9 +5,9 @@
 
 'use strict';
 
-import Model from '/ckeditor5/ui/model.js';
-import Button from '/ckeditor5/ui/button/button.js';
-import ButtonView from '/ckeditor5/ui/button/buttonview.js';
+import Model from '../../ui/model.js';
+import Button from '../../ui/button/button.js';
+import ButtonView from '../../ui/button/buttonview.js';
 
 import Collection from '/ckeditor5/utils/collection.js';