瀏覽代碼

Merge pull request #13 from ckeditor/t/12

Feature: Added the table feature to the build. Closes #12.
Piotrek Koszuliński 7 年之前
父節點
當前提交
f658ede2c5
共有 49 個文件被更改,包括 90 次插入47 次删除
  1. 7 0
      packages/ckeditor5-build-decoupled-document/build-config.js
  2. 1 1
      packages/ckeditor5-build-decoupled-document/build/ckeditor.js
  3. 1 1
      packages/ckeditor5-build-decoupled-document/build/ckeditor.js.map
  4. 1 1
      packages/ckeditor5-build-decoupled-document/build/translations/ar.js
  5. 1 1
      packages/ckeditor5-build-decoupled-document/build/translations/ast.js
  6. 1 1
      packages/ckeditor5-build-decoupled-document/build/translations/bg.js
  7. 1 1
      packages/ckeditor5-build-decoupled-document/build/translations/cs.js
  8. 1 1
      packages/ckeditor5-build-decoupled-document/build/translations/da.js
  9. 1 1
      packages/ckeditor5-build-decoupled-document/build/translations/de.js
  10. 1 1
      packages/ckeditor5-build-decoupled-document/build/translations/el.js
  11. 1 1
      packages/ckeditor5-build-decoupled-document/build/translations/en-au.js
  12. 1 1
      packages/ckeditor5-build-decoupled-document/build/translations/eo.js
  13. 1 1
      packages/ckeditor5-build-decoupled-document/build/translations/es.js
  14. 1 1
      packages/ckeditor5-build-decoupled-document/build/translations/et.js
  15. 1 1
      packages/ckeditor5-build-decoupled-document/build/translations/eu.js
  16. 1 1
      packages/ckeditor5-build-decoupled-document/build/translations/fi.js
  17. 1 1
      packages/ckeditor5-build-decoupled-document/build/translations/fr.js
  18. 1 1
      packages/ckeditor5-build-decoupled-document/build/translations/gl.js
  19. 1 1
      packages/ckeditor5-build-decoupled-document/build/translations/gu.js
  20. 1 1
      packages/ckeditor5-build-decoupled-document/build/translations/hr.js
  21. 1 1
      packages/ckeditor5-build-decoupled-document/build/translations/hu.js
  22. 1 1
      packages/ckeditor5-build-decoupled-document/build/translations/it.js
  23. 1 1
      packages/ckeditor5-build-decoupled-document/build/translations/ja.js
  24. 1 1
      packages/ckeditor5-build-decoupled-document/build/translations/km.js
  25. 1 1
      packages/ckeditor5-build-decoupled-document/build/translations/kn.js
  26. 1 1
      packages/ckeditor5-build-decoupled-document/build/translations/ko.js
  27. 1 1
      packages/ckeditor5-build-decoupled-document/build/translations/ku.js
  28. 1 1
      packages/ckeditor5-build-decoupled-document/build/translations/nb.js
  29. 1 1
      packages/ckeditor5-build-decoupled-document/build/translations/ne.js
  30. 1 1
      packages/ckeditor5-build-decoupled-document/build/translations/nl.js
  31. 1 1
      packages/ckeditor5-build-decoupled-document/build/translations/oc.js
  32. 1 1
      packages/ckeditor5-build-decoupled-document/build/translations/pl.js
  33. 1 1
      packages/ckeditor5-build-decoupled-document/build/translations/pt-br.js
  34. 1 1
      packages/ckeditor5-build-decoupled-document/build/translations/pt.js
  35. 1 1
      packages/ckeditor5-build-decoupled-document/build/translations/ro.js
  36. 1 1
      packages/ckeditor5-build-decoupled-document/build/translations/ru.js
  37. 1 1
      packages/ckeditor5-build-decoupled-document/build/translations/si.js
  38. 1 1
      packages/ckeditor5-build-decoupled-document/build/translations/sk.js
  39. 1 1
      packages/ckeditor5-build-decoupled-document/build/translations/sq.js
  40. 1 1
      packages/ckeditor5-build-decoupled-document/build/translations/sv.js
  41. 1 1
      packages/ckeditor5-build-decoupled-document/build/translations/tr.js
  42. 1 1
      packages/ckeditor5-build-decoupled-document/build/translations/tt.js
  43. 1 1
      packages/ckeditor5-build-decoupled-document/build/translations/ug.js
  44. 1 1
      packages/ckeditor5-build-decoupled-document/build/translations/uk.js
  45. 1 1
      packages/ckeditor5-build-decoupled-document/build/translations/zh-cn.js
  46. 1 1
      packages/ckeditor5-build-decoupled-document/build/translations/zh.js
  47. 1 0
      packages/ckeditor5-build-decoupled-document/package.json
  48. 13 1
      packages/ckeditor5-build-decoupled-document/src/ckeditor.js
  49. 24 1
      packages/ckeditor5-build-decoupled-document/tests/manual/ckeditor.html

+ 7 - 0
packages/ckeditor5-build-decoupled-document/build-config.js

@@ -37,6 +37,8 @@ module.exports = {
 		'@ckeditor/ckeditor5-link/src/link',
 		'@ckeditor/ckeditor5-list/src/list',
 		'@ckeditor/ckeditor5-paragraph/src/paragraph',
+		'@ckeditor/ckeditor5-table/src/table',
+		'@ckeditor/ckeditor5-table/src/tabletoolbar'
 	],
 
 	// Editor config.
@@ -62,6 +64,7 @@ module.exports = {
 				'link',
 				'blockquote',
 				'imageUpload',
+				'insertTable',
 				'|',
 				'undo',
 				'redo'
@@ -77,6 +80,10 @@ module.exports = {
 			toolbar: [ 'imageStyle:alignLeft', 'imageStyle:full', 'imageStyle:alignRight', '|', 'imageTextAlternative' ]
 		},
 
+		table: {
+			toolbar: [ 'tableColumn', 'tableRow', 'mergeCell' ]
+		},
+
 		// UI language. Language codes follow the https://en.wikipedia.org/wiki/ISO_639-1 format.
 		language: 'en'
 	}

文件差異過大導致無法顯示
+ 1 - 1
packages/ckeditor5-build-decoupled-document/build/ckeditor.js


文件差異過大導致無法顯示
+ 1 - 1
packages/ckeditor5-build-decoupled-document/build/ckeditor.js.map


文件差異過大導致無法顯示
+ 1 - 1
packages/ckeditor5-build-decoupled-document/build/translations/ar.js


文件差異過大導致無法顯示
+ 1 - 1
packages/ckeditor5-build-decoupled-document/build/translations/ast.js


文件差異過大導致無法顯示
+ 1 - 1
packages/ckeditor5-build-decoupled-document/build/translations/bg.js


文件差異過大導致無法顯示
+ 1 - 1
packages/ckeditor5-build-decoupled-document/build/translations/cs.js


文件差異過大導致無法顯示
+ 1 - 1
packages/ckeditor5-build-decoupled-document/build/translations/da.js


文件差異過大導致無法顯示
+ 1 - 1
packages/ckeditor5-build-decoupled-document/build/translations/de.js


文件差異過大導致無法顯示
+ 1 - 1
packages/ckeditor5-build-decoupled-document/build/translations/el.js


文件差異過大導致無法顯示
+ 1 - 1
packages/ckeditor5-build-decoupled-document/build/translations/en-au.js


文件差異過大導致無法顯示
+ 1 - 1
packages/ckeditor5-build-decoupled-document/build/translations/eo.js


文件差異過大導致無法顯示
+ 1 - 1
packages/ckeditor5-build-decoupled-document/build/translations/es.js


文件差異過大導致無法顯示
+ 1 - 1
packages/ckeditor5-build-decoupled-document/build/translations/et.js


文件差異過大導致無法顯示
+ 1 - 1
packages/ckeditor5-build-decoupled-document/build/translations/eu.js


文件差異過大導致無法顯示
+ 1 - 1
packages/ckeditor5-build-decoupled-document/build/translations/fi.js


文件差異過大導致無法顯示
+ 1 - 1
packages/ckeditor5-build-decoupled-document/build/translations/fr.js


文件差異過大導致無法顯示
+ 1 - 1
packages/ckeditor5-build-decoupled-document/build/translations/gl.js


文件差異過大導致無法顯示
+ 1 - 1
packages/ckeditor5-build-decoupled-document/build/translations/gu.js


文件差異過大導致無法顯示
+ 1 - 1
packages/ckeditor5-build-decoupled-document/build/translations/hr.js


文件差異過大導致無法顯示
+ 1 - 1
packages/ckeditor5-build-decoupled-document/build/translations/hu.js


文件差異過大導致無法顯示
+ 1 - 1
packages/ckeditor5-build-decoupled-document/build/translations/it.js


文件差異過大導致無法顯示
+ 1 - 1
packages/ckeditor5-build-decoupled-document/build/translations/ja.js


文件差異過大導致無法顯示
+ 1 - 1
packages/ckeditor5-build-decoupled-document/build/translations/km.js


文件差異過大導致無法顯示
+ 1 - 1
packages/ckeditor5-build-decoupled-document/build/translations/kn.js


文件差異過大導致無法顯示
+ 1 - 1
packages/ckeditor5-build-decoupled-document/build/translations/ko.js


文件差異過大導致無法顯示
+ 1 - 1
packages/ckeditor5-build-decoupled-document/build/translations/ku.js


文件差異過大導致無法顯示
+ 1 - 1
packages/ckeditor5-build-decoupled-document/build/translations/nb.js


文件差異過大導致無法顯示
+ 1 - 1
packages/ckeditor5-build-decoupled-document/build/translations/ne.js


文件差異過大導致無法顯示
+ 1 - 1
packages/ckeditor5-build-decoupled-document/build/translations/nl.js


文件差異過大導致無法顯示
+ 1 - 1
packages/ckeditor5-build-decoupled-document/build/translations/oc.js


文件差異過大導致無法顯示
+ 1 - 1
packages/ckeditor5-build-decoupled-document/build/translations/pl.js


文件差異過大導致無法顯示
+ 1 - 1
packages/ckeditor5-build-decoupled-document/build/translations/pt-br.js


文件差異過大導致無法顯示
+ 1 - 1
packages/ckeditor5-build-decoupled-document/build/translations/pt.js


文件差異過大導致無法顯示
+ 1 - 1
packages/ckeditor5-build-decoupled-document/build/translations/ro.js


文件差異過大導致無法顯示
+ 1 - 1
packages/ckeditor5-build-decoupled-document/build/translations/ru.js


文件差異過大導致無法顯示
+ 1 - 1
packages/ckeditor5-build-decoupled-document/build/translations/si.js


文件差異過大導致無法顯示
+ 1 - 1
packages/ckeditor5-build-decoupled-document/build/translations/sk.js


文件差異過大導致無法顯示
+ 1 - 1
packages/ckeditor5-build-decoupled-document/build/translations/sq.js


文件差異過大導致無法顯示
+ 1 - 1
packages/ckeditor5-build-decoupled-document/build/translations/sv.js


文件差異過大導致無法顯示
+ 1 - 1
packages/ckeditor5-build-decoupled-document/build/translations/tr.js


文件差異過大導致無法顯示
+ 1 - 1
packages/ckeditor5-build-decoupled-document/build/translations/tt.js


文件差異過大導致無法顯示
+ 1 - 1
packages/ckeditor5-build-decoupled-document/build/translations/ug.js


文件差異過大導致無法顯示
+ 1 - 1
packages/ckeditor5-build-decoupled-document/build/translations/uk.js


文件差異過大導致無法顯示
+ 1 - 1
packages/ckeditor5-build-decoupled-document/build/translations/zh-cn.js


文件差異過大導致無法顯示
+ 1 - 1
packages/ckeditor5-build-decoupled-document/build/translations/zh.js


+ 1 - 0
packages/ckeditor5-build-decoupled-document/package.json

@@ -48,6 +48,7 @@
     "@ckeditor/ckeditor5-paragraph": "^10.0.0",
     "@ckeditor/ckeditor5-theme-lark": "^10.0.0",
     "@ckeditor/ckeditor5-upload": "^10.0.0",
+    "@ckeditor/ckeditor5-table": "^0.0.1",
     "babel-minify-webpack-plugin": "^0.3.0",
     "postcss-loader": "^2.0.10",
     "raw-loader": "^0.5.1",

+ 13 - 1
packages/ckeditor5-build-decoupled-document/src/ckeditor.js

@@ -26,6 +26,8 @@ import ImageuploadPlugin from '@ckeditor/ckeditor5-image/src/imageupload';
 import LinkPlugin from '@ckeditor/ckeditor5-link/src/link';
 import ListPlugin from '@ckeditor/ckeditor5-list/src/list';
 import ParagraphPlugin from '@ckeditor/ckeditor5-paragraph/src/paragraph';
+import TablePlugin from '@ckeditor/ckeditor5-table/src/table';
+import TabletoolbarPlugin from '@ckeditor/ckeditor5-table/src/tabletoolbar';
 
 export default class DecoupledEditor extends DecoupledEditorBase {}
 
@@ -52,7 +54,9 @@ DecoupledEditor.build = {
 		ImageuploadPlugin,
 		LinkPlugin,
 		ListPlugin,
-		ParagraphPlugin
+		ParagraphPlugin,
+		TablePlugin,
+		TabletoolbarPlugin
 	],
 	config: {
 		toolbar: {
@@ -76,6 +80,7 @@ DecoupledEditor.build = {
 				'link',
 				'blockquote',
 				'imageUpload',
+				'insertTable',
 				'|',
 				'undo',
 				'redo'
@@ -95,6 +100,13 @@ DecoupledEditor.build = {
 				'imageTextAlternative'
 			]
 		},
+		table: {
+			toolbar: [
+				'tableColumn',
+				'tableRow',
+				'mergeCell'
+			]
+		},
 		language: 'en'
 	}
 };

+ 24 - 1
packages/ckeditor5-build-decoupled-document/tests/manual/ckeditor.html

@@ -42,6 +42,29 @@
 
 		<p>It has <em>bugs</em> that we are aware of &mdash; and that we will be working on in the next few
 		iterations of the project. Stay tuned for some updates soon!</p>
+
+		<table>
+			<thead>
+				<tr>
+					<th>Version</th>
+					<th>Release date</th>
+				</tr>
+			</thead>
+			<tbody>
+				<tr>
+					<td>10.0.1</td>
+					<td>May 22, 2018</td>
+				</tr>
+				<tr>
+					<td>10.0.0</td>
+					<td>April 25, 2018</td>
+				</tr>
+				<tr>
+					<td>10.0.0-beta.2</td>
+					<td>April 10, 2018</td>
+				</tr>
+			</tbody>
+		</table>
 	</div>
 </div>
 
@@ -63,7 +86,7 @@
 		max-height: 500px;
 	}
 
-	.editable-container .ck-editor__editable {
+	.editable-container > .ck-editor__editable {
 		min-height: 21cm;
 		padding: 2em;
 		border: 1px #D3D3D3 solid;