New features:
+.
-// var newBlockIsPre = newBlock.nodeName.IEquals( 'pre' );
-// var blockIsPre = block.nodeName.IEquals( 'pre' );
-
-// var toPre = newBlockIsPre && !blockIsPre;
-// var fromPre = !newBlockIsPre && blockIsPre;
-
- // Move everything from the current node to the new one.
-// if ( toPre )
-// newBlock = this._ToPre( doc, block, newBlock );
-// else if ( fromPre )
-// newBlock = this._FromPre( doc, block, newBlock );
-// else // Convering from a regular block to another regular block.
- block.moveChildren( newBlock );
-
- // Replace the current block.
- newBlock.insertBefore( block );
- block.remove();
-
- // Complete other tasks after inserting the node in the DOM.
-// if ( newBlockIsPre )
-// {
-// if ( previousPreBlock )
-// this._CheckAndMergePre( previousPreBlock, newBlock ) ; // Merge successive blocks.
-// previousPreBlock = newBlock;
-// }
-// else if ( fromPre )
-// this._CheckAndSplitPre( newBlock ) ; // Split
in successive s.
+ replaceBlock( block, newBlock );
}
range.moveToBookmark( bookmark );
+ }
+
+ // Replace the original block with new one, with special treatment
+ // for blocks to make sure content format is well preserved, and merging/splitting adjacent
+ // when necessary.(#3188)
+ function replaceBlock( block, newBlock )
+ {
+ var newBlockIsPre = newBlock.is( 'pre' );
+ var blockIsPre = block.is( 'pre' );
+
+ var isToPre = newBlockIsPre && !blockIsPre;
+ var isFromPre = !newBlockIsPre && blockIsPre;
+
+ if ( isToPre )
+ newBlock = toPre( block, newBlock );
+ else if ( isFromPre )
+ // Split big into pieces before start to convert.
+ newBlock = fromPres( splitIntoPres( block ), newBlock );
+ else
+ block.moveChildren( newBlock );
+
+ newBlock.replace( block );
+
+ if ( newBlockIsPre )
+ // Merge previous blocks.
+ mergePre( newBlock );
+ };
+
+ /**
+ * Merge a block with a previous sibling if available.
+ */
+ function mergePre( preBlock )
+ {
+ var previousBlock;
+ if ( !( ( previousBlock = preBlock.getPreviousSourceNode( true, CKEDITOR.NODE_ELEMENT ) )
+ && previousBlock.is
+ && previousBlock.is( 'pre') ) )
+ return;
+
+ // Merge the previous block contents into the current
+ // block.
+ //
+ // Another thing to be careful here is that currentBlock might contain
+ // a '\n' at the beginning, and previousBlock might contain a '\n'
+ // towards the end. These new lines are not normally displayed but they
+ // become visible after merging.
+ var mergedHtml = replace( previousBlock.getHtml(), /\n$/, '' ) + '\n\n' +
+ replace( preBlock.getHtml(), /^\n/, '' ) ;
+
+ // Krugle: IE normalizes innerHTML from , breaking whitespaces.
+ if ( CKEDITOR.env.ie )
+ preBlock.$.outerHTML = '' + mergedHtml + '
';
+ else
+ preBlock.setHtml( mergedHtml );
+
+ previousBlock.remove();
+ }
+
+ /**
+ * Split into multiple blocks separated by double line-break.
+ * @param preBlock
+ */
+ function splitIntoPres( preBlock )
+ {
+ // Exclude the ones at header OR at tail,
+ // and ignore bookmark content between them.
+ var duoBrRegex = /(\S\s*)\n(?:\s|(]+_fck_bookmark.*?\/span>))*\n(?!$)/gi,
+ blockName = preBlock.getName(),
+ splitedHtml = replace( preBlock.getOuterHtml(),
+ duoBrRegex,
+ function( match, charBefore, bookmark )
+ {
+ return charBefore + ' ' + bookmark + '';
+ } );
+
+ var pres = [];
+ splitedHtml.replace( /([\s\S]*?)<\/pre>/gi, function( match, preContent ){
+ pres.push( preContent );
+ } );
+ return pres;
+ }
+
+ // Wrapper function of String::replace without considering of head/tail bookmarks nodes.
+ function replace( str, regexp, replacement )
+ {
+ var headBookmark = '',
+ tailBookmark = '';
+
+ str = str.replace( /(^]+_fck_bookmark.*?\/span>)|(]+_fck_bookmark.*?\/span>$)/gi,
+ function( str, m1, m2 ){
+ m1 && ( headBookmark = m1 );
+ m2 && ( tailBookmark = m2 );
+ return '';
+ } );
+ return headBookmark + str.replace( regexp, replacement ) + tailBookmark;
+ }
+ /**
+ * Converting a list of into blocks with format well preserved.
+ */
+ function fromPres( preHtmls, newBlock )
+ {
+ var docFrag = new CKEDITOR.dom.documentFragment( newBlock.getDocument() );
+ for ( var i = 0 ; i < preHtmls.length ; i++ )
+ {
+ var blockHtml = preHtmls[ i ];
+
+ // 1. Trim the first and last line-breaks immediately after and before ,
+ // they're not visible.
+ blockHtml = blockHtml.replace( /(\r\n|\r)/g, '\n' ) ;
+ blockHtml = replace( blockHtml, /^[ \t]*\n/, '' ) ;
+ blockHtml = replace( blockHtml, /\n$/, '' ) ;
+ // 2. Convert spaces or tabs at the beginning or at the end to
+ blockHtml = replace( blockHtml, /^[ \t]+|[ \t]+$/g, function( match, offset, s )
+ {
+ if ( match.length == 1 ) // one space, preserve it
+ return ' ' ;
+ else if ( offset == 0 ) // beginning of block
+ return CKEDITOR.tools.replace( ' ', match.length - 1 ) + ' ';
+ else // end of block
+ return ' ' + CKEDITOR.tools.replace( ' ', match.length - 1 );
+ } ) ;
+
+ // 3. Convert \n to
.
+ // 4. Convert contiguous (i.e. non-singular) spaces or tabs to
+ blockHtml = blockHtml.replace( /\n/g, '
' ) ;
+ blockHtml = blockHtml.replace( /[ \t]{2,}/g,
+ function ( match )
+ {
+ return CKEDITOR.tools.replace( ' ', match.length - 1 ) + ' ' ;
+ } ) ;
+
+ var newBlockClone = newBlock.clone();
+ newBlockClone.setHtml( blockHtml );
+ docFrag.append( newBlockClone );
+ }
+ return docFrag;
+ }
+
+ /**
+ * Converting from a non-PRE block to a PRE block in formatting operations.
+ */
+ function toPre( block, newBlock )
+ {
+ // First trim the block content.
+ var preHtml = block.getHtml();
+
+ // 1. Trim head/tail spaces, they're not visible.
+ preHtml = replace( preHtml, /(?:^[ \t\n\r]+)|(?:[ \t\n\r]+$)/g, '' );
+ // 2. Delete ANSI whitespaces immediately before and after
because
+ // they are not visible.
+ preHtml = preHtml.replace( /[ \t\r\n]*(]*>)[ \t\r\n]*/gi, '$1' );
+ // 3. Compress other ANSI whitespaces since they're only visible as one
+ // single space previously.
+ // 4. Convert to spaces since is no longer needed in .
+ preHtml = preHtml.replace( /([ \t\n\r]+| )/g, ' ' );
+ // 5. Convert any
to \n. This must not be done earlier because
+ // the \n would then get compressed.
+ preHtml = preHtml.replace( /]*>/gi, '\n' );
+
+ // Krugle: IE normalizes innerHTML to , breaking whitespaces.
+ if ( CKEDITOR.env.ie )
+ {
+ var temp = block.getDocument().createElement( 'div' );
+ temp.append( newBlock );
+ newBlock.$.outerHTML = '' + preHtml + '
';
+ newBlock = temp.getFirst().remove();
+ }
+ else
+ newBlock.setHtml( preHtml );
+
+ return newBlock;
}
Index: /CKEditor/trunk/_source/tests/core/tools.html
===================================================================
--- /CKEditor/trunk/_source/tests/core/tools.html (revision 3888)
+++ /CKEditor/trunk/_source/tests/core/tools.html (revision 3889)
@@ -155,4 +155,9 @@
},
+ test_multiple : function()
+ {
+ assert.areSame( ' ', CKEDITOR.tools.replace( ' ', 3 ) );
+ },
+
name : document.title
};
Index: /CKEditor/trunk/_source/tests/plugins/styles/styles.html
===================================================================
--- /CKEditor/trunk/_source/tests/plugins/styles/styles.html (revision 3888)
+++ /CKEditor/trunk/_source/tests/plugins/styles/styles.html (revision 3889)
@@ -8,5 +8,5 @@
@@ -21,4 +21,11 @@
var assert = CKEDITOR.test.assert;
var getInnerHtml = CKEDITOR.test.getInnerHtml;
+
+ function getInnerHtmlParsed( element )
+ {
+ var dataProcessor = new CKEDITOR.htmlDataProcessor();
+ dataProcessor.writer = new CKEDITOR.htmlParser.basicWriter();
+ return dataProcessor.toDataFormat( getInnerHtml( element, false ) );
+ }
var doc = new CKEDITOR.dom.document( document );
@@ -538,8 +545,43 @@
assert.areSame( 'text styles ', getInnerHtml( element ) );
},
+
+ // Test convert multiple paragraphs to one .
+ test_ticket_3188 : function()
+ {
+ var element = doc.getById( '_P1' );
+ element.setHtml( '\nparagraph1
para\t\ngraph2
\nparagraph3\n
' );
+
+ // [paragraph1
paragraph2]
+ var range = new CKEDITOR.dom.range( doc );
+ range.setStartAt( doc.getById( '_P2' ), CKEDITOR.POSITION_AFTER_START );
+ range.setEndAt( doc.getById( '_P3' ), CKEDITOR.POSITION_BEFORE_END );
+
+ var style = new CKEDITOR.style( { element : 'pre' } );
+ style.applyToRange( range );
+
+ var result = getInnerHtmlParsed( element );
+ assert.areSame( 'paragraph1\n\npara graph2\n\nparagraph3
', result );
+ },
+
+ // Test convert one to multiple paragraphs.
+ test_ticket_3188_2 : function()
+ {
+ var element = doc.getById( '_P1' );
+ element.setHtml( '\n\tparagraph1\t\tparagraph1\nparagraph2\n\t\n\tpara graph3\n
' );
+
+ //[\n\tparagraph1\t\tparagraph1\nparagraph2\n\t\n\tpara graph3\n]
+ var range = new CKEDITOR.dom.range( doc );
+ range.selectNodeContents( doc.getById( '_P1' ).getFirst() );
+ var style = new CKEDITOR.style( { element : 'p' } );
+ style.applyToRange( range );
+
+ var result = getInnerHtmlParsed( element );
+ assert.areSame( ' paragraph1 paragraph1
paragraph2
para graph3
',
+ result );
+ },
name : document.title
};
})() );
-//window.onload = testCase.test_ticket_3309_3;
+//window.onload = testCase.test_ticket_3188;
//]]>