Changeset 720

Show
Ignore:
Timestamp:
04/24/06 13:21:43 (2 years ago)
Author:
bob@redivi.com
Message:

pack

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • mochikit/trunk/doc/html/MochiKit/Base.html

    r717 r720  
    621621</blockquote> 
    622622<p> 
     623<a name="fn-method"></a> 
     624<a class="mochidef reference" href="#fn-method">method(self, func, ...)</a>:</p> 
     625<blockquote> 
     626<p>Alternate form of <a class="mochiref reference" href="#fn-bind">bind</a> that takes the object before the 
     627function.  These two are equivalent:</p> 
     628<pre class="literal-block"> 
     629bind(&quot;method&quot;, myobject) 
     630method(myobject, &quot;method&quot;) 
     631</pre> 
     632</blockquote> 
     633<p> 
    623634<a name="fn-namefunctions"></a> 
    624635<a class="mochidef reference" href="#fn-namefunctions">nameFunctions(namespace)</a>:</p> 
  • mochikit/trunk/doc/html/MochiKit/VersionHistory.html

    r717 r720  
    1818<li>IMPORTANT: Renamed MochiKit.Base.forward to forwardCall (for export)</li> 
    1919<li>IMPORTANT: Renamed MochiKit.Base.find to findValue (for export)</li> 
     20<li>New MochiKit.Base.method as a convenience form of bind that takes the 
     21object before the method</li> 
    2022<li>New MochiKit.Base.flattenArguments for flattening a list of arguments to 
    2123a single Array</li> 
  • mochikit/trunk/doc/html/MochiKit/index.html

    r717 r720  
    5757<li>IMPORTANT: Renamed MochiKit.Base.forward to forwardCall (for export)</li> 
    5858<li>IMPORTANT: Renamed MochiKit.Base.find to findValue (for export)</li> 
     59<li>New MochiKit.Base.method as a convenience form of bind that takes the 
     60object before the method</li> 
    5961<li>New MochiKit.Base.flattenArguments for flattening a list of arguments to 
    6062a single Array</li> 
  • mochikit/trunk/packed/MochiKit/MochiKit.js

    r717 r720  
    391391return eval("(func("+_47.join(",")+"))"); 
    392392}; 
    393 },bind:function(_48,_49){ 
    394 if(typeof (_48)=="string"){ 
    395 _48=_49[_48]; 
    396 
    397 var _50=_48.im_func; 
    398 var _51=_48.im_preargs; 
    399 var _52=_48.im_self; 
     393},method:function(_48,_49){ 
    400394var m=MochiKit.Base; 
    401 if(typeof (_48)=="function"&&typeof (_48.apply)=="undefined"){ 
    402 _48=m._wrapDumbFunction(_48); 
    403 
    404 if(typeof (_50)!="function"){ 
    405 _50=_48; 
    406 
    407 if(typeof (_49)!="undefined"){ 
    408 _52=_49; 
    409 
    410 if(typeof (_51)=="undefined"){ 
    411 _51=[]; 
    412 }else{ 
    413 _51=_51.slice(); 
    414 
    415 m.extend(_51,arguments,2); 
    416 var _53=function(){ 
    417 var _54=arguments; 
     395return m.bind.apply(this,m.extend([_49,_48],arguments,2)); 
     396},bind:function(_50,_51){ 
     397if(typeof (_50)=="string"){ 
     398_50=_51[_50]; 
     399
     400var _52=_50.im_func; 
     401var _53=_50.im_preargs; 
     402var _54=_50.im_self; 
     403var m=MochiKit.Base; 
     404if(typeof (_50)=="function"&&typeof (_50.apply)=="undefined"){ 
     405_50=m._wrapDumbFunction(_50); 
     406
     407if(typeof (_52)!="function"){ 
     408_52=_50; 
     409
     410if(typeof (_51)!="undefined"){ 
     411_54=_51; 
     412
     413if(typeof (_53)=="undefined"){ 
     414_53=[]; 
     415}else{ 
     416_53=_53.slice(); 
     417
     418m.extend(_53,arguments,2); 
     419var _55=function(){ 
     420var _56=arguments; 
    418421var me=arguments.callee; 
    419422if(me.im_preargs.length>0){ 
    420 _54=m.concat(me.im_preargs,_54); 
    421 } 
    422 var _49=me.im_self; 
    423 if(!_49){ 
    424 _49=this; 
    425 } 
    426 return me.im_func.apply(_49,_54); 
    427 }; 
    428 _53.im_self=_52
    429 _53.im_func=_50
    430 _53.im_preargs=_51
    431 return _53
    432 },bindMethods:function(_55){ 
    433 var _56=MochiKit.Base.bind; 
    434 for(var k in _55){ 
    435 var _57=_55[k]; 
    436 if(typeof (_57)=="function"){ 
    437 _55[k]=_56(_57,_55); 
    438 } 
    439 } 
    440 },registerComparator:function(_58,_59,_60,_61){ 
    441 MochiKit.Base.comparatorRegistry.register(_58,_59,_60,_61); 
     423_56=m.concat(me.im_preargs,_56); 
     424} 
     425var _51=me.im_self; 
     426if(!_51){ 
     427_51=this; 
     428} 
     429return me.im_func.apply(_51,_56); 
     430}; 
     431_55.im_self=_54
     432_55.im_func=_52
     433_55.im_preargs=_53
     434return _55
     435},bindMethods:function(_57){ 
     436var _58=MochiKit.Base.bind; 
     437for(var k in _57){ 
     438var _59=_57[k]; 
     439if(typeof (_59)=="function"){ 
     440_57[k]=_58(_59,_57); 
     441} 
     442} 
     443},registerComparator:function(_60,_61,_62,_63){ 
     444MochiKit.Base.comparatorRegistry.register(_60,_61,_62,_63); 
    442445},_primitives:{"bool":true,"string":true,"number":true},compare:function(a,b){ 
    443446if(a==b){ 
    444447return 0; 
    445448} 
    446 var _62=(typeof (a)=="undefined"||a==null); 
    447 var _63=(typeof (b)=="undefined"||b==null); 
    448 if(_62&&_63){ 
     449var _64=(typeof (a)=="undefined"||a==null); 
     450var _65=(typeof (b)=="undefined"||b==null); 
     451if(_64&&_65){ 
    449452return 0; 
    450453}else{ 
    451 if(_62){ 
     454if(_64){ 
    452455return -1; 
    453456}else{ 
    454 if(_63){ 
     457if(_65){ 
    455458return 1; 
    456459} 
     
    458461} 
    459462var m=MochiKit.Base; 
    460 var _64=m._primitives; 
    461 if(!(typeof (a) in _64&&typeof (b) in _64)){ 
     463var _66=m._primitives; 
     464if(!(typeof (a) in _66&&typeof (b) in _66)){ 
    462465try{ 
    463466return m.comparatorRegistry.match(a,b); 
     
    476479} 
    477480} 
    478 var _65=m.repr; 
    479 throw new TypeError(_65(a)+" and "+_65(b)+" can not be compared"); 
     481var _67=m.repr; 
     482throw new TypeError(_67(a)+" and "+_67(b)+" can not be compared"); 
    480483},compareDateLike:function(a,b){ 
    481484return MochiKit.Base.compare(a.getTime(),b.getTime()); 
    482485},compareArrayLike:function(a,b){ 
    483 var _66=MochiKit.Base.compare; 
    484 var _67=a.length; 
    485 var _68=0; 
    486 if(_67>b.length){ 
    487 _68=1; 
    488 _67=b.length; 
    489 }else{ 
    490 if(_67<b.length){ 
    491 _68=-1; 
    492 } 
    493 } 
    494 for(var i=0;i<_67;i++){ 
    495 var cmp=_66(a[i],b[i]); 
     486var _68=MochiKit.Base.compare; 
     487var _69=a.length; 
     488var _70=0; 
     489if(_69>b.length){ 
     490_70=1; 
     491_69=b.length; 
     492}else{ 
     493if(_69<b.length){ 
     494_70=-1; 
     495} 
     496} 
     497for(var i=0;i<_69;i++){ 
     498var cmp=_68(a[i],b[i]); 
    496499if(cmp){ 
    497500return cmp; 
    498501} 
    499502} 
    500 return _68
    501 },registerRepr:function(_70,_71,_72,_73){ 
    502 MochiKit.Base.reprRegistry.register(_70,_71,_72,_73); 
     503return _70
     504},registerRepr:function(_72,_73,_74,_75){ 
     505MochiKit.Base.reprRegistry.register(_72,_73,_74,_75); 
    503506},repr:function(o){ 
    504507if(typeof (o)=="undefined"){ 
     
    525528} 
    526529try{ 
    527 var _74=(o+""); 
     530var _76=(o+""); 
    528531} 
    529532catch(e){ 
     
    531534} 
    532535if(typeof (o)=="function"){ 
    533 o=_74.replace(/^\s+/,""); 
     536o=_76.replace(/^\s+/,""); 
    534537var idx=o.indexOf("{"); 
    535538if(idx!=-1){ 
     
    537540} 
    538541} 
    539 return _74
     542return _76
    540543},reprArrayLike:function(o){ 
    541544var m=MochiKit.Base; 
     
    545548},reprNumber:function(o){ 
    546549return o+""; 
    547 },registerJSON:function(_76,_77,_78,_79){ 
    548 MochiKit.Base.jsonRegistry.register(_76,_77,_78,_79); 
     550},registerJSON:function(_78,_79,_80,_81){ 
     551MochiKit.Base.jsonRegistry.register(_78,_79,_80,_81); 
    549552},evalJSON:function(){ 
    550553return eval("("+arguments[0]+")"); 
    551554},serializeJSON:function(o){ 
    552 var _80=typeof (o); 
    553 if(_80=="undefined"){ 
     555var _82=typeof (o); 
     556if(_82=="undefined"){ 
    554557return "undefined"; 
    555558}else{ 
    556 if(_80=="number"||_80=="boolean"){ 
     559if(_82=="number"||_82=="boolean"){ 
    557560return o+""; 
    558561}else{ 
     
    563566} 
    564567var m=MochiKit.Base; 
    565 var _81=m.reprString; 
    566 if(_80=="string"){ 
    567 return _81(o); 
     568var _83=m.reprString; 
     569if(_82=="string"){ 
     570return _83(o); 
    568571} 
    569572var me=arguments.callee; 
    570 var _82
     573var _84
    571574if(typeof (o.__json__)=="function"){ 
    572 _82=o.__json__(); 
    573 if(o!==_82){ 
    574 return me(_82); 
     575_84=o.__json__(); 
     576if(o!==_84){ 
     577return me(_84); 
    575578} 
    576579} 
    577580if(typeof (o.json)=="function"){ 
    578 _82=o.json(); 
    579 if(o!==_82){ 
    580 return me(_82); 
    581 } 
    582 } 
    583 if(_80!="function"&&typeof (o.length)=="number"){ 
     581_84=o.json(); 
     582if(o!==_84){ 
     583return me(_84); 
     584} 
     585} 
     586if(_82!="function"&&typeof (o.length)=="number"){ 
    584587var res=[]; 
    585588for(var i=0;i<o.length;i++){ 
     
    593596} 
    594597try{ 
    595 _82=m.jsonRegistry.match(o); 
    596 return me(_82); 
     598_84=m.jsonRegistry.match(o); 
     599return me(_84); 
    597600} 
    598601catch(e){ 
     
    601604} 
    602605} 
    603 if(_80=="function"){ 
     606if(_82=="function"){ 
    604607return null; 
    605608} 
    606609res=[]; 
    607610for(var k in o){ 
    608 var _84
     611var _86
    609612if(typeof (k)=="number"){ 
    610 _84="\""+k+"\""; 
     613_86="\""+k+"\""; 
    611614}else{ 
    612615if(typeof (k)=="string"){ 
    613 _84=_81(k); 
     616_86=_83(k); 
    614617}else{ 
    615618continue; 
     
    620623continue; 
    621624} 
    622 res.push(_84+":"+val); 
     625res.push(_86+":"+val); 
    623626} 
    624627return "{"+res.join(", ")+"}"; 
    625628},objEqual:function(a,b){ 
    626629return (MochiKit.Base.compare(a,b)==0); 
    627 },arrayEqual:function(_85,arr){ 
    628 if(_85.length!=arr.length){ 
     630},arrayEqual:function(_87,arr){ 
     631if(_87.length!=arr.length){ 
    629632return false; 
    630633} 
    631 return (MochiKit.Base.compare(_85,arr)==0); 
     634return (MochiKit.Base.compare(_87,arr)==0); 
    632635},concat:function(){ 
    633 var _87=[]; 
    634 var _88=MochiKit.Base.extend; 
     636var _89=[]; 
     637var _90=MochiKit.Base.extend; 
    635638for(var i=0;i<arguments.length;i++){ 
    636 _88(_87,arguments[i]); 
    637 } 
    638 return _87
     639_90(_89,arguments[i]); 
     640} 
     641return _89
    639642},keyComparator:function(key){ 
    640643var m=MochiKit.Base; 
    641 var _90=m.compare; 
     644var _92=m.compare; 
    642645if(arguments.length==1){ 
    643646return function(a,b){ 
    644 return _90(a[key],b[key]); 
    645 }; 
    646 } 
    647 var _91=m.extend(null,arguments); 
     647return _92(a[key],b[key]); 
     648}; 
     649} 
     650var _93=m.extend(null,arguments); 
    648651return function(a,b){ 
    649 var _92=0; 
    650 for(var i=0;(_92==0)&&(i<_91.length);i++){ 
    651 var key=_91[i]; 
    652 _92=_90(a[key],b[key]); 
    653 } 
    654 return _92
     652var _94=0; 
     653for(var i=0;(_94==0)&&(i<_93.length);i++){ 
     654var key=_93[i]; 
     655_94=_92(a[key],b[key]); 
     656} 
     657return _94
    655658}; 
    656659},reverseKeyComparator:function(key){ 
    657 var _93=MochiKit.Base.keyComparator.apply(this,arguments); 
     660var _95=MochiKit.Base.keyComparator.apply(this,arguments); 
    658661return function(a,b){ 
    659 return _93(b,a); 
    660 }; 
    661 },partial:function(_94){ 
     662return _95(b,a); 
     663}; 
     664},partial:function(_96){ 
    662665var m=MochiKit.Base; 
    663 return m.bind.apply(this,m.extend([_94,undefined],arguments,1)); 
    664 },listMinMax:function(_95,lst){ 
     666return m.bind.apply(this,m.extend([_96,undefined],arguments,1)); 
     667},listMinMax:function(_97,lst){ 
    665668if(lst.length==0){ 
    666669return null; 
    667670} 
    668671var cur=lst[0]; 
    669 var _97=MochiKit.Base.compare; 
     672var _99=MochiKit.Base.compare; 
    670673for(var i=1;i<lst.length;i++){ 
    671674var o=lst[i]; 
    672 if(_97(o,cur)==_95){ 
     675if(_99(o,cur)==_97){ 
    673676cur=o; 
    674677} 
     
    679682},objMin:function(){ 
    680683return MochiKit.Base.listMinMax(-1,arguments); 
    681 },findIdentical:function(lst,_98,_99,end){ 
     684},findIdentical:function(lst,_100,_101,end){ 
    682685if(typeof (end)=="undefined"||end==null){ 
    683686end=lst.length; 
    684687} 
    685 for(var i=(_99||0);i<end;i++){ 
    686 if(lst[i]===_98){ 
     688for(var i=(_101||0);i<end;i++){ 
     689if(lst[i]===_100){ 
    687690return i; 
    688691} 
    689692} 
    690693return -1; 
    691 },findValue:function(lst,_101,_102,end){ 
     694},findValue:function(lst,_103,_104,end){ 
    692695if(typeof (end)=="undefined"||end==null){ 
    693696end=lst.length; 
    694697} 
    695698var cmp=MochiKit.Base.compare; 
    696 for(var i=(_102||0);i<end;i++){ 
    697 if(cmp(lst[i],_101)==0){ 
     699for(var i=(_104||0);i<end;i++){ 
     700if(cmp(lst[i],_103)==0){ 
    698701return i; 
    699702} 
    700703} 
    701704return -1; 
    702 },nodeWalk:function(node,_104){ 
    703 var _105=[node]; 
    704 var _106=MochiKit.Base.extend; 
    705 while(_105.length){ 
    706 var res=_104(_105.shift()); 
     705},nodeWalk:function(node,_106){ 
     706var _107=[node]; 
     707var _108=MochiKit.Base.extend; 
     708while(_107.length){ 
     709var res=_106(_107.shift()); 
    707710if(res){ 
    708 _106(_105,res); 
    709 } 
    710 } 
    711 },nameFunctions:function(_107){ 
    712 var base=_107.NAME; 
     711_108(_107,res); 
     712} 
     713} 
     714},nameFunctions:function(_109){ 
     715var base=_109.NAME; 
    713716if(typeof (base)=="undefined"){ 
    714717base=""; 
     
    716719base=base+"."; 
    717720} 
    718 for(var name in _107){ 
    719 var o=_107[name]; 
     721for(var name in _109){ 
     722var o=_109[name]; 
    720723if(typeof (o)=="function"&&typeof (o.NAME)=="undefined"){ 
    721724try{ 
     
    726729} 
    727730} 
    728 },queryString:function(_110,_111){ 
    729 if(typeof (MochiKit.DOM)!="undefined"&&arguments.length==1&&(typeof (_110)=="string"||(typeof (_110.nodeType)!="undefined"&&_110.nodeType>0))){ 
    730 var kv=MochiKit.DOM.formContents(_110); 
    731 _110=kv[0]; 
    732 _111=kv[1]; 
     731},queryString:function(_112,_113){ 
     732if(typeof (MochiKit.DOM)!="undefined"&&arguments.length==1&&(typeof (_112)=="string"||(typeof (_112.nodeType)!="undefined"&&_112.nodeType>0))){ 
     733var kv=MochiKit.DOM.formContents(_112); 
     734_112=kv[0]; 
     735_113=kv[1]; 
    733736}else{ 
    734737if(arguments.length==1){ 
    735 var o=_110
    736 _110=[]; 
    737 _111=[]; 
     738var o=_112
     739_112=[]; 
     740_113=[]; 
    738741for(var k in o){ 
    739742var v=o[k]; 
    740743if(typeof (v)!="function"){ 
    741 _110.push(k); 
    742 _111.push(v); 
     744_112.push(k); 
     745_113.push(v); 
    743746} 
    744747} 
     
    746749} 
    747750var rval=[]; 
    748 var len=Math.min(_110.length,_111.length); 
    749 var _115=MochiKit.Base.urlEncode; 
     751var len=Math.min(_112.length,_113.length); 
     752var _117=MochiKit.Base.urlEncode; 
    750753for(var i=0;i<len;i++){ 
    751 v=_111[i]; 
     754v=_113[i]; 
    752755if(typeof (v)!="undefined"&&v!=null){ 
    753 rval.push(_115(_110[i])+"="+_115(v)); 
     756rval.push(_117(_112[i])+"="+_117(v)); 
    754757} 
    755758} 
    756759return rval.join("&"); 
    757 },parseQueryString:function(_116,_117){ 
    758 var _118=_116.replace(/\+/g,"%20").split("&"); 
     760},parseQueryString:function(_118,_119){ 
     761var _120=_118.replace(/\+/g,"%20").split("&"); 
    759762var o={}; 
    760 var _119
     763var _121
    761764if(typeof (decodeURIComponent)!="undefined"){ 
    762 _119=decodeURIComponent; 
    763 }else{ 
    764 _119=unescape; 
    765 } 
    766 if(_117){ 
    767 for(var i=0;i<_118.length;i++){ 
    768 var pair=_118[i].split("="); 
    769 var name=_119(pair[0]); 
     765_121=decodeURIComponent; 
     766}else{ 
     767_121=unescape; 
     768} 
     769if(_119){ 
     770for(var i=0;i<_120.length;i++){ 
     771var pair=_120[i].split("="); 
     772var name=_121(pair[0]); 
    770773var arr=o[name]; 
    771774if(!(arr instanceof Array)){ 
     
    773776o[name]=arr; 
    774777} 
    775 arr.push(_119(pair[1])); 
    776 } 
    777 }else{ 
    778 for(i=0;i<_118.length;i++){ 
    779 pair=_118[i].split("="); 
    780 o[_119(pair[0])]=_119(pair[1]); 
     778arr.push(_121(pair[1])); 
     779} 
     780}else{ 
     781for(i=0;i<_120.length;i++){ 
     782pair=_120[i].split("="); 
     783o[_121(pair[0])]=_121(pair[1]); 
    781784} 
    782785} 
     
    786789this.pairs=[]; 
    787790}; 
    788 MochiKit.Base.AdapterRegistry.prototype={register:function(name,_121,wrap,_123){ 
    789 if(_123){ 
    790 this.pairs.unshift([name,_121,wrap]); 
    791 }else{ 
    792 this.pairs.push([name,_121,wrap]); 
     791MochiKit.Base.AdapterRegistry.prototype={register:function(name,_123,wrap,_125){ 
     792if(_125){ 
     793this.pairs.unshift([name,_123,wrap]); 
     794}else{ 
     795this.pairs.push([name,_123,wrap]); 
    793796} 
    794797},match:function(){ 
     
    810813return false; 
    811814}}; 
    812 MochiKit.Base.EXPORT=["counter","clone","extend","update","updatetree","setdefault","keys","items","NamedError","operator","forwardCall","itemgetter","typeMatcher","isCallable","isUndefined","isUndefinedOrNull","isNull","isNotEmpty","isArrayLike","isDateLike","xmap","map","xfilter","filter","bind","bindMethods","NotFound","AdapterRegistry","registerComparator","compare","registerRepr","repr","objEqual","arrayEqual","concat","keyComparator","reverseKeyComparator","partial","merge","listMinMax","listMax","listMin","objMax","objMin","nodeWalk","zip","urlEncode","queryString","serializeJSON","registerJSON","evalJSON","parseQueryString","findValue","findIdentical","flattenArguments"]; 
     815MochiKit.Base.EXPORT=["counter","clone","extend","update","updatetree","setdefault","keys","items","NamedError","operator","forwardCall","itemgetter","typeMatcher","isCallable","isUndefined","isUndefinedOrNull","isNull","isNotEmpty","isArrayLike","isDateLike","xmap","map","xfilter","filter","bind","bindMethods","NotFound","AdapterRegistry","registerComparator","compare","registerRepr","repr","objEqual","arrayEqual","concat","keyComparator","reverseKeyComparator","partial","merge","listMinMax","listMax","listMin","objMax","objMin","nodeWalk","zip","urlEncode","queryString","serializeJSON","registerJSON","evalJSON","parseQueryString","findValue","findIdentical","flattenArguments","method"]; 
    813816MochiKit.Base.EXPORT_OK=["nameFunctions","comparatorRegistry","reprRegistry","jsonRegistry","compareDateLike","compareArrayLike","reprArrayLike","reprString","reprNumber"]; 
    814 MochiKit.Base._exportSymbols=function(_124,_125){ 
     817MochiKit.Base._exportSymbols=function(_126,_127){ 
    815818if(typeof (MochiKit.__export__)=="undefined"){ 
    816819MochiKit.__export__=(MochiKit.__compat__||(typeof (JSAN)=="undefined"&&typeof (dojo)=="undefined")); 
     
    819822return; 
    820823} 
    821 var all=_125.EXPORT_TAGS[":all"]; 
     824var all=_127.EXPORT_TAGS[":all"]; 
    822825for(var i=0;i<all.length;i++){ 
    823 _124[all[i]]=_125[all[i]]; 
     826_126[all[i]]=_127[all[i]]; 
    824827} 
    825828}; 
     
    829832m.find=m.findValue; 
    830833if(typeof (encodeURIComponent)!="undefined"){ 
    831 m.urlEncode=function(_127){ 
    832 return encodeURIComponent(_127).replace(/\'/g,"%27"); 
    833 }; 
    834 }else{ 
    835 m.urlEncode=function(_128){ 
    836 return escape(_128).replace(/\+/g,"%2B").replace(/\"/g,"%22").rval.replace(/\'/g,"%27"); 
     834m.urlEncode=function(_129){ 
     835return encodeURIComponent(_129).replace(/\'/g,"%27"); 
     836}; 
     837}else{ 
     838m.urlEncode=function(_130){ 
     839return escape(_130).replace(/\+/g,"%2B").replace(/\"/g,"%22").rval.replace(/\'/g,"%27"); 
    837840}; 
    838841} 
     
    895898},toString:function(){ 
    896899return this.__repr__(); 
    897 },registerIteratorFactory:function(name,_129,_130,_131){ 
    898 MochiKit.Iter.iteratorRegistry.register(name,_129,_130,_131); 
    899 },iter:function(_132,_133){ 
     900},registerIteratorFactory:function(name,_131,_132,_133){ 
     901MochiKit.Iter.iteratorRegistry.register(name,_131,_132,_133); 
     902},iter:function(_134,_135){ 
    900903var self=MochiKit.Iter; 
    901904if(arguments.length==2){ 
    902905return self.takewhile(function(a){ 
    903 return a!=_133
    904 },_132); 
    905 } 
    906 if(typeof (_132.next)=="function"){ 
    907 return _132
    908 }else{ 
    909 if(typeof (_132.iter)=="function"){ 
    910 return _132.iter(); 
    911 } 
    912 } 
    913 try{ 
    914 return self.iteratorRegistry.match(_132); 
     906return a!=_135
     907},_134); 
     908} 
     909if(typeof (_134.next)=="function"){ 
     910return _134
     911}else{ 
     912if(typeof (_134.iter)=="function"){ 
     913return _134.iter(); 
     914} 
     915} 
     916try{ 
     917return self.iteratorRegistry.match(_134); 
    915918} 
    916919catch(e){ 
    917920var m=MochiKit.Base; 
    918921if(e==m.NotFound){ 
    919 e=new TypeError(typeof (_132)+": "+m.repr(_132)+" is not iterable"); 
     922e=new TypeError(typeof (_134)+": "+m.repr(_134)+" is not iterable"); 
    920923} 
    921924throw e; 
     
    933936var m=MochiKit.Base; 
    934937var lst=[]; 
    935 var _136=self.iter(p); 
     938var _138=self.iter(p); 
    936939return {repr:function(){ 
    937940return "cycle(...)"; 
    938941},toString:m.forwardCall("repr"),next:function(){ 
    939942try{ 
    940 var rval=_136.next(); 
     943var rval=_138.next(); 
    941944lst.push(rval); 
    942945return rval; 
     
    978981return elem; 
    979982}}; 
    980 },next:function(_138){ 
    981 return _138.next(); 
     983},next:function(_140){ 
     984return _140.next(); 
    982985},izip:function(p,q){ 
    983986var m=MochiKit.Base; 
    984987var next=MochiKit.Iter.next; 
    985 var _141=m.map(iter,arguments); 
     988var _143=m.map(iter,arguments); 
    986989return {repr:function(){ 
    987990return "izip(...)"; 
    988991},toString:m.forwardCall("repr"),next:function(){ 
    989 return m.map(next,_141); 
     992return m.map(next,_143); 
    990993}}; 
    991994},ifilter:function(pred,seq){ 
     
    10271030var m=MochiKit.Base; 
    10281031seq=self.iter(seq); 
    1029 var _144=0; 
     1032var _146=0; 
    10301033var stop=0; 
    10311034var step=1; 
     
    10351038}else{ 
    10361039if(arguments.length==3){ 
    1037 _144=arguments[1]; 
     1040_146=arguments[1]; 
    10381041stop=arguments[2]; 
    10391042}else{ 
    1040 _144=arguments[1]; 
     1043_146=arguments[1]; 
    10411044stop=arguments[2]; 
    10421045step=arguments[3]; 
     
    10441047} 
    10451048return {repr:function(){ 
    1046 return "islice("+["...",_144,stop,step].join(", ")+")"; 
     1049return "islice("+["...",_146,stop,step].join(", ")+")"; 
    10471050},toString:m.forwardCall("repr"),next:function(){ 
    10481051var rval; 
    1049 while(i<_144){ 
     1052while(i<_146){ 
    10501053rval=seq.next(); 
    10511054i++; 
    10521055} 
    1053 if(_144>=stop){ 
     1056if(_146>=stop){ 
    10541057throw self.StopIteration; 
    10551058} 
    1056 _144+=step; 
     1059_146+=step; 
    10571060return rval; 
    10581061}}; 
     
    10601063var m=MochiKit.Base; 
    10611064var self=MochiKit.Iter; 
    1062 var _148=m.map(self.iter,m.extend(null,arguments,1)); 
     1065var _150=m.map(self.iter,m.extend(null,arguments,1)); 
    10631066var map=m.map; 
    10641067var next=self.next; 
     
    10661069return "imap(...)"; 
    10671070},toString:m.forwardCall("repr"),next:function(){ 
    1068 return fun.apply(this,map(next,_148)); 
     1071return fun.apply(this,map(next,_150)); 
    10691072}}; 
    10701073},applymap:function(fun,seq,self){ 
     
    10821085return self.iter(arguments[0]); 
    10831086} 
    1084 var _150=m.map(self.iter,arguments); 
     1087var _152=m.map(self.iter,arguments); 
    10851088return {repr:function(){ 
    10861089return "chain(...)"; 
    10871090},toString:m.forwardCall("repr"),next:function(){ 
    1088 while(_150.length>1){ 
    1089 try{ 
    1090 return _150[0].next(); 
     1091while(_152.length>1){ 
     1092try{ 
     1093return _152[0].next(); 
    10911094} 
    10921095catch(e){ 
     
    10941097throw e; 
    10951098} 
    1096 _150.shift(); 
    1097 } 
    1098 } 
    1099 if(_150.length==1){ 
    1100 var arg=_150.shift(); 
     1099_152.shift(); 
     1100} 
     1101} 
     1102if(_152.length==1){ 
     1103var arg=_152.shift(); 
    11011104this.next=m.bind("next",arg); 
    11021105return this.next(); 
     
    11351138return rval; 
    11361139}}; 
    1137 },_tee:function(_152,sync,_154){ 
    1138 sync.pos[_152]=-1; 
     1140},_tee:function(_154,sync,_156){ 
     1141sync.pos[_154]=-1; 
    11391142var m=MochiKit.Base; 
    1140 var _155=m.listMin; 
     1143var _157=m.listMin; 
    11411144return {repr:function(){ 
    1142 return "tee("+_152+", ...)"; 
     1145return "tee("+_154+", ...)"; 
    11431146},toString:m.forwardCall("repr"),next:function(){ 
    11441147var rval; 
    1145 var i=sync.pos[_152]; 
     1148var i=sync.pos[_154]; 
    11461149if(i==sync.max){ 
    1147 rval=_154.next(); 
     1150rval=_156.next(); 
    11481151sync.deque.push(rval); 
    11491152sync.max+=1; 
    1150 sync.pos[_152]+=1; 
     1153sync.pos[_154]+=1; 
    11511154}else{ 
    11521155rval=sync.deque[i-sync.min]; 
    1153 sync.pos[_152]+=1; 
    1154 if(i==sync.min&&_155(sync.pos)!=sync.min){ 
     1156sync.pos[_154]+=1; 
     1157if(i==sync.min&&_157(sync.pos)!=sync.min){ 
    11551158sync.min+=1; 
    11561159sync.deque.shift(); 
     
    11591162return rval; 
    11601163}}; 
    1161 },tee:function(_156,n){ 
     1164},tee:function(_158,n){ 
    11621165var rval=[]; 
    11631166var sync={"pos":[],"deque":[],"max":-1,"min":-1}; 
     
    11661169} 
    11671170var self=MochiKit.Iter; 
    1168 _156=self.iter(_156); 
     1171_158=self.iter(_158); 
    11691172var _tee=self._tee; 
    11701173for(var i=0;i<n;i++){ 
    1171 rval.push(_tee(i,sync,_156)); 
     1174rval.push(_tee(i,sync,_158)); 
    11721175} 
    11731176return rval; 
    1174 },list:function(_158){ 
     1177},list:function(_160){ 
    11751178var m=MochiKit.Base; 
    1176 if(typeof (_158.slice)=="function"){ 
    1177 return _158.slice(); 
    1178 }else{ 
    1179 if(m.isArrayLike(_158)){ 
    1180 return m.concat(_158); 
     1179if(typeof (_160.slice)=="function"){ 
     1180return _160.slice(); 
     1181}else{ 
     1182if(m.isArrayLike(_160)){ 
     1183return m.concat(_160); 
    11811184} 
    11821185} 
    11831186var self=MochiKit.Iter; 
    1184 _158=self.iter(_158); 
     1187_160=self.iter(_160); 
    11851188var rval=[]; 
    11861189try{ 
    11871190while(true){ 
    1188 rval.push(_158.next()); 
     1191rval.push(_160.next()); 
    11891192} 
    11901193} 
     
    11961199} 
    11971200return undefined; 
    1198 },reduce:function(fn,_159,_160){ 
     1201},reduce:function(fn,_161,_162){ 
    11991202var i=0; 
    1200 var x=_160
     1203var x=_162
    12011204var self=MochiKit.Iter; 
    1202 _159=self.iter(_159); 
     1205_161=self.iter(_161); 
    12031206if(arguments.length<3){ 
    12041207try{ 
    1205 x=_159.next(); 
     1208x=_161.next(); 
    12061209} 
    12071210catch(e){ 
     
    12151218try{ 
    12161219while(true){ 
    1217 x=fn(x,_159.next()); 
     1220x=fn(x,_161.next()); 
    12181221} 
    12191222} 
     
    12251228return x; 
    12261229},range:function(){ 
    1227 var _162=0; 
     1230var _164=0; 
    12281231var stop=0; 
    12291232var step=1; 
     
    12321235}else{ 
    12331236if(arguments.length==2){ 
    1234 _162=arguments[0]; 
     1237_164=arguments[0]; 
    12351238stop=arguments[1]; 
    12361239}else{ 
    12371240if(arguments.length==3){ 
    1238 _162=arguments[0]; 
     1241_164=arguments[0]; 
    12391242stop=arguments[1]; 
    12401243step=arguments[2]; 
     
    12481251} 
    12491252return {next:function(){ 
    1250 if((step>0&&_162>=stop)||(step<0&&_162<=stop)){ 
     1253if((step>0&&_164>=stop)||(step<0&&_164<=stop)){ 
    12511254throw MochiKit.Iter.StopIteration; 
    12521255} 
    1253 var rval=_162
    1254 _162+=step; 
     1256var rval=_164
     1257_164+=step; 
    12551258return rval; 
    12561259},repr:function(){ 
    1257 return "range("+[_162,stop,step].join(", ")+")"; 
     1260return "range("+[_164,stop,step].join(", ")+")"; 
    12581261},toString:MochiKit.Base.forwardCall("repr")}; 
    1259 },sum:function(_163,_164){ 
    1260 var x=_164||0; 
     1262},sum:function(_165,_166){ 
     1263var x=_166||0; 
    12611264var self=MochiKit.Iter; 
    1262 _163=self.iter(_163); 
     1265_165=self.iter(_165); 
    12631266try{ 
    12641267while(true){ 
    1265 x+=_163.next(); 
     1268x+=_165.next(); 
    12661269} 
    12671270} 
     
    12721275} 
    12731276return x; 
    1274 },exhaust:function(_165){ 
     1277},exhaust:function(_167){ 
    12751278var self=MochiKit.Iter; 
    1276 _165=self.iter(_165); 
     1279_167=self.iter(_167); 
    12771280try{ 
    12781281while(true){ 
    1279 _165.next(); 
     1282_167.next(); 
    12801283} 
    12811284} 
     
    12851288} 
    12861289} 
    1287 },forEach:function(_166,func,self){ 
     1290},forEach:function(_168,func,self){ 
    12881291var m=MochiKit.Base; 
    12891292if(arguments.length>2){ 
    12901293func=m.bind(func,self); 
    12911294} 
    1292 if(m.isArrayLike(_166)){ 
    1293 try{ 
    1294 for(var i=0;i<_166.length;i++){ 
    1295 func(_166[i]); 
     1295if(m.isArrayLike(_168)){ 
     1296try{ 
     1297for(var i=0;i<_168.length;i++){ 
     1298func(_168[i]); 
    12961299} 
    12971300} 
     
    13031306}else{ 
    13041307self=MochiKit.Iter; 
    1305 self.exhaust(self.imap(func,_166)); 
    1306 } 
    1307 },every:function(_168,func){ 
     1308self.exhaust(self.imap(func,_168)); 
     1309} 
     1310},every:function(_170,func){ 
    13081311var self=MochiKit.Iter; 
    13091312try{ 
    1310 self.ifilterfalse(func,_168).next(); 
     1313self.ifilterfalse(func,_170).next(); 
    13111314return false; 
    13121315} 
     
    13171320return true; 
    13181321} 
    1319 },sorted:function(_169,cmp){ 
    1320 var rval=MochiKit.Iter.list(_169); 
     1322},sorted:function(_171,cmp){ 
     1323var rval=MochiKit.Iter.list(_171); 
    13211324if(arguments.length==1){ 
    13221325cmp=MochiKit.Base.compare; 
     
    13241327rval.sort(cmp); 
    13251328return rval; 
    1326 },reversed:function(_170){ 
    1327 var rval=MochiKit.Iter.list(_170); 
     1329},reversed:function(_172){ 
     1330var rval=MochiKit.Iter.list(_172); 
    13281331rval.reverse(); 
    13291332return rval; 
    1330 },some:function(_171,func){ 
     1333},some:function(_173,func){ 
    13311334var self=MochiKit.Iter; 
    13321335try{ 
    1333 self.ifilter(func,_171).next(); 
     1336self.ifilter(func,_173).next(); 
    13341337return true; 
    13351338} 
     
    13401343return false; 
    13411344} 
    1342 },iextend:function(lst,_172){ 
    1343 if(MochiKit.Base.isArrayLike(_172)){ 
    1344 for(var i=0;i<_172.length;i++){ 
    1345 lst.push(_172[i]); 
     1345},iextend:function(lst,_174){ 
     1346if(MochiKit.Base.isArrayLike(_174)){ 
     1347for(var i=0;i<_174.length;i++){ 
     1348lst.push(_174[i]); 
    13461349} 
    13471350}else{ 
    13481351var self=MochiKit.Iter; 
    1349 _172=self.iter(_172); 
     1352_174=self.iter(_174); 
    13501353try{ 
    13511354while(true){ 
    1352 lst.push(_172.next()); 
     1355lst.push(_174.next()); 
    13531356} 
    13541357} 
     
    13601363} 
    13611364return lst; 
    1362 },groupby:function(_173,_174){ 
     1365},groupby:function(_175,_176){ 
    13631366var m=MochiKit.Base; 
    13641367var self=MochiKit.Iter; 
    13651368if(arguments.length<2){ 
    1366 _174=m.operator.identity; 
    1367 } 
    1368 _173=self.iter(_173); 
     1369_176=m.operator.identity; 
     1370} 
     1371_175=self.iter(_175); 
    13691372var pk=undefined; 
    13701373var k=undefined; 
    13711374var v; 
    13721375function fetch(){ 
    1373 v=_173.next(); 
    1374 k=_174(v); 
     1376v=_175.next(); 
     1377k=_176(v); 
    13751378} 
    13761379function eat(){ 
     
    13791382return ret; 
    13801383} 
    1381 var _177=true; 
     1384var _179=true; 
    13821385return {repr:function(){ 
    13831386return "groupby(...)"; 
     
    13851388while(k==pk){ 
    13861389fetch(); 
    1387 if(_177){ 
    1388 _177=false; 
     1390if(_179){ 
     1391_179=false; 
    13891392break; 
    13901393} 
     
    14011404}}]; 
    14021405}}; 
    1403 },groupby_as_array:function(_178,_179){ 
     1406},groupby_as_array:function(_180,_181){ 
    14041407var m=MochiKit.Base; 
    14051408var self=MochiKit.Iter; 
    14061409if(arguments.length<2){ 
    1407 _179=m.operator.identity; 
    1408 } 
    1409 _178=self.iter(_178); 
    1410 var _180=[]; 
    1411 var _181=true; 
    1412 var _182
     1410_181=m.operator.identity; 
     1411} 
     1412_180=self.iter(_180); 
     1413var _182=[]; 
     1414var _183=true; 
     1415var _184
    14131416while(true){ 
    14141417try{ 
    1415 var _183=_178.next(); 
    1416 var key=_179(_183); 
     1418var _185=_180.next(); 
     1419var key=_181(_185); 
    14171420} 
    14181421catch(e){ 
     
    14221425throw e; 
    14231426} 
    1424 if(_181||key!=_182){ 
    1425 var _184=[]; 
    1426 _180.push([key,_184]); 
    1427 } 
    1428 _184.push(_183); 
    1429 _181=false; 
    1430 _182=key; 
    1431 } 
    1432 return _180
    1433 },arrayLikeIter:function(_185){ 
     1427if(_183||key!=_184){ 
     1428var _186=[]; 
     1429_182.push([key,_186]); 
     1430} 
     1431_186.push(_185); 
     1432_183=false; 
     1433_184=key; 
     1434} 
     1435return _182
     1436},arrayLikeIter:function(_187){ 
    14341437var i=0; 
    14351438return {repr:function(){ 
    14361439return "arrayLikeIter(...)"; 
    14371440},toString:MochiKit.Base.forwardCall("repr"),next:function(){ 
    1438 if(i>=_185.length){ 
     1441if(i>=_187.length){ 
    14391442throw MochiKit.Iter.StopIteration; 
    14401443} 
    1441 return _185[i++]; 
     1444return _187[i++]; 
    14421445}}; 
    1443 },hasIterateNext:function(_186){ 
    1444 return (_186&&typeof (_186.iterateNext)=="function"); 
    1445 },iterateNextIter:function(_187){ 
     1446},hasIterateNext:function(_188){ 
     1447return (_188&&typeof (_188.iterateNext)=="function"); 
     1448},iterateNextIter:function(_189){ 
    14461449return {repr:function(){ 
    14471450return "iterateNextIter(...)"; 
    14481451},toString:MochiKit.Base.forwardCall("repr"),next:function(){ 
    1449 var rval=_187.iterateNext(); 
     1452var rval=_189.iterateNext(); 
    14501453if(rval===null||rval===undefined){ 
    14511454throw MochiKit.Iter.StopIteration; 
     
    14961499MochiKit.Logging.EXPORT=["LogLevel","LogMessage","Logger","alertListener","logger","log","logError","logDebug","logFatal","logWarning"]; 
    14971500MochiKit.Logging.EXPORT_OK=["logLevelAtLeast","isLogMessage","compareLogMessage"]; 
    1498 MochiKit.Logging.LogMessage=function(num,_189,info){ 
     1501MochiKit.Logging.LogMessage=function(num,_191,info){ 
    14991502this.num=num; 
    1500 this.level=_189
     1503this.level=_191
    15011504this.info=info; 
    15021505this.timestamp=new Date(); 
     
    15061509return "LogMessage("+m.map(m.repr,[this.num,this.level,this.info]).join(", ")+")"; 
    15071510},toString:MochiKit.Base.forwardCall("repr")}; 
    1508 MochiKit.Base.update(MochiKit.Logging,{logLevelAtLeast:function(_191){ 
     1511MochiKit.Base.update(MochiKit.Logging,{logLevelAtLeast:function(_193){ 
    15091512var self=MochiKit.Logging; 
    1510 if(typeof (_191)=="string"){ 
    1511 _191=self.LogLevel[_191]; 
    1512 } 
    1513 return function(msg){ 
    1514 var _193=msg.level; 
    15151513if(typeof (_193)=="string"){ 
    15161514_193=self.LogLevel[_193]; 
    15171515} 
    1518 return _193>=_191; 
     1516return function(msg){ 
     1517var _195=msg.level; 
     1518if(typeof (_195)=="string"){ 
     1519_195=self.LogLevel[_195]; 
     1520
     1521return _195>=_193; 
    15191522}; 
    15201523},isLogMessage:function(){ 
    1521 var _194=MochiKit.Logging.LogMessage; 
     1524var _196=MochiKit.Logging.LogMessage; 
    15221525for(var i=0;i<arguments.length;i++){ 
    1523 if(!(arguments[i] instanceof _194)){ 
     1526if(!(arguments[i] instanceof _196)){ 
    15241527return false; 
    15251528} 
     
    15311534alert("num: "+msg.num+"\nlevel: "+msg.level+"\ninfo: "+msg.info.join(" ")); 
    15321535}}); 
    1533 MochiKit.Logging.Logger=function(_195){ 
     1536MochiKit.Logging.Logger=function(_197){ 
    15341537this.counter=0; 
    1535 if(typeof (_195)=="undefined"||_195==null){ 
    1536 _195=-1; 
    1537 } 
    1538 this.maxSize=_195
     1538if(typeof (_197)=="undefined"||_197==null){ 
     1