Fix: It will be possible to configure toolbar offset without overridi…

…ng preconfigured toolbar items. See ckeditor/ckeditor5#572.
ckeditor · Sep 30, 2017 · f974881 · f974881
1 parent d1526fa
commit f974881
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 22 deletions.
diff --git a/build-config.js b/build-config.js
@@ -38,17 +38,19 @@ module.exports = {
 
 	// Editor config.
 	config: {
-		toolbar: [
-			'headings',
-			'bold',
-			'italic',
-			'link',
-			'bulletedList',
-			'numberedList',
-			'blockQuote',
-			'undo',
-			'redo'
-		],
+		toolbar: {
+			items: [
+				'headings',
+				'bold',
+				'italic',
+				'link',
+				'bulletedList',
+				'numberedList',
+				'blockQuote',
+				'undo',
+				'redo'
+			]
+		},
 
 		image: {
 			toolbar: [ 'imageStyleFull', 'imageStyleSide', '|', 'imageTextAlternative' ]

diff --git a/src/ckeditor.js b/src/ckeditor.js
@@ -43,17 +43,19 @@ InlineEditor.build = {
 		ImageuploadPlugin
 	],
 	config: {
-		toolbar: [
-			'headings',
-			'bold',
-			'italic',
-			'link',
-			'bulletedList',
-			'numberedList',
-			'blockQuote',
-			'undo',
-			'redo'
-		],
+		toolbar: {
+			items: [
+				'headings',
+				'bold',
+				'italic',
+				'link',
+				'bulletedList',
+				'numberedList',
+				'blockQuote',
+				'undo',
+				'redo'
+			]
+		},
 		image: {
 			toolbar: [
 				'imageStyleFull',