Skip to content

Commit 52f66c7

Browse files
committed
Merge branch 'development'
2 parents be34f4b + 6421416 commit 52f66c7

File tree

6 files changed

+12
-22
lines changed

6 files changed

+12
-22
lines changed

CHANGELOG.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
# WProofreader plugin for CKEditor 5 Changelog
22

3+
## 2.3.0 – 2023-06-13
4+
5+
* Enabled all the actions such in the badge similarly to ones in the toolbar icon. [#67](https://github.com/WebSpellChecker/wproofreader-ckeditor5/issues/67).
6+
* Improved text hint for the WProofreader toolbar icon. [#68](https://github.com/WebSpellChecker/wproofreader-ckeditor5/issues/68).
7+
38
## 2.2.1 – 2023-05-10
49

510
Internal changes only (updated dependencies, documentation, etc.).

package-lock.json

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@webspellchecker/wproofreader-ckeditor5",
3-
"version": "2.2.1",
3+
"version": "2.3.0",
44
"description": "Multilingual spelling and grammar checking plugin for CKEditor 5",
55
"repository": {
66
"type": "git",

samples/multi-root-editor/multi-root-editor-ui.js

Lines changed: 4 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
import EditorUI from '@ckeditor/ckeditor5-core/src/editor/editorui';
2-
import enableToolbarKeyboardFocus from '@ckeditor/ckeditor5-ui/src/toolbar/enabletoolbarkeyboardfocus';
1+
import EditorUI from '@ckeditor/ckeditor5-ui/src/editorui/editorui';
32
import { enablePlaceholder } from '@ckeditor/ckeditor5-engine/src/view/placeholder';
43

54
/**
@@ -69,11 +68,6 @@ export default class MultirootEditorUI extends EditorUI {
6968
// Register each editable UI view in the editor.
7069
this.setEditableElement(editable.name, editableElement);
7170

72-
// Let the global focus tracker know that the editable UI element is focusable and
73-
// belongs to the editor. From now on, the focus tracker will sustain the editor focus
74-
// as long as the editable is focused (e.g. the user is typing).
75-
this.focusTracker.add(editableElement);
76-
7771
// Let the editable UI element respond to the changes in the global editor focus
7872
// tracker. It has been added to the same tracker a few lines above but, in reality, there are
7973
// many focusable areas in the editor, like balloons, toolbars or dropdowns and as long
@@ -137,18 +131,10 @@ export default class MultirootEditorUI extends EditorUI {
137131
* @private
138132
*/
139133
_initToolbar() {
140-
const editor = this.editor;
141-
const view = this.view;
142-
const toolbar = view.toolbar;
134+
const toolbar = this.view.toolbar;
143135

144-
toolbar.fillFromConfig(editor.config.get('toolbar'), this.componentFactory);
145-
146-
enableToolbarKeyboardFocus({
147-
origin: editor.editing.view,
148-
originFocusTracker: this.focusTracker,
149-
originKeystrokeHandler: editor.keystrokes,
150-
toolbar
151-
});
136+
toolbar.fillFromConfig(this.editor.config.get('toolbar'), this.componentFactory);
137+
this.editor.ui.addToolbar(toolbar)
152138
}
153139

154140
/**

src/wproofreader.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -214,7 +214,6 @@ export default class WProofreader extends Plugin {
214214
appType: 'proofreader_ck5',
215215
disableDialog: this._isMultiRoot || this._isCollaborationMode,
216216
restrictedEditingMode: this._isRestrictedEditingMode,
217-
hideStaticActions: true,
218217
disableBadgePulsing: true,
219218
onCommitOptions: this._onCommitOptions.bind(this),
220219
onToggle: this._onToggle.bind(this)

src/wproofreaderui.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ export default class WProofreaderUI extends Plugin {
5151
let dropdownItemsDefinitions, actions;
5252

5353
dropdownView.buttonView.set({
54-
label: 'WProofreader',
54+
label: 'WProofreader text checker',
5555
icon: wproofreaderIcon,
5656
tooltip: true
5757
});

0 commit comments

Comments
 (0)