Ticket #5599: 5599_2.patch
| File 5599_2.patch, 13.3 KB (added by , 14 years ago) |
|---|
-
_source/plugins/specialchar/dialogs/specialchar.js
213 213 } 214 214 }); 215 215 216 function mergeChars( chars, extraChars ) 217 { 218 if ( CKEDITOR.tools.isArray( extraChars ) ) 219 for ( var i = 0; i < extraChars.length; i++ ) 220 chars[ chars.length ] = extraChars[ i ]; 221 return chars; 222 } 223 216 224 return { 217 225 title : lang.title, 218 226 minWidth : 430, 219 227 minHeight : 280, 220 228 buttons : [ CKEDITOR.dialog.cancelButton ], 221 229 charColumns : 17, 222 chars :223 [224 '!','"','#','$','%','&',"'",'(',')','*','+','-','.','/',225 '0','1','2','3','4','5','6','7','8','9',':',';',226 '<','=','>','?','@',227 'A','B','C','D','E','F','G','H','I','J','K','L','M','N','O',228 'P','Q','R','S','T','U','V','W','X','Y','Z',229 '[',']','^','_','`',230 'a','b','c','d','e','f','g','h','i','j','k','l','m','n','o','p',231 'q','r','s','t','u','v','w','x','y','z',232 '{','|','}','~','€(EURO SIGN)','‘(LEFT SINGLE QUOTATION MARK)','’(RIGHT SINGLE QUOTATION MARK)','“(LEFT DOUBLE QUOTATION MARK)',233 '”(RIGHT DOUBLE QUOTATION MARK)','–(EN DASH)','—(EM DASH)','¡(INVERTED EXCLAMATION MARK)','¢(CENT SIGN)','£(POUND SIGN)',234 '¤(CURRENCY SIGN)','¥(YEN SIGN)','¦(BROKEN BAR)','§(SECTION SIGN)','¨(DIAERESIS)','©(COPYRIGHT SIGN)','ª(FEMININE ORDINAL INDICATOR)',235 '«(LEFT-POINTING DOUBLE ANGLE QUOTATION MARK)','¬(NOT SIGN)','®(REGISTERED SIGN)','¯(MACRON)','°(DEGREE SIGN)','±(PLUS-MINUS SIGN)','²(SUPERSCRIPT TWO)',236 '³(SUPERSCRIPT THREE)','´(ACUTE ACCENT)','µ(MICRO SIGN)','¶(PILCROW SIGN)','·(MIDDLE DOT)','¸(CEDILLA)',237 '¹(SUPERSCRIPT ONE)','º(MASCULINE ORDINAL INDICATOR)','»(RIGHT-POINTING DOUBLE ANGLE QUOTATION MARK)','¼(VULGAR FRACTION ONE QUARTER)','½(VULGAR FRACTION ONE HALF)','¾(VULGAR FRACTION THREE QUARTERS)',238 '¿(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)',239 'Å(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)',240 'Ë(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)',241 'Ñ(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)',242 '×(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)',243 'Ý(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)',244 'ã(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)',245 'é(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)',246 'ï(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)',247 'õ(LATIN SMALL LETTER O WITH TILDE)','ö(LATIN SMALL LETTER O WITH DIAERESIS)',248 '÷(DIVISION SIGN)','ø(LATIN SMALL LETTER O WITH STROKE)',249 'ù(LATIN SMALL LETTER U WITH GRAVE)','ú(LATIN SMALL LETTER U WITH ACUTE)',250 'û(LATIN SMALL LETTER U WITH CIRCUMFLEX)','ü(LATIN SMALL LETTER U WITH DIAERESIS)',251 'ü(LATIN SMALL LETTER U WITH DIAERESIS)','ý(LATIN SMALL LETTER Y WITH ACUTE)','þ(LATIN SMALL LETTER THORN)','ÿ(LATIN SMALL LETTER Y WITH DIAERESIS)',252 'Œ(LATIN CAPITAL LIGATURE OE)',253 'œ(LATIN SMALL LIGATURE OE)','Ŵ(LATIN CAPITAL LETTER W WITH CIRCUMFLEX)',254 'Ŷ(LATIN CAPITAL LETTER Y WITH CIRCUMFLEX)','ŵ(LATIN SMALL LETTER W WITH CIRCUMFLEX)',255 'ŷ(LATIN SMALL LETTER Y WITH CIRCUMFLEX)','‚(SINGLE LOW-9 QUOTATION MARK)',256 '‛(SINGLE HIGH-REVERSED-9 QUOTATION MARK)','„(DOUBLE LOW-9 QUOTATION MARK)','…(HORIZONTAL ELLIPSIS)',257 '™(TRADE MARK SIGN)','►(BLACK RIGHT-POINTING POINTER)','•(BULLET)',258 '→(RIGHTWARDS ARROW)','⇒(RIGHTWARDS DOUBLE ARROW)','⇔(LEFT RIGHT DOUBLE ARROW)','♦(BLACK DIAMOND SUIT)','≈(ALMOST EQUAL TO)'259 ],260 230 onLoad : function() 261 231 { 262 232 var columns = this.definition.charColumns, 263 chars = this.definition.chars;233 chars = mergeChars( editor.config.specialChars, editor.config.extraSpecialChars ); 264 234 265 235 var charsTableLabel = 'specialchar_table_label' + CKEDITOR.tools.getNextNumber(); 266 236 var html = [ '<table role="listbox" aria-labelledby="' + charsTableLabel + '"' + … … 281 251 if ( ( character = chars[ i ] ) ) 282 252 { 283 253 charDesc = ''; 284 character = character.replace( /\((.*?)\)/, function( match, desc ) 285 { 286 charDesc = desc; 287 return ''; 288 } ); 254 255 if ( character instanceof Array ) 256 { 257 charDesc = character[ 1 ]; 258 character = character[ 0 ]; 259 } 260 else 261 { 262 var _tmpName = character.replace( '&', '' ).replace( ';', '' ).replace( '#', '' ); 263 if ( parseInt( _tmpName, 10 ) == _tmpName ) 264 _tmpName = 'sign_' + _tmpName; 289 265 290 // Use character in case description unavailable. 291 charDesc = charDesc || character; 266 // Use character in case description unavailable. 267 charDesc = lang[ _tmpName ] || CKEDITOR.tools.htmlEncode( character ); 268 } 292 269 270 console.log( character, charDesc ); 271 293 272 var charLabelId = 'cke_specialchar_label_' + i + '_' + CKEDITOR.tools.getNextNumber(); 294 273 295 274 html.push( -
_source/lang/en.js
115 115 options : 'Context Menu Options' 116 116 }, 117 117 118 // Special char dialog.119 specialChar :120 {121 toolbar : 'Insert Special Character',122 title : 'Select Special Character',123 options : 'Special Character Options'124 },125 126 118 // Link dialog. 127 119 link : 128 120 { … … 744 736 }, 745 737 746 738 toolbarCollapse : 'Collapse Toolbar', 747 toolbarExpand : 'Expand Toolbar' 739 toolbarExpand : 'Expand Toolbar', 740 741 // Special char dialog. 742 specialChar : 743 { 744 toolbar : 'Insert Special Character', 745 title : 'Select Special Character', 746 options : 'Special Character Options', 747 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" 748 } 748 749 }; -
_source/core/config.js
327 327 * @example 328 328 * config.baseFloatZIndex = 2000 329 329 */ 330 baseFloatZIndex : 10000 330 baseFloatZIndex : 10000, 331 332 /** 333 * The list of special characters visible in Special Character dialog. 334 * @type Array 335 * @example 336 * config.specialChars = [ '"', '’', [ '&custom;', 'Custom label' ] ]; 337 */ 338 specialChars : 339 [ 340 '!','"','#','$','%','&',"'",'(',')','*','+','-','.','/', 341 '0','1','2','3','4','5','6','7','8','9',':',';', 342 '<','=','>','?','@', 343 'A','B','C','D','E','F','G','H','I','J','K','L','M','N','O', 344 'P','Q','R','S','T','U','V','W','X','Y','Z', 345 '[',']','^','_','`', 346 'a','b','c','d','e','f','g','h','i','j','k','l','m','n','o','p', 347 'q','r','s','t','u','v','w','x','y','z', 348 '{','|','}','~', 349 "€", "‘", "’", "“", "”", "–", "—", "¡", "¢", "£", "¤", "¥", "¦", "§", "¨", "©", "ª", "«", "¬", "®", "¯", "°", "&", "²", "³", "´", "µ", "¶", "·", "¸", "¹", "º", "&", "¼", "½", "¾", "¿", "À", "Á", "Â", "Ã", "Ä", "Å", "Æ", "Ç", "È", "É", "Ê", "Ë", "Ì", "Í", "Î", "Ï", "Ð", "Ñ", "Ò", "Ó", "Ô", "Õ", "Ö", "×", "Ø", "Ù", "Ú", "Û", "Ü", "Ý", "Þ", "ß", "à", "á", "â", "ã", "ä", "å", "æ", "ç", "è", "é", "ê", "ë", "ì", "í", "î", "ï", "ð", "ñ", "ò", "ó", "ô", "õ", "ö", "÷", "ø", "ù", "ú", "û", "ü", "ü", "ý", "þ", "ÿ", "Œ", "œ", "Ŵ", "Ŷ", "ŵ", "ŷ", "&", "‛", "„", "…", "™", "►", "•", "→", "⇒", "⇔", "♦", "≈" 350 ], 351 352 // extraSpecialChars : null 353 /** 354 * List of additional special characters. This is a tool setting which 355 * makes it easier to add new characters, whithout having to touch and 356 * possibly breaking the {@link CKEDITOR.config.specialChars} array. 357 * @type Array 358 * @example 359 * config.extraSpecialChars = [ '"', '’', [ '&custom;', 'Custom label' ] ]; 360 */ 361 extraSpecialChars : null 331 362 }; 332 363 333 364 // PACKAGER_RENAME( CKEDITOR.config )
