Ticket #5599: 5599_1.patch

_source/plugins/specialchar/dialogs/specialchar.js

@@ -229 +229 @@
                                 '[',']','^','_','`',
                                 '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)'
+                                '{','|','}','~',
+                                ["€", lang.euro], ["‘", lang.lsquo], ["’", lang.rsquo], ["“", lang.ldquo], ["”", lang.rdquo], ["–", lang.ndash], ["—", lang.mdash], ["¡", lang.iexcl], ["¢", lang.cent], ["£", lang.pound], ["¤", lang.curren], ["¥", lang.yen], ["¦", lang.brvbar], ["§", lang.sect], ["¨", lang.uml], ["©", lang.copy], ["ª", lang.ordf], ["«", lang.laquo], ["¬", lang.not], ["®", lang.reg], ["¯", lang.macr], ["°", lang.deg], ["&", "LANG."], ["²", lang.sup2], ["³", lang.sup3], ["´", lang.acute], ["µ", lang.micro], ["¶", lang.para], ["·", lang.middot], ["¸", lang.cedil], ["¹", lang.sup1], ["º", lang.ordm], ["&", "LANG."], ["¼", lang.frac14], ["½", lang.frac12], ["¾", lang.frac34], ["¿", lang.iquest], ["À", lang.agrave], ["Á", lang.aacute], ["Â", lang.acirc], ["Ã", lang.atilde], ["Ä", lang.auml], ["Å", lang.aring], ["Æ", lang.aelig], ["Ç", lang.ccedil], ["È", lang.egrave], ["É", lang.eacute], ["Ê", lang.ecirc], ["Ë", lang.euml], ["Ì", lang.igrave], ["Í", lang.iacute], ["Î", lang.icirc], ["Ï", lang.iuml], ["Ð", lang.eth], ["Ñ", lang.ntilde], ["Ò", lang.ograve], ["Ó", lang.oacute], ["Ô", lang.ocirc], ["Õ", lang.otilde], ["Ö", lang.ouml], ["×", lang.times], ["Ø", lang.oslash], ["Ù", lang.ugrave], ["Ú", lang.uacute], ["Û", lang.ucirc], ["Ü", lang.uuml], ["Ý", lang.yacute], ["Þ", lang.thorn], ["ß", lang.szlig], ["à", lang.agrave], ["á", lang.aacute], ["â", lang.acirc], ["ã", lang.atilde], ["ä", lang.auml], ["å", lang.aring], ["æ", lang.aelig], ["ç", lang.ccedil], ["è", lang.egrave], ["é", lang.eacute], ["ê", lang.ecirc], ["ë", lang.euml], ["ì", lang.igrave], ["í", lang.iacute], ["î", lang.icirc], ["ï", lang.iuml], ["ð", lang.eth], ["ñ", lang.ntilde], ["ò", lang.ograve], ["ó", lang.oacute], ["ô", lang.ocirc], ["õ", lang.otilde], ["ö", lang.ouml], ["÷", lang.divide], ["ø", lang.oslash], ["ù", lang.ugrave], ["ú", lang.uacute], ["û", lang.ucirc], ["ü", lang.uuml], ["ü", lang.uuml], ["ý", lang.yacute], ["þ", lang.thorn], ["ÿ", lang.yuml], ["Œ", lang.oelig], ["œ", lang.oelig], ["Ŵ", lang.sign_372], ["&#374", lang.sign_374], ["&#373", lang.sign_373], ["ŷ", lang.sign_375], ["&", "LANG."], ["‛", lang.sign_8219], ["„", lang.bdquo], ["…", lang.hellip], ["™", lang.trade], ["►", lang.sign_9658], ["•", lang.bull], ["→", lang.rarr], ["⇒", lang.rarr], ["⇔", lang.harr], ["♦", lang.diams], ["≈", lang.asymp]
                         ],
                 onLoad :  function()
                 {
@@ -281 +256 @@
                                         if ( ( character = chars[ i ] ) )
                                         {
                                                 charDesc = '';
-                                                character = character.replace( /\((.*?)\)/, function( match, desc )
-                                                        {
-                                                                charDesc = desc;
-                                                                return '';
-                                                        } );
-
+                                                
+                                                if ( character instanceof Array ) {
+                                                        charDesc = character[ 1 ];
+                                                        character = character[ 0 ];
+                                                }
+
                                                 // Use character in case description unavailable.
                                                 charDesc = charDesc || character;
 

_source/lang/en.js

@@ -115 +115 @@
                 options : 'Context Menu Options'
         },
 
-        // Special char dialog.
-        specialChar             :
-        {
-                toolbar         : 'Insert Special Character',
-                title           : 'Select Special Character',
-                options : 'Special Character Options'
-        },
-
         // Link dialog.
         link :
         {
@@ -743 +735 @@
         },
 
         toolbarCollapse : 'Collapse Toolbar',
-        toolbarExpand   : 'Expand Toolbar'
+        toolbarExpand   : 'Expand Toolbar',
+        
+        // Special char dialog.
+        specialChar             :
+        {
+                toolbar         : 'Insert Special Character',
+                title           : 'Select Special Character',
+                options : 'Special Character Options',
+                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", '':"s", 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", sign_372:"LATIN CAPITAL LETTER W WITH CIRCUMFLEX", sign_374:"LATIN CAPITAL LETTER Y WITH CIRCUMFLEX", sign_373:"LATIN SMALL LETTER W WITH CIRCUMFLEX", sign_375:"LATIN SMALL LETTER Y WITH CIRCUMFLEX", sign_8219:"SINGLE HIGH-REVERSED-9 QUOTATION MARK", bdquo:"DOUBLE LOW-9 QUOTATION MARK", hellip:"HORIZONTAL ELLIPSIS", trade:"TRADE MARK SIGN", 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"
+        }
 };