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 );
});
}
Index: /CKEditor/branches/versions/3.2.x/_source/core/config.js
===================================================================
--- /CKEditor/branches/versions/3.2.x/_source/core/config.js (revision 5170)
+++ /CKEditor/branches/versions/3.2.x/_source/core/config.js (revision 5171)
@@ -90,6 +90,6 @@
* 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.
Index: /CKEditor/branches/versions/3.2.x/_source/core/editor.js
===================================================================
--- /CKEditor/branches/versions/3.2.x/_source/core/editor.js (revision 5170)
+++ /CKEditor/branches/versions/3.2.x/_source/core/editor.js (revision 5171)
@@ -586,6 +586,4 @@
* @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.
setData( '<p>This is the editor data.</p>' );
@@ -596,14 +594,14 @@
* });
*/
- 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,5 +692,5 @@
* @name CKEDITOR.config.htmlEncodeOutput
* @since 3.1
- * @type {Boolean}
+ * @type Boolean
* @default false
* @example
Index: /CKEditor/branches/versions/3.2.x/_source/lang/_translationstatus.txt
===================================================================
--- /CKEditor/branches/versions/3.2.x/_source/lang/_translationstatus.txt (revision 5170)
+++ /CKEditor/branches/versions/3.2.x/_source/lang/_translationstatus.txt (revision 5171)
@@ -17,5 +17,5 @@
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
Index: /CKEditor/branches/versions/3.2.x/_source/lang/es.js
===================================================================
--- /CKEditor/branches/versions/3.2.x/_source/lang/es.js (revision 5170)
+++ /CKEditor/branches/versions/3.2.x/_source/lang/es.js (revision 5171)
@@ -98,6 +98,6 @@
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,5 +471,5 @@
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,8 +504,8 @@
{
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 (
Ctrl+V); luego presione
Aceptar.',
- 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 (
Ctrl+V);\r\nluego presione
Aceptar.',
+ 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,5 +513,5 @@
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,17 +605,17 @@
{
'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,5 +627,5 @@
'00F' : 'Azul',
'EE82EE' : 'Violeta',
- 'A9A9A9' : 'Gris oscuro',
+ 'A9A9A9' : 'Gris medio',
'FFA07A' : 'Salmón claro',
'FFA500' : 'Naranja',
@@ -634,13 +634,13 @@
'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'
},
Index: /CKEditor/branches/versions/3.2.x/_source/plugins/basicstyles/plugin.js
===================================================================
--- /CKEditor/branches/versions/3.2.x/_source/plugins/basicstyles/plugin.js (revision 5170)
+++ /CKEditor/branches/versions/3.2.x/_source/plugins/basicstyles/plugin.js (revision 5171)
@@ -43,8 +43,51 @@
// 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' };
Index: /CKEditor/branches/versions/3.2.x/_source/plugins/indent/plugin.js
===================================================================
--- /CKEditor/branches/versions/3.2.x/_source/plugins/indent/plugin.js (revision 5170)
+++ /CKEditor/branches/versions/3.2.x/_source/plugins/indent/plugin.js (revision 5171)
@@ -322,2 +322,28 @@
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'];
+ */
Index: /CKEditor/branches/versions/3.2.x/_source/plugins/link/dialogs/link.js
===================================================================
--- /CKEditor/branches/versions/3.2.x/_source/plugins/link/dialogs/link.js (revision 5170)
+++ /CKEditor/branches/versions/3.2.x/_source/plugins/link/dialogs/link.js (revision 5171)
@@ -1396,7 +1396,7 @@
/**
- *
The e-mail address anti-spam protection option. The protection will be
- * applied when creating or modifying e-mail links through the editor interface.
- *
Two methods of protection can be choosed:
+ * The e-mail address anti-spam protection option. The protection will be
+ * applied when creating or modifying e-mail links through the editor interface.
+ * Two methods of protection can be choosed:
*
- The e-mail parts (name, domain and any other query string) are
* assembled into a function call pattern. Such function must be
@@ -1405,8 +1405,8 @@
* has no meaning for humans or spam bots, but which is properly
* rendered and accepted by the browser.
- *
Both approaches require JavaScript to be enabled.
+ * Both approaches require JavaScript to be enabled.
* @name CKEDITOR.config.emailProtection
* @since 3.1
- * @type {String}
+ * @type String
* @default '' (empty string = disabled)
* @example
Index: /CKEditor/branches/versions/3.2.x/_source/plugins/selection/plugin.js
===================================================================
--- /CKEditor/branches/versions/3.2.x/_source/plugins/selection/plugin.js (revision 5170)
+++ /CKEditor/branches/versions/3.2.x/_source/plugins/selection/plugin.js (revision 5171)
@@ -139,18 +139,4 @@
// 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();
- }
});
Index: /CKEditor/branches/versions/3.2.x/_source/plugins/templates/dialogs/templates.js
===================================================================
--- /CKEditor/branches/versions/3.2.x/_source/plugins/templates/dialogs/templates.js (revision 5170)
+++ /CKEditor/branches/versions/3.2.x/_source/plugins/templates/dialogs/templates.js (revision 5171)
@@ -82,5 +82,11 @@
range.moveToElementEditStart( editor.document.getBody() );
range.select( true );
+ setTimeout( function ()
+ {
+ editor.fire( 'saveSnapshot' );
+ }, 0 );
} );
+
+ editor.fire( 'saveSnapshot' );
editor.setData( html );
}
Index: /CKEditor/branches/versions/3.2.x/_source/skins/v2/richcombo.css
===================================================================
--- /CKEditor/branches/versions/3.2.x/_source/skins/v2/richcombo.css (revision 5170)
+++ /CKEditor/branches/versions/3.2.x/_source/skins/v2/richcombo.css (revision 5171)
@@ -145,5 +145,4 @@
width: 14px;
height: 20px;
- _height: 22px;
}
@@ -284,2 +283,7 @@
float: none;
}
+
+.cke_skin_v2 .cke_browser_iequirks .cke_rcombo .cke_openbutton
+{
+ height: 22px;
+}