/*\r
-Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved.\r
+Copyright (c) 2003-2011, CKSource - Frederico Knabben. All rights reserved.\r
For licensing, see LICENSE.html or http://ckeditor.com/license\r
*/\r
\r
\r
var semicolonFixRegex = /\s*(?:;\s*|$)/;\r
\r
+ var notBookmark = CKEDITOR.dom.walker.bookmark( 0, 1 );\r
+\r
CKEDITOR.style = function( styleDefinition, variablesValues )\r
{\r
if ( variablesValues )\r
return ( this.removeFromRange =\r
this.type == CKEDITOR.STYLE_INLINE ?\r
removeInlineStyle\r
+ : this.type == CKEDITOR.STYLE_BLOCK ?\r
+ removeBlockStyle\r
: this.type == CKEDITOR.STYLE_OBJECT ?\r
removeObjectStyle\r
: null ).call( this, range );\r
\r
// Gets the parent element which blocks the styling for an element. This\r
// can be done through read-only elements (contenteditable=false) or\r
- // elements with the "data-cke-nostyle" attribute.\r
+ // elements with the "data-nostyle" attribute.\r
function getUnstylableParent( element )\r
{\r
var unstylable,\r
if ( element.getName() == 'body' )\r
break;\r
\r
- if ( element.getAttribute( 'data-cke-nostyle' ) )\r
+ if ( element.getAttribute( 'data-nostyle' ) )\r
unstylable = element;\r
else if ( !editable )\r
{\r
var dtd = CKEDITOR.dtd[ elementName ] || ( isUnknownElement = true, CKEDITOR.dtd.span );\r
\r
// Expand the range.\r
- range.enlarge( CKEDITOR.ENLARGE_ELEMENT );\r
+ range.enlarge( CKEDITOR.ENLARGE_ELEMENT, 1 );\r
range.trim();\r
\r
// Get the first node to be processed and the last, which concludes the\r
var nodeType = currentNode.type;\r
var nodeName = nodeType == CKEDITOR.NODE_ELEMENT ? currentNode.getName() : null;\r
var nodeIsReadonly = nodeName && ( currentNode.getAttribute( 'contentEditable' ) == 'false' );\r
- var nodeIsNoStyle = nodeName && currentNode.getAttribute( 'data-cke-nostyle' );\r
+ var nodeIsNoStyle = nodeName && currentNode.getAttribute( 'data-nostyle' );\r
\r
if ( nodeName && currentNode.data( 'cke-bookmark' ) )\r
{\r
// This node is about to be included completelly, but,\r
// if this is the last node in its parent, we must also\r
// check if the parent itself can be added completelly\r
- // to the range.\r
- while ( !includedNode.$.nextSibling\r
+ // to the range, otherwise apply the style immediately.\r
+ while ( ( applyStyle = !includedNode.getNext( notBookmark ) )\r
&& ( parentNode = includedNode.getParent(), dtd[ parentNode.getName() ] )\r
&& ( parentNode.getPosition( firstNode ) | CKEDITOR.POSITION_FOLLOWING | CKEDITOR.POSITION_IDENTICAL | CKEDITOR.POSITION_IS_CONTAINED ) == ( CKEDITOR.POSITION_FOLLOWING + CKEDITOR.POSITION_IDENTICAL + CKEDITOR.POSITION_IS_CONTAINED )\r
&& ( !def.childRule || def.childRule( parentNode ) ) )\r
\r
styleRange.setEndAfter( includedNode );\r
\r
- // If the included node still is the last node in its\r
- // parent, it means that the parent can't be included\r
- // in this style DTD, so apply the style immediately.\r
- if ( !includedNode.$.nextSibling )\r
- applyStyle = true;\r
}\r
}\r
else\r
* Make sure our range has included all "collpased" parent inline nodes so\r
* that our operation logic can be simpler.\r
*/\r
- range.enlarge( CKEDITOR.ENLARGE_ELEMENT );\r
+ range.enlarge( CKEDITOR.ENLARGE_ELEMENT, 1 );\r
\r
var bookmark = range.createBookmark(),\r
startNode = bookmark.startNode;\r
range.moveToBookmark( bookmark );\r
}\r
\r
+ function removeBlockStyle( range )\r
+ {\r
+ // Serializible bookmarks is needed here since\r
+ // elements may be merged.\r
+ var bookmark = range.createBookmark( 1 );\r
+\r
+ var iterator = range.createIterator();\r
+ iterator.enforceRealBlocks = true;\r
+ iterator.enlargeBr = this._.enterMode != CKEDITOR.ENTER_BR;\r
+\r
+ var block;\r
+ while ( ( block = iterator.getNextParagraph() ) )\r
+ {\r
+ if ( this.checkElementRemovable( block ) )\r
+ {\r
+ // <pre> get special treatment.\r
+ if ( block.is( 'pre' ) )\r
+ {\r
+ var newBlock = this._.enterMode == CKEDITOR.ENTER_BR ?\r
+ null : range.document.createElement(\r
+ this._.enterMode == CKEDITOR.ENTER_P ? 'p' : 'div' );\r
+\r
+ newBlock && block.copyAttributes( newBlock );\r
+ replaceBlock( block, newBlock );\r
+ }\r
+ else\r
+ removeFromElement( this, block, 1 );\r
+ }\r
+ }\r
+\r
+ range.moveToBookmark( bookmark );\r
+ }\r
+\r
// Replace the original block with new one, with special treatment\r
// for <pre> blocks to make sure content format is well preserved, and merging/splitting adjacent\r
// when necessary.(#3188)\r
function replaceBlock( block, newBlock )\r
{\r
- var newBlockIsPre = newBlock.is( 'pre' );\r
- var blockIsPre = block.is( 'pre' );\r
+ // Block is to be removed, create a temp element to\r
+ // save contents.\r
+ var removeBlock = !newBlock;\r
+ if ( removeBlock )\r
+ {\r
+ newBlock = block.getDocument().createElement( 'div' );\r
+ block.copyAttributes( newBlock );\r
+ }\r
+\r
+ var newBlockIsPre = newBlock && newBlock.is( 'pre' );\r
+ var blockIsPre = block.is( 'pre' );\r
\r
var isToPre = newBlockIsPre && !blockIsPre;\r
var isFromPre = !newBlockIsPre && blockIsPre;\r
newBlock = toPre( block, newBlock );\r
else if ( isFromPre )\r
// Split big <pre> into pieces before start to convert.\r
- newBlock = fromPres( splitIntoPres( block ), newBlock );\r
+ newBlock = fromPres( removeBlock ?\r
+ [ block.getHtml() ] : splitIntoPres( block ), newBlock );\r
else\r
block.moveChildren( newBlock );\r
\r
// Merge previous <pre> blocks.\r
mergePre( newBlock );\r
}\r
+ else if ( removeBlock )\r
+ removeNoAttribsElement( newBlock );\r
}\r
\r
- var nonWhitespaces = CKEDITOR.dom.walker.whitespaces( true );\r
+ var nonWhitespaces = CKEDITOR.dom.walker.whitespaces( 1 );\r
/**\r
* Merge a <pre> block with a previous sibling if available.\r
*/\r
*/\r
function fromPres( preHtmls, newBlock )\r
{\r
- var docFrag = new CKEDITOR.dom.documentFragment( newBlock.getDocument() );\r
+ var docFrag;\r
+ if ( preHtmls.length > 1 )\r
+ docFrag = new CKEDITOR.dom.documentFragment( newBlock.getDocument() );\r
+\r
for ( var i = 0 ; i < preHtmls.length ; i++ )\r
{\r
var blockHtml = preHtmls[ i ];\r
return CKEDITOR.tools.repeat( ' ', match.length - 1 ) + ' ' ;\r
} ) ;\r
\r
- var newBlockClone = newBlock.clone();\r
- newBlockClone.setHtml( blockHtml );\r
- docFrag.append( newBlockClone );\r
+ if ( docFrag )\r
+ {\r
+ var newBlockClone = newBlock.clone();\r
+ newBlockClone.setHtml( blockHtml );\r
+ docFrag.append( newBlockClone );\r
+ }\r
+ else\r
+ newBlock.setHtml( blockHtml );\r
}\r
- return docFrag;\r
+\r
+ return docFrag || newBlock;\r
}\r
\r
/**\r
*/\r
function toPre( block, newBlock )\r
{\r
+ var bogus = block.getBogus();\r
+ bogus && bogus.remove();\r
+\r
// First trim the block content.\r
var preHtml = block.getHtml();\r
\r
var temp = block.getDocument().createElement( 'div' );\r
temp.append( newBlock );\r
newBlock.$.outerHTML = '<pre>' + preHtml + '</pre>';\r
+ newBlock.copyAttributes( temp.getFirst() );\r
newBlock = temp.getFirst().remove();\r
}\r
else\r
element.removeStyle( styleName );\r
}\r
\r
- removeEmpty && removeNoAttribsElement( element );\r
+ if ( removeEmpty )\r
+ {\r
+ !CKEDITOR.dtd.$block[ element.getName() ] || style._.enterMode == CKEDITOR.ENTER_BR && !element.hasAttributes() ?\r
+ removeNoAttribsElement( element ) :\r
+ element.renameNode( style._.enterMode == CKEDITOR.ENTER_P ? 'p' : 'div' );\r
+ }\r
}\r
\r
// Removes a style from inside an element.\r
// leaving its children.\r
if ( !element.hasAttributes() )\r
{\r
- // Removing elements may open points where merging is possible,\r
- // so let's cache the first and last nodes for later checking.\r
- var firstChild = element.getFirst();\r
- var lastChild = element.getLast();\r
+ if ( CKEDITOR.dtd.$block[ element.getName() ] )\r
+ {\r
+ var previous = element.getPrevious( nonWhitespaces ),\r
+ next = element.getNext( nonWhitespaces );\r
\r
- element.remove( true );\r
+ if ( previous && ( previous.type == CKEDITOR.NODE_TEXT || !previous.isBlockBoundary( { br : 1 } ) ) )\r
+ element.append( 'br', 1 );\r
+ if ( next && ( next.type == CKEDITOR.NODE_TEXT || !next.isBlockBoundary( { br : 1 } ) ) )\r
+ element.append( 'br' );\r
\r
- if ( firstChild )\r
+ element.remove( true );\r
+ }\r
+ else\r
{\r
- // Check the cached nodes for merging.\r
- firstChild.type == CKEDITOR.NODE_ELEMENT && firstChild.mergeSiblings();\r
+ // Removing elements may open points where merging is possible,\r
+ // so let's cache the first and last nodes for later checking.\r
+ var firstChild = element.getFirst();\r
+ var lastChild = element.getLast();\r
+\r
+ element.remove( true );\r
+\r
+ if ( firstChild )\r
+ {\r
+ // Check the cached nodes for merging.\r
+ firstChild.type == CKEDITOR.NODE_ELEMENT && firstChild.mergeSiblings();\r
+\r
+ if ( lastChild && !firstChild.equals( lastChild )\r
+ && lastChild.type == CKEDITOR.NODE_ELEMENT )\r
+ lastChild.mergeSiblings();\r
+ }\r
\r
- if ( lastChild && !firstChild.equals( lastChild )\r
- && lastChild.type == CKEDITOR.NODE_ELEMENT )\r
- lastChild.mergeSiblings();\r
}\r
}\r
}\r
if ( element )\r
element.copyAttributes( el );\r
\r
- return setupElement( el, style );\r
+ el = setupElement( el, style );\r
+\r
+ // Avoid ID duplication.\r
+ if ( targetDocument.getCustomData( 'doc_processing_style' ) && el.hasAttribute( 'id' ) )\r
+ el.removeAttribute( 'id' );\r
+ else\r
+ targetDocument.setCustomData( 'doc_processing_style', 1 );\r
+\r
+ return el;\r
}\r
\r
function setupElement( el, style )\r
function applyStyle( document, remove )\r
{\r
var selection = document.getSelection(),\r
- // Bookmark the range so we can re-select it after processing.\r
- bookmarks = selection.createBookmarks( 1 ),\r
ranges = selection.getRanges(),\r
func = remove ? this.removeFromRange : this.applyToRange,\r
range;\r
while ( ( range = iterator.getNextRange() ) )\r
func.call( this, range );\r
\r
- if ( bookmarks.length == 1 && bookmarks[0].collapsed )\r
- {\r
- selection.selectRanges( ranges );\r
- document.getById( bookmarks[ 0 ].startNode ).remove();\r
- }\r
- else\r
- selection.selectBookmarks( bookmarks );\r
+ selection.selectRanges( ranges );\r
+\r
+ document.removeCustomData( 'doc_processing_style' );\r
}\r
})();\r
\r