8
0
Просмотр исходного кода

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

Release: v1.0.0-beta.1.
Piotrek Koszuliński 7 лет назад
Родитель
Сommit
d4b21d0694

+ 1 - 1
packages/ckeditor5-easy-image/.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-easy-image/.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: tuKfdIM8922N8hXhabGbEstYmyFNitg2N65rqiEZFBhKIh9Hf7XhK/bNb7JKMJ0aurzdqo7wi3uTemyWe0zVnOJxncAUrpBozHBQdPHIH3KY8xRuYoWA6z5LVUd14NdkoRmVo+uHVyhWJ08p0yolV0+qxEPMwW5j1r24BZ3Z5p3u4VUEsJmK9Nz+V1R4n8JRaSLF9FF5OpsDIYYTgswiqWERahkrNDRkEgJYsYTT4e+SJDtJe33ke4VGLIKCU39D5tfA+ilkNpYHGijvpXIEyIF4dgS1M4ishXaRiSzFx+LzvB7yrn4CBowqRNf9v1Kvu1Tli0krk5OIe6IpipyUGctP5Dtpm/11nwYz5Nsl+KKX3FFNj/oqyj7MP5R/HZNktwNaysrR8ZzsxlNO13xvqpBMsGHBVMl4PnkDTY29TRzIjVLpesjzUwoX7UmKkQPE04A32/H3lXPO7OdEQ2ikFJWtP5KfhZ0kNh7fy5z64OkxPt78mVUmGSVIFo5GZCfIWOrv+Cv4A4dapus7bXBgzxPtymyAKs+bbPjLz9zYDNxvzI3EvrNDqDMxTG9WDoNT4c/Hn2jwH5lSLFOLbi7NZcTBviqr4qIqKhZNC/2HKVDueiIZ14W4YN0PFW8qdw50+pPgAO69LyTHeL6y9ZduwuxCMRBhg2hpc6iWRSC5gY8=
+  - secure: u6mrymQU3ptLzmuWRQKoMXlKjdE3VHvI7RWNDp0bj8TSAWCbOhKLdB8Scji2AVTaL1Avs/X62HiceG3d8pPVQyob9d9dbpvgIucbEa2i3Aj0HQZw6f+K+v+4ghnNbLIwDs82FVSDWr75Y/s1vDDf5fTmj6sQYYS2H8jme4a32teN6Z8vNDVobl0nEt2LKS1dntjaJP3VVTfVh1yJJp6RGxGND6dwcUOjafo0qVJPMtnq6tC56bWp/lN8Smfg4D1pywvX8J7pLa50/EQYV0AcEnY3ksm08GlCa1cxQWpHjUz7HIOI/UfxtIkzuPjbI4AO8tHma8Ln7TK0m3N9TcWEiACpnrhz/oNg85svl4t7HxIGpFNxJlCsvmfe193reAbeKfVRQBCTxW2TTdmZtroPw8anrAKHiCNa+yz1mX851MC5Yco3lRZn43/FL8jcpALcEh2UyAitidQXkYw2tRAw1PwNNGTuSHjCZC4q5YkPztuzeYScSsXqRF6MMkNMmUzK3RkkIyMOKJH8CXA99RoE3P82JSllZscsgiJKtEuqg9p9KH7ynmZGWmyNXX0cno0uHZWKSpjPyfmhsqeATkZjKBSqAcAAlmyFPog0NZwGIhKeyt3yViA2M+JQYUSfU5tOZdyVscmthFEORgLy0YAFZOOdK+cmEifi/vsQl4uFQME=

+ 5 - 0
packages/ckeditor5-easy-image/CHANGELOG.md

@@ -1,6 +1,11 @@
 Changelog
 =========
 
+## [1.0.0-beta.1](https://github.com/ckeditor/ckeditor5-easy-image/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-easy-image/compare/v1.0.0-alpha.1...v1.0.0-alpha.2) (2017-11-14)
 
 ### Bug fixes

+ 1 - 1
packages/ckeditor5-easy-image/LICENSE.md

@@ -2,7 +2,7 @@ Software License Agreement
 ==========================
 
 **CKEditor 5 Easy Image** – https://github.com/ckeditor/ckeditor5-easy-image <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:
 

+ 4 - 2
packages/ckeditor5-easy-image/README.md

@@ -4,11 +4,13 @@ CKEditor 5 Easy Image with Cloud Services
 [![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-easy-image.svg)](https://www.npmjs.com/package/@ckeditor/ckeditor5-easy-image)
 [![Build Status](https://travis-ci.org/ckeditor/ckeditor5-easy-image.svg?branch=master)](https://travis-ci.org/ckeditor/ckeditor5-easy-image)
-[![Test Coverage](https://codeclimate.com/github/ckeditor/ckeditor5-easy-image/badges/coverage.svg)](https://codeclimate.com/github/ckeditor/ckeditor5-easy-image/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-easy-image/badge.svg?branch=master)](https://coveralls.io/github/ckeditor/ckeditor5-easy-image?branch=master)
+<br>
 [![Dependency Status](https://david-dm.org/ckeditor/ckeditor5-easy-image/status.svg)](https://david-dm.org/ckeditor/ckeditor5-easy-image)
 [![devDependency Status](https://david-dm.org/ckeditor/ckeditor5-easy-image/dev-status.svg)](https://david-dm.org/ckeditor/ckeditor5-easy-image?type=dev)
 
-This package implements the [Easy Image](https://ckeditor5.github.io/docs/nightly/ckeditor5/latest/features/image.html#Image-upload) feature for CKEditor 5.
+This package implements the [Easy Image](https://ckeditor5.github.io/docs/nightly/ckeditor5/latest/features/image.html#image-upload) feature for CKEditor 5.
 
 Easy Image lets you easily insert images into the editor and integrates automatically with [CKEditor Cloud Services](https://ckeditor.com/ckeditor-cloud-services/).
 

+ 2 - 2
packages/ckeditor5-easy-image/docs/api/easy-image.md

@@ -6,13 +6,13 @@ category: api-reference
 
 [![npm version](https://badge.fury.io/js/%40ckeditor%2Fckeditor5-easy-image.svg)](https://www.npmjs.com/package/@ckeditor/ckeditor5-easy-image)
 
-This package implements the {@link features/image#Image-upload Easy Image} feature for CKEditor 5.
+This package implements the {@link features/image#image-upload Easy Image} feature for CKEditor 5.
 
 Easy Image lets you easily insert images into the editor and integrates automatically with [CKEditor Cloud Services](https://ckeditor.com/ckeditor-cloud-services/).
 
 ## Documentation
 
-See the {@link features/image#Image-upload Image upload} section in the {@link features/image Image feature} guide.
+See the {@link features/image#image-upload Image upload} section in the {@link features/image Image feature} guide.
 
 You can also check the {@link module:easy-image/easyimage~EasyImage} plugin documentation.
 

+ 11 - 11
packages/ckeditor5-easy-image/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ckeditor/ckeditor5-easy-image",
-  "version": "1.0.0-alpha.2",
+  "version": "1.0.0-beta.1",
   "description": "Easy Image feature for CKEditor 5.",
   "keywords": [
     "ckeditor5",
@@ -8,19 +8,19 @@
   ],
   "dependencies": {
     "@ckeditor/ckeditor-cloudservices-core": "^0.2.0",
-    "@ckeditor/ckeditor5-cloudservices": "^1.0.0-alpha.1",
-    "@ckeditor/ckeditor5-core": "^1.0.0-alpha.2",
-    "@ckeditor/ckeditor5-image": "^1.0.0-alpha.2",
-    "@ckeditor/ckeditor5-upload": "^1.0.0-alpha.2"
+    "@ckeditor/ckeditor5-cloudservices": "^1.0.0-beta.1",
+    "@ckeditor/ckeditor5-core": "^1.0.0-beta.1",
+    "@ckeditor/ckeditor5-image": "^1.0.0-beta.1",
+    "@ckeditor/ckeditor5-upload": "^1.0.0-beta.1"
   },
   "devDependencies": {
-    "@ckeditor/ckeditor5-editor-classic": "^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-config-ckeditor5": "^1.0.6",
+    "@ckeditor/ckeditor5-editor-classic": "^1.0.0-beta.1",
+    "@ckeditor/ckeditor5-paragraph": "^1.0.0-beta.1",
+    "@ckeditor/ckeditor5-utils": "^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",

+ 2 - 2
packages/ckeditor5-easy-image/src/cloudservicesuploadadapter.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.
  */
 
@@ -47,7 +47,7 @@ export default class CloudServicesUploadAdapter extends Plugin {
 
 		this._uploadGateway = new CloudServicesUploadAdapter._UploadGateway( token, uploadUrl );
 
-		editor.plugins.get( FileRepository ).createAdapter = loader => {
+		editor.plugins.get( FileRepository ).createUploadAdapter = loader => {
 			return new Adapter( this._uploadGateway, loader );
 		};
 	}

+ 3 - 3
packages/ckeditor5-easy-image/src/easyimage.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.
  */
 
@@ -10,7 +10,7 @@
 import Plugin from '@ckeditor/ckeditor5-core/src/plugin';
 import CloudServicesUploadAdapter from './cloudservicesuploadadapter';
 import Image from '@ckeditor/ckeditor5-image/src/image';
-import ImageUpload from '@ckeditor/ckeditor5-upload/src/imageupload';
+import ImageUpload from '@ckeditor/ckeditor5-image/src/imageupload';
 
 /**
  * The Easy Image feature.
@@ -18,7 +18,7 @@ import ImageUpload from '@ckeditor/ckeditor5-upload/src/imageupload';
  * This plugin enables:
  *
  * * {@link module:image/image~Image},
- * * {@link module:upload/imageupload~ImageUpload},
+ * * {@link module:image/imageupload~ImageUpload},
  * * {@link module:easy-image/cloudservicesuploadadapter~CloudServicesUploadAdapter}.
  *
  * After enabling the Easy Image plugin you need to configure the Cloud Services integration through

+ 1 - 1
packages/ckeditor5-easy-image/tests/_utils/uploadgatewaymock.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-easy-image/tests/cloudservicesuploadadapter.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.
  */
 

+ 4 - 3
packages/ckeditor5-easy-image/tests/easyimage.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,7 +8,7 @@
 import EasyImage from '../src/easyimage';
 import CloudServicesUploadAdapter from '../src/cloudservicesuploadadapter';
 import Image from '@ckeditor/ckeditor5-image/src/image';
-import ImageUpload from '@ckeditor/ckeditor5-upload/src/imageupload';
+import ImageUpload from '@ckeditor/ckeditor5-image/src/imageupload';
 import ClassicTestEditor from '@ckeditor/ckeditor5-core/tests/_utils/classictesteditor';
 import UploadGatewayMock from './_utils/uploadgatewaymock';
 import { createNativeFileMock } from '@ckeditor/ckeditor5-upload/tests/_utils/mocks';
@@ -45,6 +45,7 @@ describe( 'EasyImage', () => {
 				plugins: [ EasyImage ],
 				cloudServices: {
 					tokenUrl: 'abc',
+					uploadUrl: 'def'
 				}
 			} )
 			.then( editor => {
@@ -112,7 +113,7 @@ describe( 'EasyImage', () => {
 							reject( new Error( data.title ) );
 						} );
 
-						editor.document.on( 'change', () => {
+						editor.model.document.on( 'change', () => {
 							// Check whether the image is uploaded and the image's src is replaced correctly.
 							if ( editor.getData() === '<figure class="image"><img src="http://image.mock.url/"></figure>' ) {
 								editor.destroy().then( resolve );

+ 5 - 7
packages/ckeditor5-easy-image/tests/manual/easyimage.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.
  */
 
@@ -10,17 +10,15 @@ import ClassicEditor from '@ckeditor/ckeditor5-editor-classic/src/classiceditor'
 import EasyImage from '../../src/easyimage';
 import ArticlePluginSet from '@ckeditor/ckeditor5-core/tests/_utils/articlepluginset';
 
-import { TOKEN_URL } from '@ckeditor/ckeditor5-cloudservices/tests/_utils/cloudservices-config';
+import { CS_CONFIG } from '@ckeditor/ckeditor5-cloudservices/tests/_utils/cloudservices-config';
 
 ClassicEditor
 	.create( document.querySelector( '#editor' ), {
-		cloudServices: {
-			tokenUrl: TOKEN_URL
-		},
+		cloudServices: CS_CONFIG,
 		plugins: [ ArticlePluginSet, EasyImage ],
-		toolbar: [ 'headings', 'undo', 'redo', 'insertImage' ],
+		toolbar: [ 'heading', '|', 'undo', 'redo', 'imageUpload' ],
 		image: {
-			toolbar: [ 'imageStyleFull', 'imageStyleSide', '|', 'imageTextAlternative' ]
+			toolbar: [ 'imageStyle:full', 'imageStyle:side', '|', 'imageTextAlternative' ]
 		}
 	} )
 	.then( editor => {