Changeset 1368

Show
Ignore:
Timestamp:
04/25/08 03:41:56 (3 months ago)
Author:
cederberg@gmail.com
Message:

Fixed MochiKit.DOM to create correct functions for all deprecations (this time also tested).

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • mochikit/trunk/MochiKit/DOM.js

    r1367 r1368  
    11391139        // FIXME: this really belongs in Base, and could probably be cleaner 
    11401140        var _deprecated = function(fromModule, arr) { 
    1141             var modules = arr[1].split('.'); 
     1141            var fromName = arr[0]; 
     1142            var toName = arr[1]; 
     1143            var toModule = toName.split('.')[1]; 
    11421144            var str = ''; 
    1143             var obj = {}; 
    1144  
    1145             str += 'if (!MochiKit.' + modules[1] + ') { throw new Error("'; 
     1145 
     1146            str += 'if (!MochiKit.' + toModule + ') { throw new Error("'; 
    11461147            str += 'This function has been deprecated and depends on MochiKit.'; 
    1147             str += modules[1] + '.");}'; 
    1148             str += 'return MochiKit.' + modules[1] + '.' + arr[0]; 
    1149             str += '.apply(this, arguments);'; 
    1150  
    1151             obj[modules[2]] = new Function(str); 
    1152             MochiKit.Base.update(MochiKit[fromModule], obj); 
     1148            str += toModule + '.");}'; 
     1149            str += 'return ' + toName + '.apply(this, arguments);'; 
     1150            MochiKit[fromModule][fromName] = new Function(str); 
    11531151        } 
    11541152        for (var i = 0; i < MochiKit.DOM.DEPRECATED.length; i++) { 
  • mochikit/trunk/packed/MochiKit/MochiKit.js

    </
    r1367 r1368  
    34353435this.attributeArray=_3c0; 
    34363436var _3c9=function(_3ca,arr){ 
    3437 var _3cc=arr[1].split("."); 
     3437var _3cc=arr[0]; 
     3438var _3cd=arr[1]; 
     3439var _3ce=_3cd.split(".")[1]; 
    34383440var str=""; 
    3439 var obj={}; 
    3440 str+="if (!MochiKit."+_3cc[1]+") { throw new Error(\""; 
     3441str+="if (!MochiKit."+_3ce+") { throw new Error(\""; 
    34413442str+="This function has been deprecated and depends on MochiKit."; 
    3442 str+=_3cc[1]+".\");}"; 
    3443 str+="return MochiKit."+_3cc[1]+"."+arr[0]; 
    3444 str+=".apply(this, arguments);"; 
    3445 obj[_3cc[2]]=new Function(str); 
    3446 MochiKit.Base.update(MochiKit[_3ca],obj); 
     3443str+=_3ce+".\");}"; 
     3444str+="return "+_3cd+".apply(this, arguments);"; 
     3445MochiKit[_3ca][_3cc]=new Function(str); 
    34473446}; 
    34483447for(var i=0;i<MochiKit.DOM.DEPRECATED.length;i++){ 
    34493448_3c9("DOM",MochiKit.DOM.DEPRECATED[i]); 
    34503449} 
    3451 var _3cf=this.createDOMFunc; 
    3452 this.UL=_3cf("ul"); 
    3453 this.OL=_3cf("ol"); 
    3454 this.LI=_3cf("li"); 
    3455 this.DL=_3cf("dl"); 
    3456 this.DT=_3cf("dt"); 
    3457 this.DD=_3cf("dd"); 
    3458 this.TD=_3cf("td"); 
    3459 this.TR=_3cf("tr"); 
    3460 this.TBODY=_3cf("tbody"); 
    3461 this.THEAD=_3cf("thead"); 
    3462 this.TFOOT=_3cf("tfoot"); 
    3463 this.TABLE=_3cf("table"); 
    3464 this.TH=_3cf("th"); 
    3465 this.INPUT=_3cf("input"); 
    3466 this.SPAN=_3cf("span"); 
    3467 this.A=_3cf("a"); 
    3468 this.DIV=_3cf("div"); 
    3469 this.IMG=_3cf("img"); 
    3470 this.BUTTON=_3cf("button"); 
    3471 this.TT=_3cf("tt"); 
    3472 this.PRE=_3cf("pre"); 
    3473 this.H1=_3cf("h1"); 
    3474 this.H2=_3cf("h2"); 
    3475 this.H3=_3cf("h3"); 
    3476 this.H4=_3cf("h4"); 
    3477 this.H5=_3cf("h5"); 
    3478 this.H6=_3cf("h6"); 
    3479 this.BR=_3cf("br"); 
    3480 this.HR=_3cf("hr"); 
    3481 this.LABEL=_3cf("label"); 
    3482 this.TEXTAREA=_3cf("textarea"); 
    3483 this.FORM=_3cf("form"); 
    3484 this.P=_3cf("p"); 
    3485 this.SELECT=_3cf("select"); 
    3486 this.OPTION=_3cf("option"); 
    3487 this.OPTGROUP=_3cf("optgroup"); 
    3488 this.LEGEND=_3cf("legend"); 
    3489 this.FIELDSET=_3cf("fieldset"); 
    3490 this.STRONG=_3cf("strong"); 
    3491 this.CANVAS=_3cf("canvas"); 
     3450var _3d0=this.createDOMFunc; 
     3451this.UL=_3d0("ul"); 
     3452this.OL=_3d0("ol"); 
     3453this.LI=_3d0("li"); 
     3454this.DL=_3d0("dl"); 
     3455this.DT=_3d0("dt"); 
     3456this.DD=_3d0("dd"); 
     3457this.TD=_3d0("td"); 
     3458this.TR=_3d0("tr"); 
     3459this.TBODY=_3d0("tbody"); 
     3460this.THEAD=_3d0("thead"); 
     3461this.TFOOT=_3d0("tfoot"); 
     3462this.TABLE=_3d0("table"); 
     3463this.TH=_3d0("th"); 
     3464this.INPUT=_3d0("input"); 
     3465this.SPAN=_3d0("span"); 
     3466this.A=_3d0("a"); 
     3467this.DIV=_3d0("div"); 
     3468this.IMG=_3d0("img"); 
     3469this.BUTTON=_3d0("button"); 
     3470this.TT=_3d0("tt"); 
     3471this.PRE=_3d0("pre"); 
     3472this.H1=_3d0("h1"); 
     3473this.H2=_3d0("h2"); 
     3474this.H3=_3d0("h3"); 
     3475this.H4=_3d0("h4"); 
     3476this.H5=_3d0("h5"); 
     3477this.H6=_3d0("h6"); 
     3478this.BR=_3d0("br"); 
     3479this.HR=_3d0("hr"); 
     3480this.LABEL=_3d0("label"); 
     3481this.TEXTAREA=_3d0("textarea"); 
     3482this.FORM=_3d0("form"); 
     3483this.P=_3d0("p"); 
     3484this.SELECT=_3d0("select"); 
     3485this.OPTION=_3d0("option"); 
     3486this.OPTGROUP=_3d0("optgroup"); 
     3487this.LEGEND=_3d0("legend"); 
     3488this.FIELDSET=_3d0("fieldset"); 
     3489this.STRONG=_3d0("strong"); 
     3490this.CANVAS=_3d0("canvas"); 
    34923491this.$=this.getElement; 
    34933492this.EXPORT_TAGS={":common":this.EXPORT,":all":m.concat(this.EXPORT,this.EXPORT_OK)}; 
     
    35113510MochiKit.Selector.EXPORT=["Selector","findChildElements","findDocElements","$$"]; 
    35123511MochiKit.Selector.EXPORT_OK=[]; 
    3513 MochiKit.Selector.Selector=function(_3d0){ 
     3512MochiKit.Selector.Selector=function(_3d1){ 
    35143513this.params={classNames:[],pseudoClassNames:[]}; 
    3515 this.expression=_3d0.toString().replace(/(^\s+|\s+$)/g,""); 
     3514this.expression=_3d1.toString().replace(/(^\s+|\s+$)/g,""); 
    35163515this.parseExpression(); 
    35173516this.compileMatcher(); 
    35183517}; 
    35193518MochiKit.Selector.Selector.prototype={__class__:MochiKit.Selector.Selector,parseExpression:function(){ 
    3520 function abort(_3d1){ 
    3521 throw "Parse error in selector: "+_3d1
     3519function abort(_3d2){ 
     3520throw "Parse error in selector: "+_3d2
    35223521} 
    35233522if(this.expression==""){ 
     
    35253524} 
    35263525var repr=MochiKit.Base.repr; 
    3527 var _3d3=this.params; 
     3526var _3d4=this.params; 
    35283527var expr=this.expression; 
    3529 var _3d5,_3d6,_3d7,rest; 
    3530 while(_3d5=expr.match(/^(.*)\[([a-z0-9_:-]+?)(?:([~\|!^$*]?=)(?:"([^"]*)"|([^\]\s]*)))?\]$/i)){ 
    3531 _3d3.attributes=_3d3.attributes||[]; 
    3532 _3d3.attributes.push({name:_3d5[2],operator:_3d5[3],value:_3d5[4]||_3d5[5]||""}); 
    3533 expr=_3d5[1]; 
     3528var _3d6,_3d7,_3d8,rest; 
     3529while(_3d6=expr.match(/^(.*)\[([a-z0-9_:-]+?)(?:([~\|!^$*]?=)(?:"([^"]*)"|([^\]\s]*)))?\]$/i)){ 
     3530_3d4.attributes=_3d4.attributes||[]; 
     3531_3d4.attributes.push({name:_3d6[2],operator:_3d6[3],value:_3d6[4]||_3d6[5]||""}); 
     3532expr=_3d6[1]; 
    35343533} 
    35353534if(expr=="*"){ 
    35363535return this.params.wildcard=true; 
    35373536} 
    3538 while(_3d5=expr.match(/^([^a-z0-9_-])?([a-z0-9_-]+(?:\([^)]*\))?)(.*)/i)){ 
    3539 _3d6=_3d5[1]; 
    3540 _3d7=_3d5[2]; 
    3541 rest=_3d5[3]; 
    3542 switch(_3d6){ 
     3537while(_3d6=expr.match(/^([^a-z0-9_-])?([a-z0-9_-]+(?:\([^)]*\))?)(.*)/i)){ 
     3538_3d7=_3d6[1]; 
     3539_3d8=_3d6[2]; 
     3540rest=_3d6[3]; 
     3541switch(_3d7){ 
    35433542case "#": 
    3544 _3d3.id=_3d7
     3543_3d4.id=_3d8
    35453544break; 
    35463545case ".": 
    3547 _3d3.classNames.push(_3d7); 
     3546_3d4.classNames.push(_3d8); 
    35483547break; 
    35493548case ":": 
    3550 _3d3.pseudoClassNames.push(_3d7); 
     3549_3d4.pseudoClassNames.push(_3d8); 
    35513550break; 
    35523551case "": 
    35533552case undefined: 
    3554 _3d3.tagName=_3d7.toUpperCase(); 
     3553_3d4.tagName=_3d8.toUpperCase(); 
    35553554break; 
    35563555default: 
     
    35643563},buildMatchExpression:function(){ 
    35653564var repr=MochiKit.Base.repr; 
    3566 var _3da=this.params; 
    3567 var _3db=[]; 
    3568 var _3dc,i; 
    3569 function childElements(_3de){ 
    3570 return "MochiKit.Base.filter(function (node) { return node.nodeType == 1; }, "+_3de+".childNodes)"; 
    3571 } 
    3572 if(_3da.wildcard){ 
    3573 _3db.push("true"); 
    3574 } 
    3575 if(_3dc=_3da.id){ 
    3576 _3db.push("element.id == "+repr(_3dc)); 
    3577 } 
    3578 if(_3dc=_3da.tagName){ 
    3579 _3db.push("element.tagName.toUpperCase() == "+repr(_3dc)); 
    3580 } 
    3581 if((_3dc=_3da.classNames).length>0){ 
    3582 for(i=0;i<_3dc.length;i++){ 
    3583 _3db.push("MochiKit.DOM.hasElementClass(element, "+repr(_3dc[i])+")"); 
    3584 } 
    3585 } 
    3586 if((_3dc=_3da.pseudoClassNames).length>0){ 
    3587 for(i=0;i<_3dc.length;i++){ 
    3588 var _3df=_3dc[i].match(/^([^(]+)(?:\((.*)\))?$/); 
    3589 var _3e0=_3df[1]; 
    3590 var _3e1=_3df[2]; 
    3591 switch(_3e0){ 
     3565var _3db=this.params; 
     3566var _3dc=[]; 
     3567var _3dd,i; 
     3568function childElements(_3df){ 
     3569return "MochiKit.Base.filter(function (node) { return node.nodeType == 1; }, "+_3df+".childNodes)"; 
     3570} 
     3571if(_3db.wildcard){ 
     3572_3dc.push("true"); 
     3573} 
     3574if(_3dd=_3db.id){ 
     3575_3dc.push("element.id == "+repr(_3dd)); 
     3576} 
     3577if(_3dd=_3db.tagName){ 
     3578_3dc.push("element.tagName.toUpperCase() == "+repr(_3dd)); 
     3579} 
     3580if((_3dd=_3db.classNames).length>0){ 
     3581for(i=0;i<_3dd.length;i++){ 
     3582_3dc.push("MochiKit.DOM.hasElementClass(element, "+repr(_3dd[i])+")"); 
     3583} 
     3584} 
     3585if((_3dd=_3db.pseudoClassNames).length>0){ 
     3586for(i=0;i<_3dd.length;i++){ 
     3587var _3e0=_3dd[i].match(/^([^(]+)(?:\((.*)\))?$/); 
     3588var _3e1=_3e0[1]; 
     3589var _3e2=_3e0[2]; 
     3590switch(_3e1){ 
    35923591case "root": 
    3593 _3db.push("element.nodeType == 9 || element === element.ownerDocument.documentElement"); 
     3592_3dc.push("element.nodeType == 9 || element === element.ownerDocument.documentElement"); 
    35943593break; 
    35953594case "nth-child": 
     
    35973596case "nth-of-type": 
    35983597case "nth-last-of-type": 
    3599 _3df=_3e1.match(/^((?:(\d+)n\+)?(\d+)|odd|even)$/); 
    3600 if(!_3df){ 
    3601 throw "Invalid argument to pseudo element nth-child: "+_3e1
     3598_3e0=_3e2.match(/^((?:(\d+)n\+)?(\d+)|odd|even)$/); 
     3599if(!_3e0){ 
     3600throw "Invalid argument to pseudo element nth-child: "+_3e2
    36023601} 
    36033602var a,b; 
    3604 if(_3df[0]=="odd"){ 
     3603if(_3e0[0]=="odd"){ 
    36053604a=2; 
    36063605b=1; 
    36073606}else{ 
    3608 if(_3df[0]=="even"){ 
     3607if(_3e0[0]=="even"){ 
    36093608a=2; 
    36103609b=0; 
    36113610}else{ 
    3612 a=_3df[2]&&parseInt(_3df)||null; 
    3613 b=parseInt(_3df[3]); 
    3614 } 
    3615 } 
    3616 _3db.push("this.nthChild(element,"+a+","+b+","+!!_3e0.match("^nth-last")+","+!!_3e0.match("of-type$")+")"); 
     3611a=_3e0[2]&&parseInt(_3e0)||null; 
     3612b=parseInt(_3e0[3]); 
     3613} 
     3614} 
     3615_3dc.push("this.nthChild(element,"+a+","+b+","+!!_3e1.match("^nth-last")+","+!!_3e1.match("of-type$")+")"); 
    36173616break; 
    36183617case "first-child": 
    3619 _3db.push("this.nthChild(element, null, 1)"); 
     3618_3dc.push("this.nthChild(element, null, 1)"); 
    36203619break; 
    36213620case "last-child": 
    3622 _3db.push("this.nthChild(element, null, 1, true)"); 
     3621_3dc.push("this.nthChild(element, null, 1, true)"); 
    36233622break; 
    36243623case "first-of-type": 
    3625 _3db.push("this.nthChild(element, null, 1, false, true)"); 
     3624_3dc.push("this.nthChild(element, null, 1, false, true)"); 
    36263625break; 
    36273626case "last-of-type": 
    3628 _3db.push("this.nthChild(element, null, 1, true, true)"); 
     3627_3dc.push("this.nthChild(element, null, 1, true, true)"); 
    36293628break; 
    36303629case "only-child": 
    3631 _3db.push(childElements("element.parentNode")+".length == 1"); 
     3630_3dc.push(childElements("element.parentNode")+".length == 1"); 
    36323631break; 
    36333632case "only-of-type": 
    3634 _3db.push("MochiKit.Base.filter(function (node) { return node.tagName == element.tagName; }, "+childElements("element.parentNode")+").length == 1"); 
     3633_3dc.push("MochiKit.Base.filter(function (node) { return node.tagName == element.tagName; }, "+childElements("element.parentNode")+").length == 1"); 
    36353634break; 
    36363635case "empty": 
    3637 _3db.push("element.childNodes.length == 0"); 
     3636_3dc.push("element.childNodes.length == 0"); 
    36383637break; 
    36393638case "enabled": 
    3640 _3db.push("(this.isUIElement(element) && element.disabled === false)"); 
     3639_3dc.push("(this.isUIElement(element) && element.disabled === false)"); 
    36413640break; 
    36423641case "disabled": 
    3643 _3db.push("(this.isUIElement(element) && element.disabled === true)"); 
     3642_3dc.push("(this.isUIElement(element) && element.disabled === true)"); 
    36443643break; 
    36453644case "checked": 
    3646 _3db.push("(this.isUIElement(element) && element.checked === true)"); 
     3645_3dc.push("(this.isUIElement(element) && element.checked === true)"); 
    36473646break; 
    36483647case "not": 
    3649 var _3e4=new MochiKit.Selector.Selector(_3e1); 
    3650 _3db.push("!( "+_3e4.buildMatchExpression()+")"); 
     3648var _3e5=new MochiKit.Selector.Selector(_3e2); 
     3649_3dc.push("!( "+_3e5.buildMatchExpression()+")"); 
    36513650break; 
    36523651} 
    36533652} 
    36543653} 
    3655 if(_3dc=_3da.attributes){ 
    3656 MochiKit.Base.map(function(_3e5){ 
    3657 var _3e6="MochiKit.DOM.getNodeAttribute(element, "+repr(_3e5.name)+")"; 
    3658 var _3e7=function(_3e8){ 
    3659 return _3e6+".split("+repr(_3e8)+")"; 
    3660 }; 
    3661 switch(_3e5.operator){ 
     3654if(_3dd=_3db.attributes){ 
     3655MochiKit.Base.map(function(_3e6){ 
     3656var _3e7="MochiKit.DOM.getNodeAttribute(element, "+repr(_3e6.name)+")"; 
     3657var _3e8=function(_3e9){ 
     3658return _3e7+".split("+repr(_3e9)+")"; 
     3659}; 
     3660switch(_3e6.operator){ 
    36623661case "=": 
    3663 _3db.push(_3e6+" == "+repr(_3e5.value)); 
     3662_3dc.push(_3e7+" == "+repr(_3e6.value)); 
    36643663break; 
    36653664case "~=": 
    3666 _3db.push(_3e6+" && MochiKit.Base.findValue("+_3e7(" ")+", "+repr(_3e5.value)+") > -1"); 
     3665_3dc.push(_3e7+" && MochiKit.Base.findValue("+_3e8(" ")+", "+repr(_3e6.value)+") > -1"); 
    36673666break; 
    36683667case "^=": 
    3669 _3db.push(_3e6+".substring(0, "+_3e5.value.length+") == "+repr(_3e5.value)); 
     3668_3dc.push(_3e7+".substring(0, "+_3e6.value.length+") == "+repr(_3e6.value)); 
    36703669break; 
    36713670case "$=": 
    3672 _3db.push(_3e6+".substring("+_3e6+".length - "+_3e5.value.length+") == "+repr(_3e5.value)); 
     3671_3dc.push(_3e7+".substring("+_3e7+".length - "+_3e6.value.length+") == "+repr(_3e6.value)); 
    36733672break; 
    36743673case "*=": 
    3675 _3db.push(_3e6+".match("+repr(_3e5.value)+")"); 
     3674_3dc.push(_3e7+".match("+repr(_3e6.value)+")"); 
    36763675break; 
    36773676case "|=": 
    3678 _3db.push(_3e6+" && "+_3e7("-")+"[0].toUpperCase() == "+repr(_3e5.value.toUpperCase())); 
     3677_3dc.push(_3e7+" && "+_3e8("-")+"[0].toUpperCase() == "+repr(_3e6.value.toUpperCase())); 
    36793678break; 
    36803679case "!=": 
    3681 _3db.push(_3e6+" != "+repr(_3e5.value)); 
     3680_3dc.push(_3e7+" != "+repr(_3e6.value)); 
    36823681break; 
    36833682case "": 
    36843683case undefined: 
    3685 _3db.push(_3e6+" != null"); 
     3684_3dc.push(_3e7+" != null"); 
    36863685break; 
    36873686default: 
    3688 throw "Unknown operator "+_3e5.operator+" in selector"; 
    3689 } 
    3690 },_3dc); 
    3691 } 
    3692 return _3db.join(" && "); 
     3687throw "Unknown operator "+_3e6.operator+" in selector"; 
     3688} 
     3689},_3dd); 
     3690} 
     3691return _3dc.join(" && "); 
    36933692},compileMatcher:function(){ 
    36943693this.match=new Function("element","if (!element.tagName) return false;                 return "+this.buildMatchExpression()); 
    3695 },nthChild:function(_3e9,a,b,_3ec,_3ed){ 
    3696 var _3ee=MochiKit.Base.filter(function(node){ 
     3694},nthChild:function(_3ea,a,b,_3ed,_3ee){ 
     3695var _3ef=MochiKit.Base.filter(function(node){ 
    36973696return node.nodeType==1; 
    3698 },_3e9.parentNode.childNodes); 
     3697},_3ea.parentNode.childNodes); 
     3698if(_3ee){ 
     3699_3ef=MochiKit.Base.filter(function(node){ 
     3700return node.tagName==_3ea.tagName; 
     3701},_3ef); 
     3702
    36993703if(_3ed){ 
    3700 _3ee=MochiKit.Base.filter(function(node){ 
    3701 return node.tagName==_3e9.tagName; 
    3702 },_3ee); 
    3703 
    3704 if(_3ec){ 
    3705 _3ee=MochiKit.Iter.reversed(_3ee); 
     3704_3ef=MochiKit.Iter.reversed(_3ef); 
    37063705} 
    37073706if(a){ 
    3708 var _3f1=MochiKit.Base.findIdentical(_3ee,_3e9); 
    3709 return ((_3f1+1-b)/a)%1==0; 
    3710 }else{ 
    3711 return b==MochiKit.Base.findIdentical(_3ee,_3e9)+1; 
    3712 } 
    3713 },isUIElement:function(_3f2){ 
    3714 return MochiKit.Base.findValue(["input","button","select","option","textarea","object"],_3f2.tagName.toLowerCase())>-1; 
    3715 },findElements:function(_3f3,axis){ 
    3716 var _3f5
     3707var _3f2=MochiKit.Base.findIdentical(_3ef,_3ea); 
     3708return ((_3f2+1-b)/a)%1==0; 
     3709}else{ 
     3710return b==MochiKit.Base.findIdentical(_3ef,_3ea)+1; 
     3711} 
     3712},isUIElement:function(_3f3){ 
     3713return MochiKit.Base.findValue(["input","button","select","option","textarea","object"],_3f3.tagName.toLowerCase())>-1; 
     3714},findElements:function(_3f4,axis){ 
     3715var _3f6
    37173716if(axis==undefined){ 
    37183717axis=""; 
    37193718} 
    3720 function inScope(_3f6,_3f7){ 
     3719function inScope(_3f7,_3f8){ 
    37213720if(axis==""){ 
    3722 return MochiKit.DOM.isChildNode(_3f6,_3f7); 
     3721return MochiKit.DOM.isChildNode(_3f7,_3f8); 
    37233722}else{ 
    37243723if(axis==">"){ 
    3725 return _3f6.parentNode==_3f7
     3724return _3f7.parentNode==_3f8
    37263725}else{ 
    37273726if(axis=="+"){ 
    3728 return _3f6==nextSiblingElement(_3f7); 
     3727return _3f7==nextSiblingElement(_3f8); 
    37293728}else{ 
    37303729if(axis=="~"){ 
    3731 var _3f8=_3f7
    3732 while(_3f8=nextSiblingElement(_3f8)){ 
    3733 if(_3f6==_3f8){ 
     3730var _3f9=_3f8
     3731while(_3f9=nextSiblingElement(_3f9)){ 
     3732if(_3f7==_3f9){ 
    37343733return true; 
    37353734} 
     
    37433742} 
    37443743} 
    3745 if(_3f5=MochiKit.DOM.getElement(this.params.id)){ 
    3746 if(this.match(_3f5)){ 
    3747 if(!_3f3||inScope(_3f5,_3f3)){ 
    3748 return [_3f5]; 
     3744if(_3f6=MochiKit.DOM.getElement(this.params.id)){ 
     3745if(this.match(_3f6)){ 
     3746if(!_3f4||inScope(_3f6,_3f4)){ 
     3747return [_3f6]; 
    37493748} 
    37503749} 
     
    37583757} 
    37593758if(axis==""){ 
    3760 _3f3=(_3f3||MochiKit.DOM.currentDocument()).getElementsByTagName(this.params.tagName||"*"); 
     3759_3f4=(_3f4||MochiKit.DOM.currentDocument()).getElementsByTagName(this.params.tagName||"*"); 
    37613760}else{ 
    37623761if(axis==">"){ 
    3763 if(!_3f3){ 
     3762if(!_3f4){ 
    37643763throw "> combinator not allowed without preceeding expression"; 
    37653764} 
    3766 _3f3=MochiKit.Base.filter(function(node){ 
     3765_3f4=MochiKit.Base.filter(function(node){ 
    37673766return node.nodeType==1; 
    3768 },_3f3.childNodes); 
     3767},_3f4.childNodes); 
    37693768}else{ 
    37703769if(axis=="+"){ 
    3771 if(!_3f3){ 
     3770if(!_3f4){ 
    37723771throw "+ combinator not allowed without preceeding expression"; 
    37733772} 
    3774 _3f3=nextSiblingElement(_3f3)&&[nextSiblingElement(_3f3)]; 
     3773_3f4=nextSiblingElement(_3f4)&&[nextSiblingElement(_3f4)]; 
    37753774}else{ 
    37763775if(axis=="~"){ 
    3777 if(!_3f3){ 
     3776if(!_3f4){ 
    37783777throw "~ combinator not allowed without preceeding expression"; 
    37793778} 
    3780 var _3fb=[]; 
    3781 while(nextSiblingElement(_3f3)){ 
    3782 _3f3=nextSiblingElement(_3f3); 
    3783 _3fb.push(_3f3); 
    3784 } 
    3785 _3f3=_3fb
    3786 } 
    3787 } 
    3788 } 
    3789 } 
    3790 if(!_3f3){ 
     3779var _3fc=[]; 
     3780while(nextSiblingElement(_3f4)){ 
     3781_3f4=nextSiblingElement(_3f4); 
     3782_3fc.push(_3f4); 
     3783} 
     3784_3f4=_3fc
     3785} 
     3786} 
     3787} 
     3788} 
     3789if(!_3f4){ 
    37913790return []; 
    37923791} 
    3793 var _3fc=MochiKit.Base.filter(MochiKit.Base.bind(function(_3fd){ 
    3794 return this.match(_3fd); 
    3795 },this),_3f3); 
    3796 return _3fc
     3792var _3fd=MochiKit.Base.filter(MochiKit.Base.bind(function(_3fe){ 
     3793return this.match(_3fe); 
     3794},this),_3f4); 
     3795return _3fd
    37973796},repr:function(){ 
    37983797return "Selector("+this.expression+")"; 
    37993798},toString:MochiKit.Base.forwardCall("repr")}; 
    3800 MochiKit.Base.update(MochiKit.Selector,{findChildElements:function(_3fe,_3ff){ 
    3801 return MochiKit.Base.flattenArray(MochiKit.Base.map(function(_400){ 
    3802 var _401=""; 
    3803 return MochiKit.Iter.reduce(function(_402,expr){ 
     3799MochiKit.Base.update(MochiKit.Selector,{findChildElements:function(_3ff,_400){ 
     3800return MochiKit.Base.flattenArray(MochiKit.Base.map(function(_401){ 
     3801var _402=""; 
     3802return MochiKit.Iter.reduce(function(_403,expr){ 
    38043803if(match=expr.match(/^[>+~]$/)){ 
    3805 _401=match[0]; 
    3806 return _402
    3807 }else{ 
    3808 var _404=new MochiKit.Selector.Selector(expr); 
    3809 var _405=MochiKit.Iter.reduce(function(_406,_407){ 
    3810 return MochiKit.Base.extend(_406,_404.findElements(_407||_3fe,_401)); 
    3811 },_402,[]); 
    3812 _401=""; 
    3813 return _405
    3814 } 
    3815 },_400.replace(/(^\s+|\s+$)/g,"").split(/\s+/),[null]); 
    3816 },_3ff)); 
     3804_402=match[0]; 
     3805return _403
     3806}else{ 
     3807var _405=new MochiKit.Selector.Selector(expr); 
     3808var _406=MochiKit.Iter.reduce(function(_407,_408){ 
     3809return MochiKit.Base.extend(_407,_405.findElements(_408||_3ff,_402)); 
     3810},_403,[]); 
     3811_402=""; 
     3812return _406
     3813} 
     3814},_401.replace(/(^\s+|\s+$)/g,"").split(/\s+/),[null]); 
     3815},_400)); 
    38173816},findDocElements:function(){ 
    38183817return MochiKit.Selector.findChildElements(MochiKit.DOM.currentDocument(),arguments); 
     
    38583857return this.__repr__(); 
    38593858}; 
    3860 MochiKit.Base.update(MochiKit.Style,{getStyle:function(elem,_410){ 
     3859MochiKit.Base.update(MochiKit.Style,{getStyle:function(elem,_411){ 
    38613860var dom=MochiKit.DOM; 
    38623861var d=dom._document; 
    38633862elem=dom.getElement(elem); 
    3864 _410=MochiKit.Base.camelize(_410); 
     3863_411=MochiKit.Base.camelize(_411); 
    38653864if(!elem||elem==d){ 
    38663865return undefined; 
    38673866} 
    3868 if(_410=="opacity"&&elem.filters){ 
    3869 var _413=(MochiKit.Style.getStyle(elem,"filter")||"").match(/alpha\(opacity=(.*)\)/); 
    3870 if(_413&&_413[1]){ 
    3871 return parseFloat(_413[1])/100; 
     3867if(_411=="opacity"&&elem.filters){ 
     3868var _414=(MochiKit.Style.getStyle(elem,"filter")||"").match(/alpha\(opacity=(.*)\)/); 
     3869if(_414&&_414[1]){ 
     3870return parseFloat(_414[1])/100; 
    38723871} 
    38733872return 1; 
    38743873} 
    3875 var _414=elem.style?elem.style[_410]:null; 
    3876 if(!_414){ 
     3874var _415=elem.style?elem.style[_411]:null; 
     3875if(!_415){ 
    38773876if(d.defaultView&&d.defaultView.getComputedStyle){ 
    38783877var css=d.defaultView.getComputedStyle(elem,null); 
    3879 _410=_410.replace(/([A-Z])/g,"-$1").toLowerCase(); 
    3880 _414=css?css.getPropertyValue(_410):null; 
     3878_411=_411.replace(/([A-Z])/g,"-$1").toLowerCase(); 
     3879_415=css?css.getPropertyValue(_411):null; 
    38813880}else{ 
    38823881if(elem.currentStyle){ 
    3883 _414=elem.currentStyle[_410]; 
    3884 } 
    3885 } 
    3886 } 
    3887 if(_410=="opacity"){ 
    3888 _414=parseFloat(_414); 
    3889 } 
    3890 if(/Opera/.test(navigator.userAgent)&&(MochiKit.Base.find(["left","top","right","bottom"],_410)!=-1)){ 
     3882_415=elem.currentStyle[_411]; 
     3883} 
     3884} 
     3885} 
     3886if(_411=="opacity"){ 
     3887_415=parseFloat(_415); 
     3888} 
     3889if(/Opera/.test(navigator.userAgent)&&(MochiKit.Base.find(["left","top","right","bottom"],_411)!=-1)){ 
    38913890if(MochiKit.Style.getStyle(elem,"position")=="static"){ 
    3892 _414="auto"; 
    3893 } 
    3894 } 
    3895 return _414=="auto"?null:_414
    3896 },setStyle:function(elem,_417){ 
     3891_415="auto"; 
     3892} 
     3893} 
     3894return _415=="auto"?null:_415
     3895},setStyle:function(elem,_418){ 
    38973896elem=MochiKit.DOM.getElement(elem); 
    3898 for(var name in _417){ 
     3897for(var name in _418){ 
    38993898if(name=="opacity"){ 
    3900 MochiKit.Style.setOpacity(elem,_417[name]); 
    3901 }else{ 
    3902 elem.style[MochiKit.Base.camelize(name)]=_417[name]; 
     3899MochiKit.Style.setOpacity(elem,_418[name]); 
     3900}else{ 
     3901elem.style[MochiKit.Base.camelize(name)]=_418[name]; 
    39033902} 
    39043903} 
     
    39073906var self=MochiKit.Style; 
    39083907if(o==1){ 
    3909 var _41c=/Gecko/.test(navigator.userAgent)&&!(/Konqueror|AppleWebKit|KHTML/.test(navigator.userAgent)); 
    3910 elem.style["opacity"]=_41c?0.999999:1; 
     3908var _41d=/Gecko/.test(navigator.userAgent)&&!(/Konqueror|AppleWebKit|KHTML/.test(navigator.userAgent)); 
     3909elem.style["opacity"]=_41d?0.999999:1; 
    39113910if(/MSIE/.test(navigator.userAgent)){ 
    39123911elem.style["filter"]=self.getStyle(elem,"filter").replace(/alpha\([^\)]*\)/gi,""); 
     
    39213920} 
    39223921} 
    3923 },getElementPosition:function(elem,_41e){ 
     3922},getElementPosition:function(elem,_41f){ 
    39243923var self=MochiKit.Style; 
    39253924var dom=MochiKit.DOM; 
     
    39303929var c=new self.Coordinates(0,0); 
    39313930var box=null; 
    3932 var _423=null; 
     3931var _424=null; 
    39333932var d=MochiKit.DOM._document; 
    39343933var de=d.documentElement; 
     
    39463945c.x+=elem.offsetLeft; 
    39473946c.y+=elem.offsetTop; 
    3948 _423=elem.offsetParent; 
    3949 if(_423!=elem){ 
    3950 while(_423){ 
    3951 c.x+=_423.offsetLeft; 
    3952 c.y+=_423.offsetTop; 
    3953 _423=_423.offsetParent; 
     3947_424=elem.offsetParent; 
     3948if(_424!=elem){ 
     3949while(_424){ 
     3950c.x+=_424.offsetLeft; 
     3951c.y+=_424.offsetTop; 
     3952_424=_424.offsetParent; 
    39543953} 
    39553954} 
     
    39603959} 
    39613960if(elem.parentNode){ 
    3962 _423=elem.parentNode; 
    3963 }else{ 
    3964 _423=null; 
    3965 } 
    3966 while(_423){ 
    3967 var _428=_423.tagName.toUpperCase(); 
    3968 if(_428==="BODY"||_428==="HTML"){ 
     3961_424=elem.parentNode; 
     3962}else{ 
     3963_424=null; 
     3964} 
     3965while(_424){ 
     3966var _429=_424.tagName.toUpperCase(); 
     3967if(_429==="BODY"||_429==="HTML"){ 
    39693968break; 
    39703969} 
    3971 var disp=self.getStyle(_423,"display"); 
     3970var disp=self.getStyle(_424,"display"); 
    39723971if(disp.search(/^inline|table-row.*$/i)){ 
    3973 c.x-=_423.scrollLeft; 
    3974 c.y-=_423.scrollTop; 
    3975 } 
    3976 if(_423.parentNode){ 
    3977 _423=_423.parentNode; 
    3978 }else{ 
    3979 _423=null; 
    3980 } 
    3981 } 
    3982 } 
    3983 } 
    3984 } 
    3985 if(typeof (_41e)!="undefined"){ 
    3986 _41e=arguments.callee(_41e); 
    3987 if(_41e){ 
    3988 c.x-=(_41e.x||0); 
    3989 c.y-=(_41e.y||0); 
     3972c.x-=_424.scrollLeft; 
     3973c.y-=_424.scrollTop; 
     3974} 
     3975if(_424.parentNode){ 
     3976_424=_424.parentNode; 
     3977}else{ 
     3978_424=null; 
     3979} 
     3980} 
     3981} 
     3982} 
     3983} 
     3984if(typeof (_41f)!="undefined"){ 
     3985_41f=arguments.callee(_41f); 
     3986if(_41f){ 
     3987c.x-=(_41f.x||0); 
     3988c.y-=(_41f.y||0); 
    39903989} 
    39913990} 
    39923991return c; 
    3993 },setElementPosition:function(elem,_42b,_42c){ 
     3992},setElementPosition:function(elem,_42c,_42d){ 
    39943993elem=MochiKit.DOM.getElement(elem); 
    3995 if(typeof (_42c)=="undefined"){ 
    3996 _42c="px"; 
    3997 } 
    3998 var _42d={}; 
    3999 var _42e=MochiKit.Base.isUndefinedOrNull; 
    4000 if(!_42e(_42b.x)){ 
    4001 _42d["left"]=_42b.x+_42c
    4002 } 
    4003 if(!_42e(_42b.y)){ 
    4004 _42d["top"]=_42b.y+_42c
    4005 } 
    4006 MochiKit.DOM.updateNodeAttributes(elem,{"style":_42d}); 
     3994if(typeof (_42d)=="undefined"){ 
     3995_42d="px"; 
     3996} 
     3997var _42e={}; 
     3998var _42f=MochiKit.Base.isUndefinedOrNull; 
     3999if(!_42f(_42c.x)){ 
     4000_42e["left"]=_42c.x+_42d
     4001} 
     4002if(!_42f(_42c.y)){ 
     4003_42e["top"]=_42c.y+_42d
     4004} 
     4005MochiKit.DOM.updateNodeAttributes(elem,{"style":_42e}); 
    40074006},getElementDimensions:function(elem){ 
    40084007var self=MochiKit.Style; 
     
    40204019} 
    40214020var s=elem.style; 
    4022 var _434=s.visibility; 
    4023 var _435=s.position; 
    4024 var _436=s.display; 
     4021var _435=s.visibility; 
     4022var _436=s.position; 
     4023var _437=s.display; 
    40254024s.visibility="hidden"; 
    40264025s.position="absolute"; 
    40274026s.display=""; 
    4028 var _437=elem.offsetWidth; 
    4029 var _438=elem.offsetHeight; 
    4030 s.display=_436
    4031 s.position=_435
    4032 s.visibility=_434
    4033 return new self.Dimensions(_437,_438); 
    4034 },setElementDimensions:function(elem,_43a,_43b){ 
     4027var _438=elem.offsetWidth; 
     4028var _439=elem.offsetHeight; 
     4029s.display=_437
     4030s.position=_436
     4031s.visibility=_435
     4032return new self.Dimensions(_438,_439); 
     4033},setElementDimensions:function(elem,_43b,_43c){ 
    40354034elem=MochiKit.DOM.getElement(elem); 
    4036 if(typeof (_43b)=="undefined"){ 
    4037 _43b="px"; 
    4038 } 
    4039 var _43c={}; 
    4040 var _43d=MochiKit.Base.isUndefinedOrNull; 
    4041 if(!_43d(_43a.w)){ 
    4042 _43c["width"]=_43a.w+_43b
    4043 } 
    4044 if(!_43d(_43a.h)){ 
    4045 _43c["height"]=_43a.h+_43b
    4046 } 
    4047 MochiKit.DOM.updateNodeAttributes(elem,{"style":_43c}); 
    4048 },setDisplayForElement:function(_43e,_43f){ 
    4049 var _440=MochiKit.Base.extend(null,arguments,1); 
    4050 var _441=MochiKit.DOM.getElement; 
    4051 for(var i=0;i<_440.length;i++){ 
    4052 _43f=_441(_440[i]); 
    4053 if(_43f){ 
    4054 _43f.style.display=_43e
     4035if(typeof (_43c)=="undefined"){ 
     4036_43c="px"; 
     4037} 
     4038var _43d={}; 
     4039var _43e=MochiKit.Base.isUndefinedOrNull; 
     4040if(!_43e(_43b.w)){ 
     4041_43d["width"]=_43b.w+_43c
     4042} 
     4043if(!_43e(_43b.h)){ 
     4044_43d["height"]=_43b.h+_43c
     4045} 
     4046MochiKit.DOM.updateNodeAttributes(elem,{"style":_43d}); 
     4047},setDisplayForElement:function(_43f,_440){ 
     4048var _441=MochiKit.Base.extend(null,arguments,1); 
     4049var _442=MochiKit.DOM.getElement; 
     4050for(var i=0;i<_441.length;i++){ 
     4051_440=_442(_441[i]); 
     4052if(_440){ 
     4053_440.style.display=_43f
    40554054} 
    40564055} 
     
    41094108return this.__repr__(); 
    41104109}; 
    4111 MochiKit.LoggingPane.createLoggingPane=function(_44b){ 
     4110MochiKit.LoggingPane.createLoggingPane=function(_44c){ 
    41124111var m=MochiKit.LoggingPane; 
    4113 _44b=!(!_44b); 
    4114 if(m._loggingPane&&m._loggingPane.inline!=_44b){ 
     4112_44c=!(!_44c); 
     4113if(m._loggingPane&&m._loggingPane.inline!=_44c){ 
    41154114m._loggingPane.closePane(); 
    41164115m._loggingPane=null; 
    41174116} 
    41184117if(!m._loggingPane||m._loggingPane.closed){ 
    4119 m._loggingPane=new m.LoggingPane(_44b,MochiKit.Logging.logger); 
     4118m._loggingPane=new m.LoggingPane(_44c,MochiKit.Logging.logger); 
    41204119} 
    41214120return m._loggingPane; 
    41224121}; 
    4123 MochiKit.LoggingPane.LoggingPane=function(_44d,_44e){ 
    4124 if(typeof (_44e)=="undefined"||_44e===null){ 
    4125 _44e=MochiKit.Logging.logger; 
    4126 } 
    4127 this.logger=_44e
    4128 var _44f=MochiKit.Base.update; 
    4129 var _450=MochiKit.Base.updatetree; 
     4122MochiKit.LoggingPane.LoggingPane=function(_44e,_44f){ 
     4123if(typeof (_44f)=="undefined"||_44f===null){ 
     4124_44f=MochiKit.Logging.logger; 
     4125} 
     4126this.logger=_44f
     4127var _450=MochiKit.Base.update; 
     4128var _451=MochiKit.Base.updatetree; 
    41304129var bind=MochiKit.Base.bind; 
    4131 var _452=MochiKit.Base.clone; 
     4130var _453=MochiKit.Base.clone; 
    41324131var win=window; 
    41334132var uid="_MochiKit_LoggingPane"; 
     
    41354134win=MochiKit.DOM.currentWindow(); 
    41364135} 
    4137 if(!_44d){ 
     4136if(!_44e){ 
    41384137var url=win.location.href.split("?")[0].replace(/[#:\/.><&-]/g,"_"); 
    41394138var name=uid+"_"+url; 
     
    41504149var doc=win.document; 
    41514150this.doc=doc; 
    4152 var _459=doc.getElementById(uid); 
    4153 var _45a=!!_459; 
    4154 if(_459&&typeof (_459.loggingPane)!="undefined"){ 
    4155 _459.loggingPane.logger=this.logger; 
    4156 _459.loggingPane.buildAndApplyFilter(); 
    4157 return _459.loggingPane; 
    4158 
    4159 if(_45a){ 
    4160 var _45b; 
    4161 while((_45b=_459.firstChild)){ 
    4162 _459.removeChild(_45b); 
    4163 
    4164 }else{ 
    4165 _459=doc.createElement("div"); 
    4166 _459.id=uid; 
    4167 
    4168 _459.loggingPane=this; 
    4169 var _45c=doc.createElement("input"); 
     4151var _45a=doc.getElementById(uid); 
     4152var _45b=!!_45a; 
     4153if(_45a&&typeof (_45a.loggingPane)!="undefined"){ 
     4154_45a.loggingPane.logger=this.logger; 
     4155_45a.loggingPane.buildAndApplyFilter(); 
     4156return _45a.loggingPane; 
     4157
     4158if(_45b){ 
     4159var _45c; 
     4160while((_45c=_45a.firstChild)){ 
     4161_45a.removeChild(_45c); 
     4162
     4163}else{ 
     4164_45a=doc.createElement("div"); 
     4165_45a.id=uid; 
     4166
     4167_45a.loggingPane=this; 
    41704168var _45d=doc.createElement("input"); 
    4171 var _45e=doc.createElement("button"); 
     4169var _45e=doc.createElement("input"); 
    41724170var _45f=doc.createElement("button"); 
    41734171var _460=doc.createElement("button"); 
    41744172var _461=doc.createElement("button"); 
    4175 var _462=doc.createElement("div"); 
     4173var _462=doc.createElement("button"); 
    41764174var _463=doc.createElement("div"); 
    4177 var _464=uid+"_Listener"; 
    4178 this.colorTable=_452(this.colorTable); 
    4179 var _465=[]; 
    4180 var _466=null; 
    4181 var _467=function(msg){ 
    4182 var _469=msg.level; 
    4183 if(typeof (_469)=="number"){ 
    4184 _469=MochiKit.Logging.LogLevel[_469]; 
    4185 
    4186 return _469; 
    4187 }; 
    4188 var _46a=function(msg){ 
     4175var _464=doc.createElement("div"); 
     4176var _465=uid+"_Listener"; 
     4177this.colorTable=_453(this.colorTable); 
     4178var _466=[]; 
     4179var _467=null; 
     4180var _468=function(msg){ 
     4181var _46a=msg.level; 
     4182if(typeof (_46a)=="number"){ 
     4183_46a=MochiKit.Logging.LogLevel[_46a]; 
     4184
     4185return _46a; 
     4186}; 
     4187var _46b=function(msg){ 
    41894188return msg.info.join(" "); 
    41904189}; 
    4191 var _46c=bind(function(msg){ 
    4192 var _46e=_467(msg); 
    4193 var text=_46a(msg); 
    4194 var c=this.colorTable[_46e]; 
     4190var _46d=bind(function(msg){ 
     4191var _46f=_468(msg); 
     4192var text=_46b(msg); 
     4193var c=this.colorTable[_46f]; 
    41954194var p=doc.createElement("span"); 
    4196 p.className="MochiKit-LogMessage MochiKit-LogLevel-"+_46e
     4195p.className="MochiKit-LogMessage MochiKit-LogLevel-"+_46f
    41974196p.style.cssText="margin: 0px; white-space: -moz-pre-wrap; white-space: -o-pre-wrap; white-space: pre-wrap; white-space: pre-line; word-wrap: break-word; wrap-option: emergency; color: "+c; 
    4198 p.appendChild(doc.createTextNode(_46e+": "+text)); 
    4199 _463.appendChild(p); 
    4200 _463.appendChild(doc.createElement("br")); 
    4201 if(_462.offsetHeight>_462.scrollHeight){ 
    4202 _462.scrollTop=0; 
    4203 }else{ 
    4204 _462.scrollTop=_462.scrollHeight; 
     4197p.appendChild(doc.createTextNode(_46f+": "+text)); 
     4198_464.appendChild(p); 
     4199_464.appendChild(doc.createElement("br")); 
     4200if(_463.offsetHeight>_463.scrollHeight){ 
     4201_463.scrollTop=0; 
     4202}else{ 
     4203_463.scrollTop=_463.scrollHeight; 
    42054204} 
    42064205},this); 
    4207 var _472=function(msg){ 
    4208 _465[_465.length]=msg; 
    4209 _46c(msg); 
    4210 }; 
    4211 var _474=function(){ 
    4212 var _475,_476
     4206var _473=function(msg){ 
     4207_466[_466.length]=msg; 
     4208_46d(msg); 
     4209}; 
     4210var _475=function(){ 
     4211var _476,_477
    42134212try{ 
    4214 _475=new RegExp(_45c.value); 
    42154213_476=new RegExp(_45d.value); 
     4214_477=new RegExp(_45e.value); 
    42164215} 
    42174216catch(e){ 
     
    42204219} 
    42214220return function(msg){ 
    4222 return (_475.test(_467(msg))&&_476.test(_46a(msg))); 
    4223 }; 
    4224 }; 
    4225 var _478=function(){ 
    4226 while(_463.firstChild){ 
    4227 _463.removeChild(_463.firstChild); 
    4228 
     4221return (_476.test(_468(msg))&&_477.test(_46b(msg))); 
     4222}; 
    42294223}; 
    42304224var _479=function(){ 
    4231 _465=[]; 
    4232 _478(); 
    4233 }; 
    4234 var _47a=bind(function(){ 
     4225while(_464.firstChild){ 
     4226_464.removeChild(_464.firstChild); 
     4227
     4228}; 
     4229var _47a=function(){ 
     4230_466=[]; 
     4231_479(); 
     4232}; 
     4233var _47b=bind(function(){ 
    42354234if(this.closed){ 
    42364235return; 
     
    42404239MochiKit.LoggingPane._loggingPane=null; 
    42414240} 
    4242 this.logger.removeListener(_464); 
     4241this.logger.removeListener(_465); 
    42434242try{ 
    42444243try{ 
    4245 _459.loggingPane=null; 
     4244_45a.loggingPane=null; 
    42464245} 
    42474246catch(e){ 
    42484247logFatal("Bookmarklet was closed incorrectly."); 
    42494248} 
    4250 if(_44d){ 
    4251 _459.parentNode.removeChild(_459); 
     4249if(_44e){ 
     4250_45a.parentNode.removeChild(_45a); 
    42524251}else{ 
    42534252this.win.close(); 
     
    42574256} 
    42584257},this); 
    4259 var _47b=function(){ 
    4260 _478(); 
    4261 for(var i=0;i<_465.length;i++){ 
    4262 var msg=_465[i]; 
    4263 if(_466===null||_466(msg)){ 
    4264 _46c(msg); 
     4258var _47c=function(){ 
     4259_479(); 
     4260for(var i=0;i<_466.length;i++){ 
     4261var msg=_466[i]; 
     4262if(_467===null||_467(msg)){ 
     4263_46d(msg); 
    42654264} 
    42664265} 
    42674266}; 
    42684267this.buildAndApplyFilter=function(){ 
    4269 _466=_474(); 
    4270 _47b(); 
    4271 this.logger.removeListener(_464); 
    4272 this.logger.addListener(_464,_466,_472); 
    4273 }; 
    4274 var _47e=bind(function(){ 
    4275 _465=this.logger.getMessages(); 
    4276 _47b(); 
     4268_467=_475(); 
     4269_47c(); 
     4270this.logger.removeListener(_465); 
     4271this.logger.addListener(_465,_467,_473); 
     4272}; 
     4273var _47f=bind(function(){ 
     4274_466=this.logger.getMessages(); 
     4275_47c(); 
    42774276},this); 
    4278 var _47f=bind(function(_480){ 
    4279 _480=_480||window.event; 
    4280 key=_480.which||_480.keyCode; 
     4277var _480=bind(function(_481){ 
     4278_481=_481||window.event; 
     4279key=_481.which||_481.keyCode; 
    42814280if(key==13){ 
    42824281this.buildAndApplyFilter(); 
    42834282} 
    42844283},this); 
    4285 var _481="display: block; z-index: 1000; left: 0px; bottom: 0px; position: fixed; width: 100%; background-color: white; font: "+this.logFont; 
    4286 if(_44d){ 
    4287 _481+="; height: 10em; border-top: 2px solid black"; 
    4288 }else{ 
    4289 _481+="; height: 100%;"; 
    4290 
    4291 _459.style.cssText=_481; 
    4292 if(!_45a){ 
    4293 doc.body.appendChild(_459); 
    4294 
    4295 _481={"cssText":"width: 33%; display: inline; font: "+this.logFont}; 
    4296 _450(_45c,{"value":"FATAL|ERROR|WARNING|INFO|DEBUG","onkeypress":_47f,"style":_481}); 
    4297 _459.appendChild(_45c); 
    4298 _450(_45d,{"value":".*","onkeypress":_47f,"style":_481}); 
    4299 _459.appendChild(_45d); 
    4300 _481="width: 8%; display:inline; font: "+this.logFont; 
    4301 _45e.appendChild(doc.createTextNode("Filter")); 
    4302 _45e.onclick=bind("buildAndApplyFilter",this); 
    4303 _45e.style.cssText=_481; 
    4304 _459.appendChild(_45e); 
    4305 _45f.appendChild(doc.createTextNode("Load")); 
    4306 _45f.onclick=_47e; 
    4307 _45f.style.cssText=_481; 
    4308 _459.appendChild(_45f); 
    4309 _460.appendChild(doc.createTextNode("Clear")); 
    4310 _460.onclick=_479; 
    4311 _460.style.cssText=_481; 
    4312 _459.appendChild(_460); 
    4313 _461.appendChild(doc.createTextNode("Close")); 
     4284var _482="display: block; z-index: 1000; left: 0px; bottom: 0px; position: fixed; width: 100%; background-color: white; font: "+this.logFont; 
     4285if(_44e){ 
     4286_482+="; height: 10em; border-top: 2px solid black"; 
     4287}else{ 
     4288_482+="; height: 100%;"; 
     4289
     4290_45a.style.cssText=_482; 
     4291if(!_45b){ 
     4292doc.body.appendChild(_45a); 
     4293
     4294_482={"cssText":"width: 33%; display: inline; font: "+this.logFont}; 
     4295_451(_45d,{"value":"FATAL|ERROR|WARNING|INFO|DEBUG","onkeypress":_480,"style":_482}); 
     4296_45a.appendChild(_45d); 
     4297_451(_45e,{"value":".*","onkeypress":_480,"style":_482}); 
     4298_45a.appendChild(_45e); 
     4299_482="width: 8%; display:inline; font: "+this.logFont; 
     4300_45f.appendChild(doc.createTextNode("Filter")); 
     4301_45f.onclick=bind("buildAndApplyFilter",this); 
     4302_45f.style.cssText=_482; 
     4303_45a.appendChild(_45f); 
     4304_460.appendChild(doc.createTextNode("Load")); 
     4305_460.onclick=_47f; 
     4306_460.style.cssText=_482; 
     4307_45a.appendChild(_460); 
     4308_461.appendChild(doc.createTextNode("Clear")); 
    43144309_461.onclick=_47a; 
    4315 _461.style.cssText=_481; 
    4316 _459.appendChild(_461); 
    4317 _462.style.cssText="overflow: auto; width: 100%"; 
    4318 _463.style.cssText="width: 100%; height: "+(_44d?"8em":"100%"); 
    4319 _462.appendChild(_463); 
    4320 _459.appendChild(_462); 
     4310_461.style.cssText=_482; 
     4311_45a.appendChild(_461); 
     4312_462.appendChild(doc.createTextNode("Close")); 
     4313_462.onclick=_47b; 
     4314_462.style.cssText=_482; 
     4315_45a.appendChild(_462); 
     4316_463.style.cssText="overflow: auto; width: 100%"; 
     4317_464.style.cssText="width: 100%; height: "+(_44e?"8em":"100%"); 
     4318_463.appendChild(_464); 
     4319_45a.appendChild(_463); 
    43214320this.buildAndApplyFilter();