Ticket #5599: 5599_7.patch

_source/plugins/specialchar/dialogs/specialchar.js

@@ -222 +222 @@
                 minHeight : 280,
                 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)',
-                                '&#374(LATIN CAPITAL LETTER Y WITH CIRCUMFLEX)','&#373(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';
                         var html = [ '<table role="listbox" aria-labelledby="' + charsTableLabel + '"' +
@@ -284 +247 @@
                                         if ( ( character = chars[ i ] ) )
                                         {
                                                 charDesc = '';
-                                                character = character.replace( /\((.*?)\)/, function( match, desc )
-                                                        {
-                                                                charDesc = desc;
-                                                                return '';
-                                                        } );
+                                                
+                                                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 = charDesc || character;
+                                                        // Use character in case description unavailable.
+                                                        charDesc = lang[ _tmpName ] || character;
+                                                }
 
                                                 var charLabelId =  'cke_specialchar_label_' + i + '_' + CKEDITOR.tools.getNextNumber();
 

_source/plugins/specialchar/lang/en.js

@@ +1 @@
+
+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'
+});
+ No newline at end of file

_source/plugins/specialchar/plugin.js

@@ -9 +9 @@
 
 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.
                 editor.ui.addButton( 'SpecialChar',
                         {

_source/core/config.js

@@ -408 +408 @@
          * @example
          * config.baseFloatZIndex = 2000
          */
-        baseFloatZIndex : 10000
+        baseFloatZIndex : 10000,
+
+        /**
+         * 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' ] ] );
+         */
+        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',
+                        '{','|','}','~',
+                        "€", "‘", "’", "“", "”", "–", "—", "¡", "¢", "£", "¤", "¥", "¦", "§", "¨", "©", "ª", "«", "¬", "®", "¯", "°", "&", "²", "³", "´", "µ", "¶", "·", "¸", "¹", "º", "&", "¼", "½", "¾", "¿", "À", "Á", "Â", "Ã", "Ä", "Å", "Æ", "Ç", "È", "É", "Ê", "Ë", "Ì", "Í", "Î", "Ï", "Ð", "Ñ", "Ò", "Ó", "Ô", "Õ", "Ö", "×", "Ø", "Ù", "Ú", "Û", "Ü", "Ý", "Þ", "ß", "à", "á", "â", "ã", "ä", "å", "æ", "ç", "è", "é", "ê", "ë", "ì", "í", "î", "ï", "ð", "ñ", "ò", "ó", "ô", "õ", "ö", "÷", "ø", "ù", "ú", "û", "ü", "ü", "ý", "þ", "ÿ", "Œ", "œ", "Ŵ", "&#374", "&#373", "ŷ", "‚", "‛", "„", "…", "™", "►", "•", "→", "⇒", "⇔", "♦", "≈"
+                ]
 };
 
 /**