Changeset 5171

Timestamp:

02/21/10 02:35:01 (3 years ago)

Author:

fredck

Message:

Merged trunk [5151-5170].

Location:

CKEditor/branches/versions/3.2.x

Files:

• . (modified) (1 prop)
• CHANGES.html (modified) (2 diffs)
• _dev/releaser/ckreleaser.release (modified) (1 prop)
• _dev/releaser/release.bat (modified) (1 prop)
• _samples/ajax.html (modified) (1 diff)
• _source/core/config.js (modified) (1 diff)
• _source/core/editor.js (modified) (3 diffs)
• _source/lang/_translationstatus.txt (modified) (1 diff)
• _source/lang/es.js (modified) (7 diffs)
• _source/plugins/basicstyles/plugin.js (modified) (1 diff)
• _source/plugins/div/dialogs/div.js (modified) (1 prop)
• _source/plugins/div/plugin.js (modified) (1 prop)
• _source/plugins/indent/plugin.js (modified) (1 diff)
• _source/plugins/link/dialogs/link.js (modified) (2 diffs)
• _source/plugins/selection/plugin.js (modified) (1 diff)
• _source/plugins/showborders/plugin.js (modified) (1 prop)
• _source/plugins/templates/dialogs/templates.js (modified) (1 diff)
• _source/skins/v2/richcombo.css (modified) (2 diffs)

CKEditor/branches/versions/3.2.x/CHANGES.html

@@ -87 +87 @@
                 <li><a href="http://dev.fckeditor.net/ticket/4951">#4951</a> : Replacing patterns into empty string throws errors.</li>
                 <li><a href="http://dev.fckeditor.net/ticket/4963">#4963</a> : Link dialog doesn't open properly for e-mail type links.</li>
-                <li><a href="http://dev.fckeditor.net/ticket/4999">#4999</a> : Adding undo snapshot for editor::setData.</li>
                 <li><a href="http://dev.fckeditor.net/ticket/5043">#5043</a> : Removed the possibility of having an unwanted script tag being outputted with the editor contents.</li>
                 <li><a href="http://dev.fckeditor.net/ticket/3678">#3678</a> : There were issues when editing links inside floating divs with IE.</li>
                 <li><a href="http://dev.fckeditor.net/ticket/4763">#4763</a> : Press Enter key with text selected will not delete the text.</li>
-                <li><a href="http://dev.fckeditor.net/ticket/4716">#4716</a> : [IE] Cursor remain blinking in editor when focus is moved to any button that following.</li>
                 <li><a href="http://dev.fckeditor.net/ticket/5096">#5096</a> : Simple ampersand attribute value doesn't work for more than once occurance.</li>
                 <li><a href="http://dev.fckeditor.net/ticket/3494">#3494</a> : Context menu is too narrow in some translations.</li>
@@ -112 +110 @@
                 <li><a href="http://dev.fckeditor.net/ticket/5163">#5163</a> : The undo system was not working on some specific cases.</li>
                 <li><a href="http://dev.fckeditor.net/ticket/5162">#5162</a> : The ajax sample was throwing errors when loading data.</li>
+                <li><a href="http://dev.fckeditor.net/ticket/4999">#4999</a> : The Template dialog was not generating an undo snapshot.</li>
                 <li><a href="http://dev.fckeditor.net/ticket/5213">#5213</a> : Reorganization of some entries in the language files to make it more consistent.</li>
                 <li><a href="http://dev.fckeditor.net/ticket/5199">#5199</a> : In IE, single row toolbars didn't have the bottom padding.</li>

CKEditor/branches/versions/3.2.x/_samples/ajax.html

@@ -29 +29 @@
         // Create a new editor inside the <div id="editor">
         editor = CKEDITOR.appendTo( 'editor' );
-        editor.setData( html, null, true );
+        editor.setData( html );
 
         // This sample may break here if the ckeditor_basic.js is used. In such case, the following code should be used instead:
         /*
         if ( editor.setData )
-                editor.setData( html, null, true );
+                editor.setData( html );
         else
         {
                 CKEDITOR.on( 'loaded', function()
                         {
-                                editor.setData( html, null, true );
+                                editor.setData( html );
                         });
         }

CKEditor/branches/versions/3.2.x/_source/core/config.js

@@ -90 +90 @@
          * automatically localize the editor to the user language, if supported,
          * otherwise the {@link CKEDITOR.config.defaultLanguage} language is used.
-         * @default true
-         * @type Boolean
+         * @default '' (empty)
+         * @type String
          * @example
          * // Load the German interface.

CKEditor/branches/versions/3.2.x/_source/core/editor.js

@@ -586 +586 @@
                  * @param {Function} callback Function to be called after the setData
                  *              is completed.
-                 * @param {Boolean} noUndo Indicates that the function call must not
-                 *              create and undo snapshot.
                  * @example
                  * CKEDITOR.instances.editor1.<b>setData</b>( '&lt;p&gt;This is the editor data.&lt;/p&gt;' );
@@ -596 +594 @@
                  *     });
                  */
-                setData : function( data , callback, noUndo )
-                {
-                        noUndo !== false && this.fire( 'saveSnapshot' );
-
-                        this.on( 'dataReady', function( evt )
+                setData : function( data , callback )
+                {
+                        if( callback )
+                        {
+                                this.on( 'dataReady', function( evt )
                                 {
                                         evt.removeListener();
-                                        callback && callback.call( evt.editor );
-                                        noUndo !== false && this.fire( 'saveSnapshot' );
-                                });
+                                        callback.call( evt.editor );
+                                } );
+                        }
 
                         // Fire "setData" so data manipulation may happen.
@@ -694 +692 @@
  * @name CKEDITOR.config.htmlEncodeOutput
  * @since 3.1
- * @type {Boolean}
+ * @type Boolean
  * @default false
  * @example

CKEditor/branches/versions/3.2.x/_source/lang/_translationstatus.txt

@@ -17 +17 @@
 en-gb.js   Found: 369 Missing: 120
 eo.js      Found: 259 Missing: 230
-es.js      Found: 460 Missing: 29
+es.js      Found: 466 Missing: 23
 et.js      Found: 300 Missing: 189
 eu.js      Found: 403 Missing: 86

CKEditor/branches/versions/3.2.x/_source/lang/es.js

@@ -98 +98 @@
                 advancedTab             : 'Avanzado',
                 validateNumberFailed : 'El valor no es un número.',
-                confirmNewPage  : 'Cualquier cambio que no se haya guardado se perderá. ¿Está seguro de querer crear una nueva página?',
-                confirmCancel   : 'Algunas de las opciones se han cambiado. ¿Está seguro de querer cerrar el diálogo?',
+                confirmNewPage  : 'Cualquier cambio que no se haya guardado se perderá.\r\n¿Está seguro de querer crear una nueva página?',
+                confirmCancel   : 'Algunas de las opciones se han cambiado.\r\n¿Está seguro de querer cerrar el diálogo?',
                 options                 : 'Options', // MISSING
                 target                  : 'Target', // MISSING
@@ -471 +471 @@
                 oneChange               : 'Control finalizado: se ha cambiado una palabra',
                 manyChanges             : 'Control finalizado: se ha cambiado %1 palabras',
-                ieSpellDownload : 'Módulo de Control de Ortografía no instalado. ¿Desea descargarlo ahora?'
+                ieSpellDownload : 'Módulo de Control de Ortografía no instalado.\r\n¿Desea descargarlo ahora?'
         },
 
@@ -504 +504 @@
         {
                 title           : 'Pegar',
-                cutError        : 'La configuración de seguridad de este navegador no permite la ejecución automática de operaciones de cortado. Por favor use el teclado (Ctrl+X).',
-                copyError       : 'La configuración de seguridad de este navegador no permite la ejecución automática de operaciones de copiado. Por favor use el teclado (Ctrl+C).',
-                pasteMsg        : 'Por favor pegue dentro del cuadro utilizando el teclado (<STRONG>Ctrl+V</STRONG>); luego presione <STRONG>Aceptar</STRONG>.',
-                securityMsg     : 'Debido a la configuración de seguridad de su navegador, el editor no tiene acceso al portapapeles. Es necesario que lo pegue de nuevo en esta ventana.',
+                cutError        : 'La configuración de seguridad de este navegador no permite la ejecución automática de operaciones de cortado.\r\nPor favor use el teclado (Ctrl+X).',
+                copyError       : 'La configuración de seguridad de este navegador no permite la ejecución automática de operaciones de copiado.\r\nPor favor use el teclado (Ctrl+C).',
+                pasteMsg        : 'Por favor pegue dentro del cuadro utilizando el teclado (<STRONG>Ctrl+V</STRONG>);\r\nluego presione <STRONG>Aceptar</STRONG>.',
+                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.',
                 pasteArea       : 'Paste Area' // MISSING
         },
@@ -513 +513 @@
         pastefromword :
         {
-                confirmCleanup  : 'El texto que desea parece provenir de Word. Desea depurarlo antes de pegarlo?',
+                confirmCleanup  : 'El texto que desea parece provenir de Word.\r\n¿Desea depurarlo antes de pegarlo?',
                 toolbar                 : 'Pegar desde Word',
                 title                   : 'Pegar desde Word',
@@ -605 +605 @@
         {
                 '000' : 'Negro',
-                '800000' : 'Granate',
-                '8B4513' : 'Saddle Brown', // MISSING
+                '800000' : 'Marrón oscuro',
+                '8B4513' : 'Marrón tierra',
                 '2F4F4F' : 'Pizarra Oscuro',
                 '008080' : 'Azul verdoso',
                 '000080' : 'Azul marino',
                 '4B0082' : 'Añil',
-                '696969' : 'Gris medio',
-                'B22222' : 'Fire Brick', // MISSING
+                '696969' : 'Gris oscuro',
+                'B22222' : 'Ladrillo',
                 'A52A2A' : 'Marrón',
-                'DAA520' : 'Golden Rod', // MISSING
+                'DAA520' : 'Oro oscuro',
                 '006400' : 'Verde oscuro',
                 '40E0D0' : 'Turquesa',
-                '0000CD' : 'Medium Blue', // MISSING
+                '0000CD' : 'Azul medio-oscuro',
                 '800080' : 'Púrpura',
                 '808080' : 'Gris',
@@ -627 +627 @@
                 '00F' : 'Azul',
                 'EE82EE' : 'Violeta',
-                'A9A9A9' : 'Gris oscuro',
+                'A9A9A9' : 'Gris medio',
                 'FFA07A' : 'Salmón claro',
                 'FFA500' : 'Naranja',
@@ -634 +634 @@
                 'AFEEEE' : 'Turquesa claro',
                 'ADD8E6' : 'Azul claro',
-                'DDA0DD' : 'Ciruela',
+                'DDA0DD' : 'Violeta claro',
                 'D3D3D3' : 'Gris claro',
-                'FFF0F5' : 'Lavender Blush', // MISSING
+                'FFF0F5' : 'Lavanda rojizo',
                 'FAEBD7' : 'Blanco antiguo',
                 'FFFFE0' : 'Amarillo claro',
                 'F0FFF0' : 'Miel',
                 'F0FFFF' : 'Azul celeste',
-                'F0F8FF' : 'Alice Blue', // MISSING
-                'E6E6FA' : 'LAvanda',
+                'F0F8FF' : 'Azul pálido',
+                'E6E6FA' : 'Lavanda',
                 'FFF' : 'Blanco'
         },

CKEditor/branches/versions/3.2.x/_source/plugins/basicstyles/plugin.js

@@ -43 +43 @@
 
 // Basic Inline Styles.
+/**
+ * The style definition to be used to apply the bold style in the text.
+ * @type Object
+ * @example
+ * config.coreStyles_bold = { element : 'b', overrides : 'strong' };
+ * @example
+ * config.coreStyles_bold = { element : 'span', attributes : {'class': 'Bold'} };
+ */
 CKEDITOR.config.coreStyles_bold                 = { element : 'strong', overrides : 'b' };
+/**
+ * The style definition to be used to apply the italic style in the text.
+ * @type Object
+ * @default { element : 'em', overrides : 'i' }
+ * @example
+ * CKEDITOR.config.coreStyles_italic            = { element : 'span', attributes : {'class': 'Italic'} };
+ */
 CKEDITOR.config.coreStyles_italic               = { element : 'em', overrides : 'i' };
+/**
+ * The style definition to be used to apply the underline style in the text.
+ * @type Object
+ * @default { element : 'u' }
+ * @example
+ * CKEDITOR.config.coreStyles_underline = { element : 'span', attributes : {'class': 'Underline'}};
+ */
 CKEDITOR.config.coreStyles_underline    = { element : 'u' };
+/**
+ * The style definition to be used to apply the strike style in the text.
+ * @type Object
+ * @default { element : 'strike' }
+ * @example
+ * CKEDITOR.config.coreStyles_strike            = { element : 'span', attributes : {'class': 'StrikeThrough'}, overrides : 'strike' };
+ */
 CKEDITOR.config.coreStyles_strike               = { element : 'strike' };
+/**
+ * The style definition to be used to apply the subscript style in the text.
+ * @type Object
+ * @default { element : 'sub' }
+ * @example
+ * CKEDITOR.config.coreStyles_subscript = { element : 'span', attributes : {'class': 'Subscript'}, overrides : 'sub' };
+ */
 CKEDITOR.config.coreStyles_subscript    = { element : 'sub' };
+/**
+ * The style definition to be used to apply the superscript style in the text.
+ * @type Object
+ * @default { element : 'sup' }
+ * @example
+ * CKEDITOR.config.coreStyles_superscript       = { element : 'span', attributes : {'class': 'Superscript'}, overrides : 'sup' };
+ */
 CKEDITOR.config.coreStyles_superscript  = { element : 'sup' };

CKEditor/branches/versions/3.2.x/_source/plugins/indent/plugin.js

@@ -322 +322 @@
                 indentClasses : null
         });
+
+/**
+ * Size of each indentation step
+ * @type Number
+ * @default 40
+ * @example
+ * config.indentOffset = 4;
+ */
+
+ /**
+ * Unit for the indentation style
+ * @type String
+ * @default 'px'
+ * @example
+ * config.indentUnit = 'em';
+ */
+
+ /**
+ * List of classes to use for indenting the contents. If it's null, no classes will be used
+ * and instead the {@link #indentUnit} and {@link #indentOffset} properties will be used.
+ * @type Array
+ * default null
+ * @example
+ * // Use the classes 'Indent1', 'Indent2', 'Indent3'
+ * config.indentClasses = ['Indent1', 'Indent2', 'Indent3'];
+ */

CKEditor/branches/versions/3.2.x/_source/plugins/link/dialogs/link.js

@@ -1396 +1396 @@
 
 /**
- * <p>The e-mail address anti-spam protection option. The protection will be
- * applied when creating or modifying e-mail links through the editor interface.</p>
- * <p>Two methods of protection can be choosed:</p>
+ * The e-mail address anti-spam protection option. The protection will be
+ * applied when creating or modifying e-mail links through the editor interface.<br>
+ * Two methods of protection can be choosed:
  * <ol> <li>The e-mail parts (name, domain and any other query string) are
  *                      assembled into a function call pattern. Such function must be
@@ -1405 +1405 @@
  *                      has no meaning for humans or spam bots, but which is properly
  *                      rendered and accepted by the browser.</li></ol>
- * <p>Both approaches require JavaScript to be enabled.</p>
+ * Both approaches require JavaScript to be enabled.
  * @name CKEDITOR.config.emailProtection
  * @since 3.1
- * @type {String}
+ * @type String
  * @default '' (empty string = disabled)
  * @example

CKEditor/branches/versions/3.2.x/_source/plugins/selection/plugin.js

@@ -139 +139 @@
                                                                 // Disable selections from being saved.
                                                                 saveEnabled = false;
-
-                                                                // IE before version 8 will leave cursor blinking inside the document after
-                                                                // editor blurred unless we clean up the selection. (#4716)
-                                                                if ( CKEDITOR.env.ie && CKEDITOR.env.version < 8 )
-                                                                {
-                                                                        // IE stack overflows when we're doing so inside table. (#5114)
-                                                                        var parent =
-                                                                                savedRange
-                                                                                && savedRange.parentElement
-                                                                                && savedRange.parentElement();
-
-                                                                        if ( !( parent && parent.tagName.toLowerCase() in CKEDITOR.dtd.$tableContent ) )
-                                                                                editor.document.$.selection.empty();
-                                                                }
                                                         });
 

CKEditor/branches/versions/3.2.x/_source/plugins/templates/dialogs/templates.js

@@ -82 +82 @@
                                                 range.moveToElementEditStart( editor.document.getBody() );
                                                 range.select( true );
+                                                setTimeout( function ()
+                                                {
+                                                        editor.fire( 'saveSnapshot' );
+                                                }, 0 );
                                         } );
+
+                                        editor.fire( 'saveSnapshot' );
                                         editor.setData( html );
                                 }

CKEditor/branches/versions/3.2.x/_source/skins/v2/richcombo.css

@@ -145 +145 @@
         width: 14px;
         height: 20px;
-        _height: 22px;
 }
 
@@ -284 +283 @@
         float: none;
 }
+
+.cke_skin_v2 .cke_browser_iequirks .cke_rcombo .cke_openbutton
+{
+        height: 22px;
+}