8
0
Quellcode durchsuchen

Merge branch 'master' into t/ckeditor5/1457

Marek Lewandowski vor 6 Jahren
Ursprung
Commit
cce395d8da

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

@@ -20,8 +20,6 @@ import EditingKeystrokeHandler from '../editingkeystrokehandler';
 import ObservableMixin from '@ckeditor/ckeditor5-utils/src/observablemixin';
 import mix from '@ckeditor/ckeditor5-utils/src/mix';
 
-import '@ckeditor/ckeditor5-utils/src/version';
-
 /**
  * Class representing a basic, generic editor.
  *

+ 4 - 4
packages/ckeditor5-core/src/editor/editorconfig.jsdoc

@@ -40,14 +40,14 @@
  *			.then( ... )
  *			.catch( ... );
  *
- * By default, the editor is initialized with the content of the element on which the editor is initialized.
+ * By default, the editor is initialized with the content of the element on which this editor is initialized.
  * See {@link module:core/editor/editor~Editor.create Editor.create()}.
  *
- * This configuration option lets you override initial data if an element is passed in `Editor.create()` call.
+ * This configuration option lets you override initial data if an element is passed to `Editor.create()`.
  * It is especially useful if it is difficult for your integration to put the data inside the HTML element.
  *
- * **Note:** if initial data is passed in `Editor.create()` as a parameter, an error will be thrown as those
- * two options exclude themselves.
+ * **Note:** If initial data is passed to `Editor.create()` as a parameter and, at the same time, via this configuration option,
+ * an error will be thrown as those two options exclude themselves.
  *
  * @member {String} module:core/editor/editorconfig~EditorConfig#initialData
  */