Browse Source

Merge branch 'master' into t/24

Piotrek Koszuliński 9 years ago
parent
commit
b2ce744348
45 changed files with 64 additions and 59 deletions
  1. 5 6
      packages/ckeditor5-image/.travis.yml
  2. 1 1
      packages/ckeditor5-image/LICENSE.md
  3. 1 1
      packages/ckeditor5-image/gulpfile.js
  4. 5 0
      packages/ckeditor5-image/lang/contexts.json
  5. 12 11
      packages/ckeditor5-image/package.json
  6. 1 1
      packages/ckeditor5-image/src/converters.js
  7. 1 1
      packages/ckeditor5-image/src/image.js
  8. 1 1
      packages/ckeditor5-image/src/imagealternatetext/imagealternatetext.js
  9. 1 1
      packages/ckeditor5-image/src/imagealternatetext/imagealternatetextcommand.js
  10. 1 1
      packages/ckeditor5-image/src/imagealternatetext/imagealternatetextengine.js
  11. 1 1
      packages/ckeditor5-image/src/imagealternatetext/ui/alternatetextformview.js
  12. 1 1
      packages/ckeditor5-image/src/imagealternatetext/ui/textareaview.js
  13. 1 1
      packages/ckeditor5-image/src/imageengine.js
  14. 1 1
      packages/ckeditor5-image/src/imagestyle/converters.js
  15. 1 1
      packages/ckeditor5-image/src/imagestyle/imagestyle.js
  16. 1 1
      packages/ckeditor5-image/src/imagestyle/imagestylecommand.js
  17. 1 1
      packages/ckeditor5-image/src/imagestyle/imagestyleengine.js
  18. 1 1
      packages/ckeditor5-image/src/imagetoolbar.js
  19. 1 1
      packages/ckeditor5-image/src/ui/imageballoonpanel.js
  20. 1 1
      packages/ckeditor5-image/src/utils.js
  21. 1 1
      packages/ckeditor5-image/src/widget/utils.js
  22. 1 1
      packages/ckeditor5-image/src/widget/widget.js
  23. 1 1
      packages/ckeditor5-image/src/widget/widgetengine.js
  24. 1 1
      packages/ckeditor5-image/tests/image.js
  25. 1 1
      packages/ckeditor5-image/tests/imagealternatetext/imagealternatetext.js
  26. 1 1
      packages/ckeditor5-image/tests/imagealternatetext/imagealternatetextcommand.js
  27. 1 1
      packages/ckeditor5-image/tests/imagealternatetext/imagelaternatetextengine.js
  28. 1 1
      packages/ckeditor5-image/tests/imagealternatetext/ui/alternatetextformview.js
  29. 1 1
      packages/ckeditor5-image/tests/imagealternatetext/ui/textareaview.js
  30. 1 1
      packages/ckeditor5-image/tests/imageengine.js
  31. 1 1
      packages/ckeditor5-image/tests/imagestyle/imagestyle.js
  32. 1 1
      packages/ckeditor5-image/tests/imagestyle/imagestylecommand.js
  33. 1 1
      packages/ckeditor5-image/tests/imagestyle/imagestyleengine.js
  34. 1 1
      packages/ckeditor5-image/tests/imagetoolbar.js
  35. 1 1
      packages/ckeditor5-image/tests/manual/alternatetext.js
  36. 1 1
      packages/ckeditor5-image/tests/manual/image.js
  37. 1 1
      packages/ckeditor5-image/tests/manual/imagestyle.js
  38. 1 1
      packages/ckeditor5-image/tests/ui/imageballoonpanel.js
  39. 1 1
      packages/ckeditor5-image/tests/utils.js
  40. 1 1
      packages/ckeditor5-image/tests/widget/utils.js
  41. 1 1
      packages/ckeditor5-image/tests/widget/widget.js
  42. 1 1
      packages/ckeditor5-image/tests/widget/widgetengine.js
  43. 1 1
      packages/ckeditor5-image/theme/imagealternatetext/theme.scss
  44. 1 1
      packages/ckeditor5-image/theme/textareaview/theme.scss
  45. 1 1
      packages/ckeditor5-image/theme/theme.scss

+ 5 - 6
packages/ckeditor5-image/.travis.yml

@@ -15,11 +15,10 @@ before_install:
   - export DISPLAY=:99.0
   - sh -e /etc/init.d/xvfb start
 install:
-  - npm install
-  - npm install @ckeditor/ckeditor5-dev-tests
-  - npm install codeclimate-test-reporter
+  - npm install gulp mgit2 lerna codeclimate-test-reporter
+  - npm install @ckeditor/ckeditor5-dev-tests @ckeditor/ckeditor5-dev-lint
+  - ckeditor5-dev-tests-install-dependencies
 script:
-  - node_modules/.bin/ckeditor5-dev-tests-travis
+  - ckeditor5-dev-tests-travis
 after_success:
-  - node_modules/.bin/codeclimate-test-reporter < build/.automated-tests/coverage/lcov.info
-
+  - codeclimate-test-reporter < coverage/lcov.info

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

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

+ 1 - 1
packages/ckeditor5-image/gulpfile.js

@@ -1,5 +1,5 @@
 /**
- * @license Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+ * @license Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
  * For licensing, see LICENSE.md.
  */
 

+ 5 - 0
packages/ckeditor5-image/lang/contexts.json

@@ -0,0 +1,5 @@
+{
+	"image widget": "Label for the image widget.",
+	"Side image": "Label for the Side image option.",
+	"Full size image": "Label for the Full size image option."
+}

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

@@ -1,22 +1,23 @@
 {
-  "name": "ckeditor5-image",
+  "name": "@ckeditor/ckeditor5-image",
   "version": "0.2.0",
   "description": "Image feature for CKEditor 5.",
   "keywords": [],
   "dependencies": {
-    "ckeditor5-core": "ckeditor/ckeditor5-core",
-    "ckeditor5-engine": "ckeditor/ckeditor5-engine",
-    "ckeditor5-ui": "ckeditor/ckeditor5-ui"
+    "@ckeditor/ckeditor5-core": "*",
+    "@ckeditor/ckeditor5-engine": "*",
+    "@ckeditor/ckeditor5-ui": "*"
   },
   "devDependencies": {
+    "@ckeditor/ckeditor5-clipboard": "*",
     "@ckeditor/ckeditor5-dev-lint": "^2.0.0",
-    "ckeditor5-clipboard": "ckeditor/ckeditor5-clipboard",
-    "ckeditor5-editor-classic": "ckeditor/ckeditor5-editor-classic",
-    "ckeditor5-enter": "ckeditor/ckeditor5-enter",
-    "ckeditor5-typing": "ckeditor/ckeditor5-typing",
-    "ckeditor5-paragraph": "ckeditor/ckeditor5-paragraph",
-    "ckeditor5-heading": "ckeditor/ckeditor5-heading",
-    "ckeditor5-undo": "ckeditor/ckeditor5-undo",
+    "@ckeditor/ckeditor5-editor-classic": "*",
+    "@ckeditor/ckeditor5-enter": "*",
+    "@ckeditor/ckeditor5-heading": "*",
+    "@ckeditor/ckeditor5-paragraph": "*",
+    "@ckeditor/ckeditor5-typing": "*",
+    "@ckeditor/ckeditor5-undo": "*",
+    "@ckeditor/ckeditor5-utils": "*",
     "gulp": "^3.9.1",
     "guppy-pre-commit": "^0.4.0"
   },

+ 1 - 1
packages/ckeditor5-image/src/converters.js

@@ -1,5 +1,5 @@
 /**
- * @license Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+ * @license Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
  * For licensing, see LICENSE.md.
  */
 

+ 1 - 1
packages/ckeditor5-image/src/image.js

@@ -1,5 +1,5 @@
 /**
- * @license Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+ * @license Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
  * For licensing, see LICENSE.md.
  */
 

+ 1 - 1
packages/ckeditor5-image/src/imagealternatetext/imagealternatetext.js

@@ -1,5 +1,5 @@
 /**
- * @license Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+ * @license Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
  * For licensing, see LICENSE.md.
  */
 

+ 1 - 1
packages/ckeditor5-image/src/imagealternatetext/imagealternatetextcommand.js

@@ -1,5 +1,5 @@
 /**
- * @license Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+ * @license Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
  * For licensing, see LICENSE.md.
  */
 

+ 1 - 1
packages/ckeditor5-image/src/imagealternatetext/imagealternatetextengine.js

@@ -1,5 +1,5 @@
 /**
- * @license Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+ * @license Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
  * For licensing, see LICENSE.md.
  */
 

+ 1 - 1
packages/ckeditor5-image/src/imagealternatetext/ui/alternatetextformview.js

@@ -1,5 +1,5 @@
 /**
- * @license Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+ * @license Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
  * For licensing, see LICENSE.md.
  */
 

+ 1 - 1
packages/ckeditor5-image/src/imagealternatetext/ui/textareaview.js

@@ -1,5 +1,5 @@
 /**
- * @license Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+ * @license Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
  * For licensing, see LICENSE.md.
  */
 

+ 1 - 1
packages/ckeditor5-image/src/imageengine.js

@@ -1,5 +1,5 @@
 /**
- * @license Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+ * @license Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
  * For licensing, see LICENSE.md.
  */
 

+ 1 - 1
packages/ckeditor5-image/src/imagestyle/converters.js

@@ -1,5 +1,5 @@
 /**
- * @license Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+ * @license Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
  * For licensing, see LICENSE.md.
  */
 

+ 1 - 1
packages/ckeditor5-image/src/imagestyle/imagestyle.js

@@ -1,5 +1,5 @@
 /**
- * @license Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+ * @license Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
  * For licensing, see LICENSE.md.
  */
 

+ 1 - 1
packages/ckeditor5-image/src/imagestyle/imagestylecommand.js

@@ -1,5 +1,5 @@
 /**
- * @license Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+ * @license Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
  * For licensing, see LICENSE.md.
  */
 

+ 1 - 1
packages/ckeditor5-image/src/imagestyle/imagestyleengine.js

@@ -1,5 +1,5 @@
 /**
- * @license Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+ * @license Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
  * For licensing, see LICENSE.md.
  */
 

+ 1 - 1
packages/ckeditor5-image/src/imagetoolbar.js

@@ -1,5 +1,5 @@
 /**
- * @license Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+ * @license Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
  * For licensing, see LICENSE.md.
  */
 

+ 1 - 1
packages/ckeditor5-image/src/ui/imageballoonpanel.js

@@ -1,5 +1,5 @@
 /**
- * @license Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+ * @license Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
  * For licensing, see LICENSE.md.
  */
 

+ 1 - 1
packages/ckeditor5-image/src/utils.js

@@ -1,5 +1,5 @@
 /**
- * @license Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+ * @license Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
  * For licensing, see LICENSE.md.
  */
 

+ 1 - 1
packages/ckeditor5-image/src/widget/utils.js

@@ -1,5 +1,5 @@
 /**
- * @license Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+ * @license Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
  * For licensing, see LICENSE.md.
  */
 

+ 1 - 1
packages/ckeditor5-image/src/widget/widget.js

@@ -1,5 +1,5 @@
 /**
- * @license Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+ * @license Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
  * For licensing, see LICENSE.md.
  */
 

+ 1 - 1
packages/ckeditor5-image/src/widget/widgetengine.js

@@ -1,5 +1,5 @@
 /**
- * @license Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+ * @license Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
  * For licensing, see LICENSE.md.
  */
 

+ 1 - 1
packages/ckeditor5-image/tests/image.js

@@ -1,5 +1,5 @@
 /**
- * @license Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+ * @license Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
  * For licensing, see LICENSE.md.
  */
 

+ 1 - 1
packages/ckeditor5-image/tests/imagealternatetext/imagealternatetext.js

@@ -1,5 +1,5 @@
 /**
- * @license Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+ * @license Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
  * For licensing, see LICENSE.md.
  */
 

+ 1 - 1
packages/ckeditor5-image/tests/imagealternatetext/imagealternatetextcommand.js

@@ -1,5 +1,5 @@
 /**
- * @license Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+ * @license Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
  * For licensing, see LICENSE.md.
  */
 

+ 1 - 1
packages/ckeditor5-image/tests/imagealternatetext/imagelaternatetextengine.js

@@ -1,5 +1,5 @@
 /**
- * @license Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+ * @license Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
  * For licensing, see LICENSE.md.
  */
 

+ 1 - 1
packages/ckeditor5-image/tests/imagealternatetext/ui/alternatetextformview.js

@@ -1,5 +1,5 @@
 /**
- * @license Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+ * @license Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
  * For licensing, see LICENSE.md.
  */
 

+ 1 - 1
packages/ckeditor5-image/tests/imagealternatetext/ui/textareaview.js

@@ -1,5 +1,5 @@
 /**
- * @license Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+ * @license Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
  * For licensing, see LICENSE.md.
  */
 

+ 1 - 1
packages/ckeditor5-image/tests/imageengine.js

@@ -1,5 +1,5 @@
 /**
- * @license Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+ * @license Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
  * For licensing, see LICENSE.md.
  */
 

+ 1 - 1
packages/ckeditor5-image/tests/imagestyle/imagestyle.js

@@ -1,5 +1,5 @@
 /**
- * @license Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+ * @license Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
  * For licensing, see LICENSE.md.
  */
 

+ 1 - 1
packages/ckeditor5-image/tests/imagestyle/imagestylecommand.js

@@ -1,5 +1,5 @@
 /**
- * @license Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+ * @license Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
  * For licensing, see LICENSE.md.
  */
 

+ 1 - 1
packages/ckeditor5-image/tests/imagestyle/imagestyleengine.js

@@ -1,5 +1,5 @@
 /**
- * @license Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+ * @license Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
  * For licensing, see LICENSE.md.
  */
 

+ 1 - 1
packages/ckeditor5-image/tests/imagetoolbar.js

@@ -1,5 +1,5 @@
 /**
- * @license Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+ * @license Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
  * For licensing, see LICENSE.md.
  */
 

+ 1 - 1
packages/ckeditor5-image/tests/manual/alternatetext.js

@@ -1,5 +1,5 @@
 /**
- * @license Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+ * @license Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
  * For licensing, see LICENSE.md.
  */
 

+ 1 - 1
packages/ckeditor5-image/tests/manual/image.js

@@ -1,5 +1,5 @@
 /**
- * @license Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+ * @license Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
  * For licensing, see LICENSE.md.
  */
 

+ 1 - 1
packages/ckeditor5-image/tests/manual/imagestyle.js

@@ -1,5 +1,5 @@
 /**
- * @license Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+ * @license Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
  * For licensing, see LICENSE.md.
  */
 

+ 1 - 1
packages/ckeditor5-image/tests/ui/imageballoonpanel.js

@@ -1,5 +1,5 @@
 /**
- * @license Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+ * @license Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
  * For licensing, see LICENSE.md.
  */
 

+ 1 - 1
packages/ckeditor5-image/tests/utils.js

@@ -1,5 +1,5 @@
 /**
- * @license Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+ * @license Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
  * For licensing, see LICENSE.md.
  */
 

+ 1 - 1
packages/ckeditor5-image/tests/widget/utils.js

@@ -1,5 +1,5 @@
 /**
- * @license Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+ * @license Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
  * For licensing, see LICENSE.md.
  */
 

+ 1 - 1
packages/ckeditor5-image/tests/widget/widget.js

@@ -1,5 +1,5 @@
 /**
- * @license Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+ * @license Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
  * For licensing, see LICENSE.md.
  */
 

+ 1 - 1
packages/ckeditor5-image/tests/widget/widgetengine.js

@@ -1,5 +1,5 @@
 /**
- * @license Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+ * @license Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
  * For licensing, see LICENSE.md.
  */
 

+ 1 - 1
packages/ckeditor5-image/theme/imagealternatetext/theme.scss

@@ -1,4 +1,4 @@
-// Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+// Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
 // For licensing, see LICENSE.md or http://ckeditor.com/license
 
 @import '~ckeditor5-theme-lark/theme/helpers/_spacing';

+ 1 - 1
packages/ckeditor5-image/theme/textareaview/theme.scss

@@ -1,4 +1,4 @@
-// Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+// Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
 // For licensing, see LICENSE.md or http://ckeditor.com/license
 
 @import '~ckeditor5-theme-lark/theme/helpers/_spacing';

+ 1 - 1
packages/ckeditor5-image/theme/theme.scss

@@ -1,4 +1,4 @@
-// Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+// Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
 // For licensing, see LICENSE.md or http://ckeditor.com/license
 
 @import '~ckeditor5-theme-lark/theme/helpers/_spacing';