Index: /CKEditor/branches/versions/3.2.x/CHANGES.html
===================================================================
--- /CKEditor/branches/versions/3.2.x/CHANGES.html (revision 5336)
+++ /CKEditor/branches/versions/3.2.x/CHANGES.html (revision 5337)
@@ -44,6 +44,6 @@
#4810 : Adding configuration option for image dialog preview area filling text.
#536 : Object style now could be applied on any parent element of current selection.
- #5290 : Unified stylesSet loading removing dependecies from the styles combo.
- Now the configuration entry is named 'config.stylesSet' instead of config.stylesCombo_stylesSet and the default location
+ #5290 : Unified stylesSet loading removing dependecies from the styles combo.
+ Now the configuration entry is named 'config.stylesSet' instead of config.stylesCombo_stylesSet and the default location
is under the 'styles' plugin instead of 'stylescombo'.
#5302 : Adding config option 'CKEDITOR.config.forceEnterMode'.
Index: /CKEditor/branches/versions/3.2.x/_samples/assets/output_xhtml.css
===================================================================
--- /CKEditor/branches/versions/3.2.x/_samples/assets/output_xhtml.css (revision 5336)
+++ /CKEditor/branches/versions/3.2.x/_samples/assets/output_xhtml.css (revision 5337)
@@ -1,3 +1,3 @@
-/*
+/*
* Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved.
* For licensing, see LICENSE.html or http://ckeditor.com/license
Index: /CKEditor/branches/versions/3.2.x/_samples/output_xhtml.html
===================================================================
--- /CKEditor/branches/versions/3.2.x/_samples/output_xhtml.html (revision 5336)
+++ /CKEditor/branches/versions/3.2.x/_samples/output_xhtml.html (revision 5337)
@@ -125,5 +125,5 @@
* Styles combo.
*/
- stylesSet :
+ stylesSet :
[
{ name : 'Strong Emphasis', element : 'strong' },
@@ -137,5 +137,5 @@
{ name : 'Deleted Text', element : 'del' },
{ name : 'Inserted Text', element : 'ins' },
-
+
{ name : 'Cited Work', element : 'cite' },
{ name : 'Inline Quotation', element : 'q' }
Index: /CKEditor/branches/versions/3.2.x/_source/core/ckeditor_base.js
===================================================================
--- /CKEditor/branches/versions/3.2.x/_source/core/ckeditor_base.js (revision 5336)
+++ /CKEditor/branches/versions/3.2.x/_source/core/ckeditor_base.js (revision 5337)
@@ -1,3 +1,3 @@
-/*
+/*
Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved.
For licensing, see LICENSE.html or http://ckeditor.com/license
@@ -137,6 +137,6 @@
}
- if( !path )
- throw 'The CKEditor installation path could not be automatically detected. Please set the global variable "CKEDITOR_BASEPATH" before creating editor instances.'
+ if ( !path )
+ throw 'The CKEditor installation path could not be automatically detected. Please set the global variable "CKEDITOR_BASEPATH" before creating editor instances.';
return path;
Index: /CKEditor/branches/versions/3.2.x/_source/core/commanddefinition.js
===================================================================
--- /CKEditor/branches/versions/3.2.x/_source/core/commanddefinition.js (revision 5336)
+++ /CKEditor/branches/versions/3.2.x/_source/core/commanddefinition.js (revision 5337)
@@ -1,3 +1,3 @@
-/*
+/*
Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved.
For licensing, see LICENSE.html or http://ckeditor.com/license
@@ -98,5 +98,5 @@
* {
* },
- * startDisabled : true // Command is unavailable until selection is inside a link.
+ * startDisabled : true // Command is unavailable until selection is inside a link.
* });
*/
Index: /CKEditor/branches/versions/3.2.x/_source/core/config.js
===================================================================
--- /CKEditor/branches/versions/3.2.x/_source/core/config.js (revision 5336)
+++ /CKEditor/branches/versions/3.2.x/_source/core/config.js (revision 5337)
@@ -1,3 +1,3 @@
-/*
+/*
Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved.
For licensing, see LICENSE.html or http://ckeditor.com/license
Index: /CKEditor/branches/versions/3.2.x/_source/core/dom/domobject.js
===================================================================
--- /CKEditor/branches/versions/3.2.x/_source/core/dom/domobject.js (revision 5336)
+++ /CKEditor/branches/versions/3.2.x/_source/core/dom/domobject.js (revision 5337)
@@ -126,5 +126,5 @@
{
var nativeListeners = this.getCustomData( '_cke_nativeListeners' );
- for ( eventName in nativeListeners)
+ for ( var eventName in nativeListeners )
{
var listener = nativeListeners[ eventName ];
Index: /CKEditor/branches/versions/3.2.x/_source/core/dom/range.js
===================================================================
--- /CKEditor/branches/versions/3.2.x/_source/core/dom/range.js (revision 5336)
+++ /CKEditor/branches/versions/3.2.x/_source/core/dom/range.js (revision 5337)
@@ -1,3 +1,3 @@
-/*
+/*
Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved.
For licensing, see LICENSE.html or http://ckeditor.com/license
@@ -1274,5 +1274,5 @@
}
}
-
+
if ( endContainer && endContainer.type == CKEDITOR.NODE_TEXT )
{
@@ -1309,4 +1309,6 @@
if ( !movingOut && node.type == CKEDITOR.NODE_ELEMENT )
currentElement = node;
+
+ return true;
};
@@ -1833,3 +1835,2 @@
CKEDITOR.SHRINK_ELEMENT = 1;
CKEDITOR.SHRINK_TEXT = 2;
-
Index: /CKEditor/branches/versions/3.2.x/_source/core/editor.js
===================================================================
--- /CKEditor/branches/versions/3.2.x/_source/core/editor.js (revision 5336)
+++ /CKEditor/branches/versions/3.2.x/_source/core/editor.js (revision 5337)
@@ -506,5 +506,5 @@
CKEDITOR.tools.removeFunction( this._.filebrowserFn );
- items = editor.config.elementsPath_filters;
+ items = this.config.elementsPath_filters;
if ( items )
{
Index: /CKEditor/branches/versions/3.2.x/_source/core/htmlparser/basicwriter.js
===================================================================
--- /CKEditor/branches/versions/3.2.x/_source/core/htmlparser/basicwriter.js (revision 5336)
+++ /CKEditor/branches/versions/3.2.x/_source/core/htmlparser/basicwriter.js (revision 5337)
@@ -63,5 +63,5 @@
// Browsers don't always escape special character in attribute values. (#4683, #4719).
if ( typeof attValue == 'string' )
- attValue = CKEDITOR.tools.htmlEncodeAttr( attValue );
+ attValue = CKEDITOR.tools.htmlEncodeAttr( attValue );
this._.output.push( ' ', attName, '="', attValue, '"' );
Index: /CKEditor/branches/versions/3.2.x/_source/core/tools.js
===================================================================
--- /CKEditor/branches/versions/3.2.x/_source/core/tools.js (revision 5336)
+++ /CKEditor/branches/versions/3.2.x/_source/core/tools.js (revision 5337)
@@ -1,3 +1,3 @@
-/*
+/*
Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved.
For licensing, see LICENSE.html or http://ckeditor.com/license
@@ -331,9 +331,9 @@
* alert( CKEDITOR.tools.htmlEncodeAttr( element.getAttribute( 'title' ) ); // ">a " b <"
*/
- htmlEncodeAttr : function( text )
+ htmlEncodeAttr : function( text )
{
return text.replace( /"/g, '"' ).replace( //, '>' );
},
-
+
/**
* Replace characters can't be represented through CSS Selectors string
Index: /CKEditor/branches/versions/3.2.x/_source/lang/af.js
===================================================================
--- /CKEditor/branches/versions/3.2.x/_source/lang/af.js (revision 5336)
+++ /CKEditor/branches/versions/3.2.x/_source/lang/af.js (revision 5337)
@@ -1,3 +1,3 @@
-/*
+/*
Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved.
For licensing, see LICENSE.html or http://ckeditor.com/license
Index: /CKEditor/branches/versions/3.2.x/_source/lang/ar.js
===================================================================
--- /CKEditor/branches/versions/3.2.x/_source/lang/ar.js (revision 5336)
+++ /CKEditor/branches/versions/3.2.x/_source/lang/ar.js (revision 5337)
@@ -1,3 +1,3 @@
-/*
+/*
Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved.
For licensing, see LICENSE.html or http://ckeditor.com/license
Index: /CKEditor/branches/versions/3.2.x/_source/lang/bg.js
===================================================================
--- /CKEditor/branches/versions/3.2.x/_source/lang/bg.js (revision 5336)
+++ /CKEditor/branches/versions/3.2.x/_source/lang/bg.js (revision 5337)
@@ -1,3 +1,3 @@
-/*
+/*
Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved.
For licensing, see LICENSE.html or http://ckeditor.com/license
Index: /CKEditor/branches/versions/3.2.x/_source/lang/bn.js
===================================================================
--- /CKEditor/branches/versions/3.2.x/_source/lang/bn.js (revision 5336)
+++ /CKEditor/branches/versions/3.2.x/_source/lang/bn.js (revision 5337)
@@ -1,3 +1,3 @@
-/*
+/*
Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved.
For licensing, see LICENSE.html or http://ckeditor.com/license
Index: /CKEditor/branches/versions/3.2.x/_source/lang/bs.js
===================================================================
--- /CKEditor/branches/versions/3.2.x/_source/lang/bs.js (revision 5336)
+++ /CKEditor/branches/versions/3.2.x/_source/lang/bs.js (revision 5337)
@@ -1,3 +1,3 @@
-/*
+/*
Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved.
For licensing, see LICENSE.html or http://ckeditor.com/license
Index: /CKEditor/branches/versions/3.2.x/_source/lang/ca.js
===================================================================
--- /CKEditor/branches/versions/3.2.x/_source/lang/ca.js (revision 5336)
+++ /CKEditor/branches/versions/3.2.x/_source/lang/ca.js (revision 5337)
@@ -1,3 +1,3 @@
-/*
+/*
Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved.
For licensing, see LICENSE.html or http://ckeditor.com/license
Index: /CKEditor/branches/versions/3.2.x/_source/lang/cs.js
===================================================================
--- /CKEditor/branches/versions/3.2.x/_source/lang/cs.js (revision 5336)
+++ /CKEditor/branches/versions/3.2.x/_source/lang/cs.js (revision 5337)
@@ -1,3 +1,3 @@
-/*
+/*
Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved.
For licensing, see LICENSE.html or http://ckeditor.com/license
Index: /CKEditor/branches/versions/3.2.x/_source/lang/cy.js
===================================================================
--- /CKEditor/branches/versions/3.2.x/_source/lang/cy.js (revision 5336)
+++ /CKEditor/branches/versions/3.2.x/_source/lang/cy.js (revision 5337)
@@ -1,3 +1,3 @@
-/*
+/*
Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved.
For licensing, see LICENSE.html or http://ckeditor.com/license
Index: /CKEditor/branches/versions/3.2.x/_source/lang/da.js
===================================================================
--- /CKEditor/branches/versions/3.2.x/_source/lang/da.js (revision 5336)
+++ /CKEditor/branches/versions/3.2.x/_source/lang/da.js (revision 5337)
@@ -1,3 +1,3 @@
-/*
+/*
Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved.
For licensing, see LICENSE.html or http://ckeditor.com/license
Index: /CKEditor/branches/versions/3.2.x/_source/lang/de.js
===================================================================
--- /CKEditor/branches/versions/3.2.x/_source/lang/de.js (revision 5336)
+++ /CKEditor/branches/versions/3.2.x/_source/lang/de.js (revision 5337)
@@ -1,3 +1,3 @@
-/*
+/*
Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved.
For licensing, see LICENSE.html or http://ckeditor.com/license
Index: /CKEditor/branches/versions/3.2.x/_source/lang/el.js
===================================================================
--- /CKEditor/branches/versions/3.2.x/_source/lang/el.js (revision 5336)
+++ /CKEditor/branches/versions/3.2.x/_source/lang/el.js (revision 5337)
@@ -1,3 +1,3 @@
-/*
+/*
Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved.
For licensing, see LICENSE.html or http://ckeditor.com/license
Index: /CKEditor/branches/versions/3.2.x/_source/lang/en-au.js
===================================================================
--- /CKEditor/branches/versions/3.2.x/_source/lang/en-au.js (revision 5336)
+++ /CKEditor/branches/versions/3.2.x/_source/lang/en-au.js (revision 5337)
@@ -1,3 +1,3 @@
-/*
+/*
Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved.
For licensing, see LICENSE.html or http://ckeditor.com/license
Index: /CKEditor/branches/versions/3.2.x/_source/lang/en-ca.js
===================================================================
--- /CKEditor/branches/versions/3.2.x/_source/lang/en-ca.js (revision 5336)
+++ /CKEditor/branches/versions/3.2.x/_source/lang/en-ca.js (revision 5337)
@@ -1,3 +1,3 @@
-/*
+/*
Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved.
For licensing, see LICENSE.html or http://ckeditor.com/license
Index: /CKEditor/branches/versions/3.2.x/_source/lang/en-gb.js
===================================================================
--- /CKEditor/branches/versions/3.2.x/_source/lang/en-gb.js (revision 5336)
+++ /CKEditor/branches/versions/3.2.x/_source/lang/en-gb.js (revision 5337)
@@ -1,3 +1,3 @@
-/*
+/*
Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved.
For licensing, see LICENSE.html or http://ckeditor.com/license
Index: /CKEditor/branches/versions/3.2.x/_source/lang/en.js
===================================================================
--- /CKEditor/branches/versions/3.2.x/_source/lang/en.js (revision 5336)
+++ /CKEditor/branches/versions/3.2.x/_source/lang/en.js (revision 5337)
@@ -1,3 +1,3 @@
-/*
+/*
Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved.
For licensing, see LICENSE.html or http://ckeditor.com/license
Index: /CKEditor/branches/versions/3.2.x/_source/lang/eo.js
===================================================================
--- /CKEditor/branches/versions/3.2.x/_source/lang/eo.js (revision 5336)
+++ /CKEditor/branches/versions/3.2.x/_source/lang/eo.js (revision 5337)
@@ -1,3 +1,3 @@
-/*
+/*
Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved.
For licensing, see LICENSE.html or http://ckeditor.com/license
Index: /CKEditor/branches/versions/3.2.x/_source/lang/es.js
===================================================================
--- /CKEditor/branches/versions/3.2.x/_source/lang/es.js (revision 5336)
+++ /CKEditor/branches/versions/3.2.x/_source/lang/es.js (revision 5337)
@@ -1,3 +1,3 @@
-/*
+/*
Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved.
For licensing, see LICENSE.html or http://ckeditor.com/license
Index: /CKEditor/branches/versions/3.2.x/_source/lang/et.js
===================================================================
--- /CKEditor/branches/versions/3.2.x/_source/lang/et.js (revision 5336)
+++ /CKEditor/branches/versions/3.2.x/_source/lang/et.js (revision 5337)
@@ -1,3 +1,3 @@
-/*
+/*
Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved.
For licensing, see LICENSE.html or http://ckeditor.com/license
Index: /CKEditor/branches/versions/3.2.x/_source/lang/eu.js
===================================================================
--- /CKEditor/branches/versions/3.2.x/_source/lang/eu.js (revision 5336)
+++ /CKEditor/branches/versions/3.2.x/_source/lang/eu.js (revision 5337)
@@ -1,3 +1,3 @@
-/*
+/*
Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved.
For licensing, see LICENSE.html or http://ckeditor.com/license
Index: /CKEditor/branches/versions/3.2.x/_source/lang/fa.js
===================================================================
--- /CKEditor/branches/versions/3.2.x/_source/lang/fa.js (revision 5336)
+++ /CKEditor/branches/versions/3.2.x/_source/lang/fa.js (revision 5337)
@@ -1,3 +1,3 @@
-/*
+/*
Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved.
For licensing, see LICENSE.html or http://ckeditor.com/license
Index: /CKEditor/branches/versions/3.2.x/_source/lang/fi.js
===================================================================
--- /CKEditor/branches/versions/3.2.x/_source/lang/fi.js (revision 5336)
+++ /CKEditor/branches/versions/3.2.x/_source/lang/fi.js (revision 5337)
@@ -1,3 +1,3 @@
-/*
+/*
Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved.
For licensing, see LICENSE.html or http://ckeditor.com/license
Index: /CKEditor/branches/versions/3.2.x/_source/lang/fo.js
===================================================================
--- /CKEditor/branches/versions/3.2.x/_source/lang/fo.js (revision 5336)
+++ /CKEditor/branches/versions/3.2.x/_source/lang/fo.js (revision 5337)
@@ -1,3 +1,3 @@
-/*
+/*
Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved.
For licensing, see LICENSE.html or http://ckeditor.com/license
Index: /CKEditor/branches/versions/3.2.x/_source/lang/fr-ca.js
===================================================================
--- /CKEditor/branches/versions/3.2.x/_source/lang/fr-ca.js (revision 5336)
+++ /CKEditor/branches/versions/3.2.x/_source/lang/fr-ca.js (revision 5337)
@@ -1,3 +1,3 @@
-/*
+/*
Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved.
For licensing, see LICENSE.html or http://ckeditor.com/license
Index: /CKEditor/branches/versions/3.2.x/_source/lang/fr.js
===================================================================
--- /CKEditor/branches/versions/3.2.x/_source/lang/fr.js (revision 5336)
+++ /CKEditor/branches/versions/3.2.x/_source/lang/fr.js (revision 5337)
@@ -1,3 +1,3 @@
-/*
+/*
Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved.
For licensing, see LICENSE.html or http://ckeditor.com/license
Index: /CKEditor/branches/versions/3.2.x/_source/lang/gl.js
===================================================================
--- /CKEditor/branches/versions/3.2.x/_source/lang/gl.js (revision 5336)
+++ /CKEditor/branches/versions/3.2.x/_source/lang/gl.js (revision 5337)
@@ -1,3 +1,3 @@
-/*
+/*
Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved.
For licensing, see LICENSE.html or http://ckeditor.com/license
Index: /CKEditor/branches/versions/3.2.x/_source/lang/gu.js
===================================================================
--- /CKEditor/branches/versions/3.2.x/_source/lang/gu.js (revision 5336)
+++ /CKEditor/branches/versions/3.2.x/_source/lang/gu.js (revision 5337)
@@ -1,3 +1,3 @@
-/*
+/*
Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved.
For licensing, see LICENSE.html or http://ckeditor.com/license
Index: /CKEditor/branches/versions/3.2.x/_source/lang/he.js
===================================================================
--- /CKEditor/branches/versions/3.2.x/_source/lang/he.js (revision 5336)
+++ /CKEditor/branches/versions/3.2.x/_source/lang/he.js (revision 5337)
@@ -1,3 +1,3 @@
-/*
+/*
Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved.
For licensing, see LICENSE.html or http://ckeditor.com/license
Index: /CKEditor/branches/versions/3.2.x/_source/lang/hi.js
===================================================================
--- /CKEditor/branches/versions/3.2.x/_source/lang/hi.js (revision 5336)
+++ /CKEditor/branches/versions/3.2.x/_source/lang/hi.js (revision 5337)
@@ -1,3 +1,3 @@
-/*
+/*
Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved.
For licensing, see LICENSE.html or http://ckeditor.com/license
Index: /CKEditor/branches/versions/3.2.x/_source/lang/hr.js
===================================================================
--- /CKEditor/branches/versions/3.2.x/_source/lang/hr.js (revision 5336)
+++ /CKEditor/branches/versions/3.2.x/_source/lang/hr.js (revision 5337)
@@ -1,3 +1,3 @@
-/*
+/*
Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved.
For licensing, see LICENSE.html or http://ckeditor.com/license
Index: /CKEditor/branches/versions/3.2.x/_source/lang/hu.js
===================================================================
--- /CKEditor/branches/versions/3.2.x/_source/lang/hu.js (revision 5336)
+++ /CKEditor/branches/versions/3.2.x/_source/lang/hu.js (revision 5337)
@@ -1,3 +1,3 @@
-/*
+/*
Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved.
For licensing, see LICENSE.html or http://ckeditor.com/license
Index: /CKEditor/branches/versions/3.2.x/_source/lang/is.js
===================================================================
--- /CKEditor/branches/versions/3.2.x/_source/lang/is.js (revision 5336)
+++ /CKEditor/branches/versions/3.2.x/_source/lang/is.js (revision 5337)
@@ -1,3 +1,3 @@
-/*
+/*
Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved.
For licensing, see LICENSE.html or http://ckeditor.com/license
Index: /CKEditor/branches/versions/3.2.x/_source/lang/it.js
===================================================================
--- /CKEditor/branches/versions/3.2.x/_source/lang/it.js (revision 5336)
+++ /CKEditor/branches/versions/3.2.x/_source/lang/it.js (revision 5337)
@@ -1,3 +1,3 @@
-/*
+/*
Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved.
For licensing, see LICENSE.html or http://ckeditor.com/license
Index: /CKEditor/branches/versions/3.2.x/_source/lang/ja.js
===================================================================
--- /CKEditor/branches/versions/3.2.x/_source/lang/ja.js (revision 5336)
+++ /CKEditor/branches/versions/3.2.x/_source/lang/ja.js (revision 5337)
@@ -1,3 +1,3 @@
-/*
+/*
Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved.
For licensing, see LICENSE.html or http://ckeditor.com/license
Index: /CKEditor/branches/versions/3.2.x/_source/lang/km.js
===================================================================
--- /CKEditor/branches/versions/3.2.x/_source/lang/km.js (revision 5336)
+++ /CKEditor/branches/versions/3.2.x/_source/lang/km.js (revision 5337)
@@ -1,3 +1,3 @@
-/*
+/*
Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved.
For licensing, see LICENSE.html or http://ckeditor.com/license
Index: /CKEditor/branches/versions/3.2.x/_source/lang/ko.js
===================================================================
--- /CKEditor/branches/versions/3.2.x/_source/lang/ko.js (revision 5336)
+++ /CKEditor/branches/versions/3.2.x/_source/lang/ko.js (revision 5337)
@@ -1,3 +1,3 @@
-/*
+/*
Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved.
For licensing, see LICENSE.html or http://ckeditor.com/license
Index: /CKEditor/branches/versions/3.2.x/_source/lang/lt.js
===================================================================
--- /CKEditor/branches/versions/3.2.x/_source/lang/lt.js (revision 5336)
+++ /CKEditor/branches/versions/3.2.x/_source/lang/lt.js (revision 5337)
@@ -1,3 +1,3 @@
-/*
+/*
Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved.
For licensing, see LICENSE.html or http://ckeditor.com/license
Index: /CKEditor/branches/versions/3.2.x/_source/lang/lv.js
===================================================================
--- /CKEditor/branches/versions/3.2.x/_source/lang/lv.js (revision 5336)
+++ /CKEditor/branches/versions/3.2.x/_source/lang/lv.js (revision 5337)
@@ -1,3 +1,3 @@
-/*
+/*
Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved.
For licensing, see LICENSE.html or http://ckeditor.com/license
Index: /CKEditor/branches/versions/3.2.x/_source/lang/mn.js
===================================================================
--- /CKEditor/branches/versions/3.2.x/_source/lang/mn.js (revision 5336)
+++ /CKEditor/branches/versions/3.2.x/_source/lang/mn.js (revision 5337)
@@ -1,3 +1,3 @@
-/*
+/*
Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved.
For licensing, see LICENSE.html or http://ckeditor.com/license
Index: /CKEditor/branches/versions/3.2.x/_source/lang/ms.js
===================================================================
--- /CKEditor/branches/versions/3.2.x/_source/lang/ms.js (revision 5336)
+++ /CKEditor/branches/versions/3.2.x/_source/lang/ms.js (revision 5337)
@@ -1,3 +1,3 @@
-/*
+/*
Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved.
For licensing, see LICENSE.html or http://ckeditor.com/license
Index: /CKEditor/branches/versions/3.2.x/_source/lang/nb.js
===================================================================
--- /CKEditor/branches/versions/3.2.x/_source/lang/nb.js (revision 5336)
+++ /CKEditor/branches/versions/3.2.x/_source/lang/nb.js (revision 5337)
@@ -1,3 +1,3 @@
-/*
+/*
Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved.
For licensing, see LICENSE.html or http://ckeditor.com/license
Index: /CKEditor/branches/versions/3.2.x/_source/lang/nl.js
===================================================================
--- /CKEditor/branches/versions/3.2.x/_source/lang/nl.js (revision 5336)
+++ /CKEditor/branches/versions/3.2.x/_source/lang/nl.js (revision 5337)
@@ -1,3 +1,3 @@
-/*
+/*
Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved.
For licensing, see LICENSE.html or http://ckeditor.com/license
Index: /CKEditor/branches/versions/3.2.x/_source/lang/no.js
===================================================================
--- /CKEditor/branches/versions/3.2.x/_source/lang/no.js (revision 5336)
+++ /CKEditor/branches/versions/3.2.x/_source/lang/no.js (revision 5337)
@@ -1,3 +1,3 @@
-/*
+/*
Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved.
For licensing, see LICENSE.html or http://ckeditor.com/license
Index: /CKEditor/branches/versions/3.2.x/_source/lang/pl.js
===================================================================
--- /CKEditor/branches/versions/3.2.x/_source/lang/pl.js (revision 5336)
+++ /CKEditor/branches/versions/3.2.x/_source/lang/pl.js (revision 5337)
@@ -1,3 +1,3 @@
-/*
+/*
Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved.
For licensing, see LICENSE.html or http://ckeditor.com/license
Index: /CKEditor/branches/versions/3.2.x/_source/lang/pt-br.js
===================================================================
--- /CKEditor/branches/versions/3.2.x/_source/lang/pt-br.js (revision 5336)
+++ /CKEditor/branches/versions/3.2.x/_source/lang/pt-br.js (revision 5337)
@@ -1,3 +1,3 @@
-/*
+/*
Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved.
For licensing, see LICENSE.html or http://ckeditor.com/license
Index: /CKEditor/branches/versions/3.2.x/_source/lang/pt.js
===================================================================
--- /CKEditor/branches/versions/3.2.x/_source/lang/pt.js (revision 5336)
+++ /CKEditor/branches/versions/3.2.x/_source/lang/pt.js (revision 5337)
@@ -1,3 +1,3 @@
-/*
+/*
Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved.
For licensing, see LICENSE.html or http://ckeditor.com/license
Index: /CKEditor/branches/versions/3.2.x/_source/lang/ro.js
===================================================================
--- /CKEditor/branches/versions/3.2.x/_source/lang/ro.js (revision 5336)
+++ /CKEditor/branches/versions/3.2.x/_source/lang/ro.js (revision 5337)
@@ -1,3 +1,3 @@
-/*
+/*
Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved.
For licensing, see LICENSE.html or http://ckeditor.com/license
Index: /CKEditor/branches/versions/3.2.x/_source/lang/ru.js
===================================================================
--- /CKEditor/branches/versions/3.2.x/_source/lang/ru.js (revision 5336)
+++ /CKEditor/branches/versions/3.2.x/_source/lang/ru.js (revision 5337)
@@ -1,3 +1,3 @@
-/*
+/*
Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved.
For licensing, see LICENSE.html or http://ckeditor.com/license
Index: /CKEditor/branches/versions/3.2.x/_source/lang/sk.js
===================================================================
--- /CKEditor/branches/versions/3.2.x/_source/lang/sk.js (revision 5336)
+++ /CKEditor/branches/versions/3.2.x/_source/lang/sk.js (revision 5337)
@@ -1,3 +1,3 @@
-/*
+/*
Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved.
For licensing, see LICENSE.html or http://ckeditor.com/license
Index: /CKEditor/branches/versions/3.2.x/_source/lang/sl.js
===================================================================
--- /CKEditor/branches/versions/3.2.x/_source/lang/sl.js (revision 5336)
+++ /CKEditor/branches/versions/3.2.x/_source/lang/sl.js (revision 5337)
@@ -1,3 +1,3 @@
-/*
+/*
Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved.
For licensing, see LICENSE.html or http://ckeditor.com/license
Index: /CKEditor/branches/versions/3.2.x/_source/lang/sr-latn.js
===================================================================
--- /CKEditor/branches/versions/3.2.x/_source/lang/sr-latn.js (revision 5336)
+++ /CKEditor/branches/versions/3.2.x/_source/lang/sr-latn.js (revision 5337)
@@ -1,3 +1,3 @@
-/*
+/*
Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved.
For licensing, see LICENSE.html or http://ckeditor.com/license
Index: /CKEditor/branches/versions/3.2.x/_source/lang/sr.js
===================================================================
--- /CKEditor/branches/versions/3.2.x/_source/lang/sr.js (revision 5336)
+++ /CKEditor/branches/versions/3.2.x/_source/lang/sr.js (revision 5337)
@@ -1,3 +1,3 @@
-/*
+/*
Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved.
For licensing, see LICENSE.html or http://ckeditor.com/license
Index: /CKEditor/branches/versions/3.2.x/_source/lang/sv.js
===================================================================
--- /CKEditor/branches/versions/3.2.x/_source/lang/sv.js (revision 5336)
+++ /CKEditor/branches/versions/3.2.x/_source/lang/sv.js (revision 5337)
@@ -1,3 +1,3 @@
-/*
+/*
Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved.
For licensing, see LICENSE.html or http://ckeditor.com/license
Index: /CKEditor/branches/versions/3.2.x/_source/lang/th.js
===================================================================
--- /CKEditor/branches/versions/3.2.x/_source/lang/th.js (revision 5336)
+++ /CKEditor/branches/versions/3.2.x/_source/lang/th.js (revision 5337)
@@ -1,3 +1,3 @@
-/*
+/*
Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved.
For licensing, see LICENSE.html or http://ckeditor.com/license
Index: /CKEditor/branches/versions/3.2.x/_source/lang/tr.js
===================================================================
--- /CKEditor/branches/versions/3.2.x/_source/lang/tr.js (revision 5336)
+++ /CKEditor/branches/versions/3.2.x/_source/lang/tr.js (revision 5337)
@@ -1,3 +1,3 @@
-/*
+/*
Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved.
For licensing, see LICENSE.html or http://ckeditor.com/license
Index: /CKEditor/branches/versions/3.2.x/_source/lang/uk.js
===================================================================
--- /CKEditor/branches/versions/3.2.x/_source/lang/uk.js (revision 5336)
+++ /CKEditor/branches/versions/3.2.x/_source/lang/uk.js (revision 5337)
@@ -1,3 +1,3 @@
-/*
+/*
Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved.
For licensing, see LICENSE.html or http://ckeditor.com/license
Index: /CKEditor/branches/versions/3.2.x/_source/lang/vi.js
===================================================================
--- /CKEditor/branches/versions/3.2.x/_source/lang/vi.js (revision 5336)
+++ /CKEditor/branches/versions/3.2.x/_source/lang/vi.js (revision 5337)
@@ -1,3 +1,3 @@
-/*
+/*
Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved.
For licensing, see LICENSE.html or http://ckeditor.com/license
Index: /CKEditor/branches/versions/3.2.x/_source/lang/zh-cn.js
===================================================================
--- /CKEditor/branches/versions/3.2.x/_source/lang/zh-cn.js (revision 5336)
+++ /CKEditor/branches/versions/3.2.x/_source/lang/zh-cn.js (revision 5337)
@@ -1,3 +1,3 @@
-/*
+/*
Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved.
For licensing, see LICENSE.html or http://ckeditor.com/license
Index: /CKEditor/branches/versions/3.2.x/_source/lang/zh.js
===================================================================
--- /CKEditor/branches/versions/3.2.x/_source/lang/zh.js (revision 5336)
+++ /CKEditor/branches/versions/3.2.x/_source/lang/zh.js (revision 5337)
@@ -1,3 +1,3 @@
-/*
+/*
Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved.
For licensing, see LICENSE.html or http://ckeditor.com/license
Index: /CKEditor/branches/versions/3.2.x/_source/plugins/basicstyles/plugin.js
===================================================================
--- /CKEditor/branches/versions/3.2.x/_source/plugins/basicstyles/plugin.js (revision 5336)
+++ /CKEditor/branches/versions/3.2.x/_source/plugins/basicstyles/plugin.js (revision 5337)
@@ -43,4 +43,5 @@
// Basic Inline Styles.
+
/**
* The style definition to be used to apply the bold style in the text.
@@ -51,5 +52,6 @@
* config.coreStyles_bold = { element : 'span', attributes : {'class': 'Bold'} };
*/
-CKEDITOR.config.coreStyles_bold = { element : 'strong', overrides : 'b' };
+CKEDITOR.config.coreStyles_bold = { element : 'strong', overrides : 'b' };
+
/**
* The style definition to be used to apply the italic style in the text.
@@ -57,7 +59,10 @@
* @default { element : 'em', overrides : 'i' }
* @example
- * CKEDITOR.config.coreStyles_italic = { element : 'span', attributes : {'class': 'Italic'} };
+ * config.coreStyles_bold = { element : 'i', overrides : 'em' };
+ * @example
+ * CKEDITOR.config.coreStyles_italic = { element : 'span', attributes : {'class': 'Italic'} };
*/
-CKEDITOR.config.coreStyles_italic = { element : 'em', overrides : 'i' };
+CKEDITOR.config.coreStyles_italic = { element : 'em', overrides : 'i' };
+
/**
* The style definition to be used to apply the underline style in the text.
@@ -65,7 +70,8 @@
* @default { element : 'u' }
* @example
- * CKEDITOR.config.coreStyles_underline = { element : 'span', attributes : {'class': 'Underline'}};
+ * CKEDITOR.config.coreStyles_underline = { element : 'span', attributes : {'class': 'Underline'}};
*/
-CKEDITOR.config.coreStyles_underline = { element : 'u' };
+CKEDITOR.config.coreStyles_underline = { element : 'u' };
+
/**
* The style definition to be used to apply the strike style in the text.
@@ -73,7 +79,8 @@
* @default { element : 'strike' }
* @example
- * CKEDITOR.config.coreStyles_strike = { element : 'span', attributes : {'class': 'StrikeThrough'}, overrides : 'strike' };
+ * CKEDITOR.config.coreStyles_strike = { element : 'span', attributes : {'class': 'StrikeThrough'}, overrides : 'strike' };
*/
-CKEDITOR.config.coreStyles_strike = { element : 'strike' };
+CKEDITOR.config.coreStyles_strike = { element : 'strike' };
+
/**
* The style definition to be used to apply the subscript style in the text.
@@ -81,7 +88,8 @@
* @default { element : 'sub' }
* @example
- * CKEDITOR.config.coreStyles_subscript = { element : 'span', attributes : {'class': 'Subscript'}, overrides : 'sub' };
+ * CKEDITOR.config.coreStyles_subscript = { element : 'span', attributes : {'class': 'Subscript'}, overrides : 'sub' };
*/
-CKEDITOR.config.coreStyles_subscript = { element : 'sub' };
+CKEDITOR.config.coreStyles_subscript = { element : 'sub' };
+
/**
* The style definition to be used to apply the superscript style in the text.
@@ -89,5 +97,5 @@
* @default { element : 'sup' }
* @example
- * CKEDITOR.config.coreStyles_superscript = { element : 'span', attributes : {'class': 'Superscript'}, overrides : 'sup' };
+ * CKEDITOR.config.coreStyles_superscript = { element : 'span', attributes : {'class': 'Superscript'}, overrides : 'sup' };
*/
-CKEDITOR.config.coreStyles_superscript = { element : 'sup' };
+CKEDITOR.config.coreStyles_superscript = { element : 'sup' };
Index: /CKEditor/branches/versions/3.2.x/_source/plugins/contextmenu/plugin.js
===================================================================
--- /CKEditor/branches/versions/3.2.x/_source/plugins/contextmenu/plugin.js (revision 5336)
+++ /CKEditor/branches/versions/3.2.x/_source/plugins/contextmenu/plugin.js (revision 5337)
@@ -1,3 +1,3 @@
-/*
+/*
Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved.
For licensing, see LICENSE.html or http://ckeditor.com/license
Index: /CKEditor/branches/versions/3.2.x/_source/plugins/dialog/plugin.js
===================================================================
--- /CKEditor/branches/versions/3.2.x/_source/plugins/dialog/plugin.js (revision 5336)
+++ /CKEditor/branches/versions/3.2.x/_source/plugins/dialog/plugin.js (revision 5337)
@@ -1,3 +1,3 @@
-/*
+/*
Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved.
For licensing, see LICENSE.html or http://ckeditor.com/license
Index: /CKEditor/branches/versions/3.2.x/_source/plugins/forms/dialogs/checkbox.js
===================================================================
--- /CKEditor/branches/versions/3.2.x/_source/plugins/forms/dialogs/checkbox.js (revision 5336)
+++ /CKEditor/branches/versions/3.2.x/_source/plugins/forms/dialogs/checkbox.js (revision 5337)
@@ -93,14 +93,14 @@
else
{
- if ( CKEDITOR.env.ie )
- {
- // Remove attribute 'value' of checkbox #4721.
- var checkbox = new CKEDITOR.dom.element( 'input' );
- element.copyAttributes( checkbox, { value: 1 } );
- checkbox.replace( element );
- editor.getSelection().selectElement( checkbox );
- data.element = checkbox;
- }
- else
+ if ( CKEDITOR.env.ie )
+ {
+ // Remove attribute 'value' of checkbox #4721.
+ var checkbox = new CKEDITOR.dom.element( 'input' );
+ element.copyAttributes( checkbox, { value: 1 } );
+ checkbox.replace( element );
+ editor.getSelection().selectElement( checkbox );
+ data.element = checkbox;
+ }
+ else
element.removeAttribute( 'value' );
}
Index: /CKEditor/branches/versions/3.2.x/_source/plugins/htmlwriter/plugin.js
===================================================================
--- /CKEditor/branches/versions/3.2.x/_source/plugins/htmlwriter/plugin.js (revision 5336)
+++ /CKEditor/branches/versions/3.2.x/_source/plugins/htmlwriter/plugin.js (revision 5337)
@@ -177,5 +177,5 @@
this.forceSimpleAmpersand && ( attValue = attValue.replace( /&/g, '&' ) );
// Browsers don't always escape special character in attribute values. (#4683, #4719).
- attValue = CKEDITOR.tools.htmlEncodeAttr( attValue );
+ attValue = CKEDITOR.tools.htmlEncodeAttr( attValue );
}
Index: /CKEditor/branches/versions/3.2.x/_source/plugins/image/plugin.js
===================================================================
--- /CKEditor/branches/versions/3.2.x/_source/plugins/image/plugin.js (revision 5336)
+++ /CKEditor/branches/versions/3.2.x/_source/plugins/image/plugin.js (revision 5337)
@@ -72,3 +72,2 @@
* config.image_previewText = CKEDITOR.tools.repeat( '___ ', 100 );
*/
-
Index: /CKEditor/branches/versions/3.2.x/_source/plugins/link/dialogs/link.js
===================================================================
--- /CKEditor/branches/versions/3.2.x/_source/plugins/link/dialogs/link.js (revision 5336)
+++ /CKEditor/branches/versions/3.2.x/_source/plugins/link/dialogs/link.js (revision 5337)
@@ -783,5 +783,5 @@
data.target = {};
- data.target.name = this.getValue().replace(/\W/gi, '');
+ data.target.name = this.getValue().replace(/\W/gi, '');
}
}
Index: /CKEditor/branches/versions/3.2.x/_source/plugins/link/plugin.js
===================================================================
--- /CKEditor/branches/versions/3.2.x/_source/plugins/link/plugin.js (revision 5336)
+++ /CKEditor/branches/versions/3.2.x/_source/plugins/link/plugin.js (revision 5337)
@@ -155,5 +155,5 @@
* @example CKEDITOR.plugins.link.getSelectedLink( editor );
* @since 3.2.1
- * The following selection will all return the link element.
+ * The following selection will all return the link element.
*
* li^nk
Index: /CKEditor/branches/versions/3.2.x/_source/plugins/panel/plugin.js
===================================================================
--- /CKEditor/branches/versions/3.2.x/_source/plugins/panel/plugin.js (revision 5336)
+++ /CKEditor/branches/versions/3.2.x/_source/plugins/panel/plugin.js (revision 5337)
@@ -230,5 +230,5 @@
// Disable context menu for block panel.
holder.getParent().getParent().disableContextMenu();
-
+
if ( current )
{
Index: /CKEditor/branches/versions/3.2.x/_source/plugins/resize/plugin.js
===================================================================
--- /CKEditor/branches/versions/3.2.x/_source/plugins/resize/plugin.js (revision 5336)
+++ /CKEditor/branches/versions/3.2.x/_source/plugins/resize/plugin.js (revision 5337)
@@ -54,7 +54,7 @@
editor.document.on( 'mouseup', dragEndHandler );
}
- } );
+ });
- editor.on( 'destroy', function() { CKEDITOR.tools.removeFunction( mouseDownFn ) } );
+ editor.on( 'destroy', function() { CKEDITOR.tools.removeFunction( mouseDownFn ); } );
editor.on( 'themeSpace', function( event )
Index: /CKEditor/branches/versions/3.2.x/_source/plugins/scayt/plugin.js
===================================================================
--- /CKEditor/branches/versions/3.2.x/_source/plugins/scayt/plugin.js (revision 5336)
+++ /CKEditor/branches/versions/3.2.x/_source/plugins/scayt/plugin.js (revision 5337)
@@ -42,9 +42,9 @@
oParams.srcNodeRef = editor.document.getWindow().$.frameElement;
// syntax : AppName.AppVersion@AppRevision
- oParams.assocApp = "CKEDITOR." + CKEDITOR.version + "@" + CKEDITOR.revision;
- oParams.customerid = editor.config.scayt_customerid || "1:WvF0D4-UtPqN1-43nkD4-NKvUm2-daQqk3-LmNiI-z7Ysb4-mwry24-T8YrS3-Q2tpq2";
+ oParams.assocApp = 'CKEDITOR.' + CKEDITOR.version + '@' + CKEDITOR.revision;
+ oParams.customerid = editor.config.scayt_customerid || '1:WvF0D4-UtPqN1-43nkD4-NKvUm2-daQqk3-LmNiI-z7Ysb4-mwry24-T8YrS3-Q2tpq2';
oParams.customDictionaryIds = editor.config.scayt_customDictionaryIds || '';
oParams.userDictionaryName = editor.config.scayt_userDictionaryName || '';
- oParams.sLang = editor.config.scayt_sLang || "en_US";
+ oParams.sLang = editor.config.scayt_sLang || 'en_US';
oParams.onBeforeChange = function()
@@ -62,8 +62,8 @@
}
}
-
+ // needs for restoring a specific scayt control settings
if ( scayt_control_id )
oParams.id = scayt_control_id;
-
+
var scayt_control = new window.scayt( oParams );
@@ -118,10 +118,11 @@
if ( (ev.data.name == 'source' || ev.data.name == 'newpage') && editor.mode == 'wysiwyg' )
{
- var scayt_instanse = plugin.getScayt( editor );
- if ( scayt_instanse )
- {
- scayt_paused = scayt_instanse.paused = !scayt_instanse.disabled;
- scayt_control_id = scayt_instanse.id;
- scayt_instanse.destroy( true );
+ var scayt_instance = plugin.getScayt( editor );
+ if ( scayt_instance )
+ {
+ scayt_paused = scayt_instance.paused = !scayt_instance.disabled;
+ // store a control id for restore a specific scayt control settings
+ scayt_control_id = scayt_instance.id;
+ scayt_instance.destroy( true );
delete plugin.instances[ editor.name ];
}
@@ -129,15 +130,19 @@
});
-
- editor.on( 'destroy', function()
- {
- scayt_control_id = scayt_instanse.id;
- plugin.getScayt( editor ).destroy( true );
+ editor.on( 'destroy', function( ev )
+ {
+ var editor = ev.editor,
+ scayt_instance = plugin.getScayt( editor );
+ // store a control id for restore a specific scayt control settings
+ scayt_control_id = scayt_instance.id;
+ scayt_instance.destroy( true );
+ delete plugin.instances[ editor.name ];
});
+
// Listen to data manipulation to reflect scayt markup.
editor.on( 'afterSetData', function()
{
if ( plugin.isScaytEnabled( editor ) ) {
- window.setTimeout( function(){ plugin.getScayt( editor ).refresh() }, 10 );
+ window.setTimeout( function(){ plugin.getScayt( editor ).refresh(); }, 10 );
}
});
@@ -155,5 +160,5 @@
// Swallow any SCAYT engine errors.
- window.setTimeout( function(){ scayt_instance.refresh() }, 10 );
+ window.setTimeout( function(){ scayt_instance.refresh(); }, 10 );
}
}, this, null, 50 );
@@ -161,5 +166,4 @@
editor.on( 'insertHtml', function()
{
-
var scayt_instance = plugin.getScayt( editor );
if ( plugin.isScaytEnabled( editor ) )
@@ -171,7 +175,5 @@
// Swallow any SCAYT engine errors.
-
- window.setTimeout( function(){ scayt_instance.refresh() },10 );
-
+ window.setTimeout( function(){ scayt_instance.refresh(); },10 );
}
}, this, null, 50 );
@@ -187,4 +189,5 @@
var dataProcessor = editor.dataProcessor,
htmlFilter = dataProcessor && dataProcessor.htmlFilter;
+
if ( htmlFilter )
{
@@ -225,6 +228,6 @@
isScaytEnabled : function( editor )
{
- var scayt_instanse = this.getScayt( editor );
- return ( scayt_instanse ) ? scayt_instanse.disabled === false : false;
+ var scayt_instance = this.getScayt( editor );
+ return ( scayt_instance ) ? scayt_instance.disabled === false : false;
},
loadEngine : function( editor )
@@ -232,9 +235,10 @@
// SCAYT doesn't work with Opera.
if ( CKEDITOR.env.opera )
- return;
+ return null;
+
if ( this.engineLoaded === true )
return onEngineLoad.apply( editor ); // Add new instance.
else if ( this.engineLoaded == -1 ) // We are waiting.
- return CKEDITOR.on( 'scaytReady', function(){ onEngineLoad.apply( editor );} ); // Use function(){} to avoid rejection as duplicate.
+ return CKEDITOR.on( 'scaytReady', function(){ onEngineLoad.apply( editor ); } ); // Use function(){} to avoid rejection as duplicate.
CKEDITOR.on( 'scaytReady', onEngineLoad, editor );
@@ -245,5 +249,5 @@
this,
null,
- 0
+ 0
); // First to run.
@@ -254,8 +258,8 @@
// Default to 'http' for unknown.
protocol = protocol.search( /https?:/) != -1? protocol : 'http:';
- var baseUrl = "svc.spellchecker.net/spellcheck31/lf/scayt/scayt22.js";
-
- var scaytUrl = editor.config.scayt_srcUrl || ( protocol + "//" + baseUrl );
- var scaytConfigBaseUrl = plugin.parseUrl( scaytUrl ).path + "/";
+ var baseUrl = 'svc.spellchecker.net/spellcheck31/lf/scayt/scayt22.js';
+
+ var scaytUrl = editor.config.scayt_srcUrl || ( protocol + '//' + baseUrl );
+ var scaytConfigBaseUrl = plugin.parseUrl( scaytUrl ).path + '/';
CKEDITOR._djScaytConfig =
@@ -266,5 +270,5 @@
function()
{
- CKEDITOR.fireOnce( "scaytReady" );
+ CKEDITOR.fireOnce( 'scaytReady' );
}
],
@@ -366,13 +370,13 @@
CKEDITOR.dialog.add( commandName, CKEDITOR.getUrl( this.path + 'dialogs/options.js' ) );
// read ui tags
- var confuiTabs = editor.config.scayt_uiTabs || "1,1,1";
+ var confuiTabs = editor.config.scayt_uiTabs || '1,1,1';
var uiTabs =[];
- // string tp array convert
- confuiTabs = confuiTabs.split(",");
- // check array length ! allwaays must be 3 filled with 1 or 0
+ // string to array convert
+ confuiTabs = confuiTabs.split( ',' );
+ // check array length ! always must be 3 filled with 1 or 0
for (var i=0,l=3; i