X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=_source%2Fplugins%2Fscayt%2Fplugin.js;h=b789c5bc7ca0df14822655e13304628a4badd372;hb=614511639979907ceb0da3614122a4d8eb963ad4;hp=2076207b0136532a64e975c22bd62bf2d44421e8;hpb=8665a7c6c60586526e32e8941fe2896739b6ebfb;p=ckeditor.git

diff --git a/_source/plugins/scayt/plugin.js b/_source/plugins/scayt/plugin.js
index 2076207..b789c5b 100644
--- a/_source/plugins/scayt/plugin.js
+++ b/_source/plugins/scayt/plugin.js
@@ -10,18 +10,19 @@ 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)
+	function in_array( needle, haystack )
 	{
-		var found = false, key;
-		for (key in haystack)
+		var found = 0,
+			key;
+		for ( key in haystack )
 		{
-			if ((haystack[key] === needle) || ( haystack[key] == needle))
+			if ( haystack[ key ] == needle )
 			{
-				found = true;
+				found = 1;
 				break;
 			}
 		}
@@ -34,16 +35,17 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
 
 		var createInstance = function()	// Create new instance every time Document is created.
 		{
+			var config = editor.config;
 			// Initialise Scayt instance.
 			var oParams = {};
 			// Get the iframe.
 			oParams.srcNodeRef = editor.document.getWindow().$.frameElement;
 			// syntax : AppName.AppVersion@AppRevision
 			oParams.assocApp  = 'CKEDITOR.' + CKEDITOR.version + '@' + CKEDITOR.revision;
-			oParams.customerid = editor.config.scayt_customerid  || '1:WvF0D4-UtPqN1-43nkD4-NKvUm2-daQqk3-LmNiI-z7Ysb4-mwry24-T8YrS3-Q2tpq2';
-			oParams.customDictionaryIds = editor.config.scayt_customDictionaryIds || '';
-			oParams.userDictionaryName = editor.config.scayt_userDictionaryName || '';
-			oParams.sLang = editor.config.scayt_sLang || 'en_US';
+			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()
@@ -62,20 +64,18 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
 			oParams.onBeforeChange = function()
 			{
 				if ( plugin.getScayt( editor ) && !editor.checkDirty() )
-					setTimeout( function(){ editor.resetDirty(); } );
+					setTimeout( function(){ editor.resetDirty(); }, 0 );
 			};
 
 			var scayt_custom_params = window.scayt_custom_params;
-			if ( typeof scayt_custom_params == 'object')
+			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);
+			if ( plugin.getControlId( editor ) )
+				oParams.id = plugin.getControlId( editor );
 
 			var scayt_control = new window.scayt( oParams );
 
@@ -85,7 +85,7 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
 			} );
 
 			// Copy config.
-			var	lastInstance = plugin.instances[ editor.name ];
+			var lastInstance = plugin.instances[ editor.name ];
 			if ( lastInstance )
 			{
 				scayt_control.sLang = lastInstance.sLang;
@@ -100,7 +100,7 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
 			var uiTabs = window.scayt.uiTags;
 			var fTabs  = [];
 
-			for (var i = 0,l=4; i<l; i++)
+			for ( var i = 0, l=4; i < l; i++ )
 			    fTabs.push( uiTabs[i] && plugin.uiTabs[i] );
 
 			plugin.uiTabs = fTabs;
@@ -132,7 +132,7 @@ 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' )
+				if ( ( ev.data.name == 'source' || ev.data.name == 'newpage' ) && editor.mode == 'wysiwyg' )
 				{
 					var scayt_instance = plugin.getScayt( editor );
 					if ( scayt_instance )
@@ -244,7 +244,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;
@@ -257,7 +258,7 @@ 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 )
+		undoImagePrototype.equals = CKEDITOR.tools.override( undoImagePrototype.equals, function( org )
 		{
 			return function( otherImage )
 			{
@@ -298,7 +299,7 @@ CKEDITOR.plugins.scayt =
 			for ( var infoOpt in o )
 				this.controlInfo[ editor.name ][ infoOpt ] = o[ infoOpt ];
 		},
-		isControlRestored : function ( editor )
+		isControlRestored : function( editor )
 		{
 			if ( editor &&
 					editor.name &&
@@ -308,15 +309,15 @@ CKEDITOR.plugins.scayt =
 			}
 			return false;
 		},
-		markControlRestore : function ( editor )
+		markControlRestore : function( editor )
 		{
-			this.setControlInfo( editor,{ restored:true } );
+			this.setControlInfo( editor, { restored:true } );
 		},
-		setControlId: function (editor, id)
+		setControlId: function( editor, id )
 		{
-			this.setControlInfo( editor,{ id:id } );
+			this.setControlInfo( editor, { id:id } );
 		},
-		getControlId: function (editor)
+		getControlId: function( editor )
 		{
 			if ( editor &&
 					editor.name &&
@@ -327,17 +328,17 @@ CKEDITOR.plugins.scayt =
 			}
 			return null;
 		},
-		setPaused: function ( editor , bool )
+		setPaused: function( editor , bool )
 		{
-			this.setControlInfo( editor,{ paused:bool } );
+			this.setControlInfo( editor, { paused:bool } );
 		},
-		isPaused: function (editor)
+		isPaused: function( editor )
 		{
 			if ( editor &&
 					editor.name &&
 					this.controlInfo[editor.name] )
 			{
-				return this.controlInfo[editor.name].paused ;
+				return this.controlInfo[editor.name].paused;
 			}
 			return undefined;
 		},
@@ -357,8 +358,8 @@ CKEDITOR.plugins.scayt =
 		},
 		loadEngine : function( editor )
 		{
-			// SCAYT doesn't work with Opera.
-			if ( CKEDITOR.env.opera )
+			// SCAYT doesn't work with Firefox2, Opera.
+			if ( CKEDITOR.env.gecko && CKEDITOR.env.version < 10900 || CKEDITOR.env.opera )
 				return editor.fire( 'showScaytState' );
 
 			if ( this.engineLoaded === true )
@@ -382,7 +383,7 @@ CKEDITOR.plugins.scayt =
 			var protocol = document.location.protocol;
 			// Default to 'http' for unknown.
 			protocol = protocol.search( /https?:/) != -1? protocol : 'http:';
-			var baseUrl  = 'svc.spellchecker.net/spellcheck31/lf/scayt24/loader__base.js';
+			var baseUrl  = 'svc.spellchecker.net/scayt26/loader__base.js';
 
 			var scaytUrl  =  editor.config.scayt_srcUrl || ( protocol + '//' + baseUrl );
 			var scaytConfigBaseUrl =  plugin.parseUrl( scaytUrl ).path +  '/';
@@ -408,6 +409,7 @@ CKEDITOR.plugins.scayt =
 							attributes :
 								{
 									type : 'text/javascript',
+									async : 'true',
 									src : scaytUrl
 								}
 						})
@@ -449,12 +451,10 @@ CKEDITOR.plugins.scayt =
 	{
 		preserveState : true,
 		editorFocus : false,
+		canUndo : false,
 
 		exec: function( editor )
 		{
-			var autoStartup = editor.config.scayt_autoStartup;
-			autoStartup = ( autoStartup == undefined ) || autoStartup;
-
 			if ( plugin.isScaytReady( editor ) )
 			{
 				var isEnabled = plugin.isScaytEnabled( editor );
@@ -468,10 +468,10 @@ CKEDITOR.plugins.scayt =
 				//   scayt_control.focus();
 				//
 				// now focus is set certainly
-				scayt_control.focus( );
+				scayt_control.focus();
 				scayt_control.setDisabled( isEnabled );
 			}
-			else if ( !autoStartup && plugin.engineLoaded >= 0 )	// Load first time
+			else if ( !editor.config.scayt_autoStartup && plugin.engineLoaded >= 0 )	// Load first time
 			{
 				this.setState( CKEDITOR.TRISTATE_DISABLED );
 				plugin.loadEngine( editor );
@@ -494,23 +494,18 @@ CKEDITOR.plugins.scayt =
 
 			if ( items_order && items_order.length )
 			{
-				for ( var pos in items_order )
+				for ( var pos = 0 ; pos < items_order.length ; pos++ )
 					items_order_str += 'scayt_' + items_order[ pos ] + ( items_order.length != parseInt( pos, 10 ) + 1 ? ',' : '' );
 			}
 
-			// Register scayt rbc menu group.
-			if ( editor.config.scayt_contextMenuOntop )
-				// Put it on top of all context menu items
-				editor.config.menu_groups =  items_order_str + ',' + editor.config.menu_groups;
-			else
-				// Put it down
-				editor.config.menu_groups = editor.config.menu_groups + ',' +items_order_str;
+			// 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 = {};
+			var moreSuggestions = {},
+				mainSuggestions = {};
 
 			// Scayt command.
 			var command = editor.addCommand( commandName, commandDefinition );
@@ -523,9 +518,9 @@ CKEDITOR.plugins.scayt =
 			// string to array convert
 			confuiTabs = confuiTabs.split( ',' );
 			// check array length ! always must be 3 filled with 1 or 0
-			for (var i=0,l=3; i<l; i++)
+			for ( var i=0, l=3; i < l; i++ )
 			{
-				var flag = parseInt(confuiTabs[i] || '1' ,10);
+				var flag = parseInt( confuiTabs[i] || '1', 10 );
 				uiTabs.push( flag );
 			}
 
@@ -534,18 +529,20 @@ CKEDITOR.plugins.scayt =
 			// combine menu items to render
 			var uiMuneItems = {};
 
+			var lang = editor.lang.scayt;
+
 			// always added
 			uiMuneItems.scaytToggle =
 				{
-					label : editor.lang.scayt.enable,
+					label : lang.enable,
 					command : commandName,
 					group : menuGroup
 				};
 
-			if (uiTabs[0] == 1)
+			if ( uiTabs[0] == 1 )
 				uiMuneItems.scaytOptions =
 				{
-					label : editor.lang.scayt.options,
+					label : lang.options,
 					group : menuGroup,
 					onClick : function()
 					{
@@ -554,10 +551,10 @@ CKEDITOR.plugins.scayt =
 					}
 				};
 
-			if (uiTabs[1] == 1)
+			if ( uiTabs[1] == 1 )
 				uiMuneItems.scaytLangs =
 				{
-					label : editor.lang.scayt.langs,
+					label : lang.langs,
 					group : menuGroup,
 					onClick : function()
 					{
@@ -565,10 +562,10 @@ CKEDITOR.plugins.scayt =
 						editor.openDialog( commandName );
 					}
 				};
-			if (uiTabs[2] == 1)
+			if ( uiTabs[2] == 1 )
 				uiMuneItems.scaytDict =
 				{
-					label : editor.lang.scayt.dictionariesTab,
+					label : lang.dictionariesTab,
 					group : menuGroup,
 					onClick : function()
 					{
@@ -586,8 +583,7 @@ CKEDITOR.plugins.scayt =
 						openPage = 'about';
 						editor.openDialog( commandName );
 					}
-				}
-			;
+				};
 
 			uiTabs[3] = 1; // about us tab is always on
 			plugin.uiTabs = uiTabs;
@@ -596,9 +592,10 @@ CKEDITOR.plugins.scayt =
 
 				editor.ui.add( 'Scayt', CKEDITOR.UI_MENUBUTTON,
 					{
-						label : editor.lang.scayt.title,
-						title : CKEDITOR.env.opera ? editor.lang.scayt.opera_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()
@@ -611,7 +608,7 @@ CKEDITOR.plugins.scayt =
 						{
 							var isEnabled = plugin.isScaytEnabled( editor );
 
-							editor.getMenuItem( 'scaytToggle' ).label = editor.lang.scayt[ isEnabled ? 'disable' : 'enable' ];
+							editor.getMenuItem( 'scaytToggle' ).label = lang[ isEnabled ? 'disable' : 'enable' ];
 
 							return {
 								scaytToggle  : CKEDITOR.TRISTATE_OFF,
@@ -626,9 +623,10 @@ CKEDITOR.plugins.scayt =
 			// If the "contextmenu" plugin is loaded, register the listeners.
 			if ( editor.contextMenu && editor.addMenuItems )
 			{
-				editor.contextMenu.addListener( function(  )
+				editor.contextMenu.addListener( function( element, selection )
 					{
-						if ( !plugin.isScaytEnabled( editor ) )
+						if ( !plugin.isScaytEnabled( editor )
+								|| selection.getCommonAncestor().isReadOnly() )
 							return null;
 
 						var scayt_control = plugin.getScayt( editor ),
@@ -679,7 +677,7 @@ CKEDITOR.plugins.scayt =
 									return {
 										exec: function()
 										{
-											scayt_control.replace(el, s);
+											scayt_control.replace( el, s );
 										}
 									};
 								})( node, items_suggestion[i] );
@@ -705,7 +703,7 @@ CKEDITOR.plugins.scayt =
 							// Register the More suggestions group;
 							editor.addMenuItem( 'scayt_moresuggest',
 							{
-								label : editor.lang.scayt.moreSuggestions,
+								label : lang.moreSuggestions,
 								group : 'scayt_moresuggest',
 								order : 10,
 								getItems : function()
@@ -723,7 +721,7 @@ CKEDITOR.plugins.scayt =
 									scayt_control.ignore( node );
 								}
 							};
-							addButtonCommand( editor, 'ignore', editor.lang.scayt.ignore, 'scayt_ignore', ignore_command, 'scayt_control', 1 );
+							addButtonCommand( editor, 'ignore', lang.ignore, 'scayt_ignore', ignore_command, 'scayt_control', 1 );
 							mainSuggestions[ 'scayt_ignore' ] = CKEDITOR.TRISTATE_OFF;
 						}
 
@@ -734,7 +732,7 @@ CKEDITOR.plugins.scayt =
 									scayt_control.ignoreAll( node );
 								}
 							};
-							addButtonCommand(editor, 'ignore_all', editor.lang.scayt.ignoreAll, 'scayt_ignore_all', ignore_all_command, 'scayt_control', 2);
+							addButtonCommand(editor, 'ignore_all', lang.ignoreAll, 'scayt_ignore_all', ignore_all_command, 'scayt_control', 2);
 							mainSuggestions['scayt_ignore_all'] = CKEDITOR.TRISTATE_OFF;
 						}
 
@@ -745,7 +743,7 @@ CKEDITOR.plugins.scayt =
 									window.scayt.addWordToUserDictionary( node );
 								}
 							};
-							addButtonCommand(editor, 'add_word', editor.lang.scayt.addWord, 'scayt_add_word', addword_command, 'scayt_control', 3);
+							addButtonCommand(editor, 'add_word', lang.addWord, 'scayt_add_word', addword_command, 'scayt_control', 3);
 							mainSuggestions['scayt_add_word'] = CKEDITOR.TRISTATE_OFF;
 						}
 
@@ -777,8 +775,7 @@ CKEDITOR.plugins.scayt =
 			}
 
 			// Start plugin
-			var autoStartup = editor.config.scayt_autoStartup;
-			if ( ( autoStartup == undefined ) || autoStartup )
+			if ( editor.config.scayt_autoStartup )
 			{
 				editor.on( 'instanceReady', function()
 				{
@@ -793,7 +790,7 @@ CKEDITOR.plugins.scayt =
 			var elementsPathFilters,
 					scaytFilter = function( element )
 					{
-						if ( element.hasAttribute( 'scaytid' ) )
+						if ( element.hasAttribute( 'data-scaytid' ) )
 							return false;
 					};
 
@@ -810,9 +807,9 @@ CKEDITOR.plugins.scayt =
  * If enabled (true), turns on SCAYT automatically after loading the editor.
  * @name CKEDITOR.config.scayt_autoStartup
  * @type Boolean
- * @default true
+ * @default false
  * @example
- * config.scayt_autoStartup = false;
+ * config.scayt_autoStartup = true;
  */
 
 /**
@@ -933,15 +930,6 @@ CKEDITOR.plugins.scayt =
  */
 
 /**
- * Makes it possible to place the SCAYT context menu items above others.
- * @name CKEDITOR.config.scayt_contextMenuOntop
- * @type Boolean
- * @default false
- * @example
- * config.scayt_contextMenuOntop = true;
- */
-
-/**
  * Define order of placing of SCAYT context menu items by groups.
  * It must be a string with one or more of the following
  * words separated by a pipe ("|"):