From cb6f9de5e3a14820ef1b9f723d77af88eb45435a Mon Sep 17 00:00:00 2001 From: Aleksander Nowodzinski Date: Mon, 11 Feb 2013 16:08:27 +0100 Subject: [PATCH 1/2] Changed magicline keystroke to not to overwrite default square bracket typing for French keyboard layout. --- plugins/magicline/plugin.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/plugins/magicline/plugin.js b/plugins/magicline/plugin.js index 1aa384aa8ea..01c8ecf2e3d 100644 --- a/plugins/magicline/plugin.js +++ b/plugins/magicline/plugin.js @@ -1693,10 +1693,10 @@ * // Changes keystroke to CTRL + , * CKEDITOR.config.magicline_keystrokePrevious = CKEDITOR.CTRL + 188; * - * @cfg {Number} [magicline_keystrokePrevious=CKEDITOR.CTRL + CKEDITOR.ALT + 219 (CTRL + ALT + [)] + * @cfg {Number} [magicline_keystrokePrevious=CKEDITOR.CTRL + CKEDITOR.SHIFT + 219 (CTRL + SHIFT + [)] * @member CKEDITOR.config */ -CKEDITOR.config.magicline_keystrokePrevious = CKEDITOR.CTRL + CKEDITOR.ALT + 219; // CTRL + ALT + [ +CKEDITOR.config.magicline_keystrokePrevious = CKEDITOR.CTRL + CKEDITOR.SHIFT + 219; // CTRL + SHIFT + [ /** * Defines default keystroke that access the closest unreachable focus space **after** @@ -1705,10 +1705,10 @@ CKEDITOR.config.magicline_keystrokePrevious = CKEDITOR.CTRL + CKEDITOR.ALT + 219 * // Changes keystroke to CTRL + . * CKEDITOR.config.magicline_keystrokeNext = CKEDITOR.CTRL + 190; * - * @cfg {Number} [magicline_keystrokeNext=CKEDITOR.CTRL + CKEDITOR.ALT + 221 (CTRL + ALT + ])] + * @cfg {Number} [magicline_keystrokeNext=CKEDITOR.CTRL + CKEDITOR.SHIFT + 221 (CTRL + SHIFT + ])] * @member CKEDITOR.config */ -CKEDITOR.config.magicline_keystrokeNext = CKEDITOR.CTRL + CKEDITOR.ALT + 221; // CTRL + ALT + ] +CKEDITOR.config.magicline_keystrokeNext = CKEDITOR.CTRL + CKEDITOR.SHIFT + 221; // CTRL + SHIFT + ] /** * Defines box color. The color may be adjusted to enhance readability. From befd472636e06f09bff4ce89f348c4216d845e51 Mon Sep 17 00:00:00 2001 From: Aleksander Nowodzinski Date: Wed, 13 Feb 2013 16:20:58 +0100 Subject: [PATCH 2/2] Changelog entry. --- CHANGES.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGES.md b/CHANGES.md index 3f66939d340..f1d24a46a2b 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -16,6 +16,7 @@ CKEditor 4 Changelog * [#9845](http://dev.ckeditor.com/ticket/9845): Fixed TAB navigation in the Link dialog and the Anchors option is used and no anchors are available. * [#9883](http://dev.ckeditor.com/ticket/9883): Maximizing was making the entire page editable with divarea based editors. * [#9940](http://dev.ckeditor.com/ticket/9940): With Firefox, navigating back to a page with the editor was making the entire page editable. +* [#9966](http://dev.ckeditor.com/ticket/9966): Fixed: Unable to type square brackets with French keyboard layout. Changed magicline keystrokes. ## CKEditor 4.0.1