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

Resolved conclicts and adjusted code style to match CKEditor 5 rules.

Kamil Piechaczek 6 лет назад
Родитель
Сommit
937bbde239

+ 2 - 2
packages/ckeditor-cloud-services-core/.eslintrc.js

@@ -1,6 +1,6 @@
 /**
 /**
- * @license Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
- * For licensing, see LICENSE.md.
+ * @license Copyright (c) 2003-2019, CKSource - Frederico Knabben. All rights reserved.
+ * For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
  */
  */
 
 
 /* eslint-env node */
 /* eslint-env node */

+ 6 - 7
packages/ckeditor-cloud-services-core/.travis.yml

@@ -1,12 +1,8 @@
 sudo: required
 sudo: required
 dist: trusty
 dist: trusty
 addons:
 addons:
+  chrome: stable
   firefox: latest
   firefox: latest
-  apt:
-    sources:
-    - google-chrome
-    packages:
-    - google-chrome-stable
 language: node_js
 language: node_js
 node_js:
 node_js:
 - '8'
 - '8'
@@ -16,6 +12,7 @@ branches:
   except:
   except:
   - stable
   - stable
 before_install:
 before_install:
+- export START_TIME=$( date +%s )
 - export DISPLAY=:99.0
 - export DISPLAY=:99.0
 - sh -e /etc/init.d/xvfb start
 - sh -e /etc/init.d/xvfb start
 - npm i -g yarn
 - npm i -g yarn
@@ -26,7 +23,9 @@ script:
 - ckeditor5-dev-tests-travis
 - ckeditor5-dev-tests-travis
 after_success:
 after_success:
 - ckeditor5-dev-tests-save-revision
 - ckeditor5-dev-tests-save-revision
+after_script:
+- export END_TIME=$( date +%s )
+- ckeditor5-dev-tests-notify-travis-status
 env:
 env:
   global:
   global:
-  - secure: RtA5YtWkbIlqhVhLsTd5i912ERdHTEOcMPG7I4Kw2wXy2SOjXN/jGM3+VMpvLpv1LxKJOws37tQvSjnFfN/HW3I4paaxDukitX4m3H017YiY2VxjhU7buHX6MBY8wAe/qtRZJbiZ44N5ww0HKyF3t9JrwS6UGaoxDreshRwt4DRBs+YA0V/z/fZoFY5zXpudjUiqgA2bXpDgYcURn2muEEJ5pD07bT+SdMldKFfOi/j6r8Uc1ibmcBxDTZ+42KKwT3NPd28ERVYInMlcepb1OB0N5MzDHE9gAqkCooE9WlZPL4AcXrxajhYpMMLamkTiOHsiBuUmGyBgrn76y4ypiW5gf1dVhz9h7YSBJAw5tGUmPHoG7/yigSTt7rabvFHpko7m372VENOky1kIrrLzaxJNspD0ujRw5ZZVqbxDZflPAE1jUNv/PZlKFze4zHaL8RFns0rv0tq3zNaiUki4TvRtgqxWrkrfPFyEp9WUMFcintB+B9z8kwCbWA/6Jwuby1QOtD7QmmSkEqnroJeahS71n1Z4+xJUk/b6EdOd18ew7PJ3VJMD3pkQddDJ6ly+SIl2SAyIAWOk4YPd+IzCcOm3vIxeHasLnnp/Gs1vTNSfQbgReOcNYm0IMM174HcqtGYf9prGRI3Bjp6B2pGGUipMO+D2V2pSzpSL+SbgBDQ=
-  - secure: v5nmXdqD8YvOUFlNRUzeDy73nDDmlSM0SW5jhS/zgWDa2SqLH9SbIGR1LQHKmzhs96GrVFQrPb/GibDKmIYo5FVsXXqzs0YvfDXkMO/ejZIs4k8Td/kLqbRCevK+xovJf3XZ44NwcreCF3jY9XRyasZRi65DK27tri53Ynahv+WGDl4w/3soTGR8xBHDmbE8uwVOL21ybIsFoQNCL4XcfROSVhjbGQQyspLuivkGipFuFa1aPlqnDdCmPBb1SBV7x+GPuDdry2uDdNulW74qXFvN8V5PJGsoJ5LtKeilNIEgTtD796tkpdwhQuBwqFU61G/LyNltGXWQhrntCjErdsHYsOezrVb1X3RUOoOma2Afp/y76WNiEuB06abyhXO5h98Un3dNa7rFiUxK1pcMAsyQnkKbvaJ/Y8TqsPyYEYRSA0gO6ayJeHWRsS6H3IfDlF1H29GIppAIQLC5UwERxFK3iVfEVwX1PX4d/75+QpyL1IPxq1jlVeqivFEom5QCWfYVpM27mmUsv37VcTG3oOOjdJdccuLTkPwp2VSbGpBhzOsiHpn+ffTzIJdGOxd9Adb9PbDETNVPdxF3FLZWd41Zfcmp+M62VNOljry9KT4nX4Hi8Jhv6KskWxYITMpNv1ZMLPJcPXyrbFUmE2bbry4hBJ9nn0ha4DSmjOPT40A=
+    secure: NEc7V0b4XaZfCzk8pne6dLV9wsM036yb9C+rkrXORQJuBHP7k93b5jcXzLvqE1LbZwyoWVroAmOKBR+0+ZoqcfcTU49dL6W3kmdbJr6ltxHHqcJ+9ES7bdxOMxuu7Uy+EQrdKOOfxh6MPOPQC6+d3bAwiMYuzM1yUtif7oYuFMsR7aRqQreWVnpiJPy4+EDOGmEw+WHgr9vms3RsK4dyECbnLYaCBsK0IAzYh94wKz7/NCBYANExojKuvKNBQvonjz/tMW/2y/9MS5+N8il9H/skzkgbB2jkwaC9Ved2m41TCVaPWg1DBLvN/T/bcD3br4a6r71V9QiDxS12qcc/gtlpKKByAiYMu8clhrBgda9PGGxuAAVeJwcAzcw6SMfoAaymSuhZQDfKiHdFBu4cxCjRFL7SkN5ReBRZfRaYfxuN66Lftd3rukwiz3xFX1XlXpqDPQQlgKm0KbLQZro1M3qaRgUc01kp+JLyDElLs/3sgWjJfof2+V5+kNSSoni5W9VOVg7+5ukPxVaGpY40B5nL0T5WcE5U4xrOaoyQsBwuyJSpxdSQ2N2NP7mJ5NyX6zaLAc2MGsIbNftygOWwJIVZ4rCVMp3NP3bc9BDlMHenWINzVpfh3x2Sy1TI8yDgfjYGjMxwGkkXzz8NzvOHFJ35Y4q9T/d0yLXoZS+XupM=

+ 1 - 2
packages/ckeditor-cloud-services-core/README.md

@@ -4,7 +4,6 @@ CKEditor Cloud Services Core
 [![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)
 [![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%2Fckeditor-cloud-services-core.svg)](https://www.npmjs.com/package/@ckeditor/ckeditor-cloud-services-core)
 [![npm version](https://badge.fury.io/js/%40ckeditor%2Fckeditor-cloud-services-core.svg)](https://www.npmjs.com/package/@ckeditor/ckeditor-cloud-services-core)
 [![Build Status](https://travis-ci.org/ckeditor/ckeditor-cloud-services-core.svg?branch=master)](https://travis-ci.org/ckeditor/ckeditor-cloud-services-core)
 [![Build Status](https://travis-ci.org/ckeditor/ckeditor-cloud-services-core.svg?branch=master)](https://travis-ci.org/ckeditor/ckeditor-cloud-services-core)
-[![BrowserStack Status](https://automate.browserstack.com/automate/badge.svg?badge_key=d3hvenZqQVZERFQ5d09FWXdyT0ozVXhLaVltRFRjTTUyZGpvQWNmWVhUUT0tLUZqNlJ1YWRUd0RvdEVOaEptM1B2Q0E9PQ==--c9d3dee40b9b4471ff3fb516d9ecf8d09292c7e0)](https://automate.browserstack.com/public-build/d3hvenZqQVZERFQ5d09FWXdyT0ozVXhLaVltRFRjTTUyZGpvQWNmWVhUUT0tLUZqNlJ1YWRUd0RvdEVOaEptM1B2Q0E9PQ==--c9d3dee40b9b4471ff3fb516d9ecf8d09292c7e0)
 [![Coverage Status](https://coveralls.io/repos/github/ckeditor/ckeditor-cloud-services-core/badge.svg?branch=master)](https://coveralls.io/github/ckeditor/ckeditor-cloud-services-core?branch=master)
 [![Coverage Status](https://coveralls.io/repos/github/ckeditor/ckeditor-cloud-services-core/badge.svg?branch=master)](https://coveralls.io/github/ckeditor/ckeditor-cloud-services-core?branch=master)
 <br>
 <br>
 [![Dependency Status](https://david-dm.org/ckeditor/ckeditor-cloud-services-core/status.svg)](https://david-dm.org/ckeditor/ckeditor-cloud-services-core)
 [![Dependency Status](https://david-dm.org/ckeditor/ckeditor-cloud-services-core/status.svg)](https://david-dm.org/ckeditor/ckeditor-cloud-services-core)
@@ -17,4 +16,4 @@ CKEditor Cloud Services Core API:
 
 
 ## License
 ## License
 
 
-Licensed under the terms of [GNU General Public License Version 2 or later](http://www.gnu.org/licenses/gpl.html). For full details about the license, please check the LICENSE.md file.
+Licensed under the terms of [GNU General Public License Version 2 or later](http://www.gnu.org/licenses/gpl.html). For full details about the license, please check the `LICENSE.md` file or [https://ckeditor.com/legal/ckeditor-oss-license](https://ckeditor.com/legal/ckeditor-oss-license).

+ 2 - 2
packages/ckeditor-cloud-services-core/package.json

@@ -1,13 +1,13 @@
 {
 {
   "name": "@ckeditor/ckeditor-cloud-services-core",
   "name": "@ckeditor/ckeditor-cloud-services-core",
-  "version": "0.2.0",
+  "version": "3.0.1",
   "description": "CKEditor Cloud Services Core API.",
   "description": "CKEditor Cloud Services Core API.",
   "keywords": [
   "keywords": [
     "ckeditor5",
     "ckeditor5",
     "ckeditor5-lib"
     "ckeditor5-lib"
   ],
   ],
   "dependencies": {
   "dependencies": {
-    "@ckeditor/ckeditor5-utils": "^11.1.0"
+    "@ckeditor/ckeditor5-utils": "^12.0.0"
   },
   },
   "devDependencies": {
   "devDependencies": {
     "eslint": "^5.5.0",
     "eslint": "^5.5.0",

+ 2 - 4
packages/ckeditor-cloud-services-core/src/token/token.js

@@ -1,12 +1,10 @@
 /**
 /**
- * @license Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
- * For licensing, see LICENSE.md.
+ * @license Copyright (c) 2003-2019, CKSource - Frederico Knabben. All rights reserved.
+ * For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
  */
  */
 
 
 /* eslint-env browser */
 /* eslint-env browser */
 
 
-'use strict';
-
 import mix from '@ckeditor/ckeditor5-utils/src/mix';
 import mix from '@ckeditor/ckeditor5-utils/src/mix';
 import ObservableMixin from '@ckeditor/ckeditor5-utils/src/observablemixin';
 import ObservableMixin from '@ckeditor/ckeditor5-utils/src/observablemixin';
 
 

+ 2 - 4
packages/ckeditor-cloud-services-core/src/uploadgateway/fileuploader.js

@@ -1,12 +1,10 @@
 /**
 /**
- * @license Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
- * For licensing, see LICENSE.md.
+ * @license Copyright (c) 2003-2019, CKSource - Frederico Knabben. All rights reserved.
+ * For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
  */
  */
 
 
 /* eslint-env browser */
 /* eslint-env browser */
 
 
-'use strict';
-
 import mix from '@ckeditor/ckeditor5-utils/src/mix';
 import mix from '@ckeditor/ckeditor5-utils/src/mix';
 import EmitterMixin from '@ckeditor/ckeditor5-utils/src/emittermixin';
 import EmitterMixin from '@ckeditor/ckeditor5-utils/src/emittermixin';
 
 

+ 2 - 4
packages/ckeditor-cloud-services-core/src/uploadgateway/uploadgateway.js

@@ -1,10 +1,8 @@
 /**
 /**
- * @license Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
- * For licensing, see LICENSE.md.
+ * @license Copyright (c) 2003-2019, CKSource - Frederico Knabben. All rights reserved.
+ * For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
  */
  */
 
 
-'use strict';
-
 import FileUploader from './fileuploader';
 import FileUploader from './fileuploader';
 
 
 /**
 /**

+ 2 - 4
packages/ckeditor-cloud-services-core/tests/token/token.js

@@ -1,12 +1,10 @@
 /**
 /**
- * @license Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
- * For licensing, see LICENSE.md.
+ * @license Copyright (c) 2003-2019, CKSource - Frederico Knabben. All rights reserved.
+ * For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
  */
  */
 
 
 /* eslint-env commonjs, browser */
 /* eslint-env commonjs, browser */
 
 
-'use strict';
-
 import Token from '../../src/token/token';
 import Token from '../../src/token/token';
 
 
 describe( 'Token', () => {
 describe( 'Token', () => {

+ 2 - 4
packages/ckeditor-cloud-services-core/tests/uploadgateway/fileuploader.js

@@ -1,12 +1,10 @@
 /**
 /**
- * @license Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
- * For licensing, see LICENSE.md.
+ * @license Copyright (c) 2003-2019, CKSource - Frederico Knabben. All rights reserved.
+ * For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
  */
  */
 
 
 /* eslint-env commonjs, browser */
 /* eslint-env commonjs, browser */
 
 
-'use strict';
-
 import FileUploader from '../../src/uploadgateway/fileuploader';
 import FileUploader from '../../src/uploadgateway/fileuploader';
 import Token from '../../src/token/token';
 import Token from '../../src/token/token';
 
 

+ 2 - 4
packages/ckeditor-cloud-services-core/tests/uploadgateway/uploadgateway.js

@@ -1,10 +1,8 @@
 /**
 /**
- * @license Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
- * For licensing, see LICENSE.md.
+ * @license Copyright (c) 2003-2019, CKSource - Frederico Knabben. All rights reserved.
+ * For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
  */
  */
 
 
-'use strict';
-
 import FileUploader from '../../src/uploadgateway/fileuploader';
 import FileUploader from '../../src/uploadgateway/fileuploader';
 import UploadGateway from '../../src/uploadgateway/uploadgateway';
 import UploadGateway from '../../src/uploadgateway/uploadgateway';
 import Token from '../../src/token/token';
 import Token from '../../src/token/token';