' +
- '
' +
- '
' +
- '
'
}
]
},
- */
{
id : 'about',
Index: /CKEditor/trunk/_source/plugins/scayt/plugin.js
===================================================================
--- /CKEditor/trunk/_source/plugins/scayt/plugin.js (revision 3695)
+++ /CKEditor/trunk/_source/plugins/scayt/plugin.js (revision 3696)
@@ -24,8 +24,9 @@
{
// Initialise Scayt instance.
- var scayt_control = new scayt(
- {
- srcNodeRef: editor.document.getWindow().$.frameElement
- });
+ var oParams = CKEDITOR.config.scaytParams || {};
+ oParams.srcNodeRef = editor.document.getWindow().$.frameElement; // Get the iframe.
+ // syntax : AppName.AppVersion@AppRevision
+ oParams.assocApp = "CKEDITOR." + CKEDITOR.version + "@" + CKEDITOR.revision;
+ var scayt_control = new scayt( oParams );
// Copy config.
@@ -46,5 +47,5 @@
};
- editor.on( 'contentDom', createInstance ); // Get the iframe somehow.
+ editor.on( 'contentDom', createInstance );
editor.on( 'contentDomUnload', function()
{
@@ -52,6 +53,5 @@
var scripts = CKEDITOR.document.getElementsByTag( 'script' );
scaytIdRegex = /^dojoIoScript(\d+)$/i;
- scaytSrcRegex = /^http:\/\/demo\.spellchecker\.net\/spellcheck3\/script\/ssrv\.cgi/i;
-
+ scaytSrcRegex = /^https?:\/\/svc\.spellchecker\.net\/spellcheck\/script\/ssrv\.cgi/i;
for ( var i=0; i < scripts.count(); i++ )
{
@@ -154,33 +154,30 @@
this.engineLoaded = -1; // Loading in progress.
- djConfig =
- {
- baseUrl: './',
- blankGif: 'http://demo.spellchecker.net/spellcheck3/lf/scayt/blank.gif',
- parseOnLoad: true,
- afterOnLoad: true,
- useXDomain: true,
- locale: 'en',
- xdWaitSeconds: 10,
- preventCache: false,
- scaytNodes: document.getElementById('foo'),
- require: [
- 'dojo.i18n',
- 'scayt._base'
- ],
- modulePaths:
- {
- 'scayt': 'http://demo.spellchecker.net/spellcheck3/lf/scayt'
- },
+ // assign diojo configurable vars
+ var parseUrl = function(data)
+ {
+ var m = data.match(/(.*)[\/\\]([^\/\\]+\.\w+)$/);
+ return {path: m[1], file: m[2]}
+ }
+
+ // compose scayt url
+ var protocol = document.location.protocol;
+ var baseUrl = "svc.spellchecker.net/spellcheck/lf/scayt/scayt.js";
+ var scaytUrl = editor.config.scaytParams.srcScayt ||
+ (protocol + "//" + baseUrl);
+ var scaytConfigBaseUrl = parseUrl(scaytUrl).path + "/";
+
+ djScaytConfig =
+ {
+ baseUrl: scaytConfigBaseUrl,
addOnLoad:
[
function()
{
- CKEDITOR.fireOnce( 'scaytReady' );
+ CKEDITOR.fireOnce( "scaytReady" );
}
],
isDebug: false
};
-
// Append javascript code.
CKEDITOR.document.getHead().append(
@@ -190,5 +187,5 @@
{
type : 'text/javascript',
- src : 'http://demo.spellchecker.net/spellcheck3/lf/dojo/dojo/dojo.xd.js'
+ src : scaytUrl
}
})
@@ -229,5 +226,5 @@
scayt_control.setDisabled( isEnabled );
}
- else if ( !editor.config.scayt_autoStartup && plugin.engineLoaded >= 0 ) // Load first time
+ else if ( !editor.config.scaytParams.autoStartup && plugin.engineLoaded >= 0 ) // Load first time
{
this.setState( CKEDITOR.TRISTATE_DISABLED );
@@ -357,5 +354,6 @@
_r = {},
items_suggestion = scayt.getSuggestion( word, sLang );
-
+ if (!items_suggestion || !items_suggestion.length || items_suggestion.length == 0 )
+ return null;
// Remove unused commands and menuitems
for ( i in moreSuggestions )
@@ -371,16 +369,5 @@
moreSuggestions = {}; // Reset items.
mainSuggestions = {};
-
- // Register the More suggestions group;
- editor.addMenuItem( 'scayt_moresuggest',
- {
- label : editor.lang.scayt.moreSuggestions,
- group : 'scayt_moresuggest',
- order : 10,
- getItems : function()
- {
- return moreSuggestions;
- }
- });
+ moreSuggestionsUnable = false;
for ( var i = 0, l = items_suggestion.length; i < l; i += 1 )
@@ -397,5 +384,5 @@
})( element.$, items_suggestion[i] );
- if ( i < editor.config.scayt_maxSuggestions )
+ if ( i < editor.config.scaytParams.maxSuggestions )
{
addButtonCommand( editor, 'button_' + commandName, items_suggestion[i],
@@ -409,6 +396,20 @@
commandName, exec, 'scayt_moresuggest', i + 1 );
moreSuggestions[ commandName ] = CKEDITOR.TRISTATE_OFF;
- }
- }
+ moreSuggestionsUnable = true;
+ }
+ }
+ if ( moreSuggestionsUnable )
+ // Rgister the More suggestions group;
+ editor.addMenuItem( 'scayt_moresuggest',
+ {
+ label : editor.lang.scayt.moreSuggestions,
+ group : 'scayt_moresuggest',
+ order : 10,
+ getItems : function()
+ {
+ return moreSuggestions;
+ }
+ });
+
var ignore_command =
@@ -446,4 +447,10 @@
mainSuggestions[ 'scayt_add_word' ] = CKEDITOR.TRISTATE_OFF;
+ // ** ahow ads entry point
+ // ** hide ads listener register
+// try{
+ //scayt_control.showBanner( editor )
+// }catch(err){}
+
return mainSuggestions;
});
@@ -451,5 +458,5 @@
// Start plugin
- if ( editor.config.scayt_autoStartup )
+ if ( editor.config.scaytParams.autoStartup )
{
var showInitialState = function()
@@ -466,4 +473,6 @@
})();
-CKEDITOR.config.scayt_maxSuggestions = 5;
-CKEDITOR.config.scayt_autoStartup = false;
+CKEDITOR.config.scaytParams = CKEDITOR.config.scaytParams || {};
+CKEDITOR.config.scaytParams.maxSuggestions = CKEDITOR.config.scaytParams.maxSuggestions || 5;
+CKEDITOR.config.scaytParams.autoStartup = CKEDITOR.config.scaytParams.autoStartup || false;
+