Browse Source

Merge branch 'master' into t/43

Piotrek Koszuliński 9 years ago
parent
commit
fdc24770d3

+ 5 - 6
packages/ckeditor5-editor-classic/.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

+ 12 - 12
packages/ckeditor5-editor-classic/package.json

@@ -1,23 +1,23 @@
 {
-  "name": "ckeditor5-editor-classic",
+  "name": "@ckeditor/ckeditor5-editor-classic",
   "version": "0.6.0",
   "description": "Classic Editor for CKEditor 5.",
   "keywords": [],
   "dependencies": {
-    "ckeditor5-core": "ckeditor/ckeditor5-core",
-    "ckeditor5-engine": "ckeditor/ckeditor5-engine",
-    "ckeditor5-theme-lark": "ckeditor/ckeditor5-theme-lark",
-    "ckeditor5-ui": "ckeditor/ckeditor5-ui",
-    "ckeditor5-utils": "ckeditor/ckeditor5-utils"
+    "@ckeditor/ckeditor5-core": "*",
+    "@ckeditor/ckeditor5-engine": "*",
+    "@ckeditor/ckeditor5-theme-lark": "*",
+    "@ckeditor/ckeditor5-ui": "*",
+    "@ckeditor/ckeditor5-utils": "*"
   },
   "devDependencies": {
     "@ckeditor/ckeditor5-dev-lint": "^2.0.0",
-    "ckeditor5-basic-styles": "ckeditor/ckeditor5-basic-styles",
-    "ckeditor5-enter": "ckeditor/ckeditor5-enter",
-    "ckeditor5-heading": "ckeditor/ckeditor5-heading",
-    "ckeditor5-paragraph": "ckeditor/ckeditor5-paragraph",
-    "ckeditor5-undo": "ckeditor/ckeditor5-undo",
-    "ckeditor5-typing": "ckeditor/ckeditor5-typing",
+    "@ckeditor/ckeditor5-basic-styles": "*",
+    "@ckeditor/ckeditor5-enter": "*",
+    "@ckeditor/ckeditor5-heading": "*",
+    "@ckeditor/ckeditor5-paragraph": "*",
+    "@ckeditor/ckeditor5-undo": "*",
+    "@ckeditor/ckeditor5-typing": "*",
     "gulp": "^3.9.0",
     "guppy-pre-commit": "^0.4.0"
   },

+ 2 - 1
packages/ckeditor5-editor-classic/src/classiceditorui.js

@@ -78,7 +78,8 @@ export default class ClassicEditorUI {
 
 		// Setup the editable.
 		const editingRoot = editor.editing.createRoot( 'div' );
-		view.editable.bind( 'isReadOnly', 'isFocused' ).to( editingRoot );
+		view.editable.bind( 'isReadOnly' ).to( editingRoot );
+		view.editable.bind( 'isFocused' ).to( editor.editing.view );
 		view.editable.name = editingRoot.rootName;
 		this.focusTracker.add( view.editableElement );
 	}

+ 5 - 3
packages/ckeditor5-editor-classic/tests/classiceditorui.js

@@ -6,13 +6,15 @@
 /* globals document, Event */
 
 import ComponentFactory from '@ckeditor/ckeditor5-ui/src/componentfactory';
-import FocusTracker from '@ckeditor/ckeditor5-utils/src/focustracker';
+import View from '@ckeditor/ckeditor5-ui/src/view';
+
 import ClassicEditorUI from '../src/classiceditorui';
 import ClassicEditorUIView from '../src/classiceditoruiview';
 import ClassicTestEditor from '@ckeditor/ckeditor5-core/tests/_utils/classictesteditor';
+
+import FocusTracker from '@ckeditor/ckeditor5-utils/src/focustracker';
 import KeystrokeHandler from '@ckeditor/ckeditor5-utils/src/keystrokehandler';
 import { keyCodes } from '@ckeditor/ckeditor5-utils/src/keyboard';
-import View from '@ckeditor/ckeditor5-ui/src/view';
 
 import testUtils from '@ckeditor/ckeditor5-core/tests/_utils/utils';
 import utils from '@ckeditor/ckeditor5-utils/tests/_utils/utils';
@@ -99,7 +101,7 @@ describe( 'ClassicEditorUI', () => {
 					view.editable,
 					{ isFocused: false },
 					[
-						[ editable, { isFocused: true } ]
+						[ editor.editing.view, { isFocused: true } ]
 					],
 					{ isFocused: true }
 				);

+ 1 - 1
packages/ckeditor5-editor-classic/theme/theme.scss

@@ -1,7 +1,7 @@
 // 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/theme.scss';
+@import '~@ckeditor/ckeditor5-theme-lark/theme/theme.scss';
 
 @include ck-editor {
 	@include ck-rounded-corners();