- would cause
@@ -1605,5 +1606,5 @@
/**
- * Moves the range boundaries to the first editing point inside an
+ * Moves the range boundaries to the first/end editing point inside an
* element. For example, in an element tree like
* "<p><b><i></i></b> Text</p>", the start editing point is
@@ -1611,6 +1612,7 @@
* @param {CKEDITOR.dom.element} el The element into which look for the
* editing spot.
+ * @param {Boolean} isMoveToEnd Whether move to the end editable position.
*/
- moveToElementEditStart : function( el )
+ moveToElementEditablePosition : function( el, isMoveToEnd )
{
var isEditable;
@@ -1622,9 +1624,13 @@
// If an editable element is found, move inside it.
if ( isEditable )
- this.moveToPosition( el, CKEDITOR.POSITION_AFTER_START );
+ this.moveToPosition( el, isMoveToEnd ?
+ CKEDITOR.POSITION_BEFORE_END :
+ CKEDITOR.POSITION_AFTER_START );
// Stop immediately if we've found a non editable inline element (e.g
- with another list tree as the first
+ // child, we'll need to append a filler (
/NBSP) or the list item + // wouldn't be editable. (#1420) + if ( nextBlock.is( 'li' ) + && ( node = nextBlock.getFirst( CKEDITOR.dom.walker.invisible( true ) ) ) + && node.is && node.is( 'ul', 'ol' ) ) + ( CKEDITOR.env.ie ? doc.createText( '\xa0' ) : doc.createElement( 'br' ) ).insertBefore( node ); + + // Move the selection to the end block. + if ( nextBlock ) + range.moveToElementEditStart( nextBlock ); + } + else + { + + if ( isStartOfBlock && isEndOfBlock && previousBlock.is( 'li' ) ) + { + editor.execCommand( 'outdent' ); + return; + } + + var newBlock; + + if ( previousBlock ) + { + // Do not enter this block if it's a header tag, or we are in + // a Shift+Enter (#77). Create a new block element instead + // (later in the code). + if ( !forceMode && !headerTagRegex.test( previousBlock.getName() ) ) + { + // Otherwise, duplicate the previous block. + newBlock = previousBlock.clone(); + } + } + else if ( nextBlock ) + newBlock = nextBlock.clone(); + + if ( !newBlock ) + newBlock = doc.createElement( blockTag ); + + // Recreate the inline elements tree, which was available + // before hitting enter, so the same styles will be available in + // the new block. + var elementPath = splitInfo.elementPath; + if ( elementPath ) + { + for ( var i = 0, len = elementPath.elements.length ; i < len ; i++ ) + { + var element = elementPath.elements[ i ]; + + if ( element.equals( elementPath.block ) || element.equals( elementPath.blockLimit ) ) + break; + + if ( CKEDITOR.dtd.$removeEmpty[ element.getName() ] ) + { + element = element.clone(); + newBlock.moveChildren( element ); + newBlock.append( element ); + } + } + } + + if ( !CKEDITOR.env.ie ) + newBlock.appendBogus(); + + range.insertNode( newBlock ); + + // This is tricky, but to make the new block visible correctly + // we must select it. + // The previousBlock check has been included because it may be + // empty if we have fixed a block-less space (like ENTER into an + // empty table cell). + if ( CKEDITOR.env.ie && isStartOfBlock && ( !isEndOfBlock || !previousBlock.getChildCount() ) ) + { + // Move the selection to the new block. + range.moveToElementEditStart( isEndOfBlock ? previousBlock : newBlock ); + range.select(); + } + + // Move the selection to the new block. + range.moveToElementEditStart( isStartOfBlock && !isEndOfBlock ? nextBlock : newBlock ); + } + + if ( !CKEDITOR.env.ie ) + { + if ( nextBlock ) + { + // If we have split the block, adds a temporary span at the + // range position and scroll relatively to it. + var tmpNode = doc.createElement( 'span' ); + + // We need some content for Safari. + tmpNode.setHtml( ' ' ); + + range.insertNode( tmpNode ); + tmpNode.scrollIntoView(); + range.deleteContents(); + } + else + { + // We may use the above scroll logic for the new block case + // too, but it gives some weird result with Opera. + newBlock.scrollIntoView(); + } + } + + range.select(); + }, + + enterBr : function( editor, mode, range, forceMode ) + { + // Get the range for the current selection. + range = range || getRange( editor ); + + var doc = range.document; + + // Determine the block element to be used. + var blockTag = ( mode == CKEDITOR.ENTER_DIV ? 'div' : 'p' ); + + var isEndOfBlock = range.checkEndOfBlock(); + + var elementPath = new CKEDITOR.dom.elementPath( editor.getSelection().getStartElement() ); + + var startBlock = elementPath.block, + startBlockTag = startBlock && elementPath.block.getName(); + + var isPre = false; + + if ( !forceMode && startBlockTag == 'li' ) + { + enterBlock( editor, mode, range, forceMode ); + return; + } + + // If we are at the end of a header block. + if ( !forceMode && isEndOfBlock && headerTagRegex.test( startBlockTag ) ) + { + // Insert a
after the current paragraph. + doc.createElement( 'br' ).insertAfter( startBlock ); + + // A text node is required by Gecko only to make the cursor blink. + if ( CKEDITOR.env.gecko ) + doc.createText( '' ).insertAfter( startBlock ); + + // IE has different behaviors regarding position. + range.setStartAt( startBlock.getNext(), CKEDITOR.env.ie ? CKEDITOR.POSITION_BEFORE_START : CKEDITOR.POSITION_AFTER_START ); + } + else + { + var lineBreak; + + isPre = ( startBlockTag == 'pre' ); + + if ( isPre ) + lineBreak = doc.createText( CKEDITOR.env.ie ? '\r' : '\n' ); + else + lineBreak = doc.createElement( 'br' ); + + range.deleteContents(); + range.insertNode( lineBreak ); + + // A text node is required by Gecko only to make the cursor blink. + // We need some text inside of it, so the bogus
is properly + // created. + if ( !CKEDITOR.env.ie ) + doc.createText( '\ufeff' ).insertAfter( lineBreak ); + + // If we are at the end of a block, we must be sure the bogus node is available in that block. + if ( isEndOfBlock && !CKEDITOR.env.ie ) + lineBreak.getParent().appendBogus(); + + // Now we can remove the text node contents, so the caret doesn't + // stop on it. + if ( !CKEDITOR.env.ie ) + lineBreak.getNext().$.nodeValue = ''; + // IE has different behavior regarding position. + if ( CKEDITOR.env.ie ) + range.setStartAt( lineBreak, CKEDITOR.POSITION_AFTER_END ); + else + range.setStartAt( lineBreak.getNext(), CKEDITOR.POSITION_AFTER_START ); + + // Scroll into view, for non IE. + if ( !CKEDITOR.env.ie ) + { + var dummy = null; + + // BR is not positioned in Opera and Webkit. + if ( !CKEDITOR.env.gecko ) + { + dummy = doc.createElement( 'span' ); + // We need have some contents for Webkit to position it + // under parent node. ( #3681) + dummy.setHtml(' '); + } + else + dummy = doc.createElement( 'br' ); + + dummy.insertBefore( lineBreak.getNext() ); + dummy.scrollIntoView(); + dummy.remove(); + } + } + + // This collapse guarantees the cursor will be blinking. + range.collapse( true ); + + range.select( isPre ); + } + }; + + var plugin = CKEDITOR.plugins.enterkey, + enterBr = plugin.enterBr, + enterBlock = plugin.enterBlock, headerTagRegex = /^h[1-6]$/; @@ -25,10 +286,8 @@ // On SHIFT+ENTER we want to enforce the mode to be respected, instead // of cloning the current block. (#77) - forceMode = 1; - - return enter( editor, editor.config.shiftEnterMode ); + return enter( editor, editor.config.shiftEnterMode, true ); } - function enter( editor, mode ) + function enter( editor, mode, forceMode ) { // Only effective within document. @@ -44,9 +303,8 @@ editor.fire( 'saveSnapshot' ); // Save undo step. if ( mode == CKEDITOR.ENTER_BR || editor.getSelection().getStartElement().hasAscendant( 'pre', true ) ) - enterBr( editor, mode ); + enterBr( editor, mode, null, forceMode ); else - enterBlock( editor, mode ); - - forceMode = 0; + enterBlock( editor, mode, null, forceMode ); + }, 0 ); @@ -54,258 +312,4 @@ } - function enterBlock( editor, mode, range ) - { - // Get the range for the current selection. - range = range || getRange( editor ); - - var doc = range.document; - - // Determine the block element to be used. - var blockTag = ( mode == CKEDITOR.ENTER_DIV ? 'div' : 'p' ); - - // Split the range. - var splitInfo = range.splitBlock( blockTag ); - - if ( !splitInfo ) - return; - - // Get the current blocks. - var previousBlock = splitInfo.previousBlock, - nextBlock = splitInfo.nextBlock; - - var isStartOfBlock = splitInfo.wasStartOfBlock, - isEndOfBlock = splitInfo.wasEndOfBlock; - - var node; - - // If this is a block under a list item, split it as well. (#1647) - if ( nextBlock ) - { - node = nextBlock.getParent(); - if ( node.is( 'li' ) ) - { - nextBlock.breakParent( node ); - nextBlock.move( nextBlock.getNext(), true ); - } - } - else if ( previousBlock && ( node = previousBlock.getParent() ) && node.is( 'li' ) ) - { - previousBlock.breakParent( node ); - range.moveToElementEditStart( previousBlock.getNext() ); - previousBlock.move( previousBlock.getPrevious() ); - } - - // If we have both the previous and next blocks, it means that the - // boundaries were on separated blocks, or none of them where on the - // block limits (start/end). - if ( !isStartOfBlock && !isEndOfBlock ) - { - // If the next block is an - with another list tree as the first
- // child, we'll need to append a filler (
/NBSP) or the list item - // wouldn't be editable. (#1420) - if ( nextBlock.is( 'li' ) - && ( node = nextBlock.getFirst( CKEDITOR.dom.walker.invisible( true ) ) ) - && node.is && node.is( 'ul', 'ol' ) ) - ( CKEDITOR.env.ie ? doc.createText( '\xa0' ) : doc.createElement( 'br' ) ).insertBefore( node ); - - // Move the selection to the end block. - if ( nextBlock ) - range.moveToElementEditStart( nextBlock ); - } - else - { - - if ( isStartOfBlock && isEndOfBlock && previousBlock.is( 'li' ) ) - { - editor.execCommand( 'outdent' ); - return; - } - - var newBlock; - - if ( previousBlock ) - { - // Do not enter this block if it's a header tag, or we are in - // a Shift+Enter (#77). Create a new block element instead - // (later in the code). - if ( !forceMode && !headerTagRegex.test( previousBlock.getName() ) ) - { - // Otherwise, duplicate the previous block. - newBlock = previousBlock.clone(); - } - } - else if ( nextBlock ) - newBlock = nextBlock.clone(); - - if ( !newBlock ) - newBlock = doc.createElement( blockTag ); - - // Recreate the inline elements tree, which was available - // before hitting enter, so the same styles will be available in - // the new block. - var elementPath = splitInfo.elementPath; - if ( elementPath ) - { - for ( var i = 0, len = elementPath.elements.length ; i < len ; i++ ) - { - var element = elementPath.elements[ i ]; - - if ( element.equals( elementPath.block ) || element.equals( elementPath.blockLimit ) ) - break; - - if ( CKEDITOR.dtd.$removeEmpty[ element.getName() ] ) - { - element = element.clone(); - newBlock.moveChildren( element ); - newBlock.append( element ); - } - } - } - - if ( !CKEDITOR.env.ie ) - newBlock.appendBogus(); - - range.insertNode( newBlock ); - - // This is tricky, but to make the new block visible correctly - // we must select it. - // The previousBlock check has been included because it may be - // empty if we have fixed a block-less space (like ENTER into an - // empty table cell). - if ( CKEDITOR.env.ie && isStartOfBlock && ( !isEndOfBlock || !previousBlock.getChildCount() ) ) - { - // Move the selection to the new block. - range.moveToElementEditStart( isEndOfBlock ? previousBlock : newBlock ); - range.select(); - } - - // Move the selection to the new block. - range.moveToElementEditStart( isStartOfBlock && !isEndOfBlock ? nextBlock : newBlock ); - } - - if ( !CKEDITOR.env.ie ) - { - if ( nextBlock ) - { - // If we have split the block, adds a temporary span at the - // range position and scroll relatively to it. - var tmpNode = doc.createElement( 'span' ); - - // We need some content for Safari. - tmpNode.setHtml( ' ' ); - - range.insertNode( tmpNode ); - tmpNode.scrollIntoView(); - range.deleteContents(); - } - else - { - // We may use the above scroll logic for the new block case - // too, but it gives some weird result with Opera. - newBlock.scrollIntoView(); - } - } - - range.select(); - } - - function enterBr( editor, mode ) - { - // Get the range for the current selection. - var range = getRange( editor ), - doc = range.document; - - // Determine the block element to be used. - var blockTag = ( mode == CKEDITOR.ENTER_DIV ? 'div' : 'p' ); - - var isEndOfBlock = range.checkEndOfBlock(); - - var elementPath = new CKEDITOR.dom.elementPath( editor.getSelection().getStartElement() ); - - var startBlock = elementPath.block, - startBlockTag = startBlock && elementPath.block.getName(); - - var isPre = false; - - if ( !forceMode && startBlockTag == 'li' ) - { - enterBlock( editor, mode, range ); - return; - } - - // If we are at the end of a header block. - if ( !forceMode && isEndOfBlock && headerTagRegex.test( startBlockTag ) ) - { - // Insert a
after the current paragraph. - doc.createElement( 'br' ).insertAfter( startBlock ); - - // A text node is required by Gecko only to make the cursor blink. - if ( CKEDITOR.env.gecko ) - doc.createText( '' ).insertAfter( startBlock ); - - // IE has different behaviors regarding position. - range.setStartAt( startBlock.getNext(), CKEDITOR.env.ie ? CKEDITOR.POSITION_BEFORE_START : CKEDITOR.POSITION_AFTER_START ); - } - else - { - var lineBreak; - - isPre = ( startBlockTag == 'pre' ); - - if ( isPre ) - lineBreak = doc.createText( CKEDITOR.env.ie ? '\r' : '\n' ); - else - lineBreak = doc.createElement( 'br' ); - - range.deleteContents(); - range.insertNode( lineBreak ); - - // A text node is required by Gecko only to make the cursor blink. - // We need some text inside of it, so the bogus
is properly - // created. - if ( !CKEDITOR.env.ie ) - doc.createText( '\ufeff' ).insertAfter( lineBreak ); - - // If we are at the end of a block, we must be sure the bogus node is available in that block. - if ( isEndOfBlock && !CKEDITOR.env.ie ) - lineBreak.getParent().appendBogus(); - - // Now we can remove the text node contents, so the caret doesn't - // stop on it. - if ( !CKEDITOR.env.ie ) - lineBreak.getNext().$.nodeValue = ''; - // IE has different behavior regarding position. - if ( CKEDITOR.env.ie ) - range.setStartAt( lineBreak, CKEDITOR.POSITION_AFTER_END ); - else - range.setStartAt( lineBreak.getNext(), CKEDITOR.POSITION_AFTER_START ); - - // Scroll into view, for non IE. - if ( !CKEDITOR.env.ie ) - { - var dummy = null; - - // BR is not positioned in Opera and Webkit. - if ( !CKEDITOR.env.gecko ) - { - dummy = doc.createElement( 'span' ); - // We need have some contents for Webkit to position it - // under parent node. ( #3681) - dummy.setHtml(' '); - } - else - dummy = doc.createElement( 'br' ); - - dummy.insertBefore( lineBreak.getNext() ); - dummy.scrollIntoView(); - dummy.remove(); - } - } - - // This collapse guarantees the cursor will be blinking. - range.collapse( true ); - - range.select( isPre ); - } function getRange( editor ) Index: /CKEditor/trunk/_source/plugins/fakeobjects/plugin.js =================================================================== --- /CKEditor/trunk/_source/plugins/fakeobjects/plugin.js (revision 4773) +++ /CKEditor/trunk/_source/plugins/fakeobjects/plugin.js (revision 4774) @@ -12,13 +12,13 @@ $ : function( element ) { - var realHtml = element.attributes._cke_realelement, + var attributes = element.attributes, + realHtml = attributes && attributes._cke_realelement, realFragment = realHtml && new CKEDITOR.htmlParser.fragment.fromHtml( decodeURIComponent( realHtml ) ), realElement = realFragment && realFragment.children[ 0 ]; - if ( realElement ) + // If we have width/height in the element, we must move it into + // the real element. + if ( realElement && element.attributes._cke_resizable ) { - // If we have width/height in the element, we must move it into - // the real element. - var style = element.attributes.style; @@ -64,4 +64,5 @@ { var lang = this.lang.fakeobjects; + var attributes = { @@ -69,8 +70,11 @@ src : CKEDITOR.getUrl( 'images/spacer.gif' ), _cke_realelement : encodeURIComponent( realElement.getOuterHtml() ), + _cke_real_node_type : realElement.type, alt : lang[ realElementType ] || lang.unknown }; + if ( realElementType ) attributes._cke_real_element_type = realElementType; + if ( isResizable ) attributes._cke_resizable = isResizable; @@ -81,10 +85,10 @@ CKEDITOR.editor.prototype.createFakeParserElement = function( realElement, className, realElementType, isResizable ) { + var lang = this.lang.fakeobjects, + html, writer; + var writer = new CKEDITOR.htmlParser.basicWriter(); - realElement.writeHtml( writer ); - - var html = writer.getHtml(); - var lang = this.lang.fakeobjects; + html = writer.getHtml(); var attributes = @@ -93,4 +97,5 @@ src : CKEDITOR.getUrl( 'images/spacer.gif' ), _cke_realelement : encodeURIComponent( html ), + _cke_real_node_type : realElement.type, alt : lang[ realElementType ] || lang.unknown }; @@ -107,5 +112,9 @@ CKEDITOR.editor.prototype.restoreRealElement = function( fakeElement ) { - var html = decodeURIComponent( fakeElement.getAttribute( '_cke_realelement' ) ); - return CKEDITOR.dom.element.createFromHtml( html, this.document ); + if ( fakeElement.getAttribute( '_cke_real_node_type' ) != CKEDITOR.NODE_ELEMENT ) + return null; + + return CKEDITOR.dom.element.createFromHtml( + decodeURIComponent( fakeElement.getAttribute( '_cke_realelement' ) ), + this.document ); }; Index: /CKEditor/trunk/_source/plugins/flash/dialogs/flash.js =================================================================== --- /CKEditor/trunk/_source/plugins/flash/dialogs/flash.js (revision 4773) +++ /CKEditor/trunk/_source/plugins/flash/dialogs/flash.js (revision 4774) @@ -174,5 +174,6 @@ makeEmbedTag = editor.config.flashAddEmbedTag || editor.config.flashEmbedTagOnly; - var previewAreaHtml = '' + CKEDITOR.tools.htmlEncode( editor.lang.image.preview ) +'
' + + var previewPreloader, + previewAreaHtml = '' + CKEDITOR.tools.htmlEncode( editor.lang.image.preview ) +''; @@ -186,4 +187,5 @@ // Clear previously saved elements. this.fakeImage = this.objectNode = this.embedNode = null; + previewPreloader = new CKEDITOR.dom.element( 'embeded', editor.document ); // Try to detect any embed or object tag that has Flash parameters. @@ -319,7 +321,8 @@ var dialog = this.getDialog(), updatePreview = function( src ){ - + // Query the preloader to figure out the url impacted by based href. + previewPreloader.setAttribute( 'src', src ); dialog.preview.setHtml( '' ); }; Index: /CKEditor/trunk/_source/plugins/font/plugin.js =================================================================== --- /CKEditor/trunk/_source/plugins/font/plugin.js (revision 4773) +++ /CKEditor/trunk/_source/plugins/font/plugin.js (revision 4774) @@ -37,5 +37,5 @@ panel : { - css : [ CKEDITOR.getUrl( editor.skinPath + 'editor.css' ) ].concat( config.contentsCss ), + css : editor.skin.editor.css.concat( config.contentsCss ), voiceLabel : lang.panelVoiceLabel }, Index: /CKEditor/trunk/_source/plugins/format/plugin.js =================================================================== --- /CKEditor/trunk/_source/plugins/format/plugin.js (revision 4773) +++ /CKEditor/trunk/_source/plugins/format/plugin.js (revision 4774) @@ -34,5 +34,5 @@ panel : { - css : [ CKEDITOR.getUrl( editor.skinPath + 'editor.css' ) ].concat( config.contentsCss ), + css : editor.skin.editor.css.concat( config.contentsCss ), voiceLabel : lang.panelVoiceLabel }, Index: /CKEditor/trunk/_source/plugins/htmldataprocessor/plugin.js =================================================================== --- /CKEditor/trunk/_source/plugins/htmldataprocessor/plugin.js (revision 4773) +++ /CKEditor/trunk/_source/plugins/htmldataprocessor/plugin.js (revision 4774) @@ -1,3 +1,3 @@ -/* +/* Copyright (c) 2003-2009, CKSource - Frederico Knabben. All rights reserved. For licensing, see LICENSE.html or http://ckeditor.com/license @@ -11,5 +11,4 @@ var protectedSourceMarker = '{cke_protected}'; - // Return the last non-space child node of the block (#4344). @@ -111,5 +110,7 @@ // All "_cke" attributes are to be ignored. - [ ( /^_cke.*/ ), '' ] + [ ( /^_cke.*/ ), '' ], + + [ 'hidefocus', '' ] ], @@ -118,9 +119,13 @@ $ : function( element ) { - // Remove duplicated attributes - #3789. var attribs = element.attributes; if ( attribs ) { + // Elements marked as temporary are to be ignored. + if ( attribs.cke_temp ) + return false; + + // Remove duplicated attributes - #3789. var attributeNames = [ 'name', 'href', 'src' ], savedAttributeName; @@ -131,4 +136,6 @@ } } + + return element; }, @@ -164,4 +171,19 @@ return false; } + }, + + body : function( element ) + { + delete element.attributes.spellcheck; + delete element.attributes.contenteditable; + }, + + style : function( element ) + { + var child = element.children[ 0 ]; + child && child.value && ( child.value = CKEDITOR.tools.trim( child.value )); + + if ( !element.attributes.type ) + element.attributes.type = 'text/css'; } }, @@ -178,6 +200,15 @@ comment : function( contents ) { + // If this is a comment for protected source. if ( contents.substr( 0, protectedSourceMarker.length ) == protectedSourceMarker ) - return new CKEDITOR.htmlParser.cdata( decodeURIComponent( contents.substr( protectedSourceMarker.length ) ) ); + { + // Remove the extra marker for real comments from it. + if ( contents.substr( protectedSourceMarker.length, 3 ) == '{C}' ) + contents = contents.substr( protectedSourceMarker.length + 3 ); + else + contents = contents.substr( protectedSourceMarker.length ); + + return new CKEDITOR.htmlParser.cdata( decodeURIComponent( contents ) ); + } return contents; @@ -202,4 +233,12 @@ var protectAttributeRegex = /<(?:a|area|img|input)[\s\S]*?\s((?:href|src|name)\s*=\s*(?:(?:"[^"]*")|(?:'[^']*')|(?:[^ "'>]+)))/gi; + var protectElementsRegex = /(?:
' + '' + '. this.setRules( 'pre', - { - indent: false - } ); + { + indent: false + }); }, @@ -263,5 +277,6 @@ * * - * All rules default to "false". + * All rules default to "false". Each call to the function overrides + * already present rules, leaving the undefined untouched. * * By default, all elements available in the {@link CKEDITOR.dtd.$block), @@ -284,5 +299,10 @@ setRules : function( tagName, rules ) { - this._.rules[ tagName ] = rules; + var currentRules = this._.rules[ tagName ]; + + if ( currentRules ) + CKEDITOR.tools.extend( currentRules, rules, true ); + else + this._.rules[ tagName ] = rules; } } Index: /CKEditor/trunk/_source/plugins/image/dialogs/image.js =================================================================== --- /CKEditor/trunk/_source/plugins/image/dialogs/image.js (revision 4773) +++ /CKEditor/trunk/_source/plugins/image/dialogs/image.js (revision 4774) @@ -196,4 +196,6 @@ var imageDialog = function( editor, dialogType ) { + var previewPreloader; + var onImgLoadEvent = function() { @@ -316,4 +318,5 @@ this.imageElement = editor.document.createElement( 'img' ); + previewPreloader = new CKEDITOR.dom.element( 'img', editor.document ); // Dont show preview if no URL given. if ( !CKEDITOR.tools.trim( this.getValueOf( 'info', 'txtUrl' ) ) ) @@ -493,6 +496,8 @@ original.on( 'abort', onImgLoadErrorEvent, dialog ); original.setAttribute( 'src', newUrl ); - dialog.preview.setAttribute( 'src', newUrl ); - + + // Query the preloader to figure out the url impacted by based href. + previewPreloader.setAttribute( 'src', newUrl ); + dialog.preview.setAttribute( 'src', previewPreloader.$.src ); updatePreview( dialog ); } @@ -1054,5 +1059,5 @@ ''+ ''+ - 'Lorem ipsum dolor sit amet, consectetuer adipiscing elit. '+ + '
Lorem ipsum dolor sit amet, consectetuer adipiscing elit. '+ 'Maecenas feugiat consequat diam. Maecenas metus. Vivamus diam purus, cursus a, commodo non, facilisis vitae, '+ 'nulla. Aenean dictum lacinia tortor. Nunc iaculis, nibh non iaculis aliquam, orci felis euismod neque, sed ornare massa mauris sed velit. Nulla pretium mi et risus. Fusce mi pede, tempor id, cursus ac, ullamcorper nec, enim. Sed tortor. Curabitur molestie. Duis velit augue, condimentum at, ultrices a, luctus ut, orci. Donec pellentesque egestas eros. Integer cursus, augue in cursus faucibus, eros pede bibendum sem, in tempus tellus justo quis ligula. Etiam eget tortor. Vestibulum rutrum, est ut placerat elementum, lectus nisl aliquam velit, tempor aliquam eros nunc nonummy metus. In eros metus, gravida a, gravida sed, lobortis id, turpis. Ut ultrices, ipsum at venenatis fringilla, sem nulla lacinia tellus, eget aliquet turpis mauris non enim. Nam turpis. Suspendisse lacinia. Curabitur ac tortor ut ipsum egestas elementum. Nunc imperdiet gravida mauris.' + Index: /CKEditor/trunk/_source/plugins/link/dialogs/link.js =================================================================== --- /CKEditor/trunk/_source/plugins/link/dialogs/link.js (revision 4773) +++ /CKEditor/trunk/_source/plugins/link/dialogs/link.js (revision 4774) @@ -74,6 +74,8 @@ emailBodyRegex = /body=([^;?:@&=$,\/]*)/, anchorRegex = /^#(.*)$/, - urlRegex = /^((?:http|https|ftp|news):\/\/)?(.*)$/, - selectableTargets = /^(_(?:self|top|parent|blank))$/; + urlRegex = /^(?!javascript)((?:http|https|ftp|news):\/\/)?(.*)$/, + selectableTargets = /^(_(?:self|top|parent|blank))$/, + encodedEmailLinkRegex = /^javascript:void\(location\.href='mailto:'\+String\.fromCharCode\(([^)]+)\)(?:\+'(.*)')?\)$/, + functionCallProtectedEmailLinkRegex = /^javascript:([^(]+)\(([^)]+)\)$/; var popupRegex = @@ -84,28 +86,10 @@ { var href = element ? ( element.getAttribute( '_cke_saved_href' ) || element.getAttribute( 'href' ) ) : '', - emailMatch = '', - anchorMatch = '', - urlMatch = false, + emailMatch, + anchorMatch, + urlMatch, retval = {}; - - if ( href ) - { - emailMatch = href.match( emailRegex ); - anchorMatch = href.match( anchorRegex ); - urlMatch = href.match( urlRegex ); - } - - // Load the link type and URL. - if ( emailMatch ) - { - var subjectMatch = href.match( emailSubjectRegex ), - bodyMatch = href.match( emailBodyRegex ); - retval.type = 'email'; - retval.email = {}; - retval.email.address = emailMatch[1]; - subjectMatch && ( retval.email.subject = decodeURIComponent( subjectMatch[1] ) ); - bodyMatch && ( retval.email.body = decodeURIComponent( bodyMatch[1] ) ); - } - else if ( anchorMatch ) + + if ( anchorMatch = href.match( anchorRegex ) ) { retval.type = 'anchor'; @@ -113,5 +97,6 @@ retval.anchor.name = retval.anchor.id = anchorMatch[1]; } - else if ( href && urlMatch ) // urlRegex matches empty strings, so need to check for href as well. + // urlRegex matches empty strings, so need to check for href as well. + else if ( href && ( urlMatch = href.match( urlRegex ) ) ) { retval.type = 'url'; @@ -119,4 +104,59 @@ retval.url.protocol = urlMatch[1]; retval.url.url = urlMatch[2]; + } + // Protected email link as encoded string. + else if ( !emailProtection || emailProtection == 'encode' ) + { + if( emailProtection == 'encode' ) + { + href = href.replace( encodedEmailLinkRegex, + function ( match, protectedAddress, rest ) + { + return 'mailto:' + + String.fromCharCode.apply( String, protectedAddress.split( ',' ) ) + + ( rest && unescapeSingleQuote( rest ) ); + } ); + } + + emailMatch = href.match( emailRegex ); + + if( emailMatch ) + { + var subjectMatch = href.match( emailSubjectRegex ), + bodyMatch = href.match( emailBodyRegex ); + + retval.type = 'email'; + var email = ( retval.email = {} ); + email.address = emailMatch[ 1 ]; + subjectMatch && ( email.subject = decodeURIComponent( subjectMatch[ 1 ] ) ); + bodyMatch && ( email.body = decodeURIComponent( bodyMatch[ 1 ] ) ); + } + } + // Protected email link as function call. + else if( emailProtection ) + { + href.replace( functionCallProtectedEmailLinkRegex, function( match, funcName, funcArgs ) + { + if( funcName == compiledProtectionFunction.name ) + { + retval.type = 'email'; + var email = retval.email = {}; + + var paramRegex = /[^,\s]+/g, + paramQuoteRegex = /(^')|('$)/g, + paramsMatch = funcArgs.match( paramRegex ), + paramsMatchLength = paramsMatch.length, + paramName, + paramVal; + + for ( var i = 0; i < paramsMatchLength; i++ ) + { + paramVal = decodeURIComponent( unescapeSingleQuote( paramsMatch[ i ].replace( paramQuoteRegex, '' ) ) ); + paramName = compiledProtectionFunction.params[ i ].toLowerCase(); + email[ paramName ] = paramVal; + } + email.address = [ email.name, email.domain ].join( '@' ); + } + } ); } else @@ -246,4 +286,70 @@ }; + function unescapeSingleQuote( str ) + { + return str.replace( /\\'/g, '\'' ); + } + + function escapeSingleQuote( str ) + { + return str.replace( /'/g, '\\$&' ); + } + + var emailProtection = editor.config.emailProtection || ''; + + // Compile the protection function pattern. + if( emailProtection && emailProtection != 'encode' ) + { + var compiledProtectionFunction = {}; + + emailProtection.replace( /^([^(]+)\(([^)]+)\)$/, function( match, funcName, params ) + { + compiledProtectionFunction.name = funcName; + compiledProtectionFunction.params = []; + params.replace( /[^,\s]+/g, function( param ) + { + compiledProtectionFunction.params.push( param ); + } ); + } ); + } + + function protectEmailLinkAsFunction( email ) + { + var retval, + name = compiledProtectionFunction.name, + params = compiledProtectionFunction.params, + paramName, + paramValue; + + retval = [ name, '(' ]; + for ( var i = 0; i < params.length; i++ ) + { + paramName = params[ i ].toLowerCase(); + paramValue = email[ paramName ]; + + i > 0 && retval.push( ',' ); + retval.push( '\'', + paramValue ? + escapeSingleQuote( encodeURIComponent( email[ paramName ] ) ) + : '', + '\''); + } + retval.push( ')' ); + return retval.join( '' ); + } + + function protectEmailAddressAsEncodedString( address ) + { + var charCode, + length = address.length, + encodedChars = []; + for ( var i = 0; i < length; i++ ) + { + charCode = address.charCodeAt( i ); + encodedChars.push( charCode ); + } + return 'String.fromCharCode(' + encodedChars.join( ',' ) + ')'; + } + return { title : editor.lang.link.title, @@ -1042,5 +1148,6 @@ removeAttributes = [], data = { href : attributes.href }, - me = this, editor = this.getParentEditor(); + me = this, + editor = this.getParentEditor(); this.commitContent( data ); @@ -1060,19 +1167,50 @@ break; case 'email': - var address = ( data.email && data.email.address ), - subject = ( data.email && encodeURIComponent( data.email.subject || '' ) ), - body = ( data.email && encodeURIComponent( data.email.body || '' ) ), - linkList = [ 'mailto:', address ]; - if ( subject || body ) - { - var argList = []; - linkList.push( '?' ); - subject && argList.push( 'subject=' + subject ); - body && argList.push( 'body=' + body ); - linkList.push( argList.join( '&' ) ); + + var linkHref, + email = data.email, + address = email.address; + + switch( emailProtection ) + { + case '' : + case 'encode' : + { + var subject = encodeURIComponent( email.subject || '' ), + body = encodeURIComponent( email.body || '' ); + + // Build the e-mail parameters first. + var argList = []; + subject && argList.push( 'subject=' + subject ); + body && argList.push( 'body=' + body ); + argList = argList.length ? '?' + argList.join( '&' ) : ''; + + if ( emailProtection == 'encode' ) + { + linkHref = [ 'javascript:void(location.href=\'mailto:\'+', + protectEmailAddressAsEncodedString( address ) ]; + // parameters are optional. + argList && linkHref.push( '+\'', escapeSingleQuote( argList ), '\'' ); + + linkHref.push( ')' ); + } + else + linkHref = [ 'mailto:', address, argList ]; + + break; + } + default : + { + // Separating name and domain. + var nameAndDomain = address.split( '@', 2 ); + email.name = nameAndDomain[ 0 ]; + email.domain = nameAndDomain[ 1 ]; + + linkHref = [ 'javascript:', protectEmailLinkAsFunction( email ) ]; + } } - attributes._cke_saved_href = linkList.join( '' ); + + attributes._cke_saved_href = linkHref.join( '' ); break; - default: } @@ -1219,3 +1357,23 @@ } }; -} ); +} ) + +/** + * The e-mail address anti-spam protection option. + * @name CKEDITOR.config.emailProtection + * @type {String} + * Two forms of protection could be choosed from : + * 1. The whole address parts ( name, domain with any other query string ) are assembled into a + * function call pattern which invoke you own provided function, with the specified arguments. + * 2. Only the e-mail address is obfuscated into unicode code point sequences, replacement are + * done by a String.fromCharCode() call. + * Note: Both approaches require JavaScript to be enabled. + * @default '' + * @example + * config.emailProtection = ''; + * // href="mailto:tester@ckeditor.com?subject=subject&body=body" + * config.emailProtection = 'encode'; + * // href="e-mail" + * config.emailProtection = 'mt(NAME,DOMAIN,SUBJECT,BODY)'; + * // href="javascript:mt('tester','ckeditor.com','subject','body')" + */ Index: /CKEditor/trunk/_source/plugins/menu/plugin.js =================================================================== --- /CKEditor/trunk/_source/plugins/menu/plugin.js (revision 4773) +++ /CKEditor/trunk/_source/plugins/menu/plugin.js (revision 4774) @@ -138,5 +138,5 @@ panel = this._.panel = new CKEDITOR.ui.floatPanel( this.editor, CKEDITOR.document.getBody(), { - css : [ CKEDITOR.getUrl( editor.skinPath + 'editor.css' ) ], + css : editor.skin.editor.css, level : this._.level - 1, className : editor.skinClass + ' cke_contextmenu' @@ -382,3 +382,3 @@ 'tablecell,tablecellproperties,tablerow,tablecolumn,table,'+ 'anchor,link,image,flash,' + - 'checkbox,radio,textfield,hiddenfield,imagebutton,button,select,textarea'; + 'checkbox,radio,textfield,hiddenfield,imagebutton,button,select,textarea,div'; Index: /CKEditor/trunk/_source/plugins/pagebreak/plugin.js =================================================================== --- /CKEditor/trunk/_source/plugins/pagebreak/plugin.js (revision 4773) +++ /CKEditor/trunk/_source/plugins/pagebreak/plugin.js (revision 4774) @@ -56,5 +56,6 @@ div : function( element ) { - var style = element.attributes.style, + var attributes = element.attributes + style = attributes && attributes.style, child = style && element.children.length == 1 && element.children[ 0 ], childStyle = child && ( child.name == 'span' ) && child.attributes.style; Index: /CKEditor/trunk/_source/plugins/panel/plugin.js =================================================================== --- /CKEditor/trunk/_source/plugins/panel/plugin.js (revision 4773) +++ /CKEditor/trunk/_source/plugins/panel/plugin.js (revision 4774) @@ -161,5 +161,5 @@ // after , so it (body) becames immediatelly // available. (#3031) - '' + + CKEDITOR.tools.buildStyleHtml( this.css ) + '<\/html>' ); doc.$.close(); Index: /CKEditor/trunk/_source/plugins/pastefromword/filter/default.js =================================================================== --- /CKEditor/trunk/_source/plugins/pastefromword/filter/default.js (revision 4774) +++ /CKEditor/trunk/_source/plugins/pastefromword/filter/default.js (revision 4774) @@ -0,0 +1,1089 @@ +/* +Copyright (c) 2003-2009, CKSource - Frederico Knabben. All rights reserved. +For licensing, see LICENSE.html or http://ckeditor.com/license +*/ + +(function() +{ + var fragmentPrototype = CKEDITOR.htmlParser.fragment.prototype, + elementPrototype = CKEDITOR.htmlParser.element.prototype; + + fragmentPrototype.onlyChild = elementPrototype.onlyChild = function() + { + var children = this.children, + count = children.length, + firstChild = ( count == 1 ) && children[ 0 ]; + return firstChild || null; + }; + + elementPrototype.removeAnyChildWithName = function( tagName ) + { + var children = this.children, + childs = [], + child; + + for ( var i = 0; i < children.length; i++ ) + { + child = children[ i ]; + if( !child.name ) + continue; + + if ( child.name == tagName ) + { + childs.push( child ); + children.splice( i--, 1 ); + } + childs = childs.concat( child.removeAnyChildWithName( tagName ) ); + } + return childs; + }; + + elementPrototype.getAncestor = function( tagNameRegex ) + { + var parent = this.parent; + while ( parent && !( parent.name && parent.name.match( tagNameRegex ) ) ) + parent = parent.parent; + return parent; + }; + + fragmentPrototype.firstChild = elementPrototype.firstChild = function( evaluator ) + { + var child; + for ( var i = 0 ; i < this.children.length ; i++ ) + { + child = this.children[ i ]; + if ( evaluator( child ) ) + return child; + else if ( child.name ) + { + child = child.firstChild( evaluator ); + if( child ) + return child; + else + continue; + } + } + }; + + // Adding a (set) of styles to the element's attributes. + elementPrototype.addStyle = function( name, value, isPrepend ) + { + var styleText, addingStyleText = ''; + // name/value pair. + if ( typeof value == 'string' ) + addingStyleText += name + ':' + value + ';'; + else + { + // style literal. + if ( typeof name == 'object' ) + { + for( var style in name ) + { + if( name.hasOwnProperty( style) ) + addingStyleText += style + ':' + name[ style ] + ';'; + } + // Avoid CKPackager produce buggy output (#4695) + // TODO: Remove after CKPackager get fixed. + ; + } + // raw style text form. + else + addingStyleText += name; + + isPrepend = value; + } + + if( !this.attributes ) + this.attributes = {}; + + styleText = this.attributes.style || ''; + + styleText = ( isPrepend ? + [ addingStyleText, styleText ] + : [ styleText, addingStyleText ] ).join( ';' ); + + this.attributes.style = styleText.replace( /^;|;(?=;)/, '' ); + }; + + /** + * Return the DTD-valid parent tag names of the specified one. + * @param tagName + */ + CKEDITOR.dtd.parentOf = function( tagName ) + { + var result = {}; + for ( var tag in this ) + { + if ( tag.indexOf( '$' ) == -1 && this[ tag ][ tagName ] ) + result[ tag ] = 1; + } + return result; + }; + + var cssLengthRelativeUnit = /^(\d[.\d]*)+(em|ex|px|gd|rem|vw|vh|vm|ch|mm|cm|in|pt|pc|deg|rad|ms|s|hz|khz){1}?/i; + var emptyMarginRegex = /^(?:\b0[^\s]*\s*){1,4}$/; + + CKEDITOR.plugins.pastefromword = + { + utils : + { + // Create a
- level1
- level2
=>
+ //
. + if ( element.getAncestor( 'thead') ) + element.name = 'th'; + }, + + // MS-Word sometimes present list as a mixing of normal list + // and pseudo-list, normalize the previous ones into pseudo form. + 'ol' : flattenList, + 'ul' : flattenList, + 'dl' : flattenList, + + 'font' : function( element ) + { + // IE/Safari: drop the font tag if it comes from list bullet text. + if ( !CKEDITOR.env.gecko && isListBulletIndicator( element.parent ) ) + { + delete element.name; + return; + } + + element.filterChildren(); + + var attrs = element.attributes, + styleText = attrs.style, + parent = element.parent; + + if ( 'font' == parent.name ) // Merge nested tags. + { + CKEDITOR.tools.extend( parent.attributes, + element.attributes ); + styleText && parent.addStyle( styleText ); + delete element.name; + return; + } + // Convert the merged into a span with all attributes preserved. + else + { + styleText = styleText || ''; + // IE's having those deprecated attributes, normalize them. + if ( attrs.color ) + { + attrs.color != '#000000' && ( styleText += 'color:' + attrs.color + ';' ); + delete attrs.color; + } + if ( attrs.face ) + { + styleText += 'font-family:' + attrs.face + ';'; + delete attrs.face; + } + // TODO: Mapping size in ranges of xx-small, + // x-small, small, medium, large, x-large, xx-large. + if ( attrs.size ) + { + styleText += 'font-size:' + + ( attrs.size > 3 ? 'large' + : ( attrs.size < 3 ? 'small' : 'medium' ) ) + ';'; + delete attrs.size; + } + + element.name = 'span'; + element.addStyle( styleText ); + } + }, + + 'span' : function( element ) + { + // IE/Safari: remove the span if it comes from list bullet text. + if ( !CKEDITOR.env.gecko && isListBulletIndicator( element.parent ) ) + return false; + + element.filterChildren(); + if ( containsNothingButSpaces( element ) ) + { + delete element.name; + return; + } + + // For IE/Safari: List item bullet type is supposed to be indicated by + // the text of a span with style 'mso-list : Ignore' or an image. + if ( !CKEDITOR.env.gecko && isListBulletIndicator( element ) ) + { + var listSymbolNode = element.firstChild( function( node ) + { + return node.value || node.name == 'img'; + }); + + var listSymbol = listSymbolNode && ( listSymbolNode.value || 'l.' ), + listType = listSymbol.match( /^([^\s]+?)([.)]?)$/ ); + return createListBulletMarker( listType, listSymbol ); + } + + // Update the src attribute of image element with href. + var children = element.children, + attrs = element.attributes, + styleText = attrs && attrs.style, + firstChild = children && children[ 0 ]; + + // Assume MS-Word mostly carry font related styles on , + // adapting them to editor's convention. + if ( styleText ) + { + attrs.style = stylesFilter( + [ + // Drop 'inline-height' style which make lines overlapping. + [ 'line-height' ], + [ /^font-family$/, null, !removeFontStyles ? styleMigrateFilter( config[ 'font_style' ], 'family' ) : null ] , + [ /^font-size$/, null, !removeFontStyles ? styleMigrateFilter( config[ 'fontSize_style' ], 'size' ) : null ] , + [ /^color$/, null, !removeFontStyles ? styleMigrateFilter( config[ 'colorButton_foreStyle' ], 'color' ) : null ] , + [ /^background-color$/, null, !removeFontStyles ? styleMigrateFilter( config[ 'colorButton_backStyle' ], 'color' ) : null ] + ] )( styleText, element ) || ''; + } + + }, + + // Migrate basic style formats to editor configured ones. + 'b' : elementMigrateFilter( config[ 'coreStyles_bold' ] ), + 'i' : elementMigrateFilter( config[ 'coreStyles_italic' ] ), + 'u' : elementMigrateFilter( config[ 'coreStyles_underline' ] ), + 's' : elementMigrateFilter( config[ 'coreStyles_strike' ] ), + 'sup' : elementMigrateFilter( config[ 'coreStyles_superscript' ] ), + 'sub' : elementMigrateFilter( config[ 'coreStyles_subscript' ] ), + // Editor doesn't support anchor with content currently (#3582), + // drop such anchors with content preserved. + 'a' : function( element ) + { + var attrs = element.attributes; + if( attrs && !attrs.href && attrs.name ) + delete element.name; + }, + 'cke:listbullet' : function( element ) + { + if ( element.getAncestor( /h\d/ ) && !config.pasteFromWordNumberedHeadingToList ) + delete element.name; + } + }, + + attributeNames : + [ + // Remove onmouseover and onmouseout events (from MS Word comments effect) + [ /^onmouse(:?out|over)/, '' ], + // Onload on image element. + [ /^onload$/, '' ], + // Remove office and vml attribute from elements. + [ /(?:v|o):\w+/, '' ], + // Remove lang/language attributes. + [ /^lang/, '' ] + ], + + attributes : + { + 'style' : stylesFilter( + removeStyles ? + // Provide a white-list of styles that we preserve, those should + // be the ones that could later be altered with editor tools. + [ + [ /^margin$|^margin-(?!bottom|top)/, null, function( value, element ) + { + if( element.name in { p : 1, div : 1 } + && !emptyMarginRegex.test( value ) ) + return value; + } ], + + [ /^border.*|margin.*|vertical-align|float$/ , null, + function( value, element ) + { + if( element.name == 'img' ) + return value; + } ], + + [ /^width|height$/, null, + function( value, element ) + { + if( element.name in { table : 1, td : 1, th : 1, img : 1 } ) + return value; + } ] + ] : + // Otherwise provide a black-list of styles that we remove. + [ + [ /^mso-/ ], + // Fixing color values. + [ /-color$/, null, function( value ) + { + if( value == 'transparent' ) + return false; + if( CKEDITOR.env.gecko ) + return value.replace( /-moz-use-text-color/g, 'transparent' ); + } ], + // Remove empty margin values, e.g. 0.00001pt 0em 0pt + [ /^margin$/, emptyMarginRegex ], + [ 'text-indent', '0cm' ], + [ 'page-break-before' ], + [ 'tab-stops' ], + [ 'display', 'none' ], + removeFontStyles ? [ /font-?/ ] : null, + ], removeStyles ), + + // Prefer width styles over 'width' attributes. + 'width' : function( value, element ) + { + if( element.name in dtd.$tableContent ) + return false; + }, + // Prefer border styles over table 'border' attributes. + 'border' : function( value, element ) + { + if( element.name in dtd.$tableContent ) + return false; + }, + + // Only Firefox carry style sheet from MS-Word, which + // will be applied by us manually. For other browsers + // the css className is useless. + 'class' : falsyFilter, + + // MS-Word always generate 'background-color' along with 'bgcolor', + // simply drop the deprecated attributes. + 'bgcolor' : falsyFilter, + + // Deprecate 'valign' attribute in favor of 'vertical-align'. + 'valign' : removeStyles ? falsyFilter : function( value, element ) + { + element.addStyle( 'vertical-align', value ); + return false; + } + }, + + // Fore none-IE, some useful data might be buried under these IE-conditional + // comments where RegExp were the right approach to dig them out where usual approach + // is transform it into a fake element node which hold the desired data. + comment : + !CKEDITOR.env.ie ? + function( value, node ) + { + var imageInfo = value.match( /
' ); - - this.insertHtml( text ); -}; /** @@ -135,4 +166,5 @@ * editor, loosing any formatting information possibly available in the source * text. + * @name CKEDITOR.config.forcePasteAsPlainText * @type Boolean * @default false @@ -140,3 +172,2 @@ * config.forcePasteAsPlainText = true; */ -CKEDITOR.config.forcePasteAsPlainText = false; Index: /CKEditor/trunk/_source/plugins/preview/plugin.js =================================================================== --- /CKEditor/trunk/_source/plugins/preview/plugin.js (revision 4773) +++ /CKEditor/trunk/_source/plugins/preview/plugin.js (revision 4774) @@ -17,12 +17,18 @@ { var sHTML, + config = editor.config, + baseTag = config.baseHref ? '' : '', isCustomDomain = CKEDITOR.env.isCustomDomain(); - if ( editor.config.fullPage ) - sHTML = editor.getData(); + + if ( config.fullPage ) + { + sHTML = editor.getData() + .replace( //, '$&' + baseTag ) + .replace( /[^>]*(?=<\/title>)/, editor.lang.preview ); + } else { var bodyHtml = ' 0 ) ? ' ' : ''; + body = editor.document.getBody(); if ( body.getAttribute( 'id' ) ) @@ -38,7 +44,5 @@ baseTag + ' ' + editor.lang.preview + ' ' + - '' + + CKEDITOR.tools.buildStyleHtml( editor.config.contentsCss ) + '' + bodyHtml + editor.getData() + Index: /CKEditor/trunk/_source/plugins/selection/plugin.js =================================================================== --- /CKEditor/trunk/_source/plugins/selection/plugin.js (revision 4773) +++ /CKEditor/trunk/_source/plugins/selection/plugin.js (revision 4774) @@ -942,4 +942,12 @@ return this; }, + + getCommonAncestor : function() + { + var ranges = this.getRanges(), + startNode = ranges[ 0 ].startContainer, + endNode = ranges[ ranges.length - 1 ].endContainer; + return startNode.getCommonAncestor( endNode ); + }, // Moving scroll bar to the current selection's start position. Index: /CKEditor/trunk/_source/plugins/showborders/plugin.js =================================================================== --- /CKEditor/trunk/_source/plugins/showborders/plugin.js (revision 4774) +++ /CKEditor/trunk/_source/plugins/showborders/plugin.js (revision 4774) @@ -0,0 +1,171 @@ +/* +Copyright (c) 2003-2009, CKSource - Frederico Knabben. All rights reserved. +For licensing, see LICENSE.html or http://ckeditor.com/license +*/ + +/** + * @fileOverview The "show border" plugin. The command display visible outline + * border line around all table elements if table doesn't have a none-zero 'border' attribute specified. + */ + +(function() +{ + var showBorderClassName = 'cke_show_border', + cssStyleText, + cssTemplate = + // TODO: For IE6, we don't have child selector support, + // where nested table cells could be incorrect. + ( CKEDITOR.env.ie6Compat ? + [ + '.%1 table.%2,', + '.%1 table.%2 td, .%1 table.%2 th,', + '{', + 'border : #d3d3d3 1px dotted', + '}' + ] : + [ + '.%1 table.%2,', + '.%1 table.%2 > tr > td, .%1 table.%2 > tr > th,', + '.%1 table.%2 > tbody > tr > td, .%1 table.%2 > tbody > tr > th,', + '.%1 table.%2 > thead > tr > td, .%1 table.%2 > thead > tr > th,', + '.%1 table.%2 > tfoot > tr > td, .%1 table.%2 > tfoot > tr > th', + '{', + 'border : #d3d3d3 1px dotted', + '}' + ] ).join( '' ); + + cssStyleText = cssTemplate.replace( /%2/g, showBorderClassName ).replace( /%1/g, 'cke_show_borders ' ); + + var commandDefinition = + { + preserveState : true, + editorFocus : false, + + exec : function ( editor ) + { + this.toggleState(); + this.refresh( editor ); + }, + + refresh : function( editor ) + { + var funcName = ( this.state == CKEDITOR.TRISTATE_ON ) ? 'addClass' : 'removeClass'; + editor.document.getBody()[ funcName ]( 'cke_show_borders' ); + } + }; + + CKEDITOR.plugins.add( 'showborders', + { + requires : [ 'wysiwygarea' ], + modes : { 'wysiwyg' : 1 }, + + init : function( editor ) + { + + var command = editor.addCommand( 'showborders', commandDefinition ); + command.canUndo = false; + + if ( editor.config.startupShowBorders != false ) + command.setState( CKEDITOR.TRISTATE_ON ); + + editor.addCss( cssStyleText ); + + // Refresh the command on setData. + editor.on( 'mode', function() + { + if ( command.state != CKEDITOR.TRISTATE_DISABLED ) + command.refresh( editor ); + }, null, null, 100 ); + + // Refresh the command on wysiwyg frame reloads. + editor.on( 'contentDom', function() + { + if ( command.state != CKEDITOR.TRISTATE_DISABLED ) + command.refresh( editor ); + }); + }, + + afterInit : function( editor ) + { + var dataProcessor = editor.dataProcessor, + dataFilter = dataProcessor && dataProcessor.dataFilter, + htmlFilter = dataProcessor && dataProcessor.htmlFilter; + + if ( dataFilter ) + { + dataFilter.addRules( + { + elements : + { + 'table' : function( element ) + { + var attributes = element.attributes, + cssClass = attributes[ 'class' ], + border = parseInt( attributes.border ); + + if ( !border || border <= 0 ) + attributes[ 'class' ] = ( cssClass || '' ) + ' ' + showBorderClassName; + } + } + } ); + } + + if( htmlFilter ) + { + htmlFilter.addRules( + { + elements : + { + 'table' : function( table ) + { + var attributes = table.attributes, + cssClass = attributes[ 'class' ]; + + cssClass && ( attributes[ 'class' ] = + cssClass.replace( showBorderClassName, '' ) + .replace( /\s{2}/, ' ' ) + .replace( /^\s+|\s+$/, '' ) ); + } + } + } ); + } + + // Table dialog must be aware of it. + CKEDITOR.on( 'dialogDefinition', function( ev ) + { + if( ev.editor != editor ) + return; + + var dialogName = ev.data.name; + + if ( dialogName == 'table' || dialogName == 'tableProperties' ) + { + var dialogDefinition = ev.data.definition, + infoTab = dialogDefinition.getContents( 'info' ), + borderField = infoTab.get( 'txtBorder' ), + originalCommit = borderField.commit; + + borderField.commit = CKEDITOR.tools.override( originalCommit, function( org ) + { + return function( data, selectedTable ) + { + org.apply( this, arguments ); + var value = parseInt( this.getValue() ); + selectedTable[ ( !value || value <= 0 ) ? 'addClass' : 'removeClass' ]( showBorderClassName ); + } + } ); + } + }); + } + + }); +} )(); + +/** + * Whether to automatically enable the "show borders" command when the editor loads. + * @type Boolean + * @default true + * @example + * config.startupShowBorders = false; + */ + Index: /CKEditor/trunk/_source/plugins/styles/plugin.js =================================================================== --- /CKEditor/trunk/_source/plugins/styles/plugin.js (revision 4773) +++ /CKEditor/trunk/_source/plugins/styles/plugin.js (revision 4774) @@ -199,6 +199,6 @@ continue; - var elementAttr = element.getAttribute( attName ); - if ( attribs[attName] == + var elementAttr = element.getAttribute( attName ) || ''; + if ( attribs[ attName ] == ( attName == 'style' ? normalizeCssText( elementAttr, false ) : elementAttr ) ) Index: /CKEditor/trunk/_source/plugins/stylescombo/plugin.js =================================================================== --- /CKEditor/trunk/_source/plugins/stylescombo/plugin.js (revision 4773) +++ /CKEditor/trunk/_source/plugins/stylescombo/plugin.js (revision 4774) @@ -27,5 +27,5 @@ panel : { - css : [ CKEDITOR.getUrl( editor.skinPath + 'editor.css' ) ].concat( config.contentsCss ), + css : editor.skin.editor.css.concat( config.contentsCss ), voiceLabel : lang.panelVoiceLabel }, Index: /CKEditor/trunk/_source/plugins/tabletools/plugin.js =================================================================== --- /CKEditor/trunk/_source/plugins/tabletools/plugin.js (revision 4773) +++ /CKEditor/trunk/_source/plugins/tabletools/plugin.js (revision 4774) @@ -87,156 +87,4 @@ } - function createTableMap( $refCell ) - { - var refCell = new CKEDITOR.dom.element( $refCell ); - var $table = ( refCell.getName() == 'table' ? $refCell : refCell.getAscendant( 'table' ) ).$; - var $rows = $table.rows; - - // Row and column counters. - var r = -1; - var map = []; - for ( var i = 0 ; i < $rows.length ; i++ ) - { - r++; - if ( !map[ r ] ) - map[ r ] = []; - - var c = -1; - - for ( var j = 0 ; j < $rows[ i ].cells.length ; j++ ) - { - var $cell = $rows[ i ].cells[ j ]; - - c++; - while ( map[ r ][ c ] ) - c++; - - var colSpan = isNaN( $cell.colSpan ) ? 1 : $cell.colSpan; - var rowSpan = isNaN( $cell.rowSpan ) ? 1 : $cell.rowSpan; - - for ( var rs = 0 ; rs < rowSpan ; rs++ ) - { - if ( !map[ r + rs ] ) - map[ r + rs ] = []; - - for ( var cs = 0 ; cs < colSpan ; cs++ ) - map [ r + rs ][ c + cs ] = $rows[ i ].cells[ j ]; - } - - c += colSpan - 1; - } - } - - return map; - } - - function installTableMap( tableMap, $table ) - { - /* - * IE BUG: rowSpan is always 1 in IE if the cell isn't attached to a row. So - * store is separately in another attribute. (#1917) - */ - var rowSpanAttr = CKEDITOR.env.ie ? '_cke_rowspan' : 'rowSpan'; - - /* - * Disconnect all the cells in tableMap from their parents, set all colSpan - * and rowSpan attributes to 1. - */ - for ( var i = 0 ; i < tableMap.length ; i++ ) - { - for ( var j = 0 ; j < tableMap[ i ].length ; j++ ) - { - var $cell = tableMap[ i ][ j ]; - if ( $cell.parentNode ) - $cell.parentNode.removeChild( $cell ); - $cell.colSpan = $cell[ rowSpanAttr ] = 1; - } - } - - // Scan by rows and set colSpan. - var maxCol = 0; - for ( i = 0 ; i < tableMap.length ; i++ ) - { - for ( j = 0 ; j < tableMap[ i ].length ; j++ ) - { - $cell = tableMap[ i ][ j ]; - if ( !$cell ) - continue; - if ( j > maxCol ) - maxCol = j; - if ( $cell[ '_cke_colScanned' ] ) - continue; - if ( tableMap[ i ][ j - 1 ] == $cell ) - $cell.colSpan++; - if ( tableMap[ i ][ j + 1 ] != $cell ) - $cell[ '_cke_colScanned' ] = 1; - } - } - - // Scan by columns and set rowSpan. - for ( i = 0 ; i <= maxCol ; i++ ) - { - for ( j = 0 ; j < tableMap.length ; j++ ) - { - if ( !tableMap[ j ] ) - continue; - $cell = tableMap[ j ][ i ]; - if ( !$cell || $cell[ '_cke_rowScanned' ] ) - continue; - if ( tableMap[ j - 1 ] && tableMap[ j - 1 ][ i ] == $cell ) - $cell[ rowSpanAttr ]++; - if ( !tableMap[ j + 1 ] || tableMap[ j + 1 ][ i ] != $cell ) - $cell[ '_cke_rowScanned' ] = 1; - } - } - - // Clear all temporary flags. - for ( i = 0 ; i < tableMap.length ; i++ ) - { - for ( j = 0 ; j < tableMap[ i ].length ; j++ ) - { - $cell = tableMap[ i ][ j ]; - removeRawAttribute( $cell, '_cke_colScanned' ); - removeRawAttribute( $cell, '_cke_rowScanned' ); - } - } - - // Insert physical rows and columns to table. - for ( i = 0 ; i < tableMap.length ; i++ ) - { - var $row = $table.ownerDocument.createElement( 'tr' ); - for ( j = 0 ; j < tableMap[ i ].length ; ) - { - $cell = tableMap[ i ][ j ]; - if ( tableMap[ i - 1 ] && tableMap[ i - 1 ][ j ] == $cell ) - { - j += $cell.colSpan; - continue; - } - $row.appendChild( $cell ); - if ( rowSpanAttr != 'rowSpan' ) - { - $cell.rowSpan = $cell[ rowSpanAttr ]; - $cell.removeAttribute( rowSpanAttr ); - } - j += $cell.colSpan; - if ( $cell.colSpan == 1 ) - $cell.removeAttribute( 'colSpan' ); - if ( $cell.rowSpan == 1 ) - $cell.removeAttribute( 'rowSpan' ); - } - - if ( CKEDITOR.env.ie ) - $table.rows[ i ].replaceNode( $row ); - else - { - var dest = new CKEDITOR.dom.element( $table.rows[ i ] ); - var src = new CKEDITOR.dom.element( $row ); - dest.setHtml( '' ); - src.moveChildren( dest ); - } - } - } - function clearRow( $tr ) { @@ -417,4 +265,359 @@ } + // Remove filler at end and empty spaces around the cell content. + function trimCell( cell ) + { + var bogus = cell.getBogus(); + bogus && bogus.remove(); + cell.trim(); + } + + function placeCursorInCell( cell, placeAtEnd ) + { + var range = new CKEDITOR.dom.range( cell.getDocument() ); + if ( !range[ 'moveToElementEdit' + ( placeAtEnd ? 'End' : 'Start' ) ]( cell ) ) + { + range.selectNodeContents( cell ); + range.collapse( placeAtEnd ? false : true ); + } + range.select( true ); + } + + function buildTableMap( table ) + { + + var aRows = table.$.rows ; + + // Row and Column counters. + var r = -1 ; + + var aMap = []; + + for ( var i = 0 ; i < aRows.length ; i++ ) + { + r++ ; + !aMap[r] && ( aMap[r] = [] ); + + var c = -1 ; + + for ( var j = 0 ; j < aRows[i].cells.length ; j++ ) + { + var oCell = aRows[i].cells[j] ; + + c++ ; + while ( aMap[r][c] ) + c++ ; + + var iColSpan = isNaN( oCell.colSpan ) ? 1 : oCell.colSpan ; + var iRowSpan = isNaN( oCell.rowSpan ) ? 1 : oCell.rowSpan ; + + for ( var rs = 0 ; rs < iRowSpan ; rs++ ) + { + if ( !aMap[r + rs] ) + aMap[r + rs] = new Array() ; + + for ( var cs = 0 ; cs < iColSpan ; cs++ ) + { + aMap[r + rs][c + cs] = aRows[i].cells[j] ; + } + } + + c += iColSpan - 1 ; + } + } + return aMap ; + } + + function cellInRow( tableMap, rowIndex, cell ) + { + var oRow = tableMap[ rowIndex ]; + if( typeof cell == 'undefined' ) + return oRow; + + for ( var c = 0 ; oRow && c < oRow.length ; c++ ) + { + if ( cell.is && oRow[c] == cell.$ ) + return c; + else if( c == cell ) + return new CKEDITOR.dom.element( oRow[ c ] ); + } + return cell.is ? -1 : null; + } + + function cellInCol( tableMap, colIndex, cell ) + { + var oCol = []; + for ( var r = 0; r < tableMap.length; r++ ) + { + var row = tableMap[ r ]; + if( typeof cell == 'undefined' ) + oCol.push( row[ colIndex ] ); + else if( cell.is && row[ colIndex ] == cell.$ ) + return r; + else if( r == cell ) + return new CKEDITOR.dom.element( row[ colIndex ] ); + } + + return ( typeof cell == 'undefined' )? oCol : cell.is ? -1 : null; + } + + function mergeCells( selection, mergeDirection, isDetect ) + { + var cells = getSelectedCells( selection ); + + // Invalid merge request if: + // 1. In batch mode despite that less than two selected. + // 2. In solo mode while not exactly only one selected. + // 3. Cells distributed in different table groups (e.g. from both thead and tbody). + if( ( mergeDirection ? cells.length != 1 : cells.length < 2 ) + || selection.getCommonAncestor().is( 'table' ) ) + return false; + + var cell, + firstCell = cells[ 0 ], + table = firstCell.getAscendant( 'table' ), + map = buildTableMap( table ), + mapHeight = map.length, + mapWidth = map[ 0 ].length, + startRow = firstCell.getParent().$.rowIndex, + startColumn = cellInRow( map, startRow, firstCell ); + + if( mergeDirection ) + { + var targetCell; + try + { + targetCell = + map[ mergeDirection == 'up' ? + ( startRow - 1 ): + mergeDirection == 'down' ? ( startRow + 1 ) : startRow ] [ + mergeDirection == 'left' ? + ( startColumn - 1 ): + mergeDirection == 'right' ? ( startColumn + 1 ) : startColumn ]; + + } + catch( er ) + { + return false; + } + + // 1. No cell could be merged. + // 2. Same cell actually. + if( !targetCell || firstCell.$ == targetCell ) + return false; + + // Sort in map order regardless of the DOM sequence. + cells[ ( mergeDirection == 'up' || mergeDirection == 'left' ) ? + 'unshift' : 'push' ]( new CKEDITOR.dom.element( targetCell ) ); + } + + // Start from here are merging way ignorance (merge up/right, batch merge). + var doc = firstCell.getDocument(), + lastRowIndex = startRow, + totalRowSpan = 0, + totalColSpan = 0, + // Use a documentFragment as buffer when appending cell contents. + frag = !isDetect && new CKEDITOR.dom.documentFragment( doc ), + dimension = 0; + + for ( var i = 0; i < cells.length; i++ ) + { + cell = cells[ i ]; + + var tr = cell.getParent(), + cellFirstChild = cell.getFirst(), + colSpan = cell.$.colSpan, + rowSpan = cell.$.rowSpan, + rowIndex = tr.$.rowIndex, + colIndex = cellInRow( map, rowIndex, cell ); + + // Accumulated the actual places taken by all selected cells. + dimension += colSpan * rowSpan; + // Accumulated the maximum virtual spans from column and row. + totalColSpan = Math.max( totalColSpan, colIndex - startColumn + colSpan ) ; + totalRowSpan = Math.max( totalRowSpan, rowIndex - startRow + rowSpan ); + + if ( !isDetect ) + { + // Trim all cell fillers and check to remove empty cells. + if( trimCell( cell ), cell.getChildren().count() ) + { + // Merge vertically cells as two separated paragraphs. + if( rowIndex != lastRowIndex + && cellFirstChild + && !( cellFirstChild.isBlockBoundary + && cellFirstChild.isBlockBoundary( { br : 1 } ) ) ) + { + var last = frag.getLast( CKEDITOR.dom.walker.whitespaces( true ) ); + if( last && !( last.is && last.is( 'br' ) ) ) + frag.append( new CKEDITOR.dom.element( 'br' ) ); + } + + cell.moveChildren( frag ); + } + i ? cell.remove() : cell.setHtml( '' ); + } + lastRowIndex = rowIndex; + } + + if ( !isDetect ) + { + frag.moveChildren( firstCell ); + + if( !CKEDITOR.env.ie ) + firstCell.appendBogus(); + + if( totalColSpan >= mapWidth ) + firstCell.removeAttribute( 'rowSpan' ); + else + firstCell.$.rowSpan = totalRowSpan; + + if( totalRowSpan >= mapHeight ) + firstCell.removeAttribute( 'colSpan' ); + else + firstCell.$.colSpan = totalColSpan; + + // Swip emptyleft at the end of table due to the merging. + var trs = new CKEDITOR.dom.nodeList( table.$.rows ), + count = trs.count(); + + for ( var i = count - 1; i >= 0; i-- ) + { + var tailTr = trs.getItem( i ); + if( !tailTr.$.cells.length ) + { + tailTr.remove(); + count++; + continue; + } + } + + return firstCell; + } + // Be able to merge cells only if actual dimension of selected + // cells equals to the caculated rectangle. + else + return ( totalRowSpan * totalColSpan ) == dimension; + } + + function verticalSplitCell ( selection, isDetect ) + { + var cells = getSelectedCells( selection ); + if( cells.length > 1 ) + return false; + else if( isDetect ) + return true; + + var cell = cells[ 0 ], + tr = cell.getParent(), + table = tr.getAscendant( 'table' ), + map = buildTableMap( table ), + rowIndex = tr.$.rowIndex, + colIndex = cellInRow( map, rowIndex, cell ), + rowSpan = cell.$.rowSpan, + newCell, + newRowSpan, + newCellRowSpan, + newRowIndex; + + if( rowSpan > 1 ) + { + newRowSpan = Math.ceil( rowSpan / 2 ); + newCellRowSpan = Math.floor( rowSpan / 2 ); + newRowIndex = rowIndex + newRowSpan; + var newCellTr = new CKEDITOR.dom.element( table.$.rows[ newRowIndex ] ), + newCellRow = cellInRow( map, newRowIndex ), + candidateCell; + + newCell = cell.clone(); + + // Figure out where to insert the new cell by checking the vitual row. + for ( var c = 0; c < newCellRow.length; c++ ) + { + candidateCell = newCellRow[ c ]; + // Catch first cell actually following the column. + if( candidateCell.parentNode == newCellTr.$ + && c > colIndex ) + { + newCell.insertBefore( new CKEDITOR.dom.element( candidateCell ) ); + break; + } + else + candidateCell = null; + } + + // The destination row is empty, append at will. + if( !candidateCell ) + newCellTr.append( newCell, true ); + } + else + { + newCellRowSpan = newRowSpan = 1; + var newCellTr = tr.clone(); + newCellTr.insertAfter( tr ); + newCellTr.append( newCell = cell.clone() ); + var cellsInSameRow = cellInRow( map, rowIndex ); + for ( var i = 0; i < cellsInSameRow.length; i++ ) + cellsInSameRow[ i ].rowSpan++; + } + + if( !CKEDITOR.env.ie ) + newCell.appendBogus(); + + cell.$.rowSpan = newRowSpan; + newCell.$.rowSpan = newCellRowSpan; + if( newRowSpan == 1 ) + cell.removeAttribute( 'rowSpan' ); + if( newCellRowSpan == 1 ) + newCell.removeAttribute( 'rowSpan' ); + + return newCell; + } + + function horizontalSplitCell( selection, isDetect ) + { + var cells = getSelectedCells( selection ); + if( cells.length > 1 ) + return false; + else if( isDetect ) + return true; + + var cell = cells[ 0 ], + tr = cell.getParent(), + table = tr.getAscendant( 'table' ), + map = buildTableMap( table ), + rowIndex = tr.$.rowIndex, + colIndex = cellInRow( map, rowIndex, cell ), + colSpan = cell.$.colSpan, + newCell, + newColSpan, + newCellColSpan; + + if( colSpan > 1 ) + { + newColSpan = Math.ceil( colSpan / 2 ); + newCellColSpan = Math.floor( colSpan / 2 ); + } + else + { + newCellColSpan = newColSpan = 1; + var cellsInSameCol = cellInCol( map, colIndex ); + for ( var i = 0; i < cellsInSameCol.length; i++ ) + cellsInSameCol[ i ].colSpan++; + } + newCell = cell.clone(); + newCell.insertAfter( cell ); + if( !CKEDITOR.env.ie ) + newCell.appendBogus(); + + cell.$.colSpan = newColSpan; + newCell.$.colSpan = newCellColSpan; + if( newColSpan == 1 ) + cell.removeAttribute( 'colSpan' ); + if( newCellColSpan == 1 ) + newCell.removeAttribute( 'colSpan' ); + + return newCell; + } // Context menu on table caption incorrect (#3834) var contextMenuTags = { thead : 1, tbody : 1, tfoot : 1, td : 1, tr : 1, th : 1 }; @@ -517,4 +720,44 @@ } ); + editor.addCommand( 'cellMerge', + { + exec : function( editor ) + { + placeCursorInCell( mergeCells( editor.getSelection() ), true ); + } + } ); + + editor.addCommand( 'cellMergeRight', + { + exec : function( editor ) + { + placeCursorInCell( mergeCells( editor.getSelection(), 'right' ), true ); + } + } ); + + editor.addCommand( 'cellMergeDown', + { + exec : function( editor ) + { + placeCursorInCell( mergeCells( editor.getSelection(), 'down' ), true ); + } + } ); + + editor.addCommand( 'cellVerticalSplit', + { + exec : function( editor ) + { + placeCursorInCell( verticalSplitCell( editor.getSelection() ) ); + } + } ); + + editor.addCommand( 'cellHorizontalSplit', + { + exec : function( editor ) + { + placeCursorInCell( horizontalSplitCell( editor.getSelection() ) ); + } + } ); + editor.addCommand( 'cellInsertBefore', { @@ -547,9 +790,15 @@ getItems : function() { - var cells = getSelectedCells( editor.getSelection() ); + var selection = editor.getSelection(), + cells = getSelectedCells( selection ); return { tablecell_insertBefore : CKEDITOR.TRISTATE_OFF, tablecell_insertAfter : CKEDITOR.TRISTATE_OFF, tablecell_delete : CKEDITOR.TRISTATE_OFF, + tablecell_merge : mergeCells( selection, null, true ) ? CKEDITOR.TRISTATE_OFF : CKEDITOR.TRISTATE_DISABLED, + tablecell_merge_right : mergeCells( selection, 'right', true ) ? CKEDITOR.TRISTATE_OFF : CKEDITOR.TRISTATE_DISABLED, + tablecell_merge_down : mergeCells( selection, 'down', true ) ? CKEDITOR.TRISTATE_OFF : CKEDITOR.TRISTATE_DISABLED, + tablecell_split_vertical : verticalSplitCell( selection, true ) ? CKEDITOR.TRISTATE_OFF : CKEDITOR.TRISTATE_DISABLED, + tablecell_split_horizontal : horizontalSplitCell( selection, true ) ? CKEDITOR.TRISTATE_OFF : CKEDITOR.TRISTATE_DISABLED, tablecell_properties : cells.length > 0 ? CKEDITOR.TRISTATE_OFF : CKEDITOR.TRISTATE_DISABLED }; @@ -581,4 +830,44 @@ }, + tablecell_merge : + { + label : lang.cell.merge, + group : 'tablecell', + command : 'cellMerge', + order : 16 + }, + + tablecell_merge_right : + { + label : lang.cell.mergeRight, + group : 'tablecell', + command : 'cellMergeRight', + order : 17 + }, + + tablecell_merge_down : + { + label : lang.cell.mergeDown, + group : 'tablecell', + command : 'cellMergeDown', + order : 18 + }, + + tablecell_split_horizontal : + { + label : lang.cell.splitHorizontal, + group : 'tablecell', + command : 'cellHorizontalSplit', + order : 19 + }, + + tablecell_split_vertical : + { + label : lang.cell.splitVertical, + group : 'tablecell', + command : 'cellVerticalSplit', + order : 20 + }, + tablecell_properties : { @@ -586,5 +875,5 @@ group : 'tablecellproperties', command : 'cellProperties', - order : 20 + order : 21 }, Index: /CKEditor/trunk/_source/plugins/toolbar/plugin.js =================================================================== --- /CKEditor/trunk/_source/plugins/toolbar/plugin.js (revision 4773) +++ /CKEditor/trunk/_source/plugins/toolbar/plugin.js (revision 4774) @@ -368,5 +368,5 @@ '/', ['Bold','Italic','Underline','Strike','-','Subscript','Superscript'], - ['NumberedList','BulletedList','-','Outdent','Indent','Blockquote'], + ['NumberedList','BulletedList','-','Outdent','Indent','Blockquote','CreateDiv'], ['JustifyLeft','JustifyCenter','JustifyRight','JustifyBlock'], ['Link','Unlink','Anchor'], Index: /CKEditor/trunk/_source/plugins/wysiwygarea/plugin.js =================================================================== --- /CKEditor/trunk/_source/plugins/wysiwygarea/plugin.js (revision 4773) +++ /CKEditor/trunk/_source/plugins/wysiwygarea/plugin.js (revision 4774) @@ -11,10 +11,9 @@ (function() { - /** - * List of elements in which has no way to move editing focus outside. - */ + // 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*(?: ' : ''; + + if ( fullPage ) + { + // Search and sweep out the doctype declaration. + data = data.replace( /]*>/i, function( match ) + { + editor.docType = docType = match; + return ''; + }); + } + // Get the HTML version of the data. if ( editor.dataProcessor ) - { data = editor.dataProcessor.toHtml( data, fixForBody ); - } - - data = - editor.config.docType + - '' + - '' + - '' + - ''+ - '' + - '' + - data + - '' + - '' + - activationScript; - - window[ '_cke_htmlToLoad_' + editor.name ] = data; + + if ( fullPage ) + { + // Check if the tag is available. + if ( !(/ ' ) ; + + // The base must be the first tag in the HEAD, e.g. to get relative + // links on styles. + baseTag && ( data = data.replace( //, '$&' + baseTag ) ); + + // Inject the extra stuff into . + // Attention: do not change it before testing it well. (V2) + // This is tricky... if the head ends with , + // Firefox will break. But, it works if we place our extra stuff as + // the last elements in the HEAD. + data = data.replace( /<\/head\s*>/, headExtra + '$&' ); + + // Add the DOCTYPE back to it. + data = docType + data; + } + else + { + data = + config.docType + + '' + + '' + + baseTag + + headExtra + + '' + + ' ' + + ''; + + var mainContainer = element.append( CKEDITOR.dom.element.createFromHtml( html, element.getDocument() ) ); + + // Only the first container starts visible. Others get hidden. + if ( element.getCustomData( 'cke_hasshared' ) ) + mainContainer.hide(); + else + element.setCustomData( 'cke_hasshared', 1 ); + + // Get the deeper inner. + container = mainContainer.getChild( [0,0,0,0] ); + + // When the editor gets focus, we show the space container, hiding others. + editor.on( 'focus', function() + { + for ( var i = 0, sibling, children = element.getChildren() ; ( sibling = children.getItem( i ) ) ; i++ ) + { + if ( sibling.type == CKEDITOR.NODE_ELEMENT + && !sibling.equals( mainContainer ) + && sibling.hasClass( 'cke_shared' ) ) + { + sibling.hide(); + } + } + + mainContainer.show(); + }); + + editor.on( 'destroy', function() + { + mainContainer.remove(); + }); + } + + return container; + } + return { build : function( editor, themePath ) @@ -45,9 +105,15 @@ } + var sharedTop = topHtml && checkSharedSpace( editor, 'top' ), + sharedBottoms = checkSharedSpace( editor, 'bottom' ); + + sharedTop && ( sharedTop.setHtml( topHtml ) , topHtml = '' ); + sharedBottoms && ( sharedBottoms.setHtml( bottomHtml ), bottomHtml = '' ); + var container = CKEDITOR.dom.element.createFromHtml( [ 'Initial value.
"); + * ?> + * @endcode + */ + +if ( !function_exists('version_compare') || version_compare( phpversion(), '5', '<' ) ) + include_once( 'ckeditor_php4.php' ) ; +else + include_once( 'ckeditor_php5.php' ) ; Index: /CKEditor/trunk/ckeditor_php4.php =================================================================== --- /CKEditor/trunk/ckeditor_php4.php (revision 4774) +++ /CKEditor/trunk/ckeditor_php4.php (revision 4774) @@ -0,0 +1,598 @@ +editor("editor1", "Initial value.
"); + * @endcode + */ +class CKEditor +{ + /** + * The version of %CKEditor. + * \private + */ + var $version = '%VERSION%'; + /** + * A constant string unique for each release of %CKEditor. + * \private + */ + var $_timestamp = '%TIMESTAMP%'; + + /** + * URL to the %CKEditor installation directory (absolute or relative to document root). + * If not set, CKEditor will try to guess it's path. + * + * Example usage: + * @code + * $CKEditor->basePath = '/ckeditor/'; + * @endcode + */ + var $basePath; + /** + * An array that holds the global %CKEditor configuration. + * For the list of available options, see http://docs.cksource.com/ckeditor_api/symbols/CKEDITOR.config.html + * + * Example usage: + * @code + * $CKEditor->config['height'] = 400; + * // Use @@ at the beggining of a string to ouput it without surrounding quotes. + * $CKEditor->config['width'] = '@@screen.width * 0.8'; + * @endcode + */ + var $config = array(); + /** + * A boolean variable indicating whether CKEditor has been initialized. + * Set it to true only if you have already included + * <script> tag loading ckeditor.js in your website. + */ + var $initialized = false; + /** + * Boolean variable indicating whether created code should be printed out or returned by a function. + * + * Example 1: get the code creating %CKEditor instance and print it on a page with the "echo" function. + * @code + * $CKEditor = new CKEditor(); + * $CKEditor->returnOutput = true; + * $code = $CKEditor->editor("editor1", "Initial value.
"); + * echo "Editor 1:
"; + * echo $code; + * @endcode + */ + var $returnOutput = false; + /** + * An array with textarea attributes. + * + * When %CKEditor is created with the editor() method, a HTML <textarea> element is created, + * it will be displayed to anyone with JavaScript disabled or with incompatible browser. + */ + var $textareaAttributes = array( "rows" => 8, "cols" => 60 ); + /** + * A string indicating the creation date of %CKEditor. + * Do not change it unless you want to force browsers to not use previously cached version of %CKEditor. + */ + var $timestamp = "%TIMESTAMP%"; + /** + * An array that holds event listeners. + * \private + */ + var $_events = array(); + /** + * An array that holds global event listeners. + * \private + */ + var $_globalEvents = array(); + + /** + * Main Constructor. + * + * @param $basePath (string) URL to the %CKEditor installation directory (optional). + */ + function CKEditor($basePath = null) { + if (!empty($basePath)) { + $this->basePath = $basePath; + } + } + + /** + * Creates a %CKEditor instance. + * In incompatible browsers %CKEditor will downgrade to plain HTML <textarea> element. + * + * @param $name (string) Name of the %CKEditor instance (this will be also the "name" attribute of textarea element). + * @param $value (string) Initial value (optional). + * @param $config (array) The specific configurations to apply to this editor instance (optional). + * @param $events (array) Event listeners for this editor instance (optional). + * + * Example usage: + * @code + * $CKEditor = new CKEditor(); + * $CKEditor->editor("field1", "Initial value.
"); + * @endcode + * + * Advanced example: + * @code + * $CKEditor = new CKEditor(); + * $config = array(); + * $config['toolbar'] = array( + * array( 'Source', '-', 'Bold', 'Italic', 'Underline', 'Strike' ), + * array( 'Image', 'Link', 'Unlink', 'Anchor' ) + * ); + * $events['instanceReady'] = 'function (ev) { + * alert("Loaded: " + ev.editor.name); + * }'; + * $CKEditor->editor("field1", "Initial value.
", $config, $events); + * @endcode + */ + function editor($name, $value = "", $config = array(), $events = array()) + { + $attr = ""; + foreach ($this->textareaAttributes as $key => $val) { + $attr.= " " . $key . '="' . str_replace('"', '"', $val) . '"'; + } + $out = "\n"; + if (!$this->initialized) { + $out .= $this->init(); + } + + $_config = $this->configSettings($config, $events); + + $js = $this->returnGlobalEvents(); + if (!empty($_config)) + $js .= "CKEDITOR.replace('".$name."', ".$this->jsEncode($_config).");"; + else + $js .= "CKEDITOR.replace('".$name."');"; + + $out .= $this->script($js); + + if (!$this->returnOutput) { + print $out; + $out = ""; + } + + return $out; + } + + /** + * Replaces a <textarea> with a %CKEditor instance. + * + * @param $id (string) The id or name of textarea element. + * @param $config (array) The specific configurations to apply to this editor instance (optional). + * @param $events (array) Event listeners for this editor instance (optional). + * + * Example 1: adding %CKEditor to <textarea name="article"></textarea> element: + * @code + * $CKEditor = new CKEditor(); + * $CKEditor->replace("article"); + * @endcode + */ + function replace($id, $config = array(), $events = array()) + { + $out = ""; + if (!$this->initialized) { + $out .= $this->init(); + } + + $_config = $this->configSettings($config, $events); + + $js = $this->returnGlobalEvents(); + if (!empty($_config)) { + $js .= "CKEDITOR.replace('".$id."', ".$this->jsEncode($_config).");"; + } + else { + $js .= "CKEDITOR.replace('".$id."');"; + } + $out .= $this->script($js); + + if (!$this->returnOutput) { + print $out; + $out = ""; + } + + return $out; + } + + /** + * Replace all <textarea> elements available in the document with editor instances. + * + * @param $className (string) If set, replace all textareas with class className in the page. + * + * Example 1: replace all <textarea> elements in the page. + * @code + * $CKEditor = new CKEditor(); + * $CKEditor->replaceAll(); + * @endcode + * + * Example 2: replace all <textarea class="myClassName"> elements in the page. + * @code + * $CKEditor = new CKEditor(); + * $CKEditor->replaceAll( 'myClassName' ); + * @endcode + */ + function replaceAll($className = null) + { + $out = ""; + if (!$this->initialized) { + $out .= $this->init(); + } + + $_config = $this->configSettings(); + + $js = $this->returnGlobalEvents(); + if (empty($_config)) { + if (empty($className)) { + $js .= "CKEDITOR.replaceAll();"; + } + else { + $js .= "CKEDITOR.replaceAll('".$className."');"; + } + } + else { + $classDetection = ""; + $js .= "CKEDITOR.replaceAll( function(textarea, config) {\n"; + if (!empty($className)) { + $js .= " var classRegex = new RegExp('(?:^| )' + '". $className ."' + '(?:$| )');\n"; + $js .= " if (!classRegex.test(textarea.className))\n"; + $js .= " return false;\n"; + } + $js .= " CKEDITOR.tools.extend(config, ". $this->jsEncode($_config) .", true);"; + $js .= "} );"; + + } + + $out .= $this->script($js); + + if (!$this->returnOutput) { + print $out; + $out = ""; + } + + return $out; + } + + /** + * Adds event listener. + * Events are fired by %CKEditor in various situations. + * + * @param $event (string) Event name. + * @param $javascriptCode (string) Javascript anonymous function or function name. + * + * Example usage: + * @code + * $CKEditor->addEventHandler('instanceReady', 'function (ev) { + * alert("Loaded: " + ev.editor.name); + * }'); + * @endcode + */ + function addEventHandler($event, $javascriptCode) + { + if (!isset($this->_events[$event])) { + $this->_events[$event] = array(); + } + // Avoid duplicates. + if (!in_array($javascriptCode, $this->_events[$event])) { + $this->_events[$event][] = $javascriptCode; + } + } + + /** + * Clear registered event handlers. + * Note: this function will have no effect on already created editor instances. + * + * @param $event (string) Event name, if not set all event handlers will be removed (optional). + */ + function clearEventHandlers($event = null) + { + if (!empty($event)) { + $this->_events[$event] = array(); + } + else { + $this->_events = array(); + } + } + + /** + * Adds global event listener. + * + * @param $event (string) Event name. + * @param $javascriptCode (string) Javascript anonymous function or function name. + * + * Example usage: + * @code + * $CKEditor->addGlobalEventHandler('dialogDefinition', 'function (ev) { + * alert("Loading dialog: " + ev.data.name); + * }'); + * @endcode + */ + function addGlobalEventHandler($event, $javascriptCode) + { + if (!isset($this->_globalEvents[$event])) { + $this->_globalEvents[$event] = array(); + } + // Avoid duplicates. + if (!in_array($javascriptCode, $this->_globalEvents[$event])) { + $this->_globalEvents[$event][] = $javascriptCode; + } + } + + /** + * Clear registered global event handlers. + * Note: this function will have no effect if the event handler has been already printed/returned. + * + * @param $event (string) Event name, if not set all event handlers will be removed (optional). + */ + function clearGlobalEventHandlers($event = null) + { + if (!empty($event)) { + $this->_globalEvents[$event] = array(); + } + else { + $this->_globalEvents = array(); + } + } + + /** + * Prints javascript code. + * \private + * + * @param string $js + */ + function script($js) + { + $out = "\n"; + + return $out; + } + + /** + * Returns the configuration array (global and instance specific settings are merged into one array). + * \private + * + * @param $config (array) The specific configurations to apply to editor instance. + * @param $events (array) Event listeners for editor instance. + */ + function configSettings($config = array(), $events = array()) + { + $_config = $this->config; + $_events = $this->_events; + + if (is_array($config) && !empty($config)) { + $_config = array_merge($_config, $config); + } + + if (is_array($events) && !empty($events)) { + foreach ($events as $eventName => $code) { + if (!isset($_events[$eventName])) { + $_events[$eventName] = array(); + } + if (!in_array($code, $_events[$eventName])) { + $_events[$eventName][] = $code; + } + } + } + + if (!empty($_events)) { + foreach($_events as $eventName => $handlers) { + if (empty($handlers)) { + continue; + } + else if (count($handlers) == 1) { + $_config['on'][$eventName] = '@@'.$handlers[0]; + } + else { + $_config['on'][$eventName] = '@@function (ev){'; + foreach ($handlers as $handler => $code) { + $_config['on'][$eventName] .= '('.$code.')(ev);'; + } + $_config['on'][$eventName] .= '}'; + } + } + } + + return $_config; + } + + /** + * Return global event handlers. + * \private + */ + function returnGlobalEvents() + { + static $returnedEvents; + $out = ""; + + if (!isset($returnedEvents)) { + $returnedEvents = array(); + } + + if (!empty($this->_globalEvents)) { + foreach ($this->_globalEvents as $eventName => $handlers) { + foreach ($handlers as $handler => $code) { + if (!isset($returnedEvents[$eventName])) { + $returnedEvents[$eventName] = array(); + } + // Return only new events + if (!in_array($code, $returnedEvents[$eventName])) { + $out .= ($code ? "\n" : "") . "CKEDITOR.on('". $eventName ."', $code);"; + $returnedEvents[$eventName][] = $code; + } + } + } + } + + return $out; + } + + /** + * Initializes CKEditor (executed only once). + * \private + */ + function init() + { + static $initComplete; + $out = ""; + + if (!empty($initComplete)) { + return ""; + } + + if ($this->initialized) { + $initComplete = true; + return ""; + } + + $args = ""; + $ckeditorPath = $this->ckeditorPath(); + + if (!empty($this->timestamp) && $this->timestamp != "%TIMESTAMP%") { + $args = '?t=' . $this->timestamp; + } + + // Skip relative paths... + if (strpos($ckeditorPath, '..') !== 0) { + $out .= $this->script("window.CKEDITOR_BASEPATH='". $ckeditorPath ."';"); + } + + $out .= "\n"; + + $extraCode = ""; + // CKReleaser %REMOVE_START% + if ($this->version == '%VERSION%') { + $extraCode .= ($extraCode ? "\n" : "") . "if (typeof(CKEDITOR) == 'undefined') { alert('The CKEDITOR object was not found. Please make sure that the ckeditor.js file is available in your installation.'); }"; + } + // %REMOVE_END% + if (!empty($this->timestamp) && $this->timestamp != $this->_timestamp) { + $extraCode .= ($extraCode ? "\n" : "") . "CKEDITOR.timestamp = '". $this->timestamp ."';"; + } + if ($extraCode) { + $out .= $this->script($extraCode); + } + + $initComplete = $this->initialized = true; + + return $out; + } + + /** + * Return path to ckeditor.js. + * \private + */ + function ckeditorPath() + { + if (!empty($this->basePath)) { + return $this->basePath; + } + + /** + * The absolute pathname of the currently executing script. + * Note: If a script is executed with the CLI, as a relative path, such as file.php or ../file.php, + * $_SERVER['SCRIPT_FILENAME'] will contain the relative path specified by the user. + */ + if (isset($_SERVER['SCRIPT_FILENAME'])) { + $realPath = dirname($_SERVER['SCRIPT_FILENAME']); + } + else { + /** + * realpath — Returns canonicalized absolute pathname + */ + $realPath = realpath( './' ) ; + } + + /** + * The filename of the currently executing script, relative to the document root. + * For instance, $_SERVER['PHP_SELF'] in a script at the address http://example.com/test.php/foo.bar + * would be /test.php/foo.bar. + */ + $selfPath = dirname($_SERVER['PHP_SELF']); + $file = str_replace("\\", "/", __FILE__); + + if (!$selfPath || !$realPath || !$file) { + return "/ckeditor/"; + } + + $documentRoot = substr($realPath, 0, strlen($realPath) - strlen($selfPath)); + $fileUrl = substr($file, strlen($documentRoot)); + $ckeditorUrl = str_replace("ckeditor_php5.php", "", $fileUrl); + + return $ckeditorUrl; + } + + /** + * This little function provides a basic JSON support. + * http://php.net/manual/en/function.json-encode.php + * \private + * + * @param mixed $val + * @return string + */ + function jsEncode($val) + { + if (is_null($val)) { + return 'null'; + } + if ($val === false) { + return 'false'; + } + if ($val === true) { + return 'true'; + } + if (is_scalar($val)) + { + if (is_float($val)) + { + // Always use "." for floats. + $val = str_replace(",", ".", strval($val)); + } + + // Use @@ to not use quotes when outputting string value + if (strpos($val, '@@') === 0) { + return substr($val, 2); + } + else { + // All scalars are converted to strings to avoid indeterminism. + // PHP's "1" and 1 are equal for all PHP operators, but + // JS's "1" and 1 are not. So if we pass "1" or 1 from the PHP backend, + // we should get the same result in the JS frontend (string). + // Character replacements for JSON. + static $jsonReplaces = array(array("\\", "/", "\n", "\t", "\r", "\b", "\f", '"'), + array('\\\\', '\\/', '\\n', '\\t', '\\r', '\\b', '\\f', '\"')); + + $val = str_replace($jsonReplaces[0], $jsonReplaces[1], $val); + + return '"' . $val . '"'; + } + } + $isList = true; + for ($i = 0, reset($val); $i < count($val); $i++, next($val)) + { + if (key($val) !== $i) + { + $isList = false; + break; + } + } + $result = array(); + if ($isList) + { + foreach ($val as $v) $result[] = $this->jsEncode($v); + return '[ ' . join(', ', $result) . ' ]'; + } + else + { + foreach ($val as $k => $v) $result[] = $this->jsEncode($k).': '.$this->jsEncode($v); + return '{ ' . join(', ', $result) . ' }'; + } + } +} Index: /CKEditor/trunk/ckeditor_php5.php =================================================================== --- /CKEditor/trunk/ckeditor_php5.php (revision 4774) +++ /CKEditor/trunk/ckeditor_php5.php (revision 4774) @@ -0,0 +1,588 @@ +editor("editor1", "Initial value.
"); + * @endcode + */ +class CKEditor +{ + /** + * The version of %CKEditor. + */ + const version = '%VERSION%'; + /** + * A constant string unique for each release of %CKEditor. + */ + const timestamp = '%TIMESTAMP%'; + + /** + * URL to the %CKEditor installation directory (absolute or relative to document root). + * If not set, CKEditor will try to guess it's path. + * + * Example usage: + * @code + * $CKEditor->basePath = '/ckeditor/'; + * @endcode + */ + public $basePath; + /** + * An array that holds the global %CKEditor configuration. + * For the list of available options, see http://docs.cksource.com/ckeditor_api/symbols/CKEDITOR.config.html + * + * Example usage: + * @code + * $CKEditor->config['height'] = 400; + * // Use @@ at the beggining of a string to ouput it without surrounding quotes. + * $CKEditor->config['width'] = '@@screen.width * 0.8'; + * @endcode + */ + public $config = array(); + /** + * A boolean variable indicating whether CKEditor has been initialized. + * Set it to true only if you have already included + * <script> tag loading ckeditor.js in your website. + */ + public $initialized = false; + /** + * Boolean variable indicating whether created code should be printed out or returned by a function. + * + * Example 1: get the code creating %CKEditor instance and print it on a page with the "echo" function. + * @code + * $CKEditor = new CKEditor(); + * $CKEditor->returnOutput = true; + * $code = $CKEditor->editor("editor1", "Initial value.
"); + * echo "Editor 1:
"; + * echo $code; + * @endcode + */ + public $returnOutput = false; + /** + * An array with textarea attributes. + * + * When %CKEditor is created with the editor() method, a HTML <textarea> element is created, + * it will be displayed to anyone with JavaScript disabled or with incompatible browser. + */ + public $textareaAttributes = array( "rows" => 8, "cols" => 60 ); + /** + * A string indicating the creation date of %CKEditor. + * Do not change it unless you want to force browsers to not use previously cached version of %CKEditor. + */ + public $timestamp = "%TIMESTAMP%"; + /** + * An array that holds event listeners. + */ + private $events = array(); + /** + * An array that holds global event listeners. + */ + private $globalEvents = array(); + + /** + * Main Constructor. + * + * @param $basePath (string) URL to the %CKEditor installation directory (optional). + */ + function __construct($basePath = null) { + if (!empty($basePath)) { + $this->basePath = $basePath; + } + } + + /** + * Creates a %CKEditor instance. + * In incompatible browsers %CKEditor will downgrade to plain HTML <textarea> element. + * + * @param $name (string) Name of the %CKEditor instance (this will be also the "name" attribute of textarea element). + * @param $value (string) Initial value (optional). + * @param $config (array) The specific configurations to apply to this editor instance (optional). + * @param $events (array) Event listeners for this editor instance (optional). + * + * Example usage: + * @code + * $CKEditor = new CKEditor(); + * $CKEditor->editor("field1", "Initial value.
"); + * @endcode + * + * Advanced example: + * @code + * $CKEditor = new CKEditor(); + * $config = array(); + * $config['toolbar'] = array( + * array( 'Source', '-', 'Bold', 'Italic', 'Underline', 'Strike' ), + * array( 'Image', 'Link', 'Unlink', 'Anchor' ) + * ); + * $events['instanceReady'] = 'function (ev) { + * alert("Loaded: " + ev.editor.name); + * }'; + * $CKEditor->editor("field1", "Initial value.
", $config, $events); + * @endcode + */ + public function editor($name, $value = "", $config = array(), $events = array()) + { + $attr = ""; + foreach ($this->textareaAttributes as $key => $val) { + $attr.= " " . $key . '="' . str_replace('"', '"', $val) . '"'; + } + $out = "\n"; + if (!$this->initialized) { + $out .= $this->init(); + } + + $_config = $this->configSettings($config, $events); + + $js = $this->returnGlobalEvents(); + if (!empty($_config)) + $js .= "CKEDITOR.replace('".$name."', ".$this->jsEncode($_config).");"; + else + $js .= "CKEDITOR.replace('".$name."');"; + + $out .= $this->script($js); + + if (!$this->returnOutput) { + print $out; + $out = ""; + } + + return $out; + } + + /** + * Replaces a <textarea> with a %CKEditor instance. + * + * @param $id (string) The id or name of textarea element. + * @param $config (array) The specific configurations to apply to this editor instance (optional). + * @param $events (array) Event listeners for this editor instance (optional). + * + * Example 1: adding %CKEditor to <textarea name="article"></textarea> element: + * @code + * $CKEditor = new CKEditor(); + * $CKEditor->replace("article"); + * @endcode + */ + public function replace($id, $config = array(), $events = array()) + { + $out = ""; + if (!$this->initialized) { + $out .= $this->init(); + } + + $_config = $this->configSettings($config, $events); + + $js = $this->returnGlobalEvents(); + if (!empty($_config)) { + $js .= "CKEDITOR.replace('".$id."', ".$this->jsEncode($_config).");"; + } + else { + $js .= "CKEDITOR.replace('".$id."');"; + } + $out .= $this->script($js); + + if (!$this->returnOutput) { + print $out; + $out = ""; + } + + return $out; + } + + /** + * Replace all <textarea> elements available in the document with editor instances. + * + * @param $className (string) If set, replace all textareas with class className in the page. + * + * Example 1: replace all <textarea> elements in the page. + * @code + * $CKEditor = new CKEditor(); + * $CKEditor->replaceAll(); + * @endcode + * + * Example 2: replace all <textarea class="myClassName"> elements in the page. + * @code + * $CKEditor = new CKEditor(); + * $CKEditor->replaceAll( 'myClassName' ); + * @endcode + */ + public function replaceAll($className = null) + { + $out = ""; + if (!$this->initialized) { + $out .= $this->init(); + } + + $_config = $this->configSettings(); + + $js = $this->returnGlobalEvents(); + if (empty($_config)) { + if (empty($className)) { + $js .= "CKEDITOR.replaceAll();"; + } + else { + $js .= "CKEDITOR.replaceAll('".$className."');"; + } + } + else { + $classDetection = ""; + $js .= "CKEDITOR.replaceAll( function(textarea, config) {\n"; + if (!empty($className)) { + $js .= " var classRegex = new RegExp('(?:^| )' + '". $className ."' + '(?:$| )');\n"; + $js .= " if (!classRegex.test(textarea.className))\n"; + $js .= " return false;\n"; + } + $js .= " CKEDITOR.tools.extend(config, ". $this->jsEncode($_config) .", true);"; + $js .= "} );"; + + } + + $out .= $this->script($js); + + if (!$this->returnOutput) { + print $out; + $out = ""; + } + + return $out; + } + + /** + * Adds event listener. + * Events are fired by %CKEditor in various situations. + * + * @param $event (string) Event name. + * @param $javascriptCode (string) Javascript anonymous function or function name. + * + * Example usage: + * @code + * $CKEditor->addEventHandler('instanceReady', 'function (ev) { + * alert("Loaded: " + ev.editor.name); + * }'); + * @endcode + */ + public function addEventHandler($event, $javascriptCode) + { + if (!isset($this->events[$event])) { + $this->events[$event] = array(); + } + // Avoid duplicates. + if (!in_array($javascriptCode, $this->events[$event])) { + $this->events[$event][] = $javascriptCode; + } + } + + /** + * Clear registered event handlers. + * Note: this function will have no effect on already created editor instances. + * + * @param $event (string) Event name, if not set all event handlers will be removed (optional). + */ + public function clearEventHandlers($event = null) + { + if (!empty($event)) { + $this->events[$event] = array(); + } + else { + $this->events = array(); + } + } + + /** + * Adds global event listener. + * + * @param $event (string) Event name. + * @param $javascriptCode (string) Javascript anonymous function or function name. + * + * Example usage: + * @code + * $CKEditor->addGlobalEventHandler('dialogDefinition', 'function (ev) { + * alert("Loading dialog: " + ev.data.name); + * }'); + * @endcode + */ + public function addGlobalEventHandler($event, $javascriptCode) + { + if (!isset($this->globalEvents[$event])) { + $this->globalEvents[$event] = array(); + } + // Avoid duplicates. + if (!in_array($javascriptCode, $this->globalEvents[$event])) { + $this->globalEvents[$event][] = $javascriptCode; + } + } + + /** + * Clear registered global event handlers. + * Note: this function will have no effect if the event handler has been already printed/returned. + * + * @param $event (string) Event name, if not set all event handlers will be removed (optional). + */ + public function clearGlobalEventHandlers($event = null) + { + if (!empty($event)) { + $this->globalEvents[$event] = array(); + } + else { + $this->globalEvents = array(); + } + } + + /** + * Prints javascript code. + * + * @param string $js + */ + private function script($js) + { + $out = "\n"; + + return $out; + } + + /** + * Returns the configuration array (global and instance specific settings are merged into one array). + * + * @param $config (array) The specific configurations to apply to editor instance. + * @param $events (array) Event listeners for editor instance. + */ + private function configSettings($config = array(), $events = array()) + { + $_config = $this->config; + $_events = $this->events; + + if (is_array($config) && !empty($config)) { + $_config = array_merge($_config, $config); + } + + if (is_array($events) && !empty($events)) { + foreach ($events as $eventName => $code) { + if (!isset($_events[$eventName])) { + $_events[$eventName] = array(); + } + if (!in_array($code, $_events[$eventName])) { + $_events[$eventName][] = $code; + } + } + } + + if (!empty($_events)) { + foreach($_events as $eventName => $handlers) { + if (empty($handlers)) { + continue; + } + else if (count($handlers) == 1) { + $_config['on'][$eventName] = '@@'.$handlers[0]; + } + else { + $_config['on'][$eventName] = '@@function (ev){'; + foreach ($handlers as $handler => $code) { + $_config['on'][$eventName] .= '('.$code.')(ev);'; + } + $_config['on'][$eventName] .= '}'; + } + } + } + + return $_config; + } + + /** + * Return global event handlers. + */ + private function returnGlobalEvents() + { + static $returnedEvents; + $out = ""; + + if (!isset($returnedEvents)) { + $returnedEvents = array(); + } + + if (!empty($this->globalEvents)) { + foreach ($this->globalEvents as $eventName => $handlers) { + foreach ($handlers as $handler => $code) { + if (!isset($returnedEvents[$eventName])) { + $returnedEvents[$eventName] = array(); + } + // Return only new events + if (!in_array($code, $returnedEvents[$eventName])) { + $out .= ($code ? "\n" : "") . "CKEDITOR.on('". $eventName ."', $code);"; + $returnedEvents[$eventName][] = $code; + } + } + } + } + + return $out; + } + + /** + * Initializes CKEditor (executed only once). + */ + private function init() + { + static $initComplete; + $out = ""; + + if (!empty($initComplete)) { + return ""; + } + + if ($this->initialized) { + $initComplete = true; + return ""; + } + + $args = ""; + $ckeditorPath = $this->ckeditorPath(); + + if (!empty($this->timestamp) && $this->timestamp != "%TIMESTAMP%") { + $args = '?t=' . $this->timestamp; + } + + // Skip relative paths... + if (strpos($ckeditorPath, '..') !== 0) { + $out .= $this->script("window.CKEDITOR_BASEPATH='". $ckeditorPath ."';"); + } + + $out .= "\n"; + + $extraCode = ""; + // CKReleaser %REMOVE_START% + if (self::version == '%VERSION%') { + $extraCode .= ($extraCode ? "\n" : "") . "if (typeof(CKEDITOR) == 'undefined') { alert('The CKEDITOR object was not found. Please make sure that the ckeditor.js file is available in your installation.'); }"; + } + // %REMOVE_END% + if (!empty($this->timestamp) && $this->timestamp != self::timestamp) { + $extraCode .= ($extraCode ? "\n" : "") . "CKEDITOR.timestamp = '". $this->timestamp ."';"; + } + if ($extraCode) { + $out .= $this->script($extraCode); + } + + $initComplete = $this->initialized = true; + + return $out; + } + + /** + * Return path to ckeditor.js. + */ + private function ckeditorPath() + { + if (!empty($this->basePath)) { + return $this->basePath; + } + + /** + * The absolute pathname of the currently executing script. + * Note: If a script is executed with the CLI, as a relative path, such as file.php or ../file.php, + * $_SERVER['SCRIPT_FILENAME'] will contain the relative path specified by the user. + */ + if (isset($_SERVER['SCRIPT_FILENAME'])) { + $realPath = dirname($_SERVER['SCRIPT_FILENAME']); + } + else { + /** + * realpath — Returns canonicalized absolute pathname + */ + $realPath = realpath( './' ) ; + } + + /** + * The filename of the currently executing script, relative to the document root. + * For instance, $_SERVER['PHP_SELF'] in a script at the address http://example.com/test.php/foo.bar + * would be /test.php/foo.bar. + */ + $selfPath = dirname($_SERVER['PHP_SELF']); + $file = str_replace("\\", "/", __FILE__); + + if (!$selfPath || !$realPath || !$file) { + return "/ckeditor/"; + } + + $documentRoot = substr($realPath, 0, strlen($realPath) - strlen($selfPath)); + $fileUrl = substr($file, strlen($documentRoot)); + $ckeditorUrl = str_replace("ckeditor_php5.php", "", $fileUrl); + + return $ckeditorUrl; + } + + /** + * This little function provides a basic JSON support. + * http://php.net/manual/en/function.json-encode.php + * + * @param mixed $val + * @return string + */ + private function jsEncode($val) + { + if (is_null($val)) { + return 'null'; + } + if ($val === false) { + return 'false'; + } + if ($val === true) { + return 'true'; + } + if (is_scalar($val)) + { + if (is_float($val)) + { + // Always use "." for floats. + $val = str_replace(",", ".", strval($val)); + } + + // Use @@ to not use quotes when outputting string value + if (strpos($val, '@@') === 0) { + return substr($val, 2); + } + else { + // All scalars are converted to strings to avoid indeterminism. + // PHP's "1" and 1 are equal for all PHP operators, but + // JS's "1" and 1 are not. So if we pass "1" or 1 from the PHP backend, + // we should get the same result in the JS frontend (string). + // Character replacements for JSON. + static $jsonReplaces = array(array("\\", "/", "\n", "\t", "\r", "\b", "\f", '"'), + array('\\\\', '\\/', '\\n', '\\t', '\\r', '\\b', '\\f', '\"')); + + $val = str_replace($jsonReplaces[0], $jsonReplaces[1], $val); + + return '"' . $val . '"'; + } + } + $isList = true; + for ($i = 0, reset($val); $i < count($val); $i++, next($val)) + { + if (key($val) !== $i) + { + $isList = false; + break; + } + } + $result = array(); + if ($isList) + { + foreach ($val as $v) $result[] = $this->jsEncode($v); + return '[ ' . join(', ', $result) . ' ]'; + } + else + { + foreach ($val as $k => $v) $result[] = $this->jsEncode($k).': '.$this->jsEncode($v); + return '{ ' . join(', ', $result) . ' }'; + } + } +} Index: /CKEditor/trunk/config.js =================================================================== --- /CKEditor/trunk/config.js (revision 4773) +++ /CKEditor/trunk/config.js (revision 4774) @@ -1,3 +1,3 @@ -/* +/* Copyright (c) 2003-2009, CKSource - Frederico Knabben. All rights reserved. For licensing, see LICENSE.html or http://ckeditor.com/license - level1