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

Merge "Rename getDataFromDom to getDataFromDomSubtree"

Browse source
This commit is contained in:
jenkins-bot 2013-12-12 17:37:04 +00:00 committed by Gerrit Code Review
parent 4c98f753a0 1e83bd03b3
commit 67bd5488da
3 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
modules/ve/dm/ve.dm.Converter.js
View file

@ -258,7 +258,7 @@ ve.dm.Converter.prototype.getHtmlDocument = function () {
};
/**
* Get the current conversion context. This is the recursion state of getDataFromDom().
* Get the current conversion context. This is the recursion state of getDataFromDomSubtree().
*
* @method
* @returns {Object|null} Context object, or null if not converting
@ -400,7 +400,7 @@ ve.dm.Converter.prototype.getModelFromDom = function ( doc ) {
// Generate data
linearData = new ve.dm.FlatLinearData(
store,
this.getDataFromDom( doc.body )
this.getDataFromDomSubtree( doc.body )
);
refData = this.internalList.convertToData( this, doc );
linearData.batchSplice( linearData.getLength(), 0, refData );
@ -430,7 +430,7 @@ ve.dm.Converter.prototype.getModelFromDom = function ( doc ) {
ve.dm.Converter.prototype.getDataFromDomClean = function ( domElement, wrapperElement, annotationSet ) {
var result, contextStack = this.contextStack;
this.contextStack = [];
result = this.getDataFromDom( domElement, wrapperElement, annotationSet );
result = this.getDataFromDomSubtree( domElement, wrapperElement, annotationSet );
this.contextStack = contextStack;
return result;
};
@ -445,7 +445,7 @@ ve.dm.Converter.prototype.getDataFromDomClean = function ( domElement, wrapperEl
* @param {ve.dm.AnnotationSet} [annotationSet] Override the set of annotations to use
* @returns {Array} Linear model data
*/
ve.dm.Converter.prototype.getDataFromDom = function ( domElement, wrapperElement, annotationSet ) {
ve.dm.Converter.prototype.getDataFromDomSubtree = function ( domElement, wrapperElement, annotationSet ) {
/**
* Add whitespace to an element at a specific offset.
*
@ -654,7 +654,7 @@ ve.dm.Converter.prototype.getDataFromDom = function ( domElement, wrapperElement
childAnnotations = context.annotations.clone();
childAnnotations.push( annotation );
childDataElements = this.getDataFromDom( childDomElement, undefined, childAnnotations );
childDataElements = this.getDataFromDomSubtree( childDomElement, undefined, childAnnotations );
if ( !childDataElements.length || isAllInstanceOf( childDataElements, ve.dm.AlienMetaItem ) ) {
// Empty annotation, create a meta item
childDataElements = this.createDataElements( ve.dm.AlienMetaItem, childDomElements );
@ -754,7 +754,7 @@ ve.dm.Converter.prototype.getDataFromDom = function ( domElement, wrapperElement
// Opening and closing elements are added by the recursion too
outputWrappedMetaItems( 'restore' );
data = data.concat(
this.getDataFromDom( childDomElement, childDataElements[0],
this.getDataFromDomSubtree( childDomElement, childDataElements[0],
new ve.dm.AnnotationSet( this.store )
)
);

2
modules/ve/dm/ve.dm.InternalList.js
View file

@ -218,7 +218,7 @@ ve.dm.InternalList.prototype.convertToData = function ( converter, doc ) {
list.push( { 'type': 'internalList' } );
for ( i = 0, length = itemHtmlQueue.length; i < length; i++ ) {
if ( itemHtmlQueue[i] !== '' ) {
itemData = converter.getDataFromDom( $( '<div>', doc ).html( itemHtmlQueue[i] )[0] );
itemData = converter.getDataFromDomSubtree( $( '<div>', doc ).html( itemHtmlQueue[i] )[0] );
list = list.concat(
[{ 'type': 'internalItem' }],
itemData,

2
modules/ve/dm/ve.dm.Model.js
View file

@ -117,7 +117,7 @@ ve.dm.Model.static.matchFunction = null;
*
* This function may return a single linear model element, or an array of balanced linear model
* data. If this function needs to recursively convert a DOM node (e.g. a child of one of the
* DOM elements passed in), it can call converter.getDataFromDom( domElement ). Note that
* DOM elements passed in), it can call converter.getDataFromDomSubtree( domElement ). Note that
* if an array is returned, the converter will not descend into the DOM node's children; the model
* will be assumed to have handled those children.
*