Skip to content
Permalink
Browse files

Merge branch 't/10963'

  • Loading branch information...
oleq committed Nov 5, 2013
2 parents cd791a6 + a6bb977 commit 6f379b289ceb6e58a374f45a14c1563cf889b90b
Showing with 5 additions and 4 deletions.
  1. +1 −0 CHANGES.md
  2. +4 −4 plugins/magicline/plugin.js
@@ -8,6 +8,7 @@ Fixed Issues:
* [#10994](http://dev.ckeditor.com/ticket/10994): Fixed: loading external jQuery when opening adapter sample from file.
* [#10975](http://dev.ckeditor.com/ticket/10975): [IE] Fixed: Error thrown while opening color palette.
* [#9929](http://dev.ckeditor.com/ticket/9929): [Blink/Webkit] Fixed: A non-breaking space is created once deleted a character and a regular space is typed.
* [#10963](http://dev.ckeditor.com/ticket/10963): Fixed: JAWS issue with keyboard shortcut for Magicline.

## CKEditor 4.2.2

@@ -1695,10 +1695,10 @@
* // Changes keystroke to CTRL + ,
* CKEDITOR.config.magicline_keystrokePrevious = CKEDITOR.CTRL + 188;
*
* @cfg {Number} [magicline_keystrokePrevious=CKEDITOR.CTRL + CKEDITOR.SHIFT + 219 (CTRL + SHIFT + [)]
* @cfg {Number} [magicline_keystrokePrevious=CKEDITOR.CTRL + CKEDITOR.SHIFT + 51 (CTRL + SHIFT + 3)]
* @member CKEDITOR.config
*/
CKEDITOR.config.magicline_keystrokePrevious = CKEDITOR.CTRL + CKEDITOR.SHIFT + 219; // CTRL + SHIFT + [
CKEDITOR.config.magicline_keystrokePrevious = CKEDITOR.CTRL + CKEDITOR.SHIFT + 51; // CTRL + SHIFT + 3

/**
* Defines default keystroke that access the closest unreachable focus space **after**
@@ -1707,10 +1707,10 @@ CKEDITOR.config.magicline_keystrokePrevious = CKEDITOR.CTRL + CKEDITOR.SHIFT + 2
* // Changes keystroke to CTRL + .
* CKEDITOR.config.magicline_keystrokeNext = CKEDITOR.CTRL + 190;
*
* @cfg {Number} [magicline_keystrokeNext=CKEDITOR.CTRL + CKEDITOR.SHIFT + 221 (CTRL + SHIFT + ])]
* @cfg {Number} [magicline_keystrokeNext=CKEDITOR.CTRL + CKEDITOR.SHIFT + 52 (CTRL + SHIFT + 4)]
* @member CKEDITOR.config
*/
CKEDITOR.config.magicline_keystrokeNext = CKEDITOR.CTRL + CKEDITOR.SHIFT + 221; // CTRL + SHIFT + ]
CKEDITOR.config.magicline_keystrokeNext = CKEDITOR.CTRL + CKEDITOR.SHIFT + 52; // CTRL + SHIFT + 4

/**
* Defines box color. The color may be adjusted to enhance readability.

0 comments on commit 6f379b2

Please sign in to comment.
You can’t perform that action at this time.