X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;ds=sidebyside;f=0.6.x%2Fjs%2F02_dom%2F09_XHTMLParser.js;h=18cdc3799bfefc95f8fb8fcc847511348230971c;hb=HEAD;hp=60b6d27858730106715a4128c3d45000679c14af;hpb=83a329e3210a40f383282389a48a33ea34ccfa1f;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 60b6d27..18cdc37 100644
--- a/0.6.x/js/02_dom/09_XHTMLParser.js
+++ b/0.6.x/js/02_dom/09_XHTMLParser.js
@@ -8,7 +8,7 @@
 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使う
+		'!':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
 	},
@@ -20,7 +20,7 @@ var X_HTMLParser_CHARS = {
 	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,
+	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)
@@ -55,21 +55,19 @@ 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;
 
-		while ( html ) {
+		while( html ){
 			chars = true;
 			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 );
@@ -81,23 +79,23 @@ var X_HTMLParser_CHARS = {
 				};
 			} else {
 				// Comment
-				if ( html.indexOf("<!--") === 0 ) {
-					if ( 0 < ( index = html.indexOf("-->") ) ) {
+				if( html.indexOf("<!--") === 0 ){
+					if( 0 < ( index = html.indexOf("-->") ) ){
 						handler.comment( html.substring( 4, index ) );
 						html = html.substring( index + 3 );
 						chars = false;
 					};
 	
 				// end tag
-				} else if ( html.indexOf("</") === 0 ) {
-					if ( 2 < ( index = _parseEndTag( stack, handler, html ) ) ) {
+				} else if( html.indexOf("</") === 0 ){
+					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 ) ){
+				} else if( html.indexOf("<") === 0 ){
+					if( index = X_HTMLParser__parseStartTag( stack, last, handler, html ) ){
 						html  = html.substring( index );
 						chars = false;
 					} else
@@ -106,7 +104,7 @@ var X_HTMLParser_CHARS = {
 					};
 				};
 
-				if ( chars ) {
+				if( chars ){
 					index = html.indexOf("<");
 					
 					text = index < 0 ? html : html.substring( 0, index );
@@ -122,7 +120,7 @@ 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 ] );
 				return;
@@ -134,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 ){
@@ -147,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 );
@@ -173,14 +171,16 @@ var X_HTMLParser_CHARS = {
 				case 4 : // 属性名の終わりを待つ
 					chr === '=' ?
 						( ( phase = 6 ) && ( attrName = html.substring( start, i ) ) ) :
-					( whiteSpace[ chr ] & 16 ) &&
-						( ( phase = 5 ) && ( attrName = html.substring( start, i ) ) );
+					( whiteSpace[ chr ] & 16 ) ?
+						( ( phase = 5 ) && ( attrName = html.substring( start, i ) ) ) :
+					( chr === '>' || ( empty = html.substr( i, 2 ) === '/>' ) ) &&
+						( ( phase = 9 ) && ( attrs[ attrs.length ] = 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 ) ) :
+						( ( phase = 3 ) && ( attrs[ attrs.length ] = attrName ) && ( start = i ) ) : // <textarea readonly>
 					chr === '=' ?
 						( phase = 6 ) :
 					( chr === '>' || ( empty = html.substr( i, 2 ) === '/>' ) ) &&
@@ -201,7 +201,7 @@ var X_HTMLParser_CHARS = {
 					( chr === '>' ) ?
 						( ( phase = 9 ) && saveAttr( attrs, attrName, html.substring( start, i ) ) ) :
 					!escape && !uri[ attrName ] && ( empty = html.substr( i, 2 ) === '/>' ) && // attr の val が uri で / で終わりかつ、未対応属性の場合
-						( phase = 9 );
+						( ( phase = 9 ) && saveAttr( attrs, attrName, html.substring( start, i ) ) );
 					break;
 			};
 			escape = chr === '\\' && !escape; // \\\\ is not escape for "
@@ -209,7 +209,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
@@ -245,7 +262,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
@@ -255,32 +272,15 @@ var X_HTMLParser_CHARS = {
 		name  = name.toLowerCase();
 		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_Dom_DTD_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
@@ -294,7 +294,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;
@@ -304,11 +304,12 @@ 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,
@@ -328,7 +329,7 @@ var X_HTMLParser_htmlStringToXNode = {
 						name = attr;
 						_attrs[ name ] = true;
 					} else {
-						name = attr.name;
+						name = attr.attName;
 						_attrs[ name ] = attr.escaped;
 					};
 				};
@@ -336,7 +337,7 @@ var X_HTMLParser_htmlStringToXNode = {
 			xnode[ 'attr' ]( _attrs );
 		};
 	},
-	end : function(){
+	tagEnd : function(){
 		0 < X_HTMLParser_htmlStringToXNode.nest.length && ( --X_HTMLParser_htmlStringToXNode.nest.length );
 	},
 	chars : function( text ){
@@ -361,19 +362,20 @@ 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 );
 	},
-	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 } );
 	},
-	complete : function(){
+	asyncComplete : function(){
 		var ret = X_HTMLParser_htmlStringToXNode.flat;
 		delete X_HTMLParser_htmlStringToXNode.flat;
 		this[ 'asyncDispatch' ]( { type : X_EVENT_SUCCESS, xnodes : ret } );