8
0
Quellcode durchsuchen

Merge branch 'master' into t/ckeditor5-widget/95

Maciej Gołaszewski vor 6 Jahren
Ursprung
Commit
71b4d13ac7

+ 14 - 1
packages/ckeditor5-block-quote/CHANGELOG.md

@@ -1,6 +1,19 @@
 Changelog
 =========
 
+## [11.1.3](https://github.com/ckeditor/ckeditor5-block-quote/compare/v11.1.2...v11.1.3) (2019-08-26)
+
+### Bug fixes
+
+* The UI buttons should be marked as toggleable for better assistive technologies support (see [ckeditor/ckeditor5#1403](https://github.com/ckeditor/ckeditor5/issues/1403)). ([aa24686](https://github.com/ckeditor/ckeditor5-block-quote/commit/aa24686))
+
+### Other changes
+
+* Adjusted blockquote content styles for better compatibility with RTL languages. See [ckeditor/ckeditor5#1151](https://github.com/ckeditor/ckeditor5/issues/1151). ([c48b703](https://github.com/ckeditor/ckeditor5-block-quote/commit/c48b703))
+* The issue tracker for this package was moved to https://github.com/ckeditor/ckeditor5/issues. See [ckeditor/ckeditor5#1988](https://github.com/ckeditor/ckeditor5/issues/1988). ([ffcbcfc](https://github.com/ckeditor/ckeditor5-block-quote/commit/ffcbcfc))
+* Updated translations. ([537f761](https://github.com/ckeditor/ckeditor5-block-quote/commit/537f761))
+
+
 ## [11.1.2](https://github.com/ckeditor/ckeditor5-block-quote/compare/v11.1.1...v11.1.2) (2019-07-10)
 
 Internal changes only (updated dependencies, documentation, etc.).
@@ -10,7 +23,7 @@ Internal changes only (updated dependencies, documentation, etc.).
 
 ### Other changes
 
-* Updated translations. ([3ab78f2](https://github.com/ckeditor/ckeditor5-block-quote/commit/3ab78f2)) 
+* Updated translations. ([3ab78f2](https://github.com/ckeditor/ckeditor5-block-quote/commit/3ab78f2))
 
 
 ## [11.1.0](https://github.com/ckeditor/ckeditor5-block-quote/compare/v11.0.1...v11.1.0) (2019-06-05)

+ 21 - 0
packages/ckeditor5-block-quote/lang/translations/en-gb.po

@@ -0,0 +1,21 @@
+# Copyright (c) 2003-2019, CKSource - Frederico Knabben. All rights reserved.
+#
+#                                     !!! IMPORTANT !!!
+#
+#         Before you edit this file, please keep in mind that contributing to the project
+#                translations is possible ONLY via the Transifex online service.
+#
+#         To submit your translations, visit https://www.transifex.com/ckeditor/ckeditor5.
+#
+#                   To learn more, check out the official contributor's guide:
+#     https://ckeditor.com/docs/ckeditor5/latest/framework/guides/contributing/contributing.html
+#
+msgid ""
+msgstr ""
+"Language-Team: English (United Kingdom) (https://www.transifex.com/ckeditor/teams/11143/en_GB/)\n"
+"Language: en_GB\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+msgctxt "Toolbar button tooltip for the Block quote feature."
+msgid "Block quote"
+msgstr "Block quote"

+ 15 - 15
packages/ckeditor5-block-quote/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ckeditor/ckeditor5-block-quote",
-  "version": "11.1.2",
+  "version": "11.1.3",
   "description": "Block quote feature for CKEditor 5.",
   "keywords": [
     "ckeditor",
@@ -10,21 +10,21 @@
     "ckeditor5-plugin"
   ],
   "dependencies": {
-    "@ckeditor/ckeditor5-core": "^12.2.1",
-    "@ckeditor/ckeditor5-ui": "^13.0.2",
-    "@ckeditor/ckeditor5-utils": "^13.0.1"
+    "@ckeditor/ckeditor5-core": "^12.3.0",
+    "@ckeditor/ckeditor5-ui": "^14.0.0",
+    "@ckeditor/ckeditor5-utils": "^14.0.0"
   },
   "devDependencies": {
-    "@ckeditor/ckeditor5-basic-styles": "^11.1.3",
-    "@ckeditor/ckeditor5-editor-classic": "^12.1.3",
-    "@ckeditor/ckeditor5-engine": "^13.2.1",
-    "@ckeditor/ckeditor5-enter": "^11.0.4",
-    "@ckeditor/ckeditor5-heading": "^11.0.4",
-    "@ckeditor/ckeditor5-image": "^13.1.2",
-    "@ckeditor/ckeditor5-list": "^12.0.4",
-    "@ckeditor/ckeditor5-paragraph": "^11.0.4",
-    "@ckeditor/ckeditor5-table": "^13.0.2",
-    "@ckeditor/ckeditor5-typing": "^12.1.1",
+    "@ckeditor/ckeditor5-basic-styles": "^11.1.4",
+    "@ckeditor/ckeditor5-editor-classic": "^12.1.4",
+    "@ckeditor/ckeditor5-engine": "^14.0.0",
+    "@ckeditor/ckeditor5-enter": "^11.1.0",
+    "@ckeditor/ckeditor5-heading": "^11.0.5",
+    "@ckeditor/ckeditor5-image": "^14.0.0",
+    "@ckeditor/ckeditor5-list": "^12.1.0",
+    "@ckeditor/ckeditor5-paragraph": "^11.0.5",
+    "@ckeditor/ckeditor5-table": "^14.0.0",
+    "@ckeditor/ckeditor5-typing": "^12.2.0",
     "eslint": "^5.5.0",
     "eslint-config-ckeditor5": "^2.0.0",
     "husky": "^1.3.1",
@@ -37,7 +37,7 @@
   "author": "CKSource (http://cksource.com/)",
   "license": "GPL-2.0-or-later",
   "homepage": "https://ckeditor.com/ckeditor-5",
-  "bugs": "https://github.com/ckeditor/ckeditor5-block-quote/issues",
+  "bugs": "https://github.com/ckeditor/ckeditor5/issues",
   "repository": {
     "type": "git",
     "url": "https://github.com/ckeditor/ckeditor5-block-quote.git"

+ 2 - 1
packages/ckeditor5-block-quote/src/blockquoteui.js

@@ -35,7 +35,8 @@ export default class BlockQuoteUI extends Plugin {
 			buttonView.set( {
 				label: t( 'Block quote' ),
 				icon: quoteIcon,
-				tooltip: true
+				tooltip: true,
+				isToggleable: true
 			} );
 
 			// Bind button model to command.

+ 1 - 0
packages/ckeditor5-block-quote/tests/blockquoteui.js

@@ -40,6 +40,7 @@ describe( 'BlockQuoteUI', () => {
 			expect( button ).to.have.property( 'label', 'Block quote' );
 			expect( button ).to.have.property( 'icon' );
 			expect( button ).to.have.property( 'tooltip', true );
+			expect( button ).to.have.property( 'isToggleable', true );
 		} );
 
 		it( 'has isOn bound to command\'s value', () => {

+ 6 - 6
packages/ckeditor5-block-quote/tests/integration.js

@@ -333,7 +333,7 @@ describe( 'BlockQuote integration', () => {
 				.then( editor => {
 					setModelData( editor.model,
 						'<paragraph>fo[o</paragraph>' +
-						'<image src="foo.png"></image>' +
+						'<image src="/assets/sample.png"></image>' +
 						'<paragraph>b]ar</paragraph>'
 					);
 
@@ -342,7 +342,7 @@ describe( 'BlockQuote integration', () => {
 					expect( getModelData( editor.model ) ).to.equal(
 						'<blockQuote>' +
 							'<paragraph>fo[o</paragraph>' +
-							'<image src="foo.png"></image>' +
+							'<image src="/assets/sample.png"></image>' +
 							'<paragraph>b]ar</paragraph>' +
 						'</blockQuote>'
 					);
@@ -355,7 +355,7 @@ describe( 'BlockQuote integration', () => {
 		it( 'quotes an image with caption', () => {
 			setModelData( model,
 				'<paragraph>fo[o</paragraph>' +
-				'<image src="foo.png">' +
+				'<image src="/assets/sample.png">' +
 					'<caption>xxx</caption>' +
 				'</image>' +
 				'<paragraph>b]ar</paragraph>'
@@ -366,7 +366,7 @@ describe( 'BlockQuote integration', () => {
 			expect( getModelData( model ) ).to.equal(
 				'<blockQuote>' +
 					'<paragraph>fo[o</paragraph>' +
-					'<image src="foo.png">' +
+					'<image src="/assets/sample.png">' +
 						'<caption>xxx</caption>' +
 					'</image>' +
 					'<paragraph>b]ar</paragraph>' +
@@ -377,7 +377,7 @@ describe( 'BlockQuote integration', () => {
 		it( 'adds an image to an existing quote', () => {
 			setModelData( model,
 				'<paragraph>fo[o</paragraph>' +
-				'<image src="foo.png">' +
+				'<image src="/assets/sample.png">' +
 					'<caption>xxx</caption>' +
 				'</image>' +
 				'<blockQuote><paragraph>b]ar</paragraph></blockQuote>'
@@ -389,7 +389,7 @@ describe( 'BlockQuote integration', () => {
 			expect( getModelData( model ) ).to.equal(
 				'<blockQuote>' +
 					'<paragraph>foo</paragraph>' +
-					'<image src="foo.png">' +
+					'<image src="/assets/sample.png">' +
 						'<caption>xxx</caption>' +
 					'</image>' +
 					'<paragraph>[b]ar</paragraph>' +

+ 7 - 1
packages/ckeditor5-block-quote/theme/blockquote.css

@@ -9,9 +9,15 @@
 
 	/* https://github.com/ckeditor/ckeditor5-block-quote/issues/15 */
 	padding-right: 1.5em;
-
 	padding-left: 1.5em;
+
 	margin-left: 0;
+	margin-right: 0;
 	font-style: italic;
 	border-left: solid 5px hsl(0, 0%, 80%);
 }
+
+.ck-content[dir="rtl"] blockquote {
+	border-left: 0;
+	border-right: solid 5px hsl(0, 0%, 80%);
+}