Version 0.6.96. add lock function @X.EventDispatcher.

[pettanr/clientJs.git] / 0.6.x / js / 02_dom / 09_XDomParser.js

diff --git a/0.6.x/js/02_dom/09_XDomParser.js b/0.6.x/js/02_dom/09_XDomParser.js
index d4030e2..af11c4b 100644 (file)
--- a/0.6.x/js/02_dom/09_XDomParser.js
+++ b/0.6.x/js/02_dom/09_XDomParser.js
@@ -5,7 +5,7 @@
  *\r
  */\r
 \r
-var 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
@@ -305,17 +305,17 @@ var X_Dom_Parser = {
        \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
@@ -328,7 +328,7 @@ X.Dom._htmlStringToXNode = {
                        _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
@@ -341,20 +341,20 @@ X.Dom._htmlStringToXNode = {
                };\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
@@ -364,29 +364,29 @@ X.Dom.parse = function( html, ignoreError ){
        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