// Clean up any remaining tags\r
X_HTMLParser_parseEndTag( stack, handler );\r
\r
- async && handler.complete();\r
+ async && handler.asyncComplete();\r
};\r
\r
function X_HTMLParser__parseStartTag( stack, last, handler, html ){\r
empty = empty || X_Dom_DTD_EMPTY[ tagUpper ];\r
!empty && ( stack[ stack.length ] = handler.isXML ? tagName : tagUpper );\r
\r
- if( handler.start( handler.isXML ? tagName : tagUpper, attrs, empty, i ) === false ) return false;\r
+ if( handler.tagStart( handler.isXML ? tagName : tagUpper, attrs, empty, i ) === false ) return false;\r
\r
return i;\r
};\r
name = name.toLowerCase();\r
value = X_Node_Attr_noValue[ name ] === 1 ? name : value;\r
attrs[ attrs.length ] = {\r
- name : name,\r
- value : value,\r
- escaped :\r
+ attName : name,\r
+ // attrValue : value,\r
+ escaped :\r
value.indexOf( '"' ) !== -1 ?\r
value.split( '"' ).join( '\\"' ).split( '\\\\"' ).join( '\\"' ) :\r
value\r
if ( 0 <= pos ) {\r
// Close all the open elements, up the stack\r
for ( ; pos < i; )\r
- handler.end( stack[ --i ] );\r
+ handler.tagEnd( stack[ --i ] );\r
\r
// Remove the open elements from the stack\r
stack.length = pos;\r
X_HTMLParser_htmlStringToXNode.flat.length = 0;\r
!X_HTMLParser_htmlStringToXNode.ignoreError && X.Logger.warn( 'X_Dom_Parser() error ' + html );\r
},\r
- start : function( tagName, attrs, noChild, length ){\r
+ tagStart : function( tagName, attrs, noChild, length ){\r
var xnode,\r
nest = X_HTMLParser_htmlStringToXNode.nest,\r
flat = X_HTMLParser_htmlStringToXNode.flat,\r
name = attr;\r
_attrs[ name ] = true;\r
} else {\r
- name = attr.name;\r
+ name = attr.attName;\r
_attrs[ name ] = attr.escaped;\r
};\r
};\r
xnode[ 'attr' ]( _attrs );\r
};\r
},\r
- end : function(){\r
+ tagEnd : function(){\r
0 < X_HTMLParser_htmlStringToXNode.nest.length && ( --X_HTMLParser_htmlStringToXNode.nest.length );\r
},\r
chars : function( text ){\r
X_HTMLParser_htmlStringToXNode.err( html );\r
this[ 'asyncDispatch' ]( X_EVENT_ERROR );\r
},\r
- start : X_HTMLParser_htmlStringToXNode.start,\r
- end : X_HTMLParser_htmlStringToXNode.end,\r
- chars : X_HTMLParser_htmlStringToXNode.chars,\r
- comment : X_emptyFunction,\r
+ tagStart : X_HTMLParser_htmlStringToXNode.tagStart,\r
+ tagEnd : X_HTMLParser_htmlStringToXNode.tagEnd,\r
+ chars : X_HTMLParser_htmlStringToXNode.chars,\r
+ comment : X_emptyFunction,\r
\r
progress : function( pct ){\r
this[ 'asyncDispatch' ]( { type : X_EVENT_PROGRESS, percent : pct } );\r
},\r
- complete : function(){\r
+ asyncComplete : function(){\r
var ret = X_HTMLParser_htmlStringToXNode.flat;\r
delete X_HTMLParser_htmlStringToXNode.flat;\r
this[ 'asyncDispatch' ]( { type : X_EVENT_SUCCESS, xnodes : ret } );\r