Index: /CKEditor/branches/versions/3.4.x/CHANGES.html =================================================================== --- /CKEditor/branches/versions/3.4.x/CHANGES.html (revision 5708) +++ /CKEditor/branches/versions/3.4.x/CHANGES.html (revision 5709) @@ -44,4 +44,5 @@
  • #5909 : BiDi: Support for switching base language.
  • #4606 : Port 'AutoGrow' plugin from FCKEditor 2.x.
    • +
  • #5737 : Added support for the HTML5 contenteditable attribute, making it possible to define read only regions into the editor contents.

    • Index: /CKEditor/branches/versions/3.4.x/_source/core/dom/node.js =================================================================== --- /CKEditor/branches/versions/3.4.x/_source/core/dom/node.js (revision 5708) +++ /CKEditor/branches/versions/3.4.x/_source/core/dom/node.js (revision 5709) @@ -658,4 +658,25 @@ } } + }, + + isReadOnly : function() + { + var current = this; + while( current ) + { + if ( current.type == CKEDITOR.NODE_ELEMENT ) + { + if ( current.is ( 'body' ) ) + break; + + if ( current.getAttribute( 'contentEditable' ) == 'false' ) + return current; + else if ( current.getAttribute( 'contentEditable' ) == 'true' ) + break; + } + current = current.getParent(); + } + + return false; } } Index: /CKEditor/branches/versions/3.4.x/_source/core/dom/range.js =================================================================== --- /CKEditor/branches/versions/3.4.x/_source/core/dom/range.js (revision 5708) +++ /CKEditor/branches/versions/3.4.x/_source/core/dom/range.js (revision 5709) @@ -1,3 +1,3 @@ -/* +/* Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved. For licensing, see LICENSE.html or http://ckeditor.com/license Index: /CKEditor/branches/versions/3.4.x/_source/core/dom/rangelist.js =================================================================== --- /CKEditor/branches/versions/3.4.x/_source/core/dom/rangelist.js (revision 5709) +++ /CKEditor/branches/versions/3.4.x/_source/core/dom/rangelist.js (revision 5709) @@ -0,0 +1,163 @@ +/* +Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved. +For licensing, see LICENSE.html or http://ckeditor.com/license +*/ + +(function() +{ + /** + * Represents a list os CKEDITOR.dom.range objects, which can be easily + * iterated sequentially. + * @constructor + * @param {CKEDITOR.dom.range|Array} [ranges] The ranges contained on this list. + * Note that, if an array of ranges is specified, the range sequence + * should match its DOM order. This class will not help to sort them. + */ + CKEDITOR.dom.rangeList = function( ranges ) + { + if ( ranges.createIterator ) + return ranges; + + if ( !ranges ) + ranges = []; + else if ( ranges instanceof CKEDITOR.dom.range ) + ranges = [ ranges ]; + + return CKEDITOR.tools.extend( ranges, mixins ); + }; + + var mixins = + /** @lends CKEDITOR.dom.rangeList.prototype */ + { + /** + * Creates an instance of the rangeList iterator, it should be used + * only when the ranges processing could be DOM intrusive, which + * means it may pollute and break other ranges in this list. + * Otherwise, it's enough to just iterate over this array in a for loop. + * @returns {CKEDITOR.dom.rangeListIterator} + */ + createIterator : function() + { + var rangeList = this, + bookmarks = [], + current; + + /** + * @lends CKEDITOR.dom.rangeListIterator.prototype + */ + return { + + /** + * Retrieves the next range in the list. + */ + getNextRange : function() + { + current = current == undefined ? 0 : current + 1; + + var range = rangeList[ current ]; + + // Multiple ranges might be mangled by each other. + if ( range && rangeList.length > 1 ) + { + // Bookmarking all other ranges on the first iteration, + // the range correctness after it doesn't matter since we'll + // restore them before the next iteration. + if ( current == 0 ) + { + // Make sure bookmark correctness by reverse processing. + for ( var i = rangeList.length - 1; i > 0; i-- ) + bookmarks.unshift( rangeList[ i ].createBookmark( true ) ); + } + else + range.moveToBookmark( bookmarks.shift() ); + } + + return range; + } + }; + }, + + createBookmarks : function( serializable ) + { + var retval = [], bookmark; + for ( var i = 0; i < this.length ; i++ ) + { + retval.push( bookmark = this[ i ].createBookmark( serializable, true) ); + + // Updating the container & offset values for ranges + // that have been touched. + for ( var j = i + 1; j < this.length; j++ ) + { + this[ j ] = updateDirtyRange( bookmark, this[ j ] ); + this[ j ] = updateDirtyRange( bookmark, this[ j ], true ); + } + } + return retval; + }, + + createBookmarks2 : function( normalized ) + { + var bookmarks = []; + + for ( var i = 0 ; i < this.length ; i++ ) + bookmarks.push( this[ i ].createBookmark2( normalized ) ); + + return bookmarks; + }, + + /** + * Move each range in the list to the position specified by a list of bookmarks. + * @param {Array} bookmarks The list of bookmarks, each one matching a range in the list. + */ + moveToBookmarks : function( bookmarks ) + { + for ( var i = 0 ; i < this.length ; i++ ) + this[ i ].moveToBookmark( bookmarks[ i ] ); + } + }; + + // Update the specified range which has been mangled by previous insertion of + // range bookmark nodes.(#3256) + function updateDirtyRange( bookmark, dirtyRange, checkEnd ) + { + var serializable = bookmark.serializable, + container = dirtyRange[ checkEnd ? 'endContainer' : 'startContainer' ], + offset = checkEnd ? 'endOffset' : 'startOffset'; + + var bookmarkStart = serializable ? + dirtyRange.document.getById( bookmark.startNode ) + : bookmark.startNode; + + var bookmarkEnd = serializable ? + dirtyRange.document.getById( bookmark.endNode ) + : bookmark.endNode; + + if ( container.equals( bookmarkStart.getPrevious() ) ) + { + dirtyRange.startOffset = dirtyRange.startOffset + - container.getLength() + - bookmarkEnd.getPrevious().getLength(); + container = bookmarkEnd.getNext(); + } + else if ( container.equals( bookmarkEnd.getPrevious() ) ) + { + dirtyRange.startOffset = dirtyRange.startOffset - container.getLength(); + container = bookmarkEnd.getNext(); + } + + container.equals( bookmarkStart.getParent() ) && dirtyRange[ offset ]++; + container.equals( bookmarkEnd.getParent() ) && dirtyRange[ offset ]++; + + // Update and return this range. + dirtyRange[ checkEnd ? 'endContainer' : 'startContainer' ] = container; + return dirtyRange; + } +})(); + +/** + * (Virtual Class) Do not call this constructor. This class is not really part + * of the API. It just describes the return type of {@link CKEDITOR.dom.rangeList#createIterator}. + * @name CKEDITOR.dom.rangeListIterator + * @constructor + * @example + */ Index: /CKEditor/branches/versions/3.4.x/_source/core/loader.js =================================================================== --- /CKEditor/branches/versions/3.4.x/_source/core/loader.js (revision 5708) +++ /CKEditor/branches/versions/3.4.x/_source/core/loader.js (revision 5709) @@ -1,3 +1,3 @@ -/* +/* Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved. For licensing, see LICENSE.html or http://ckeditor.com/license @@ -24,5 +24,5 @@ var scripts = { - 'core/_bootstrap' : [ 'core/config', 'core/ckeditor', 'core/plugins', 'core/scriptloader', 'core/tools', /* The following are entries that we want to force loading at the end to avoid dependence recursion */ 'core/dom/comment', 'core/dom/elementpath', 'core/dom/text', 'core/dom/range' ], + 'core/_bootstrap' : [ 'core/config', 'core/ckeditor', 'core/plugins', 'core/scriptloader', 'core/tools', /* The following are entries that we want to force loading at the end to avoid dependence recursion */ 'core/dom/comment', 'core/dom/elementpath', 'core/dom/text', 'core/dom/rangelist' ], 'core/ajax' : [ 'core/xml' ], 'core/ckeditor' : [ 'core/ckeditor_basic', 'core/dom', 'core/dtd', 'core/dom/document', 'core/dom/element', 'core/editor', 'core/event', 'core/htmlparser', 'core/htmlparser/element', 'core/htmlparser/fragment', 'core/htmlparser/filter', 'core/htmlparser/basicwriter', 'core/tools' ], @@ -42,4 +42,5 @@ 'core/dom/domobject' : [ 'core/dom/event' ], 'core/dom/range' : [ 'core/dom/document', 'core/dom/documentfragment', 'core/dom/element', 'core/dom/walker' ], + 'core/dom/rangelist' : [ 'core/dom/range' ], 'core/dom/text' : [ 'core/dom/node', 'core/dom/domobject' ], 'core/dom/walker' : [ 'core/dom/node' ], Index: /CKEditor/branches/versions/3.4.x/_source/plugins/blockquote/plugin.js =================================================================== --- /CKEditor/branches/versions/3.4.x/_source/plugins/blockquote/plugin.js (revision 5708) +++ /CKEditor/branches/versions/3.4.x/_source/plugins/blockquote/plugin.js (revision 5709) @@ -48,5 +48,5 @@ var state = editor.getCommand( 'blockquote' ).state, selection = editor.getSelection(), - range = selection && selection.getRanges()[0]; + range = selection && selection.getRanges( true )[0]; if ( !range ) Index: /CKEditor/branches/versions/3.4.x/_source/plugins/clipboard/plugin.js =================================================================== --- /CKEditor/branches/versions/3.4.x/_source/plugins/clipboard/plugin.js (revision 5708) +++ /CKEditor/branches/versions/3.4.x/_source/plugins/clipboard/plugin.js (revision 5709) @@ -1,3 +1,3 @@ -/* +/* Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved. For licensing, see LICENSE.html or http://ckeditor.com/license @@ -387,12 +387,13 @@ } - editor.contextMenu.addListener( function() + editor.contextMenu.addListener( function( element, selection ) { + var readOnly = selection.getCommonAncestor().isReadOnly(); return { - cut : stateFromNamedCommand( 'Cut' ), + cut : !readOnly && stateFromNamedCommand( 'Cut' ), // Browser bug: 'Cut' has the correct states for both Copy and Cut. copy : stateFromNamedCommand( 'Cut' ), - paste : CKEDITOR.env.webkit ? CKEDITOR.TRISTATE_OFF : stateFromNamedCommand( 'Paste' ) + paste : !readOnly && ( CKEDITOR.env.webkit ? CKEDITOR.TRISTATE_OFF : stateFromNamedCommand( 'Paste' ) ) }; }); Index: /CKEditor/branches/versions/3.4.x/_source/plugins/div/plugin.js =================================================================== --- /CKEditor/branches/versions/3.4.x/_source/plugins/div/plugin.js (revision 5708) +++ /CKEditor/branches/versions/3.4.x/_source/plugins/div/plugin.js (revision 5709) @@ -96,5 +96,5 @@ editor.contextMenu.addListener( function( element, selection ) { - if ( !element ) + if ( !element || element.isReadOnly()) return null; Index: /CKEditor/branches/versions/3.4.x/_source/plugins/enterkey/plugin.js =================================================================== --- /CKEditor/branches/versions/3.4.x/_source/plugins/enterkey/plugin.js (revision 5708) +++ /CKEditor/branches/versions/3.4.x/_source/plugins/enterkey/plugin.js (revision 5709) @@ -24,4 +24,9 @@ // Get the range for the current selection. range = range || getRange( editor ); + + // We may not have valid ranges to work on, like when inside a + // contenteditable=false element. + if ( !range ) + return; var doc = range.document; @@ -189,4 +194,9 @@ // Get the range for the current selection. range = range || getRange( editor ); + + // We may not have valid ranges to work on, like when inside a + // contenteditable=false element. + if ( !range ) + return; var doc = range.document; @@ -340,5 +350,5 @@ { // Get the selection ranges. - var ranges = editor.getSelection().getRanges(); + var ranges = editor.getSelection().getRanges( true ); // Delete the contents of all ranges except the first one. Index: /CKEditor/branches/versions/3.4.x/_source/plugins/find/dialogs/find.js =================================================================== --- /CKEditor/branches/versions/3.4.x/_source/plugins/find/dialogs/find.js (revision 5708) +++ /CKEditor/branches/versions/3.4.x/_source/plugins/find/dialogs/find.js (revision 5709) @@ -1,3 +1,3 @@ -/* +/* Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved. For licensing, see LICENSE.html or http://ckeditor.com/license @@ -6,7 +6,7 @@ (function() { - function nonEmptyText( node ) + function findEvaluator( node ) { - return ( node.type == CKEDITOR.NODE_TEXT && node.getLength() > 0 ); + return node.type == CKEDITOR.NODE_TEXT && node.getLength() > 0 && !node.isReadOnly(); } @@ -14,5 +14,5 @@ * Elements which break characters been considered as sequence. */ - function nonCharactersBoundary ( node ) + function nonCharactersBoundary( node ) { return !( node.type == CKEDITOR.NODE_ELEMENT && node.isBlockBoundary( @@ -85,5 +85,5 @@ new CKEDITOR.dom.walker( range ); walker.guard = matchWord ? nonCharactersBoundary : null; - walker[ 'evaluator' ] = nonEmptyText; + walker[ 'evaluator' ] = findEvaluator; walker.breakOnFalse = true; @@ -252,6 +252,8 @@ // Apply the highlight. - var range = this.toDomRange(); + var range = this.toDomRange(), + bookmark = range.createBookmark(); highlightStyle.applyToRange( range ); + range.moveToBookmark( bookmark ); this._.highlightRange = range; @@ -274,5 +276,7 @@ return; + var bookmark = this._.highlightRange.createBookmark(); highlightStyle.removeFromRange( this._.highlightRange ); + this._.highlightRange.moveToBookmark( bookmark ); this.updateFromDomRange( this._.highlightRange ); this._.highlightRange = null; Index: /CKEditor/branches/versions/3.4.x/_source/plugins/flash/plugin.js =================================================================== --- /CKEditor/branches/versions/3.4.x/_source/plugins/flash/plugin.js (revision 5708) +++ /CKEditor/branches/versions/3.4.x/_source/plugins/flash/plugin.js (revision 5709) @@ -91,5 +91,6 @@ editor.contextMenu.addListener( function( element, selection ) { - if ( element && element.is( 'img' ) && element.getAttribute( '_cke_real_element_type' ) == 'flash' ) + if ( element && element.is( 'img' ) && !element.isReadOnly() + && element.getAttribute( '_cke_real_element_type' ) == 'flash' ) return { flash : CKEDITOR.TRISTATE_OFF }; }); Index: /CKEditor/branches/versions/3.4.x/_source/plugins/forms/plugin.js =================================================================== --- /CKEditor/branches/versions/3.4.x/_source/plugins/forms/plugin.js (revision 5708) +++ /CKEditor/branches/versions/3.4.x/_source/plugins/forms/plugin.js (revision 5709) @@ -1,3 +1,3 @@ -/* +/* Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved. For licensing, see LICENSE.html or http://ckeditor.com/license @@ -132,5 +132,5 @@ editor.contextMenu.addListener( function( element ) { - if ( element && element.hasAscendant( 'form', true ) ) + if ( element && element.hasAscendant( 'form', true ) && !element.isReadOnly() ) return { form : CKEDITOR.TRISTATE_OFF }; }); @@ -138,5 +138,5 @@ editor.contextMenu.addListener( function( element ) { - if ( element ) + if ( element && !element.isReadOnly() ) { var name = element.getName(); Index: /CKEditor/branches/versions/3.4.x/_source/plugins/image/plugin.js =================================================================== --- /CKEditor/branches/versions/3.4.x/_source/plugins/image/plugin.js (revision 5708) +++ /CKEditor/branches/versions/3.4.x/_source/plugins/image/plugin.js (revision 5709) @@ -54,5 +54,5 @@ editor.contextMenu.addListener( function( element, selection ) { - if ( !element || !element.is( 'img' ) || element.getAttribute( '_cke_realelement' ) ) + if ( !element || !element.is( 'img' ) || element.getAttribute( '_cke_realelement' ) || element.isReadOnly() ) return null; Index: /CKEditor/branches/versions/3.4.x/_source/plugins/indent/plugin.js =================================================================== --- /CKEditor/branches/versions/3.4.x/_source/plugins/indent/plugin.js (revision 5708) +++ /CKEditor/branches/versions/3.4.x/_source/plugins/indent/plugin.js (revision 5709) @@ -63,185 +63,4 @@ } - function indentList( editor, range, listNode ) - { - // Our starting and ending points of the range might be inside some blocks under a list item... - // So before playing with the iterator, we need to expand the block to include the list items. - var startContainer = range.startContainer, - endContainer = range.endContainer; - while ( startContainer && !startContainer.getParent().equals( listNode ) ) - startContainer = startContainer.getParent(); - while ( endContainer && !endContainer.getParent().equals( listNode ) ) - endContainer = endContainer.getParent(); - - if ( !startContainer || !endContainer ) - return; - - // Now we can iterate over the individual items on the same tree depth. - var block = startContainer, - itemsToMove = [], - stopFlag = false; - while ( !stopFlag ) - { - if ( block.equals( endContainer ) ) - stopFlag = true; - itemsToMove.push( block ); - block = block.getNext(); - } - if ( itemsToMove.length < 1 ) - return; - - // Do indent or outdent operations on the array model of the list, not the - // list's DOM tree itself. The array model demands that it knows as much as - // possible about the surrounding lists, we need to feed it the further - // ancestor node that is still a list. - var listParents = listNode.getParents( true ); - for ( var i = 0 ; i < listParents.length ; i++ ) - { - if ( listParents[i].getName && listNodeNames[ listParents[i].getName() ] ) - { - listNode = listParents[i]; - break; - } - } - var indentOffset = this.name == 'indent' ? 1 : -1, - startItem = itemsToMove[0], - lastItem = itemsToMove[ itemsToMove.length - 1 ], - database = {}; - - // Convert the list DOM tree into a one dimensional array. - var listArray = CKEDITOR.plugins.list.listToArray( listNode, database ); - - // Apply indenting or outdenting on the array. - var baseIndent = listArray[ lastItem.getCustomData( 'listarray_index' ) ].indent; - for ( i = startItem.getCustomData( 'listarray_index' ); i <= lastItem.getCustomData( 'listarray_index' ); i++ ) - { - listArray[ i ].indent += indentOffset; - // Make sure the newly created sublist get a brand-new element of the same type. (#5372) - var listRoot = listArray[ i ].parent; - listArray[ i ].parent = new CKEDITOR.dom.element( listRoot.getName(), listRoot.getDocument() ); - } - - for ( i = lastItem.getCustomData( 'listarray_index' ) + 1 ; - i < listArray.length && listArray[i].indent > baseIndent ; i++ ) - listArray[i].indent += indentOffset; - - // Convert the array back to a DOM forest (yes we might have a few subtrees now). - // And replace the old list with the new forest. - var newList = CKEDITOR.plugins.list.arrayToList( listArray, database, null, editor.config.enterMode, 0 ); - - // Avoid nested

  • after outdent even they're visually same, - // recording them for later refactoring.(#3982) - if ( this.name == 'outdent' ) - { - var parentLiElement; - if ( ( parentLiElement = listNode.getParent() ) && parentLiElement.is( 'li' ) ) - { - var children = newList.listNode.getChildren(), - pendingLis = [], - count = children.count(), - child; - - for ( i = count - 1 ; i >= 0 ; i-- ) - { - if ( ( child = children.getItem( i ) ) && child.is && child.is( 'li' ) ) - pendingLis.push( child ); - } - } - } - - if ( newList ) - newList.listNode.replace( listNode ); - - // Move the nested
  • to be appeared after the parent. - if ( pendingLis && pendingLis.length ) - { - for ( i = 0; i < pendingLis.length ; i++ ) - { - var li = pendingLis[ i ], - followingList = li; - - // Nest preceding