Index: /CKEditor/branches/versions/3.4.x/CHANGES.html
===================================================================
--- /CKEditor/branches/versions/3.4.x/CHANGES.html (revision 6233)
+++ /CKEditor/branches/versions/3.4.x/CHANGES.html (revision 6234)
@@ -35,4 +35,33 @@
CKEditor Changelog
+
+ CKEditor 3.5 (SVN)
+
+ New features:
+
+
+ Fixed issues:
+
+ - #6419 : IE: List creation by merging problem.
+ - #5599 : Labels for special characters need to be resourced.
+
+
+ CKEditor 3.4.3 (SVN)
+
+ New features:
+
+
+ Fixed issues:
+
+ - #6569 : Indentation now honors text direction of the only item.
+ - #6579 : The jQuery adapter wasn't working properly tunning on incompatible environments.
+ - #6644 : Restrict onmousedown handler to the toolbar area.
+ - #6656 : Panelbutton's buttons became active when clicking on source.
+ - #5404 : Whitespaces (NBSP) were incorrectly added into empty table cells and list items.
+
CKEditor 3.4.2
Index: /CKEditor/branches/versions/3.4.x/_dev/releaser/release.bat
===================================================================
--- /CKEditor/branches/versions/3.4.x/_dev/releaser/release.bat (revision 6233)
+++ /CKEditor/branches/versions/3.4.x/_dev/releaser/release.bat (revision 6234)
@@ -11,3 +11,3 @@
:: rmdir /S /Q release
-java -jar ckreleaser/ckreleaser.jar ckreleaser.release ../.. release "3.4.2" ckeditor_3.4.2 --run-before-release=langtool.bat
+java -jar ckreleaser/ckreleaser.jar ckreleaser.release ../.. release "3.4.3 (SVN)" ckeditor_3.4.3_svn --run-before-release=langtool.bat
Index: /CKEditor/branches/versions/3.4.x/_dev/releaser/release.sh
===================================================================
--- /CKEditor/branches/versions/3.4.x/_dev/releaser/release.sh (revision 6233)
+++ /CKEditor/branches/versions/3.4.x/_dev/releaser/release.sh (revision 6234)
@@ -13,4 +13,4 @@
pushd $DIR
-java -jar ckreleaser/ckreleaser.jar ckreleaser.release ../.. release "3.4.2" ckeditor_3.4.2 --run-before-release=$LANGTOOL
+java -jar ckreleaser/ckreleaser.jar ckreleaser.release ../.. release "3.4.3 (SVN)" ckeditor_3.4.3_svn --run-before-release=$LANGTOOL
popd
Index: /CKEditor/branches/versions/3.4.x/_source/adapters/jquery.js
===================================================================
--- /CKEditor/branches/versions/3.4.x/_source/adapters/jquery.js (revision 6233)
+++ /CKEditor/branches/versions/3.4.x/_source/adapters/jquery.js (revision 6234)
@@ -98,4 +98,7 @@
ckeditor: function( callback, config )
{
+ if ( !CKEDITOR.env.isCompatible )
+ return this;
+
if ( !jQuery.isFunction( callback ))
{
Index: /CKEditor/branches/versions/3.4.x/_source/core/dom/domobject.js
===================================================================
--- /CKEditor/branches/versions/3.4.x/_source/core/dom/domobject.js (revision 6233)
+++ /CKEditor/branches/versions/3.4.x/_source/core/dom/domobject.js (revision 6234)
@@ -168,4 +168,7 @@
* Sets a data slot value for this object. These values are shared by all
* instances pointing to that same DOM object.
+ * Note: The created data slot is only guarantied to be available on this unique dom node,
+ * thus any wish to continue access it from other element clones (either created by clone node or from innerHtml)
+ * will fail, for such usage, please use {@link CKEDITOR.dom.element::setAttribute} instead.
* @name CKEDITOR.dom.domObject.prototype.setCustomData
* @function
Index: /CKEditor/branches/versions/3.4.x/_source/core/dom/node.js
===================================================================
--- /CKEditor/branches/versions/3.4.x/_source/core/dom/node.js (revision 6233)
+++ /CKEditor/branches/versions/3.4.x/_source/core/dom/node.js (revision 6234)
@@ -108,22 +108,23 @@
var $clone = this.$.cloneNode( includeChildren );
- if ( !cloneId )
- {
- var removeIds = function( node )
- {
- if ( node.nodeType != CKEDITOR.NODE_ELEMENT )
- return;
-
- node.removeAttribute( 'id', false ) ;
- node.removeAttribute( '_cke_expando', false ) ;
-
+ var removeIds = function( node )
+ {
+ if ( node.nodeType != CKEDITOR.NODE_ELEMENT )
+ return;
+
+ if ( !cloneId )
+ node.removeAttribute( 'id', false );
+ node.removeAttribute( '_cke_expando', false );
+
+ if ( includeChildren )
+ {
var childs = node.childNodes;
- for ( var i=0 ; i < childs.length ; i++ )
+ for ( var i=0; i < childs.length; i++ )
removeIds( childs[ i ] );
- };
-
- // The "id" attribute should never be cloned to avoid duplication.
- removeIds( $clone );
- }
+ }
+ };
+
+ // The "id" attribute should never be cloned to avoid duplication.
+ removeIds( $clone );
return new CKEDITOR.dom.node( $clone );
Index: /CKEditor/branches/versions/3.4.x/_source/core/dom/range.js
===================================================================
--- /CKEditor/branches/versions/3.4.x/_source/core/dom/range.js (revision 6233)
+++ /CKEditor/branches/versions/3.4.x/_source/core/dom/range.js (revision 6234)
@@ -1406,5 +1406,5 @@
if( startNode.type == CKEDITOR.NODE_ELEMENT
&& CKEDITOR.dtd.$empty[ startNode.getName() ] )
- startNode = startNode.getParent(), startOffset = startNode.getIndex();
+ startOffset = startNode.getIndex(), startNode = startNode.getParent();
this.startContainer = startNode;
Index: /CKEditor/branches/versions/3.4.x/_source/plugins/htmldataprocessor/plugin.js
===================================================================
--- /CKEditor/branches/versions/3.4.x/_source/plugins/htmldataprocessor/plugin.js (revision 6233)
+++ /CKEditor/branches/versions/3.4.x/_source/plugins/htmldataprocessor/plugin.js (revision 6234)
@@ -39,6 +39,15 @@
}
- function blockNeedsExtension( block )
- {
+ function blockNeedsExtension( block, fromSource )
+ {
+ // 1. For IE version >=8, empty blocks are displayed correctly themself in wysiwiyg;
+ // 2. For the rest, at least table cell and list item need no filler space.
+ // (#6248)
+ if ( fromSource && CKEDITOR.env.ie &&
+ ( document.documentMode > 7
+ || block.name in CKEDITOR.dtd.tr
+ || block.name in CKEDITOR.dtd.$listItem ) )
+ return false;
+
var lastChild = lastNoneSpaceChild( block );
@@ -54,5 +63,5 @@
trimFillers( block, true );
- if ( blockNeedsExtension( block ) )
+ if ( blockNeedsExtension( block, true ) )
{
if ( CKEDITOR.env.ie )
Index: /CKEditor/branches/versions/3.4.x/_source/plugins/indent/plugin.js
===================================================================
--- /CKEditor/branches/versions/3.4.x/_source/plugins/indent/plugin.js (revision 6233)
+++ /CKEditor/branches/versions/3.4.x/_source/plugins/indent/plugin.js (revision 6234)
@@ -79,7 +79,7 @@
// Returns the CSS property to be used for identing a given element.
- function getIndentCssProperty( element )
- {
- return element.getComputedStyle( 'direction' ) == 'ltr' ? 'margin-left' : 'margin-right';
+ function getIndentCssProperty( element, dir )
+ {
+ return ( dir || element.getComputedStyle( 'direction' ) ) == 'ltr' ? 'margin-left' : 'margin-right';
}
@@ -158,6 +158,5 @@
// Convert the array back to a DOM forest (yes we might have a few subtrees now).
// And replace the old list with the new forest.
- var newListDir = listNode.getAttribute( 'dir' ) || listNode.getStyle( 'direction' );
- var newList = CKEDITOR.plugins.list.arrayToList( listArray, database, null, editor.config.enterMode, newListDir );
+ var newList = CKEDITOR.plugins.list.arrayToList( listArray, database, null, editor.config.enterMode, listNode.getDirection() );
// Avoid nested after outdent even they're visually same,
@@ -221,5 +220,5 @@
}
- function indentElement( element )
+ function indentElement( element, dir )
{
if ( element.getCustomData( 'indent_processed' ) )
@@ -257,5 +256,5 @@
else
{
- var indentCssProperty = getIndentCssProperty( element ),
+ var indentCssProperty = getIndentCssProperty( element, dir ),
currentOffset = parseInt( element.getStyle( indentCssProperty ), 10 );
if ( isNaN( currentOffset ) )
@@ -329,8 +328,6 @@
if ( nearestListBlock )
{
- var firstListItem = nearestListBlock.getFirst( function( node )
- {
- return node.type == CKEDITOR.NODE_ELEMENT && node.is( 'li' );
- }),
+ var firstListItem = nearestListBlock.getFirst( isListItem ),
+ hasMultipleItems = !!firstListItem.getNext( isListItem ),
rangeStart = range.startContainer,
indentWholeList = firstListItem.equals( rangeStart ) || firstListItem.contains( rangeStart );
@@ -340,5 +337,5 @@
if ( !( indentWholeList &&
( self.name == 'indent' || self.useIndentClasses || parseInt( nearestListBlock.getStyle( getIndentCssProperty( nearestListBlock ) ), 10 ) ) &&
- indentElement( nearestListBlock ) ) )
+ indentElement( nearestListBlock, !hasMultipleItems && firstListItem.getDirection() ) ) )
indentList( nearestListBlock );
}
Index: /CKEditor/branches/versions/3.4.x/_source/plugins/listblock/plugin.js
===================================================================
--- /CKEditor/branches/versions/3.4.x/_source/plugins/listblock/plugin.js (revision 6233)
+++ /CKEditor/branches/versions/3.4.x/_source/plugins/listblock/plugin.js (revision 6234)
@@ -94,5 +94,5 @@
pendingHtml.push(
- '' +
+ '' +
' is also captured,
- // but we must stop the even propagation, otherwise
- // it's not possible to place the caret inside of it (non IE and IE9).
- if ( document.addEventListener )
- {
- textarea.on( 'mousedown', function( evt )
- {
- evt.data.stopPropagation();
- } );
}
Index: /CKEditor/branches/versions/3.4.x/_source/plugins/specialchar/dialogs/specialchar.js
===================================================================
--- /CKEditor/branches/versions/3.4.x/_source/plugins/specialchar/dialogs/specialchar.js (revision 6233)
+++ /CKEditor/branches/versions/3.4.x/_source/plugins/specialchar/dialogs/specialchar.js (revision 6234)
@@ -223,46 +223,9 @@
buttons : [ CKEDITOR.dialog.cancelButton ],
charColumns : 17,
- chars :
- [
- '!','"','#','$','%','&',"'",'(',')','*','+','-','.','/',
- '0','1','2','3','4','5','6','7','8','9',':',';',
- '<','=','>','?','@',
- 'A','B','C','D','E','F','G','H','I','J','K','L','M','N','O',
- 'P','Q','R','S','T','U','V','W','X','Y','Z',
- '[',']','^','_','`',
- 'a','b','c','d','e','f','g','h','i','j','k','l','m','n','o','p',
- 'q','r','s','t','u','v','w','x','y','z',
- '{','|','}','~','€(EURO SIGN)','‘(LEFT SINGLE QUOTATION MARK)','’(RIGHT SINGLE QUOTATION MARK)','“(LEFT DOUBLE QUOTATION MARK)',
- '”(RIGHT DOUBLE QUOTATION MARK)','–(EN DASH)','—(EM DASH)','¡(INVERTED EXCLAMATION MARK)','¢(CENT SIGN)','£(POUND SIGN)',
- '¤(CURRENCY SIGN)','¥(YEN SIGN)','¦(BROKEN BAR)','§(SECTION SIGN)','¨(DIAERESIS)','©(COPYRIGHT SIGN)','ª(FEMININE ORDINAL INDICATOR)',
- '«(LEFT-POINTING DOUBLE ANGLE QUOTATION MARK)','¬(NOT SIGN)','®(REGISTERED SIGN)','¯(MACRON)','°(DEGREE SIGN)','±(PLUS-MINUS SIGN)','²(SUPERSCRIPT TWO)',
- '³(SUPERSCRIPT THREE)','´(ACUTE ACCENT)','µ(MICRO SIGN)','¶(PILCROW SIGN)','·(MIDDLE DOT)','¸(CEDILLA)',
- '¹(SUPERSCRIPT ONE)','º(MASCULINE ORDINAL INDICATOR)','»(RIGHT-POINTING DOUBLE ANGLE QUOTATION MARK)','¼(VULGAR FRACTION ONE QUARTER)','½(VULGAR FRACTION ONE HALF)','¾(VULGAR FRACTION THREE QUARTERS)',
- '¿(INVERTED QUESTION MARK)','À(LATIN CAPITAL LETTER A WITH GRAVE)','Á(LATIN CAPITAL LETTER A WITH ACUTE)','Â(LATIN CAPITAL LETTER A WITH CIRCUMFLEX)','Ã(LATIN CAPITAL LETTER A WITH TILDE)','Ä(LATIN CAPITAL LETTER A WITH DIAERESIS)',
- 'Å(LATIN CAPITAL LETTER A WITH RING ABOVE)','Æ(LATIN CAPITAL LETTER AE)','Ç(LATIN CAPITAL LETTER C WITH CEDILLA)','È(LATIN CAPITAL LETTER E WITH GRAVE)','É(LATIN CAPITAL LETTER E WITH ACUTE)','Ê(LATIN CAPITAL LETTER E WITH CIRCUMFLEX)',
- 'Ë(LATIN CAPITAL LETTER E WITH DIAERESIS)','Ì(LATIN CAPITAL LETTER I WITH GRAVE)','Í(LATIN CAPITAL LETTER I WITH ACUTE)','Î(LATIN CAPITAL LETTER I WITH CIRCUMFLEX)','Ï(LATIN CAPITAL LETTER I WITH DIAERESIS)','Ð(LATIN CAPITAL LETTER ETH)',
- 'Ñ(LATIN CAPITAL LETTER N WITH TILDE)','Ò(LATIN CAPITAL LETTER O WITH GRAVE)','Ó(LATIN CAPITAL LETTER O WITH ACUTE)','Ô(LATIN CAPITAL LETTER O WITH CIRCUMFLEX)','Õ(LATIN CAPITAL LETTER O WITH TILDE)','Ö(LATIN CAPITAL LETTER O WITH DIAERESIS)',
- '×(MULTIPLICATION SIGN)','Ø(LATIN CAPITAL LETTER O WITH STROKE)','Ù(LATIN CAPITAL LETTER U WITH GRAVE)','Ú(LATIN CAPITAL LETTER U WITH ACUTE)','Û(LATIN CAPITAL LETTER U WITH CIRCUMFLEX)','Ü(LATIN CAPITAL LETTER U WITH DIAERESIS)',
- 'Ý(LATIN CAPITAL LETTER Y WITH ACUTE)','Þ(LATIN CAPITAL LETTER THORN)','ß(LATIN SMALL LETTER SHARP S)','à(LATIN SMALL LETTER A WITH GRAVE)','á(LATIN SMALL LETTER A WITH ACUTE)','â(LATIN SMALL LETTER A WITH CIRCUMFLEX)',
- 'ã(LATIN SMALL LETTER A WITH TILDE)','ä(LATIN SMALL LETTER A WITH DIAERESIS)','å(LATIN SMALL LETTER A WITH RING ABOVE)','æ(LATIN SMALL LETTER AE)','ç(LATIN SMALL LETTER C WITH CEDILLA)','è(LATIN SMALL LETTER E WITH GRAVE)',
- 'é(LATIN SMALL LETTER E WITH ACUTE)','ê(LATIN SMALL LETTER E WITH CIRCUMFLEX)','ë(LATIN SMALL LETTER E WITH DIAERESIS)','ì(LATIN SMALL LETTER I WITH GRAVE)','í(LATIN SMALL LETTER I WITH ACUTE)','î(LATIN SMALL LETTER I WITH CIRCUMFLEX)',
- 'ï(LATIN SMALL LETTER I WITH DIAERESIS)','ð(LATIN SMALL LETTER ETH)','ñ(LATIN SMALL LETTER N WITH TILDE)','ò(LATIN SMALL LETTER O WITH GRAVE)','ó(LATIN SMALL LETTER O WITH ACUTE)','ô(LATIN SMALL LETTER O WITH CIRCUMFLEX)',
- 'õ(LATIN SMALL LETTER O WITH TILDE)','ö(LATIN SMALL LETTER O WITH DIAERESIS)',
- '÷(DIVISION SIGN)','ø(LATIN SMALL LETTER O WITH STROKE)',
- 'ù(LATIN SMALL LETTER U WITH GRAVE)','ú(LATIN SMALL LETTER U WITH ACUTE)',
- 'û(LATIN SMALL LETTER U WITH CIRCUMFLEX)','ü(LATIN SMALL LETTER U WITH DIAERESIS)',
- 'ü(LATIN SMALL LETTER U WITH DIAERESIS)','ý(LATIN SMALL LETTER Y WITH ACUTE)','þ(LATIN SMALL LETTER THORN)','ÿ(LATIN SMALL LETTER Y WITH DIAERESIS)',
- 'Œ(LATIN CAPITAL LIGATURE OE)',
- 'œ(LATIN SMALL LIGATURE OE)','Ŵ(LATIN CAPITAL LETTER W WITH CIRCUMFLEX)',
- 'Ŷ(LATIN CAPITAL LETTER Y WITH CIRCUMFLEX)','ŵ(LATIN SMALL LETTER W WITH CIRCUMFLEX)',
- 'ŷ(LATIN SMALL LETTER Y WITH CIRCUMFLEX)','‚(SINGLE LOW-9 QUOTATION MARK)',
- '‛(SINGLE HIGH-REVERSED-9 QUOTATION MARK)','„(DOUBLE LOW-9 QUOTATION MARK)','…(HORIZONTAL ELLIPSIS)',
- '™(TRADE MARK SIGN)','►(BLACK RIGHT-POINTING POINTER)','•(BULLET)',
- '→(RIGHTWARDS ARROW)','⇒(RIGHTWARDS DOUBLE ARROW)','⇔(LEFT RIGHT DOUBLE ARROW)','♦(BLACK DIAMOND SUIT)','≈(ALMOST EQUAL TO)'
- ],
onLoad : function()
{
var columns = this.definition.charColumns,
- chars = this.definition.chars;
+ extraChars = editor.config.extraSpecialChars,
+ chars = editor.config.specialChars;
var charsTableLabel = CKEDITOR.tools.getNextId() + '_specialchar_table_label';
@@ -285,12 +248,17 @@
{
charDesc = '';
- character = character.replace( /\((.*?)\)/, function( match, desc )
- {
- charDesc = desc;
- return '';
- } );
-
- // Use character in case description unavailable.
- charDesc = charDesc || character;
+
+ if ( character instanceof Array )
+ {
+ charDesc = character[ 1 ];
+ character = character[ 0 ];
+ }
+ else
+ {
+ var _tmpName = character.toLowerCase().replace( '&', '' ).replace( ';', '' ).replace( '#', '' );
+
+ // Use character in case description unavailable.
+ charDesc = lang[ _tmpName ] || character;
+ }
var charLabelId = 'cke_specialchar_label_' + i + '_' + CKEDITOR.tools.getNextNumber();
Index: /CKEditor/branches/versions/3.4.x/_source/plugins/specialchar/lang/en.js
===================================================================
--- /CKEditor/branches/versions/3.4.x/_source/plugins/specialchar/lang/en.js (revision 6234)
+++ /CKEditor/branches/versions/3.4.x/_source/plugins/specialchar/lang/en.js (revision 6234)
@@ -0,0 +1,89 @@
+
+CKEDITOR.plugins.setLang( 'specialchar', 'en',
+{
+ euro: "EURO SIGN",
+ lsquo: "LEFT SINGLE QUOTATION MARK",
+ rsquo: "RIGHT SINGLE QUOTATION MARK",
+ ldquo: "LEFT DOUBLE QUOTATION MARK",
+ rdquo: "RIGHT DOUBLE QUOTATION MARK",
+ ndash: "EN DASH",
+ mdash: "EM DASH",
+ iexcl: "INVERTED EXCLAMATION MARK",
+ cent: "CENT SIGN",
+ pound: "POUND SIGN",
+ curren: "CURRENCY SIGN",
+ yen: "YEN SIGN",
+ brvbar: "BROKEN BAR",
+ sect: "SECTION SIGN",
+ uml: "DIAERESIS",
+ copy: "COPYRIGHT SIGN",
+ ordf: "FEMININE ORDINAL INDICATOR",
+ laquo: "LEFT-POINTING DOUBLE ANGLE QUOTATION MARK",
+ not: "NOT SIGN",
+ reg: "REGISTERED SIGN",
+ macr: "MACRON",
+ deg: "DEGREE SIGN",
+ sup2: "SUPERSCRIPT TWO",
+ sup3: "SUPERSCRIPT THREE",
+ acute: "ACUTE ACCENT",
+ micro: "MICRO SIGN",
+ para: "PILCROW SIGN",
+ middot: "MIDDLE DOT",
+ cedil: "CEDILLA",
+ sup1: "SUPERSCRIPT ONE",
+ ordm: "MASCULINE ORDINAL INDICATOR",
+ frac14: "VULGAR FRACTION ONE QUARTER",
+ frac12: "VULGAR FRACTION ONE HALF",
+ frac34: "VULGAR FRACTION THREE QUARTERS",
+ iquest: "INVERTED QUESTION MARK",
+ agrave: "LATIN SMALL LETTER A WITH GRAVE",
+ aacute: "LATIN SMALL LETTER A WITH ACUTE",
+ acirc: "LATIN SMALL LETTER A WITH CIRCUMFLEX",
+ atilde: "LATIN SMALL LETTER A WITH TILDE",
+ auml: "LATIN SMALL LETTER A WITH DIAERESIS",
+ aring: "LATIN SMALL LETTER A WITH RING ABOVE",
+ aelig: "LATIN SMALL LETTER AE",
+ ccedil: "LATIN SMALL LETTER C WITH CEDILLA",
+ egrave: "LATIN SMALL LETTER E WITH GRAVE",
+ eacute: "LATIN SMALL LETTER E WITH ACUTE",
+ ecirc: "LATIN SMALL LETTER E WITH CIRCUMFLEX",
+ euml: "LATIN SMALL LETTER E WITH DIAERESIS",
+ igrave: "LATIN SMALL LETTER I WITH GRAVE",
+ iacute: "LATIN SMALL LETTER I WITH ACUTE",
+ icirc: "LATIN SMALL LETTER I WITH CIRCUMFLEX",
+ iuml: "LATIN SMALL LETTER I WITH DIAERESIS",
+ eth: "LATIN SMALL LETTER ETH",
+ ntilde: "LATIN SMALL LETTER N WITH TILDE",
+ ograve: "LATIN SMALL LETTER O WITH GRAVE",
+ oacute: "LATIN SMALL LETTER O WITH ACUTE",
+ ocirc: "LATIN SMALL LETTER O WITH CIRCUMFLEX",
+ otilde: "LATIN SMALL LETTER O WITH TILDE",
+ ouml: "LATIN SMALL LETTER O WITH DIAERESIS",
+ times: "MULTIPLICATION SIGN",
+ oslash: "LATIN SMALL LETTER O WITH STROKE",
+ ugrave: "LATIN SMALL LETTER U WITH GRAVE",
+ uacute: "LATIN SMALL LETTER U WITH ACUTE",
+ ucirc: "LATIN SMALL LETTER U WITH CIRCUMFLEX",
+ uuml: "LATIN SMALL LETTER U WITH DIAERESIS",
+ yacute: "LATIN SMALL LETTER Y WITH ACUTE",
+ thorn: "LATIN SMALL LETTER THORN",
+ szlig: "LATIN SMALL LETTER SHARP S",
+ divide: "DIVISION SIGN",
+ yuml: "LATIN SMALL LETTER Y WITH DIAERESIS",
+ oelig: "LATIN SMALL LIGATURE OE",
+ '372': "LATIN CAPITAL LETTER W WITH CIRCUMFLEX",
+ '374': "LATIN CAPITAL LETTER Y WITH CIRCUMFLEX",
+ '373': "LATIN SMALL LETTER W WITH CIRCUMFLEX",
+ '375': "LATIN SMALL LETTER Y WITH CIRCUMFLEX",
+ 8219: "SINGLE HIGH-REVERSED-9 QUOTATION MARK",
+ bdquo: "DOUBLE LOW-9 QUOTATION MARK",
+ hellip: "HORIZONTAL ELLIPSIS",
+ trade: "TRADE MARK SIGN",
+ '9658': "BLACK RIGHT-POINTING POINTER",
+ bull: "BULLET",
+ rarr: "RIGHTWARDS DOUBLE ARROW",
+ harr: "LEFT RIGHT DOUBLE ARROW",
+ diams: "BLACK DIAMOND SUIT",
+ asymp: "ALMOST EQUAL TO",
+ sbquo: 'SINGLE LOW-9 QUOTATION MARK'
+});
Index: /CKEditor/branches/versions/3.4.x/_source/plugins/specialchar/plugin.js
===================================================================
--- /CKEditor/branches/versions/3.4.x/_source/plugins/specialchar/plugin.js (revision 6233)
+++ /CKEditor/branches/versions/3.4.x/_source/plugins/specialchar/plugin.js (revision 6234)
@@ -10,13 +10,33 @@
CKEDITOR.plugins.add( 'specialchar',
{
+ // List of available localizations.
+ availableLangs : { en:1 },
+
init : function( editor )
{
- var pluginName = 'specialchar';
+ var pluginName = 'specialchar',
+ plugin = this;
// Register the dialog.
CKEDITOR.dialog.add( pluginName, this.path + 'dialogs/specialchar.js' );
- // Register the command.
- editor.addCommand( pluginName, new CKEDITOR.dialogCommand( pluginName ) );
+ editor.addCommand( pluginName,
+ {
+ exec : function()
+ {
+ var langCode = editor.langCode;
+ langCode = plugin.availableLangs[ langCode ] ? langCode : 'en';
+
+ CKEDITOR.scriptLoader.load(
+ CKEDITOR.getUrl( plugin.path + 'lang/' + langCode + '.js' ),
+ function()
+ {
+ CKEDITOR.tools.extend( editor.lang.specialChar, plugin.lang[ langCode ] );
+ editor.openDialog( pluginName );
+ });
+ },
+ modes : { wysiwyg:1 },
+ canUndo : false
+ });
// Register the toolbar button.
@@ -28,2 +48,23 @@
}
} );
+
+/**
+ * The list of special characters visible in Special Character dialog.
+ * @type Array
+ * @example
+ * config.specialChars = [ '"', '’', [ '&custom;', 'Custom label' ] ];
+ * config.specialChars = config.specialChars.concat( [ '"', [ '’', 'Custom label' ] ] );
+ */
+CKEDITOR.config.specialChars =
+ [
+ '!','"','#','$','%','&',"'",'(',')','*','+','-','.','/',
+ '0','1','2','3','4','5','6','7','8','9',':',';',
+ '<','=','>','?','@',
+ 'A','B','C','D','E','F','G','H','I','J','K','L','M','N','O',
+ 'P','Q','R','S','T','U','V','W','X','Y','Z',
+ '[',']','^','_','`',
+ 'a','b','c','d','e','f','g','h','i','j','k','l','m','n','o','p',
+ 'q','r','s','t','u','v','w','x','y','z',
+ '{','|','}','~',
+ "€", "‘", "’", "“", "”", "–", "—", "¡", "¢", "£", "¤", "¥", "¦", "§", "¨", "©", "ª", "«", "¬", "®", "¯", "°", "&", "²", "³", "´", "µ", "¶", "·", "¸", "¹", "º", "&", "¼", "½", "¾", "¿", "À", "Á", "Â", "Ã", "Ä", "Å", "Æ", "Ç", "È", "É", "Ê", "Ë", "Ì", "Í", "Î", "Ï", "Ð", "Ñ", "Ò", "Ó", "Ô", "Õ", "Ö", "×", "Ø", "Ù", "Ú", "Û", "Ü", "Ý", "Þ", "ß", "à", "á", "â", "ã", "ä", "å", "æ", "ç", "è", "é", "ê", "ë", "ì", "í", "î", "ï", "ð", "ñ", "ò", "ó", "ô", "õ", "ö", "÷", "ø", "ù", "ú", "û", "ü", "ü", "ý", "þ", "ÿ", "Œ", "œ", "Ŵ", "Ŷ", "ŵ", "ŷ", "‚", "‛", "„", "…", "™", "►", "•", "→", "⇒", "⇔", "♦", "≈"
+ ];
Index: /CKEditor/branches/versions/3.4.x/_source/plugins/toolbar/plugin.js
===================================================================
--- /CKEditor/branches/versions/3.4.x/_source/plugins/toolbar/plugin.js (revision 6233)
+++ /CKEditor/branches/versions/3.4.x/_source/plugins/toolbar/plugin.js (revision 6234)
@@ -160,5 +160,5 @@
var labelId = CKEDITOR.tools.getNextId();
- var output = [ '