Index: _source/plugins/scayt/dialogs/options.js
===================================================================
--- _source/plugins/scayt/dialogs/options.js (revision 3945)
+++ _source/plugins/scayt/dialogs/options.js Fri Jul 24 19:00:56 CST 2009
@@ -194,7 +194,7 @@
return false;
}
//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;
}
@@ -303,7 +303,7 @@
var suc_massage = captions["succ_dic_create"];
//console.info("--plugin ");
- scayt.createUserDictionary(dic_name,
+ window.scayt.createUserDictionary(dic_name,
function(arg)
{
//console.info( "dic_create callback called with args" , arg );
@@ -321,7 +321,7 @@
};
- dic.dic_rename = function( el, dic_name , dic_buttons )
+ dic.dic_rename = function( el, dic_name )
{
//
// try to rename dictionary
@@ -329,7 +329,7 @@
//console.info ( captions["err_dic_rename"] )
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)
{
//console.info( "dic_rename callback called with args" , arg );
@@ -354,7 +354,7 @@
// try to delete dictionary
// @TODO: delete dict
- scayt.deleteUserDictionary(
+ window.scayt.deleteUserDictionary(
function(arg)
{
//console.info( "dic_delete callback " , dic_name ,arg );
@@ -379,7 +379,7 @@
var err_massage = captions["err_dic_restore"];
var suc_massage = captions["succ_dic_restore"];
- scayt.restoreUserDictionary(dic_name,
+ window.scayt.restoreUserDictionary(dic_name,
function(arg)
{
//console.info( "dic_restore callback called with args" , arg );
@@ -435,7 +435,7 @@
// * user dictionary
if ( userDicActive ){
- scayt.getNameUserDictionary(
+ window.scayt.getNameUserDictionary(
function( o )
{
var dic_name = o.dname;
Index: _source/plugins/scayt/plugin.js
===================================================================
--- _source/plugins/scayt/plugin.js (revision 3945)
+++ _source/plugins/scayt/plugin.js Fri Jul 24 19:00:58 CST 2009
@@ -11,8 +11,6 @@
(function()
{
var commandName = 'scaytcheck',
- sc_on_cssclass = 'scayt_enabled',
- sc_off_cssclass = 'scayt_disabled',
openPage = '';
var onEngineLoad = function()
@@ -40,7 +38,7 @@
}
}
- var scayt_control = new scayt( oParams );
+ var scayt_control = new window.scayt( oParams );
// Copy config.
var lastInstance = plugin.instances[ editor.name ];
@@ -120,10 +118,10 @@
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;
});
var dataProcessor = editor.dataProcessor,
@@ -157,13 +155,12 @@
instances : {},
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 )
{
@@ -379,7 +376,7 @@
// If the "contextmenu" plugin is loaded, register the listeners.
if ( editor.contextMenu && editor.addMenuItems )
{
- editor.contextMenu.addListener( function( element, selection )
+ editor.contextMenu.addListener( function( element )
{
if ( !( plugin.isScaytEnabled( editor ) && element ) )
return null;
@@ -392,7 +389,7 @@
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;
// Remove unused commands and menuitems
@@ -417,7 +414,7 @@
var exec = ( function( el, s )
{
return {
- exec: function( editor )
+ exec: function()
{
scayt_control.replace(el, s);
}
@@ -471,7 +468,7 @@
{
exec: function()
{
- scayt.addWordToUserDictionary( element.$ );
+ window.scayt.addWordToUserDictionary( element.$ );
}
};
Index: _source/plugins/wsc/dialogs/tmpFrameset.html
===================================================================
--- _source/plugins/wsc/dialogs/tmpFrameset.html (revision 3796)
+++ _source/plugins/wsc/dialogs/tmpFrameset.html Fri Jul 24 19:10:52 CST 2009
@@ -22,6 +22,7 @@
return true ;
}
+var opener;
function tryLoad()
{
opener = window.parent;
Index: _source/plugins/uicolor/dialogs/uicolor.js
===================================================================
--- _source/plugins/uicolor/dialogs/uicolor.js (revision 3785)
+++ _source/plugins/uicolor/dialogs/uicolor.js Fri Jul 24 19:00:58 CST 2009
@@ -13,7 +13,7 @@
{
// Convert HEX representation to RGB, stripping # char.
if ( /^#/.test( color ) )
- color = YAHOO.util.Color.hex2rgb( color.substr( 1 ) );
+ color = window.YAHOO.util.Color.hex2rgb( color.substr( 1 ) );
picker.setValue( color, true );
// Refresh picker UI.
picker.refresh( 'cke_uicolor_picker' );
Index: _source/plugins/wsc/dialogs/wsc.js
===================================================================
--- _source/plugins/wsc/dialogs/wsc.js (revision 3508)
+++ _source/plugins/wsc/dialogs/wsc.js Fri Jul 24 19:00:58 CST 2009
@@ -55,7 +55,7 @@
initAndSpell( dialog );
}
else if ( i++ == 180 ) // Timeout: 180 * 250ms = 45s.
- _cancelOnError( errorMsg );
+ window._cancelOnError( errorMsg );
};
}
@@ -78,7 +78,7 @@
// 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 );
Index: CHANGES.html
===================================================================
--- CHANGES.html (revision 3960)
+++ CHANGES.html Fri Jul 24 19:02:36 CST 2009
@@ -176,6 +176,7 @@
#4093 : _tests/core/dom/document.html
#4094 : Smiley plugin file
+ #3791 : Fix jslint warnings in SCAYT plugin.
CKEditor 3.0 RC