Parcourir la source

Merge branch 'master' into t/1033

Piotrek Koszuliński il y a 7 ans
Parent
commit
558757d235

+ 70 - 0
CHANGELOG.md

@@ -1,6 +1,76 @@
 Changelog
 =========
 
+## [10.1.0](https://github.com/ckeditor/ckeditor5/compare/v10.0.1...v10.1.0) (2018-06-21)
+
+This is a minor release that introduces many bug fixes and new features. Most notable ones are the table plugin and support for inserting soft breaks with <kbd>Shift</kbd>+<kbd>Enter</kbd>.
+
+You can read more in the [blog post](https://ckeditor.com/blog/CKEditor-5-v10.1.0-released/).
+
+### Dependencies
+
+New packages:
+
+* [@ckeditor/ckeditor5-table](https://www.npmjs.com/package/@ckeditor/ckeditor5-table): [v10.0.0](https://github.com/ckeditor/ckeditor5-table/releases/tag/v10.0.0)
+
+Major releases (contain breaking changes):
+
+* [@ckeditor/ckeditor5-list](https://www.npmjs.com/package/@ckeditor/ckeditor5-list): v10.0.0 => [v11.0.0](https://github.com/ckeditor/ckeditor5-list/releases/tag/v11.0.0)
+
+Minor releases:
+
+* [@ckeditor/ckeditor5-build-balloon](https://www.npmjs.com/package/@ckeditor/ckeditor5-build-balloon): v10.0.1 => [v10.1.0](https://github.com/ckeditor/ckeditor5-build-balloon/releases/tag/v10.1.0)
+* [@ckeditor/ckeditor5-build-classic](https://www.npmjs.com/package/@ckeditor/ckeditor5-build-classic): v10.0.1 => [v10.1.0](https://github.com/ckeditor/ckeditor5-build-classic/releases/tag/v10.1.0)
+* [@ckeditor/ckeditor5-build-decoupled-document](https://www.npmjs.com/package/@ckeditor/ckeditor5-build-decoupled-document): v10.0.1 => [v10.1.0](https://github.com/ckeditor/ckeditor5-build-decoupled-document/releases/tag/v10.1.0)
+* [@ckeditor/ckeditor5-build-inline](https://www.npmjs.com/package/@ckeditor/ckeditor5-build-inline): v10.0.1 => [v10.1.0](https://github.com/ckeditor/ckeditor5-build-inline/releases/tag/v10.1.0)
+* [@ckeditor/ckeditor5-core](https://www.npmjs.com/package/@ckeditor/ckeditor5-core): v10.0.0 => [v10.1.0](https://github.com/ckeditor/ckeditor5-core/releases/tag/v10.1.0)
+* [@ckeditor/ckeditor5-engine](https://www.npmjs.com/package/@ckeditor/ckeditor5-engine): v10.0.0 => [v10.1.0](https://github.com/ckeditor/ckeditor5-engine/releases/tag/v10.1.0)
+* [@ckeditor/ckeditor5-enter](https://www.npmjs.com/package/@ckeditor/ckeditor5-enter): v10.0.0 => [v10.1.0](https://github.com/ckeditor/ckeditor5-enter/releases/tag/v10.1.0)
+* [@ckeditor/ckeditor5-essentials](https://www.npmjs.com/package/@ckeditor/ckeditor5-essentials): v10.0.0 => [v10.1.0](https://github.com/ckeditor/ckeditor5-essentials/releases/tag/v10.1.0)
+* [@ckeditor/ckeditor5-image](https://www.npmjs.com/package/@ckeditor/ckeditor5-image): v10.0.0 => [v10.1.0](https://github.com/ckeditor/ckeditor5-image/releases/tag/v10.1.0)
+* [@ckeditor/ckeditor5-theme-lark](https://www.npmjs.com/package/@ckeditor/ckeditor5-theme-lark): v10.0.0 => [v10.1.0](https://github.com/ckeditor/ckeditor5-theme-lark/releases/tag/v10.1.0)
+* [@ckeditor/ckeditor5-ui](https://www.npmjs.com/package/@ckeditor/ckeditor5-ui): v10.0.0 => [v10.1.0](https://github.com/ckeditor/ckeditor5-ui/releases/tag/v10.1.0)
+* [@ckeditor/ckeditor5-upload](https://www.npmjs.com/package/@ckeditor/ckeditor5-upload): v10.0.0 => [v10.1.0](https://github.com/ckeditor/ckeditor5-upload/releases/tag/v10.1.0)
+* [@ckeditor/ckeditor5-utils](https://www.npmjs.com/package/@ckeditor/ckeditor5-utils): v10.0.0 => [v10.1.0](https://github.com/ckeditor/ckeditor5-utils/releases/tag/v10.1.0)
+* [@ckeditor/ckeditor5-widget](https://www.npmjs.com/package/@ckeditor/ckeditor5-widget): v10.0.0 => [v10.1.0](https://github.com/ckeditor/ckeditor5-widget/releases/tag/v10.1.0)
+
+Patch releases (bug fixes, internal changes):
+
+* [@ckeditor/ckeditor5-adapter-ckfinder](https://www.npmjs.com/package/@ckeditor/ckeditor5-adapter-ckfinder): v10.0.0 => [v10.0.1](https://github.com/ckeditor/ckeditor5-adapter-ckfinder/releases/tag/v10.0.1)
+* [@ckeditor/ckeditor5-alignment](https://www.npmjs.com/package/@ckeditor/ckeditor5-alignment): v10.0.0 => [v10.0.1](https://github.com/ckeditor/ckeditor5-alignment/releases/tag/v10.0.1)
+* [@ckeditor/ckeditor5-autoformat](https://www.npmjs.com/package/@ckeditor/ckeditor5-autoformat): v10.0.0 => [v10.0.1](https://github.com/ckeditor/ckeditor5-autoformat/releases/tag/v10.0.1)
+* [@ckeditor/ckeditor5-basic-styles](https://www.npmjs.com/package/@ckeditor/ckeditor5-basic-styles): v10.0.0 => [v10.0.1](https://github.com/ckeditor/ckeditor5-basic-styles/releases/tag/v10.0.1)
+* [@ckeditor/ckeditor5-block-quote](https://www.npmjs.com/package/@ckeditor/ckeditor5-block-quote): v10.0.0 => [v10.0.1](https://github.com/ckeditor/ckeditor5-block-quote/releases/tag/v10.0.1)
+* [@ckeditor/ckeditor5-clipboard](https://www.npmjs.com/package/@ckeditor/ckeditor5-clipboard): v10.0.0 => [v10.0.1](https://github.com/ckeditor/ckeditor5-clipboard/releases/tag/v10.0.1)
+* [@ckeditor/ckeditor5-cloud-services](https://www.npmjs.com/package/@ckeditor/ckeditor5-cloud-services): v10.0.0 => [v10.0.1](https://github.com/ckeditor/ckeditor5-cloud-services/releases/tag/v10.0.1)
+* [@ckeditor/ckeditor5-easy-image](https://www.npmjs.com/package/@ckeditor/ckeditor5-easy-image): v10.0.0 => [v10.0.1](https://github.com/ckeditor/ckeditor5-easy-image/releases/tag/v10.0.1)
+* [@ckeditor/ckeditor5-editor-balloon](https://www.npmjs.com/package/@ckeditor/ckeditor5-editor-balloon): v10.0.0 => [v10.0.1](https://github.com/ckeditor/ckeditor5-editor-balloon/releases/tag/v10.0.1)
+* [@ckeditor/ckeditor5-editor-classic](https://www.npmjs.com/package/@ckeditor/ckeditor5-editor-classic): v10.0.0 => [v10.0.1](https://github.com/ckeditor/ckeditor5-editor-classic/releases/tag/v10.0.1)
+* [@ckeditor/ckeditor5-editor-decoupled](https://www.npmjs.com/package/@ckeditor/ckeditor5-editor-decoupled): v10.0.1 => [v10.0.2](https://github.com/ckeditor/ckeditor5-editor-decoupled/releases/tag/v10.0.2)
+* [@ckeditor/ckeditor5-editor-inline](https://www.npmjs.com/package/@ckeditor/ckeditor5-editor-inline): v10.0.0 => [v10.0.1](https://github.com/ckeditor/ckeditor5-editor-inline/releases/tag/v10.0.1)
+* [@ckeditor/ckeditor5-font](https://www.npmjs.com/package/@ckeditor/ckeditor5-font): v10.0.0 => [v10.0.1](https://github.com/ckeditor/ckeditor5-font/releases/tag/v10.0.1)
+* [@ckeditor/ckeditor5-heading](https://www.npmjs.com/package/@ckeditor/ckeditor5-heading): v10.0.0 => [v10.0.1](https://github.com/ckeditor/ckeditor5-heading/releases/tag/v10.0.1)
+* [@ckeditor/ckeditor5-highlight](https://www.npmjs.com/package/@ckeditor/ckeditor5-highlight): v10.0.0 => [v10.0.1](https://github.com/ckeditor/ckeditor5-highlight/releases/tag/v10.0.1)
+* [@ckeditor/ckeditor5-link](https://www.npmjs.com/package/@ckeditor/ckeditor5-link): v10.0.1 => [v10.0.2](https://github.com/ckeditor/ckeditor5-link/releases/tag/v10.0.2)
+* [@ckeditor/ckeditor5-markdown-gfm](https://www.npmjs.com/package/@ckeditor/ckeditor5-markdown-gfm): v10.0.0 => [v10.0.1](https://github.com/ckeditor/ckeditor5-markdown-gfm/releases/tag/v10.0.1)
+* [@ckeditor/ckeditor5-paragraph](https://www.npmjs.com/package/@ckeditor/ckeditor5-paragraph): v10.0.0 => [v10.0.1](https://github.com/ckeditor/ckeditor5-paragraph/releases/tag/v10.0.1)
+* [@ckeditor/ckeditor5-typing](https://www.npmjs.com/package/@ckeditor/ckeditor5-typing): v10.0.0 => [v10.0.1](https://github.com/ckeditor/ckeditor5-typing/releases/tag/v10.0.1)
+* [@ckeditor/ckeditor5-undo](https://www.npmjs.com/package/@ckeditor/ckeditor5-undo): v10.0.0 => [v10.0.1](https://github.com/ckeditor/ckeditor5-undo/releases/tag/v10.0.1)
+
+### Features
+
+Besides new features introduced by the dependencies, this version also introduces the following features:
+
+* Introduced the `@ckeditor/ckeditor5-table` package. ([e4b9a72](https://github.com/ckeditor/ckeditor5/commit/e4b9a72))
+
+### Bug fixes
+
+Besides changes in the dependencies, this version also contains the following bug fixes:
+
+* The editor buttons in the document editor guide should not wrap to the next line. Closes [#1077](https://github.com/ckeditor/ckeditor5/issues/1077). ([61c6ad6](https://github.com/ckeditor/ckeditor5/commit/61c6ad6))
+* The table dropdown in the document editor snippet should not be cut off. Closes [#1069](https://github.com/ckeditor/ckeditor5/issues/1069). ([bed8e70](https://github.com/ckeditor/ckeditor5/commit/bed8e70))
+
+
 ## [10.0.1](https://github.com/ckeditor/ckeditor5/compare/v10.0.0...v10.0.1) (2018-05-22)
 
 ## Release notes

+ 24 - 7
docs/_snippets/examples/document-editor.html

@@ -9,11 +9,29 @@
 			<p>We are delighted to welcome you to the annual <em>Flavorful Tuscany Meetup</em> and hope you will enjoy the programme as well as your stay at the <a href="http://ckeditor.com">Bilancino Hotel</a>.</p>
 			<p>Please find below the full schedule of the event.</p>
 
-			<ul>
-				<li>9:30 AM - 11:30 AM	Americano vs. Brewed - “know your coffee” session with <strong>Stefano Garau</strong></li>
-				<li>1:00 PM - 3:00 PM	Pappardelle al pomodoro - live cooking session with <strong>Rita Fresco</strong></li>
-				<li>5:00 PM - 8:00 PM	Tuscan vineyards at a glance - wine-tasting session with <strong>Frederico Riscoli</strong></li>
-			</ul>
+			<figure class="table">
+				<table>
+					<thead>
+						<tr>
+							<th colspan="2">Saturday, July 14</th>
+						</tr>
+					</thead>
+					<tbody>
+						<tr>
+							<td>9:30&nbsp;AM&nbsp;-&nbsp;11:30&nbsp;AM</td>
+							<td>Americano vs. Brewed - “know your coffee” session with <strong>Stefano Garau</strong></td>
+						</tr>
+						<tr>
+							<td>1:00&nbsp;PM&nbsp;-&nbsp;3:00&nbsp;PM</td>
+							<td>Pappardelle al pomodoro - <mark class="marker-yellow">live cooking session</mark> with <strong>Rita Fresco</strong></td>
+						</tr>
+						<tr>
+							<td>5:00&nbsp;PM&nbsp;-&nbsp;8:00&nbsp;PM</td>
+							<td>Tuscan vineyards at a glance - wine-tasting session with <strong>Frederico Riscoli</strong></td>
+						</tr>
+					</tbody>
+				</table>
+			</figure>
 
 			<blockquote>
 				<p>The annual Flavorful Tuscany meetups are always a culinary discovery. You get the best of Tuscan flavors during an intense one-day stay at one of the top hotels of the region. All the sessions are lead by top chefs passionate about their profession. I would certainly recommend to save the date in your calendar for this one!</p>
@@ -21,7 +39,7 @@
 				<p>Angelina Calvino, food journalist</p>
 			</blockquote>
 
-			<p>Please arrive at the <a href="http://ckeditor.com">Bilancino Hotel</a> reception desk at least <strong>half an hour earlier</strong> to make sure that the registration process goes as smoothly as possible.</p>
+			<p>Please arrive at the <a href="http://ckeditor.com">Bilancino Hotel</a> reception desk <mark class="marker-yellow">at least half an hour earlier</mark> to make sure that the registration process goes as smoothly as possible.</p>
 
 			<p>We look forward to welcoming you to the event.</p>
 
@@ -43,7 +61,6 @@
 		/* This element is a flex container for easier rendering. */
 		display: flex;
 		flex-flow: column nowrap;
-		overflow: hidden;
 	}
 
 	.document-editor__toolbar {

BIN
docs/assets/img/editor-document.png


+ 6 - 0
docs/assets/snippet-styles.css

@@ -74,6 +74,12 @@ It breaks CKEditor 5 (see how <p><code>[]</code></p> looks). */
 	padding: 0;
 }
 
+/* https://github.com/ckeditor/ckeditor5/pull/1060 */
+.live-snippet .ck.ck-content .table table {
+	margin: 0;
+	display: table;
+}
+
 #snippet-inline-editor .ck-content {
 	margin-bottom: 1rem;
 	padding: 2rem;

+ 11 - 0
docs/assets/styles.css

@@ -4,11 +4,22 @@
 
 /* https://github.com/ckeditor/ckeditor5/issues/913 */
 @media only screen and (min-width: 1600px) {
+	/* https://github.com/ckeditor/ckeditor5/issues/1077 */
+	.main .main__content .main__content-inner,
 	.main .main__content-wide .main__content-inner {
 		width: 800px;
 	}
 }
 
+/* https://github.com/ckeditor/ckeditor5-build-decoupled-document/issues/12 */
+@media only screen and (max-width: 1360px) {
+	/* https://github.com/ckeditor/ckeditor5/issues/1077 */
+	.main .main__content .main__content-inner,
+	.main .main__content-wide .main__content-inner {
+		max-width: 900px;
+	}
+}
+
 /* https://github.com/ckeditor/ckeditor5/issues/913 */
 @media only screen and (min-width: 1360px) {
 	.main .main__content.main__content-wide {

+ 1 - 1
docs/builds/guides/overview.md

@@ -60,7 +60,7 @@ To try it out online, check the {@link examples/builds/balloon-editor balloon ed
 
 The document editor is focused on rich text editing experience similar to the native word processors. It works best for creating documents which are usually later printed or exported to PDF files.
 
-{@img assets/img/editor-document.png 786 Screenshot of the user interface of the document editor.}
+{@img assets/img/editor-document.png 800 Screenshot of the user interface of the document editor.}
 
 To try it out online, check the {@link examples/builds/document-editor document editor example}. Jump to {@link builds/guides/quick-start#document-editor Quick start} to start using it.
 

+ 2 - 0
docs/features/keyboard-support.md

@@ -23,6 +23,8 @@ Below is a list of the most important keystrokes supported by CKEditor 5 and its
 | Move focus to the toolbar | <kbd>Alt</kbd> + <kbd>F10</kbd> | <kbd>Alt</kbd> + <kbd>F10</kbd> <br> (may require <kbd>Fn</kbd>) |
 | Navigate through the toolbar | <kbd>↑</kbd> / <kbd>→</kbd> / <kbd>↓</kbd> / <kbd>←</kbd> | <kbd>↑</kbd> / <kbd>→</kbd> / <kbd>↓</kbd> / <kbd>←</kbd> |
 | Execute the currently focused button | <kbd>Enter</kbd> | <kbd>Enter</kbd> |
+| Insert a hard break (e.g. a new paragraph) | <kbd>Enter</kbd> | <kbd>Enter</kbd> |
+| Insert a soft break (i.e. a `<br>`) | <kbd>Shift</kbd>+<kbd>Enter</kbd> | <kbd>Shift</kbd>+<kbd>Enter</kbd> |
 
 <style>
 .keyboard-shortcuts th {

+ 7 - 2
docs/umberto.json

@@ -5,6 +5,11 @@
 	"extraStyles": "assets/styles.css",
 	"path": "docs",
 	"observablesdocs": "module:utils/observablemixin~ObservableMixin",
+	"redirects": {
+		"builds/guides/license-and-legal.html": "builds/guides/support/license-and-legal.html",
+		"builds/guides/browser-compatibility.html": "builds/guides/support/browser-compatibility.html",
+		"builds/guides/reporting-issues.html": "builds/guides/support/reporting-issues.html"
+	},
 	"scripts": {
 		"snippet-adapter": "../scripts/docs/snippetadapter",
 		"import-path": "../scripts/docs/getrealimportpath"
@@ -46,8 +51,8 @@
 			"cookieDomain": "ckeditor5.github.io"
 		}
 	},
-  	"og": {
-	   	"description": "Learn how to install, integrate and configure CKEditor 5 Builds and how to work with CKEditor 5 Framework, customize it, create your own plugins and custom editors, change the UI or even bring your own UI to the editor. API reference and examples included."
+	"og": {
+		"description": "Learn how to install, integrate and configure CKEditor 5 Builds and how to work with CKEditor 5 Framework, customize it, create your own plugins and custom editors, change the UI or even bring your own UI to the editor. API reference and examples included."
 	},
 	"groups": [
 		{

+ 37 - 37
package.json

@@ -24,42 +24,42 @@
     "framework"
   ],
   "dependencies": {
-    "@ckeditor/ckeditor5-adapter-ckfinder": "^10.0.0",
-    "@ckeditor/ckeditor5-alignment": "^10.0.0",
-    "@ckeditor/ckeditor5-autoformat": "^10.0.0",
-    "@ckeditor/ckeditor5-basic-styles": "^10.0.0",
-    "@ckeditor/ckeditor5-block-quote": "^10.0.0",
-    "@ckeditor/ckeditor5-build-balloon": "^10.0.1",
-    "@ckeditor/ckeditor5-build-classic": "^10.0.1",
-    "@ckeditor/ckeditor5-build-decoupled-document": "^10.0.1",
-    "@ckeditor/ckeditor5-build-inline": "^10.0.1",
-    "@ckeditor/ckeditor5-clipboard": "^10.0.0",
-    "@ckeditor/ckeditor5-cloud-services": "^10.0.0",
-    "@ckeditor/ckeditor5-core": "^10.0.0",
-    "@ckeditor/ckeditor5-easy-image": "^10.0.0",
-    "@ckeditor/ckeditor5-editor-balloon": "^10.0.0",
-    "@ckeditor/ckeditor5-editor-classic": "^10.0.0",
-    "@ckeditor/ckeditor5-editor-decoupled": "^10.0.1",
-    "@ckeditor/ckeditor5-editor-inline": "^10.0.0",
-    "@ckeditor/ckeditor5-engine": "^10.0.0",
-    "@ckeditor/ckeditor5-enter": "^10.0.0",
-    "@ckeditor/ckeditor5-essentials": "^10.0.0",
-    "@ckeditor/ckeditor5-font": "^10.0.0",
-    "@ckeditor/ckeditor5-heading": "^10.0.0",
-    "@ckeditor/ckeditor5-highlight": "^10.0.0",
-    "@ckeditor/ckeditor5-image": "^10.0.0",
-    "@ckeditor/ckeditor5-link": "^10.0.1",
-    "@ckeditor/ckeditor5-list": "^10.0.0",
-    "@ckeditor/ckeditor5-markdown-gfm": "^10.0.0",
-    "@ckeditor/ckeditor5-paragraph": "^10.0.0",
-    "@ckeditor/ckeditor5-table": "^0.0.1",
-    "@ckeditor/ckeditor5-theme-lark": "^10.0.0",
-    "@ckeditor/ckeditor5-typing": "^10.0.0",
-    "@ckeditor/ckeditor5-ui": "^10.0.0",
-    "@ckeditor/ckeditor5-undo": "^10.0.0",
-    "@ckeditor/ckeditor5-upload": "^10.0.0",
-    "@ckeditor/ckeditor5-utils": "^10.0.0",
-    "@ckeditor/ckeditor5-widget": "^10.0.0"
+    "@ckeditor/ckeditor5-adapter-ckfinder": "v10.0.1",
+    "@ckeditor/ckeditor5-alignment": "v10.0.1",
+    "@ckeditor/ckeditor5-autoformat": "v10.0.1",
+    "@ckeditor/ckeditor5-basic-styles": "v10.0.1",
+    "@ckeditor/ckeditor5-block-quote": "v10.0.1",
+    "@ckeditor/ckeditor5-build-balloon": "v10.1.0",
+    "@ckeditor/ckeditor5-build-classic": "v10.1.0",
+    "@ckeditor/ckeditor5-build-decoupled-document": "v10.1.0",
+    "@ckeditor/ckeditor5-build-inline": "v10.1.0",
+    "@ckeditor/ckeditor5-clipboard": "v10.0.1",
+    "@ckeditor/ckeditor5-cloud-services": "v10.0.1",
+    "@ckeditor/ckeditor5-core": "v10.1.0",
+    "@ckeditor/ckeditor5-easy-image": "v10.0.1",
+    "@ckeditor/ckeditor5-editor-balloon": "v10.0.1",
+    "@ckeditor/ckeditor5-editor-classic": "v10.0.1",
+    "@ckeditor/ckeditor5-editor-decoupled": "v10.0.2",
+    "@ckeditor/ckeditor5-editor-inline": "v10.0.1",
+    "@ckeditor/ckeditor5-engine": "v10.1.0",
+    "@ckeditor/ckeditor5-enter": "v10.1.0",
+    "@ckeditor/ckeditor5-essentials": "v10.1.0",
+    "@ckeditor/ckeditor5-font": "v10.0.1",
+    "@ckeditor/ckeditor5-heading": "v10.0.1",
+    "@ckeditor/ckeditor5-highlight": "v10.0.1",
+    "@ckeditor/ckeditor5-image": "v10.1.0",
+    "@ckeditor/ckeditor5-link": "v10.0.2",
+    "@ckeditor/ckeditor5-list": "v11.0.0",
+    "@ckeditor/ckeditor5-markdown-gfm": "v10.0.1",
+    "@ckeditor/ckeditor5-paragraph": "v10.0.1",
+    "@ckeditor/ckeditor5-table":"v10.0.0",
+    "@ckeditor/ckeditor5-theme-lark": "v10.1.0",
+    "@ckeditor/ckeditor5-typing": "v10.0.1",
+    "@ckeditor/ckeditor5-ui": "v10.1.0",
+    "@ckeditor/ckeditor5-undo": "v10.0.1",
+    "@ckeditor/ckeditor5-upload": "v10.0.1",
+    "@ckeditor/ckeditor5-utils": "v10.1.0",
+    "@ckeditor/ckeditor5-widget": "v10.1.0"
   },
   "devDependencies": {
     "@ckeditor/ckeditor5-collaboration": "^10.0.0",
@@ -81,7 +81,7 @@
     "postcss-loader": "^2.0.10",
     "raw-loader": "^0.5.1",
     "style-loader": "^0.20.3",
-    "umberto": "^0.5.0",
+    "umberto": "^0.6.0",
     "webpack": "^3.11.0",
     "webpack-sources": "1.0.1"
   },