8
0
Quellcode durchsuchen

Merge branch 'master' into t/28

Piotrek Koszuliński vor 9 Jahren
Ursprung
Commit
006d6246c4

+ 1 - 1
packages/ckeditor5-heading/gulpfile.js

@@ -19,7 +19,7 @@ const config = {
 	]
 };
 
-const ckeditor5Lint = require( 'ckeditor5-dev-lint' )( config );
+const ckeditor5Lint = require( '@ckeditor/ckeditor5-dev-lint' )( config );
 
 gulp.task( 'lint', ckeditor5Lint.lint );
 gulp.task( 'lint-staged', ckeditor5Lint.lintStaged );

+ 9 - 6
packages/ckeditor5-heading/package.json

@@ -1,21 +1,24 @@
 {
   "name": "ckeditor5-headings",
-  "version": "0.1.0",
+  "version": "0.2.0",
   "description": "Headings feature for CKEditor 5.",
   "keywords": [],
   "dependencies": {},
   "devDependencies": {
-    "ckeditor5-dev-lint": "github:ckeditor/ckeditor5-dev-lint",
+    "@ckeditor/ckeditor5-dev-lint": "^1.0.1",
     "gulp": "^3.9.0",
     "guppy-pre-commit": "^0.3.0"
   },
   "engines": {
-    "node": ">=5.0.0",
+    "node": ">=6.0.0",
     "npm": ">=3.0.0"
   },
   "author": "CKSource (http://cksource.com/)",
   "license": "See LICENSE.md",
-  "homepage": "",
-  "bugs": "",
-  "repository": ""
+  "homepage": "https://ckeditor5.github.io",
+  "bugs": "https://github.com/ckeditor/ckeditor5-headings/issues",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/ckeditor/ckeditor5-headings.git"
+  }
 }

+ 2 - 2
packages/ckeditor5-heading/src/headingscommand.js

@@ -114,12 +114,12 @@ export default class HeadingsCommand extends Command {
 				// When removing applied format.
 				if ( shouldRemove ) {
 					if ( element.name === formatId ) {
-						batch.rename( this.defaultFormat.id, element );
+						batch.rename( element, this.defaultFormat.id );
 					}
 				}
 				// When applying new format.
 				else {
-					batch.rename( formatId, element );
+					batch.rename( element, formatId );
 				}
 			}
 

+ 2 - 2
packages/ckeditor5-heading/tests/manual/headings.js

@@ -8,8 +8,8 @@
 import ClassicEditor from '/ckeditor5/editor-classic/classic.js';
 
 ClassicEditor.create( document.querySelector( '#editor' ), {
-	features: [ 'enter', 'typing', 'headings' ],
-	toolbar: [ 'headings' ]
+	features: [ 'enter', 'typing', 'undo', 'headings' ],
+	toolbar: [ 'headings', 'undo', 'redo' ]
 } )
 .then( editor => {
 	window.editor = editor;