wikimedia/mediawiki-extensions-VisualEditor
1
0
Fork 0
mirror of https://gerrit.wikimedia.org/r/mediawiki/extensions/VisualEditor synced 2024-12-01 09:26:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "Handle uneditable nodes in ve.ce.getDomText()"

Browse source
This commit is contained in:
Trevor Parscal 2012-08-20 16:58:13 +00:00 committed by Gerrit Code Review
parent 6243511b4d 2f31681922
commit 1a57e1a361
1 changed files with 12 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
modules/ve/ce/ve.ce.js
View file

@ -26,10 +26,9 @@ ve.ce.whitespacePattern = /[\u0020\u00A0]/g;
/** /**
* Gets the plain text of a DOM element. * Gets the plain text of a DOM element.
* *
* In the returned string only the contents of text nodes are included. * In the returned string only the contents of text nodes are included, and the contents of
* * non-editable elements are excluded (but replaced with the appropriate number of characters
* TODO: The idea of using this method over jQuery's .text() was that it will not traverse into * so the offsets match up with the linear model).
* elements that are not contentEditable, however this appears to be missing.
* *
* @static * @static
* @member * @member
@ -39,14 +38,14 @@ ve.ce.whitespacePattern = /[\u0020\u00A0]/g;
ve.ce.getDomText = function ( element ) { ve.ce.getDomText = function ( element ) {
var func = function ( element ) { var func = function ( element ) {
var nodeType = element.nodeType, var nodeType = element.nodeType,
text = ''; text = '',
numChars;
if ( nodeType === 1 || nodeType === 9 || nodeType === 11 ) { if ( nodeType === 1 || nodeType === 9 || nodeType === 11 ) {
// Use textContent || innerText for elements if ( element.contentEditable === 'false' ) {
if ( typeof element.textContent === 'string' ) { // For non-editable nodes, don't return the content, but return
return element.textContent; // the right amount of characters so the offsets match up
} else if ( typeof element.innerText === 'string' ) { numChars = $( element ).data( 'node' ).getOuterLength();
// Replace IE's carriage returns return new Array( numChars + 1 ).join( '\u2603' );
return element.innerText.replace( /\r\n/g, '' );
} else { } else {
// Traverse its children // Traverse its children
for ( element = element.firstChild; element; element = element.nextSibling) { for ( element = element.firstChild; element; element = element.nextSibling) {
@ -66,9 +65,9 @@ ve.ce.getDomText = function ( element ) {
/** /**
* Gets a hash of a DOM element's structure. * Gets a hash of a DOM element's structure.
* *
* In the returned string text nodes are repesented as "#" and elements are represented as "<type>" * In the returned string text nodes are represented as "#" and elements are represented as "<type>"
* and "</type>" where "type" is their element name. This effectively generates an HTML * and "</type>" where "type" is their element name. This effectively generates an HTML
* serialization without any attributes or text contents. This can be used to observer structural * serialization without any attributes or text contents. This can be used to observe structural
* changes. * changes.
* *
* @static * @static