wikimedia/mediawiki-extensions-VisualEditor
1
0
Fork 0
mirror of https://gerrit.wikimedia.org/r/mediawiki/extensions/VisualEditor synced 2024-09-25 03:08:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Double spaces optimization

Browse source 
Moved the sequential space check into the whitespaceHtmlChars and htmlChars loop

Change-Id: I835cccf868fed851f25f5ccbba1386697b0ea66b
This commit is contained in:
Christian Williams 2013-01-16 15:31:51 -08:00 committed by Trevor Parscal
parent b80f2ef7dd
commit e4ef6163a0
1 changed files with 12 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
modules/ve/ce/nodes/ve.ce.TextNode.js
View file

@ -63,11 +63,11 @@ ve.ce.TextNode.whitespaceHtmlCharacters = {
* @returns {Array} Array of rendered HTML fragments with annotations
*/
ve.ce.TextNode.prototype.getAnnotatedHtml = function () {
var data = this.model.getDocument().getDataFromNode( this.model ),
var i, chr, character, nextCharacter,
data = this.model.getDocument().getDataFromNode( this.model ),
htmlChars = ve.ce.TextNode.htmlCharacters,
whitespaceHtmlChars = ve.ce.TextNode.whitespaceHtmlCharacters,
significantWhitespace = this.getModel().getParent().hasSignificantWhitespace(),
i, chr, character, nextCharacter;
significantWhitespace = this.getModel().getParent().hasSignificantWhitespace();
function setChar( chr, index, data ) {
if ( ve.isArray( data[index] ) ) {
@ -95,25 +95,19 @@ ve.ce.TextNode.prototype.getAnnotatedHtml = function () {
setChar( ' ', data.length - 1, data );
}
}
if ( data.length > 2 ) {
// Replace any sequence of 2+ spaces with an alternating pattern
// (space-nbsp-space-nbsp-...)
for ( i = 1; i < data.length - 1; i++ ) { // TODO fold into loop below
character = data[i];
nextCharacter = data[i + 1];
if (
( ve.isArray( character ) ? character[0] === ' ' : character === ' ' ) &&
( ve.isArray( nextCharacter ) ? nextCharacter[0] === ' ' : nextCharacter === ' ' )
) {
setChar( '&nbsp;', i + 1, data );
i++;
}
}
}
}
for ( i = 0; i < data.length; i++ ) {
chr = typeof data[i] === 'string' ? data[i] : data[i][0];
if ( chr === ' ' && !significantWhitespace && data.length > 2 && i !== 0 && i !== data.length - 1 ) {
// Replace any sequence of 2+ spaces with an alternating pattern
// (space-nbsp-space-nbsp-...)
nextCharacter = typeof data[i + 1] === 'string' ? data[i + 1] : data[i + 1][0];
if ( nextCharacter === ' ' ) {
setChar( '&nbsp;', i + 1, data );
}
}
if ( !significantWhitespace && chr in whitespaceHtmlChars ) {
chr = whitespaceHtmlChars[chr];
}