Index: /CKEditor/trunk/CHANGES.html =================================================================== --- /CKEditor/trunk/CHANGES.html (revision 6084) +++ /CKEditor/trunk/CHANGES.html (revision 6085) @@ -35,17 +35,4 @@ CKEditor Changelog -

- CKEditor 3.5 (SVN)

-

- New features:

- -

- Fixed issues:

-

CKEditor 3.4.3 (SVN)

Index: /CKEditor/trunk/_source/core/dom/domobject.js =================================================================== --- /CKEditor/trunk/_source/core/dom/domobject.js (revision 6084) +++ /CKEditor/trunk/_source/core/dom/domobject.js (revision 6085) @@ -168,7 +168,4 @@ * 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/trunk/_source/core/dom/node.js =================================================================== --- /CKEditor/trunk/_source/core/dom/node.js (revision 6084) +++ /CKEditor/trunk/_source/core/dom/node.js (revision 6085) @@ -108,23 +108,22 @@ var $clone = this.$.cloneNode( includeChildren ); - var removeIds = function( node ) - { - if ( node.nodeType != CKEDITOR.NODE_ELEMENT ) - return; - - if ( !cloneId ) - node.removeAttribute( 'id', false ); - node.removeAttribute( '_cke_expando', false ); - - if ( includeChildren ) - { + if ( !cloneId ) + { + var removeIds = function( node ) + { + if ( node.nodeType != CKEDITOR.NODE_ELEMENT ) + return; + + node.removeAttribute( 'id', false ) ; + node.removeAttribute( '_cke_expando', false ) ; + 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/trunk/_source/plugins/specialchar/dialogs/specialchar.js =================================================================== --- /CKEditor/trunk/_source/plugins/specialchar/dialogs/specialchar.js (revision 6084) +++ /CKEditor/trunk/_source/plugins/specialchar/dialogs/specialchar.js (revision 6085) @@ -223,9 +223,46 @@ 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, - extraChars = editor.config.extraSpecialChars, - chars = editor.config.specialChars; + chars = this.definition.chars; var charsTableLabel = CKEDITOR.tools.getNextId() + '_specialchar_table_label'; @@ -248,17 +285,12 @@ { charDesc = ''; - - 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; - } + character = character.replace( /\((.*?)\)/, function( match, desc ) + { + charDesc = desc; + return ''; + } ); + + // Use character in case description unavailable. + charDesc = charDesc || character; var charLabelId = 'cke_specialchar_label_' + i + '_' + CKEDITOR.tools.getNextNumber(); Index: /CKEditor/trunk/_source/plugins/specialchar/plugin.js =================================================================== --- /CKEditor/trunk/_source/plugins/specialchar/plugin.js (revision 6084) +++ /CKEditor/trunk/_source/plugins/specialchar/plugin.js (revision 6085) @@ -10,33 +10,13 @@ CKEDITOR.plugins.add( 'specialchar', { - // List of available localizations. - availableLangs : { en:1 }, - init : function( editor ) { - var pluginName = 'specialchar', - plugin = this; + var pluginName = 'specialchar'; // Register the dialog. CKEDITOR.dialog.add( pluginName, this.path + 'dialogs/specialchar.js' ); - 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 command. + editor.addCommand( pluginName, new CKEDITOR.dialogCommand( pluginName ) ); // Register the toolbar button. @@ -48,23 +28,2 @@ } } ); - -/** - * 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', - '{','|','}','~', - "€", "‘", "’", "“", "”", "–", "—", "¡", "¢", "£", "¤", "¥", "¦", "§", "¨", "©", "ª", "«", "¬", "®", "¯", "°", "&", "²", "³", "´", "µ", "¶", "·", "¸", "¹", "º", "&", "¼", "½", "¾", "¿", "À", "Á", "Â", "Ã", "Ä", "Å", "Æ", "Ç", "È", "É", "Ê", "Ë", "Ì", "Í", "Î", "Ï", "Ð", "Ñ", "Ò", "Ó", "Ô", "Õ", "Ö", "×", "Ø", "Ù", "Ú", "Û", "Ü", "Ý", "Þ", "ß", "à", "á", "â", "ã", "ä", "å", "æ", "ç", "è", "é", "ê", "ë", "ì", "í", "î", "ï", "ð", "ñ", "ò", "ó", "ô", "õ", "ö", "÷", "ø", "ù", "ú", "û", "ü", "ü", "ý", "þ", "ÿ", "Œ", "œ", "Ŵ", "Ŷ", "ŵ", "ŷ", "‚", "‛", "„", "…", "™", "►", "•", "→", "⇒", "⇔", "♦", "≈" - ];