*\r
*/\r
\r
-X_Dom_Parser = {\r
+var X_Dom_Parser = { // HTMLParser\r
CHARS : {\r
A:1,B:1,C:1,D:1,E:1,F:1,G:1,H:1,I:1,J:1,K:1,L:1,M:1,N:1,O:1,P:1,Q:1,R:1,S:1,T:1,U:1,V:1,W:1,X:1,Y:1,Z:1,\r
a:2,b:2,c:2,d:2,e:2,f:2,g:2,h:2,i:2,j:2,k:2,l:2,m:2,n:2,o:2,p:2,q:2,r:2,s:2,t:2,u:2,v:2,w:2,x:2,y:2,z:2,\r
- '0' : 4, '1' : 4, '2' : 4, '3' : 4, '4' : 4, '5' : 4, '6' : 4, '7' : 4, '8' : 4, '9' : 4,\r
+ // "0" : 4, "1" : 4, "2" : 4, "3" : 4, "4" : 4, "5" : 4, "6" : 4, "7" : 4, "8" : 4, "9" : 4, closure compiler で minify すると ie4 で error、eval使う\r
\r
'\t' : 16, '\r\n' : 16, '\r' : 16, '\n' : 16, '\f' : 16, '\b' : 16, ' ' : 16\r
},\r
whiteSpace : '\t\r\n\f\b ',\r
\r
// Empty Elements - HTML 4.01\r
- empty : X.Dom.DTD.EMPTY,\r
+ empty : X_Dom_DTD_EMPTY,\r
\r
// Block Elements - HTML 4.01\r
block : {ADDRESS:1,APPLET:1,BLOCKQUOTE:1,BUTTON:1,CENTER:1,DD:1,DEL:1,DIR:1,DIV:1,DL:1,DT:1,FIELDSET:1,FORM:1,FRAMESET:1,HR:1,IFRAME:1,INS:1,\r
*/\r
\r
// Attributes that have their values filled in disabled="disabled"\r
- fillAttrs : X.Dom.Attr.noValue, //{checked:1,compact:1,declare:1,defer:1,disabled:1,ismap:1,multiple:1,nohref:1,noresize:1,noshade:1,nowrap:1,readonly:1,selected:1};\r
+ fillAttrs : X_Node_Attr.noValue, //{checked:1,compact:1,declare:1,defer:1,disabled:1,ismap:1,multiple:1,nohref:1,noresize:1,noshade:1,nowrap:1,readonly:1,selected:1};\r
\r
// Special Elements (can contain anything)\r
special : { SCRIPT : 1, STYLE : 1, PLAINTEXT : 1, XMP : 1, TEXTAREA : 1 },\r
exec : function( html, handler, async ){\r
var special = X_Dom_Parser.special,\r
//plainText = X_Dom_Parser.plainText,\r
- startTime = async && X.getTime(),\r
+ startTime = async && X_Timer_now(),\r
_parseStartTag = X_Dom_Parser._parseStartTag,\r
_parseEndTag = X_Dom_Parser._parseEndTag,\r
stack = async ? async[ 1 ] : [],\r
return;\r
};\r
\r
- if( async && startTime + 15 <= X.getTime() && html ){\r
+ if( async && startTime + 15 <= X_Timer_now() && html ){\r
handler.progress( 1 - html.length / async[ 0 ] );\r
X.Timer.once( 0, X_Dom_Parser.exec, [ html, handler, async ] );\r
return;\r
var alphabets = X_Dom_Parser.CHARS,\r
whiteSpace = X_Dom_Parser.CHARS,\r
saveAttr = X_Dom_Parser.saveAttr,\r
- uri = X.Dom.DTD.ATTR_VAL_IS_URI,\r
+ uri = X_Dom_DTD_ATTR_VAL_IS_URI,\r
phase = 0,\r
l = html.length,\r
i = 0,\r
};\r
},\r
\r
- parseStartTag : function( stack, last, handler, tagName, attrs, unary, index ) {\r
+ parseStartTag : function( stack, last, handler, tagName, attrs, empty, index ) {\r
var inline = X_Dom_Parser.inline,\r
parseEndTag = X_Dom_Parser.parseEndTag,\r
sisters = X_Dom_Parser.sisters;\r
};\r
};\r
last && X_Dom_Parser.closeSelf[ tagName ] === 1 && ( last === tagName || ( sisters[ tagName ] && sisters[ tagName ][ last ] === 1 ) ) && parseEndTag( stack, handler, last );\r
- unary = unary || X_Dom_Parser.empty[ tagName ];\r
- !unary && ( stack[ stack.length ] = tagName );\r
+ empty = empty || X_Dom_Parser.empty[ tagName ];\r
+ !empty && ( stack[ stack.length ] = tagName );\r
\r
- return handler.start( tagName, attrs, unary, index );\r
+ return handler.start( tagName, attrs, empty, index );\r
},\r
\r
parseEndTag : function( stack, handler, tagName ) {\r
\r
};\r
\r
-X.Dom._htmlStringToXNode = {\r
+var X_HTMLParser_htmlStringToXNode = {\r
flat : null,\r
nest : [],\r
err : function( html ){\r
- X.Dom._htmlStringToXNode.flat.length = 0;\r
- X.Dom._htmlStringToXNode.ignoreError !== true && X.Logger.warn( 'X_Dom_Parser() error ' + html );\r
+ X_HTMLParser_htmlStringToXNode.flat.length = 0;\r
+ X_HTMLParser_htmlStringToXNode.ignoreError !== true && X.Logger.warn( 'X_Dom_Parser() error ' + html );\r
},\r
start : function( tagName, attrs, noChild, length ){\r
var xnode,\r
- nest = X.Dom._htmlStringToXNode.nest,\r
- flat = X.Dom._htmlStringToXNode.flat,\r
+ nest = X_HTMLParser_htmlStringToXNode.nest,\r
+ flat = X_HTMLParser_htmlStringToXNode.flat,\r
l = nest.length,\r
attr, name, i, _attrs; //, toIndex;\r
if( l ){\r
_attrs = {};\r
for( ; i; ){\r
if( attr = attrs[ --i ] ){\r
- if( typeof attr === 'string' ){\r
+ if( X.Type.isString( attr ) ){\r
name = attr;\r
_attrs[ name ] = true;\r
} else {\r
};\r
},\r
end : function(){\r
- 0 < X.Dom._htmlStringToXNode.nest.length && ( --X.Dom._htmlStringToXNode.nest.length );\r
+ 0 < X_HTMLParser_htmlStringToXNode.nest.length && ( --X_HTMLParser_htmlStringToXNode.nest.length );\r
},\r
chars : function( text ){\r
- if( X.Dom._htmlStringToXNode.nest.length ){\r
- X.Dom._htmlStringToXNode.nest[ X.Dom._htmlStringToXNode.nest.length - 1 ].createText( text );\r
+ if( X_HTMLParser_htmlStringToXNode.nest.length ){\r
+ X_HTMLParser_htmlStringToXNode.nest[ X_HTMLParser_htmlStringToXNode.nest.length - 1 ].createText( text );\r
} else {\r
- X.Dom._htmlStringToXNode.flat[ X.Dom._htmlStringToXNode.flat.length ] = X.Dom.Node.createText( text );\r
+ X_HTMLParser_htmlStringToXNode.flat[ X_HTMLParser_htmlStringToXNode.flat.length ] = X.Dom.Node.createText( text );\r
};\r
},\r
comment : X.emptyFunction\r
};\r
\r
-X.Dom.parse = function( html, ignoreError ){\r
- var worker = X.Dom._htmlStringToXNode, ret;\r
+function X_HtmlParser_parse( html, ignoreError ){\r
+ var worker = X_HTMLParser_htmlStringToXNode, ret;\r
worker.flat = [];\r
worker.nest.length = 0;\r
worker.ignoreError = ignoreError;\r
return ret;\r
};\r
\r
-X.Dom._asyncHtmlStringToXNode = {\r
+var X_HTMLParser_asyncHtmlStringToXNode = {\r
err : function( html ){\r
- X.Dom._htmlStringToXNode.err( html );\r
- this.asyncDispatch( 0, { type : X.Event.ERROR } );\r
+ X_HTMLParser_htmlStringToXNode.err( html );\r
+ this.asyncDispatch( X.Event.ERROR );\r
},\r
- start : X.Dom._htmlStringToXNode.start,\r
- end : X.Dom._htmlStringToXNode.end,\r
- chars : X.Dom._htmlStringToXNode.chars,\r
+ start : X_HTMLParser_htmlStringToXNode.start,\r
+ end : X_HTMLParser_htmlStringToXNode.end,\r
+ chars : X_HTMLParser_htmlStringToXNode.chars,\r
comment : X.emptyFunction,\r
\r
progress : function( pct ){\r
- this.asyncDispatch( 0, { type : X.Event.PROGRESS, percent : pct } );\r
+ this.asyncDispatch( { type : X.Event.PROGRESS, percent : pct } );\r
},\r
complete : function(){\r
- var ret = X.Dom._htmlStringToXNode.flat;\r
- delete X.Dom._htmlStringToXNode.flat;\r
- this.asyncDispatch( 0, { type : X.Event.SUCCESS, xnodes : ret } );\r
+ var ret = X_HTMLParser_htmlStringToXNode.flat;\r
+ delete X_HTMLParser_htmlStringToXNode.flat;\r
+ this.asyncDispatch( { type : X.Event.SUCCESS, xnodes : ret } );\r
}\r
};\r
\r
-X.Dom.asyncParse = function( html, ignoreError ){\r
- var dispatcher = X.Class._override( new X.EventDispatcher(), X.Dom._asyncHtmlStringToXNode ),\r
- worker = X.Dom._htmlStringToXNode;\r
+function X_HTMLParser_asyncParse( html, ignoreError ){\r
+ var dispatcher = X.Class._override( new X.EventDispatcher(), X_HTMLParser_asyncHtmlStringToXNode ),\r
+ worker = X_HTMLParser_htmlStringToXNode;\r
dispatcher.listenOnce( X.Event.SUCCESS, dispatcher, dispatcher.kill );\r
worker.flat = [];\r
worker.nest.length = 0;\r
OSDN Git Service
