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

Merge branch 'master' into t/ckeditor5-image/134

Aleksander Nowodzinski 8 лет назад
Родитель
Сommit
784595e5f8

+ 1 - 1
packages/ckeditor5-core/package.json

@@ -12,7 +12,7 @@
     "@ckeditor/ckeditor5-basic-styles": "^0.9.0",
     "@ckeditor/ckeditor5-block-quote": "^0.2.0",
     "@ckeditor/ckeditor5-editor-classic": "^0.8.0",
-    "@ckeditor/ckeditor5-dev-lint": "^3.1.0",
+    "@ckeditor/ckeditor5-dev-lint": "^3.1.1",
     "@ckeditor/ckeditor5-heading": "^0.10.0",
     "@ckeditor/ckeditor5-image": "^0.7.0",
     "@ckeditor/ckeditor5-link": "^0.8.0",

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

@@ -47,7 +47,7 @@ export default class Editor {
 		 * The plugins loaded and in use by this editor instance.
 		 *
 		 * @readonly
-		 * @member {module:core/plugin~PluginCollection}
+		 * @member {module:core/plugincollection~PluginCollection}
 		 */
 		this.plugins = new PluginCollection( this, availablePlugins );
 

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

@@ -33,7 +33,7 @@
 /**
  * The list of plugins to load.
  *
- * If you use an {@linkTODO builds/guides/overview editor build} you can define the list of plugins to load
+ * If you use an {@glink builds/guides/overview editor build} you can define the list of plugins to load
  * using names of plugins which are available:
  *
  *		const config = {
@@ -61,7 +61,7 @@
  */
 
 /**
- * The list of plugins which should not be loaded despite being available in an {@linkTODO builds/guides/overview editor build}.
+ * The list of plugins which should not be loaded despite being available in an {@glink builds/guides/overview editor build}.
  *
  *		const config = {
  *			removePlugins: [ 'Bold', 'Italic' ]

+ 2 - 2
packages/ckeditor5-core/tests/manual/formsubmit.js

@@ -6,14 +6,14 @@
 /* globals console, window, document */
 
 import ClassicEditor from '@ckeditor/ckeditor5-editor-classic/src/classiceditor';
-import ArticlePreset from '@ckeditor/ckeditor5-presets/src/article';
+import ArticlePluginSet from '../_utils/articlepluginset';
 
 // Replace original submit method to prevent page reload.
 document.getElementById( 'form' ).submit = () => {};
 
 ClassicEditor
 	.create( document.querySelector( '#editor' ), {
-		plugins: [ ArticlePreset ],
+		plugins: [ ArticlePluginSet ],
 		toolbar: [ 'bold', 'italic', 'undo', 'redo' ],
 	} )
 	.then( editor => {