Index: /CKEditor/branches/versions/3.3.x/CHANGES.html
===================================================================
--- /CKEditor/branches/versions/3.3.x/CHANGES.html (revision 5523)
+++ /CKEditor/branches/versions/3.3.x/CHANGES.html (revision 5524)
@@ -68,6 +68,4 @@
#5559 : [IE] The first call of CKEDITOR.editor::setData is affected by iframe cache when loading wysiwyg mode.
#5567 : [IE] Remove inline styles in some case doesn't join identical siblings.
- #4836 : Using SCAYT result in fragile elements when applying inline styles.
- #5425 : [Opera] Disable SCAYT plugin for Opera browser.
#5450 : [FireFox] Press enter on 'replace' button result wrong.
#5121 : Recognizes the <br /> tag as a separator when apply block styles in enterMode=BR.
@@ -85,8 +83,6 @@
#4734 : Font size resets when font name is changed in an empty numbered list.
#5237 : English text in dialogs' title is flipped when using RTL language.
- #5632 : SCAYT word marker is not visible on text with background-color set.
#3257 : Create list doesn't keep blocks as headings.
#5111 : [Firefox] JAWS doesn't respect PC cursor mode (application role) on toolbar.
- #4125 : Remove Format command incorrectly removes SCAYT word markers.
#5530 : Page break for printing can't be removed with undo.
#5381 : Unable to place cursor between two paragraphs in body.
@@ -94,11 +90,8 @@
#5623 : [Firefox] Apply style that edges another inline style result incorrect.
#5586 : [Firefox] Maximize the second editor ruins fullscreen mode.
- #5671 : SCAYT bookstrap script could be added multiple times unnecessarily.
#5617 : Html filter system does not allow two 'text' filter rules.
#5663 : General memory clean up after destroying last instance.
#5673 : [Firefox] Tab key have to press twice to focus the editor.
#5461 : [IE] Fix Paste from Word dialog doesn't accept imput problem.
- #5573 : SCAYT move cursor position after insert element into marked word text.
- #5546 : SCAYT interferes with undo/redo commands.
#5676 : Make color buttons use RRGGBB instead of RGB for better compatibility with IE.
#4948 : [Safari] Select the first/last cell of table to open context menu may lead to undetected table.
@@ -106,7 +99,19 @@
#5667 : Pasting in a RTL page content causes shows up the horizontal scrollbar.
#5688 : Duplicate ids are used in dialog definition.
- #5570 : [IE] First enabling SCAYT blind cursor in editor.
#5719 : [IE] 'change' dialog event should not be triggered when dialog is already closed.
#5746 : [Firefox] Form elements (input/textarea) because editable and cause problem in wysiwyg mode.
+ #5747 : [IE] Error thrown when IE input field editing mode is turned on.
+ SCAYT plugin related:
+ - #4836 : Using SCAYT result in fragile elements when applying inline styles.
+ - #5425 : [Opera] Disable SCAYT plugin for Opera browser.
+ - #5632 : SCAYT word marker is not visible on text with background-color set.
+ - #4125 : Remove Format command incorrectly removes SCAYT word markers.
+ - #5671 : SCAYT bookstrap script could be added multiple times unnecessarily.
+ - #5573 : SCAYT move cursor position after insert element into marked word text.
+ - #5546 : SCAYT interferes with undo/redo commands.
+ - #5570 : [IE] First enabling SCAYT blind cursor in editor.
+ - #5741 : Enable SCAYT cause error in multiple editor instances.
+ - #5744 : Remove editor with SCAYT enabled in source mode throws error.
+
Updated the following language files:
- #5432 : Dutch;
Index: /CKEditor/branches/versions/3.3.x/_source/plugins/scayt/plugin.js
===================================================================
--- /CKEditor/branches/versions/3.3.x/_source/plugins/scayt/plugin.js (revision 5523)
+++ /CKEditor/branches/versions/3.3.x/_source/plugins/scayt/plugin.js (revision 5524)
@@ -12,8 +12,6 @@
{
var commandName = 'scaytcheck',
- openPage = '',
- scayt_paused = null,
- scayt_control_id = null;
-
+ openPage = '';
+
// Checks if a value exists in an array
function in_array(needle, haystack)
@@ -56,6 +54,6 @@
// Call scayt_control.focus when SCAYT loaded
- // and only if editor has focus
- if ( editor.focusManager.hasFocus )
+ // and only if editor has focus and scayt control creates at first time (#5720)
+ if ( editor.focusManager.hasFocus && !plugin.isControlRestored( editor ) )
this.focus();
@@ -77,6 +75,6 @@
}
// needs for restoring a specific scayt control settings
- if ( scayt_control_id )
- oParams.id = scayt_control_id;
+ if ( plugin.getControlId(editor) )
+ oParams.id = plugin.getControlId(editor);
var scayt_control = new window.scayt( oParams );
@@ -108,5 +106,5 @@
plugin.uiTabs = fTabs;
try {
- scayt_control.setDisabled( scayt_paused === false );
+ scayt_control.setDisabled( plugin.isPaused( editor ) === false );
} catch (e) {}
@@ -140,11 +138,14 @@
if ( scayt_instance )
{
- scayt_paused = scayt_instance.paused = !scayt_instance.disabled;
+ plugin.setPaused( editor, !scayt_instance.disabled );
// store a control id for restore a specific scayt control settings
- scayt_control_id = scayt_instance.id;
+ plugin.setControlId( editor, scayt_instance.id );
scayt_instance.destroy( true );
delete plugin.instances[ editor.name ];
}
}
+ // Catch on source mode switch off (#5720)
+ else if ( ev.data.name == 'source' && editor.mode == 'source' )
+ plugin.markControlRestore( editor )
});
@@ -162,7 +163,12 @@
var editor = ev.editor,
scayt_instance = plugin.getScayt( editor );
+
+ // SCAYT instance might already get destroyed by mode switch (#5744).
+ if ( !scayt_instance )
+ return;
+
delete plugin.instances[ editor.name ];
// store a control id for restore a specific scayt control settings
- scayt_control_id = scayt_instance.id;
+ plugin.setControlId( editor, scayt_instance.id );
scayt_instance.destroy( true );
});
@@ -262,6 +268,7 @@
if ( scayt_instance && plugin.isScaytReady( this.editor ) )
{
- this.contents = scayt_instance.reset( thisContents );
- otherImage.contents = scayt_instance.reset( otherContents );
+ // scayt::reset might return value undefined. (#5742)
+ this.contents = scayt_instance.reset( thisContents ) || '';
+ otherImage.contents = scayt_instance.reset( otherContents ) || '';
}
@@ -277,9 +284,62 @@
createInstance();
};
-
- CKEDITOR.plugins.scayt =
+
+CKEDITOR.plugins.scayt =
{
engineLoaded : false,
instances : {},
+ // Data storage for SCAYT control, based on editor instances
+ controlInfo : {},
+ setControlInfo : function( editor, o )
+ {
+ if ( editor && editor.name && typeof ( this.controlInfo[ editor.name ] ) != 'object' )
+ this.controlInfo[ editor.name ] = {};
+
+ for ( var infoOpt in o )
+ this.controlInfo[ editor.name ][ infoOpt ] = o[ infoOpt ];
+ },
+ isControlRestored : function ( editor )
+ {
+ if ( editor &&
+ editor.name &&
+ this.controlInfo[ editor.name ] )
+ {
+ return this.controlInfo[ editor.name ].restored ;
+ }
+ return false;
+ },
+ markControlRestore : function ( editor )
+ {
+ this.setControlInfo( editor,{ restored:true } );
+ },
+ setControlId: function (editor, id)
+ {
+ this.setControlInfo( editor,{ id:id } );
+ },
+ getControlId: function (editor)
+ {
+ if ( editor &&
+ editor.name &&
+ this.controlInfo[ editor.name ] &&
+ this.controlInfo[ editor.name ].id )
+ {
+ return this.controlInfo[ editor.name ].id
+ }
+ return null;
+ },
+ setPaused: function ( editor , bool )
+ {
+ this.setControlInfo( editor,{ paused:bool } );
+ },
+ isPaused: function (editor)
+ {
+ if ( editor &&
+ editor.name &&
+ this.controlInfo[editor.name] )
+ {
+ return this.controlInfo[editor.name].paused ;
+ }
+ return undefined;
+ },
getScayt : function( editor )
{
@@ -306,5 +366,5 @@
else if ( this.engineLoaded == -1 ) // We are waiting.
return CKEDITOR.on( 'scaytReady', function(){ onEngineLoad.apply( editor ); } ); // Use function(){} to avoid rejection as duplicate.
-
+
CKEDITOR.on( 'scaytReady', onEngineLoad, editor );
CKEDITOR.on( 'scaytReady', function()
@@ -740,5 +800,5 @@
editor.addRemoveFormatFilter && editor.addRemoveFormatFilter( scaytFilter );
-
+
}
});
Index: /CKEditor/branches/versions/3.3.x/_source/plugins/selection/plugin.js
===================================================================
--- /CKEditor/branches/versions/3.3.x/_source/plugins/selection/plugin.js (revision 5523)
+++ /CKEditor/branches/versions/3.3.x/_source/plugins/selection/plugin.js (revision 5524)
@@ -232,4 +232,13 @@
return;
}
+ }
+
+ // Avoid saving selection from within text input. (#5747)
+ var parentTag;
+ if ( nativeSel.type == 'Text'
+ && ( parentTag = nativeSel.createRange().parentElement().nodeName.toLowerCase() )
+ && parentTag in { input: 1, textarea : 1 } )
+ {
+ return;
}