Index: /CKEditor/branches/versions/3.5.x/CHANGES.html =================================================================== --- /CKEditor/branches/versions/3.5.x/CHANGES.html (revision 6897) +++ /CKEditor/branches/versions/3.5.x/CHANGES.html (revision 6898) @@ -35,4 +35,30 @@ CKEditor Changelog +

+ CKEditor 3.5.4 (SVN)

+

+ New features:

+ +

+ Fixed issues:

+

CKEditor 3.5.3

Index: /CKEditor/branches/versions/3.5.x/_dev/releaser/release.bat =================================================================== --- /CKEditor/branches/versions/3.5.x/_dev/releaser/release.bat (revision 6897) +++ /CKEditor/branches/versions/3.5.x/_dev/releaser/release.bat (revision 6898) @@ -11,3 +11,3 @@ :: rmdir /S /Q release -java -jar ckreleaser/ckreleaser.jar ckreleaser.release ../.. release "3.5.3" ckeditor_3.5.3 --run-before-release=langtool.bat +java -jar ckreleaser/ckreleaser.jar ckreleaser.release ../.. release "3.5.4 (SVN)" ckeditor_3.5.4_svn --run-before-release=langtool.bat Index: /CKEditor/branches/versions/3.5.x/_dev/releaser/release.sh =================================================================== --- /CKEditor/branches/versions/3.5.x/_dev/releaser/release.sh (revision 6897) +++ /CKEditor/branches/versions/3.5.x/_dev/releaser/release.sh (revision 6898) @@ -13,4 +13,4 @@ pushd $DIR -java -jar ckreleaser/ckreleaser.jar ckreleaser.release ../.. release "3.5.3" ckeditor_3.5.3 --run-before-release=$LANGTOOL +java -jar ckreleaser/ckreleaser.jar ckreleaser.release ../.. release "3.5.4 (SVN)" ckeditor_3.5.4_svn --run-before-release=$LANGTOOL popd Index: /CKEditor/branches/versions/3.5.x/_samples/asp/index.html =================================================================== --- /CKEditor/branches/versions/3.5.x/_samples/asp/index.html (revision 6897) +++ /CKEditor/branches/versions/3.5.x/_samples/asp/index.html (revision 6898) @@ -81,5 +81,5 @@ Index: /CKEditor/branches/versions/3.5.x/_samples/assets/_posteddata.php =================================================================== --- /CKEditor/branches/versions/3.5.x/_samples/assets/_posteddata.php (revision 6897) +++ /CKEditor/branches/versions/3.5.x/_samples/assets/_posteddata.php (revision 6898) @@ -40,5 +40,5 @@ ?> - +
Index: /CKEditor/branches/versions/3.5.x/_samples/php/index.html =================================================================== --- /CKEditor/branches/versions/3.5.x/_samples/php/index.html (revision 6897) +++ /CKEditor/branches/versions/3.5.x/_samples/php/index.html (revision 6898) @@ -20,5 +20,5 @@
  • Replace existing textarea elements by code
    Replacement of selected textarea elements with CKEditor instances by using a JavaScript call.
    • -
  • Replace all textarea elements by code
    +
  • Replace all textarea elements by code
    Replacement of all textarea elements with CKEditor instances by using a JavaScript call.
  • Create CKEditor instances in PHP
    Index: /CKEditor/branches/versions/3.5.x/_samples/placeholder.html =================================================================== --- /CKEditor/branches/versions/3.5.x/_samples/placeholder.html (revision 6897) +++ /CKEditor/branches/versions/3.5.x/_samples/placeholder.html (revision 6898) @@ -23,10 +23,10 @@

    This sample shows how to configure CKEditor instances to use the - placeholder plugin that lets you insert read-only elements + Placeholder plugin that lets you insert read-only elements into your content. To enter and modify read-only text, use the Create Placeholder button and its matching dialog window.

    - To add a CKEditor instance that uses the placeholder plugin and a related + To add a CKEditor instance that uses the placeholder plugin and a related Create Placeholder toolbar button, insert the following JavaScript call to your code: @@ -55,5 +55,5 @@

    + CKEditor using the placeholder plugin with its default configuration: ' + - ''; - - var src = - CKEDITOR.env.air ? - 'javascript:void(0)' : - isCustomDomain ? - 'javascript:void((function(){' + - 'document.open();' + - 'document.domain=\'' + document.domain + '\';' + - 'document.close();' + - '})())"' - : - ''; - - var iframe = CKEDITOR.dom.element.createFromHtml( - '' ); - - iframe.on( 'load', function( e ) - { - e.removeListener(); - - var doc = iframe.getFrameDocument(); - doc.write( htmlToLoad ); - - if ( CKEDITOR.env.air ) - onPasteFrameLoad.call( this, doc.getWindow().$ ); - }, - this ); - - iframe.setCustomData( 'dialog', this ); - - var field = this.getContentElement( 'general', 'editing_area' ), - container = field.getElement(); - container.setHtml( '' ); - container.append( iframe ); - - // IE need a redirect on focus to make - // the cursor blinking inside iframe. (#5461) - if ( CKEDITOR.env.ie ) - { - var focusGrabber = CKEDITOR.dom.element.createFromHtml( '' ); - focusGrabber.on( 'focus', function() - { - iframe.$.contentWindow.focus(); - }); - container.append( focusGrabber ); - - // Override focus handler on field. - field.focus = function() - { - focusGrabber.focus(); - this.fire( 'focus' ); - }; - } - - field.getInputElement = function(){ return iframe; }; - - // Force container to scale in IE. - if ( CKEDITOR.env.ie ) - { - container.setStyle( 'display', 'block' ); - container.setStyle( 'height', ( iframe.$.offsetHeight + 2 ) + 'px' ); - } + this.setupContent(); }, @@ -162,18 +84,5 @@ onOk : function() { - var container = this.getContentElement( 'general', 'editing_area' ).getElement(), - iframe = container.getElementsByTag( 'iframe' ).getItem( 0 ), - editor = this.getParentEditor(), - body = iframe.getFrameDocument().getBody(), - bogus = body.getBogus(), - html; - bogus && bogus.remove(); - // Saving the contents in variable so changes until paste is complete will not take place (#7500) - html = body.getHtml(); - - setTimeout( function(){ - editor.fire( 'paste', { 'html' : html } ); - }, 0 ); - + this.commitContent(); }, @@ -209,4 +118,101 @@ win.focus(); }, 500 ); + }, + setup : function() + { + var dialog = this.getDialog(); + var htmlToLoad = + '' + + '' + + '' + + ''; + + var src = + CKEDITOR.env.air ? + 'javascript:void(0)' : + isCustomDomain ? + 'javascript:void((function(){' + + 'document.open();' + + 'document.domain=\'' + document.domain + '\';' + + 'document.close();' + + '})())"' + : + ''; + + var iframe = CKEDITOR.dom.element.createFromHtml( + '' ); + + iframe.on( 'load', function( e ) + { + e.removeListener(); + + var doc = iframe.getFrameDocument(); + doc.write( htmlToLoad ); + + if ( CKEDITOR.env.air ) + onPasteFrameLoad.call( this, doc.getWindow().$ ); + }, dialog ); + + iframe.setCustomData( 'dialog', dialog ); + + var container = this.getElement(); + container.setHtml( '' ); + container.append( iframe ); + + // IE need a redirect on focus to make + // the cursor blinking inside iframe. (#5461) + if ( CKEDITOR.env.ie ) + { + var focusGrabber = CKEDITOR.dom.element.createFromHtml( '' ); + focusGrabber.on( 'focus', function() + { + iframe.$.contentWindow.focus(); + }); + container.append( focusGrabber ); + + // Override focus handler on field. + this.focus = function() + { + focusGrabber.focus(); + this.fire( 'focus' ); + }; + } + + this.getInputElement = function(){ return iframe; }; + + // Force container to scale in IE. + if ( CKEDITOR.env.ie ) + { + container.setStyle( 'display', 'block' ); + container.setStyle( 'height', ( iframe.$.offsetHeight + 2 ) + 'px' ); + } + }, + commit : function( data ) + { + var container = this.getElement(), + editor = this.getDialog().getParentEditor(), + body = this.getInputElement().getFrameDocument().getBody(), + bogus = body.getBogus(), + html; + bogus && bogus.remove(); + + // Saving the contents so changes until paste is complete will not take place (#7500) + html = body.getHtml(); + + setTimeout( function(){ + editor.fire( 'paste', { 'html' : html } ); + }, 0 ); } } Index: /CKEditor/branches/versions/3.5.x/_source/plugins/clipboard/plugin.js =================================================================== --- /CKEditor/branches/versions/3.5.x/_source/plugins/clipboard/plugin.js (revision 6897) +++ /CKEditor/branches/versions/3.5.x/_source/plugins/clipboard/plugin.js (revision 6898) @@ -215,15 +215,5 @@ // Turn off design mode temporarily before give focus to the paste bin. if ( mode == 'text' ) - { - if ( CKEDITOR.env.ie ) - { - var ieRange = doc.getBody().$.createTextRange(); - ieRange.moveToElementText( pastebin.$ ); - ieRange.execCommand( 'Paste' ); - evt.data.preventDefault(); - } - else - pastebin.$.focus(); - } + pastebin.$.focus(); else { @@ -378,6 +368,4 @@ editor.on( 'key', onKey, editor ); - var mode = editor.config.forcePasteAsPlainText ? 'text' : 'html'; - // We'll be catching all pasted content in one line, regardless of whether the // it's introduced by a document command execution (e.g. toolbar buttons) or @@ -386,19 +374,23 @@ { var body = editor.document.getBody(); - body.on( ( ( mode == 'text' && CKEDITOR.env.ie ) || CKEDITOR.env.webkit ) ? 'paste' : 'beforepaste', - function( evt ) + body.on( CKEDITOR.env.webkit ? 'paste' : 'beforepaste', function( evt ) { if ( depressBeforeEvent ) return; - getClipboardData.call( editor, evt, mode, function ( data ) + // Fire 'beforePaste' event so clipboard flavor get customized + // by other plugins. + var eventData = { mode : 'html' }; + editor.fire( 'beforePaste', eventData ); + + getClipboardData.call( editor, evt, eventData.mode, function ( data ) { // The very last guard to make sure the // paste has successfully happened. - if ( !CKEDITOR.tools.trim( data.toLowerCase().replace( /]+data-cke-bookmark[^<]*?<\/span>/g,'' ) ) ) + if ( !( data = CKEDITOR.tools.trim( data.replace( /]+data-cke-bookmark[^<]*?<\/span>/ig,'' ) ) ) ) return; var dataTransfer = {}; - dataTransfer[ mode ] = data; + dataTransfer[ eventData.mode ] = data; editor.fire( 'paste', dataTransfer ); } ); Index: /CKEditor/branches/versions/3.5.x/_source/plugins/colorbutton/plugin.js =================================================================== --- /CKEditor/branches/versions/3.5.x/_source/plugins/colorbutton/plugin.js (revision 6897) +++ /CKEditor/branches/versions/3.5.x/_source/plugins/colorbutton/plugin.js (revision 6898) @@ -228,4 +228,5 @@ /** * Whether to enable the "More Colors..." button in the color selectors. + * @name CKEDITOR.config.colorButton_enableMore * @default true * @type Boolean @@ -241,4 +242,5 @@ * name and the slash character. For example, "FontColor1/FF9900" will be * displayed as the color #FF9900 in the selector, but will be outputted as "FontColor1". + * @name CKEDITOR.config.colorButton_colors * @type String * @default '000,800000,8B4513,2F4F4F,008080,000080,4B0082,696969,B22222,A52A2A,DAA520,006400,40E0D0,0000CD,800080,808080,F00,FF8C00,FFD700,008000,0FF,00F,EE82EE,A9A9A9,FFA07A,FFA500,FFFF00,00FF00,AFEEEE,ADD8E6,DDA0DD,D3D3D3,FFF0F5,FAEBD7,FFFFE0,F0FFF0,F0FFFF,F0F8FF,E6E6FA,FFF' @@ -258,4 +260,5 @@ /** * Holds the style definition to be used to apply the text foreground color. + * @name CKEDITOR.config.colorButton_foreStyle * @type Object * @example @@ -276,4 +279,5 @@ /** * Holds the style definition to be used to apply the text background color. + * @name CKEDITOR.config.colorButton_backStyle * @type Object * @example Index: /CKEditor/branches/versions/3.5.x/_source/plugins/colordialog/plugin.js =================================================================== --- /CKEditor/branches/versions/3.5.x/_source/plugins/colordialog/plugin.js (revision 6897) +++ /CKEditor/branches/versions/3.5.x/_source/plugins/colordialog/plugin.js (revision 6898) @@ -1,13 +1,15 @@ -( function() +/* +Copyright (c) 2003-2011, CKSource - Frederico Knabben. All rights reserved. +For licensing, see LICENSE.html or http://ckeditor.com/license +*/ + +CKEDITOR.plugins.colordialog = { - CKEDITOR.plugins.colordialog = + init : function( editor ) { - init : function( editor ) - { - editor.addCommand( 'colordialog', new CKEDITOR.dialogCommand( 'colordialog' ) ); - CKEDITOR.dialog.add( 'colordialog', this.path + 'dialogs/colordialog.js' ); - } - }; + editor.addCommand( 'colordialog', new CKEDITOR.dialogCommand( 'colordialog' ) ); + CKEDITOR.dialog.add( 'colordialog', this.path + 'dialogs/colordialog.js' ); + } +}; - CKEDITOR.plugins.add( 'colordialog', CKEDITOR.plugins.colordialog ); -} )(); +CKEDITOR.plugins.add( 'colordialog', CKEDITOR.plugins.colordialog ); Index: /CKEditor/branches/versions/3.5.x/_source/plugins/dialog/dialogDefinition.js =================================================================== --- /CKEditor/branches/versions/3.5.x/_source/plugins/dialog/dialogDefinition.js (revision 6897) +++ /CKEditor/branches/versions/3.5.x/_source/plugins/dialog/dialogDefinition.js (revision 6898) @@ -283,4 +283,22 @@ * Function to execute whenever the UI element's parent dialog is closed. * @name CKEDITOR.dialog.definition.uiElement.prototype.onHide + * @field + * @type Function + * @example + */ + +/** + * Function to execute whenever the UI element's parent dialog's {@link CKEDITOR.dialog.definition.setupContent} method is executed. + * It usually takes care of the respective UI element as a standalone element. + * @name CKEDITOR.dialog.definition.uiElement.prototype.setup + * @field + * @type Function + * @example + */ + +/** + * Function to execute whenever the UI element's parent dialog's {@link CKEDITOR.dialog.definition.commitContent} method is executed. + * It usually takes care of the respective UI element as a standalone element. + * @name CKEDITOR.dialog.definition.uiElement.prototype.commit * @field * @type Function Index: /CKEditor/branches/versions/3.5.x/_source/plugins/dialog/plugin.js =================================================================== --- /CKEditor/branches/versions/3.5.x/_source/plugins/dialog/plugin.js (revision 6897) +++ /CKEditor/branches/versions/3.5.x/_source/plugins/dialog/plugin.js (revision 6898) @@ -860,4 +860,14 @@ })(), + + /** + * Calls the {@link CKEDITOR.dialog.definition.uiElement#setup} method of each of the UI elements, with the arguments passed through it. + * It is usually being called when the dialog is opened, to put the initial value inside the field. + * @example + * dialogObj.setupContent(); + * @example + * var timestamp = ( new Date() ).valueOf(); + * dialogObj.setupContent( timestamp ); + */ setupContent : function() { @@ -870,4 +880,13 @@ }, + /** + * Calls the {@link CKEDITOR.dialog.definition.uiElement#commit} method of each of the UI elements, with the arguments passed through it. + * It is usually being called when the user confirms the dialog, to process the values. + * @example + * dialogObj.commitContent(); + * @example + * var timestamp = ( new Date() ).valueOf(); + * dialogObj.commitContent( timestamp ); + */ commitContent : function() { @@ -1140,4 +1159,5 @@ * @param {String} elementId id of UI element. * @example + * dialogObj.getContentElement( 'tabId', 'elementId' ).setValue( 'Example' ); * @returns {CKEDITOR.ui.dialog.uiElement} The dialog UI element. */ @@ -1153,4 +1173,5 @@ * @param {String} elementId id of UI element. * @example + * alert( dialogObj.getValueOf( 'tabId', 'elementId' ) ); * @returns {Object} The value of the UI element. */ @@ -1166,4 +1187,5 @@ * @param {Object} value The new value of the UI element. * @example + * dialogObj.setValueOf( 'tabId', 'elementId', 'Example' ); */ setValueOf : function( pageId, elementId, value ) @@ -1906,4 +1928,9 @@ currentCover; + function cancelEvent( ev ) + { + ev.data.preventDefault(1); + } + function showCover( editor ) { @@ -1965,4 +1992,8 @@ coverElement = CKEDITOR.dom.element.createFromHtml( html.join( '' ) ); coverElement.setOpacity( backgroundCoverOpacity != undefined ? backgroundCoverOpacity : 0.5 ); + + coverElement.on( 'keydown', cancelEvent ); + coverElement.on( 'keypress', cancelEvent ); + coverElement.on( 'keyup', cancelEvent ); coverElement.appendTo( CKEDITOR.document.getBody() ); Index: /CKEditor/branches/versions/3.5.x/_source/plugins/entities/plugin.js =================================================================== --- /CKEditor/branches/versions/3.5.x/_source/plugins/entities/plugin.js (revision 6897) +++ /CKEditor/branches/versions/3.5.x/_source/plugins/entities/plugin.js (revision 6898) @@ -172,4 +172,5 @@ /** * Whether to use HTML entities in the output. + * @name CKEDITOR.config.entities * @type Boolean * @default true @@ -183,4 +184,5 @@ * to HTML entities. The list of entities can be found at the * W3C HTML 4.01 Specification, section 24.2.1. + * @name CKEDITOR.config.entities_latin * @type Boolean * @default true @@ -195,4 +197,5 @@ * The list of entities can be found at the * W3C HTML 4.01 Specification, section 24.3.1. + * @name CKEDITOR.config.entities_greek * @type Boolean * @default true @@ -208,5 +211,5 @@ * For example, the phrase "This is Chinese: 汉语." is outputted * as "This is Chinese: &#27721;&#35821;." - * @type Boolean + * @name CKEDITOR.config.entities_processNumerical * @type Boolean|String * @default false @@ -220,4 +223,5 @@ * entry separated by a comma. Entities names or number must be used, exclusing * the "&" preffix and the ";" termination. + * @name CKEDITOR.config.entities_additional * @default '#39' // The single quote (') character. * @type String Index: /CKEditor/branches/versions/3.5.x/_source/plugins/indent/plugin.js =================================================================== --- /CKEditor/branches/versions/3.5.x/_source/plugins/indent/plugin.js (revision 6897) +++ /CKEditor/branches/versions/3.5.x/_source/plugins/indent/plugin.js (revision 6898) @@ -452,5 +452,5 @@ * @name CKEDITOR.config.indentClasses * @type Array - * default null + * @default null * @example * // Use the classes 'Indent1', 'Indent2', 'Indent3' Index: /CKEditor/branches/versions/3.5.x/_source/plugins/justify/plugin.js =================================================================== --- /CKEditor/branches/versions/3.5.x/_source/plugins/justify/plugin.js (revision 6897) +++ /CKEditor/branches/versions/3.5.x/_source/plugins/justify/plugin.js (revision 6898) @@ -238,2 +238,13 @@ }); })(); + + /** + * List of classes to use for aligning the contents. If it's null, no classes will be used + * and instead the corresponding CSS values will be used. The array should contain 4 members, in the following order: left, center, right, justify. + * @name CKEDITOR.config.justifyClasses + * @type Array + * @default null + * @example + * // Use the classes 'AlignLeft', 'AlignCenter', 'AlignRight', 'AlignJustify' + * config.justifyClasses = [ 'AlignLeft', 'AlignCenter', 'AlignRight', 'AlignJustify' ]; + */ Index: /CKEditor/branches/versions/3.5.x/_source/plugins/pastefromword/plugin.js =================================================================== --- /CKEditor/branches/versions/3.5.x/_source/plugins/pastefromword/plugin.js (revision 6897) +++ /CKEditor/branches/versions/3.5.x/_source/plugins/pastefromword/plugin.js (revision 6898) @@ -5,4 +5,6 @@ (function() { + function forceHtmlMode( evt ) { evt.data.mode = 'html'; } + CKEDITOR.plugins.add( 'pastefromword', { @@ -16,4 +18,5 @@ { evt && evt.removeListener(); + editor.removeListener( 'beforePaste', forceHtmlMode ); forceFromWord && setTimeout( function() { forceFromWord = 0; }, 0 ); }; @@ -28,6 +31,9 @@ exec : function() { + // Ensure the received data format is HTML and apply content filtering. (#6718) forceFromWord = 1; - if ( editor.execCommand( 'paste' ) === false ) + editor.on( 'beforePaste', forceHtmlMode ); + + if ( editor.execCommand( 'paste', 'html' ) === false ) { editor.on( 'dialogShow', function ( evt ) Index: /CKEditor/branches/versions/3.5.x/_source/plugins/pastetext/dialogs/pastetext.js =================================================================== --- /CKEditor/branches/versions/3.5.x/_source/plugins/pastetext/dialogs/pastetext.js (revision 6897) +++ /CKEditor/branches/versions/3.5.x/_source/plugins/pastetext/dialogs/pastetext.js (revision 6898) @@ -14,21 +14,6 @@ minHeight : 240, - onShow : function() - { - // Reset the textarea value. - this.getContentElement( 'general', 'content' ).getInputElement().setValue( '' ); - }, - - onOk : function() - { - // Get the textarea value. - var text = this.getContentElement( 'general', 'content' ).getInputElement().getValue(), - editor = this.getParentEditor(); - - setTimeout( function() - { - editor.fire( 'paste', { 'text' : text } ); - }, 0 ); - }, + onShow : function(){ this.setupContent(); }, + onOk : function(){ this.commitContent(); }, contents : @@ -61,4 +46,16 @@ { this.getElement().focus(); + }, + setup : function() + { + this.setValue( '' ); + }, + commit : function() + { + var value = this.getValue(); + setTimeout( function() + { + editor.fire( 'paste', { 'text' : value } ); + }, 0 ); } } Index: /CKEditor/branches/versions/3.5.x/_source/plugins/pastetext/plugin.js =================================================================== --- /CKEditor/branches/versions/3.5.x/_source/plugins/pastetext/plugin.js (revision 6897) +++ /CKEditor/branches/versions/3.5.x/_source/plugins/pastetext/plugin.js (revision 6898) @@ -59,5 +59,7 @@ editor.on( 'beforeCommandExec', function ( evt ) { - if ( evt.data.name == 'paste' ) + var mode = evt.data.commandData; + // Do NOT overwrite if HTML format is explicitly requested. + if ( evt.data.name == 'paste' && mode != 'html' ) { editor.execCommand( 'pastetext' ); @@ -65,4 +67,9 @@ } }, null, null, 0 ); + + editor.on( 'beforePaste', function( evt ) + { + evt.data.mode = 'text'; + }); } @@ -83,4 +90,5 @@ * editor, loosing any formatting information possibly available in the source * text. + * Note: paste from word is not affected by this configuration. * @name CKEDITOR.config.forcePasteAsPlainText * @type Boolean Index: /CKEditor/branches/versions/3.5.x/_source/plugins/scayt/plugin.js =================================================================== --- /CKEditor/branches/versions/3.5.x/_source/plugins/scayt/plugin.js (revision 6897) +++ /CKEditor/branches/versions/3.5.x/_source/plugins/scayt/plugin.js (revision 6898) @@ -664,13 +664,13 @@ return null; // Remove unused commands and menuitems - for ( i in moreSuggestions ) - { - delete editor._.menuItems[ i ]; - delete editor._.commands[ i ]; + for ( var m in moreSuggestions ) + { + delete editor._.menuItems[ m ]; + delete editor._.commands[ m ]; } - for ( i in mainSuggestions ) - { - delete editor._.menuItems[ i ]; - delete editor._.commands[ i ]; + for ( m in mainSuggestions ) + { + delete editor._.menuItems[ m ]; + delete editor._.commands[ m ]; } moreSuggestions = {}; // Reset items. Index: /CKEditor/branches/versions/3.5.x/_source/plugins/selection/plugin.js =================================================================== --- /CKEditor/branches/versions/3.5.x/_source/plugins/selection/plugin.js (revision 6897) +++ /CKEditor/branches/versions/3.5.x/_source/plugins/selection/plugin.js (revision 6898) @@ -568,8 +568,8 @@ var styleObjectElements = - { - img:1,hr:1,li:1,table:1,tr:1,td:1,th:1,embed:1,object:1,ol:1,ul:1, - a:1, input:1, form:1, select:1, textarea:1, button:1, fieldset:1, th:1, thead:1, tfoot:1 - }; + { + img:1,hr:1,li:1,table:1,tr:1,td:1,th:1,embed:1,object:1,ol:1,ul:1, + a:1,input:1,form:1,select:1,textarea:1,button:1,fieldset:1,thead:1,tfoot:1 + }; CKEDITOR.dom.selection.prototype = Index: /CKEditor/branches/versions/3.5.x/_source/plugins/styles/plugin.js =================================================================== --- /CKEditor/branches/versions/3.5.x/_source/plugins/styles/plugin.js (revision 6897) +++ /CKEditor/branches/versions/3.5.x/_source/plugins/styles/plugin.js (revision 6898) @@ -816,5 +816,5 @@ var root = range.getCommonAncestor( true, true ), element = root.getAscendant( this.element, true ); - element && setupElement( element, this ); + element && !element.isReadOnly() && setupElement( element, this ); } @@ -873,6 +873,9 @@ while ( ( block = iterator.getNextParagraph() ) ) // Only one = { - var newBlock = getElement( this, doc, block ); - replaceBlock( block, newBlock ); + if ( !block.isReadOnly() ) + { + var newBlock = getElement( this, doc, block ); + replaceBlock( block, newBlock ); + } } @@ -1446,4 +1449,14 @@ else styleText = unparsedCssText; + + // Normalize font-family property, ignore quotes and being case insensitive. (#7322) + // http://www.w3.org/TR/css3-fonts/#font-family-the-font-family-property + styleText = styleText.replace( /(font-family:)(.*?)(?=;|$)/, function ( match, prop, val ) + { + var names = val.split( ',' ); + for ( var i = 0; i < names.length; i++ ) + names[ i ] = CKEDITOR.tools.trim( names[ i ].replace( /["']/g, '' ) ); + return prop + names.join( ',' ); + }); // Shrinking white-spaces around colon and semi-colon (#4147). Index: /CKEditor/branches/versions/3.5.x/_source/plugins/undo/plugin.js =================================================================== --- /CKEditor/branches/versions/3.5.x/_source/plugins/undo/plugin.js (revision 6897) +++ /CKEditor/branches/versions/3.5.x/_source/plugins/undo/plugin.js (revision 6898) @@ -546,4 +546,5 @@ * The number of undo steps to be saved. The higher this setting value the more * memory is used for it. + * @name CKEDITOR.config.undoStackSize * @type Number * @default 20 Index: /CKEditor/branches/versions/3.5.x/_source/plugins/wysiwygarea/plugin.js =================================================================== --- /CKEditor/branches/versions/3.5.x/_source/plugins/wysiwygarea/plugin.js (revision 6897) +++ /CKEditor/branches/versions/3.5.x/_source/plugins/wysiwygarea/plugin.js (revision 6898) @@ -11,17 +11,13 @@ (function() { - // List of elements in which has no way to move editing focus outside. - var nonExitableElementNames = { table:1,pre:1 }; - // Matching an empty paragraph at the end of document. - var emptyParagraphRegexp = /(^|]*>)\s*<(p|div|address|h\d|center)[^>]*>\s*(?:]*>| |\u00A0| )?\s*(:?<\/\2>)?\s*(?=$|<\/body>)/gi; + var emptyParagraphRegexp = /(^|]*>)\s*<(p|div|address|h\d|center|pre)[^>]*>\s*(?:]*>| |\u00A0| )?\s*(:?<\/\2>)?\s*(?=$|<\/body>)/gi; var notWhitespaceEval = CKEDITOR.dom.walker.whitespaces( true ); - // Elements that could have empty new line around, including table, pre-formatted block, hr, page-break. (#6554) - function nonExitable( element ) + // Elements that could blink the cursor anchoring beside it, like hr, page-break. (#6554) + function nonEditable( element ) { - return ( element.getName() in nonExitableElementNames ) - || element.isBlockBoundary() && CKEDITOR.dtd.$empty[ element.getName() ]; + return element.isBlockBoundary() && CKEDITOR.dtd.$empty[ element.getName() ]; } @@ -370,6 +366,10 @@ lastNode = pathBlock && pathBlock.getLast( isNotEmpty ); - // In case it's not ended with block element and doesn't have bogus yet. (#7467) + // Check some specialities of the current path block: + // 1. It is really displayed as block; (#7221) + // 2. It doesn't end with one inner block; (#7467) + // 3. It doesn't have bogus br yet. if ( pathBlock + && pathBlock.isBlockBoundary() && !( lastNode && lastNode.type == CKEDITOR.NODE_ELEMENT && lastNode.isBlockBoundary() ) && !pathBlock.is( 'pre' ) @@ -410,5 +410,5 @@ if ( element && element.type == CKEDITOR.NODE_ELEMENT && - !nonExitable( element ) ) + !nonEditable( element ) ) { range.moveToElementEditStart( element ); @@ -420,5 +420,5 @@ if ( element && element.type == CKEDITOR.NODE_ELEMENT && - !nonExitable( element ) ) + !nonEditable( element ) ) { range.moveToElementEditEnd( element ); @@ -433,20 +433,11 @@ } - // All browsers are incapable to moving cursor out of certain non-exitable - // blocks (e.g. table, list, pre) at the end of document, make this happen by - // place a bogus node there, which would be later removed by dataprocessor. - var walkerRange = new CKEDITOR.dom.range( editor.document ), - walker = new CKEDITOR.dom.walker( walkerRange ); - walkerRange.selectNodeContents( body ); - walker.evaluator = function( node ) - { - return node.type == CKEDITOR.NODE_ELEMENT && ( node.getName() in nonExitableElementNames ); - }; - walker.guard = function( node, isMoveout ) - { - return !( ( node.type == CKEDITOR.NODE_TEXT && isNotWhitespace( node ) ) || isMoveout ); - }; - - if ( walker.previous() ) + // Browsers are incapable of moving cursor out of certain block elements (e.g. table, div, pre) + // at the end of document, makes it unable to continue adding content, we have to make this + // easier by opening an new empty paragraph. + var testRange = new CKEDITOR.dom.range( editor.document ); + testRange.moveToElementEditEnd( editor.document.getBody() ); + var testPath = new CKEDITOR.dom.elementPath( testRange.startContainer ); + if ( !testPath.blockLimit.is( 'body') ) { editor.fire( 'updateSnapshot' ); @@ -456,5 +447,5 @@ var paddingBlock; if ( enterMode != CKEDITOR.ENTER_BR ) - paddingBlock = body.append( new CKEDITOR.dom.element( enterMode == CKEDITOR.ENTER_P ? 'p' : 'div' ) ); + paddingBlock = body.append( editor.document.createElement( enterMode == CKEDITOR.ENTER_P ? 'p' : 'div' ) ); else paddingBlock = body; Index: /CKEditor/branches/versions/3.5.x/_source/themes/default/theme.js =================================================================== --- /CKEditor/branches/versions/3.5.x/_source/themes/default/theme.js (revision 6897) +++ /CKEditor/branches/versions/3.5.x/_source/themes/default/theme.js (revision 6898) @@ -11,4 +11,6 @@ CKEDITOR.themes.add( 'default', (function() { + var hiddenSkins = {}; + function checkSharedSpace( editor, spaceName ) { @@ -121,4 +123,10 @@ sharedTop && ( sharedTop.setHtml( topHtml ) , topHtml = '' ); sharedBottoms && ( sharedBottoms.setHtml( bottomHtml ), bottomHtml = '' ); + + var hideSkin = ''; + if ( hiddenSkins[ editor.skinClass ] ) + hideSkin = ''; + else + hiddenSkins[ editor.skinClass ] = 1; var container = CKEDITOR.dom.element.createFromHtml( [ @@ -143,5 +151,5 @@ '' + //Hide the container when loading skins, later restored by skin css. - '' + + hideSkin + '' + '' +