Browse Source

Merge branch 'master' into t/1

Piotrek Koszuliński 8 years ago
parent
commit
40a40e5aec

+ 4 - 9
packages/ckeditor5-editor-inline/package.json

@@ -1,24 +1,19 @@
 {
   "name": "@ckeditor/ckeditor5-editor-inline",
-  "version": "0.6.0",
-  "description": "Inline Editor for CKEditor 5.",
+  "version": "0.0.1",
+  "description": "Inline editor for CKEditor 5.",
   "keywords": [],
   "dependencies": {
     "@ckeditor/ckeditor5-core": "*",
     "@ckeditor/ckeditor5-engine": "*",
-    "@ckeditor/ckeditor5-theme-lark": "*",
     "@ckeditor/ckeditor5-ui": "*",
     "@ckeditor/ckeditor5-utils": "*"
   },
   "devDependencies": {
-    "@ckeditor/ckeditor5-dev-lint": "^2.0.0",
     "@ckeditor/ckeditor5-basic-styles": "*",
-    "@ckeditor/ckeditor5-enter": "*",
-    "@ckeditor/ckeditor5-heading": "*",
+    "@ckeditor/ckeditor5-dev-lint": "^2.0.0",
     "@ckeditor/ckeditor5-paragraph": "*",
-    "@ckeditor/ckeditor5-undo": "*",
-    "@ckeditor/ckeditor5-typing": "*",
-    "@ckeditor/ckeditor5-link": "*",
+    "@ckeditor/ckeditor5-presets": "*",
     "gulp": "^3.9.0",
     "guppy-pre-commit": "^0.4.0"
   },

+ 2 - 9
packages/ckeditor5-editor-inline/tests/manual/inline.js

@@ -6,14 +6,7 @@
 /* globals console:false, document, window */
 
 import InlineEditor from '../../src/inline';
-import Enter from '@ckeditor/ckeditor5-enter/src/enter';
-import Typing from '@ckeditor/ckeditor5-typing/src/typing';
-import Heading from '@ckeditor/ckeditor5-heading/src/heading';
-import Paragraph from '@ckeditor/ckeditor5-paragraph/src/paragraph';
-import Undo from '@ckeditor/ckeditor5-undo/src/undo';
-import Bold from '@ckeditor/ckeditor5-basic-styles/src/bold';
-import Italic from '@ckeditor/ckeditor5-basic-styles/src/italic';
-import Link from '@ckeditor/ckeditor5-link/src/link';
+import ArticlePreset from '@ckeditor/ckeditor5-presets/src/article';
 import testUtils from '@ckeditor/ckeditor5-utils/tests/_utils/utils';
 
 window.editors = {};
@@ -26,7 +19,7 @@ function initEditors() {
 
 	function init( selector ) {
 		InlineEditor.create( document.querySelector( selector ), {
-			plugins: [ Link, Enter, Typing, Paragraph, Undo, Heading, Bold, Italic ],
+			plugins: [ ArticlePreset ],
 			toolbar: [ 'headings', 'bold', 'italic', 'undo', 'redo', 'link', 'unlink' ]
 		} )
 		.then( editor => {