浏览代码

Merge branch 'master' into t/ckeditor5/645

Aleksander Nowodzinski 8 年之前
父节点
当前提交
bc0c542fd9
共有 37 个文件被更改,包括 48 次插入44 次删除
  1. 1 1
      packages/ckeditor5-basic-styles/.eslintrc.js
  2. 1 1
      packages/ckeditor5-basic-styles/lang/translations/ast.po
  3. 1 1
      packages/ckeditor5-basic-styles/lang/translations/bg.po
  4. 1 1
      packages/ckeditor5-basic-styles/lang/translations/da.po
  5. 1 1
      packages/ckeditor5-basic-styles/lang/translations/de.po
  6. 1 1
      packages/ckeditor5-basic-styles/lang/translations/el.po
  7. 1 1
      packages/ckeditor5-basic-styles/lang/translations/en-au.po
  8. 1 1
      packages/ckeditor5-basic-styles/lang/translations/en.po
  9. 1 1
      packages/ckeditor5-basic-styles/lang/translations/eo.po
  10. 1 1
      packages/ckeditor5-basic-styles/lang/translations/es.po
  11. 1 1
      packages/ckeditor5-basic-styles/lang/translations/fi.po
  12. 1 1
      packages/ckeditor5-basic-styles/lang/translations/fr.po
  13. 1 1
      packages/ckeditor5-basic-styles/lang/translations/gl.po
  14. 1 1
      packages/ckeditor5-basic-styles/lang/translations/gu.po
  15. 1 1
      packages/ckeditor5-basic-styles/lang/translations/hr.po
  16. 1 1
      packages/ckeditor5-basic-styles/lang/translations/hu.po
  17. 1 1
      packages/ckeditor5-basic-styles/lang/translations/it.po
  18. 1 1
      packages/ckeditor5-basic-styles/lang/translations/ja.po
  19. 1 1
      packages/ckeditor5-basic-styles/lang/translations/km.po
  20. 1 1
      packages/ckeditor5-basic-styles/lang/translations/kn.po
  21. 1 1
      packages/ckeditor5-basic-styles/lang/translations/ko.po
  22. 1 1
      packages/ckeditor5-basic-styles/lang/translations/ku.po
  23. 1 1
      packages/ckeditor5-basic-styles/lang/translations/nb.po
  24. 1 1
      packages/ckeditor5-basic-styles/lang/translations/nl.po
  25. 1 1
      packages/ckeditor5-basic-styles/lang/translations/oc.po
  26. 1 1
      packages/ckeditor5-basic-styles/lang/translations/pl.po
  27. 1 1
      packages/ckeditor5-basic-styles/lang/translations/pt-br.po
  28. 1 1
      packages/ckeditor5-basic-styles/lang/translations/pt.po
  29. 1 1
      packages/ckeditor5-basic-styles/lang/translations/ro.po
  30. 1 1
      packages/ckeditor5-basic-styles/lang/translations/sk.po
  31. 1 1
      packages/ckeditor5-basic-styles/lang/translations/sv.po
  32. 1 1
      packages/ckeditor5-basic-styles/lang/translations/tr.po
  33. 1 1
      packages/ckeditor5-basic-styles/lang/translations/uk.po
  34. 1 1
      packages/ckeditor5-basic-styles/lang/translations/zh-cn.po
  35. 1 1
      packages/ckeditor5-basic-styles/lang/translations/zh.po
  36. 2 2
      packages/ckeditor5-basic-styles/package.json
  37. 11 7
      packages/ckeditor5-basic-styles/tests/attributecommand.js

+ 1 - 1
packages/ckeditor5-basic-styles/.eslintrc.js

@@ -1,5 +1,5 @@
 /**
- * @license Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
+ * @license Copyright (c) 2003-2018, CKSource - Frederico Knabben. All rights reserved.
  * For licensing, see LICENSE.md.
  */
 

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

@@ -1,4 +1,4 @@
-# Copyright (c) Copyright (c) 2003-2018, CKSource - Frederico Knabben. All rights reserved.
+# Copyright (c) 2003-2018, CKSource - Frederico Knabben. All rights reserved.
 msgid ""
 msgstr ""
 "Language: ast\n"

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

@@ -1,4 +1,4 @@
-# Copyright (c) Copyright (c) 2003-2018, CKSource - Frederico Knabben. All rights reserved.
+# Copyright (c) 2003-2018, CKSource - Frederico Knabben. All rights reserved.
 msgid ""
 msgstr ""
 "Language: bg\n"

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

@@ -1,4 +1,4 @@
-# Copyright (c) Copyright (c) 2003-2018, CKSource - Frederico Knabben. All rights reserved.
+# Copyright (c) 2003-2018, CKSource - Frederico Knabben. All rights reserved.
 msgid ""
 msgstr ""
 "Language: da\n"

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

@@ -1,4 +1,4 @@
-# Copyright (c) Copyright (c) 2003-2018, CKSource - Frederico Knabben. All rights reserved.
+# Copyright (c) 2003-2018, CKSource - Frederico Knabben. All rights reserved.
 msgid ""
 msgstr ""
 "Language: de\n"

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

@@ -1,4 +1,4 @@
-# Copyright (c) Copyright (c) 2003-2018, CKSource - Frederico Knabben. All rights reserved.
+# Copyright (c) 2003-2018, CKSource - Frederico Knabben. All rights reserved.
 msgid ""
 msgstr ""
 "Language: el\n"

+ 1 - 1
packages/ckeditor5-basic-styles/lang/translations/en-au.po

@@ -1,4 +1,4 @@
-# Copyright (c) Copyright (c) 2003-2018, CKSource - Frederico Knabben. All rights reserved.
+# Copyright (c) 2003-2018, CKSource - Frederico Knabben. All rights reserved.
 msgid ""
 msgstr ""
 "Language: en_AU\n"

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

@@ -1,4 +1,4 @@
-# Copyright (c) Copyright (c) 2003-2018, CKSource - Frederico Knabben. All rights reserved.
+# Copyright (c) 2003-2018, CKSource - Frederico Knabben. All rights reserved.
 msgid ""
 msgstr ""
 "Language: \n"

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

@@ -1,4 +1,4 @@
-# Copyright (c) Copyright (c) 2003-2018, CKSource - Frederico Knabben. All rights reserved.
+# Copyright (c) 2003-2018, CKSource - Frederico Knabben. All rights reserved.
 msgid ""
 msgstr ""
 "Language: eo\n"

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

@@ -1,4 +1,4 @@
-# Copyright (c) Copyright (c) 2003-2018, CKSource - Frederico Knabben. All rights reserved.
+# Copyright (c) 2003-2018, CKSource - Frederico Knabben. All rights reserved.
 msgid ""
 msgstr ""
 "Language: es\n"

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

@@ -1,4 +1,4 @@
-# Copyright (c) Copyright (c) 2003-2018, CKSource - Frederico Knabben. All rights reserved.
+# Copyright (c) 2003-2018, CKSource - Frederico Knabben. All rights reserved.
 msgid ""
 msgstr ""
 "Language: fi\n"

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

@@ -1,4 +1,4 @@
-# Copyright (c) Copyright (c) 2003-2018, CKSource - Frederico Knabben. All rights reserved.
+# Copyright (c) 2003-2018, CKSource - Frederico Knabben. All rights reserved.
 msgid ""
 msgstr ""
 "Language: fr\n"

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

@@ -1,4 +1,4 @@
-# Copyright (c) Copyright (c) 2003-2018, CKSource - Frederico Knabben. All rights reserved.
+# Copyright (c) 2003-2018, CKSource - Frederico Knabben. All rights reserved.
 msgid ""
 msgstr ""
 "Language: gl\n"

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

@@ -1,4 +1,4 @@
-# Copyright (c) Copyright (c) 2003-2018, CKSource - Frederico Knabben. All rights reserved.
+# Copyright (c) 2003-2018, CKSource - Frederico Knabben. All rights reserved.
 msgid ""
 msgstr ""
 "Language: gu\n"

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

@@ -1,4 +1,4 @@
-# Copyright (c) Copyright (c) 2003-2018, CKSource - Frederico Knabben. All rights reserved.
+# Copyright (c) 2003-2018, CKSource - Frederico Knabben. All rights reserved.
 msgid ""
 msgstr ""
 "Language: hr\n"

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

@@ -1,4 +1,4 @@
-# Copyright (c) Copyright (c) 2003-2018, CKSource - Frederico Knabben. All rights reserved.
+# Copyright (c) 2003-2018, CKSource - Frederico Knabben. All rights reserved.
 msgid ""
 msgstr ""
 "Language: hu\n"

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

@@ -1,4 +1,4 @@
-# Copyright (c) Copyright (c) 2003-2018, CKSource - Frederico Knabben. All rights reserved.
+# Copyright (c) 2003-2018, CKSource - Frederico Knabben. All rights reserved.
 msgid ""
 msgstr ""
 "Language: it\n"

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

@@ -1,4 +1,4 @@
-# Copyright (c) Copyright (c) 2003-2018, CKSource - Frederico Knabben. All rights reserved.
+# Copyright (c) 2003-2018, CKSource - Frederico Knabben. All rights reserved.
 msgid ""
 msgstr ""
 "Language: ja\n"

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

@@ -1,4 +1,4 @@
-# Copyright (c) Copyright (c) 2003-2018, CKSource - Frederico Knabben. All rights reserved.
+# Copyright (c) 2003-2018, CKSource - Frederico Knabben. All rights reserved.
 msgid ""
 msgstr ""
 "Language: km\n"

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

@@ -1,4 +1,4 @@
-# Copyright (c) Copyright (c) 2003-2018, CKSource - Frederico Knabben. All rights reserved.
+# Copyright (c) 2003-2018, CKSource - Frederico Knabben. All rights reserved.
 msgid ""
 msgstr ""
 "Language: kn\n"

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

@@ -1,4 +1,4 @@
-# Copyright (c) Copyright (c) 2003-2018, CKSource - Frederico Knabben. All rights reserved.
+# Copyright (c) 2003-2018, CKSource - Frederico Knabben. All rights reserved.
 msgid ""
 msgstr ""
 "Language: ko\n"

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

@@ -1,4 +1,4 @@
-# Copyright (c) Copyright (c) 2003-2018, CKSource - Frederico Knabben. All rights reserved.
+# Copyright (c) 2003-2018, CKSource - Frederico Knabben. All rights reserved.
 msgid ""
 msgstr ""
 "Language: ku\n"

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

@@ -1,4 +1,4 @@
-# Copyright (c) Copyright (c) 2003-2018, CKSource - Frederico Knabben. All rights reserved.
+# Copyright (c) 2003-2018, CKSource - Frederico Knabben. All rights reserved.
 msgid ""
 msgstr ""
 "Language: nb\n"

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

@@ -1,4 +1,4 @@
-# Copyright (c) Copyright (c) 2003-2018, CKSource - Frederico Knabben. All rights reserved.
+# Copyright (c) 2003-2018, CKSource - Frederico Knabben. All rights reserved.
 msgid ""
 msgstr ""
 "Language: nl\n"

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

@@ -1,4 +1,4 @@
-# Copyright (c) Copyright (c) 2003-2018, CKSource - Frederico Knabben. All rights reserved.
+# Copyright (c) 2003-2018, CKSource - Frederico Knabben. All rights reserved.
 msgid ""
 msgstr ""
 "Language: oc\n"

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

@@ -1,4 +1,4 @@
-# Copyright (c) Copyright (c) 2003-2018, CKSource - Frederico Knabben. All rights reserved.
+# Copyright (c) 2003-2018, CKSource - Frederico Knabben. All rights reserved.
 msgid ""
 msgstr ""
 "Language: pl\n"

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

@@ -1,4 +1,4 @@
-# Copyright (c) Copyright (c) 2003-2018, CKSource - Frederico Knabben. All rights reserved.
+# Copyright (c) 2003-2018, CKSource - Frederico Knabben. All rights reserved.
 msgid ""
 msgstr ""
 "Language: pt_BR\n"

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

@@ -1,4 +1,4 @@
-# Copyright (c) Copyright (c) 2003-2018, CKSource - Frederico Knabben. All rights reserved.
+# Copyright (c) 2003-2018, CKSource - Frederico Knabben. All rights reserved.
 msgid ""
 msgstr ""
 "Language: pt\n"

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

@@ -1,4 +1,4 @@
-# Copyright (c) Copyright (c) 2003-2018, CKSource - Frederico Knabben. All rights reserved.
+# Copyright (c) 2003-2018, CKSource - Frederico Knabben. All rights reserved.
 msgid ""
 msgstr ""
 "Language: ro\n"

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

@@ -1,4 +1,4 @@
-# Copyright (c) Copyright (c) 2003-2018, CKSource - Frederico Knabben. All rights reserved.
+# Copyright (c) 2003-2018, CKSource - Frederico Knabben. All rights reserved.
 msgid ""
 msgstr ""
 "Language: sk\n"

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

@@ -1,4 +1,4 @@
-# Copyright (c) Copyright (c) 2003-2018, CKSource - Frederico Knabben. All rights reserved.
+# Copyright (c) 2003-2018, CKSource - Frederico Knabben. All rights reserved.
 msgid ""
 msgstr ""
 "Language: sv\n"

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

@@ -1,4 +1,4 @@
-# Copyright (c) Copyright (c) 2003-2018, CKSource - Frederico Knabben. All rights reserved.
+# Copyright (c) 2003-2018, CKSource - Frederico Knabben. All rights reserved.
 msgid ""
 msgstr ""
 "Language: tr\n"

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

@@ -1,4 +1,4 @@
-# Copyright (c) Copyright (c) 2003-2018, CKSource - Frederico Knabben. All rights reserved.
+# Copyright (c) 2003-2018, CKSource - Frederico Knabben. All rights reserved.
 msgid ""
 msgstr ""
 "Language: uk\n"

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

@@ -1,4 +1,4 @@
-# Copyright (c) Copyright (c) 2003-2018, CKSource - Frederico Knabben. All rights reserved.
+# Copyright (c) 2003-2018, CKSource - Frederico Knabben. All rights reserved.
 msgid ""
 msgstr ""
 "Language: zh_CN\n"

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

@@ -1,4 +1,4 @@
-# Copyright (c) Copyright (c) 2003-2018, CKSource - Frederico Knabben. All rights reserved.
+# Copyright (c) 2003-2018, CKSource - Frederico Knabben. All rights reserved.
 msgid ""
 msgstr ""
 "Language: zh_TW\n"

+ 2 - 2
packages/ckeditor5-basic-styles/package.json

@@ -17,10 +17,10 @@
     "@ckeditor/ckeditor5-essentials": "^1.0.0-alpha.2",
     "@ckeditor/ckeditor5-paragraph": "^1.0.0-alpha.2",
     "@ckeditor/ckeditor5-utils": "^1.0.0-alpha.2",
-    "eslint": "^4.8.0",
+    "eslint": "^4.15.0",
     "eslint-config-ckeditor5": "^1.0.7",
     "husky": "^0.14.3",
-    "lint-staged": "^4.2.3"
+    "lint-staged": "^6.0.0"
   },
   "engines": {
     "node": ">=6.0.0",

+ 11 - 7
packages/ckeditor5-basic-styles/tests/attributecommand.js

@@ -63,6 +63,10 @@ describe( 'AttributeCommand', () => {
 
 		it( 'is false when selection does not have the attribute', () => {
 			model.change( () => {
+				doc.selection.setAttribute( attrKey, true );
+			} );
+
+			model.change( () => {
 				doc.selection.removeAttribute( attrKey );
 			} );
 
@@ -269,7 +273,7 @@ describe( 'AttributeCommand', () => {
 			expect( getData( model ) ).to.equal( '<p>a[<$text bold="true">bcfo]obar</$text>xyz</p>' );
 		} );
 
-		describe( 'should cause firing model document changesDone event', () => {
+		describe( 'should cause firing model change event', () => {
 			let spy;
 
 			beforeEach( () => {
@@ -279,31 +283,31 @@ describe( 'AttributeCommand', () => {
 			it( 'collapsed selection in non-empty parent', () => {
 				setData( model, '<p>x[]y</p>' );
 
-				doc.on( 'changesDone', spy );
+				model.document.on( 'change', spy );
 
 				command.execute();
 
-				expect( spy.calledOnce ).to.be.true;
+				expect( spy.called ).to.be.true;
 			} );
 
 			it( 'non-collapsed selection', () => {
 				setData( model, '<p>[xy]</p>' );
 
-				doc.on( 'changesDone', spy );
+				model.document.on( 'change', spy );
 
 				command.execute();
 
-				expect( spy.calledOnce ).to.be.true;
+				expect( spy.called ).to.be.true;
 			} );
 
 			it( 'in empty parent', () => {
 				setData( model, '<p>[]</p>' );
 
-				doc.on( 'changesDone', spy );
+				model.document.on( 'change', spy );
 
 				command.execute();
 
-				expect( spy.calledOnce ).to.be.true;
+				expect( spy.called ).to.be.true;
 			} );
 		} );
 	} );