Skip to content

Commit 6f22002

Browse files
committed
Merge branch 'scayt-dev'. CKEditor 4.5.6 ready
2 parents 62461da + 1c59f06 commit 6f22002

File tree

3 files changed

+235
-64
lines changed

3 files changed

+235
-64
lines changed

CHANGELOG.md

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
SCAYT plugin for CKEditor 4 Changelog
2+
====================
3+
### CKEditor 4.5.6
4+
5+
New Features:
6+
* CKEditor [language adddon](http://ckeditor.com/addon/language) support
7+
* CKEditor [placeholder adddon](http://ckeditor.com/addon/placeholder) support
8+
* Drag and Drop support
9+
* *Experimental* GRAYT functionality http://www.webspellchecker.net/samples/scayt-ckeditor-plugin.html#25
10+
11+
Fixed issues:
12+
* [#98](https://github.com/WebSpellChecker/ckeditor-plugin-scayt/issues/98) SCAYT Affects Dialog Double Click. Fixed in SCAYT Core.
13+
* [#102](https://github.com/WebSpellChecker/ckeditor-plugin-scayt/issues/102) SCAYT Core performance enhancements
14+
* [#104](https://github.com/WebSpellChecker/ckeditor-plugin-scayt/issues/104) SCAYT's spans leak into the clipboard and after pasting
15+
* [#105](https://github.com/WebSpellChecker/ckeditor-plugin-scayt/issues/105) Javascript error fired in case of multiple instances of CKEditor in one page
16+
* [#107](https://github.com/WebSpellChecker/ckeditor-plugin-scayt/issues/107) SCAYT should not check non-editable parts of content
17+
* [#108](https://github.com/WebSpellChecker/ckeditor-plugin-scayt/issues/108) Latest SCAYT copies id of editor element to the iframe
18+
* SCAYT stops working when CKEditor Undo plug-in not enabled
19+
* Issue with pasting SCAYT markup in CKEditor
20+
* SCAYT stops working after pressing Cancel button in WSC dialog

dialogs/options.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ CKEDITOR.dialog.add( 'scaytDialog', function( editor ) {
110110
var scayt_instance = editor.scayt;
111111
var lang = scayt_instance.getLang(),
112112
prefix_id = "scaytLang_",
113-
radio = doc.getById(prefix_id + lang);
113+
radio = doc.getById(prefix_id + editor.name + '_' + lang);
114114

115115
radio.$.checked = true;
116116
}
@@ -477,7 +477,7 @@ CKEDITOR.dialog.add( 'scaytDialog', function( editor ) {
477477
buildRadioInputs: function(key, value, isSupportedByGrayt) {
478478
var divContainer = new CKEDITOR.dom.element( 'div' ),
479479
doc = CKEDITOR.document,
480-
id = "scaytLang_" + value,
480+
id = "scaytLang_" + editor.name + '_' + value,
481481
radio = CKEDITOR.dom.element.createFromHtml( '<input id="' +
482482
id + '" type="radio" ' +
483483
' value="' + value + '" name="scayt_lang" />' ),

0 commit comments

Comments
 (0)