浏览代码

Merge branch 'master' into t/52

Piotrek Koszuliński 8 年之前
父节点
当前提交
669d86e1a9
共有 31 个文件被更改,包括 203 次插入16 次删除
  1. 24 0
      packages/ckeditor5-basic-styles/CHANGELOG.md
  2. 4 0
      packages/ckeditor5-basic-styles/lang/translations/ast.po
  3. 4 0
      packages/ckeditor5-basic-styles/lang/translations/bg.po
  4. 4 0
      packages/ckeditor5-basic-styles/lang/translations/da.po
  5. 4 0
      packages/ckeditor5-basic-styles/lang/translations/de.po
  6. 4 0
      packages/ckeditor5-basic-styles/lang/translations/el.po
  7. 4 0
      packages/ckeditor5-basic-styles/lang/translations/en.po
  8. 4 0
      packages/ckeditor5-basic-styles/lang/translations/eo.po
  9. 18 0
      packages/ckeditor5-basic-styles/lang/translations/es.po
  10. 4 0
      packages/ckeditor5-basic-styles/lang/translations/fr.po
  11. 18 0
      packages/ckeditor5-basic-styles/lang/translations/gl.po
  12. 4 0
      packages/ckeditor5-basic-styles/lang/translations/hr.po
  13. 4 0
      packages/ckeditor5-basic-styles/lang/translations/hu.po
  14. 4 0
      packages/ckeditor5-basic-styles/lang/translations/it.po
  15. 18 0
      packages/ckeditor5-basic-styles/lang/translations/ja.po
  16. 4 0
      packages/ckeditor5-basic-styles/lang/translations/kn.po
  17. 4 0
      packages/ckeditor5-basic-styles/lang/translations/ku.po
  18. 4 0
      packages/ckeditor5-basic-styles/lang/translations/nb.po
  19. 4 0
      packages/ckeditor5-basic-styles/lang/translations/nl.po
  20. 4 0
      packages/ckeditor5-basic-styles/lang/translations/oc.po
  21. 5 1
      packages/ckeditor5-basic-styles/lang/translations/pl.po
  22. 4 0
      packages/ckeditor5-basic-styles/lang/translations/pt-br.po
  23. 4 0
      packages/ckeditor5-basic-styles/lang/translations/pt.po
  24. 4 0
      packages/ckeditor5-basic-styles/lang/translations/sk.po
  25. 4 0
      packages/ckeditor5-basic-styles/lang/translations/sv.po
  26. 4 0
      packages/ckeditor5-basic-styles/lang/translations/tr.po
  27. 4 0
      packages/ckeditor5-basic-styles/lang/translations/uk.po
  28. 4 0
      packages/ckeditor5-basic-styles/lang/translations/zh-cn.po
  29. 18 0
      packages/ckeditor5-basic-styles/lang/translations/zh.po
  30. 8 11
      packages/ckeditor5-basic-styles/package.json
  31. 2 4
      packages/ckeditor5-basic-styles/tests/manual/basic-styles.js

+ 24 - 0
packages/ckeditor5-basic-styles/CHANGELOG.md

@@ -1,6 +1,30 @@
 Changelog
 =========
 
+## [0.9.0](https://github.com/ckeditor/ckeditor5-basic-styles/compare/v0.8.1...v0.9.0) (2017-09-03)
+
+### Bug fixes
+
+* It should be possible to paste basic styles. See https://github.com/ckeditor/ckeditor5/issues/477. ([d2db7fe](https://github.com/ckeditor/ckeditor5-basic-styles/commit/d2db7fe))
+
+### Features
+
+* Introduced `AttributeCommand`. It was moved from `@ckeditor/ckeditor5-core/src/command/toggleattributecommand`. Closes [#47](https://github.com/ckeditor/ckeditor5-basic-styles/issues/47). ([0301d4a](https://github.com/ckeditor/ckeditor5-basic-styles/commit/0301d4a))
+* Introduced the `Underline` plugin. Closes [#51](https://github.com/ckeditor/ckeditor5-basic-styles/issues/51). ([f724ae0](https://github.com/ckeditor/ckeditor5-basic-styles/commit/f724ae0))
+
+### Other changes
+
+* Aligned the implementation to the new Command API (see https://github.com/ckeditor/ckeditor5-core/issues/88). ([36a976e](https://github.com/ckeditor/ckeditor5-basic-styles/commit/36a976e))
+* Cleaned up SVG icons. ([da10131](https://github.com/ckeditor/ckeditor5-basic-styles/commit/da10131))
+* Italic feature will use `<i>` instead of `<em>`. Closes [#28](https://github.com/ckeditor/ckeditor5-basic-styles/issues/28). ([9d1d5e2](https://github.com/ckeditor/ckeditor5-basic-styles/commit/9d1d5e2))
+
+  Read more in [Editor Recommendations](http://ckeditor.github.io/editor-recommendations/features/italic.html).
+
+### BREAKING CHANGES
+
+* The command API has been changed.
+
+
 ## [0.8.1](https://github.com/ckeditor/ckeditor5-basic-styles/compare/v0.8.0...v0.8.1) (2017-05-07)
 
 ### Bug fixes

+ 4 - 0
packages/ckeditor5-basic-styles/lang/translations/ast.po

@@ -12,3 +12,7 @@ msgstr "Negrina"
 msgctxt "Toolbar button tooltip for the Italic feature."
 msgid "Italic"
 msgstr "Cursiva"
+
+msgctxt "Toolbar button tooltip for the Underline feature."
+msgid "Underline"
+msgstr ""

+ 4 - 0
packages/ckeditor5-basic-styles/lang/translations/bg.po

@@ -12,3 +12,7 @@ msgstr "Удебелен"
 msgctxt "Toolbar button tooltip for the Italic feature."
 msgid "Italic"
 msgstr "Курсив"
+
+msgctxt "Toolbar button tooltip for the Underline feature."
+msgid "Underline"
+msgstr ""

+ 4 - 0
packages/ckeditor5-basic-styles/lang/translations/da.po

@@ -12,3 +12,7 @@ msgstr "Fed"
 msgctxt "Toolbar button tooltip for the Italic feature."
 msgid "Italic"
 msgstr "Kursiv"
+
+msgctxt "Toolbar button tooltip for the Underline feature."
+msgid "Underline"
+msgstr ""

+ 4 - 0
packages/ckeditor5-basic-styles/lang/translations/de.po

@@ -12,3 +12,7 @@ msgstr "Fett"
 msgctxt "Toolbar button tooltip for the Italic feature."
 msgid "Italic"
 msgstr "Kursiv"
+
+msgctxt "Toolbar button tooltip for the Underline feature."
+msgid "Underline"
+msgstr ""

+ 4 - 0
packages/ckeditor5-basic-styles/lang/translations/el.po

@@ -12,3 +12,7 @@ msgstr "Έντονη"
 msgctxt "Toolbar button tooltip for the Italic feature."
 msgid "Italic"
 msgstr "Πλάγια"
+
+msgctxt "Toolbar button tooltip for the Underline feature."
+msgid "Underline"
+msgstr ""

+ 4 - 0
packages/ckeditor5-basic-styles/lang/translations/en.po

@@ -12,3 +12,7 @@ msgstr "Bold"
 msgctxt "Toolbar button tooltip for the Italic feature."
 msgid "Italic"
 msgstr "Italic"
+
+msgctxt "Toolbar button tooltip for the Underline feature."
+msgid "Underline"
+msgstr "Underline"

+ 4 - 0
packages/ckeditor5-basic-styles/lang/translations/eo.po

@@ -12,3 +12,7 @@ msgstr "grasa"
 msgctxt "Toolbar button tooltip for the Italic feature."
 msgid "Italic"
 msgstr "kursiva"
+
+msgctxt "Toolbar button tooltip for the Underline feature."
+msgid "Underline"
+msgstr ""

+ 18 - 0
packages/ckeditor5-basic-styles/lang/translations/es.po

@@ -0,0 +1,18 @@
+# Copyright (c) Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
+msgid ""
+msgstr ""
+"Language: es\n"
+"Language-Team: Spanish (https://www.transifex.com/ckeditor/teams/11143/es/)\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+msgctxt "Toolbar button tooltip for the Bold feature."
+msgid "Bold"
+msgstr "Negritas"
+
+msgctxt "Toolbar button tooltip for the Italic feature."
+msgid "Italic"
+msgstr "Cursiva"
+
+msgctxt "Toolbar button tooltip for the Underline feature."
+msgid "Underline"
+msgstr ""

+ 4 - 0
packages/ckeditor5-basic-styles/lang/translations/fr.po

@@ -12,3 +12,7 @@ msgstr "Gras"
 msgctxt "Toolbar button tooltip for the Italic feature."
 msgid "Italic"
 msgstr "Italique"
+
+msgctxt "Toolbar button tooltip for the Underline feature."
+msgid "Underline"
+msgstr ""

+ 18 - 0
packages/ckeditor5-basic-styles/lang/translations/gl.po

@@ -0,0 +1,18 @@
+# Copyright (c) Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
+msgid ""
+msgstr ""
+"Language: gl\n"
+"Language-Team: Galician (https://www.transifex.com/ckeditor/teams/11143/gl/)\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+msgctxt "Toolbar button tooltip for the Bold feature."
+msgid "Bold"
+msgstr "Negra"
+
+msgctxt "Toolbar button tooltip for the Italic feature."
+msgid "Italic"
+msgstr "Itálica"
+
+msgctxt "Toolbar button tooltip for the Underline feature."
+msgid "Underline"
+msgstr ""

+ 4 - 0
packages/ckeditor5-basic-styles/lang/translations/hr.po

@@ -12,3 +12,7 @@ msgstr "Podebljano"
 msgctxt "Toolbar button tooltip for the Italic feature."
 msgid "Italic"
 msgstr "Ukošeno"
+
+msgctxt "Toolbar button tooltip for the Underline feature."
+msgid "Underline"
+msgstr ""

+ 4 - 0
packages/ckeditor5-basic-styles/lang/translations/hu.po

@@ -12,3 +12,7 @@ msgstr "Félkövér"
 msgctxt "Toolbar button tooltip for the Italic feature."
 msgid "Italic"
 msgstr "Dőlt"
+
+msgctxt "Toolbar button tooltip for the Underline feature."
+msgid "Underline"
+msgstr ""

+ 4 - 0
packages/ckeditor5-basic-styles/lang/translations/it.po

@@ -12,3 +12,7 @@ msgstr "Grassetto"
 msgctxt "Toolbar button tooltip for the Italic feature."
 msgid "Italic"
 msgstr "Corsivo"
+
+msgctxt "Toolbar button tooltip for the Underline feature."
+msgid "Underline"
+msgstr ""

+ 18 - 0
packages/ckeditor5-basic-styles/lang/translations/ja.po

@@ -0,0 +1,18 @@
+# Copyright (c) Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
+msgid ""
+msgstr ""
+"Language: ja\n"
+"Language-Team: Japanese (https://www.transifex.com/ckeditor/teams/11143/ja/)\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+msgctxt "Toolbar button tooltip for the Bold feature."
+msgid "Bold"
+msgstr "ボールド"
+
+msgctxt "Toolbar button tooltip for the Italic feature."
+msgid "Italic"
+msgstr "イタリック"
+
+msgctxt "Toolbar button tooltip for the Underline feature."
+msgid "Underline"
+msgstr ""

+ 4 - 0
packages/ckeditor5-basic-styles/lang/translations/kn.po

@@ -12,3 +12,7 @@ msgstr "‍‍ದಪ್ಪ"
 msgctxt "Toolbar button tooltip for the Italic feature."
 msgid "Italic"
 msgstr "‍ಇಟಾಲಿಕ್"
+
+msgctxt "Toolbar button tooltip for the Underline feature."
+msgid "Underline"
+msgstr ""

+ 4 - 0
packages/ckeditor5-basic-styles/lang/translations/ku.po

@@ -12,3 +12,7 @@ msgstr "قەڵەو"
 msgctxt "Toolbar button tooltip for the Italic feature."
 msgid "Italic"
 msgstr "لار"
+
+msgctxt "Toolbar button tooltip for the Underline feature."
+msgid "Underline"
+msgstr ""

+ 4 - 0
packages/ckeditor5-basic-styles/lang/translations/nb.po

@@ -12,3 +12,7 @@ msgstr "Fet"
 msgctxt "Toolbar button tooltip for the Italic feature."
 msgid "Italic"
 msgstr "Kursiv"
+
+msgctxt "Toolbar button tooltip for the Underline feature."
+msgid "Underline"
+msgstr ""

+ 4 - 0
packages/ckeditor5-basic-styles/lang/translations/nl.po

@@ -12,3 +12,7 @@ msgstr "Vet"
 msgctxt "Toolbar button tooltip for the Italic feature."
 msgid "Italic"
 msgstr ""
+
+msgctxt "Toolbar button tooltip for the Underline feature."
+msgid "Underline"
+msgstr ""

+ 4 - 0
packages/ckeditor5-basic-styles/lang/translations/oc.po

@@ -12,3 +12,7 @@ msgstr "Gras"
 msgctxt "Toolbar button tooltip for the Italic feature."
 msgid "Italic"
 msgstr "Italica"
+
+msgctxt "Toolbar button tooltip for the Underline feature."
+msgid "Underline"
+msgstr ""

+ 5 - 1
packages/ckeditor5-basic-styles/lang/translations/pl.po

@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Language: pl\n"
 "Language-Team: Polish (https://www.transifex.com/ckeditor/teams/11143/pl/)\n"
-"Plural-Forms: nplurals=4; plural=(n==1 ? 0 : (n%10>=2 && n%10<=4) && (n%100<12 || n%100>=14) ? 1 : n!=1 && (n%10>=0 && n%10<=1) || (n%10>=5 && n%10<=9) || (n%100>=12 && n%100<=14) ? 2 : 3);\n"
+"Plural-Forms: nplurals=4; plural=(n==1 ? 0 : (n%10>=2 && n%10<=4) && (n%100<12 || n%100>14) ? 1 : n!=1 && (n%10>=0 && n%10<=1) || (n%10>=5 && n%10<=9) || (n%100>=12 && n%100<=14) ? 2 : 3);\n"
 
 msgctxt "Toolbar button tooltip for the Bold feature."
 msgid "Bold"
@@ -12,3 +12,7 @@ msgstr "Pogrubienie"
 msgctxt "Toolbar button tooltip for the Italic feature."
 msgid "Italic"
 msgstr "Kursywa"
+
+msgctxt "Toolbar button tooltip for the Underline feature."
+msgid "Underline"
+msgstr ""

+ 4 - 0
packages/ckeditor5-basic-styles/lang/translations/pt-br.po

@@ -12,3 +12,7 @@ msgstr "Negrito"
 msgctxt "Toolbar button tooltip for the Italic feature."
 msgid "Italic"
 msgstr "Itálico"
+
+msgctxt "Toolbar button tooltip for the Underline feature."
+msgid "Underline"
+msgstr ""

+ 4 - 0
packages/ckeditor5-basic-styles/lang/translations/pt.po

@@ -12,3 +12,7 @@ msgstr "Negrito"
 msgctxt "Toolbar button tooltip for the Italic feature."
 msgid "Italic"
 msgstr "Itálico"
+
+msgctxt "Toolbar button tooltip for the Underline feature."
+msgid "Underline"
+msgstr ""

+ 4 - 0
packages/ckeditor5-basic-styles/lang/translations/sk.po

@@ -12,3 +12,7 @@ msgstr "Tučným"
 msgctxt "Toolbar button tooltip for the Italic feature."
 msgid "Italic"
 msgstr "Kurzíva"
+
+msgctxt "Toolbar button tooltip for the Underline feature."
+msgid "Underline"
+msgstr ""

+ 4 - 0
packages/ckeditor5-basic-styles/lang/translations/sv.po

@@ -12,3 +12,7 @@ msgstr "Fet"
 msgctxt "Toolbar button tooltip for the Italic feature."
 msgid "Italic"
 msgstr "Kursiv"
+
+msgctxt "Toolbar button tooltip for the Underline feature."
+msgid "Underline"
+msgstr ""

+ 4 - 0
packages/ckeditor5-basic-styles/lang/translations/tr.po

@@ -12,3 +12,7 @@ msgstr "Kalın"
 msgctxt "Toolbar button tooltip for the Italic feature."
 msgid "Italic"
 msgstr "İtalik"
+
+msgctxt "Toolbar button tooltip for the Underline feature."
+msgid "Underline"
+msgstr ""

+ 4 - 0
packages/ckeditor5-basic-styles/lang/translations/uk.po

@@ -12,3 +12,7 @@ msgstr "Жирний"
 msgctxt "Toolbar button tooltip for the Italic feature."
 msgid "Italic"
 msgstr "Курсив"
+
+msgctxt "Toolbar button tooltip for the Underline feature."
+msgid "Underline"
+msgstr ""

+ 4 - 0
packages/ckeditor5-basic-styles/lang/translations/zh-cn.po

@@ -12,3 +12,7 @@ msgstr "加粗"
 msgctxt "Toolbar button tooltip for the Italic feature."
 msgid "Italic"
 msgstr "倾斜"
+
+msgctxt "Toolbar button tooltip for the Underline feature."
+msgid "Underline"
+msgstr ""

+ 18 - 0
packages/ckeditor5-basic-styles/lang/translations/zh.po

@@ -0,0 +1,18 @@
+# Copyright (c) Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
+msgid ""
+msgstr ""
+"Language: zh_TW\n"
+"Language-Team: Chinese (Taiwan) (https://www.transifex.com/ckeditor/teams/11143/zh_TW/)\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+msgctxt "Toolbar button tooltip for the Bold feature."
+msgid "Bold"
+msgstr "粗體"
+
+msgctxt "Toolbar button tooltip for the Italic feature."
+msgid "Italic"
+msgstr "斜體"
+
+msgctxt "Toolbar button tooltip for the Underline feature."
+msgid "Underline"
+msgstr ""

+ 8 - 11
packages/ckeditor5-basic-styles/package.json

@@ -1,22 +1,19 @@
 {
   "name": "@ckeditor/ckeditor5-basic-styles",
-  "version": "0.8.1",
+  "version": "0.9.0",
   "description": "Basic styles feature for CKEditor 5.",
   "keywords": [],
   "dependencies": {
-    "@ckeditor/ckeditor5-core": "^0.8.1",
-    "@ckeditor/ckeditor5-engine": "^0.10.0",
-    "@ckeditor/ckeditor5-ui": "^0.9.0"
+    "@ckeditor/ckeditor5-core": "^0.9.0",
+    "@ckeditor/ckeditor5-engine": "^0.11.0",
+    "@ckeditor/ckeditor5-ui": "^0.10.0"
   },
   "devDependencies": {
     "@ckeditor/ckeditor5-dev-lint": "^3.1.0",
-    "@ckeditor/ckeditor5-editor-classic": "^0.7.3",
-    "@ckeditor/ckeditor5-enter": "^0.9.1",
-    "@ckeditor/ckeditor5-heading": "^0.9.1",
-    "@ckeditor/ckeditor5-paragraph": "^0.8.0",
-    "@ckeditor/ckeditor5-typing": "^0.9.1",
-    "@ckeditor/ckeditor5-undo": "^0.8.1",
-    "@ckeditor/ckeditor5-utils": "^0.9.1",
+    "@ckeditor/ckeditor5-editor-classic": "^0.8.0",
+    "@ckeditor/ckeditor5-paragraph": "^0.9.0",
+    "@ckeditor/ckeditor5-presets": "^0.3.0",
+    "@ckeditor/ckeditor5-utils": "^0.10.0",
     "eslint-config-ckeditor5": "^1.0.5",
     "gulp": "^3.9.1",
     "guppy-pre-commit": "^0.4.0"

+ 2 - 4
packages/ckeditor5-basic-styles/tests/manual/basic-styles.js

@@ -6,10 +6,8 @@
 /* globals console:false, window, document */
 
 import ClassicEditor from '@ckeditor/ckeditor5-editor-classic/src/classiceditor';
-import Enter from '@ckeditor/ckeditor5-enter/src/enter';
-import Typing from '@ckeditor/ckeditor5-typing/src/typing';
+import EssentialsPreset from '@ckeditor/ckeditor5-presets/src/essentials';
 import Paragraph from '@ckeditor/ckeditor5-paragraph/src/paragraph';
-import Undo from '@ckeditor/ckeditor5-undo/src/undo';
 import Bold from '../../src/bold';
 import Italic from '../../src/italic';
 import Underline from '../../src/underline';
@@ -17,7 +15,7 @@ import Code from '../../src/code';
 
 ClassicEditor
 	.create( document.querySelector( '#editor' ), {
-		plugins: [ Enter, Typing, Paragraph, Undo, Bold, Italic, Underline, Code ],
+		plugins: [ EssentialsPreset, Paragraph, Bold, Italic, Underline, Code ],
 		toolbar: [ 'bold', 'italic', 'underline', 'code', 'undo', 'redo' ]
 	} )
 	.then( editor => {