X-Git-Url: http://git.osdn.jp/view?p=pettanr%2FclientJs.git;a=blobdiff_plain;f=0.6.x%2Fjs%2F02_dom%2F09_XHTMLParser.js;fp=0.6.x%2Fjs%2F02_dom%2F09_XHTMLParser.js;h=18cdc3799bfefc95f8fb8fcc847511348230971c;hp=27f2164c5d295b88838a8291db849b543554853d;hb=d56e8cc1e13089eb6cbc9dcc6900d7f1828b93df;hpb=9e607206c5510435fc1daeac93a19427ce33cc6f

diff --git a/0.6.x/js/02_dom/09_XHTMLParser.js b/0.6.x/js/02_dom/09_XHTMLParser.js
index 27f2164..18cdc37 100644
--- a/0.6.x/js/02_dom/09_XHTMLParser.js
+++ b/0.6.x/js/02_dom/09_XHTMLParser.js
@@ -59,12 +59,12 @@ var X_HTMLParser_CHARS = {
 			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[ handler.isXML ? last.toUpperCase() : last ] === 1 ) {
+			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 = X_HTMLParser__parseEndTag( stack, handler, html ) ){
@@ -79,22 +79,22 @@ 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 = X_HTMLParser__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 ) {
+				} else if( html.indexOf("<") === 0 ){
 					if( index = X_HTMLParser__parseStartTag( stack, last, handler, html ) ){
 						html  = html.substring( index );
 						chars = false;
@@ -104,7 +104,7 @@ var X_HTMLParser_CHARS = {
 					};
 				};
 
-				if ( chars ) {
+				if( chars ){
 					index = html.indexOf("<");
 					
 					text = index < 0 ? html : html.substring( 0, index );
@@ -171,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 :
 					( 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 ) === '/>' ) ) &&
@@ -199,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 "