Changeset 3971

Timestamp:

07/24/09 14:13:03 (4 years ago)

Author:

garry.yao

Message:

Fixing #3791: JSLint errors in the SCAYT plugin.

Location:

CKEditor/trunk/_source/plugins

Files:

• scayt/dialogs/options.js (modified) (7 diffs)
• scayt/plugin.js (modified) (8 diffs)
• wsc/dialogs/tmpFrameset.html (modified) (1 diff)
• wsc/dialogs/wsc.js (modified) (2 diffs)

CKEditor/trunk/_source/plugins/scayt/dialogs/options.js

@@ -195 +195 @@
                 }
                 //apply handler
-                dic[ this.getId() ].apply( null, [ this, dic_name, dic_buttons ] );
+                window.dic[ this.getId() ].apply( null, [ this, dic_name, dic_buttons ] );
 
                 return true;
@@ -304 +304 @@
                                 //console.info("--plugin ");
 
-                                scayt.createUserDictionary(dic_name,
+                                window.scayt.createUserDictionary(dic_name,
                                         function(arg)
                                                 {
@@ -322 +322 @@
                         };
 
-                dic.dic_rename = function( el, dic_name , dic_buttons )
+                dic.dic_rename = function( el, dic_name )
                         {
                                 //
@@ -330 +330 @@
                                 var err_massage = captions["err_dic_rename"] || "";
                                 var suc_massage = captions["succ_dic_rename"] || "";
-                                scayt.renameUserDictionary(dic_name,
+                                window.scayt.renameUserDictionary(dic_name,
                                         function(arg)
                                                 {
@@ -355 +355 @@
                                 // try to delete dictionary
                                 // @TODO: delete dict
-                                scayt.deleteUserDictionary(
+                                window.scayt.deleteUserDictionary(
                                         function(arg)
                                                 {
@@ -380 +380 @@
                                 var suc_massage = captions["succ_dic_restore"];
 
-                                scayt.restoreUserDictionary(dic_name,
+                                window.scayt.restoreUserDictionary(dic_name,
                                         function(arg)
                                                 {
@@ -436 +436 @@
                 // * user dictionary
                 if ( userDicActive ){
-                        scayt.getNameUserDictionary(
+                        window.scayt.getNameUserDictionary(
                         function( o )
                         {

CKEditor/trunk/_source/plugins/scayt/plugin.js

@@ -12 +12 @@
 {
         var commandName         = 'scaytcheck',
-                sc_on_cssclass  = 'scayt_enabled',
-                sc_off_cssclass = 'scayt_disabled',
                 openPage                = '';
 
@@ -41 +39 @@
                         }
 
-                        var scayt_control = new scayt( oParams );
+                        var scayt_control = new window.scayt( oParams );
 
                         // Copy config.
@@ -121 +119 @@
                 editor.on( 'scaytDialog', function( ev )        // Communication with dialog.
                         {
-                                ev.data.djConfig = djConfig;
+                                ev.data.djConfig = window.djConfig;
                                 ev.data.scayt_control = plugin.getScayt( editor );
                                 ev.data.tab = openPage;
-                                ev.data.scayt = scayt;
+                                ev.data.scayt = window.scayt;
                         });
 
@@ -158 +156 @@
                 getScayt : function( editor )
                 {
-                        var instance = this.instances[ editor.name ];
-                        return instance;
+                        return this.instances[ editor.name ];
                 },
                 isScaytReady : function( editor )
                 {
                         return this.engineLoaded === true &&
-                                'undefined' !== typeof scayt && this.getScayt( editor );
+                                'undefined' !== typeof window.scayt && this.getScayt( editor );
                 },
                 isScaytEnabled : function( editor )
@@ -380 +377 @@
                         if ( editor.contextMenu && editor.addMenuItems )
                         {
-                                editor.contextMenu.addListener( function( element, selection )
+                                editor.contextMenu.addListener( function( element )
                                         {
                                                 if ( !( plugin.isScaytEnabled( editor ) && element ) )
@@ -393 +390 @@
                                                 var sLang = scayt_control.getLang(),
                                                         _r = {},
-                                                        items_suggestion = scayt.getSuggestion( word, sLang );
+                                                        items_suggestion = window.scayt.getSuggestion( word, sLang );
                                                 if (!items_suggestion || !items_suggestion.length )
                                                         return null;
@@ -418 +415 @@
                                                                 {
                                                                         return {
-                                                                                exec: function( editor )
+                                                                                exec: function()
                                                                                 {
                                                                                         scayt_control.replace(el, s);
@@ -472 +469 @@
                                                         exec: function()
                                                         {
-                                                                scayt.addWordToUserDictionary( element.$ );
+                                                                window.scayt.addWordToUserDictionary( element.$ );
                                                         }
                                                 };

CKEditor/trunk/_source/plugins/wsc/dialogs/tmpFrameset.html

@@ -23 +23 @@
 }
 
+var opener;
 function tryLoad()
 {

CKEditor/trunk/_source/plugins/wsc/dialogs/wsc.js

@@ -56 +56 @@
                         }
                         else if ( i++ == 180 )                                                          // Timeout: 180 * 250ms = 45s.
-                                _cancelOnError( errorMsg );
+                                window._cancelOnError( errorMsg );
                 };
         }
@@ -79 +79 @@
                 // global var is used in FCK specific core
                 // change on equal var used in fckplugin.js
-                gFCKPluginName = 'wsc';
+                window.gFCKPluginName = 'wsc';
 
                 LangComparer.setDefaulLangCode( editor.config.defaultLanguage );