X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=_source%2Fplugins%2Fscayt%2Fplugin.js;h=84756ba157152fdf2f2b774cdca074fbe03e5381;hb=a272c66d841421f8bf933c16535bdcde1c4649fc;hp=cfe35d6976e50c9c6e8bfeab008d8f227bc0d359;hpb=ea7e3453c7b0f023b050aca6d9f83ab372860d91;p=ckeditor.git
diff --git a/_source/plugins/scayt/plugin.js b/_source/plugins/scayt/plugin.js
index cfe35d6..84756ba 100644
--- a/_source/plugins/scayt/plugin.js
+++ b/_source/plugins/scayt/plugin.js
@@ -1,5 +1,5 @@
/*
-Copyright (c) 2003-2009, CKSource - Frederico Knabben. All rights reserved.
+Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
For licensing, see LICENSE.html or http://ckeditor.com/license
*/
@@ -10,8 +10,24 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
(function()
{
- var commandName = 'scaytcheck',
- openPage = '';
+ var commandName = 'scaytcheck',
+ openPage = '';
+
+ // Checks if a value exists in an array
+ function in_array( needle, haystack )
+ {
+ var found = 0,
+ key;
+ for ( key in haystack )
+ {
+ if ( haystack[ key ] == needle )
+ {
+ found = 1;
+ break;
+ }
+ }
+ return found;
+ }
var onEngineLoad = function()
{
@@ -19,29 +35,59 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
var createInstance = function() // Create new instance every time Document is created.
{
+ if( plugin.instances[ editor.name ] )
+ plugin.instances[ editor.name ].destroy();
+
+ var config = editor.config;
// Initialise Scayt instance.
var oParams = {};
- oParams.srcNodeRef = editor.document.getWindow().$.frameElement; // Get the iframe.
+ // Get the iframe.
+ oParams.srcNodeRef = editor.document.getWindow().$.frameElement;
// syntax : AppName.AppVersion@AppRevision
- oParams.assocApp = "CKEDITOR." + CKEDITOR.version + "@" + CKEDITOR.revision;
+ oParams.assocApp = 'CKEDITOR.' + CKEDITOR.version + '@' + CKEDITOR.revision;
+ oParams.customerid = config.scayt_customerid || '1:WvF0D4-UtPqN1-43nkD4-NKvUm2-daQqk3-LmNiI-z7Ysb4-mwry24-T8YrS3-Q2tpq2';
+ oParams.customDictionaryIds = config.scayt_customDictionaryIds || '';
+ oParams.userDictionaryName = config.scayt_userDictionaryName || '';
+ oParams.sLang = config.scayt_sLang || 'en_US';
+
+ // Introduce SCAYT onLoad callback. (#5632)
+ oParams.onLoad = function()
+ {
+ // Draw down word marker to avoid being covered by background-color style.(#5466)
+ if ( !( CKEDITOR.env.ie && CKEDITOR.env.version < 8 ) )
+ this.addStyle( this.selectorCss(), 'padding-bottom: 2px !important;' );
- oParams.customerid = editor.config.scayt_customerid || "1:11111111111111111111111111111111111111";
- oParams.customDictionaryName = editor.config.scayt_customDictionaryName;
- oParams.userDictionaryName = editor.config.scayt_userDictionaryName;
- oParams.defLang = editor.scayt_defLang;
+ // Call scayt_control.focus when SCAYT loaded
+ // and only if editor has focus and scayt control creates at first time (#5720)
+ if ( editor.focusManager.hasFocus && !plugin.isControlRestored( editor ) )
+ this.focus();
- if ( CKEDITOR._scaytParams )
+ };
+
+ oParams.onBeforeChange = function()
{
- for ( var k in CKEDITOR._scaytParams )
- {
- oParams[ k ] = CKEDITOR._scaytParams[ k ];
- }
+ if ( plugin.getScayt( editor ) && !editor.checkDirty() )
+ setTimeout( function(){ editor.resetDirty(); }, 0 );
+ };
+
+ var scayt_custom_params = window.scayt_custom_params;
+ if ( typeof scayt_custom_params == 'object' )
+ {
+ for ( var k in scayt_custom_params )
+ oParams[ k ] = scayt_custom_params[ k ];
}
+ // needs for restoring a specific scayt control settings
+ if ( plugin.getControlId( editor ) )
+ oParams.id = plugin.getControlId( editor );
var scayt_control = new window.scayt( oParams );
+ scayt_control.afterMarkupRemove.push( function( node )
+ {
+ ( new CKEDITOR.dom.element( node, scayt_control.document ) ).mergeSiblings();
+ } );
// Copy config.
- var lastInstance = plugin.instances[ editor.name ];
+ var lastInstance = plugin.instances[ editor.name ];
if ( lastInstance )
{
scayt_control.sLang = lastInstance.sLang;
@@ -52,18 +98,22 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
plugin.instances[ editor.name ] = scayt_control;
try {
- scayt_control.setDisabled( scayt_control.paused === false ); // I really don't know why it causes JS error in IE
+ scayt_control.setDisabled( plugin.isPaused( editor ) === false );
} catch (e) {}
+
editor.fire( 'showScaytState' );
};
- editor.on( 'contentDom', createInstance );
+ editor.on( 'contentDom', function(ev)
+ {
+ createInstance();
+ });
editor.on( 'contentDomUnload', function()
{
// Remove scripts.
var scripts = CKEDITOR.document.getElementsByTag( 'script' ),
scaytIdRegex = /^dojoIoScript(\d+)$/i,
- scaytSrcRegex = /^https?:\/\/svc\.spellchecker\.net\/spellcheck\/script\/ssrv\.cgi/i;
+ scaytSrcRegex = /^https?:\/\/svc\.webspellchecker\.net\/spellcheck\/script\/ssrv\.cgi/i;
for ( var i=0; i < scripts.count(); i++ )
{
@@ -78,27 +128,68 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
editor.on( 'beforeCommandExec', function( ev ) // Disable SCAYT before Source command execution.
{
- if ( (ev.data.name == 'source' || ev.data.name == 'newpage') && editor.mode == 'wysiwyg' )
- {
- var scayt_instanse = plugin.getScayt( editor );
- if ( scayt_instanse )
+ if ( ev.data.name == 'source' && editor.mode == 'source' )
+ plugin.markControlRestore( editor );
+ });
+
+ editor.on( 'afterCommandExec', function( ev )
+ {
+ if ( !plugin.isScaytEnabled( editor ) )
+ return;
+
+ if ( editor.mode == 'wysiwyg' && ( ev.data.name == 'undo' || ev.data.name == 'redo' ) )
+ window.setTimeout( function() { plugin.getScayt( editor ).refresh(); }, 10 );
+ });
+ editor.on( 'destroy', function( ev )
+ {
+ 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
+ plugin.setControlId( editor, scayt_instance.id );
+ scayt_instance.destroy( true );
+ });
+ //#9439 after SetData method fires contentDom event and SCAYT create additional instanse
+ // This way we should destroy SCAYT on setData event when contenteditable Iframe was re-created
+ editor.on( 'setData', function( ev )
+ {
+ var scayt_instance = plugin.getScayt( editor );
+ if ( scayt_instance )
{
- scayt_instanse.paused = !scayt_instanse.disabled;
- scayt_instanse.destroy();
+ plugin.setPaused( editor, !scayt_instance.disabled );
+ // store a control id for restore a specific scayt control settings
+ plugin.setControlId( editor, scayt_instance.id );
+ scayt_instance.destroy( true );
delete plugin.instances[ editor.name ];
}
- }
});
- // Listen to data manipulation to reflect scayt markup.
- editor.on( 'afterSetData', function()
+ // Reload spell-checking for current word after insertion completed.
+ editor.on( 'insertElement', function()
{
+ var scayt_instance = plugin.getScayt( editor );
if ( plugin.isScaytEnabled( editor ) )
- plugin.getScayt( editor ).refresh();
- });
+ {
+ // Unlock the selection before reload, SCAYT will take
+ // care selection update.
+ if ( CKEDITOR.env.ie )
+ editor.getSelection().unlock( true );
- // Reload spell-checking for current word after insertion completed.
- editor.on( 'insertElement', function()
+ // Return focus to the editor and refresh SCAYT markup (#5573).
+ window.setTimeout( function()
+ {
+ scayt_instance.focus();
+ scayt_instance.refresh();
+ }, 10 );
+ }
+ }, this, null, 50 );
+
+ editor.on( 'insertHtml', function()
{
var scayt_instance = plugin.getScayt( editor );
if ( plugin.isScaytEnabled( editor ) )
@@ -108,11 +199,13 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
if ( CKEDITOR.env.ie )
editor.getSelection().unlock( true );
- // Swallow any SCAYT engine errors.
- try{
+ // Return focus to the editor (#5573)
+ // Refresh SCAYT markup
+ window.setTimeout( function()
+ {
+ scayt_instance.focus();
scayt_instance.refresh();
- }catch( er )
- {}
+ }, 10 );
}
}, this, null, 50 );
@@ -126,6 +219,7 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
var dataProcessor = editor.dataProcessor,
htmlFilter = dataProcessor && dataProcessor.htmlFilter;
+
if ( htmlFilter )
{
htmlFilter.addRules(
@@ -134,7 +228,8 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
{
span : function( element )
{
- if ( element.attributes.scayt_word && element.attributes.scaytid )
+ if ( element.attributes[ 'data-scayt_word' ]
+ && element.attributes[ 'data-scaytid' ] )
{
delete element.name; // Write children, but don't write this node.
return element;
@@ -145,14 +240,92 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
);
}
+ // Override Image.equals method avoid CK snapshot module to add SCAYT markup to snapshots. (#5546)
+ var undoImagePrototype = CKEDITOR.plugins.undo.Image.prototype;
+ undoImagePrototype.equals = CKEDITOR.tools.override( undoImagePrototype.equals, function( org )
+ {
+ return function( otherImage )
+ {
+ var thisContents = this.contents,
+ otherContents = otherImage.contents;
+ var scayt_instance = plugin.getScayt( this.editor );
+ // Making the comparison based on content without SCAYT word markers.
+ if ( scayt_instance && plugin.isScaytReady( this.editor ) )
+ {
+ // scayt::reset might return value undefined. (#5742)
+ this.contents = scayt_instance.reset( thisContents ) || '';
+ otherImage.contents = scayt_instance.reset( otherContents ) || '';
+ }
+
+ var retval = org.apply( this, arguments );
+
+ this.contents = thisContents;
+ otherImage.contents = otherContents;
+ return retval;
+ };
+ });
+
if ( editor.document )
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 )
{
return this.instances[ editor.name ];
@@ -164,15 +337,44 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
},
isScaytEnabled : function( editor )
{
- var scayt_instanse = this.getScayt( editor );
- return ( scayt_instanse ) ? scayt_instanse.disabled === false : false;
+ var scayt_instance = this.getScayt( editor );
+ return ( scayt_instance ) ? scayt_instance.disabled === false : false;
+ },
+ getUiTabs : function( editor )
+ {
+ var uiTabs = [];
+
+ // read UI tabs value from config
+ var configUiTabs = editor.config.scayt_uiTabs || "1,1,1";
+
+ // convert string to array
+ configUiTabs = configUiTabs.split( ',' );
+
+ // "About us" should be always shown for standard config
+ configUiTabs[3] = "1";
+
+ for ( var i = 0; i < 4; i++ ) {
+ uiTabs[i] = (typeof window.scayt != "undefined" && typeof window.scayt.uiTags != "undefined")
+ ? (parseInt(configUiTabs[i],10) && window.scayt.uiTags[i])
+ : parseInt(configUiTabs[i],10);
+ }
+ return uiTabs;
},
loadEngine : function( editor )
{
+ // SCAYT doesn't work with Firefox2, Opera and AIR.
+ if ( CKEDITOR.env.gecko && CKEDITOR.env.version < 10900 || CKEDITOR.env.opera || CKEDITOR.env.air )
+ return editor.fire( 'showScaytState' );
+
if ( this.engineLoaded === true )
- return onEngineLoad.apply( editor ); // Add new instance.
- else if ( this.engineLoaded == -1 ) // We are waiting.
- return CKEDITOR.on( 'scaytReady', function(){ onEngineLoad.apply( editor );} ); // Use function(){} to avoid rejection as duplicate.
+ {
+ return onEngineLoad.apply( editor );
+ }
+ // Add new instance.
+ 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()
@@ -181,7 +383,8 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
},
this,
null,
- 0 ); // First to run.
+ 0
+ ); // First to run.
this.engineLoaded = -1; // Loading in progress.
@@ -189,34 +392,42 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
var protocol = document.location.protocol;
// Default to 'http' for unknown.
protocol = protocol.search( /https?:/) != -1? protocol : 'http:';
- var baseUrl = "svc.spellchecker.net/spellcheck/lf/scayt/scayt1.js";
+ var baseUrl = 'svc.webspellchecker.net/scayt26/loader__base.js';
- var scaytUrl = editor.config.scayt_srcUrl || ( protocol + "//" + baseUrl );
- var scaytConfigBaseUrl = plugin.parseUrl( scaytUrl ).path + "/";
+ var scaytUrl = editor.config.scayt_srcUrl || ( protocol + '//' + baseUrl );
+ var scaytConfigBaseUrl = plugin.parseUrl( scaytUrl ).path + '/';
- CKEDITOR._djScaytConfig =
+ if( window.scayt == undefined )
{
- baseUrl: scaytConfigBaseUrl,
- addOnLoad:
- [
- function()
- {
- CKEDITOR.fireOnce( "scaytReady" );
- }
- ],
- isDebug: false
- };
- // Append javascript code.
- CKEDITOR.document.getHead().append(
- CKEDITOR.document.createElement( 'script',
- {
- attributes :
- {
- type : 'text/javascript',
- src : scaytUrl
- }
- })
- );
+ CKEDITOR._djScaytConfig =
+ {
+ baseUrl: scaytConfigBaseUrl,
+ addOnLoad:
+ [
+ function()
+ {
+ CKEDITOR.fireOnce( 'scaytReady' );
+ }
+ ],
+ isDebug: false
+ };
+ // Append javascript code.
+ CKEDITOR.document.getHead().append(
+ CKEDITOR.document.createElement( 'script',
+ {
+ attributes :
+ {
+ type : 'text/javascript',
+ async : 'true',
+ src : scaytUrl
+ }
+ })
+ );
+ }
+ else
+ {
+ CKEDITOR.fireOnce( 'scaytReady' );
+ }
return null;
},
@@ -250,6 +461,8 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
var commandDefinition =
{
preserveState : true,
+ editorFocus : false,
+ canUndo : false,
exec: function( editor )
{
@@ -260,19 +473,18 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
this.setState( isEnabled ? CKEDITOR.TRISTATE_OFF : CKEDITOR.TRISTATE_ON );
var scayt_control = plugin.getScayt( editor );
+ // the place where the status of editor focus should be restored
+ // after there will be ability to store its state before SCAYT button click
+ // if (storedFocusState is focused )
+ // scayt_control.focus();
+ //
+ // now focus is set certainly
+ scayt_control.focus();
scayt_control.setDisabled( isEnabled );
}
else if ( !editor.config.scayt_autoStartup && plugin.engineLoaded >= 0 ) // Load first time
{
this.setState( CKEDITOR.TRISTATE_DISABLED );
-
- editor.on( 'showScaytState', function()
- {
- this.removeListener();
- this.setState( plugin.isScaytEnabled( editor ) ? CKEDITOR.TRISTATE_ON : CKEDITOR.TRISTATE_OFF );
- },
- this);
-
plugin.loadEngine( editor );
}
}
@@ -285,14 +497,42 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
beforeInit : function( editor )
{
- // Register own rbc menu group.
- editor.config.menu_groups = 'scayt_suggest,scayt_moresuggest,scayt_control,' + editor.config.menu_groups;
+ var items_order = editor.config.scayt_contextMenuItemsOrder
+ || 'suggest|moresuggest|control',
+ items_order_str = "";
+
+ items_order = items_order.split( '|' );
+
+ if ( items_order && items_order.length )
+ {
+ for ( var pos = 0 ; pos < items_order.length ; pos++ )
+ items_order_str += 'scayt_' + items_order[ pos ] + ( items_order.length != parseInt( pos, 10 ) + 1 ? ',' : '' );
+ }
+
+ // Put it on top of all context menu items (#5717)
+ editor.config.menu_groups = items_order_str + ',' + editor.config.menu_groups;
},
init : function( editor )
{
- var moreSuggestions = {};
- var mainSuggestions = {};
+ // Delete span[data-scaytid] when text pasting in editor (#6921)
+ var dataFilter = editor.dataProcessor && editor.dataProcessor.dataFilter;
+ var dataFilterRules =
+ {
+ elements :
+ {
+ span : function( element )
+ {
+ var attrs = element.attributes;
+ if ( attrs && attrs[ 'data-scaytid' ] )
+ delete element.name;
+ }
+ }
+ };
+ dataFilter && dataFilter.addRules( dataFilterRules );
+
+ var moreSuggestions = {},
+ mainSuggestions = {};
// Scayt command.
var command = editor.addCommand( commandName, commandDefinition );
@@ -300,75 +540,99 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
// Add Options dialog.
CKEDITOR.dialog.add( commandName, CKEDITOR.getUrl( this.path + 'dialogs/options.js' ) );
+ var uiTabs = plugin.getUiTabs( editor );
+
var menuGroup = 'scaytButton';
editor.addMenuGroup( menuGroup );
- editor.addMenuItems(
+ // combine menu items to render
+ var uiMenuItems = {};
+
+ var lang = editor.lang.scayt;
+
+ // always added
+ uiMenuItems.scaytToggle =
{
- scaytToggle :
- {
- label : editor.lang.scayt.enable,
- command : commandName,
- group : menuGroup
- },
+ label : lang.enable,
+ command : commandName,
+ group : menuGroup
+ };
- scaytOptions :
+ if ( uiTabs[0] == 1 )
+ uiMenuItems.scaytOptions =
+ {
+ label : lang.options,
+ group : menuGroup,
+ onClick : function()
{
- label : editor.lang.scayt.options,
- group : menuGroup,
- onClick : function()
- {
- openPage = 'options';
- editor.openDialog( commandName );
- }
- },
+ openPage = 'options';
+ editor.openDialog( commandName );
+ }
+ };
- scaytLangs :
+ if ( uiTabs[1] == 1 )
+ uiMenuItems.scaytLangs =
+ {
+ label : lang.langs,
+ group : menuGroup,
+ onClick : function()
{
- label : editor.lang.scayt.langs,
- group : menuGroup,
- onClick : function()
- {
- openPage = 'langs';
- editor.openDialog( commandName );
- }
- },
-
- scaytAbout :
+ openPage = 'langs';
+ editor.openDialog( commandName );
+ }
+ };
+ if ( uiTabs[2] == 1 )
+ uiMenuItems.scaytDict =
+ {
+ label : lang.dictionariesTab,
+ group : menuGroup,
+ onClick : function()
{
- label : editor.lang.scayt.about,
- group : menuGroup,
- onClick : function()
- {
- openPage = 'about';
- editor.openDialog( commandName );
- }
+ openPage = 'dictionaries';
+ editor.openDialog( commandName );
}
- });
+ };
+ // always added
+ uiMenuItems.scaytAbout =
+ {
+ label : editor.lang.scayt.about,
+ group : menuGroup,
+ onClick : function()
+ {
+ openPage = 'about';
+ editor.openDialog( commandName );
+ }
+ };
+
+ editor.addMenuItems( uiMenuItems );
editor.ui.add( 'Scayt', CKEDITOR.UI_MENUBUTTON,
{
- label : editor.lang.scayt.title,
- title : editor.lang.scayt.title,
+ label : lang.title,
+ title : CKEDITOR.env.opera ? lang.opera_title : lang.title,
className : 'cke_button_scayt',
+ modes : { wysiwyg : 1 },
onRender: function()
{
- command.on( 'state', function()
+ command.on( 'state', function()
{
this.setState( command.state );
},
this);
- },
- onMenu : function()
- {
- var isEnabled = plugin.isScaytEnabled( editor );
+ },
+ onMenu : function()
+ {
+ var isEnabled = plugin.isScaytEnabled( editor );
- editor.getMenuItem( 'scaytToggle' ).label = editor.lang.scayt[ isEnabled ? 'disable' : 'enable' ];
+ editor.getMenuItem( 'scaytToggle' ).label = lang[ isEnabled ? 'disable' : 'enable' ];
+
+ var uiTabs = plugin.getUiTabs( editor );
return {
- scaytToggle : CKEDITOR.TRISTATE_OFF,
- scaytOptions : isEnabled ? CKEDITOR.TRISTATE_OFF : CKEDITOR.TRISTATE_DISABLED,
- scaytLangs : isEnabled ? CKEDITOR.TRISTATE_OFF : CKEDITOR.TRISTATE_DISABLED,
- scaytAbout : isEnabled ? CKEDITOR.TRISTATE_OFF : CKEDITOR.TRISTATE_DISABLED
+ scaytToggle : CKEDITOR.TRISTATE_OFF,
+ scaytOptions : isEnabled && uiTabs[0] ? CKEDITOR.TRISTATE_OFF : CKEDITOR.TRISTATE_DISABLED,
+ scaytLangs : isEnabled && uiTabs[1] ? CKEDITOR.TRISTATE_OFF : CKEDITOR.TRISTATE_DISABLED,
+ scaytDict : isEnabled && uiTabs[2] ? CKEDITOR.TRISTATE_OFF : CKEDITOR.TRISTATE_DISABLED,
+ scaytAbout : isEnabled && uiTabs[3] ? CKEDITOR.TRISTATE_OFF : CKEDITOR.TRISTATE_DISABLED
};
}
});
@@ -376,69 +640,82 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
// If the "contextmenu" plugin is loaded, register the listeners.
if ( editor.contextMenu && editor.addMenuItems )
{
- editor.contextMenu.addListener( function( element )
+ editor.contextMenu.addListener( function( element, selection )
{
- if ( !( plugin.isScaytEnabled( editor ) && element ) )
+ if ( !plugin.isScaytEnabled( editor )
+ || selection.getRanges()[ 0 ].checkReadOnly() )
return null;
var scayt_control = plugin.getScayt( editor ),
- word = scayt_control.getWord( element.$ );
+ node = scayt_control.getScaytNode();
+
+ if ( !node )
+ return null;
+
+ var word = scayt_control.getWord( node );
if ( !word )
return null;
var sLang = scayt_control.getLang(),
- _r = {},
items_suggestion = window.scayt.getSuggestion( word, sLang );
- if (!items_suggestion || !items_suggestion.length )
- return null;
// Remove unused commands and menuitems
- for ( i in moreSuggestions )
+ for ( var m in moreSuggestions )
{
- delete editor._.menuItems[ i ];
- delete editor._.commands[ i ];
+ delete editor._.menuItems[ m ];
+ delete editor._.commands[ m ];
}
- for ( i in mainSuggestions )
+ for ( m in mainSuggestions )
{
- delete editor._.menuItems[ i ];
- delete editor._.commands[ i ];
+ delete editor._.menuItems[ m ];
+ delete editor._.commands[ m ];
}
moreSuggestions = {}; // Reset items.
mainSuggestions = {};
- var moreSuggestionsUnable = false;
+ var moreSuggestionsUnable = editor.config.scayt_moreSuggestions || 'on';
+ var moreSuggestionsUnableAdded = false;
- for ( var i = 0, l = items_suggestion.length; i < l; i += 1 )
- {
- var commandName = 'scayt_suggestion_' + items_suggestion[i].replace( ' ', '_' );
- var exec = ( function( el, s )
- {
- return {
- exec: function()
- {
- scayt_control.replace(el, s);
- }
- };
- })( element.$, items_suggestion[i] );
-
- if ( i < editor.config.scayt_maxSuggestions )
+ var maxSuggestions = editor.config.scayt_maxSuggestions;
+ ( typeof maxSuggestions != 'number' ) && ( maxSuggestions = 5 );
+ !maxSuggestions && ( maxSuggestions = items_suggestion.length );
+
+ var contextCommands = editor.config.scayt_contextCommands || 'all';
+ contextCommands = contextCommands.split( '|' );
+
+ if ( items_suggestion && items_suggestion.length ) {
+ for ( var i = 0, l = items_suggestion.length; i < l; i += 1 )
{
- addButtonCommand( editor, 'button_' + commandName, items_suggestion[i],
- commandName, exec, 'scayt_suggest', i + 1 );
- _r[ commandName ] = CKEDITOR.TRISTATE_OFF;
- mainSuggestions[ commandName ] = CKEDITOR.TRISTATE_OFF;
+ var commandName = 'scayt_suggestion_' + items_suggestion[i].replace( ' ', '_' );
+ var exec = ( function( el, s )
+ {
+ return {
+ exec: function()
+ {
+ scayt_control.replace(el, s);
+ }
+ };
+ })( node, items_suggestion[i] );
+
+ if ( i < maxSuggestions )
+ {
+ addButtonCommand( editor, 'button_' + commandName, items_suggestion[i],
+ commandName, exec, 'scayt_suggest', i + 1 );
+ mainSuggestions[ commandName ] = CKEDITOR.TRISTATE_OFF;
+ }
+ else if ( moreSuggestionsUnable == 'on' )
+ {
+ addButtonCommand( editor, 'button_' + commandName, items_suggestion[i],
+ commandName, exec, 'scayt_moresuggest', i + 1 );
+ moreSuggestions[ commandName ] = CKEDITOR.TRISTATE_OFF;
+ moreSuggestionsUnableAdded = true;
+ }
}
- else
+
+ if ( moreSuggestionsUnableAdded )
{
- addButtonCommand( editor, 'button_' + commandName, items_suggestion[i],
- commandName, exec, 'scayt_moresuggest', i + 1 );
- moreSuggestions[ commandName ] = CKEDITOR.TRISTATE_OFF;
- moreSuggestionsUnable = true;
- }
- }
- if ( moreSuggestionsUnable )
- // Rgister the More suggestions group;
- editor.addMenuItem( 'scayt_moresuggest',
+ // Register the More suggestions group;
+ editor.addMenuItem( 'scayt_moresuggest',
{
label : editor.lang.scayt.moreSuggestions,
group : 'scayt_moresuggest',
@@ -448,41 +725,52 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
return moreSuggestions;
}
});
-
-
- var ignore_command =
- {
- exec: function()
- {
- scayt_control.ignore( element.$ );
+ mainSuggestions[ 'scayt_moresuggest' ] = CKEDITOR.TRISTATE_OFF;
}
- };
- var ignore_all_command =
- {
- exec: function()
+ }
+ else {
+ // "No suggestions" feature
+ editor.addMenuItem( 'scayt_nosuggest',
{
- scayt_control.ignoreAll( element.$ );
- }
- };
- var addword_command =
+ label : editor.lang.scayt.noSuggestions ? editor.lang.scayt.noSuggestions : (editor.lang.spellCheck.noSuggestions ? editor.lang.spellCheck.noSuggestions : 'No suggestions'),
+ group : 'scayt_suggest',
+ order : 1
+ });
+ mainSuggestions[ 'scayt_nosuggest' ] = CKEDITOR.TRISTATE_OFF;
+ }
+
+ if ( in_array( 'all', contextCommands ) || in_array( 'ignore', contextCommands) )
{
- exec: function()
- {
- window.scayt.addWordToUserDictionary( element.$ );
- }
- };
+ var ignore_command = {
+ exec: function(){
+ scayt_control.ignore( node );
+ }
+ };
+ addButtonCommand( editor, 'ignore', lang.ignore, 'scayt_ignore', ignore_command, 'scayt_control', 1 );
+ mainSuggestions[ 'scayt_ignore' ] = CKEDITOR.TRISTATE_OFF;
+ }
- addButtonCommand( editor, 'ignore', editor.lang.scayt.ignore,
- 'scayt_ignore', ignore_command, 'scayt_control', 1);
- addButtonCommand( editor, 'ignore_all', editor.lang.scayt.ignoreAll,
- 'scayt_ignore_all', ignore_all_command, 'scayt_control', 2);
- addButtonCommand( editor, 'add_word', editor.lang.scayt.addWord,
- 'scayt_add_word', addword_command, 'scayt_control', 3);
+ if ( in_array( 'all', contextCommands ) || in_array( 'ignoreall', contextCommands ) )
+ {
+ var ignore_all_command = {
+ exec: function(){
+ scayt_control.ignoreAll( node );
+ }
+ };
+ addButtonCommand(editor, 'ignore_all', lang.ignoreAll, 'scayt_ignore_all', ignore_all_command, 'scayt_control', 2);
+ mainSuggestions['scayt_ignore_all'] = CKEDITOR.TRISTATE_OFF;
+ }
- mainSuggestions[ 'scayt_moresuggest' ] = CKEDITOR.TRISTATE_OFF;
- mainSuggestions[ 'scayt_ignore' ] = CKEDITOR.TRISTATE_OFF;
- mainSuggestions[ 'scayt_ignore_all' ] = CKEDITOR.TRISTATE_OFF;
- mainSuggestions[ 'scayt_add_word' ] = CKEDITOR.TRISTATE_OFF;
+ if ( in_array( 'all', contextCommands ) || in_array( 'add', contextCommands ) )
+ {
+ var addword_command = {
+ exec: function(){
+ window.scayt.addWordToUserDictionary( node );
+ }
+ };
+ addButtonCommand(editor, 'add_word', lang.addWord, 'scayt_add_word', addword_command, 'scayt_control', 3);
+ mainSuggestions['scayt_add_word'] = CKEDITOR.TRISTATE_OFF;
+ }
if ( scayt_control.fireOnContextMenu )
scayt_control.fireOnContextMenu( editor );
@@ -491,21 +779,203 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
});
}
- // Start plugin
- if ( editor.config.scayt_autoStartup )
- {
- var showInitialState = function()
+ var showInitialState = function()
{
editor.removeListener( 'showScaytState', showInitialState );
- command.setState( plugin.isScaytEnabled( editor ) ? CKEDITOR.TRISTATE_ON : CKEDITOR.TRISTATE_OFF );
+
+ if ( !CKEDITOR.env.opera && !CKEDITOR.env.air )
+ command.setState( plugin.isScaytEnabled( editor ) ? CKEDITOR.TRISTATE_ON : CKEDITOR.TRISTATE_OFF );
+ else
+ command.setState( CKEDITOR.TRISTATE_DISABLED );
};
- editor.on( 'showScaytState', showInitialState );
- plugin.loadEngine( editor );
+ editor.on( 'showScaytState', showInitialState );
+
+ if ( CKEDITOR.env.opera || CKEDITOR.env.air )
+ {
+ editor.on( 'instanceReady', function()
+ {
+ showInitialState();
+ });
+ }
+
+ // Start plugin
+ if ( editor.config.scayt_autoStartup )
+ {
+ editor.on( 'instanceReady', function()
+ {
+ plugin.loadEngine( editor );
+ });
}
+ },
+
+ afterInit : function( editor )
+ {
+ // Prevent word marker line from displaying in elements path and been removed when cleaning format. (#3570) (#4125)
+ var elementsPathFilters,
+ scaytFilter = function( element )
+ {
+ if ( element.hasAttribute( 'data-scaytid' ) )
+ return false;
+ };
+
+ if ( editor._.elementsPath && ( elementsPathFilters = editor._.elementsPath.filters ) )
+ elementsPathFilters.push( scaytFilter );
+
+ editor.addRemoveFormatFilter && editor.addRemoveFormatFilter( scaytFilter );
+
}
});
})();
-CKEDITOR.config.scayt_maxSuggestions = 5;
-CKEDITOR.config.scayt_autoStartup = false;
+/**
+ * If enabled (set to true
), turns on SCAYT automatically
+ * after loading the editor.
+ * @name CKEDITOR.config.scayt_autoStartup
+ * @type Boolean
+ * @default false
+ * @example
+ * config.scayt_autoStartup = true;
+ */
+
+/**
+ * Defines the number of SCAYT suggestions to show in the main context menu.
+ * Possible values are:
+ *
0
(zero) – All suggestions are displayed in the main context menu.5
+ * @example
+ * // Display only three suggestions in the main context menu.
+ * config.scayt_maxSuggestions = 3;
+ * @example
+ * // Do not show the suggestions directly.
+ * config.scayt_maxSuggestions = -1;
+ */
+
+/**
+ * Sets the customer ID for SCAYT. Required for migration from free,
+ * ad-supported version to paid, ad-free version.
+ * @name CKEDITOR.config.scayt_customerid
+ * @type String
+ * @default ''
+ * @example
+ * // Load SCAYT using my customer ID.
+ * config.scayt_customerid = 'your-encrypted-customer-id';
+ */
+
+/**
+ * Enables/disables the "More Suggestions" sub-menu in the context menu.
+ * Possible values are on
and off
.
+ * @name CKEDITOR.config.scayt_moreSuggestions
+ * @type String
+ * @default 'on'
+ * @example
+ * // Disables the "More Suggestions" sub-menu.
+ * config.scayt_moreSuggestions = 'off';
+ */
+
+/**
+ * Customizes the display of SCAYT context menu commands ("Add Word", "Ignore"
+ * and "Ignore All"). This must be a string with one or more of the following
+ * words separated by a pipe character ("|"):
+ * off
– disables all options.all
– enables all options.ignore
– enables the "Ignore" option.ignoreall
– enables the "Ignore All" option.add
– enables the "Add Word" option.'all'
+ * @example
+ * // Show only "Add Word" and "Ignore All" in the context menu.
+ * config.scayt_contextCommands = 'add|ignoreall';
+ */
+
+/**
+ * Sets the default spell checking language for SCAYT. Possible values are:
+ * en_US
, en_GB
, pt_BR
, da_DK
,
+ * nl_NL
, en_CA
, fi_FI
, fr_FR
,
+ * fr_CA
, de_DE
, el_GR
, it_IT
,
+ * nb_NO
, pt_PT
, es_ES
, sv_SE
.
+ * @name CKEDITOR.config.scayt_sLang
+ * @type String
+ * @default 'en_US'
+ * @example
+ * // Sets SCAYT to German.
+ * config.scayt_sLang = 'de_DE';
+ */
+
+/**
+ * Sets the visibility of particular tabs in the SCAYT dialog window and toolbar
+ * button. This setting must contain a 1
(enabled) or 0
+ * (disabled) value for each of the following entries, in this precise order,
+ * separated by a comma (","): "Options", "Languages", and "Dictionary".
+ * @name CKEDITOR.config.scayt_uiTabs
+ * @type String
+ * @default '1,1,1'
+ * @example
+ * // Hides the "Languages" tab.
+ * config.scayt_uiTabs = '1,0,1';
+ */
+
+
+/**
+ * Sets the URL to SCAYT core. Required to switch to the licensed version of SCAYT application.
+ * Further details available at
+ *
+ * http://wiki.webspellchecker.net/doku.php?id=migration:hosredfreetolicensedck.
+ * @name CKEDITOR.config.scayt_srcUrl
+ * @type String
+ * @default ''
+ * @example
+ * config.scayt_srcUrl = "http://my-host/spellcheck/lf/scayt/scayt.js";
+ */
+
+/**
+ * Links SCAYT to custom dictionaries. This is a string containing dictionary IDs
+ * separared by commas (","). Available only for the licensed version.
+ * Further details at
+ *
+ * http://wiki.webspellchecker.net/doku.php?id=installationandconfiguration:customdictionaries:licensed.
+ * @name CKEDITOR.config.scayt_customDictionaryIds
+ * @type String
+ * @default ''
+ * @example
+ * config.scayt_customDictionaryIds = '3021,3456,3478"';
+ */
+
+/**
+ * Makes it possible to activate a custom dictionary in SCAYT. The user
+ * dictionary name must be used. Available only for the licensed version.
+ * @name CKEDITOR.config.scayt_userDictionaryName
+ * @type String
+ * @default ''
+ * @example
+ * config.scayt_userDictionaryName = 'MyDictionary';
+ */
+
+/**
+ * Defines the order SCAYT context menu items by groups.
+ * This must be a string with one or more of the following
+ * words separated by a pipe character ("|"):
+ * suggest
– main suggestion word list,moresuggest
– more suggestions word list,control
– SCAYT commands, such as "Ignore" and "Add Word".'suggest|moresuggest|control'
+ * @example
+ * config.scayt_contextMenuItemsOrder = 'moresuggest|control|suggest';
+ */