Changeset 5582
- Timestamp:
- 06/10/10 12:34:27 (3 years ago)
- Location:
- CKEditor/branches/versions/3.3.x
- Files:
-
- 19 edited
-
. (modified) (1 prop)
-
CHANGES.html (modified) (1 diff)
-
_dev/releaser/ckreleaser.release (modified) (1 prop)
-
_dev/releaser/release.bat (modified) (1 prop)
-
_source/core/dom/range.js (modified) (1 diff)
-
_source/lang/_translationstatus.txt (modified) (1 diff)
-
_source/lang/es.js (modified) (18 diffs)
-
_source/plugins/colordialog/dialogs/colordialog.js (modified) (1 diff)
-
_source/plugins/div/dialogs/div.js (modified) (1 prop)
-
_source/plugins/div/plugin.js (modified) (1 prop)
-
_source/plugins/find/dialogs/find.js (modified) (1 diff)
-
_source/plugins/htmldataprocessor/plugin.js (modified) (1 diff)
-
_source/plugins/liststyle/dialogs/liststyle.js (modified) (4 diffs)
-
_source/plugins/scayt/plugin.js (modified) (3 diffs)
-
_source/plugins/selection/plugin.js (modified) (2 diffs)
-
_source/plugins/showborders/plugin.js (modified) (1 prop)
-
_source/plugins/sourcearea/plugin.js (modified) (1 diff)
-
_source/plugins/wysiwygarea/plugin.js (modified) (5 diffs)
-
ckeditor.pack (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
-
CKEditor/branches/versions/3.3.x
- Property svn:mergeinfo changed
/CKEditor/trunk merged: 5552,5557-5563,5566-5567,5570-5571,5574,5578-5581
- Property svn:mergeinfo changed
-
CKEditor/branches/versions/3.3.x/CHANGES.html
r5542 r5582 35 35 CKEditor Changelog 36 36 </h1> 37 <h3> 38 CKEditor 3.3.1 (SVN)</h3> 39 <p> 40 New features:</p> 41 <ul> 42 <li></li> 43 </ul> 44 <p> 45 Fixed issues:</p> 46 <ul> 47 <li><a href="http://dev.fckeditor.net/ticket/5780">#5780</a> : Text selection lost when opening some of the dialogs.</li> 48 <li><a href="http://dev.fckeditor.net/ticket/5787">#5787</a> : Liststyle plugin wasn't packaged into the core (CKEDITOR.resourceManager.load exception).</li> 49 <li><a href="http://dev.fckeditor.net/ticket/5637">#5637</a> : Fix wrong nesting that generated "<head> must be a child of <html>" warning in Webkit.</li> 50 <li><a href="http://dev.fckeditor.net/ticket/5790">#5790</a> : Internal only attributes output on fullpage <html> tag.</li> 51 <li><a href="http://dev.fckeditor.net/ticket/5761">#5761</a> : [IE] Color dialog matrix buttons are barely clickable in quirks mode.</li> 52 <li><a href="http://dev.fckeditor.net/ticket/5759">#5759</a> : [IE] Clicking on the scrollbar and then on the host page causes error.</li> 53 <li><a href="http://dev.fckeditor.net/ticket/5772">#5772</a> : List style dialog is missing tab page ids.</li> 54 <li><a href="http://dev.fckeditor.net/ticket/5782">#5782</a> : [FF] Wysiwyg mode is broken by 'display' style changes on editor's parent DOM tree.</li> 55 <li><a href="http://dev.fckeditor.net/ticket/5801">#5801</a> : [IE] contentEditable="false" doesn't apply in effect on inline-elements.</li> 56 <li><a href="http://dev.fckeditor.net/ticket/5794">#5794</a> : Empty find matching twice results in JavaScript error.</li> 57 <li><a href="http://dev.fckeditor.net/ticket/5732">#5732</a> : If it isn't possible to connect to the SCAYT servers the dialogs might hang in Firefox. Fix for Firefox>=3.6.</li> 58 <li><a href="http://dev.fckeditor.net/ticket/5807">#5807</a> : [FF2] New page command results in uneditable document.</li> 59 <li><a href="http://dev.fckeditor.net/ticket/5807">#5807</a> : [FF2] SCAYT plugin is disabled in Firefox2 due to selection interference.</li> 60 <li><a href="http://dev.fckeditor.net/ticket/5772">#5772</a> : [IE] Some numbered list style types are not supported by IE6/7 and causes JavaScript error.</li> 61 </ul> 37 62 <h3> 38 63 CKEditor 3.3</h3> -
CKEditor/branches/versions/3.3.x/_dev/releaser/ckreleaser.release
- Property svn:mergeinfo changed (with no actual effect on merging)
-
CKEditor/branches/versions/3.3.x/_dev/releaser/release.bat
- Property svn:mergeinfo changed (with no actual effect on merging)
-
CKEditor/branches/versions/3.3.x/_source/core/dom/range.js
r5535 r5582 1790 1790 getEnclosedNode : function() 1791 1791 { 1792 var walkerRange = this.clone(), 1793 walker = new CKEDITOR.dom.walker( walkerRange ), 1792 var walkerRange = this.clone(); 1793 1794 // Optimize and analyze the range to avoid DOM destructive nature of walker. (# 1795 walkerRange.optimize(); 1796 if ( walkerRange.startContainer.type != CKEDITOR.NODE_ELEMENT 1797 || walkerRange.endContainer.type != CKEDITOR.NODE_ELEMENT ) 1798 return null; 1799 1800 var walker = new CKEDITOR.dom.walker( walkerRange ), 1794 1801 isNotBookmarks = CKEDITOR.dom.walker.bookmark( true ), 1795 1802 isNotWhitespaces = CKEDITOR.dom.walker.whitespaces( true ), -
CKEditor/branches/versions/3.3.x/_source/lang/_translationstatus.txt
r5506 r5582 17 17 en-gb.js Found: 370 Missing: 154 18 18 eo.js Found: 259 Missing: 265 19 es.js Found: 467 Missing: 5719 es.js Found: 524 Missing: 0 20 20 et.js Found: 301 Missing: 223 21 21 eu.js Found: 403 Missing: 121 -
CKEditor/branches/versions/3.3.x/_source/lang/es.js
r5535 r5582 32 32 * of reading non-English words. So be careful while translating it. 33 33 */ 34 editorTitle : ' Rich text editor, %1, press ALT 0 for help.', // MISSING34 editorTitle : 'Editor de texto, %1, pulse ALT 0 para ayuda.', 35 35 36 36 // ARIA descriptions. 37 toolbar : ' Toolbar', // MISSING38 editor : ' Rich Text Editor', // MISSING37 toolbar : 'Barra de herramientas', 38 editor : 'Editor de texto enriquecido', 39 39 40 40 // Toolbar buttons without dialogs. … … 93 93 ok : 'Aceptar', 94 94 cancel : 'Cancelar', 95 close : 'C lose', // MISSING96 preview : 'Previ ew', // MISSING95 close : 'Cerrar', 96 preview : 'Previsualización', 97 97 generalTab : 'General', 98 98 advancedTab : 'Avanzado', … … 100 100 confirmNewPage : 'Cualquier cambio que no se haya guardado se perderá.\r\n¿Está seguro de querer crear una nueva página?', 101 101 confirmCancel : 'Algunas de las opciones se han cambiado.\r\n¿Está seguro de querer cerrar el diálogo?', 102 options : 'Op tions', // MISSING103 target : ' Target', // MISSING104 targetNew : 'N ew Window (_blank)', // MISSING105 targetTop : ' Topmost Window (_top)', // MISSING106 targetSelf : ' Same Window (_self)', // MISSING107 targetParent : ' Parent Window (_parent)', // MISSING102 options : 'Opciones', 103 target : 'Destino', 104 targetNew : 'Nueva ventana (_blank)', 105 targetTop : 'Ventana principal (_top)', 106 targetSelf : 'Misma ventana (_self)', 107 targetParent : 'Ventana padre (_parent)', 108 108 109 109 // Put the voice-only part of the label in the span. … … 113 113 contextmenu : 114 114 { 115 options : ' Context Menu Options' // MISSING115 options : 'Opciones del menú contextual' 116 116 }, 117 117 … … 121 121 toolbar : 'Insertar Caracter Especial', 122 122 title : 'Seleccione un caracter especial', 123 options : ' Special Character Options' // MISSING123 options : 'Opciones de caracteres especiales' 124 124 }, 125 125 … … 136 136 advanced : 'Avanzado', 137 137 type : 'Tipo de vínculo', 138 toUrl : 'URL', // MISSING138 toUrl : 'URL', 139 139 toAnchor : 'Referencia en esta página', 140 140 toEmail : 'E-Mail', … … 193 193 list: 194 194 { 195 numberedTitle : ' Numbered List Properties', // MISSING196 bulletedTitle : ' Bulleted List Properties', // MISSING197 type : 'T ype', // MISSING198 start : ' Start', // MISSING199 circle : 'C ircle', // MISSING200 disc : 'Disc ', // MISSING201 square : ' Square', // MISSING202 none : 'N one', // MISSING203 notset : '< not set>', // MISSING204 armenian : ' Armenian numbering', // MISSING205 georgian : ' Georgian numbering (an, ban, gan, etc.)', // MISSING206 lowerRoman : ' Lower Roman (i, ii, iii, iv, v, etc.)', // MISSING207 upperRoman : ' Upper Roman (I, II, III, IV, V, etc.)', // MISSING208 lowerAlpha : ' Lower Alpha (a, b, c, d, e, etc.)', // MISSING209 upperAlpha : ' Upper Alpha (A, B, C, D, E, etc.)', // MISSING210 lowerGreek : 'L ower Greek (alpha, beta, gamma, etc.)', // MISSING211 decimal : 'Decimal (1, 2, 3, etc.)', // MISSING212 decimalLeadingZero : 'Decimal leading zero (01, 02, 03, etc.)' // MISSING195 numberedTitle : 'Propiedades de lista numerada', 196 bulletedTitle : 'Propiedades de viñetas', 197 type : 'Tipo', 198 start : 'Inicio', 199 circle : 'Círculo', 200 disc : 'Disco', 201 square : 'Cuadrado', 202 none : 'Ninguno', 203 notset : '<sin establecer>', 204 armenian : 'Numeración armenia', 205 georgian : 'Numeración georgiana (an, ban, gan, etc.)', 206 lowerRoman : 'Números romanos en minúsculas (i, ii, iii, iv, v, etc.)', 207 upperRoman : 'Números romanos en mayúsculas (I, II, III, IV, V, etc.)', 208 lowerAlpha : 'Alfabeto en minúsculas (a, b, c, d, e, etc.)', 209 upperAlpha : 'Alfabeto en mayúsculas (A, B, C, D, E, etc.)', 210 lowerGreek : 'Letras griegas (alpha, beta, gamma, etc.)', 211 decimal : 'Decimal (1, 2, 3, etc.)', 212 decimalLeadingZero : 'Decimal con cero inicial (01, 02, 03, etc.)' 213 213 }, 214 214 … … 246 246 widthPx : 'pixeles', 247 247 widthPc : 'porcentaje', 248 widthUnit : ' width unit', // MISSING248 widthUnit : 'unidad de la anchura', 249 249 height : 'Altura', 250 250 cellSpace : 'Esp. e/celdas', … … 409 409 height : 'Altura', 410 410 lockRatio : 'Proporcional', 411 unlockRatio : ' Unlock Ratio', // MISSING411 unlockRatio : 'Desbloquear el proporcional', 412 412 resetSize : 'Tamaño Original', 413 413 border : 'Borde', … … 422 422 img2Button : '¿Desea convertir la imagen en un botón de imagen?', 423 423 urlMissing : 'Debe indicar la URL de la imagen.', 424 validateWidth : ' Width must be a whole number.', // MISSING425 validateHeight : ' Height must be a whole number.', // MISSING426 validateBorder : ' Border must be a whole number.', // MISSING427 validateHSpace : ' HSpace must be a whole number.', // MISSING428 validateVSpace : ' VSpace must be a whole number.' // MISSING424 validateWidth : 'La anchura debe ser un número.', 425 validateHeight : 'La altura debe ser un número.', 426 validateBorder : 'El borde debe ser un número.', 427 validateHSpace : 'El espaciado horizontal debe ser un número.', 428 validateVSpace : 'El espaciado vertical debe ser un número.' 429 429 }, 430 430 … … 506 506 smiley : 507 507 { 508 toolbar : 'Emoticon s',508 toolbar : 'Emoticonos', 509 509 title : 'Insertar un Emoticon', 510 options : ' Smiley Options' // MISSING510 options : 'Opciones de emoticonos' 511 511 }, 512 512 513 513 elementsPath : 514 514 { 515 eleLabel : ' Elements path', // MISSING515 eleLabel : 'Ruta de los elementos', 516 516 eleTitle : '%1 elemento' 517 517 }, … … 539 539 pasteMsg : 'Por favor pegue dentro del cuadro utilizando el teclado (<STRONG>Ctrl/Cmd+V</STRONG>);\r\nluego presione <STRONG>Aceptar</STRONG>.', 540 540 securityMsg : 'Debido a la configuración de seguridad de su navegador, el editor no tiene acceso al portapapeles.\r\nEs necesario que lo pegue de nuevo en esta ventana.', 541 pasteArea : ' Paste Area' // MISSING541 pasteArea : 'Zona de pegado' 542 542 }, 543 543 … … 560 560 button : 'Plantillas', 561 561 title : 'Contenido de Plantillas', 562 options : ' Template Options', // MISSING562 options : 'Opciones de plantillas', 563 563 insertOption : 'Reemplazar el contenido actual', 564 564 selectPromptMsg : 'Por favor selecciona la plantilla a abrir en el editor<br>(el contenido actual se perderá):', … … 571 571 { 572 572 label : 'Estilo', 573 panelTitle : ' Formatting Styles', // MISSING573 panelTitle : 'Estilos para formatear', 574 574 panelTitle1 : 'Estilos de párrafo', 575 575 panelTitle2 : 'Estilos de carácter', … … 629 629 textColorTitle : 'Color de Texto', 630 630 bgColorTitle : 'Color de Fondo', 631 panelTitle : 'Color s', // MISSING631 panelTitle : 'Colores', 632 632 auto : 'Automático', 633 633 more : 'Más Colores...' … … 681 681 { 682 682 title : 'Comprobar Ortografía Mientras Escribe', 683 opera_title : 'No t supported by Opera', // MISSING683 opera_title : 'No soportado en Opera', 684 684 enable : 'Activar Corrector', 685 685 disable : 'Desactivar Corrector', … … 695 695 696 696 optionsTab : 'Opciones', 697 allCaps : ' Ignore All-Caps Words', // MISSING698 ignoreDomainNames : ' Ignore Domain Names', // MISSING699 mixedCase : 'Ignor e Words with Mixed Case', // MISSING700 mixedWithDigits : ' Ignore Words with Numbers', // MISSING697 allCaps : 'Omitir palabras en MAYÚSCULAS', 698 ignoreDomainNames : 'Omitir nombres de dominio', 699 mixedCase : 'Ignorar palabras con combinación de mayúsculas y minúsculas', 700 mixedWithDigits : 'Omitir palabras con números', 701 701 702 702 languagesTab : 'Idiomas', 703 703 704 704 dictionariesTab : 'Diccionarios', 705 dic_field_name : ' Dictionary name', // MISSING706 dic_create : 'Crea te', // MISSING707 dic_restore : 'Re store', // MISSING708 dic_delete : ' Delete', // MISSING709 dic_rename : 'Ren ame', // MISSING710 dic_info : 'Ini tially the User Dictionary is stored in a Cookie. However, Cookies are limited in size. When the User Dictionary grows to a point where it cannot be stored in a Cookie, then the dictionary may be stored on our server. To store your personal dictionary on our server you should specify a name for your dictionary. If you already have a stored dictionary, please type it\'s name and click the Restore button.', // MISSING705 dic_field_name : 'Nombre del diccionario', 706 dic_create : 'Crear', 707 dic_restore : 'Recuperar', 708 dic_delete : 'Borrar', 709 dic_rename : 'Renombrar', 710 dic_info : 'Inicialmente el Diccionario de usuario se guarda en una Cookie. Sin embargo, las cookies están limitadas en tamaño. Cuando el diccionario crece a un punto en el que no se puede guardar en una Cookie, el diccionario puede ser almacenado en nuestro servidor. Para almacenar su diccionario personalizado en nuestro servidor debe especificar un nombre para su diccionario. Si ya ha guardado un diccionaro, por favor, escriba su nombre y pulse el botón Recuperar', 711 711 712 712 aboutTab : 'Acerca de' … … 737 737 { 738 738 title : 'Elegir color', 739 options : ' Color Options', // MISSING739 options : 'Opciones de colores', 740 740 highlight : 'Muestra', 741 741 selected : 'Elegido', -
CKEditor/branches/versions/3.3.x/_source/plugins/colordialog/dialogs/colordialog.js
r5539 r5582 215 215 ' onkeydown="CKEDITOR.tools.callFunction( ' + onKeydownHandler + ', event, this )"' + 216 216 ' onclick="CKEDITOR.tools.callFunction(' + onClickHandler + ', event, this ); return false;"' + 217 ' tabindex="-1"><span class="cke_voice_label">' + color + '</span> </a>', CKEDITOR.document ) );217 ' tabindex="-1"><span class="cke_voice_label">' + color + '</span> </a>', CKEDITOR.document ) ); 218 218 } 219 219 -
CKEditor/branches/versions/3.3.x/_source/plugins/div/dialogs/div.js
- Property svn:mergeinfo changed (with no actual effect on merging)
-
CKEditor/branches/versions/3.3.x/_source/plugins/div/plugin.js
- Property svn:mergeinfo changed (with no actual effect on merging)
-
CKEditor/branches/versions/3.3.x/_source/plugins/find/dialogs/find.js
r5388 r5582 325 325 cursors = this._.cursors; 326 326 327 if ( ( lastCursor = cursors[ cursors.length - 1 ] ) )327 if ( ( lastCursor = cursors[ cursors.length - 1 ] ) && lastCursor.textNode ) 328 328 nextRangeWalker = new characterWalker( getRangeAfterCursor( lastCursor ) ); 329 329 // In case it's an empty range (no cursors), figure out next range from walker (#4951). -
CKEditor/branches/versions/3.3.x/_source/plugins/htmldataprocessor/plugin.js
r5521 r5582 177 177 return false; 178 178 } 179 }, 180 181 html : function( element ) 182 { 183 delete element.attributes.contenteditable; 184 delete element.attributes[ 'class' ]; 179 185 }, 180 186 -
CKEditor/branches/versions/3.3.x/_source/plugins/liststyle/dialogs/liststyle.js
r5535 r5582 38 38 [ 39 39 { 40 id : 'info', 41 accessKey : 'I', 40 42 elements : 41 43 [ … … 91 93 else if ( startupPage == 'numberedListStyle' ) 92 94 { 95 96 var listStyleOptions = 97 [ 98 [ editor.lang.list.notset, '' ], 99 [ editor.lang.list.lowerRoman, 'lower-roman' ], 100 [ editor.lang.list.upperRoman, 'upper-roman' ], 101 [ editor.lang.list.lowerAlpha, 'lower-alpha' ], 102 [ editor.lang.list.upperAlpha, 'upper-alpha' ], 103 [ editor.lang.list.decimal, 'decimal' ] 104 ]; 105 106 if ( !CKEDITOR.env.ie || CKEDITOR.env.version > 7 ) 107 { 108 listStyleOptions.concat( [ 109 [ editor.lang.list.armenian, 'armenian' ], 110 [ editor.lang.list.decimalLeadingZero, 'decimal-leading-zero' ], 111 [ editor.lang.list.georgian, 'georgian' ], 112 [ editor.lang.list.lowerGreek, 'lower-greek' ] 113 ]); 114 } 115 93 116 return { 94 117 title : editor.lang.list.numberedTitle, … … 98 121 [ 99 122 { 123 id : 'info', 124 accessKey : 'I', 100 125 elements : 101 126 [ … … 124 149 id : 'type', 125 150 style : 'width: 100%;', 126 items : 127 [ 128 [ editor.lang.list.notset, '' ], 129 [ editor.lang.list.armenian, 'armenian' ], 130 [ editor.lang.list.georgian, 'georgian' ], 131 [ editor.lang.list.lowerRoman, 'lower-roman' ], 132 [ editor.lang.list.upperRoman, 'upper-roman' ], 133 [ editor.lang.list.lowerAlpha, 'lower-alpha' ], 134 [ editor.lang.list.upperAlpha, 'upper-alpha' ], 135 [ editor.lang.list.lowerGreek, 'lower-greek' ], 136 [ editor.lang.list.decimal, 'decimal' ], 137 [ editor.lang.list.decimalLeadingZero, 'decimal-leading-zero' ] 138 ], 151 items : listStyleOptions, 139 152 setup : function( element ) 140 153 { -
CKEditor/branches/versions/3.3.x/_source/plugins/scayt/plugin.js
r5535 r5582 1 /*1 /* 2 2 Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved. 3 3 For licensing, see LICENSE.html or http://ckeditor.com/license … … 358 358 loadEngine : function( editor ) 359 359 { 360 // SCAYT doesn't work with Opera.361 if ( CKEDITOR.env. opera )360 // SCAYT doesn't work with Firefox2, Opera. 361 if ( CKEDITOR.env.gecko && CKEDITOR.env.version >= 10900 || CKEDITOR.env.opera ) 362 362 return editor.fire( 'showScaytState' ); 363 363 … … 409 409 { 410 410 type : 'text/javascript', 411 async : 'true', 411 412 src : scaytUrl 412 413 } -
CKEditor/branches/versions/3.3.x/_source/plugins/selection/plugin.js
r5535 r5582 1 /*1 /* 2 2 Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved. 3 3 For licensing, see LICENSE.html or http://ckeditor.com/license … … 236 236 // Avoid saving selection from within text input. (#5747) 237 237 var parentTag; 238 if ( nativeSel .type == 'Text'238 if ( nativeSel && nativeSel.type == 'Text' 239 239 && ( parentTag = nativeSel.createRange().parentElement().nodeName.toLowerCase() ) 240 240 && parentTag in { input: 1, textarea : 1 } ) -
CKEditor/branches/versions/3.3.x/_source/plugins/showborders/plugin.js
- Property svn:mergeinfo changed (with no actual effect on merging)
-
CKEditor/branches/versions/3.3.x/_source/plugins/sourcearea/plugin.js
r5509 r5582 192 192 { 193 193 modes : { wysiwyg:1, source:1 }, 194 editorFocus : false, 194 195 195 196 exec : function( editor ) -
CKEditor/branches/versions/3.3.x/_source/plugins/wysiwygarea/plugin.js
r5539 r5582 1 /*1 /* 2 2 Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved. 3 3 For licensing, see LICENSE.html or http://ckeditor.com/license … … 479 479 if ( evt.data.getTarget().equals( htmlElement ) ) 480 480 { 481 CKEDITOR.env.gecko && blinkCursor(); 481 if ( CKEDITOR.env.gecko && CKEDITOR.env.version >= 10900 ) 482 blinkCursor(); 482 483 focusGrabber.focus(); 483 484 } … … 493 494 { 494 495 var doc = editor.document; 495 if ( CKEDITOR.env.gecko || CKEDITOR.env.opera ) 496 497 if ( CKEDITOR.env.gecko && CKEDITOR.env.version >= 10900 ) 498 blinkCursor(); 499 else if ( CKEDITOR.env.opera ) 496 500 doc.getBody().focus(); 497 501 else if ( CKEDITOR.env.webkit ) … … 708 712 '<html dir="' + config.contentsLangDirection + '"' + 709 713 ' lang="' + ( config.contentsLanguage || editor.langCode ) + '">' + 710 '<title>' + frameLabel + '</title>' +711 714 '<head>' + 715 '<title>' + frameLabel + '</title>' + 712 716 baseTag + 713 717 headExtra + … … 816 820 // IE8 stricts mode doesn't have 'contentEditable' in effect 817 821 // on element unless it has layout. (#5562) 818 if ( CKEDITOR.env.ie8 ) 822 if ( CKEDITOR.env.ie8Compat ) 823 { 819 824 editor.addCss( 'html.CSS1Compat [contenteditable=false]{ min-height:0 !important;}' ); 820 825 826 var selectors = []; 827 for ( var tag in CKEDITOR.dtd.$removeEmpty ) 828 selectors.push( 'html.CSS1Compat ' + tag + '[contenteditable=false]' ); 829 editor.addCss( selectors.join( ',' ) + '{ display:inline-block;}' ); 830 } 831 821 832 // Switch on design mode for a short while and close it after then. 822 function blinkCursor( )833 function blinkCursor( retry ) 823 834 { 824 editor.document.$.designMode = 'on'; 825 setTimeout( function () 826 { 827 editor.document.$.designMode = 'off'; 828 }, 50 ); 835 CKEDITOR.tools.tryThese( 836 function() 837 { 838 editor.document.$.designMode = 'on'; 839 setTimeout( function () 840 { 841 editor.document.$.designMode = 'off'; 842 editor.document.getBody().focus(); 843 }, 50 ); 844 }, 845 function() 846 { 847 // The above call is known to fail when parent DOM 848 // tree layout changes may break design mode. (#5782) 849 // Refresh the 'contentEditable' is a cue to this. 850 editor.document.$.designMode = 'off'; 851 var body = editor.document.getBody(); 852 body.setAttribute( 'contentEditable', false ); 853 body.setAttribute( 'contentEditable', true ); 854 // Try it again once.. 855 !retry && blinkCursor( 1 ); 856 }); 829 857 } 830 858 -
CKEditor/branches/versions/3.3.x/ckeditor.pack
r5306 r5582 47 47 'CKEDITOR.END' : 2, 48 48 'CKEDITOR.STARTEND' : 3, 49 'CKEDITOR.SHRINK_ELEMENT' : 1, 50 'CKEDITOR.SHRINK_TEXT' : 2, 49 51 'CKEDITOR.UI_BUTTON' : 1, 50 52 'CKEDITOR.DIALOG_RESIZE_NONE' : 0, … … 158 160 '_source/plugins/link/plugin.js', 159 161 '_source/plugins/list/plugin.js', 162 '_source/plugins/liststyle/plugin.js', 160 163 '_source/plugins/maximize/plugin.js', 161 164 '_source/plugins/newpage/plugin.js',
Note: See TracChangeset
for help on using the changeset viewer.
