Ticket #5425: 5425.patch

_source/lang/en.js

@@ -657 +657 @@
         scayt :
         {
                 title                   : 'Spell Check As You Type',
+                opera_title             : 'Not supported by Opera',
                 enable                  : 'Enable SCAYT',
                 disable                 : 'Disable SCAYT',
                 about                   : 'About SCAYT',
@@ -668 +669 @@
                 ignoreAll               : 'Ignore All',
                 addWord                 : 'Add Word',
                 emptyDic                : 'Dictionary name should not be empty.',
+                
                 optionsTab              : 'Options',
+                allCaps                 : 'Ignore All-Caps Words',
+                ignoreDomainNames : 'Ignore Domain Names',
+                mixedCase               : 'Ignore Words with Mixed Case',
+                mixedWithDigits : 'Ignore Words with Numbers',
+                
                 languagesTab    : 'Languages',
+                
                 dictionariesTab : 'Dictionaries',
+                dic_field_name  : 'Dictionary name',
+                dic_create              : 'Create',
+                dic_restore             : 'Restore',
+                dic_delete              : 'Delete',
+                dic_rename              : 'Rename',
+                dic_info                : 'Initially the User Dictionary is stored in a Cookie. However, Cookies are limited in size. When the User Dictionary grows to a point where it cannot be stored in a Cookie, then the dictionary may be stored on our server. To store your personal dictionary on our server you should specify a name for your dictionary. If you already have a stored dictionary, please type it\'s name and click the Restore button.',
+                
                 aboutTab                : 'About'
         },
 

_source/plugins/scayt/plugin.js

@@ -10 +10 @@
 
 (function()
 {
+        
         var commandName         = 'scaytcheck',
                 openPage                = '',
                 scayt_paused    = null,
@@ -231 +232 @@
                 {
                         // SCAYT doesn't work with Opera.
                         if ( CKEDITOR.env.opera )
-                                return;
+                                return editor.fire( 'showScaytState' );
                         if ( this.engineLoaded === true )
                                 return onEngineLoad.apply( editor );    // Add new instance.
                         else if ( this.engineLoaded == -1 )                     // We are waiting.
@@ -330 +331 @@
                         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 );
                         }
                 }
@@ -358 +351 @@
                 {
                         var moreSuggestions = {};
                         var mainSuggestions = {};
-
+                        
                         // Scayt command.
                         var command = editor.addCommand( commandName, commandDefinition );
 
@@ -444 +437 @@
                                 editor.ui.add( 'Scayt', CKEDITOR.UI_MENUBUTTON,
                                         {
                                                 label : editor.lang.scayt.title,
-                                                title : editor.lang.scayt.title,
+                                                title : CKEDITOR.env.opera ? editor.lang.scayt.opera_title : editor.lang.scayt.title,
                                                 className : 'cke_button_scayt',
                                                 onRender: function()
                                                 {
@@ -459 +452 @@
                                                         var isEnabled = plugin.isScaytEnabled( editor );
 
                                                         editor.getMenuItem( 'scaytToggle' ).label = editor.lang.scayt[ isEnabled ? 'disable' : 'enable' ];
-
+                                                        
                                                         return {
                                                                 scaytToggle  : CKEDITOR.TRISTATE_OFF,
                                                                 scaytOptions : isEnabled && plugin.uiTabs[0] ? CKEDITOR.TRISTATE_OFF : CKEDITOR.TRISTATE_DISABLED,
@@ -602 +595 @@
                                                 return mainSuggestions;
                                         });
                         }
-
-                        // 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) 
+                                                command.setState(plugin.isScaytEnabled(editor) ? CKEDITOR.TRISTATE_ON : CKEDITOR.TRISTATE_OFF);
+                                        else 
+                                                command.setState(CKEDITOR.TRISTATE_DISABLED)
                                 };
-                                editor.on( 'showScaytState', showInitialState );
+                        
+                        editor.on( 'showScaytState', showInitialState );
+                        if (CKEDITOR.env.opera)
                                 editor.on( 'instanceReady', function()
+                                        {
+                                                showInitialState();
+                                        });
+                                
+                        // Start plugin
+                        if ( editor.config.scayt_autoStartup )
+                        {
+                                editor.on( 'instanceReady', function()
                                 {
                                         plugin.loadEngine( editor );
                                 });
                         }
+                        
 
                         // Prevent word marker line from displaying in elements path. (#3570)
                         var elementsPathFilters;