Procházet zdrojové kódy

Merge tag 'v1.0.0-beta.1' into stable

Release: v1.0.0-beta.1.
Piotrek Koszuliński před 7 roky
rodič
revize
68cff888f7
26 změnil soubory, kde provedl 64 přidání a 43 odebrání
  1. 1 1
      packages/ckeditor5-markdown-gfm/.eslintrc.js
  2. 15 11
      packages/ckeditor5-markdown-gfm/.travis.yml
  3. 5 0
      packages/ckeditor5-markdown-gfm/CHANGELOG.md
  4. 1 1
      packages/ckeditor5-markdown-gfm/LICENSE.md
  5. 3 1
      packages/ckeditor5-markdown-gfm/README.md
  6. 9 6
      packages/ckeditor5-markdown-gfm/docs/_snippets/features/markdown.js
  7. 1 1
      packages/ckeditor5-markdown-gfm/docs/features/markdown.md
  8. 7 5
      packages/ckeditor5-markdown-gfm/package.json
  9. 1 1
      packages/ckeditor5-markdown-gfm/src/gfmdataprocessor.js
  10. 1 1
      packages/ckeditor5-markdown-gfm/src/lib/marked/renderer.js
  11. 1 1
      packages/ckeditor5-markdown-gfm/src/lib/to-markdown/converters.js
  12. 5 0
      packages/ckeditor5-markdown-gfm/tests/_utils/utils.js
  13. 1 1
      packages/ckeditor5-markdown-gfm/tests/gfmdataprocessor/blockquotes.js
  14. 1 1
      packages/ckeditor5-markdown-gfm/tests/gfmdataprocessor/code.js
  15. 1 1
      packages/ckeditor5-markdown-gfm/tests/gfmdataprocessor/escaping.js
  16. 1 1
      packages/ckeditor5-markdown-gfm/tests/gfmdataprocessor/headers.js
  17. 1 1
      packages/ckeditor5-markdown-gfm/tests/gfmdataprocessor/horizontal-rules.js
  18. 1 1
      packages/ckeditor5-markdown-gfm/tests/gfmdataprocessor/images.js
  19. 1 1
      packages/ckeditor5-markdown-gfm/tests/gfmdataprocessor/links.js
  20. 1 1
      packages/ckeditor5-markdown-gfm/tests/gfmdataprocessor/lists.js
  21. 1 1
      packages/ckeditor5-markdown-gfm/tests/gfmdataprocessor/manual/gfmdataprocessor.js
  22. 1 1
      packages/ckeditor5-markdown-gfm/tests/gfmdataprocessor/paragraphs.js
  23. 1 1
      packages/ckeditor5-markdown-gfm/tests/gfmdataprocessor/strikethrough.js
  24. 1 1
      packages/ckeditor5-markdown-gfm/tests/gfmdataprocessor/strong-emphasis.js
  25. 1 1
      packages/ckeditor5-markdown-gfm/tests/gfmdataprocessor/tables.js
  26. 1 1
      packages/ckeditor5-markdown-gfm/tests/gfmdataprocessor/tabs.js

+ 1 - 1
packages/ckeditor5-markdown-gfm/.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.
  */
 

+ 15 - 11
packages/ckeditor5-markdown-gfm/.travis.yml

@@ -1,24 +1,28 @@
 sudo: required
 dist: trusty
 addons:
+  firefox: "latest"
   apt:
     sources:
-      - google-chrome
+    - google-chrome
     packages:
-      - google-chrome-stable
+    - google-chrome-stable
 language: node_js
 node_js:
-  - "6"
+- '6'
 cache:
-  - node_modules
+- node_modules
 before_install:
-  - export DISPLAY=:99.0
-  - sh -e /etc/init.d/xvfb start
+- export DISPLAY=:99.0
+- sh -e /etc/init.d/xvfb start
 install:
-  - npm install @ckeditor/ckeditor5-dev-tests
-  - ckeditor5-dev-tests-install-dependencies
+- npm install @ckeditor/ckeditor5-dev-tests
+- ckeditor5-dev-tests-install-dependencies
 script:
-  - ckeditor5-dev-tests-travis
+- ckeditor5-dev-tests-travis
 after_success:
-  - codeclimate-test-reporter < coverage/lcov.info
-  - ckeditor5-dev-tests-save-revision
+- ckeditor5-dev-tests-save-revision
+env:
+  global:
+  - secure: UPzxX+4UVjCIAR2yKQYhAjXlFNIqqctBIqQkwE/ZG0HxRVrTRSkx0yw0Lq0zEUn2FVNWkZ92PiXgxOd4RmliKgZdE3hqKcZrKa+8LVj+eqKMi1tDLFx+6hIChRYDf9ua20trxl7FoVEbOhlesTmyjhX1aNdhL6gJHIQdgA3koAI9vBaQ0pPi2uGxQXaUTkgT7tLIoMBS+dZXR980HugfNVXuSrT5vXM/c3dpCO3OQkFV6MTdxzDUJihzjsf88Ipj8r/OxO8Lbr+ym4RO/J1uR7hNxn9kk2qnSYwPHL71YAsftNv0nSIlU40fap7MuasFSeGzpxIfJRQtNjpgvKDZNBkOaRuitp82fQSZHYzWr+Q7gsrHdEGfLqjfvrfj0b/us/na+NsT7J1/kYzxyKBl/wCP5h7c+GkJ6ombVrGchbzBoDXiU2iY58nxMwuld4M3mjruGLBa2ZxSQYx+3+14p2jEM7bZUbqey10AH7GDksDAPOt3Bgim0Xst7wmAbnqFbQCCFKcP/0iuRQPw7numhlvGNccQxJn9WrheEay1n8EXA0EJtR+vAImttEJtfc7LwThF2ZgTKjg5AoCkI0bP5LEoYt4p9kJnJmC9iiHuyTH0nfkXc22VLntZdj3nA+31bhIjRxOeWJL2hJtepIkMb4XlDRU05WFt0704j8Z2jHk=
+  - secure: SfzG0BCUJZNhcEZqFtJnsN/8KuAR0WzahPSoNjyOxalD+TlVo0K6q+Yi2BjO0/3KLi41b4kl8VuFjdvhoyoDR+bbILOH0GyxzjTNoJGaHZzKODQbPHCFkcpgGetibiLNPt+BtL0JdkUNkE0jolUb05IdVZw92EClIKU/qxB9yhIa7/R9AdlpVB1Zkh3S3Q/4zKtoH3kYnhL80be7RMM/f8WB7lc9/s8Yodk9xV078zaL4CibeG3n/SKINRliGw+JvefmZcoDt9Z1qKXFb9dwzMZZwb+RLpcibvikmeix8cxKG69NF8yqwZYviTMitBGaZcC5vwOrMJDGY5x6t5GVWg7o0UXk2OgO7I/RZBKAXzGo0VnYYJcjfIYl+9mAUvqZSzoRiqwALpvM7KOFEnDWa6PP+hZVRbWdbkgUUpPySxRh7FxeuuV9FXJl3k4Fbi9Ep588nvDbz2T9Y/MR/mOVMO2TSeVLWjs+/c0Zx/Vs30TwWwjWyHcJXJFc6/4bpG+bUKhlENcNo20Qui9lDR8wxETBJNFbtJzSF7FDTQ6Nv8qooEnAeA/nxHFVUyE3ieB5NOAZzeBYVfvo/WNjP32Os2nC9GJkBwAOqR1tdq+/xdOfGyGO9extmvFb60pSbemgdZFJZFI8JM33upUn4sUqXuPtAR8LLV/3XKexcjFVQw4=

+ 5 - 0
packages/ckeditor5-markdown-gfm/CHANGELOG.md

@@ -1,6 +1,11 @@
 Changelog
 =========
 
+## [1.0.0-beta.1](https://github.com/ckeditor/ckeditor5-markdown-gfm/compare/v1.0.0-alpha.2...v1.0.0-beta.1) (2018-03-15)
+
+Internal changes only (updated dependencies, documentation, etc.).
+
+
 ## [1.0.0-alpha.2](https://github.com/ckeditor/ckeditor5-markdown-gfm/compare/v1.0.0-alpha.1...v1.0.0-alpha.2) (2017-11-14)
 
 Internal changes only (updated dependencies, documentation, etc.).

+ 1 - 1
packages/ckeditor5-markdown-gfm/LICENSE.md

@@ -2,7 +2,7 @@ Software License Agreement
 ==========================
 
 **GitHub Flavored Markdown support for CKEditor 5** – https://github.com/ckeditor/ckeditor5-markdown-gfm <br>
-Copyright (c) 2003-2017, [CKSource](http://cksource.com) Frederico Knabben. All rights reserved.
+Copyright (c) 2003-2018, [CKSource](http://cksource.com) Frederico Knabben. All rights reserved.
 
 Licensed under the terms of any of the following licenses at your choice:
 

+ 3 - 1
packages/ckeditor5-markdown-gfm/README.md

@@ -4,7 +4,9 @@ GitHub Flavored Markdown support for CKEditor 5
 [![Join the chat at https://gitter.im/ckeditor/ckeditor5](https://badges.gitter.im/ckeditor/ckeditor5.svg)](https://gitter.im/ckeditor/ckeditor5?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
 [![npm version](https://badge.fury.io/js/%40ckeditor%2Fckeditor5-markdown-gfm.svg)](https://www.npmjs.com/package/@ckeditor/ckeditor5-markdown-gfm)
 [![Build Status](https://travis-ci.org/ckeditor/ckeditor5-markdown-gfm.svg?branch=master)](https://travis-ci.org/ckeditor/ckeditor5-markdown-gfm)
-[![Test Coverage](https://codeclimate.com/github/ckeditor/ckeditor5-markdown-gfm/badges/coverage.svg)](https://codeclimate.com/github/ckeditor/ckeditor5-markdown-gfm/coverage)
+[![BrowserStack Status](https://www.browserstack.com/automate/badge.svg?badge_key=d3hvenZqQVZERFQ5d09FWXdyT0ozVXhLaVltRFRjTTUyZGpvQWNmWVhUUT0tLUZqNlJ1YWRUd0RvdEVOaEptM1B2Q0E9PQ==--c9d3dee40b9b4471ff3fb516d9ecf8d09292c7e0)](https://www.browserstack.com/automate/public-build/d3hvenZqQVZERFQ5d09FWXdyT0ozVXhLaVltRFRjTTUyZGpvQWNmWVhUUT0tLUZqNlJ1YWRUd0RvdEVOaEptM1B2Q0E9PQ==--c9d3dee40b9b4471ff3fb516d9ecf8d09292c7e0)
+[![Coverage Status](https://coveralls.io/repos/github/ckeditor/ckeditor5-markdown-gfm/badge.svg?branch=master)](https://coveralls.io/github/ckeditor/ckeditor5-markdown-gfm?branch=master)
+<br>
 [![Dependency Status](https://david-dm.org/ckeditor/ckeditor5-markdown-gfm/status.svg)](https://david-dm.org/ckeditor/ckeditor5-markdown-gfm)
 [![devDependency Status](https://david-dm.org/ckeditor/ckeditor5-markdown-gfm/dev-status.svg)](https://david-dm.org/ckeditor/ckeditor5-markdown-gfm?type=dev)
 

+ 9 - 6
packages/ckeditor5-markdown-gfm/docs/_snippets/features/markdown.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.
  */
 
@@ -8,6 +8,8 @@
 import ClassicEditor from '@ckeditor/ckeditor5-editor-classic/src/classiceditor';
 
 import ArticlePluginSet from '@ckeditor/ckeditor5-core/tests/_utils/articlepluginset';
+import EasyImage from '@ckeditor/ckeditor5-easy-image/src/easyimage';
+import { CS_CONFIG } from '@ckeditor/ckeditor5-cloudservices/tests/_utils/cloudservices-config';
 
 import GFMDataProcessor from '@ckeditor/ckeditor5-markdown-gfm/src/gfmdataprocessor';
 
@@ -17,18 +19,19 @@ function Markdown( editor ) {
 
 ClassicEditor
 	.create( document.querySelector( '#snippet-markdown' ), {
-		plugins: [ ArticlePluginSet, Markdown ],
-		toolbar: [ 'headings', 'bold', 'italic', 'link', 'bulletedList', 'numberedList', 'blockQuote', 'undo', 'redo' ],
+		plugins: [ ArticlePluginSet, EasyImage, Markdown ],
+		toolbar: [ 'heading', '|', 'bold', 'italic', 'link', 'bulletedList', 'numberedList', 'blockQuote', 'undo', 'redo' ],
 		image: {
-			toolbar: [ 'imageStyleFull', 'imageStyleSide', '|', 'imageTextAlternative' ]
-		}
+			toolbar: [ 'imageStyle:full', 'imageStyle:side', '|', 'imageTextAlternative' ]
+		},
+		cloudServices: CS_CONFIG
 	} )
 	.then( editor => {
 		window.editor = editor;
 
 		const outputElement = document.querySelector( '#snippet-markdown-output' );
 
-		editor.document.on( 'changesDone', () => {
+		editor.model.document.on( 'change', () => {
 			outputElement.innerText = editor.getData();
 		} );
 

+ 1 - 1
packages/ckeditor5-markdown-gfm/docs/features/markdown.md

@@ -3,7 +3,7 @@ title: Markdown output
 category: features
 ---
 
-The {@link module:markdown-gfm/gfmdataprocessor~GFMDataProcessor} class implements a {@link module:engine/dataprocessor/dataprocessor~DataProcessor data processor} which changes CKEditor output from HTML to Markdown. This means that you can {@link module:core/editor/standardeditor~StandardEditor#setData set} or {@link module:core/editor/standardeditor~StandardEditor#getData get} data from the editor in the Markdown format:
+The {@link module:markdown-gfm/gfmdataprocessor~GFMDataProcessor} class implements a {@link module:engine/dataprocessor/dataprocessor~DataProcessor data processor} which changes CKEditor output from HTML to Markdown. This means that you can {@link module:core/editor/utils/dataapimixin~DataApi#setData set} or {@link module:core/editor/utils/dataapimixin~DataApi#getData get} data from the editor in the Markdown format:
 
 ```js
 editor.getData(); // -> 'This is [CKEditor 5](https://ckeditor5.github.io).'

+ 7 - 5
packages/ckeditor5-markdown-gfm/package.json

@@ -1,19 +1,21 @@
 {
   "name": "@ckeditor/ckeditor5-markdown-gfm",
-  "version": "1.0.0-alpha.2",
+  "version": "1.0.0-beta.1",
   "description": "GitHub Flavored Markdown data processor for CKEditor 5.",
   "keywords": [
     "ckeditor5",
     "ckeditor5-feature"
   ],
   "dependencies": {
-    "@ckeditor/ckeditor5-engine": "^1.0.0-alpha.2"
+    "@ckeditor/ckeditor5-engine": "^1.0.0-beta.1"
   },
   "devDependencies": {
-    "eslint": "^4.8.0",
-    "eslint-config-ckeditor5": "^1.0.6",
+    "@ckeditor/ckeditor5-cloudservices": "^1.0.0-beta.1",
+    "@ckeditor/ckeditor5-easy-image": "^1.0.0-beta.1",
+    "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",

+ 1 - 1
packages/ckeditor5-markdown-gfm/src/gfmdataprocessor.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-markdown-gfm/src/lib/marked/renderer.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-markdown-gfm/src/lib/to-markdown/converters.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.
  */
 

+ 5 - 0
packages/ckeditor5-markdown-gfm/tests/_utils/utils.js

@@ -1,3 +1,8 @@
+/**
+ * @license Copyright (c) 2003-2018, CKSource - Frederico Knabben. All rights reserved.
+ * For licensing, see LICENSE.md.
+ */
+
 import MarkdownDataProcessor from '../../src/gfmdataprocessor';
 import { stringify } from '@ckeditor/ckeditor5-engine/src/dev-utils/view.js';
 

+ 1 - 1
packages/ckeditor5-markdown-gfm/tests/gfmdataprocessor/blockquotes.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-markdown-gfm/tests/gfmdataprocessor/code.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-markdown-gfm/tests/gfmdataprocessor/escaping.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-markdown-gfm/tests/gfmdataprocessor/headers.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-markdown-gfm/tests/gfmdataprocessor/horizontal-rules.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-markdown-gfm/tests/gfmdataprocessor/images.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-markdown-gfm/tests/gfmdataprocessor/links.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-markdown-gfm/tests/gfmdataprocessor/lists.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-markdown-gfm/tests/gfmdataprocessor/manual/gfmdataprocessor.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-markdown-gfm/tests/gfmdataprocessor/paragraphs.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-markdown-gfm/tests/gfmdataprocessor/strikethrough.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-markdown-gfm/tests/gfmdataprocessor/strong-emphasis.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-markdown-gfm/tests/gfmdataprocessor/tables.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-markdown-gfm/tests/gfmdataprocessor/tabs.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.
  */