X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;f=0.6.x%2Fjs%2F02_dom%2F09_XHTMLParser.js;h=27f2164c5d295b88838a8291db849b543554853d;hb=a720658bd6302a1bd5efae47333b6df793370f3d;hp=2aff37d86accb13b530b4bcf9cb9e92aebc5f33a;hpb=a130cabd01fde8865990a59d849f5d5d08ed2119;p=pettanr%2FclientJs.git

diff --git a/0.6.x/js/02_dom/09_XHTMLParser.js b/0.6.x/js/02_dom/09_XHTMLParser.js
index 2aff37d..27f2164 100644
--- a/0.6.x/js/02_dom/09_XHTMLParser.js
+++ b/0.6.x/js/02_dom/09_XHTMLParser.js
@@ -6,37 +6,35 @@
  */
 
 var X_HTMLParser_CHARS = {
-		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,
-		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,
-		// "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使う
+		'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,
+		'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,
+		'!':1,// "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使う
 		
 		'\t' : 16, '\r\n' : 16, '\r' : 16, '\n' : 16, '\f' : 16, '\b' : 16, ' ' : 16
 	},
-	X_HTMLParser_alphabets  = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz',
-	X_HTMLParser_whiteSpace = '\t\r\n\f\b ',
 
 	// Empty Elements - HTML 4.01
-	X_HTMLParser_empty = X_Dom_DTD_EMPTY,
+	// X_Dom_DTD_EMPTY
 
 	// Block Elements - HTML 4.01
-	X_HTMLParser_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,
-		ISINDEX:1,LI:1,MAP:1,MENU:1,NOFRAMES:1,NOSCRIPT:1,OBJECT:1,OL:1,P:1,PRE:1,SCRIPT:1,TABLE:1,TBODY:1,TD:1,TFOOT:1,TH:1,THEAD:1,TR:1,UL:1 },
+	X_HTMLParser_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,
+		'ISINDEX':1,'LI':1,'MAP':1,'MENU':1,'NOFRAMES':1,'NOSCRIPT':1,'OBJECT':1,'OL':1,'P':1,'PRE':1,'SCRIPT':1,'TABLE':1,'TBODY':1,'TD':1,'TFOOT':1,'TH':1,'THEAD':1,'TR':1,'UL':1 },
 	// Inline Elements - HTML 4.01
-	X_HTMLParser_inline = {A:1,ABBR:1,ACRONYM:1,APPLET:1,B:1,BASEFONT:1,BDO:1,BIG:1,BR:1,BUTTON:1,CITE:1,CODE:1,DEL:1,DFN:1,EM:1,FONT:1,I:1,IFRAME:1,IMG:1,
-		INPUT:1,INS:1,KBD:1,LABEL:1,MAP:1,OBJECT:1,Q:1,S:1,SAMP:1,SCRIPT:1,SELECT:1,SMALL:1,SPAN:1,STRIKE:1,STRONG:1,SUB:1,SUP:1,TEXTAREA:1,TT:1,U:1,VAR:1},
-	// Elements that you can, intentionally, leave open
+	X_HTMLParser_inline = {/*'A':1,*/'ABBR':1,'ACRONYM':1,'APPLET':1,'B':1,'BASEFONT':1,'BDO':1,'BIG':1,'BR':1,'BUTTON':1,'CITE':1,'CODE':1,'DEL':1,'DFN':1,'EM':1,'FONT':1,'I':1,'IFRAME':1,'IMG':1,
+		'INPUT':1,'INS':1,'KBD':1,'LABEL':1,'MAP':1,'OBJECT':1,'Q':1,'S':1,'SAMP':1,'SCRIPT':1,'SELECT':1,'SMALL':1,'SPAN':1,'STRIKE':1,'STRONG':1,'SUB':1,'SUP':1,'TEXTAREA':1,'TT':1,'U':1,'VAR':1},
+	// Elements that you can,' intentionally,' leave open
 	// (and which close themselves)
-	X_HTMLParser_closeSelf = {OLGROUP:1,DD:1,DT:1,LI:1,OPTIONS:1,P:1,TBODY:1,TD:1,TFOOT:1,TH:1,THEAD:1,TR:1}, // add tbody
+	X_HTMLParser_closeSelf = {'OLGROUP':1,'DD':1,'DT':1,'LI':1,'OPTIONS':1,'P':1,'TBODY':1,'TD':1,'TFOOT':1,'TH':1,'THEAD':1,'TR':1}, // add tbody
 
 	X_HTMLParser_sisters = {
-		TH : { TD : 1 },
-		TD : { TH : 1 },
-		DT : { DD : 1 },
-		DD : { DT : 1 },
-		COLGROUP : { CAPTION : 1 },
-		THEAD    : { CAPTION : 1, COLGROUP : 1 },
-		TFOOT    : { CAPTION : 1, COLGROUP : 1, THEAD : 1, TBODY : 1 },
-		TBODY    : { CAPTION : 1, COLGROUP : 1, THEAD : 1, TFOOT : 1 }
+		'TH' : { 'TD' : 1 },
+		'TD' : { 'TH' : 1 },
+		'DT' : { 'DD' : 1 },
+		'DD' : { 'DT' : 1 },
+		'COLGROUP' : { 'CAPTION' : 1 },
+		'THEAD'    : { 'CAPTION' : 1, 'COLGROUP' : 1 },
+		'TFOOT'    : { 'CAPTION' : 1, 'COLGROUP' : 1, 'THEAD' : 1, 'TBODY' : 1 },
+		'TBODY'    : { 'CAPTION' : 1, 'COLGROUP' : 1, 'THEAD' : 1, 'TFOOT' : 1 }
 	},
 	/*
 	 * http://www.tohoho-web.com/html/tbody.htm
@@ -47,10 +45,9 @@ var X_HTMLParser_CHARS = {
 	 */
 
 	// Attributes that have their values filled in disabled="disabled"
-	X_HTMLParser_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};
 
 	// Special Elements (can contain anything)
-	X_HTMLParser_special = { SCRIPT : 1, STYLE : 1, PLAINTEXT : 1, XMP : 1, TEXTAREA : 1 },
+	X_HTMLParser_special = { 'SCRIPT' : 1, 'STYLE' : 1, 'PLAINTEXT' : 1, 'XMP' : 1, 'TEXTAREA' : 1 },
 	
 	X_HTMLParser_skipFixNesting = false;
 	
@@ -58,8 +55,6 @@ var X_HTMLParser_CHARS = {
 		var special        = X_HTMLParser_special,
 			//plainText      = X_HTMLParser_plainText,
 			startTime      = async && X_Timer_now(),
-			_parseStartTag = X_HTMLParser__parseStartTag,
-			_parseEndTag   = X_HTMLParser__parseEndTag,
 			stack          = async ? async[ 1 ] : [],
 			lastHtml       = html,
 			chars, last, text, index;
@@ -69,10 +64,10 @@ var X_HTMLParser_CHARS = {
 			last  = stack[ stack.length - 1 ];
 			
 			// Make sure we're not in a script or style element
-			if ( last && special[ last ] === 1 ) {
-				if( 0 <= ( index = html.toUpperCase().indexOf( '</' + last ) ) ){
+			if ( last && special[ handler.isXML ? last.toUpperCase() : last ] === 1 ) {
+				if( 0 <= ( index = html.toUpperCase().indexOf( '</' + ( handler.isXML ? last.toUpperCase() : last ) ) ) ){
 					handler.chars( html.substring( 0, index ) );
-					if( index = _parseEndTag( stack, handler, html ) ){
+					if( index = X_HTMLParser__parseEndTag( stack, handler, html ) ){
 						html = html.substring( index );
 					} else {
 						handler.chars( html );
@@ -93,14 +88,14 @@ var X_HTMLParser_CHARS = {
 	
 				// end tag
 				} else if ( html.indexOf("</") === 0 ) {
-					if ( 2 < ( index = _parseEndTag( stack, handler, html ) ) ) {
+					if ( 2 < ( index = X_HTMLParser__parseEndTag( stack, handler, html ) ) ) {
 						html = html.substring( index );
 						chars = false;
 					};
 	
 				// start tag
 				} else if ( html.indexOf("<") === 0 ) {
-					if( index = _parseStartTag( stack, last, handler, html ) ){
+					if( index = X_HTMLParser__parseStartTag( stack, last, handler, html ) ){
 						html  = html.substring( index );
 						chars = false;
 					} else
@@ -125,9 +120,9 @@ var X_HTMLParser_CHARS = {
 				return;
 			};
 			
-			if( async && startTime + 15 <= X_Timer_now() && html ){
+			if( async && startTime + X_Timer_INTERVAL_TIME <= X_Timer_now() && html ){
 				handler.progress( 1 - html.length / async[ 0 ] );
-				X.Timer.once( 0, X_HTMLParser_exec, [ html, handler, async ] );
+				X_Timer_once( 0, X_HTMLParser_exec, [ html, handler, async ] );
 				return;
 			};
 			
@@ -137,7 +132,7 @@ var X_HTMLParser_CHARS = {
 		// Clean up any remaining tags
 		X_HTMLParser_parseEndTag( stack, handler );
 		
-		async && handler.complete();
+		async && handler.asyncComplete();
 	};
 
 	function X_HTMLParser__parseStartTag( stack, last, handler, html ){
@@ -150,7 +145,7 @@ var X_HTMLParser_CHARS = {
 			i     = 0,
 			attrs = [],
 			tagName, empty = false,
-			chr, start, attrName, quot, escape;
+			chr, start, attrName, quot, escape, tagUpper;
 		
 		while( i < l && phase < 9 ){
 			chr = html.charAt( i );
@@ -180,8 +175,8 @@ var X_HTMLParser_CHARS = {
 						( ( phase = 5 ) && ( attrName = html.substring( start, i ) ) );
 					break;
 				case 5 : // 属性の = または次の属性または htmlタグの閉じ
-					( whiteSpace[ chr ] & 16 ) ?// ie4 未対応の属性には cite = http:// となる
-						1 :
+					!( whiteSpace[ chr ] & 16 ) &&// ie4 未対応の属性には cite = http:// となる
+					//	1 :
 					( alphabets[ chr ] & 3 ) ?
 						( ( phase = 4 ) && ( attrs[ attrs.length ] = attrName ) && ( start = i ) ) :
 					chr === '=' ?
@@ -212,7 +207,24 @@ var X_HTMLParser_CHARS = {
 		};
 		if( phase === 9 ){
 			if( empty ) ++i;
-			if( X_HTMLParser_parseStartTag( stack, last, handler, tagName.toUpperCase(), attrs, empty, i ) === false ) return false;
+			//if( X_HTMLParser_parseStartTag( stack, last, handler, tagName, attrs, empty, i ) === false ) return false;
+			
+			tagUpper = tagName.toUpperCase();
+			
+			if( !X_HTMLParser_skipFixNesting && X_HTMLParser_block[ tagUpper ] === 1 ){
+				while( last && X_HTMLParser_inline[ handler.isXML ? last.toUpperCase() : last ] === 1 ){
+					X_HTMLParser_parseEndTag( stack, handler, last );
+					last = stack[ stack.length - 1 ];
+				};
+			};
+			last && X_HTMLParser_closeSelf[ tagUpper ] === 1 &&
+				( last === tagName || ( X_HTMLParser_sisters[ tagUpper ] && X_HTMLParser_sisters[ tagUpper ][ handler.isXML ? last.toUpperCase() : last ] === 1 ) ) &&
+					X_HTMLParser_parseEndTag( stack, handler, last );
+			empty = empty || X_Dom_DTD_EMPTY[ tagUpper ];
+			!empty && ( stack[ stack.length ] = handler.isXML ? tagName : tagUpper );
+			
+			if( handler.tagStart( handler.isXML ? tagName : tagUpper, attrs, empty, i ) === false ) return false;
+			
 			return i;
 		};
 		return 0; // error
@@ -248,7 +260,7 @@ var X_HTMLParser_CHARS = {
 			++i;
 		};
 		if( phase === 9 ){
-			X_HTMLParser_parseEndTag( stack, handler, tagName.toUpperCase() );
+			X_HTMLParser_parseEndTag( stack, handler, handler.isXML ? tagName : tagName.toUpperCase() );
 			return i;
 		};
 		return 0; // error
@@ -256,34 +268,17 @@ var X_HTMLParser_CHARS = {
 
 	function X_HTMLParser_saveAttr( attrs, name, value ){
 		name  = name.toLowerCase();
-		value = X_HTMLParser_fillAttrs[ name ] === 1 ? name : value;
+		value = X_Node_Attr_noValue[ name ] === 1 ? name : value;
 		attrs[ attrs.length ] = {
-			name    : name,
-			value   : value,
-			escaped :
+			attName   : name,
+			// attrValue : value,
+			escaped   :
 				value.indexOf( '"' ) !== -1 ?
 					value.split( '"' ).join( '\\"' ).split( '\\\\"' ).join( '\\"' ) :
 					value
 		};
 	};
 
-	function X_HTMLParser_parseStartTag( stack, last, handler, tagName, attrs, empty, index ) {
-		var inline   = X_HTMLParser_inline,
-			parseEndTag = X_HTMLParser_parseEndTag,
-			sisters  = X_HTMLParser_sisters;
-		if( !X_HTMLParser_skipFixNesting && X_HTMLParser_block[ tagName ] === 1 ){
-			while( last && inline[ last ] === 1 ){
-				parseEndTag( stack, handler, last );
-				last = stack[ stack.length - 1 ];
-			};
-		};
-		last && X_HTMLParser_closeSelf[ tagName ] === 1 && ( last === tagName || ( sisters[ tagName ] && sisters[ tagName ][ last ] === 1 ) ) && parseEndTag( stack, handler, last );
-		empty = empty || X_HTMLParser_empty[ tagName ];
-		!empty && ( stack[ stack.length ] = tagName );
-		
-		return handler.start( tagName, attrs, empty, index );
-	};
-
 	function X_HTMLParser_parseEndTag( stack, handler, tagName ) {
 		var pos = 0, i = stack.length;
 		// If no tag name is provided, clean shop
@@ -297,7 +292,7 @@ var X_HTMLParser_CHARS = {
 		if ( 0 <= pos ) {
 			// Close all the open elements, up the stack
 			for ( ; pos < i; )
-				handler.end( stack[ --i ] );
+				handler.tagEnd( stack[ --i ] );
 			
 			// Remove the open elements from the stack
 			stack.length = pos;
@@ -307,18 +302,19 @@ var X_HTMLParser_CHARS = {
 var X_HTMLParser_htmlStringToXNode = {
 	flat : null,
 	nest : [],
+	isXML : false,
 	err : function( html ){
 		X_HTMLParser_htmlStringToXNode.flat.length = 0;
 		!X_HTMLParser_htmlStringToXNode.ignoreError && X.Logger.warn( 'X_Dom_Parser() error ' + html );
 	},
-	start : function( tagName, attrs, noChild, length ){
+	tagStart : function( tagName, attrs, noChild, length ){
 		var xnode,
 			nest   = X_HTMLParser_htmlStringToXNode.nest,
 			flat   = X_HTMLParser_htmlStringToXNode.flat,
 			l      = nest.length,
 			attr, name, i, _attrs; //, toIndex;
 		if( l ){
-			xnode = nest[ l - 1 ].create( tagName );
+			xnode = nest[ l - 1 ][ 'create' ]( tagName );
 		} else {
 			xnode = flat[ flat.length ] = X_Doc_create( tagName );
 		};
@@ -331,25 +327,25 @@ var X_HTMLParser_htmlStringToXNode = {
 						name = attr;
 						_attrs[ name ] = true;
 					} else {
-						name = attr.name;
+						name = attr.attName;
 						_attrs[ name ] = attr.escaped;
 					};
 				};
 			};
-			xnode.attr( _attrs );
+			xnode[ 'attr' ]( _attrs );
 		};
 	},
-	end : function(){
+	tagEnd : function(){
 		0 < X_HTMLParser_htmlStringToXNode.nest.length && ( --X_HTMLParser_htmlStringToXNode.nest.length );
 	},
 	chars : function( text ){
 		if( X_HTMLParser_htmlStringToXNode.nest.length ){
-			X_HTMLParser_htmlStringToXNode.nest[ X_HTMLParser_htmlStringToXNode.nest.length - 1 ].createText( text );
+			X_HTMLParser_htmlStringToXNode.nest[ X_HTMLParser_htmlStringToXNode.nest.length - 1 ][ 'createText' ]( text );
 		} else {
 			X_HTMLParser_htmlStringToXNode.flat[ X_HTMLParser_htmlStringToXNode.flat.length ] = X_Doc_createText( text );
 		};
 	},
-	comment : X.emptyFunction
+	comment : X_emptyFunction
 };
 
 function X_HtmlParser_parse( html, ignoreError ){
@@ -364,29 +360,30 @@ function X_HtmlParser_parse( html, ignoreError ){
 };
 
 var X_HTMLParser_asyncHtmlStringToXNode = {
+	isXML : false,
 	err : function( html ){
 		X_HTMLParser_htmlStringToXNode.err( html );
-		this.asyncDispatch( X_Event.ERROR );
+		this[ 'asyncDispatch' ]( X_EVENT_ERROR );
 	},
-	start   : X_HTMLParser_htmlStringToXNode.start,
-	end     : X_HTMLParser_htmlStringToXNode.end,
-	chars   : X_HTMLParser_htmlStringToXNode.chars,
-	comment : X.emptyFunction,
+	tagStart : X_HTMLParser_htmlStringToXNode.tagStart,
+	tagEnd   : X_HTMLParser_htmlStringToXNode.tagEnd,
+	chars    : X_HTMLParser_htmlStringToXNode.chars,
+	comment  : X_emptyFunction,
 	
 	progress : function( pct ){
-		this.asyncDispatch( { type : X_Event.PROGRESS, percent : pct } );
+		this[ 'asyncDispatch' ]( { type : X_EVENT_PROGRESS, percent : pct } );
 	},
-	complete : function(){
+	asyncComplete : function(){
 		var ret = X_HTMLParser_htmlStringToXNode.flat;
 		delete X_HTMLParser_htmlStringToXNode.flat;
-		this.asyncDispatch( { type : X_Event.SUCCESS, xnodes : ret } );
+		this[ 'asyncDispatch' ]( { type : X_EVENT_SUCCESS, xnodes : ret } );
 	}
 };
 
 function X_HTMLParser_asyncParse( html, ignoreError ){
-	var dispatcher = X_Class_override( new X.EventDispatcher(), X_HTMLParser_asyncHtmlStringToXNode ),
+	var dispatcher = X_Class_override( X_EventDispatcher(), X_HTMLParser_asyncHtmlStringToXNode ),
 		worker = X_HTMLParser_htmlStringToXNode;
-	dispatcher.listenOnce( X_Event.SUCCESS, dispatcher, dispatcher.kill );
+	dispatcher[ 'listenOnce' ]( X_EVENT_SUCCESS, dispatcher, dispatcher[ 'kill' ] );
 	worker.flat = [];
 	worker.nest.length = 0;
 	worker.ignoreError = ignoreError;