Ticket #4667: 4667.patch

editor/_source/internals/fckscayt.js

@@ -28 +28 @@
                                                 ? true : false ;
         var scaytEnable = false;
         var scaytReady  = false;
+        var savedID;
+        var uiTabs = [];
 
         function ScaytEngineLoad( callback )
         {
@@ -41 +43 @@
                 {
                         window.scayt = top.scayt ;
                         InitScayt() ;
-                        var ScaytCombobox =  FCKToolbarItems.LoadedItems[ 'ScaytCombobox' ] ;
-                        ScaytCombobox && ScaytCombobox.SetEnabled( scyt_control && scyt_control.disabled ) ;
                         InitSetup() ;
                 };
 
@@ -66 +66 @@
                 CKEDITOR._djScaytConfig =
                 {
                         baseUrl : scaytConfigBaseUrl,
+                        initingScayt : false, // flag, if it is set to true, SCAYT files haven't been loaded yet
+                        afterScaytInitQueue: [], // queue for loading few SCAYT instances
                         addOnLoad : function()
                         {
                                 init();
+                                CKEDITOR._djScaytConfig.initingScayt=false; // SCAYT files were already loaded, first instance initialized
+                                for ( var i = 0 ; i < CKEDITOR._djScaytConfig.afterScaytInitQueue.length ; i++ ) { // execute initializing of othe SCAYT instances in the queue
+                                        try { CKEDITOR._djScaytConfig.afterScaytInitQueue[i].call() ; }
+                                        catch(err) {}
+                                }
+                                CKEDITOR._djScaytConfig.afterScaytInitQueue=[];
                         },
                         isDebug : false
                 };
@@ -77 +85 @@
                 if ( callback )
                         scaytOnLoad.push( callback ) ;
 
+                CKEDITOR._djScaytConfig.initingScayt=true; // begin to load SCAYT files
                 DoLoadScript( scaytUrl ) ;
         }
 
@@ -110 +119 @@
                 var top = FCK.EditorWindow.parent.parent;
                 oParams.srcNodeRef                              = FCK.EditingArea.IFrame;               // Get the iframe.
                 // syntax : AppName.AppVersion@AppRevision
-                //oParams.assocApp  = "FCKEDITOR." + FCKeditorAPI.Varsion + "@" + FCKeditorAPI.VersionBuild;
-                oParams.customerid                              = FCK.Config.ScaytCustomerid ;
-                oParams.customDictionaryName    = FCK.Config.ScaytCustomDictionaryName ;
-                oParams.userDictionaryName              = FCK.Config.ScaytUserDictionaryName ;
-                oParams.defLang                                 = FCK.Config.ScaytDefLang ;
-
+                oParams.assocApp  = "FCKEDITOR." + FCKeditorAPI.Version + "@" + FCKeditorAPI.VersionBuild;
+                oParams.customerid                              = FCK.Config.ScaytCustomerid || '1:WvF0D4-UtPqN1-43nkD4-NKvUm2-daQqk3-LmNiI-z7Ysb4-mwry24-T8YrS3-Q2tpq2';
+                oParams.userDictionaryName              = FCK.Config.ScaytUserDictionaryName || '';
+                oParams.customDictionaryIds     = FCK.Config.ScaytCustomDictionaryIds || '';
+                oParams.sLang                               = FCK.Config.ScaytsLang || FCK.Config.ScaytDefLang ;
+                
+                if (savedID) {   // Create a scayt_control with id specified if we already have one
+                        oParams.id = savedID;
+                        savedID = "";
+                }
+                
                 var scayt = top.scayt;
                 var scayt_control = window.scayt_control = new scayt( oParams ) ;
         }
@@ -126 +140 @@
 
                 var scayt_control = window.scayt_control ;
 
-                if ( scayt_control )
+                if ( typeof scayt_control != 'undefined' )
                 {
                         scayt_control.setDisabled( false ) ;
                         scaytReady = true;
                         scaytEnable = !scayt_control.disabled ;
 
                         // set default scayt status
-                        var ScaytCombobox = FCKToolbarItems.LoadedItems[ 'ScaytCombobox' ] ;
-                        ScaytCombobox && ScaytCombobox.Enable() ;
+                        var ScaytCombobox = FCKToolbarItems.GetItem( 'SpellCheck' );
+                        ScaytCombobox && ScaytCombobox.Command.Enable() ;
                         ShowScaytState() ;
-                }
+                        
+                        for ( i=0, l = uiTabs.length; i<l ; i ++){
+                uiTabs[i] = uiTabs[i] && scayt.uiTags[i];
+            }
 
-                for ( var i = 0 ; i < scaytOnLoad.length ; i++ )
-                {
-                        try
+                        FCKScayt.scayt_ui_tabs = uiTabs;
+
+                        for ( var i = 0 ; i < scaytOnLoad.length ; i++ )
                         {
-                                scaytOnLoad[i].call( this ) ;
+                                try
+                                {
+                                        scaytOnLoad[i].call( this ) ;
+                                }
+                                catch(err)
+                                {}
                         }
-                        catch(err)
-                        {}
                 }
         }
 
@@ -162 +182 @@
                 {
                         case 'Options' :
                         case 'Langs' :
+                        case 'Dictionary' :
                         case 'About' :
                                 if ( isEngineLoaded && scaytReady && !scaytEnable )
                                 {
@@ -247 +268 @@
 
                 if ( scaytEnable )
                 {
-                        bItem.style.opacity = '1' ;
+                        setElementOpacity(bItem,1);
                         dNode.innerHTML = GetStatusLabel() ;
                 }
                 else
                 {
-                        bItem.style.opacity = '0.5' ;
+                        setElementOpacity(bItem,0.5);
                         dNode.innerHTML = GetStatusLabel() ;
                 }
         }
@@ -282 +303 @@
         ToolbarScaytComboBox.prototype.CreateItems = function()
         {
                 this._Combo.AddItem( 'Trigger', '<b>Enable SCAYT</b>' );
-                this._Combo.AddItem( 'Options', FCKLang.ScaytTitleOptions || "Options"  );
-                this._Combo.AddItem( 'Langs', FCKLang.ScaytTitleLangs || "Languages");
-                this._Combo.AddItem( 'About', FCKLang.ScaytTitleAbout || "About");
+        if (uiTabs[0])
+            this._Combo.AddItem( 'Options', FCKLang.ScaytTitleOptions || "Options"  );
+        if (uiTabs[1])
+            this._Combo.AddItem( 'Langs', FCKLang.ScaytTitleLangs || "Languages");
+        if (uiTabs[2])
+            this._Combo.AddItem( 'Dictionary', FCKLang.ScaytTitleDict || "Dictionaries");
+        this._Combo.AddItem( 'About', FCKLang.ScaytTitleAbout || "About");
         }
 
         // Label shown in the toolbar.
@@ -334 +359 @@
                         }
                 }
         }
+        
+        // functions to set opacity of an element properly in all browsers
+        function setElementOpacity(elem, nOpacity)
+        {
+          var opacityProp = getOpacityProperty();
+          
+          if (!elem || !opacityProp) return;
+          
+          if (opacityProp=="filter")  // Internet Exploder 5.5+
+          {
+                nOpacity *= 100;
+                
+                var oAlpha = elem.filters['DXImageTransform.Microsoft.alpha'] || elem.filters.alpha;
+                if (oAlpha) oAlpha.opacity = nOpacity;
+                else elem.style.filter += "progid:DXImageTransform.Microsoft.Alpha(opacity="+nOpacity+")";
+          }
+          else
+                elem.style[opacityProp] = nOpacity;
+        }
 
+        function getOpacityProperty()
+        {
+          if (typeof document.body.style.opacity == 'string') // CSS3 compliant (Moz 1.7+, Safari 1.2+, Opera 9)
+                return 'opacity';
+          else if (typeof document.body.style.MozOpacity == 'string') // Mozilla 1.6, Firefox 0.8 
+                return 'MozOpacity';
+          else if (typeof document.body.style.KhtmlOpacity == 'string') // Konqueror 3.1, Safari 1.1
+                return 'KhtmlOpacity';
+          else if (document.body.filters && navigator.appVersion.match(/MSIE ([\d.]+);/)[1]>=5.5) // Internet Exploder 5.5+
+                return 'filter';
+
+          return false;
+        }
+        
         // Register context menu listeners.
         function InitSetup()
         {
@@ -360 +418 @@
                                         if ( !suggestions || !suggestions.length )
                                                 return;
 
-                                        menu.AddSeparator() ;
-
                                         var maxSuggestions = FCK.Config.ScaytMaxSuggestions || 5 ;
                                         var suggAveCount = ( maxSuggestions == -1 ) ? suggestions.length : maxSuggestions ;
+                                        var mmode = FCK.Config.ScaytContextCommands || 'all';
+                    
+                    mmode = mmode.split("|");
+                        mmode = {
+                            all: false,
+                            off: false,
+                            asis: mmode,
+                            isin: function(s){
+                                if (this.off)
+                                    return false;
+                                if (this.all)
+                                    return true;
 
+                                return this.is(s);
+                            },
+                            is: function(s){
+                                for (var i = 0, l = this.asis.length; i < l; i++)
+                                    if (this.asis[i] == s)
+                                        return true;
+                                return false;
+                            }
+                        };
+
+                        if (mmode.is("off")) {
+                            mmode.off = true;
+                            mmode.all = false;
+                        }
+                        if (mmode.is("all")) {
+                            mmode.off = false;
+                            mmode.all = true;
+                        }
+
+                    menu.AddSeparator() ;
+                                        
                                         for ( var i = 0 ; i < suggAveCount ; i += 1 )
                                         {
                                                 if ( suggestions[i] )
@@ -376 +465 @@
                                                 }
                                         }
 
-                                        menu.AddSeparator() ;
+                                        if (mmode.off !== true) {
+                        menu.AddSeparator() ;
+                        var o = {};
+                            o.node = node;
+                            
+                        if (mmode.isin('add')) {
+                            o.action = 'Add Word';
+                            menu.AddItem( 'ScaytContext', 'Add Word', null, false, o );
+                        }
+                        if (mmode.isin('ignore')) {
+                            o.action = 'Ignore';
+                            menu.AddItem( 'ScaytContext', 'Ignore', null, false, o );
+                        }
 
-                                        menu.AddItem( 'ScaytContext', 'Ignore', null, false, { 'action' : 'Ignore', 'node' : node } );
-                                        menu.AddItem( 'ScaytContext', 'Ignore All', null, false, { 'action' : 'Ignore All', 'node' : node } );
-                                        menu.AddItem( 'ScaytContext', 'Add Word', null, false, { 'action' : 'Add Word', 'node' : node } );
+                        if (mmode.isin('ignoreall')) {
+                            o.action = 'Ignore All';
+                            menu.AddItem( 'ScaytContext', 'Ignore All', null, false, o );
+                        }
+                    }
                                         try
                                         {
                                                 if (scaytReady && scaytEnable)
@@ -405 +508 @@
                 {
                         if ( FCKConfig.SpellChecker == 'SCAYT' )
                         {
-                                if ( !isEngineLoaded && FCK.Config.ScaytAutoStartup )
-                                        ScaytEngineLoad() ;
+                                // put loading other instances of FCKeditor into a queue until all SCAYT files will be loaded and SCAYT initialized
+                                if (FCK.EditMode == FCK_EDITMODE_WYSIWYG && typeof(FCK.EditorWindow.parent.parent.window.CKEDITOR) != "undefined" && FCK.EditorWindow.parent.parent.window.CKEDITOR._djScaytConfig.initingScayt) {
+                                        FCK.EditorWindow.parent.parent.window.CKEDITOR._djScaytConfig.afterScaytInitQueue.push(function () {
+                                                if ( !isEngineLoaded && FCK.Config.ScaytAutoStartup )
+                                                        ScaytEngineLoad() ;
+                                                
+                                                if ( FCK.EditMode == FCK_EDITMODE_WYSIWYG && isEngineLoaded && scaytReady ) {
+                                                        createScaytControl();
+                                                        var scayt_control = window.scayt_control;
+                                                        var agt = navigator.userAgent.toLowerCase();
+                                                        var is_ie = ((agt.indexOf("msie") != -1) && (agt.indexOf("opera") == -1));
+                                                        if (is_ie) {
+                                                                scayt_control.disabled = !scaytEnable;
+                                                                scaytEnable = !scayt_control.disabled;
+                                                        }
+                                                        else {
+                                                                var ScaytCombobox = FCKToolbarItems.GetItem( 'SpellCheck' );
+                                                                ScaytCombobox && ScaytCombobox.Command.SetEnabled( scaytEnable ) ;
+                                                        }
+                                                }
+                                                
+                                                ShowScaytState() ;
+                                        });
+                                        return;
+                                }
+                                else {
+                                        if ( !isEngineLoaded && FCK.Config.ScaytAutoStartup )
+                                                ScaytEngineLoad() ;
+                                        
+                                        if ( FCK.EditMode == FCK_EDITMODE_WYSIWYG && isEngineLoaded && scaytReady ) {
+                                                createScaytControl();
+                                                var scayt_control = window.scayt_control;
+                                                //restore SCAYT state
+                                                var agt = navigator.userAgent.toLowerCase();
+                                                var is_ie = ((agt.indexOf("msie") != -1) && (agt.indexOf("opera") == -1));
+                                                //needs this trick to work in IE
+                                                if (is_ie) { 
+                                                        scayt_control.disabled = !scaytEnable;
+                                                        scaytEnable = !scayt_control.disabled;
+                                                }
+                                                else {
+                                                        var ScaytCombobox = FCKToolbarItems.GetItem( 'SpellCheck' );
+                                                        ScaytCombobox && ScaytCombobox.Command.SetEnabled( scaytEnable ) ;
+                                                }
+                                        }
 
-                                if ( FCK.EditMode == FCK_EDITMODE_WYSIWYG && isEngineLoaded && scaytReady )
-                                        createScaytControl();
-
-                                ShowScaytState() ;
+                                        ShowScaytState() ;
+                                }
                         }
                 } ) ;
 
         FCK.Events.AttachEvent( 'OnBeforeGetData', function()
                 {
-                        scaytReady && window.scayt_control.reset();
+                        if (scaytReady) {
+                                //save ID for restoring control in future, reset and destroy control when entering "Source mode"
+                                savedID = window.scayt_control.id;
+                                window.scayt_control.reset();
+                                window.scayt_control.destroy(true);
+                        }
                 } ) ;
 
-        FCK.Events.AttachEvent( 'OnAfterGetData', function()
-                {
-                        scaytReady && window.scayt_control.refresh();
-                } ) ;
-
         // ###
         // The main object that holds the SCAYT interaction in the code.
         FCKScayt =
@@ -441 +585 @@
 
                 CreateToolbarItem : function()
                 {
-                        return new ToolbarScaytComboBox() ;
+                        var tabs  = FCK.Config.ScaytUiTabs || "1,1,1";
+            tabs = tabs.split(',');
+
+            for (var i=0,l=3; i<l; i++){
+                var flag = parseInt(tabs[i] || "1");
+                uiTabs.push(  flag   );
+            }
+            uiTabs[uiTabs.length] = 1;
+
+            return new ToolbarScaytComboBox() ;
                 }
         } ;
 })() ;

editor/dialog/fck_scayt.html

@@ -38 +38 @@
                         var     fckLang;
             var chosed_lang;
                         var options;
-                        var     tabs = scayt_control.uiTags || [1,1,0,1];
+                        var uiTabs = oEditor.FCKScayt.scayt_ui_tabs;
+                        var     tabs = uiTabs || [1,1,1,1];
                         var     userDicActive = tabs[2] == 1;
                         var     captions;
                         var dic_buttons = [