Browse Source

Merge pull request #37 from ckeditor/t/36

Updated paths and docs to editing and data controllers.
Piotrek Koszuliński 9 years ago
parent
commit
27b487fe52

+ 5 - 5
packages/ckeditor5-core/src/editor/editor.js

@@ -7,7 +7,7 @@ import EmitterMixin from '../../utils/emittermixin.js';
 import Config from '../../utils/config.js';
 import PluginCollection from '../plugincollection.js';
 import Locale from '../../utils/locale.js';
-import DataController from '../../engine/datacontroller.js';
+import DataController from '../../engine/controller/datacontroller.js';
 import Document from '../../engine/model/document.js';
 import FocusTracker from '../../utils/focustracker.js';
 
@@ -76,10 +76,10 @@ export default class Editor {
 		this.document = new Document();
 
 		/**
-		 * Instance of the {@link engine.DataController data controller}.
+		 * Instance of the {@link engine.controller.DataController data controller}.
 		 *
 		 * @readonly
-		 * @member {engine.DataController} core.editor.Editor#data
+		 * @member {engine.controller.DataController} core.editor.Editor#data
 		 */
 		this.data = new DataController( this.document );
 
@@ -91,7 +91,7 @@ export default class Editor {
 		this.focusTracker = new FocusTracker();
 
 		/**
-		 * Instance of the {@link engine.EditingController editing controller}.
+		 * Instance of the {@link engine.controller.EditingController editing controller}.
 		 *
 		 * This property is set by more specialized editor classes (such as {@link core.editor.StandardEditor}),
 		 * however, it's required for features to work as their engine-related parts will try to connect converters.
@@ -100,7 +100,7 @@ export default class Editor {
 		 * editing controller which only instantiates necessary properties, but without any observers and listeners.
 		 *
 		 * @readonly
-		 * @member {engine.EditingController} core.editor.Editor#editing
+		 * @member {engine.controller.EditingController} core.editor.Editor#editing
 		 */
 	}
 

+ 2 - 2
packages/ckeditor5-core/src/editor/standardeditor.js

@@ -5,14 +5,14 @@
 
 import Editor from './editor.js';
 import KeystrokeHandler from '../keystrokehandler.js';
-import EditingController from '../../engine/editingcontroller.js';
+import EditingController from '../../engine/controller/editingcontroller.js';
 
 import getDataFromElement from '../../utils/dom/getdatafromelement.js';
 import setDataInElement from '../../utils/dom/setdatainelement.js';
 
 /**
  * Class representing a typical browser-based editor. It handles a single source element and
- * uses {@link engine.EditingController}.
+ * uses {@link engine.controller.EditingController}.
  *
  * @memberOf core.editor
  */

+ 1 - 1
packages/ckeditor5-core/tests/editor/standardeditor.js

@@ -10,7 +10,7 @@ import StandardEditor from '/ckeditor5/core/editor/standardeditor.js';
 import HtmlDataProcessor from '/ckeditor5/engine/dataprocessor/htmldataprocessor.js';
 import { getData, setData } from '/ckeditor5/engine/dev-utils/model.js';
 
-import EditingController from '/ckeditor5/engine/editingcontroller.js';
+import EditingController from '/ckeditor5/engine/controller/editingcontroller.js';
 import KeystrokeHandler from '/ckeditor5/core/keystrokehandler.js';
 import Feature from '/ckeditor5/core/feature.js';