+
{foreach item=oPortlet from=$page->portlets}
{assign var=portlet_output value=$oPortlet->render() }
@@ -155,7 +156,6 @@
{/if}
{/foreach}
-
content_class}class="{$page->content_class}"{/if}>
{if (!$page->hide_section)}
@@ -182,6 +182,7 @@
{$page->contents}
diff --git a/thirdpartyjs/MochiKit/MochiKitPacked.js b/thirdpartyjs/MochiKit/MochiKitPacked.js
index d026a76..37c0d72 100644
--- a/thirdpartyjs/MochiKit/MochiKitPacked.js
+++ b/thirdpartyjs/MochiKit/MochiKitPacked.js
@@ -1,6 +1,6 @@
/***
- MochiKit.MochiKit 1.4 : PACKED VERSION
+ MochiKit.MochiKit 1.3.1 : PACKED VERSION
THIS FILE IS AUTOMATICALLY GENERATED. If creating patches, please
diff against the source tree, not this file.
@@ -20,10 +20,7 @@ MochiKit={};
if(typeof (MochiKit.Base)=="undefined"){
MochiKit.Base={};
}
-if(typeof (MochiKit.__export__)=="undefined"){
-MochiKit.__export__=(MochiKit.__compat__||(typeof (JSAN)=="undefined"&&typeof (dojo)=="undefined"));
-}
-MochiKit.Base.VERSION="1.4";
+MochiKit.Base.VERSION="1.3.1";
MochiKit.Base.NAME="MochiKit.Base";
MochiKit.Base.update=function(_1,_2){
if(_1===null){
@@ -43,13 +40,6 @@ MochiKit.Base.update(MochiKit.Base,{__repr__:function(){
return "["+this.NAME+" "+this.VERSION+"]";
},toString:function(){
return this.__repr__();
-},camelize:function(_6){
-var _7=_6.split("-");
-var cc=_7[0];
-for(var i=1;i<_7.length;i++){
-cc+=_7[i].charAt(0).toUpperCase()+_7[i].substring(1);
-}
-return cc;
},counter:function(n){
if(arguments.length===0){
n=1;
@@ -57,42 +47,30 @@ n=1;
return function(){
return n++;
};
-},clone:function(obj){
+},clone:function(_7){
var me=arguments.callee;
if(arguments.length==1){
-me.prototype=obj;
+me.prototype=_7;
return new me();
}
-},_flattenArray:function(res,lst){
-for(var i=0;i
=0;i--){
-_15.unshift(o[i]);
+_12.unshift(o[i]);
}
}else{
res.push(o);
}
}
return res;
-},extend:function(_16,obj,_17){
-if(!_17){
-_17=0;
+},extend:function(_13,obj,_15){
+if(!_15){
+_15=0;
}
if(obj){
var l=obj.length;
@@ -104,74 +82,68 @@ l=obj.length;
throw new TypeError("Argument not an array-like and MochiKit.Iter not present");
}
}
-if(!_16){
-_16=[];
+if(!_13){
+_13=[];
}
-for(var i=_17;i=b;
return al){
-_44=l;
+if(_41===null||_41>l){
+_41=l;
}
}
-_43=[];
-for(i=0;i<_44;i++){
-var _45=[];
+_40=[];
+for(i=0;i<_41;i++){
+var _42=[];
for(var j=1;j=0;i--){
-_59=[_58[i].apply(this,_59)];
-}
-return _59[0];
-};
-},bind:function(_60,_61){
-if(typeof (_60)=="string"){
-_60=_61[_60];
-}
-var _62=_60.im_func;
-var _63=_60.im_preargs;
-var _64=_60.im_self;
+return m.bind.apply(this,m.extend([_50,_49],arguments,2));
+},bind:function(_51,_52){
+if(typeof (_51)=="string"){
+_51=_52[_51];
+}
+var _53=_51.im_func;
+var _54=_51.im_preargs;
+var _55=_51.im_self;
var m=MochiKit.Base;
-if(typeof (_60)=="function"&&typeof (_60.apply)=="undefined"){
-_60=m._wrapDumbFunction(_60);
+if(typeof (_51)=="function"&&typeof (_51.apply)=="undefined"){
+_51=m._wrapDumbFunction(_51);
}
-if(typeof (_62)!="function"){
-_62=_60;
+if(typeof (_53)!="function"){
+_53=_51;
}
-if(typeof (_61)!="undefined"){
-_64=_61;
+if(typeof (_52)!="undefined"){
+_55=_52;
}
-if(typeof (_63)=="undefined"){
-_63=[];
+if(typeof (_54)=="undefined"){
+_54=[];
}else{
-_63=_63.slice();
+_54=_54.slice();
}
-m.extend(_63,arguments,2);
-var _65=function(){
-var _66=arguments;
+m.extend(_54,arguments,2);
+var _56=function(){
+var _57=arguments;
var me=arguments.callee;
if(me.im_preargs.length>0){
-_66=m.concat(me.im_preargs,_66);
+_57=m.concat(me.im_preargs,_57);
}
-var _61=me.im_self;
-if(!_61){
-_61=this;
+var _52=me.im_self;
+if(!_52){
+_52=this;
}
-return me.im_func.apply(_61,_66);
+return me.im_func.apply(_52,_57);
};
-_65.im_self=_64;
-_65.im_func=_62;
-_65.im_preargs=_63;
-return _65;
-},bindMethods:function(_67){
-var _68=MochiKit.Base.bind;
-for(var k in _67){
-var _69=_67[k];
-if(typeof (_69)=="function"){
-_67[k]=_68(_69,_67);
-}
-}
-},registerComparator:function(_70,_71,_72,_73){
-MochiKit.Base.comparatorRegistry.register(_70,_71,_72,_73);
+_56.im_self=_55;
+_56.im_func=_53;
+_56.im_preargs=_54;
+return _56;
+},bindMethods:function(_58){
+var _59=MochiKit.Base.bind;
+for(var k in _58){
+var _60=_58[k];
+if(typeof (_60)=="function"){
+_58[k]=_59(_60,_58);
+}
+}
+},registerComparator:function(_61,_62,_63,_64){
+MochiKit.Base.comparatorRegistry.register(_61,_62,_63,_64);
},_primitives:{"boolean":true,"string":true,"number":true},compare:function(a,b){
if(a==b){
return 0;
}
-var _74=(typeof (a)=="undefined"||a===null);
-var _75=(typeof (b)=="undefined"||b===null);
-if(_74&&_75){
+var _65=(typeof (a)=="undefined"||a===null);
+var _66=(typeof (b)=="undefined"||b===null);
+if(_65&&_66){
return 0;
}else{
-if(_74){
+if(_65){
return -1;
}else{
-if(_75){
+if(_66){
return 1;
}
}
}
var m=MochiKit.Base;
-var _76=m._primitives;
-if(!(typeof (a) in _76&&typeof (b) in _76)){
+var _67=m._primitives;
+if(!(typeof (a) in _67&&typeof (b) in _67)){
try{
return m.comparatorRegistry.match(a,b);
}
@@ -544,31 +481,31 @@ if(a>b){
return 1;
}
}
-var _77=m.repr;
-throw new TypeError(_77(a)+" and "+_77(b)+" can not be compared");
+var _68=m.repr;
+throw new TypeError(_68(a)+" and "+_68(b)+" can not be compared");
},compareDateLike:function(a,b){
return MochiKit.Base.compare(a.getTime(),b.getTime());
},compareArrayLike:function(a,b){
-var _78=MochiKit.Base.compare;
-var _79=a.length;
-var _80=0;
-if(_79>b.length){
-_80=1;
-_79=b.length;
+var _69=MochiKit.Base.compare;
+var _70=a.length;
+var _71=0;
+if(_70>b.length){
+_71=1;
+_70=b.length;
}else{
-if(_79=0;i--){
-sum+=o[i];
-}
-}else{
-sum+=o;
-}
-}
-if(_115<=0){
-throw new TypeError("mean() requires at least one argument");
-}
-return sum/_115;
-},median:function(){
-var data=MochiKit.Base.flattenArguments(arguments);
-if(data.length===0){
-throw new TypeError("median() requires at least one argument");
-}
-data.sort(compare);
-if(data.length%2==0){
-var _117=data.length/2;
-return (data[_117]+data[_117-1])/2;
-}else{
-return data[(data.length-1)/2];
-}
-},findValue:function(lst,_118,_119,end){
+},findValue:function(lst,_104,_105,end){
if(typeof (end)=="undefined"||end===null){
end=lst.length;
}
-if(typeof (_119)=="undefined"||_119===null){
-_119=0;
-}
var cmp=MochiKit.Base.compare;
-for(var i=_119;i0))){
-var kv=MochiKit.DOM.formContents(_127);
-_127=kv[0];
-_128=kv[1];
+},queryString:function(_113,_114){
+if(typeof (MochiKit.DOM)!="undefined"&&arguments.length==1&&(typeof (_113)=="string"||(typeof (_113.nodeType)!="undefined"&&_113.nodeType>0))){
+var kv=MochiKit.DOM.formContents(_113);
+_113=kv[0];
+_114=kv[1];
}else{
if(arguments.length==1){
-if(typeof (_127.length)=="number"&&_127.length==2){
-return arguments.callee(_127[0],_127[1]);
-}
-var o=_127;
-_127=[];
-_128=[];
+var o=_113;
+_113=[];
+_114=[];
for(var k in o){
var v=o[k];
-if(typeof (v)=="function"){
-continue;
-}else{
-if(typeof (v)!="string"&&typeof (v.length)=="number"){
-for(var i=0;i=stop){
+if(_147>=stop){
throw self.StopIteration;
}
-_161+=step;
+_147+=step;
return rval;
}};
},imap:function(fun,p,q){
var m=MochiKit.Base;
var self=MochiKit.Iter;
-var _165=m.map(self.iter,m.extend(null,arguments,1));
+var _151=m.map(self.iter,m.extend(null,arguments,1));
var map=m.map;
var next=self.next;
return {repr:function(){
return "imap(...)";
},toString:m.forwardCall("repr"),next:function(){
-return fun.apply(this,map(next,_165));
+return fun.apply(this,map(next,_151));
}};
},applymap:function(fun,seq,self){
seq=MochiKit.Iter.iter(seq);
@@ -1212,23 +1089,23 @@ var m=MochiKit.Base;
if(arguments.length==1){
return self.iter(arguments[0]);
}
-var _167=m.map(self.iter,arguments);
+var _153=m.map(self.iter,arguments);
return {repr:function(){
return "chain(...)";
},toString:m.forwardCall("repr"),next:function(){
-while(_167.length>1){
+while(_153.length>1){
try{
-return _167[0].next();
+return _153[0].next();
}
catch(e){
if(e!=self.StopIteration){
throw e;
}
-_167.shift();
+_153.shift();
}
}
-if(_167.length==1){
-var arg=_167.shift();
+if(_153.length==1){
+var arg=_153.shift();
this.next=m.bind("next",arg);
return this.next();
}
@@ -1265,58 +1142,58 @@ break;
this.next=bind("next",seq);
return rval;
}};
-},_tee:function(_169,sync,_171){
-sync.pos[_169]=-1;
+},_tee:function(_155,sync,_157){
+sync.pos[_155]=-1;
var m=MochiKit.Base;
-var _172=m.listMin;
+var _158=m.listMin;
return {repr:function(){
-return "tee("+_169+", ...)";
+return "tee("+_155+", ...)";
},toString:m.forwardCall("repr"),next:function(){
var rval;
-var i=sync.pos[_169];
+var i=sync.pos[_155];
if(i==sync.max){
-rval=_171.next();
+rval=_157.next();
sync.deque.push(rval);
sync.max+=1;
-sync.pos[_169]+=1;
+sync.pos[_155]+=1;
}else{
rval=sync.deque[i-sync.min];
-sync.pos[_169]+=1;
-if(i==sync.min&&_172(sync.pos)!=sync.min){
+sync.pos[_155]+=1;
+if(i==sync.min&&_158(sync.pos)!=sync.min){
sync.min+=1;
sync.deque.shift();
}
}
return rval;
}};
-},tee:function(_173,n){
+},tee:function(_159,n){
var rval=[];
var sync={"pos":[],"deque":[],"max":-1,"min":-1};
-if(arguments.length==1||typeof (n)=="undefined"||n===null){
+if(arguments.length==1){
n=2;
}
var self=MochiKit.Iter;
-_173=self.iter(_173);
+_159=self.iter(_159);
var _tee=self._tee;
for(var i=0;i0&&_179>=stop)||(step<0&&_179<=stop)){
+if((step>0&&_165>=stop)||(step<0&&_165<=stop)){
throw MochiKit.Iter.StopIteration;
}
-var rval=_179;
-_179+=step;
+var rval=_165;
+_165+=step;
return rval;
},repr:function(){
-return "range("+[_179,stop,step].join(", ")+")";
+return "range("+[_165,stop,step].join(", ")+")";
},toString:MochiKit.Base.forwardCall("repr")};
-},sum:function(_180,_181){
-if(typeof (_181)=="undefined"||_181===null){
-_181=0;
-}
-var x=_181;
+},sum:function(_166,_167){
+var x=_167||0;
var self=MochiKit.Iter;
-_180=self.iter(_180);
+_166=self.iter(_166);
try{
while(true){
-x+=_180.next();
+x+=_166.next();
}
}
catch(e){
@@ -1405,12 +1279,12 @@ throw e;
}
}
return x;
-},exhaust:function(_182){
+},exhaust:function(_168){
var self=MochiKit.Iter;
-_182=self.iter(_182);
+_168=self.iter(_168);
try{
while(true){
-_182.next();
+_168.next();
}
}
catch(e){
@@ -1418,15 +1292,15 @@ if(e!=self.StopIteration){
throw e;
}
}
-},forEach:function(_183,func,self){
+},forEach:function(_169,func,self){
var m=MochiKit.Base;
if(arguments.length>2){
func=m.bind(func,self);
}
-if(m.isArrayLike(_183)){
+if(m.isArrayLike(_169)){
try{
-for(var i=0;i<_183.length;i++){
-func(_183[i]);
+for(var i=0;i<_169.length;i++){
+func(_169[i]);
}
}
catch(e){
@@ -1436,12 +1310,12 @@ throw e;
}
}else{
self=MochiKit.Iter;
-self.exhaust(self.imap(func,_183));
+self.exhaust(self.imap(func,_169));
}
-},every:function(_184,func){
+},every:function(_171,func){
var self=MochiKit.Iter;
try{
-self.ifilterfalse(func,_184).next();
+self.ifilterfalse(func,_171).next();
return false;
}
catch(e){
@@ -1450,21 +1324,21 @@ throw e;
}
return true;
}
-},sorted:function(_185,cmp){
-var rval=MochiKit.Iter.list(_185);
+},sorted:function(_172,cmp){
+var rval=MochiKit.Iter.list(_172);
if(arguments.length==1){
cmp=MochiKit.Base.compare;
}
rval.sort(cmp);
return rval;
-},reversed:function(_186){
-var rval=MochiKit.Iter.list(_186);
+},reversed:function(_173){
+var rval=MochiKit.Iter.list(_173);
rval.reverse();
return rval;
-},some:function(_187,func){
+},some:function(_174,func){
var self=MochiKit.Iter;
try{
-self.ifilter(func,_187).next();
+self.ifilter(func,_174).next();
return true;
}
catch(e){
@@ -1473,17 +1347,17 @@ throw e;
}
return false;
}
-},iextend:function(lst,_188){
-if(MochiKit.Base.isArrayLike(_188)){
-for(var i=0;i<_188.length;i++){
-lst.push(_188[i]);
+},iextend:function(lst,_175){
+if(MochiKit.Base.isArrayLike(_175)){
+for(var i=0;i<_175.length;i++){
+lst.push(_175[i]);
}
}else{
var self=MochiKit.Iter;
-_188=self.iter(_188);
+_175=self.iter(_175);
try{
while(true){
-lst.push(_188.next());
+lst.push(_175.next());
}
}
catch(e){
@@ -1493,34 +1367,33 @@ throw e;
}
}
return lst;
-},groupby:function(_189,_190){
+},groupby:function(_176,_177){
var m=MochiKit.Base;
var self=MochiKit.Iter;
if(arguments.length<2){
-_190=m.operator.identity;
+_177=m.operator.identity;
}
-_189=self.iter(_189);
+_176=self.iter(_176);
var pk=undefined;
var k=undefined;
var v;
function fetch(){
-v=_189.next();
-k=_190(v);
+v=_176.next();
+k=_177(v);
}
function eat(){
var ret=v;
v=undefined;
return ret;
}
-var _193=true;
-var _194=m.compare;
+var _180=true;
return {repr:function(){
return "groupby(...)";
},next:function(){
-while(_194(k,pk)===0){
+while(k==pk){
fetch();
-if(_193){
-_193=false;
+if(_180){
+_180=false;
break;
}
}
@@ -1529,27 +1402,26 @@ return [k,{next:function(){
if(v==undefined){
fetch();
}
-if(_194(k,pk)!==0){
+if(k!=pk){
throw self.StopIteration;
}
return eat();
}}];
}};
-},groupby_as_array:function(_195,_196){
+},groupby_as_array:function(_181,_182){
var m=MochiKit.Base;
var self=MochiKit.Iter;
if(arguments.length<2){
-_196=m.operator.identity;
+_182=m.operator.identity;
}
-_195=self.iter(_195);
-var _197=[];
-var _198=true;
-var _199;
-var _200=m.compare;
+_181=self.iter(_181);
+var _183=[];
+var _184=true;
+var _185;
while(true){
try{
-var _201=_195.next();
-var key=_196(_201);
+var _186=_181.next();
+var key=_182(_186);
}
catch(e){
if(e==self.StopIteration){
@@ -1557,32 +1429,32 @@ break;
}
throw e;
}
-if(_198||_200(key,_199)!==0){
-var _202=[];
-_197.push([key,_202]);
+if(_184||key!=_185){
+var _187=[];
+_183.push([key,_187]);
}
-_202.push(_201);
-_198=false;
-_199=key;
+_187.push(_186);
+_184=false;
+_185=key;
}
-return _197;
-},arrayLikeIter:function(_203){
+return _183;
+},arrayLikeIter:function(_188){
var i=0;
return {repr:function(){
return "arrayLikeIter(...)";
},toString:MochiKit.Base.forwardCall("repr"),next:function(){
-if(i>=_203.length){
+if(i>=_188.length){
throw MochiKit.Iter.StopIteration;
}
-return _203[i++];
+return _188[i++];
}};
-},hasIterateNext:function(_204){
-return (_204&&typeof (_204.iterateNext)=="function");
-},iterateNextIter:function(_205){
+},hasIterateNext:function(_189){
+return (_189&&typeof (_189.iterateNext)=="function");
+},iterateNextIter:function(_190){
return {repr:function(){
return "iterateNextIter(...)";
},toString:MochiKit.Base.forwardCall("repr"),next:function(){
-var rval=_205.iterateNext();
+var rval=_190.iterateNext();
if(rval===null||rval===undefined){
throw MochiKit.Iter.StopIteration;
}
@@ -1593,11 +1465,7 @@ MochiKit.Iter.EXPORT_OK=["iteratorRegistry","arrayLikeIter","hasIterateNext","it
MochiKit.Iter.EXPORT=["StopIteration","registerIteratorFactory","iter","count","cycle","repeat","next","izip","ifilter","ifilterfalse","islice","imap","applymap","chain","takewhile","dropwhile","tee","list","reduce","range","sum","exhaust","forEach","every","sorted","reversed","some","iextend","groupby","groupby_as_array"];
MochiKit.Iter.__new__=function(){
var m=MochiKit.Base;
-if(typeof (StopIteration)!="undefined"){
-this.StopIteration=StopIteration;
-}else{
this.StopIteration=new m.NamedError("StopIteration");
-}
this.iteratorRegistry=new m.AdapterRegistry();
this.registerIteratorFactory("arrayLike",m.isArrayLike,this.arrayLikeIter);
this.registerIteratorFactory("iterateNext",this.hasIterateNext,this.iterateNextIter);
@@ -1605,7 +1473,7 @@ this.EXPORT_TAGS={":common":this.EXPORT,":all":m.concat(this.EXPORT,this.EXPORT_
m.nameFunctions(this);
};
MochiKit.Iter.__new__();
-if(MochiKit.__export__){
+if(!MochiKit.__compat__){
reduce=MochiKit.Iter.reduce;
}
MochiKit.Base._exportSymbols(this,MochiKit.Iter);
@@ -1628,7 +1496,7 @@ if(typeof (MochiKit.Logging)=="undefined"){
MochiKit.Logging={};
}
MochiKit.Logging.NAME="MochiKit.Logging";
-MochiKit.Logging.VERSION="1.4";
+MochiKit.Logging.VERSION="1.3.1";
MochiKit.Logging.__repr__=function(){
return "["+this.NAME+" "+this.VERSION+"]";
};
@@ -1637,9 +1505,9 @@ return this.__repr__();
};
MochiKit.Logging.EXPORT=["LogLevel","LogMessage","Logger","alertListener","logger","log","logError","logDebug","logFatal","logWarning"];
MochiKit.Logging.EXPORT_OK=["logLevelAtLeast","isLogMessage","compareLogMessage"];
-MochiKit.Logging.LogMessage=function(num,_207,info){
+MochiKit.Logging.LogMessage=function(num,_192,info){
this.num=num;
-this.level=_207;
+this.level=_192;
this.info=info;
this.timestamp=new Date();
};
@@ -1647,22 +1515,22 @@ MochiKit.Logging.LogMessage.prototype={repr:function(){
var m=MochiKit.Base;
return "LogMessage("+m.map(m.repr,[this.num,this.level,this.info]).join(", ")+")";
},toString:MochiKit.Base.forwardCall("repr")};
-MochiKit.Base.update(MochiKit.Logging,{logLevelAtLeast:function(_209){
+MochiKit.Base.update(MochiKit.Logging,{logLevelAtLeast:function(_194){
var self=MochiKit.Logging;
-if(typeof (_209)=="string"){
-_209=self.LogLevel[_209];
+if(typeof (_194)=="string"){
+_194=self.LogLevel[_194];
}
return function(msg){
-var _211=msg.level;
-if(typeof (_211)=="string"){
-_211=self.LogLevel[_211];
+var _196=msg.level;
+if(typeof (_196)=="string"){
+_196=self.LogLevel[_196];
}
-return _211>=_209;
+return _196>=_194;
};
},isLogMessage:function(){
-var _212=MochiKit.Logging.LogMessage;
+var _197=MochiKit.Logging.LogMessage;
for(var i=0;i=0&&this._messages.length>this.maxSize){
this._messages.shift();
}
-},getMessages:function(_221){
-var _222=0;
-if(!(typeof (_221)=="undefined"||_221===null)){
-_222=Math.max(0,this._messages.length-_221);
+},getMessages:function(_206){
+var _207=0;
+if(!(typeof (_206)=="undefined"||_206===null)){
+_207=Math.max(0,this._messages.length-_206);
}
-return this._messages.slice(_222);
-},getMessageText:function(_223){
-if(typeof (_223)=="undefined"||_223===null){
-_223=30;
+return this._messages.slice(_207);
+},getMessageText:function(_208){
+if(typeof (_208)=="undefined"||_208===null){
+_208=30;
}
-var _224=this.getMessages(_223);
-if(_224.length){
+var _209=this.getMessages(_208);
+if(_209.length){
var lst=map(function(m){
return "\n ["+m.num+"] "+m.level+": "+m.info.join(" ");
-},_224);
-lst.unshift("LAST "+_224.length+" MESSAGES:");
+},_209);
+lst.unshift("LAST "+_209.length+" MESSAGES:");
return lst.join("");
}
return "";
-},debuggingBookmarklet:function(_225){
+},debuggingBookmarklet:function(_210){
if(typeof (MochiKit.LoggingPane)=="undefined"){
alert(this.getMessageText());
}else{
-MochiKit.LoggingPane.createLoggingPane(_225||false);
+MochiKit.LoggingPane.createLoggingPane(_210||false);
}
}};
MochiKit.Logging.__new__=function(){
this.LogLevel={ERROR:40,FATAL:50,WARNING:30,INFO:20,DEBUG:10};
var m=MochiKit.Base;
m.registerComparator("LogMessage",this.isLogMessage,this.compareLogMessage);
-var _226=m.partial;
-var _227=this.Logger;
-var _228=_227.prototype.baseLog;
-m.update(this.Logger.prototype,{debug:_226(_228,"DEBUG"),log:_226(_228,"INFO"),error:_226(_228,"ERROR"),fatal:_226(_228,"FATAL"),warning:_226(_228,"WARNING")});
+var _211=m.partial;
+var _212=this.Logger;
+var _213=_212.prototype.baseLog;
+m.update(this.Logger.prototype,{debug:_211(_213,"DEBUG"),log:_211(_213,"INFO"),error:_211(_213,"ERROR"),fatal:_211(_213,"FATAL"),warning:_211(_213,"WARNING")});
var self=this;
-var _229=function(name){
+var _214=function(name){
return function(){
self.logger[name].apply(self.logger,arguments);
};
};
-this.log=_229("log");
-this.logError=_229("error");
-this.logDebug=_229("debug");
-this.logFatal=_229("fatal");
-this.logWarning=_229("warning");
-this.logger=new _227();
+this.log=_214("log");
+this.logError=_214("error");
+this.logDebug=_214("debug");
+this.logFatal=_214("fatal");
+this.logWarning=_214("warning");
+this.logger=new _212();
this.logger.useNativeConsole=true;
this.EXPORT_TAGS={":common":this.EXPORT,":all":m.concat(this.EXPORT,this.EXPORT_OK)};
m.nameFunctions(this);
@@ -1802,7 +1662,7 @@ if(typeof (MochiKit.DateTime)=="undefined"){
MochiKit.DateTime={};
}
MochiKit.DateTime.NAME="MochiKit.DateTime";
-MochiKit.DateTime.VERSION="1.4";
+MochiKit.DateTime.VERSION="1.3.1";
MochiKit.DateTime.__repr__=function(){
return "["+this.NAME+" "+this.VERSION+"]";
};
@@ -1865,33 +1725,33 @@ ofs=0;
}
return new Date(Date.UTC(year,month,day,hour,min,sec,msec)-ofs);
};
-MochiKit.DateTime.toISOTime=function(date,_236){
+MochiKit.DateTime.toISOTime=function(date,_221){
if(typeof (date)=="undefined"||date===null){
return null;
}
var hh=date.getHours();
var mm=date.getMinutes();
var ss=date.getSeconds();
-var lst=[((_236&&(hh<10))?"0"+hh:hh),((mm<10)?"0"+mm:mm),((ss<10)?"0"+ss:ss)];
+var lst=[((_221&&(hh<10))?"0"+hh:hh),((mm<10)?"0"+mm:mm),((ss<10)?"0"+ss:ss)];
return lst.join(":");
};
-MochiKit.DateTime.toISOTimestamp=function(date,_240){
+MochiKit.DateTime.toISOTimestamp=function(date,_225){
if(typeof (date)=="undefined"||date===null){
return null;
}
-var sep=_240?"T":" ";
-var foot=_240?"Z":"";
-if(_240){
+var sep=_225?"T":" ";
+var foot=_225?"Z":"";
+if(_225){
date=new Date(date.getTime()+(date.getTimezoneOffset()*60000));
}
-return MochiKit.DateTime.toISODate(date)+sep+MochiKit.DateTime.toISOTime(date,_240)+foot;
+return MochiKit.DateTime.toISODate(date)+sep+MochiKit.DateTime.toISOTime(date,_225)+foot;
};
MochiKit.DateTime.toISODate=function(date){
if(typeof (date)=="undefined"||date===null){
return null;
}
-var _243=MochiKit.DateTime._padTwo;
-return [date.getFullYear(),_243(date.getMonth()+1),_243(date.getDate())].join("-");
+var _228=MochiKit.DateTime._padTwo;
+return [date.getFullYear(),_228(date.getMonth()+1),_228(date.getDate())].join("-");
};
MochiKit.DateTime.americanDate=function(d){
d=d+"";
@@ -1908,8 +1768,8 @@ MochiKit.DateTime.toPaddedAmericanDate=function(d){
if(typeof (d)=="undefined"||d===null){
return null;
}
-var _245=MochiKit.DateTime._padTwo;
-return [_245(d.getMonth()+1),_245(d.getDate()),d.getFullYear()].join("/");
+var _230=MochiKit.DateTime._padTwo;
+return [_230(d.getMonth()+1),_230(d.getDate()),d.getFullYear()].join("/");
};
MochiKit.DateTime.toAmericanDate=function(d){
if(typeof (d)=="undefined"||d===null){
@@ -1937,11 +1797,11 @@ MochiKit.DateTime.__new__();
if(typeof (MochiKit.Base)!="undefined"){
MochiKit.Base._exportSymbols(this,MochiKit.DateTime);
}else{
-(function(_246,_247){
-if((typeof (JSAN)=="undefined"&&typeof (dojo)=="undefined")||(MochiKit.__export__===false)){
-var all=_247.EXPORT_TAGS[":all"];
+(function(_231,_232){
+if((typeof (JSAN)=="undefined"&&typeof (dojo)=="undefined")||(typeof (MochiKit.__compat__)=="boolean"&&MochiKit.__compat__)){
+var all=_232.EXPORT_TAGS[":all"];
for(var i=0;i_255){
-var i=_261.length-_255;
-res=fmt.separator+_261.substring(i,_261.length)+res;
-_261=_261.substring(0,i);
+if(_240){
+while(_246.length>_240){
+var i=_246.length-_240;
+res=fmt.separator+_246.substring(i,_246.length)+res;
+_246=_246.substring(0,i);
}
}
-res=_261+res;
-if(_253>0){
-while(frac.length<_256){
+res=_246+res;
+if(_238>0){
+while(frac.length<_241){
frac=frac+"0";
}
res=res+fmt.decimal+frac;
}
-return _257+res+_258;
+return _242+res+_243;
};
};
-MochiKit.Format.numberFormatter=function(_263,_264,_265){
-if(typeof (_264)=="undefined"){
-_264="";
+MochiKit.Format.numberFormatter=function(_248,_249,_250){
+if(typeof (_249)=="undefined"){
+_249="";
}
-var _266=_263.match(/((?:[0#]+,)?[0#]+)(?:\.([0#]+))?(%)?/);
-if(!_266){
+var _251=_248.match(/((?:[0#]+,)?[0#]+)(?:\.([0#]+))?(%)?/);
+if(!_251){
throw TypeError("Invalid pattern");
}
-var _267=_263.substr(0,_266.index);
-var _268=_263.substr(_266.index+_266[0].length);
-if(_267.search(/-/)==-1){
-_267=_267+"-";
+var _252=_248.substr(0,_251.index);
+var _253=_248.substr(_251.index+_251[0].length);
+if(_252.search(/-/)==-1){
+_252=_252+"-";
}
-var _269=_266[1];
-var frac=(typeof (_266[2])=="string"&&_266[2]!="")?_266[2]:"";
-var _270=(typeof (_266[3])=="string"&&_266[3]!="");
-var tmp=_269.split(/,/);
-var _272;
-if(typeof (_265)=="undefined"){
-_265="default";
+var _254=_251[1];
+var frac=(typeof (_251[2])=="string"&&_251[2]!="")?_251[2]:"";
+var _255=(typeof (_251[3])=="string"&&_251[3]!="");
+var tmp=_254.split(/,/);
+var _257;
+if(typeof (_250)=="undefined"){
+_250="default";
}
if(tmp.length==1){
-_272=null;
+_257=null;
}else{
-_272=tmp[1].length;
+_257=tmp[1].length;
}
-var _273=_269.length-_269.replace(/0/g,"").length;
-var _274=frac.length-frac.replace(/0/g,"").length;
-var _275=frac.length;
-var rval=MochiKit.Format._numberFormatter(_264,_267,_268,_265,_270,_275,_273,_272,_274);
+var _258=_254.length-_254.replace(/0/g,"").length;
+var _259=frac.length-frac.replace(/0/g,"").length;
+var _260=frac.length;
+var rval=MochiKit.Format._numberFormatter(_249,_252,_253,_250,_255,_260,_258,_257,_259);
var m=MochiKit.Base;
if(m){
var fn=arguments.callee;
@@ -2047,33 +1907,33 @@ return [self.NAME,"(",map(m.repr,args).join(", "),")"].join("");
}
return rval;
};
-MochiKit.Format.formatLocale=function(_276){
-if(typeof (_276)=="undefined"||_276===null){
-_276="default";
+MochiKit.Format.formatLocale=function(_262){
+if(typeof (_262)=="undefined"||_262===null){
+_262="default";
}
-if(typeof (_276)=="string"){
-var rval=MochiKit.Format.LOCALE[_276];
+if(typeof (_262)=="string"){
+var rval=MochiKit.Format.LOCALE[_262];
if(typeof (rval)=="string"){
rval=arguments.callee(rval);
-MochiKit.Format.LOCALE[_276]=rval;
+MochiKit.Format.LOCALE[_262]=rval;
}
return rval;
}else{
-return _276;
+return _262;
}
};
-MochiKit.Format.twoDigitAverage=function(_277,_278){
-if(_278){
-var res=_277/_278;
+MochiKit.Format.twoDigitAverage=function(_263,_264){
+if(_264){
+var res=_263/_264;
if(!isNaN(res)){
-return MochiKit.Format.twoDigitFloat(_277/_278);
+return MochiKit.Format.twoDigitFloat(_263/_264);
}
}
return "0";
};
-MochiKit.Format.twoDigitFloat=function(_279){
-var sign=(_279<0?"-":"");
-var s=Math.floor(Math.abs(_279)*100).toString();
+MochiKit.Format.twoDigitFloat=function(_265){
+var sign=(_265<0?"-":"");
+var s=Math.floor(Math.abs(_265)*100).toString();
if(s=="0"){
return s;
}
@@ -2095,45 +1955,45 @@ return head+"."+tail;
}
}
};
-MochiKit.Format.lstrip=function(str,_284){
+MochiKit.Format.lstrip=function(str,_270){
str=str+"";
if(typeof (str)!="string"){
return null;
}
-if(!_284){
+if(!_270){
return str.replace(/^\s+/,"");
}else{
-return str.replace(new RegExp("^["+_284+"]+"),"");
+return str.replace(new RegExp("^["+_270+"]+"),"");
}
};
-MochiKit.Format.rstrip=function(str,_285){
+MochiKit.Format.rstrip=function(str,_271){
str=str+"";
if(typeof (str)!="string"){
return null;
}
-if(!_285){
+if(!_271){
return str.replace(/\s+$/,"");
}else{
-return str.replace(new RegExp("["+_285+"]+$"),"");
+return str.replace(new RegExp("["+_271+"]+$"),"");
}
};
-MochiKit.Format.strip=function(str,_286){
+MochiKit.Format.strip=function(str,_272){
var self=MochiKit.Format;
-return self.rstrip(self.lstrip(str,_286),_286);
+return self.rstrip(self.lstrip(str,_272),_272);
};
-MochiKit.Format.truncToFixed=function(_287,_288){
-_287=Math.floor(_287*Math.pow(10,_288));
-var res=(_287*Math.pow(10,-_288)).toFixed(_288);
+MochiKit.Format.truncToFixed=function(_273,_274){
+_273=Math.floor(_273*Math.pow(10,_274));
+var res=(_273*Math.pow(10,-_274)).toFixed(_274);
if(res.charAt(0)=="."){
res="0"+res;
}
return res;
};
-MochiKit.Format.roundToFixed=function(_289,_290){
-return MochiKit.Format.truncToFixed(_289+0.5*Math.pow(10,-_290),_290);
+MochiKit.Format.roundToFixed=function(_275,_276){
+return MochiKit.Format.truncToFixed(_275+0.5*Math.pow(10,-_276),_276);
};
-MochiKit.Format.percentFormat=function(_291){
-return MochiKit.Format.twoDigitFloat(100*_291)+"%";
+MochiKit.Format.percentFormat=function(_277){
+return MochiKit.Format.twoDigitFloat(100*_277)+"%";
};
MochiKit.Format.EXPORT=["truncToFixed","roundToFixed","numberFormatter","formatLocale","twoDigitAverage","twoDigitFloat","percentFormat","lstrip","rstrip","strip"];
MochiKit.Format.LOCALE={en_US:{separator:",",decimal:".",percent:"%"},de_DE:{separator:".",decimal:",",percent:"%"},fr_FR:{separator:" ",decimal:",",percent:"%"},"default":"en_US"};
@@ -2166,11 +2026,11 @@ MochiKit.Format.__new__();
if(typeof (MochiKit.Base)!="undefined"){
MochiKit.Base._exportSymbols(this,MochiKit.Format);
}else{
-(function(_292,_293){
-if((typeof (JSAN)=="undefined"&&typeof (dojo)=="undefined")||(MochiKit.__export__===false)){
-var all=_293.EXPORT_TAGS[":all"];
+(function(_278,_279){
+if((typeof (JSAN)=="undefined"&&typeof (dojo)=="undefined")||(typeof (MochiKit.__compat__)=="boolean"&&MochiKit.__compat__)){
+var all=_279.EXPORT_TAGS[":all"];
for(var i=0;i=0)){
+this._fire();
+}
+},_continue:function(res){
+this._resback(res);
+this._unpause();
},_resback:function(res){
this.fired=((res instanceof Error)?1:0);
this.results[this.fired]=res;
@@ -2292,41 +2162,37 @@ this._fire();
}
return this;
},_fire:function(){
-var _298=this.chain;
-var _299=this.fired;
-var res=this.results[_299];
+var _284=this.chain;
+var _285=this.fired;
+var res=this.results[_285];
var self=this;
var cb=null;
-while(_298.length>0&&this.paused===0){
-var pair=_298.shift();
-var f=pair[_299];
+while(_284.length>0&&this.paused===0){
+var pair=_284.shift();
+var f=pair[_285];
if(f===null){
continue;
}
try{
res=f(res);
-_299=((res instanceof Error)?1:0);
+_285=((res instanceof Error)?1:0);
if(res instanceof MochiKit.Async.Deferred){
cb=function(res){
-self._resback(res);
-self.paused--;
-if((self.paused===0)&&(self.fired>=0)){
-self._fire();
-}
+self._continue(res);
};
-this.paused++;
+this._pause();
}
}
catch(err){
-_299=1;
+_285=1;
if(!(err instanceof Error)){
err=new MochiKit.Async.GenericError(err);
}
res=err;
}
}
-this.fired=_299;
-this.results[_299]=res;
+this.fired=_285;
+this.results[_285]=res;
if(cb&&this.paused){
res.addBoth(cb);
res.chained=true;
@@ -2334,18 +2200,18 @@ res.chained=true;
}};
MochiKit.Base.update(MochiKit.Async,{evalJSONRequest:function(){
return eval("("+arguments[0].responseText+")");
-},succeed:function(_301){
+},succeed:function(_287){
var d=new MochiKit.Async.Deferred();
d.callback.apply(d,arguments);
return d;
-},fail:function(_302){
+},fail:function(_288){
var d=new MochiKit.Async.Deferred();
d.errback.apply(d,arguments);
return d;
},getXMLHttpRequest:function(){
var self=arguments.callee;
if(!self.XMLHttpRequest){
-var _303=[function(){
+var _289=[function(){
return new XMLHttpRequest();
},function(){
return new ActiveXObject("Msxml2.XMLHTTP");
@@ -2356,8 +2222,8 @@ return new ActiveXObject("Msxml2.XMLHTTP.4.0");
},function(){
throw new MochiKit.Async.BrowserComplianceError("Browser does not support XMLHttpRequest");
}];
-for(var i=0;i<_303.length;i++){
-var func=_303[i];
+for(var i=0;i<_289.length;i++){
+var func=_289[i];
try{
self.XMLHttpRequest=func;
return func();
@@ -2367,29 +2233,29 @@ catch(e){
}
}
return self.XMLHttpRequest();
+},_nothing:function(){
},_xhr_onreadystatechange:function(d){
-var m=MochiKit.Base;
if(this.readyState==4){
try{
this.onreadystatechange=null;
}
catch(e){
try{
-this.onreadystatechange=m.noop;
+this.onreadystatechange=MochiKit.Async._nothing;
}
catch(e){
}
}
-var _304=null;
+var _290=null;
try{
-_304=this.status;
-if(!_304&&m.isNotEmpty(this.responseText)){
-_304=304;
+_290=this.status;
+if(!_290&&MochiKit.Base.isNotEmpty(this.responseText)){
+_290=304;
}
}
catch(e){
}
-if(_304==200||_304==201||_304==204||_304==304||_304==1223){
+if(_290==200||_290==304){
d.callback(this);
}else{
var err=new MochiKit.Async.XMLHttpRequestError(this,"Request failed");
@@ -2406,22 +2272,22 @@ req.onreadystatechange=null;
}
catch(e){
try{
-req.onreadystatechange=MochiKit.Base.noop;
+req.onreadystatechange=MochiKit.Async._nothing;
}
catch(e){
}
}
req.abort();
-},sendXMLHttpRequest:function(req,_307){
-if(typeof (_307)=="undefined"||_307===null){
-_307="";
+},sendXMLHttpRequest:function(req,_293){
+if(typeof (_293)=="undefined"||_293===null){
+_293="";
}
var m=MochiKit.Base;
var self=MochiKit.Async;
var d=new self.Deferred(m.partial(self._xhr_canceller,req));
try{
req.onreadystatechange=m.bind(self._xhr_onreadystatechange,req,d);
-req.send(_307);
+req.send(_293);
}
catch(e){
try{
@@ -2432,75 +2298,45 @@ catch(ignore){
d.errback(e);
}
return d;
-},doXHR:function(url,opts){
-var m=MochiKit.Base;
-opts=m.update({method:"GET",sendContent:""},opts);
+},doSimpleXMLHttpRequest:function(url){
var self=MochiKit.Async;
var req=self.getXMLHttpRequest();
-if(opts.queryString){
-var qs=m.queryString(opts.queryString);
-if(qs){
-url+="?"+qs;
-}
-}
-req.open(opts.method,url,true,opts.username,opts.password);
-if(req.overrideMimeType&&opts.mimeType){
-req.overrideMimeType(opts.mimeType);
-}
-if(opts.headers){
-var _311=opts.headers;
-if(!m.isArrayLike(_311)){
-_311=m.items(_311);
-}
-for(var i=0;i<_311.length;i++){
-var _312=_311[i];
-var name=_312[0];
-var _313=_312[1];
-req.setRequestHeader(name,_313);
-}
-}
-return self.sendXMLHttpRequest(req,opts.sendContent);
-},_buildURL:function(url){
if(arguments.length>1){
var m=MochiKit.Base;
var qs=m.queryString.apply(null,m.extend(null,arguments,1));
if(qs){
-return url+"?"+qs;
+url+="?"+qs;
}
}
-return url;
-},doSimpleXMLHttpRequest:function(url){
-var self=MochiKit.Async;
-url=self._buildURL.apply(self,arguments);
-return self.doXHR(url);
+req.open("GET",url,true);
+return self.sendXMLHttpRequest(req);
},loadJSONDoc:function(url){
var self=MochiKit.Async;
-url=self._buildURL.apply(self,arguments);
-var d=self.doXHR(url,{"mimeType":"text/plain","headers":[["Accept","application/json"]]});
+var d=self.doSimpleXMLHttpRequest.apply(self,arguments);
d=d.addCallback(self.evalJSONRequest);
return d;
-},wait:function(_314,_315){
+},wait:function(_296,_297){
var d=new MochiKit.Async.Deferred();
var m=MochiKit.Base;
-if(typeof (_315)!="undefined"){
+if(typeof (_297)!="undefined"){
d.addCallback(function(){
-return _315;
+return _297;
});
}
-var _316=setTimeout(m.bind("callback",d),Math.floor(_314*1000));
+var _298=setTimeout(m.bind("callback",d),Math.floor(_296*1000));
d.canceller=function(){
try{
-clearTimeout(_316);
+clearTimeout(_298);
}
catch(e){
}
};
return d;
-},callLater:function(_317,func){
+},callLater:function(_299,func){
var m=MochiKit.Base;
-var _318=m.partial.apply(m,m.extend(null,arguments,1));
-return MochiKit.Async.wait(_317).addCallback(function(res){
-return _318();
+var _300=m.partial.apply(m,m.extend(null,arguments,1));
+return MochiKit.Async.wait(_299).addCallback(function(res){
+return _300();
});
}});
MochiKit.Async.DeferredLock=function(){
@@ -2509,7 +2345,7 @@ this.locked=false;
this.id=this._nextId();
};
MochiKit.Async.DeferredLock.prototype={__class__:MochiKit.Async.DeferredLock,acquire:function(){
-var d=new MochiKit.Async.Deferred();
+d=new MochiKit.Async.Deferred();
if(this.locked){
this.waiting.push(d);
}else{
@@ -2527,44 +2363,48 @@ this.locked=true;
this.waiting.shift().callback(this);
}
},_nextId:MochiKit.Base.counter(),repr:function(){
-var _319;
+var _301;
if(this.locked){
-_319="locked, "+this.waiting.length+" waiting";
+_301="locked, "+this.waiting.length+" waiting";
}else{
-_319="unlocked";
+_301="unlocked";
}
-return "DeferredLock("+this.id+", "+_319+")";
+return "DeferredLock("+this.id+", "+_301+")";
},toString:MochiKit.Base.forwardCall("repr")};
-MochiKit.Async.DeferredList=function(list,_321,_322,_323,_324){
-MochiKit.Async.Deferred.apply(this,[_324]);
+MochiKit.Async.DeferredList=function(list,_303,_304,_305,_306){
this.list=list;
-var _325=[];
-this.resultList=_325;
-this.finishedCount=0;
-this.fireOnOneCallback=_321;
-this.fireOnOneErrback=_322;
-this.consumeErrors=_323;
-var cb=MochiKit.Base.bind(this._cbDeferred,this);
-for(var i=0;i=0){
var opt=elem.options[elem.selectedIndex];
-var v=opt.value;
-if(!v){
-var h=opt.outerHTML;
-if(h&&!h.match(/^[^>]+\svalue\s*=/i)){
-v=opt.text;
-}
-}
_339.push(name);
-_340.push(v);
+_340.push((opt.value)?opt.value:opt.text);
return null;
}
_339.push(name);
_340.push("");
return null;
-}else{
-var opts=elem.options;
-if(!opts.length){
-_339.push(name);
-_340.push("");
-return null;
-}
-for(var i=0;i]+\svalue\s*=/i)){
-v=opt.text;
-}
-}
-_339.push(name);
-_340.push(v);
-}
-return null;
-}
}
-if(_341==="FORM"||_341==="P"||_341==="SPAN"||_341==="DIV"){
+if(_341=="FORM"||_341=="P"||_341=="SPAN"||_341=="DIV"){
return elem.childNodes;
}
_339.push(name);
@@ -2763,32 +2718,29 @@ return elem.childNodes;
return [_339,_340];
},withDocument:function(doc,func){
var self=MochiKit.DOM;
-var _345=self._document;
+var _344=self._document;
var rval;
try{
self._document=doc;
rval=func();
}
catch(e){
-self._document=_345;
+self._document=_344;
throw e;
}
-self._document=_345;
+self._document=_344;
return rval;
-},registerDOMConverter:function(name,_346,wrap,_347){
-MochiKit.DOM.domConverters.register(name,_346,wrap,_347);
+},registerDOMConverter:function(name,_345,wrap,_346){
+MochiKit.DOM.domConverters.register(name,_345,wrap,_346);
},coerceToDOM:function(node,ctx){
-var m=MochiKit.Base;
var im=MochiKit.Iter;
var self=MochiKit.DOM;
-if(im){
var iter=im.iter;
-var _351=im.repeat;
-var map=m.map;
-}
+var _350=im.repeat;
+var imap=im.imap;
var _352=self.domConverters;
-var _353=arguments.callee;
-var _354=m.NotFound;
+var _353=self.coerceToDOM;
+var _354=MochiKit.Base.NotFound;
while(true){
if(typeof (node)=="undefined"||node===null){
return null;
@@ -2802,19 +2754,14 @@ node=node.toString();
if(typeof (node)=="string"){
return self._document.createTextNode(node);
}
-if(typeof (node.__dom__)=="function"){
-node=node.__dom__(ctx);
-continue;
-}
-if(typeof (node.dom)=="function"){
-node=node.dom(ctx);
+if(typeof (node.toDOM)=="function"){
+node=node.toDOM(ctx);
continue;
}
if(typeof (node)=="function"){
-node=node.apply(ctx,[ctx]);
+node=node(ctx);
continue;
}
-if(im){
var _355=null;
try{
_355=iter(node);
@@ -2822,8 +2769,7 @@ _355=iter(node);
catch(e){
}
if(_355){
-return map(_353,_355,_351(ctx));
-}
+return imap(_353,_355,_350(ctx));
}
try{
node=_352.match(node,ctx);
@@ -2837,27 +2783,9 @@ throw e;
return self._document.createTextNode(node.toString());
}
return undefined;
-},isChildNode:function(node,_356){
-var self=MochiKit.DOM;
-if(typeof (node)=="string"){
-node=self.getElement(node);
-}
-if(typeof (_356)=="string"){
-_356=self.getElement(_356);
-}
-if(node===_356){
-return true;
-}
-while(node&&node.tagName.toUpperCase()!="BODY"){
-node=node.parentNode;
-if(node===_356){
-return true;
-}
-}
-return false;
-},setNodeAttribute:function(node,attr,_358){
+},setNodeAttribute:function(node,attr,_357){
var o={};
-o[attr]=_358;
+o[attr]=_357;
try{
return MochiKit.DOM.updateNodeAttributes(node,o);
}
@@ -2866,47 +2794,30 @@ catch(e){
return null;
},getNodeAttribute:function(node,attr){
var self=MochiKit.DOM;
-var _359=self.attributeArray.renames[attr];
+var _358=self.attributeArray.renames[attr];
node=self.getElement(node);
try{
-if(_359){
-return node[_359];
+if(_358){
+return node[_358];
}
return node.getAttribute(attr);
}
catch(e){
}
return null;
-},removeNodeAttribute:function(node,attr){
-var self=MochiKit.DOM;
-var _360=self.attributeArray.renames[attr];
-node=self.getElement(node);
-try{
-if(_360){
-return node[_360];
-}
-return node.removeAttribute(attr);
-}
-catch(e){
-}
-return null;
-},updateNodeAttributes:function(node,_361){
+},updateNodeAttributes:function(node,_359){
var elem=node;
var self=MochiKit.DOM;
if(typeof (node)=="string"){
elem=self.getElement(node);
}
-if(_361){
-var _362=MochiKit.Base.updatetree;
+if(_359){
+var _360=MochiKit.Base.updatetree;
if(self.attributeArray.compliant){
-for(var k in _361){
-var v=_361[k];
+for(var k in _359){
+var v=_359[k];
if(typeof (v)=="object"&&typeof (elem[k])=="object"){
-if(k=="style"&&MochiKit.Style){
-MochiKit.Style.setStyle(elem,v);
-}else{
-_362(elem[k],v);
-}
+_360(elem[k],v);
}else{
if(k.substring(0,2)=="on"){
if(typeof (v)=="string"){
@@ -2919,22 +2830,18 @@ elem.setAttribute(k,v);
}
}
}else{
-var _363=self.attributeArray.renames;
-for(k in _361){
-v=_361[k];
-var _364=_363[k];
+var _361=self.attributeArray.renames;
+for(k in _359){
+v=_359[k];
+var _362=_361[k];
if(k=="style"&&typeof (v)=="string"){
elem.style.cssText=v;
}else{
-if(typeof (_364)=="string"){
-elem[_364]=v;
+if(typeof (_362)=="string"){
+elem[_362]=v;
}else{
if(typeof (elem[k])=="object"&&typeof (v)=="object"){
-if(k=="style"&&MochiKit.Style){
-MochiKit.Style.setStyle(elem,v);
-}else{
-_362(elem[k],v);
-}
+_360(elem[k],v);
}else{
if(k.substring(0,2)=="on"){
if(typeof (v)=="string"){
@@ -2957,53 +2864,20 @@ var self=MochiKit.DOM;
if(typeof (node)=="string"){
elem=self.getElement(node);
}
-var _365=[self.coerceToDOM(MochiKit.Base.extend(null,arguments,1),elem)];
-var _366=MochiKit.Base.concat;
-while(_365.length){
-var n=_365.shift();
+var _363=[self.coerceToDOM(MochiKit.Base.extend(null,arguments,1),elem)];
+var _364=MochiKit.Base.concat;
+while(_363.length){
+var n=_363.shift();
if(typeof (n)=="undefined"||n===null){
}else{
if(typeof (n.nodeType)=="number"){
elem.appendChild(n);
}else{
-_365=_366(n,_365);
+_363=_364(n,_363);
}
}
}
return elem;
-},insertSiblingNodesBefore:function(node){
-var elem=node;
-var self=MochiKit.DOM;
-if(typeof (node)=="string"){
-elem=self.getElement(node);
-}
-var _367=[self.coerceToDOM(MochiKit.Base.extend(null,arguments,1),elem)];
-var _368=elem.parentNode;
-var _369=MochiKit.Base.concat;
-while(_367.length){
-var n=_367.shift();
-if(typeof (n)=="undefined"||n===null){
-}else{
-if(typeof (n.nodeType)=="number"){
-_368.insertBefore(n,elem);
-}else{
-_367=_369(n,_367);
-}
-}
-}
-return _368;
-},insertSiblingNodesAfter:function(node){
-var elem=node;
-var self=MochiKit.DOM;
-if(typeof (node)=="string"){
-elem=self.getElement(node);
-}
-var _370=[self.coerceToDOM(MochiKit.Base.extend(null,arguments,1),elem)];
-if(elem.nextSibling){
-return self.insertSiblingNodesBefore(elem.nextSibling,_370);
-}else{
-return self.appendChildNodes(elem.parentNode,_370);
-}
},replaceChildNodes:function(node){
var elem=node;
var self=MochiKit.DOM;
@@ -3011,49 +2885,33 @@ if(typeof (node)=="string"){
elem=self.getElement(node);
arguments[0]=elem;
}
-var _371;
-while((_371=elem.firstChild)){
-elem.removeChild(_371);
+var _365;
+while((_365=elem.firstChild)){
+elem.removeChild(_365);
}
if(arguments.length<2){
return elem;
}else{
return self.appendChildNodes.apply(this,arguments);
}
-},createDOM:function(name,_372){
+},createDOM:function(name,_366){
var elem;
var self=MochiKit.DOM;
var m=MochiKit.Base;
-if(typeof (_372)=="string"||typeof (_372)=="number"){
+if(typeof (_366)=="string"||typeof (_366)=="number"){
var args=m.extend([name,null],arguments,1);
return arguments.callee.apply(this,args);
}
if(typeof (name)=="string"){
-var _373=self._xhtml;
-if(_372&&!self.attributeArray.compliant){
-var _374="";
-if("name" in _372){
-_374+=" name=\""+self.escapeHTML(_372.name)+"\"";
-}
-if(name=="input"&&"type" in _372){
-_374+=" type=\""+self.escapeHTML(_372.type)+"\"";
-}
-if(_374){
-name="<"+name+_374+">";
-_373=false;
-}
-}
-var d=self._document;
-if(_373&&d===document){
-elem=d.createElementNS("http://www.w3.org/1999/xhtml",name);
-}else{
-elem=d.createElement(name);
+if(_366&&"name" in _366&&!self.attributeArray.compliant){
+name=("<"+name+" name=\""+self.escapeHTML(_366.name)+"\">");
}
+elem=self._document.createElement(name);
}else{
elem=name;
}
-if(_372){
-self.updateNodeAttributes(elem,_372);
+if(_366){
+self.updateNodeAttributes(elem,_366);
}
if(arguments.length<=2){
return elem;
@@ -3064,19 +2922,15 @@ return self.appendChildNodes.apply(this,args);
},createDOMFunc:function(){
var m=MochiKit.Base;
return m.partial.apply(this,m.extend([MochiKit.DOM.createDOM],arguments));
-},removeElement:function(elem){
-var e=MochiKit.DOM.getElement(elem);
-e.parentNode.removeChild(e);
-return e;
},swapDOM:function(dest,src){
var self=MochiKit.DOM;
dest=self.getElement(dest);
-var _377=dest.parentNode;
+var _369=dest.parentNode;
if(src){
src=self.getElement(src);
-_377.replaceChild(src,dest);
+_369.replaceChild(src,dest);
}else{
-_377.removeChild(dest);
+_369.removeChild(dest);
}
return src;
},getElement:function(id){
@@ -3086,40 +2940,60 @@ return ((typeof (id)=="string")?self._document.getElementById(id):id);
}else{
return MochiKit.Base.map(self.getElement,arguments);
}
-},getElementsByTagAndClassName:function(_379,_380,_381){
+},computedStyle:function(_371,_372,_373){
+if(arguments.length==2){
+_373=_372;
+}
var self=MochiKit.DOM;
-if(typeof (_379)=="undefined"||_379===null){
-_379="*";
+var el=self.getElement(_371);
+var _375=self._document;
+if(!el||el==_375){
+return undefined;
}
-if(typeof (_381)=="undefined"||_381===null){
-_381=self._document;
+if(el.currentStyle){
+return el.currentStyle[_372];
}
-_381=self.getElement(_381);
-var _382=(_381.getElementsByTagName(_379)||self._document.all);
-if(typeof (_380)=="undefined"||_380===null){
-return MochiKit.Base.extend(null,_382);
+if(typeof (_375.defaultView)=="undefined"){
+return undefined;
}
-var _383=[];
-for(var i=0;i<_382.length;i++){
-var _384=_382[i];
-var cls=_384.className;
-if(!cls){
-continue;
+if(_375.defaultView===null){
+return undefined;
+}
+var _376=_375.defaultView.getComputedStyle(el,null);
+if(typeof (_376)=="undefined"||_376===null){
+return undefined;
+}
+return _376.getPropertyValue(_373);
+},getElementsByTagAndClassName:function(_377,_378,_379){
+var self=MochiKit.DOM;
+if(typeof (_377)=="undefined"||_377===null){
+_377="*";
}
-var _386=cls.split(" ");
-for(var j=0;j<_386.length;j++){
-if(_386[j]==_380){
-_383.push(_384);
+if(typeof (_379)=="undefined"||_379===null){
+_379=self._document;
+}
+_379=self.getElement(_379);
+var _380=(_379.getElementsByTagName(_377)||self._document.all);
+if(typeof (_378)=="undefined"||_378===null){
+return MochiKit.Base.extend(null,_380);
+}
+var _381=[];
+for(var i=0;i<_380.length;i++){
+var _382=_380[i];
+var _383=_382.className.split(" ");
+for(var j=0;j<_383.length;j++){
+if(_383[j]==_378){
+_381.push(_382);
break;
}
}
}
-return _383;
+return _381;
},_newCallStack:function(path,once){
var rval=function(){
-var _389=arguments.callee.callStack;
-for(var i=0;i<_389.length;i++){
-if(_389[i].apply(this,arguments)===false){
+var _386=arguments.callee.callStack;
+for(var i=0;i<_386.length;i++){
+if(_386[i].apply(this,arguments)===false){
break;
}
}
@@ -3133,102 +3007,98 @@ catch(e){
};
rval.callStack=[];
return rval;
-},addToCallStack:function(_390,path,func,once){
+},addToCallStack:function(_387,path,func,once){
var self=MochiKit.DOM;
-var _391=_390[path];
-var _392=_391;
-if(!(typeof (_391)=="function"&&typeof (_391.callStack)=="object"&&_391.callStack!==null)){
-_392=self._newCallStack(path,once);
-if(typeof (_391)=="function"){
-_392.callStack.push(_391);
+var _388=_387[path];
+var _389=_388;
+if(!(typeof (_388)=="function"&&typeof (_388.callStack)=="object"&&_388.callStack!==null)){
+_389=self._newCallStack(path,once);
+if(typeof (_388)=="function"){
+_389.callStack.push(_388);
}
-_390[path]=_392;
+_387[path]=_389;
}
-_392.callStack.push(func);
+_389.callStack.push(func);
},addLoadEvent:function(func){
var self=MochiKit.DOM;
self.addToCallStack(self._window,"onload",func,true);
-},focusOnLoad:function(_393){
+},focusOnLoad:function(_390){
var self=MochiKit.DOM;
self.addLoadEvent(function(){
-_393=self.getElement(_393);
-if(_393){
-_393.focus();
+_390=self.getElement(_390);
+if(_390){
+_390.focus();
}
});
-},setElementClass:function(_394,_395){
+},setElementClass:function(_391,_392){
var self=MochiKit.DOM;
-var obj=self.getElement(_394);
+var obj=self.getElement(_391);
if(self.attributeArray.compliant){
-obj.setAttribute("class",_395);
+obj.setAttribute("class",_392);
}else{
-obj.setAttribute("className",_395);
+obj.setAttribute("className",_392);
}
-},toggleElementClass:function(_396){
+},toggleElementClass:function(_393){
var self=MochiKit.DOM;
for(var i=1;i");
-_411.push("");
-var _417=dom.childNodes;
-for(i=_417.length-1;i>=0;i--){
-_411.push(_417[i]);
+_409.push("");
+var _415=dom.childNodes;
+for(i=_415.length-1;i>=0;i--){
+_409.push(_415[i]);
}
}else{
lst.push("/>");
}
}else{
if(dom.nodeType==3){
-lst.push(_412(dom.nodeValue));
+lst.push(_410(dom.nodeValue));
}
}
}
}
return lst;
-},scrapeText:function(node,_418){
+},setDisplayForElement:function(_416,_417){
+var m=MochiKit.Base;
+var _418=m.extend(null,arguments,1);
+MochiKit.Iter.forEach(m.filter(null,m.map(MochiKit.DOM.getElement,_418)),function(_417){
+_417.style.display=_416;
+});
+},scrapeText:function(node,_419){
var rval=[];
(function(node){
var cn=node.childNodes;
@@ -3297,856 +3173,93 @@ for(var i=0;i0){
-var _444=m.filter;
-_443=function(node){
-return _444(_443.ignoreAttrFilter,node.attributes);
-};
-_443.ignoreAttr={};
-var _445=_442.attributes;
-var _446=_443.ignoreAttr;
-for(var i=0;i<_445.length;i++){
-var a=_445[i];
-_446[a.name]=a.value;
-}
-_443.ignoreAttrFilter=function(a){
-return (_443.ignoreAttr[a.name]!=a.value);
-};
-_443.compliant=false;
-_443.renames={"class":"className","checked":"defaultChecked","usemap":"useMap","for":"htmlFor","readonly":"readOnly","colspan":"colSpan","bgcolor":"bgColor"};
-}else{
-_443=function(node){
-return node.attributes;
-};
-_443.compliant=true;
-_443.renames={};
-}
-this.attributeArray=_443;
-var _447=function(_448,arr){
-var _449=arr[1].split(".");
-var str="";
-var obj={};
-str+="if (!MochiKit."+_449[1]+") { throw new Error(\"";
-str+="This function has been deprecated and depends on MochiKit.";
-str+=_449[1]+".\");}";
-str+="return MochiKit."+_449[1]+"."+arr[0];
-str+=".apply(this, arguments);";
-obj[_449[2]]=new Function(str);
-MochiKit.Base.update(MochiKit[_448],obj);
-};
-for(var i;i0){
-abort(repr(expr));
-}
-},buildMatchExpression:function(){
-var repr=MochiKit.Base.repr;
-var _457=this.params;
-var _458=[];
-var _459,i;
-function childElements(_460){
-return "MochiKit.Base.filter(function (node) { return node.nodeType == 1; }, "+_460+".childNodes)";
-}
-if(_457.wildcard){
-_458.push("true");
-}
-if(_459=_457.id){
-_458.push("element.id == "+repr(_459));
-}
-if(_459=_457.tagName){
-_458.push("element.tagName.toUpperCase() == "+repr(_459));
-}
-if((_459=_457.classNames).length>0){
-for(i=0;i<_459.length;i++){
-_458.push("MochiKit.DOM.hasElementClass(element, "+repr(_459[i])+")");
-}
-}
-if((_459=_457.pseudoClassNames).length>0){
-for(i=0;i<_459.length;i++){
-var _461=_459[i].match(/^([^(]+)(?:\((.*)\))?$/);
-var _462=_461[1];
-var _463=_461[2];
-switch(_462){
-case "root":
-_458.push("element.nodeType == 9 || element === element.ownerDocument.documentElement");
-break;
-case "nth-child":
-case "nth-last-child":
-case "nth-of-type":
-case "nth-last-of-type":
-_461=_463.match(/^((?:(\d+)n\+)?(\d+)|odd|even)$/);
-if(!_461){
-throw "Invalid argument to pseudo element nth-child: "+_463;
-}
-var a,b;
-if(_461[0]=="odd"){
-a=2;
-b=1;
-}else{
-if(_461[0]=="even"){
-a=2;
-b=0;
-}else{
-a=_461[2]&&parseInt(_461)||null;
-b=parseInt(_461[3]);
-}
-}
-_458.push("this.nthChild(element,"+a+","+b+","+!!_462.match("^nth-last")+","+!!_462.match("of-type$")+")");
-break;
-case "first-child":
-_458.push("this.nthChild(element, null, 1)");
-break;
-case "last-child":
-_458.push("this.nthChild(element, null, 1, true)");
-break;
-case "first-of-type":
-_458.push("this.nthChild(element, null, 1, false, true)");
-break;
-case "last-of-type":
-_458.push("this.nthChild(element, null, 1, true, true)");
-break;
-case "only-child":
-_458.push(childElements("element.parentNode")+".length == 1");
-break;
-case "only-of-type":
-_458.push("MochiKit.Base.filter(function (node) { return node.tagName == element.tagName; }, "+childElements("element.parentNode")+").length == 1");
-break;
-case "empty":
-_458.push("element.childNodes.length == 0");
-break;
-case "enabled":
-_458.push("(this.isUIElement(element) && element.disabled === false)");
-break;
-case "disabled":
-_458.push("(this.isUIElement(element) && element.disabled === true)");
-break;
-case "checked":
-_458.push("(this.isUIElement(element) && element.checked === true)");
-break;
-case "not":
-var _464=new MochiKit.Selector.Selector(_463);
-_458.push("!( "+_464.buildMatchExpression()+")");
-break;
-}
-}
-}
-if(_459=_457.attributes){
-MochiKit.Base.map(function(_465){
-var _466="MochiKit.DOM.getNodeAttribute(element, "+repr(_465.name)+")";
-var _467=function(_468){
-return _466+" && "+_466+".split("+repr(_468)+")";
-};
-switch(_465.operator){
-case "=":
-_458.push(_466+" == "+repr(_465.value));
-break;
-case "~=":
-_458.push("MochiKit.Base.findValue("+_467(" ")+", "+repr(_465.value)+") > -1");
-break;
-case "^=":
-_458.push(_466+".substring(0, "+_465.value.length+") == "+repr(_465.value));
-break;
-case "$=":
-_458.push(_466+".substring("+_466+".length - "+_465.value.length+") == "+repr(_465.value));
-break;
-case "*=":
-_458.push(_466+".match("+repr(_465.value)+")");
-break;
-case "|=":
-_458.push(_467("-")+"[0].toUpperCase() == "+repr(_465.value.toUpperCase()));
-break;
-case "!=":
-_458.push(_466+" != "+repr(_465.value));
-break;
-case "":
-case undefined:
-_458.push(_466+" != null");
-break;
-default:
-throw "Unknown operator "+_465.operator+" in selector";
-}
-},_459);
-}
-return _458.join(" && ");
-},compileMatcher:function(){
-this.match=new Function("element","if (!element.tagName) return false; return "+this.buildMatchExpression());
-},nthChild:function(_469,a,b,_470,_471){
-var _472=MochiKit.Base.filter(function(node){
-return node.nodeType==1;
-},_469.parentNode.childNodes);
-if(_471){
-_472=MochiKit.Base.filter(function(node){
-return node.tagName==_469.tagName;
-},_472);
-}
-if(_470){
-_472=MochiKit.Iter.reversed(_472);
-}
-if(a){
-var _473=MochiKit.Base.findIdentical(_472,_469);
-return ((_473+1-b)/a)%1==0;
-}else{
-return b==MochiKit.Base.findIdentical(_472,_469)+1;
-}
-},isUIElement:function(_474){
-return findValue(["input","button","select","option","textarea","object"],_474.tagName.toLowerCase())>-1;
-},findElements:function(_475,axis){
-var _477;
-if(axis==undefined){
-axis="";
-}
-function inScope(_477,_475){
-if(axis==""){
-return MochiKit.DOM.isChildNode(_477,_475);
-}else{
-if(axis==">"){
-return _477.parentNode==_475;
-}else{
-if(axis=="+"){
-return _477==nextSiblingElement(_475);
-}else{
-if(axis=="~"){
-var _478=_475;
-while(_478=nextSiblingElement(_478)){
-if(_477==_478){
-return true;
-}
-}
-return false;
-}else{
-throw "Invalid axis: "+axis;
-}
-}
-}
-}
-}
-if(element=MochiKit.DOM.getElement(this.params.id)){
-if(this.match(element)){
-if(!scope||inScope(element,scope)){
-return [element];
-}
-}
-}
-function nextSiblingElement(node){
-node=node.nextSibling;
-while(node&&node.nodeType!=1){
-node=node.nextSibling;
-}
-return node;
-}
-if(axis==""){
-scope=(scope||currentDocument()).getElementsByTagName(this.params.tagName||"*");
-}else{
-if(axis==">"){
-if(!scope){
-throw "> combinator not allowed without preceeding expression";
-}
-scope=MochiKit.Base.filter(function(node){
-return node.nodeType==1;
-},scope.childNodes);
-}else{
-if(axis=="+"){
-if(!scope){
-throw "+ combinator not allowed without preceeding expression";
-}
-scope=nextSiblingElement(scope)&&[nextSiblingElement(scope)];
-}else{
-if(axis=="~"){
-if(!scope){
-throw "~ combinator not allowed without preceeding expression";
-}
-var _479=[];
-while(nextSiblingElement(scope)){
-scope=nextSiblingElement(scope);
-_479.push(scope);
-}
-scope=_479;
-}
-}
-}
-}
-if(!scope){
-return [];
-}
-var _480=MochiKit.Base.filter(MochiKit.Base.bind(function(_481){
-return this.match(_481);
-},this),scope);
-return _480;
-},repr:function(){
-return "Selector("+this.expression+")";
-},toString:MochiKit.Base.forwardCall("repr")};
-MochiKit.Base.update(MochiKit.Selector,{findChildElements:function(_482,_483){
-return MochiKit.Base.flattenArray(MochiKit.Base.map(function(_484){
-var _485="";
-return MochiKit.Iter.reduce(function(_486,expr){
-if(match=expr.match(/^[>+~]$/)){
-_485=match[0];
-return _486;
-}else{
-var _487=new MochiKit.Selector.Selector(expr);
-var _488=MochiKit.Iter.reduce(function(_488,_489){
-return MochiKit.Base.extend(_488,_487.findElements(_489||_482,_485));
-},_486,[]);
-_485="";
-return elements;
-}
-},_484.replace(/(^\s+|\s+$)/g,"").split(/\s+/),[null]);
-},_483));
-}});
-function $$(){
-return MochiKit.Selector.findChildElements(MochiKit.DOM.currentDocument(),arguments);
-}
-if(typeof (dojo)!="undefined"){
-dojo.provide("MochiKit.Style");
-dojo.require("MochiKit.Base");
-dojo.require("MochiKit.DOM");
-}
-if(typeof (JSAN)!="undefined"){
-JSAN.use("MochiKit.Base",[]);
-}
-try{
-if(typeof (MochiKit.Base)=="undefined"){
-throw "";
-}
-}
-catch(e){
-throw "MochiKit.Style depends on MochiKit.Base!";
-}
-try{
-if(typeof (MochiKit.DOM)=="undefined"){
-throw "";
-}
-}
-catch(e){
-throw "MochiKit.Style depends on MochiKit.DOM!";
-}
-if(typeof (MochiKit.Style)=="undefined"){
-MochiKit.Style={};
-}
-MochiKit.Style.NAME="MochiKit.Style";
-MochiKit.Style.VERSION="1.4";
-MochiKit.Style.__repr__=function(){
-return "["+this.NAME+" "+this.VERSION+"]";
-};
-MochiKit.Style.toString=function(){
-return this.__repr__();
-};
-MochiKit.Style.EXPORT_OK=[];
-MochiKit.Style.EXPORT=["setStyle","setOpacity","getStyle","getElementDimensions","elementDimensions","setElementDimensions","getElementPosition","elementPosition","setElementPosition","setDisplayForElement","hideElement","showElement","getViewportDimensions","getViewportPosition","Dimensions","Coordinates"];
-MochiKit.Style.Dimensions=function(w,h){
-this.w=w;
-this.h=h;
-};
-MochiKit.Style.Dimensions.prototype.__repr__=function(){
-var repr=MochiKit.Base.repr;
-return "{w: "+repr(this.w)+", h: "+repr(this.h)+"}";
-};
-MochiKit.Style.Dimensions.prototype.toString=function(){
-return this.__repr__();
-};
-MochiKit.Style.Coordinates=function(x,y){
-this.x=x;
-this.y=y;
-};
-MochiKit.Style.Coordinates.prototype.__repr__=function(){
-var repr=MochiKit.Base.repr;
-return "{x: "+repr(this.x)+", y: "+repr(this.y)+"}";
-};
-MochiKit.Style.Coordinates.prototype.toString=function(){
-return this.__repr__();
-};
-MochiKit.Base.update(MochiKit.Style,{getStyle:function(elem,_492){
-var dom=MochiKit.DOM;
-var d=dom._document;
-elem=dom.getElement(elem);
-_492=MochiKit.Base.camelize(_492);
-if(!elem||elem==d){
-return undefined;
-}
-if(_492=="opacity"&&elem.filters){
-var _493;
-if(_493=(MochiKit.Style.getStyle(elem,"filter")||"").match(/alpha\(opacity=(.*)\)/)){
-if(_493[1]){
-return parseFloat(_493[1])/100;
-}
-}
-return 1;
-}
-var _494=elem.style?elem.style[_492]:null;
-if(!_494){
-if(d.defaultView&&d.defaultView.getComputedStyle){
-var css=d.defaultView.getComputedStyle(elem,null);
-_492=_492.replace(/([A-Z])/g,"-$1").toLowerCase();
-_494=css?css.getPropertyValue(_492):null;
-}else{
-if(elem.currentStyle){
-_494=elem.currentStyle[_492];
-}
-}
-}
-if(_492=="opacity"){
-_494=parseFloat(_494);
-}
-if(/Opera/.test(navigator.userAgent)&&(MochiKit.Base.find(["left","top","right","bottom"],_492)!=-1)){
-if(MochiKit.Style.getStyle(elem,"position")=="static"){
-_494="auto";
-}
-}
-return _494=="auto"?null:_494;
-},setStyle:function(elem,_496){
-elem=MochiKit.DOM.getElement(elem);
-for(name in _496){
-if(name=="opacity"){
-MochiKit.Style.setOpacity(elem,_496[name]);
-}else{
-elem.style[MochiKit.Base.camelize(name)]=_496[name];
-}
-}
-},setOpacity:function(elem,o){
-elem=MochiKit.DOM.getElement(elem);
-var self=MochiKit.Style;
-if(o==1){
-var _497=/Gecko/.test(navigator.userAgent)&&!(/Konqueror|Safari|KHTML/.test(navigator.userAgent));
-elem.style[name]=_497?0.999999:1;
-if(/MSIE/.test(navigator.userAgent)){
-elem.style["filter"]=self.getStyle(elem,"filter").replace(/alpha\([^\)]*\)/gi,"");
-}
-}else{
-if(o<0.00001){
-o=0;
-}
-elem.style[name]=o;
-if(/MSIE/.test(navigator.userAgent)){
-elem.style["filter"]=self.getStyle(elem,"filter").replace(/alpha\([^\)]*\)/gi,"")+"alpha(opacity="+o*100+")";
-}
-}
-},getElementPosition:function(elem,_498){
-var self=MochiKit.Style;
-var dom=MochiKit.DOM;
-elem=dom.getElement(elem);
-if(!elem||(!(elem.x&&elem.y)&&(!elem.parentNode==null||self.getStyle(elem,"display")=="none"))){
-return undefined;
-}
-var c=new self.Coordinates(0,0);
-var box=null;
-var _501=null;
-var d=MochiKit.DOM._document;
-var de=d.documentElement;
-var b=d.body;
-if(!elem.parentNode&&elem.x&&elem.y){
-c.x+=elem.x||0;
-c.y+=elem.y||0;
-}else{
-if(elem.getBoundingClientRect){
-box=elem.getBoundingClientRect();
-c.x+=box.left+(de.scrollLeft||b.scrollLeft)-(de.clientLeft||0);
-c.y+=box.top+(de.scrollTop||b.scrollTop)-(de.clientTop||0);
-}else{
-if(elem.offsetParent){
-c.x+=elem.offsetLeft;
-c.y+=elem.offsetTop;
-_501=elem.offsetParent;
-if(_501!=elem){
-while(_501){
-c.x+=_501.offsetLeft;
-c.y+=_501.offsetTop;
-_501=_501.offsetParent;
-}
-}
-var ua=navigator.userAgent.toLowerCase();
-if((typeof (opera)!="undefined"&&parseFloat(opera.version())<9)||(ua.indexOf("safari")!=-1&&self.getStyle(elem,"position")=="absolute")){
-c.x-=b.offsetLeft;
-c.y-=b.offsetTop;
-}
-}
-}
-}
-if(typeof (_498)!="undefined"){
-_498=arguments.callee(_498);
-if(_498){
-c.x-=(_498.x||0);
-c.y-=(_498.y||0);
-}
-}
-if(elem.parentNode){
-_501=elem.parentNode;
-}else{
-_501=null;
-}
-while(_501){
-var _504=_501.tagName.toUpperCase();
-if(_504==="BODY"||_504==="HTML"){
-break;
-}
-c.x-=_501.scrollLeft;
-c.y-=_501.scrollTop;
-if(_501.parentNode){
-_501=_501.parentNode;
-}else{
-_501=null;
-}
-}
-return c;
-},setElementPosition:function(elem,_505,_506){
-elem=MochiKit.DOM.getElement(elem);
-if(typeof (_506)=="undefined"){
-_506="px";
-}
-var _507={};
-var _508=MochiKit.Base.isUndefinedOrNull;
-if(!_508(_505.x)){
-_507["left"]=_505.x+_506;
-}
-if(!_508(_505.y)){
-_507["top"]=_505.y+_506;
-}
-MochiKit.DOM.updateNodeAttributes(elem,{"style":_507});
-},getElementDimensions:function(elem){
-var self=MochiKit.Style;
-var dom=MochiKit.DOM;
-if(typeof (elem.w)=="number"||typeof (elem.h)=="number"){
-return new self.Dimensions(elem.w||0,elem.h||0);
-}
-elem=dom.getElement(elem);
-if(!elem){
-return undefined;
-}
-var disp=self.getStyle(elem,"display");
-if(disp!="none"&&disp!=""&&typeof (disp)!="undefined"){
-return new self.Dimensions(elem.offsetWidth||0,elem.offsetHeight||0);
-}
-var s=elem.style;
-var _510=s.visibility;
-var _511=s.position;
-s.visibility="hidden";
-s.position="absolute";
-s.display="";
-var _512=elem.offsetWidth;
-var _513=elem.offsetHeight;
-s.display="none";
-s.position=_511;
-s.visibility=_510;
-return new self.Dimensions(_512,_513);
-},setElementDimensions:function(elem,_514,_515){
-elem=MochiKit.DOM.getElement(elem);
-if(typeof (_515)=="undefined"){
-_515="px";
-}
-var _516={};
-var _517=MochiKit.Base.isUndefinedOrNull;
-if(!_517(_514.w)){
-_516["width"]=_514.w+_515;
-}
-if(!_517(_514.h)){
-_516["height"]=_514.h+_515;
-}
-MochiKit.DOM.updateNodeAttributes(elem,{"style":_516});
-},setDisplayForElement:function(_518,_519){
-var _520=MochiKit.Base.extend(null,arguments,1);
-var _521=MochiKit.DOM.getElement;
-for(var i=0;i<_520.length;i++){
-var _519=_521(_520[i]);
-if(_519){
-_519.style.display=_518;
-}
-}
-},getViewportDimensions:function(){
-var d=new MochiKit.Style.Dimensions();
-var w=MochiKit.DOM._window;
-var b=MochiKit.DOM._document.body;
-if(w.innerWidth){
-d.w=w.innerWidth;
-d.h=w.innerHeight;
-}else{
-if(b.parentElement.clientWidth){
-d.w=b.parentElement.clientWidth;
-d.h=b.parentElement.clientHeight;
-}else{
-if(b&&b.clientWidth){
-d.w=b.clientWidth;
-d.h=b.clientHeight;
-}
-}
-}
-return d;
-},getViewportPosition:function(){
-var c=new MochiKit.Style.Coordinates(0,0);
-var d=MochiKit.DOM._document;
-var de=d.documentElement;
-var db=d.body;
-if(de&&(de.scrollTop||de.scrollLeft)){
-c.x=de.scrollLeft;
-c.y=de.scrollTop;
-}else{
-if(db){
-c.x=db.scrollLeft;
-c.y=db.scrollTop;
-}
-}
-return c;
-},__new__:function(){
+},__new__:function(win){
var m=MochiKit.Base;
-this.elementPosition=this.getElementPosition;
-this.elementDimensions=this.getElementDimensions;
+this._document=document;
+this._window=win;
+this.domConverters=new m.AdapterRegistry();
+var _422=this._document.createElement("span");
+var _423;
+if(_422&&_422.attributes&&_422.attributes.length>0){
+var _424=m.filter;
+_423=function(node){
+return _424(_423.ignoreAttrFilter,node.attributes);
+};
+_423.ignoreAttr={};
+MochiKit.Iter.forEach(_422.attributes,function(a){
+_423.ignoreAttr[a.name]=a.value;
+});
+_423.ignoreAttrFilter=function(a){
+return (_423.ignoreAttr[a.name]!=a.value);
+};
+_423.compliant=false;
+_423.renames={"class":"className","checked":"defaultChecked","usemap":"useMap","for":"htmlFor"};
+}else{
+_423=function(node){
+return node.attributes;
+};
+_423.compliant=true;
+_423.renames={};
+}
+this.attributeArray=_423;
+var _425=this.createDOMFunc;
+this.UL=_425("ul");
+this.OL=_425("ol");
+this.LI=_425("li");
+this.TD=_425("td");
+this.TR=_425("tr");
+this.TBODY=_425("tbody");
+this.THEAD=_425("thead");
+this.TFOOT=_425("tfoot");
+this.TABLE=_425("table");
+this.TH=_425("th");
+this.INPUT=_425("input");
+this.SPAN=_425("span");
+this.A=_425("a");
+this.DIV=_425("div");
+this.IMG=_425("img");
+this.BUTTON=_425("button");
+this.TT=_425("tt");
+this.PRE=_425("pre");
+this.H1=_425("h1");
+this.H2=_425("h2");
+this.H3=_425("h3");
+this.BR=_425("br");
+this.HR=_425("hr");
+this.LABEL=_425("label");
+this.TEXTAREA=_425("textarea");
+this.FORM=_425("form");
+this.P=_425("p");
+this.SELECT=_425("select");
+this.OPTION=_425("option");
+this.OPTGROUP=_425("optgroup");
+this.LEGEND=_425("legend");
+this.FIELDSET=_425("fieldset");
+this.STRONG=_425("strong");
+this.CANVAS=_425("canvas");
this.hideElement=m.partial(this.setDisplayForElement,"none");
this.showElement=m.partial(this.setDisplayForElement,"block");
+this.removeElement=this.swapDOM;
+this.$=this.getElement;
this.EXPORT_TAGS={":common":this.EXPORT,":all":m.concat(this.EXPORT,this.EXPORT_OK)};
m.nameFunctions(this);
}});
-MochiKit.Style.__new__();
-MochiKit.Base._exportSymbols(this,MochiKit.Style);
+MochiKit.DOM.__new__(((typeof (window)=="undefined")?this:window));
+if(!MochiKit.__compat__){
+withWindow=MochiKit.DOM.withWindow;
+withDocument=MochiKit.DOM.withDocument;
+}
+MochiKit.Base._exportSymbols(this,MochiKit.DOM);
if(typeof (dojo)!="undefined"){
dojo.provide("MochiKit.LoggingPane");
dojo.require("MochiKit.Logging");
@@ -4168,41 +3281,41 @@ if(typeof (MochiKit.LoggingPane)=="undefined"){
MochiKit.LoggingPane={};
}
MochiKit.LoggingPane.NAME="MochiKit.LoggingPane";
-MochiKit.LoggingPane.VERSION="1.4";
+MochiKit.LoggingPane.VERSION="1.3.1";
MochiKit.LoggingPane.__repr__=function(){
return "["+this.NAME+" "+this.VERSION+"]";
};
MochiKit.LoggingPane.toString=function(){
return this.__repr__();
};
-MochiKit.LoggingPane.createLoggingPane=function(_523){
+MochiKit.LoggingPane.createLoggingPane=function(_426){
var m=MochiKit.LoggingPane;
-_523=!(!_523);
-if(m._loggingPane&&m._loggingPane.inline!=_523){
+_426=!(!_426);
+if(m._loggingPane&&m._loggingPane.inline!=_426){
m._loggingPane.closePane();
m._loggingPane=null;
}
if(!m._loggingPane||m._loggingPane.closed){
-m._loggingPane=new m.LoggingPane(_523,MochiKit.Logging.logger);
+m._loggingPane=new m.LoggingPane(_426,MochiKit.Logging.logger);
}
return m._loggingPane;
};
-MochiKit.LoggingPane.LoggingPane=function(_524,_525){
-if(typeof (_525)=="undefined"||_525===null){
-_525=MochiKit.Logging.logger;
+MochiKit.LoggingPane.LoggingPane=function(_427,_428){
+if(typeof (_428)=="undefined"||_428===null){
+_428=MochiKit.Logging.logger;
}
-this.logger=_525;
-var _526=MochiKit.Base.update;
-var _527=MochiKit.Base.updatetree;
+this.logger=_428;
+var _429=MochiKit.Base.update;
+var _430=MochiKit.Base.updatetree;
var bind=MochiKit.Base.bind;
-var _528=MochiKit.Base.clone;
+var _431=MochiKit.Base.clone;
var win=window;
var uid="_MochiKit_LoggingPane";
if(typeof (MochiKit.DOM)!="undefined"){
win=MochiKit.DOM.currentWindow();
}
-if(!_524){
-var url=win.location.href.split("?")[0].replace(/[#:\/.><&-]/g,"_");
+if(!_427){
+var url=win.location.href.split("?")[0].replace(/[:\/.><&]/g,"_");
var name=uid+"_"+url;
var nwin=win.open("",name,"dependent,resizable,height=200");
if(!nwin){
@@ -4216,89 +3329,89 @@ win=nwin;
}
var doc=win.document;
this.doc=doc;
-var _531=doc.getElementById(uid);
-var _532=!!_531;
-if(_531&&typeof (_531.loggingPane)!="undefined"){
-_531.loggingPane.logger=this.logger;
-_531.loggingPane.buildAndApplyFilter();
-return _531.loggingPane;
-}
-if(_532){
-var _533;
-while((_533=_531.firstChild)){
-_531.removeChild(_533);
-}
-}else{
-_531=doc.createElement("div");
-_531.id=uid;
-}
-_531.loggingPane=this;
-var _534=doc.createElement("input");
-var _535=doc.createElement("input");
-var _536=doc.createElement("button");
-var _537=doc.createElement("button");
-var _538=doc.createElement("button");
-var _539=doc.createElement("button");
-var _540=doc.createElement("div");
-var _541=doc.createElement("div");
-var _542=uid+"_Listener";
-this.colorTable=_528(this.colorTable);
-var _543=[];
-var _544=null;
-var _545=function(msg){
-var _546=msg.level;
-if(typeof (_546)=="number"){
-_546=MochiKit.Logging.LogLevel[_546];
-}
-return _546;
-};
-var _547=function(msg){
+var _434=doc.getElementById(uid);
+var _435=!!_434;
+if(_434&&typeof (_434.loggingPane)!="undefined"){
+_434.loggingPane.logger=this.logger;
+_434.loggingPane.buildAndApplyFilter();
+return _434.loggingPane;
+}
+if(_435){
+var _436;
+while((_436=_434.firstChild)){
+_434.removeChild(_436);
+}
+}else{
+_434=doc.createElement("div");
+_434.id=uid;
+}
+_434.loggingPane=this;
+var _437=doc.createElement("input");
+var _438=doc.createElement("input");
+var _439=doc.createElement("button");
+var _440=doc.createElement("button");
+var _441=doc.createElement("button");
+var _442=doc.createElement("button");
+var _443=doc.createElement("div");
+var _444=doc.createElement("div");
+var _445=uid+"_Listener";
+this.colorTable=_431(this.colorTable);
+var _446=[];
+var _447=null;
+var _448=function(msg){
+var _449=msg.level;
+if(typeof (_449)=="number"){
+_449=MochiKit.Logging.LogLevel[_449];
+}
+return _449;
+};
+var _450=function(msg){
return msg.info.join(" ");
};
-var _548=bind(function(msg){
-var _549=_545(msg);
-var text=_547(msg);
-var c=this.colorTable[_549];
+var _451=bind(function(msg){
+var _452=_448(msg);
+var text=_450(msg);
+var c=this.colorTable[_452];
var p=doc.createElement("span");
-p.className="MochiKit-LogMessage MochiKit-LogLevel-"+_549;
+p.className="MochiKit-LogMessage MochiKit-LogLevel-"+_452;
p.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;
-p.appendChild(doc.createTextNode(_549+": "+text));
-_541.appendChild(p);
-_541.appendChild(doc.createElement("br"));
-if(_540.offsetHeight>_540.scrollHeight){
-_540.scrollTop=0;
+p.appendChild(doc.createTextNode(_452+": "+text));
+_444.appendChild(p);
+_444.appendChild(doc.createElement("br"));
+if(_443.offsetHeight>_443.scrollHeight){
+_443.scrollTop=0;
}else{
-_540.scrollTop=_540.scrollHeight;
+_443.scrollTop=_443.scrollHeight;
}
},this);
-var _551=function(msg){
-_543[_543.length]=msg;
-_548(msg);
+var _454=function(msg){
+_446[_446.length]=msg;
+_451(msg);
};
-var _552=function(){
-var _553,infore;
+var _455=function(){
+var _456,infore;
try{
-_553=new RegExp(_534.value);
-infore=new RegExp(_535.value);
+_456=new RegExp(_437.value);
+infore=new RegExp(_438.value);
}
catch(e){
logDebug("Error in filter regex: "+e.message);
return null;
}
return function(msg){
-return (_553.test(_545(msg))&&infore.test(_547(msg)));
+return (_456.test(_448(msg))&&infore.test(_450(msg)));
};
};
-var _554=function(){
-while(_541.firstChild){
-_541.removeChild(_541.firstChild);
+var _457=function(){
+while(_444.firstChild){
+_444.removeChild(_444.firstChild);
}
};
-var _555=function(){
-_543=[];
-_554();
+var _458=function(){
+_446=[];
+_457();
};
-var _556=bind(function(){
+var _459=bind(function(){
if(this.closed){
return;
}
@@ -4306,94 +3419,85 @@ this.closed=true;
if(MochiKit.LoggingPane._loggingPane==this){
MochiKit.LoggingPane._loggingPane=null;
}
-this.logger.removeListener(_542);
-try{
-try{
-_531.loggingPane=null;
-}
-catch(e){
-logFatal("Bookmarklet was closed incorrectly.");
-}
-if(_524){
-_531.parentNode.removeChild(_531);
+this.logger.removeListener(_445);
+_434.loggingPane=null;
+if(_427){
+_434.parentNode.removeChild(_434);
}else{
this.win.close();
}
-}
-catch(e){
-}
},this);
-var _557=function(){
-_554();
-for(var i=0;i<_543.length;i++){
-var msg=_543[i];
-if(_544===null||_544(msg)){
-_548(msg);
+var _460=function(){
+_457();
+for(var i=0;i<_446.length;i++){
+var msg=_446[i];
+if(_447===null||_447(msg)){
+_451(msg);
}
}
};
this.buildAndApplyFilter=function(){
-_544=_552();
-_557();
-this.logger.removeListener(_542);
-this.logger.addListener(_542,_544,_551);
-};
-var _558=bind(function(){
-_543=this.logger.getMessages();
-_557();
+_447=_455();
+_460();
+this.logger.removeListener(_445);
+this.logger.addListener(_445,_447,_454);
+};
+var _461=bind(function(){
+_446=this.logger.getMessages();
+_460();
},this);
-var _559=bind(function(_560){
-_560=_560||window.event;
-key=_560.which||_560.keyCode;
+var _462=bind(function(_463){
+_463=_463||window.event;
+key=_463.which||_463.keyCode;
if(key==13){
this.buildAndApplyFilter();
}
},this);
-var _561="display: block; z-index: 1000; left: 0px; bottom: 0px; position: fixed; width: 100%; background-color: white; font: "+this.logFont;
-if(_524){
-_561+="; height: 10em; border-top: 2px solid black";
-}else{
-_561+="; height: 100%;";
-}
-_531.style.cssText=_561;
-if(!_532){
-doc.body.appendChild(_531);
-}
-_561={"cssText":"width: 33%; display: inline; font: "+this.logFont};
-_527(_534,{"value":"FATAL|ERROR|WARNING|INFO|DEBUG","onkeypress":_559,"style":_561});
-_531.appendChild(_534);
-_527(_535,{"value":".*","onkeypress":_559,"style":_561});
-_531.appendChild(_535);
-_561="width: 8%; display:inline; font: "+this.logFont;
-_536.appendChild(doc.createTextNode("Filter"));
-_536.onclick=bind("buildAndApplyFilter",this);
-_536.style.cssText=_561;
-_531.appendChild(_536);
-_537.appendChild(doc.createTextNode("Load"));
-_537.onclick=_558;
-_537.style.cssText=_561;
-_531.appendChild(_537);
-_538.appendChild(doc.createTextNode("Clear"));
-_538.onclick=_555;
-_538.style.cssText=_561;
-_531.appendChild(_538);
-_539.appendChild(doc.createTextNode("Close"));
-_539.onclick=_556;
-_539.style.cssText=_561;
-_531.appendChild(_539);
-_540.style.cssText="overflow: auto; width: 100%";
-_541.style.cssText="width: 100%; height: "+(_524?"8em":"100%");
-_540.appendChild(_541);
-_531.appendChild(_540);
+var _464="display: block; z-index: 1000; left: 0px; bottom: 0px; position: fixed; width: 100%; background-color: white; font: "+this.logFont;
+if(_427){
+_464+="; height: 10em; border-top: 2px solid black";
+}else{
+_464+="; height: 100%;";
+}
+_434.style.cssText=_464;
+if(!_435){
+doc.body.appendChild(_434);
+}
+_464={"cssText":"width: 33%; display: inline; font: "+this.logFont};
+_430(_437,{"value":"FATAL|ERROR|WARNING|INFO|DEBUG","onkeypress":_462,"style":_464});
+_434.appendChild(_437);
+_430(_438,{"value":".*","onkeypress":_462,"style":_464});
+_434.appendChild(_438);
+_464="width: 8%; display:inline; font: "+this.logFont;
+_439.appendChild(doc.createTextNode("Filter"));
+_439.onclick=bind("buildAndApplyFilter",this);
+_439.style.cssText=_464;
+_434.appendChild(_439);
+_440.appendChild(doc.createTextNode("Load"));
+_440.onclick=_461;
+_440.style.cssText=_464;
+_434.appendChild(_440);
+_441.appendChild(doc.createTextNode("Clear"));
+_441.onclick=_458;
+_441.style.cssText=_464;
+_434.appendChild(_441);
+_442.appendChild(doc.createTextNode("Close"));
+_442.onclick=_459;
+_442.style.cssText=_464;
+_434.appendChild(_442);
+_443.style.cssText="overflow: auto; width: 100%";
+_444.style.cssText="width: 100%; height: "+(_427?"8em":"100%");
+_443.appendChild(_444);
+_434.appendChild(_443);
this.buildAndApplyFilter();
-_558();
-if(_524){
+_461();
+if(_427){
this.win=undefined;
}else{
this.win=win;
}
-this.inline=_524;
-this.closePane=_556;
+this.inline=_427;
+this.closePane=_459;
this.closed=false;
return this;
};
@@ -4410,13 +3514,9 @@ MochiKit.Base._exportSymbols(this,MochiKit.LoggingPane);
if(typeof (dojo)!="undefined"){
dojo.provide("MochiKit.Color");
dojo.require("MochiKit.Base");
-dojo.require("MochiKit.DOM");
-dojo.require("MochiKit.Style");
}
if(typeof (JSAN)!="undefined"){
JSAN.use("MochiKit.Base",[]);
-JSAN.use("MochiKit.DOM",[]);
-JSAN.use("MochiKit.Style",[]);
}
try{
if(typeof (MochiKit.Base)=="undefined"){
@@ -4426,80 +3526,64 @@ throw "";
catch(e){
throw "MochiKit.Color depends on MochiKit.Base";
}
-try{
-if(typeof (MochiKit.Base)=="undefined"){
-throw "";
-}
-}
-catch(e){
-throw "MochiKit.Color depends on MochiKit.DOM";
-}
-try{
-if(typeof (MochiKit.Base)=="undefined"){
-throw "";
-}
-}
-catch(e){
-throw "MochiKit.Color depends on MochiKit.Style";
-}
if(typeof (MochiKit.Color)=="undefined"){
MochiKit.Color={};
}
MochiKit.Color.NAME="MochiKit.Color";
-MochiKit.Color.VERSION="1.4";
+MochiKit.Color.VERSION="1.3.1";
MochiKit.Color.__repr__=function(){
return "["+this.NAME+" "+this.VERSION+"]";
};
MochiKit.Color.toString=function(){
return this.__repr__();
};
-MochiKit.Color.Color=function(red,_563,blue,_565){
-if(typeof (_565)=="undefined"||_565===null){
-_565=1;
+MochiKit.Color.Color=function(red,_466,blue,_468){
+if(typeof (_468)=="undefined"||_468===null){
+_468=1;
}
-this.rgb={r:red,g:_563,b:blue,a:_565};
+this.rgb={r:red,g:_466,b:blue,a:_468};
};
-MochiKit.Color.Color.prototype={__class__:MochiKit.Color.Color,colorWithAlpha:function(_566){
+MochiKit.Color.Color.prototype={__class__:MochiKit.Color.Color,colorWithAlpha:function(_469){
var rgb=this.rgb;
var m=MochiKit.Color;
-return m.Color.fromRGB(rgb.r,rgb.g,rgb.b,_566);
+return m.Color.fromRGB(rgb.r,rgb.g,rgb.b,_469);
},colorWithHue:function(hue){
var hsl=this.asHSL();
hsl.h=hue;
var m=MochiKit.Color;
return m.Color.fromHSL(hsl);
-},colorWithSaturation:function(_570){
+},colorWithSaturation:function(_473){
var hsl=this.asHSL();
-hsl.s=_570;
+hsl.s=_473;
var m=MochiKit.Color;
return m.Color.fromHSL(hsl);
-},colorWithLightness:function(_571){
+},colorWithLightness:function(_474){
var hsl=this.asHSL();
-hsl.l=_571;
+hsl.l=_474;
var m=MochiKit.Color;
return m.Color.fromHSL(hsl);
-},darkerColorWithLevel:function(_572){
+},darkerColorWithLevel:function(_475){
var hsl=this.asHSL();
-hsl.l=Math.max(hsl.l-_572,0);
+hsl.l=Math.max(hsl.l-_475,0);
var m=MochiKit.Color;
return m.Color.fromHSL(hsl);
-},lighterColorWithLevel:function(_573){
+},lighterColorWithLevel:function(_476){
var hsl=this.asHSL();
-hsl.l=Math.min(hsl.l+_573,1);
+hsl.l=Math.min(hsl.l+_476,1);
var m=MochiKit.Color;
return m.Color.fromHSL(hsl);
-},blendedColor:function(_574,_575){
-if(typeof (_575)=="undefined"||_575===null){
-_575=0.5;
+},blendedColor:function(_477,_478){
+if(typeof (_478)=="undefined"||_478===null){
+_478=0.5;
}
-var sf=1-_575;
+var sf=1-_478;
var s=this.rgb;
-var d=_574.rgb;
-var df=_575;
+var d=_477.rgb;
+var df=_478;
return MochiKit.Color.Color.fromRGB((s.r*sf)+(d.r*df),(s.g*sf)+(d.g*df),(s.b*sf)+(d.b*df),(s.a*sf)+(d.a*df));
-},compareRGB:function(_578){
+},compareRGB:function(_481){
var a=this.asRGB();
-var b=_578.asRGB();
+var b=_481.asRGB();
return MochiKit.Base.compare([a.r,a.g,a.b,a.a],[b.r,b.g,b.b,b.a]);
},isLight:function(){
return this.asHSL().b>0.5;
@@ -4573,114 +3657,114 @@ var c=this.rgb;
var col=[c.r,c.g,c.b,c.a];
return this.__class__.NAME+"("+col.join(", ")+")";
}};
-MochiKit.Base.update(MochiKit.Color.Color,{fromRGB:function(red,_583,blue,_584){
-var _585=MochiKit.Color.Color;
+MochiKit.Base.update(MochiKit.Color.Color,{fromRGB:function(red,_486,blue,_487){
+var _488=MochiKit.Color.Color;
if(arguments.length==1){
var rgb=red;
red=rgb.r;
-_583=rgb.g;
+_486=rgb.g;
blue=rgb.b;
if(typeof (rgb.a)=="undefined"){
-_584=undefined;
+_487=undefined;
}else{
-_584=rgb.a;
+_487=rgb.a;
}
}
-return new _585(red,_583,blue,_584);
-},fromHSL:function(hue,_586,_587,_588){
+return new _488(red,_486,blue,_487);
+},fromHSL:function(hue,_489,_490,_491){
var m=MochiKit.Color;
return m.Color.fromRGB(m.hslToRGB.apply(m,arguments));
-},fromHSV:function(hue,_589,_590,_591){
+},fromHSV:function(hue,_492,_493,_494){
var m=MochiKit.Color;
return m.Color.fromRGB(m.hsvToRGB.apply(m,arguments));
},fromName:function(name){
-var _592=MochiKit.Color.Color;
+var _495=MochiKit.Color.Color;
if(name.charAt(0)=="\""){
name=name.substr(1,name.length-2);
}
-var _593=_592._namedColors[name.toLowerCase()];
-if(typeof (_593)=="string"){
-return _592.fromHexString(_593);
+var _496=_495._namedColors[name.toLowerCase()];
+if(typeof (_496)=="string"){
+return _495.fromHexString(_496);
}else{
if(name=="transparent"){
-return _592.transparentColor();
+return _495.transparentColor();
}
}
return null;
-},fromString:function(_594){
+},fromString:function(_497){
var self=MochiKit.Color.Color;
-var _595=_594.substr(0,3);
-if(_595=="rgb"){
-return self.fromRGBString(_594);
+var _498=_497.substr(0,3);
+if(_498=="rgb"){
+return self.fromRGBString(_497);
}else{
-if(_595=="hsl"){
-return self.fromHSLString(_594);
+if(_498=="hsl"){
+return self.fromHSLString(_497);
}else{
-if(_594.charAt(0)=="#"){
-return self.fromHexString(_594);
+if(_497.charAt(0)=="#"){
+return self.fromHexString(_497);
}
}
}
-return self.fromName(_594);
-},fromHexString:function(_596){
-if(_596.charAt(0)=="#"){
-_596=_596.substring(1);
+return self.fromName(_497);
+},fromHexString:function(_499){
+if(_499.charAt(0)=="#"){
+_499=_499.substring(1);
}
-var _597=[];
+var _500=[];
var i,hex;
-if(_596.length==3){
+if(_499.length==3){
for(i=0;i<3;i++){
-hex=_596.substr(i,1);
-_597.push(parseInt(hex+hex,16)/255);
+hex=_499.substr(i,1);
+_500.push(parseInt(hex+hex,16)/255);
}
}else{
for(i=0;i<6;i+=2){
-hex=_596.substr(i,2);
-_597.push(parseInt(hex,16)/255);
+hex=_499.substr(i,2);
+_500.push(parseInt(hex,16)/255);
}
}
-var _598=MochiKit.Color.Color;
-return _598.fromRGB.apply(_598,_597);
-},_fromColorString:function(pre,_600,_601,_602){
-if(_602.indexOf(pre)===0){
-_602=_602.substring(_602.indexOf("(",3)+1,_602.length-1);
+var _501=MochiKit.Color.Color;
+return _501.fromRGB.apply(_501,_500);
+},_fromColorString:function(pre,_503,_504,_505){
+if(_505.indexOf(pre)===0){
+_505=_505.substring(_505.indexOf("(",3)+1,_505.length-1);
}
-var _603=_602.split(/\s*,\s*/);
-var _604=[];
-for(var i=0;i<_603.length;i++){
-var c=_603[i];
+var _506=_505.split(/\s*,\s*/);
+var _507=[];
+for(var i=0;i<_506.length;i++){
+var c=_506[i];
var val;
-var _605=c.substring(c.length-3);
+var _508=c.substring(c.length-3);
if(c.charAt(c.length-1)=="%"){
val=0.01*parseFloat(c.substring(0,c.length-1));
}else{
-if(_605=="deg"){
+if(_508=="deg"){
val=parseFloat(c)/360;
}else{
-if(_605=="rad"){
+if(_508=="rad"){
val=parseFloat(c)/(Math.PI*2);
}else{
-val=_601[i]*parseFloat(c);
+val=_504[i]*parseFloat(c);
}
}
}
-_604.push(val);
+_507.push(val);
}
-return this[_600].apply(this,_604);
-},fromComputedStyle:function(elem,_606){
+return this[_503].apply(this,_507);
+},fromComputedStyle:function(elem,_509,_510){
var d=MochiKit.DOM;
var cls=MochiKit.Color.Color;
for(elem=d.getElement(elem);elem;elem=elem.parentNode){
-var _607=MochiKit.Style.getStyle.apply(d,arguments);
-if(!_607){
+var _511=d.computedStyle.apply(d,arguments);
+if(!_511){
continue;
}
-var _608=cls.fromString(_607);
-if(!_608){
+var _512=cls.fromString(_511);
+if(!_512){
break;
}
-if(_608.asRGB().a>0){
-return _608;
+if(_512.asRGB().a>0){
+return _512;
}
}
return null;
@@ -4693,13 +3777,13 @@ return cls.fromComputedStyle(elem,"color","color")||cls.blackColor();
},namedColors:function(){
return MochiKit.Base.clone(MochiKit.Color.Color._namedColors);
}});
-MochiKit.Base.update(MochiKit.Color,{clampColorComponent:function(v,_609){
-v*=_609;
+MochiKit.Base.update(MochiKit.Color,{clampColorComponent:function(v,_513){
+v*=_513;
if(v<0){
return 0;
}else{
-if(v>_609){
-return _609;
+if(v>_513){
+return _513;
}else{
return v;
}
@@ -4727,118 +3811,118 @@ val=n1;
}
}
return val;
-},hsvToRGB:function(hue,_612,_613,_614){
+},hsvToRGB:function(hue,_516,_517,_518){
if(arguments.length==1){
var hsv=hue;
hue=hsv.h;
-_612=hsv.s;
-_613=hsv.v;
-_614=hsv.a;
+_516=hsv.s;
+_517=hsv.v;
+_518=hsv.a;
}
var red;
-var _615;
+var _519;
var blue;
-if(_612===0){
+if(_516===0){
red=0;
-_615=0;
+_519=0;
blue=0;
}else{
var i=Math.floor(hue*6);
var f=(hue*6)-i;
-var p=_613*(1-_612);
-var q=_613*(1-(_612*f));
-var t=_613*(1-(_612*(1-f)));
+var p=_517*(1-_516);
+var q=_517*(1-(_516*f));
+var t=_517*(1-(_516*(1-f)));
switch(i){
case 1:
red=q;
-_615=_613;
+_519=_517;
blue=p;
break;
case 2:
red=p;
-_615=_613;
+_519=_517;
blue=t;
break;
case 3:
red=p;
-_615=q;
-blue=_613;
+_519=q;
+blue=_517;
break;
case 4:
red=t;
-_615=p;
-blue=_613;
+_519=p;
+blue=_517;
break;
case 5:
-red=_613;
-_615=p;
+red=_517;
+_519=p;
blue=q;
break;
case 6:
case 0:
-red=_613;
-_615=t;
+red=_517;
+_519=t;
blue=p;
break;
}
}
-return {r:red,g:_615,b:blue,a:_614};
-},hslToRGB:function(hue,_617,_618,_619){
+return {r:red,g:_519,b:blue,a:_518};
+},hslToRGB:function(hue,_521,_522,_523){
if(arguments.length==1){
var hsl=hue;
hue=hsl.h;
-_617=hsl.s;
-_618=hsl.l;
-_619=hsl.a;
+_521=hsl.s;
+_522=hsl.l;
+_523=hsl.a;
}
var red;
-var _620;
+var _524;
var blue;
-if(_617===0){
-red=_618;
-_620=_618;
-blue=_618;
+if(_521===0){
+red=_522;
+_524=_522;
+blue=_522;
}else{
var m2;
-if(_618<=0.5){
-m2=_618*(1+_617);
+if(_522<=0.5){
+m2=_522*(1+_521);
}else{
-m2=_618+_617-(_618*_617);
+m2=_522+_521-(_522*_521);
}
-var m1=(2*_618)-m2;
+var m1=(2*_522)-m2;
var f=MochiKit.Color._hslValue;
var h6=hue*6;
red=f(m1,m2,h6+2);
-_620=f(m1,m2,h6);
+_524=f(m1,m2,h6);
blue=f(m1,m2,h6-2);
}
-return {r:red,g:_620,b:blue,a:_619};
-},rgbToHSV:function(red,_624,blue,_625){
+return {r:red,g:_524,b:blue,a:_523};
+},rgbToHSV:function(red,_528,blue,_529){
if(arguments.length==1){
var rgb=red;
red=rgb.r;
-_624=rgb.g;
+_528=rgb.g;
blue=rgb.b;
-_625=rgb.a;
+_529=rgb.a;
}
-var max=Math.max(Math.max(red,_624),blue);
-var min=Math.min(Math.min(red,_624),blue);
+var max=Math.max(Math.max(red,_528),blue);
+var min=Math.min(Math.min(red,_528),blue);
var hue;
-var _628;
-var _629=max;
+var _532;
+var _533=max;
if(min==max){
hue=0;
-_628=0;
+_532=0;
}else{
-var _630=(max-min);
-_628=_630/max;
+var _534=(max-min);
+_532=_534/max;
if(red==max){
-hue=(_624-blue)/_630;
+hue=(_528-blue)/_534;
}else{
-if(_624==max){
-hue=2+((blue-red)/_630);
+if(_528==max){
+hue=2+((blue-red)/_534);
}else{
-hue=4+((red-_624)/_630);
+hue=4+((red-_528)/_534);
}
}
hue/=6;
@@ -4849,37 +3933,37 @@ if(hue>1){
hue-=1;
}
}
-return {h:hue,s:_628,v:_629,a:_625};
-},rgbToHSL:function(red,_631,blue,_632){
+return {h:hue,s:_532,v:_533,a:_529};
+},rgbToHSL:function(red,_535,blue,_536){
if(arguments.length==1){
var rgb=red;
red=rgb.r;
-_631=rgb.g;
+_535=rgb.g;
blue=rgb.b;
-_632=rgb.a;
+_536=rgb.a;
}
-var max=Math.max(red,Math.max(_631,blue));
-var min=Math.min(red,Math.min(_631,blue));
+var max=Math.max(red,Math.max(_535,blue));
+var min=Math.min(red,Math.min(_535,blue));
var hue;
-var _633;
-var _634=(max+min)/2;
-var _635=max-min;
-if(_635===0){
+var _537;
+var _538=(max+min)/2;
+var _539=max-min;
+if(_539===0){
hue=0;
-_633=0;
+_537=0;
}else{
-if(_634<=0.5){
-_633=_635/(max+min);
+if(_538<=0.5){
+_537=_539/(max+min);
}else{
-_633=_635/(2-max-min);
+_537=_539/(2-max-min);
}
if(red==max){
-hue=(_631-blue)/_635;
+hue=(_535-blue)/_539;
}else{
-if(_631==max){
-hue=2+((blue-red)/_635);
+if(_535==max){
+hue=2+((blue-red)/_539);
}else{
-hue=4+((red-_631)/_635);
+hue=4+((red-_535)/_539);
}
}
hue/=6;
@@ -4890,33 +3974,33 @@ if(hue>1){
hue-=1;
}
}
-return {h:hue,s:_633,l:_634,a:_632};
+return {h:hue,s:_537,l:_538,a:_536};
},toColorPart:function(num){
num=Math.round(num);
-var _636=num.toString(16);
+var _540=num.toString(16);
if(num<16){
-return "0"+_636;
+return "0"+_540;
}
-return _636;
+return _540;
},__new__:function(){
var m=MochiKit.Base;
this.Color.fromRGBString=m.bind(this.Color._fromColorString,this.Color,"rgb","fromRGB",[1/255,1/255,1/255,1]);
this.Color.fromHSLString=m.bind(this.Color._fromColorString,this.Color,"hsl","fromHSL",[1/360,0.01,0.01,1]);
-var _637=1/3;
-var _638={black:[0,0,0],blue:[0,0,1],brown:[0.6,0.4,0.2],cyan:[0,1,1],darkGray:[_637,_637,_637],gray:[0.5,0.5,0.5],green:[0,1,0],lightGray:[2*_637,2*_637,2*_637],magenta:[1,0,1],orange:[1,0.5,0],purple:[0.5,0,0.5],red:[1,0,0],transparent:[0,0,0,0],white:[1,1,1],yellow:[1,1,0]};
-var _639=function(name,r,g,b,a){
+var _541=1/3;
+var _542={black:[0,0,0],blue:[0,0,1],brown:[0.6,0.4,0.2],cyan:[0,1,1],darkGray:[_541,_541,_541],gray:[0.5,0.5,0.5],green:[0,1,0],lightGray:[2*_541,2*_541,2*_541],magenta:[1,0,1],orange:[1,0.5,0],purple:[0.5,0,0.5],red:[1,0,0],transparent:[0,0,0,0],white:[1,1,1],yellow:[1,1,0]};
+var _543=function(name,r,g,b,a){
var rval=this.fromRGB(r,g,b,a);
this[name]=function(){
return rval;
};
return rval;
};
-for(var k in _638){
+for(var k in _542){
var name=k+"Color";
-var _641=m.concat([_639,this.Color,name],_638[k]);
-this.Color[name]=m.bind.apply(null,_641);
+var _545=m.concat([_543,this.Color,name],_542[k]);
+this.Color[name]=m.bind.apply(null,_545);
}
-var _642=function(){
+var _546=function(){
for(var i=0;i1){
var src=MochiKit.DOM.getElement(arguments[0]);
var sig=arguments[1];
var obj=arguments[2];
var func=arguments[3];
-for(var i=_664.length-1;i>=0;i--){
-var o=_664[i];
+for(var i=_562.length-1;i>=0;i--){
+var o=_562[i];
if(o[0]===src&&o[1]===sig&&o[4]===obj&&o[5]===func){
self._disconnect(o);
-if(!self._lock){
-_664.splice(i,1);
-}else{
-self._dirty=true;
-}
+_562.splice(i,1);
return true;
}
}
}else{
-var idx=m.findIdentical(_664,_663);
+var idx=m.findIdentical(_562,_561);
if(idx>=0){
-self._disconnect(_663);
-if(!self._lock){
-_664.splice(idx,1);
-}else{
-self._dirty=true;
-}
+self._disconnect(_561);
+_562.splice(idx,1);
return true;
}
}
return false;
-},disconnectAllTo:function(_665,_666){
-var self=MochiKit.Signal;
-var _667=self._observers;
-var _668=self._disconnect;
-var _669=self._lock;
-var _670=self._dirty;
-if(typeof (_666)==="undefined"){
-_666=null;
-}
-for(var i=_667.length-1;i>=0;i--){
-var _671=_667[i];
-if(_671[4]===_665&&(_666===null||_671[5]===_666)){
-_668(_671);
-if(_669){
-_670=true;
-}else{
-_667.splice(i,1);
-}
-}
-}
-self._dirty=_670;
},disconnectAll:function(src,sig){
src=MochiKit.DOM.getElement(src);
var m=MochiKit.Base;
-var _672=m.flattenArguments(m.extend(null,arguments,1));
+var _563=m.flattenArguments(m.extend(null,arguments,1));
var self=MochiKit.Signal;
-var _673=self._disconnect;
-var _674=self._observers;
-var i,ident;
-var _675=self._lock;
-var _676=self._dirty;
-if(_672.length===0){
-for(i=_674.length-1;i>=0;i--){
-ident=_674[i];
-if(ident[0]===src){
-_673(ident);
-if(!_675){
-_674.splice(i,1);
-}else{
-_676=true;
-}
+var _564=self._disconnect;
+var _565=self._observers;
+if(_563.length===0){
+for(var i=_565.length-1;i>=0;i--){
+var _566=_565[i];
+if(_566[0]===src){
+_564(_566);
+_565.splice(i,1);
}
}
}else{
var sigs={};
-for(i=0;i<_672.length;i++){
-sigs[_672[i]]=true;
-}
-for(i=_674.length-1;i>=0;i--){
-ident=_674[i];
-if(ident[0]===src&&ident[1] in sigs){
-_673(ident);
-if(!_675){
-_674.splice(i,1);
-}else{
-_676=true;
+for(var i=0;i<_563.length;i++){
+sigs[_563[i]]=true;
}
+for(var i=_565.length-1;i>=0;i--){
+var _566=_565[i];
+if(_566[0]===src&&_566[1] in sigs){
+_564(_566);
+_565.splice(i,1);
}
}
}
-self._dirty=_676;
},signal:function(src,sig){
-var self=MochiKit.Signal;
-var _678=self._observers;
+var _568=MochiKit.Signal._observers;
src=MochiKit.DOM.getElement(src);
var args=MochiKit.Base.extend(null,arguments,2);
-var _679=[];
-self._lock=true;
-for(var i=0;i<_678.length;i++){
-var _680=_678[i];
-if(_680[0]===src&&_680[1]===sig){
+var _569=[];
+for(var i=0;i<_568.length;i++){
+var _570=_568[i];
+if(_570[0]===src&&_570[1]===sig){
try{
-_680[2].apply(src,args);
+_570[2].apply(src,args);
}
catch(e){
-_679.push(e);
-}
-}
-}
-self._lock=false;
-if(self._dirty){
-self._dirty=false;
-for(var i=_678.length-1;i>=0;i--){
-if(!_678[i][6]){
-_678.splice(i,1);
+_569.push(e);
}
}
}
-if(_679.length==1){
-throw _679[0];
+if(_569.length==1){
+throw _569[0];
}else{
-if(_679.length>1){
+if(_569.length>1){
var e=new Error("Multiple errors thrown in handling 'sig', see errors property");
-e.errors=_679;
+e.errors=_569;
throw e;
}
}
}});
MochiKit.Signal.EXPORT_OK=[];
-MochiKit.Signal.EXPORT=["connect","disconnect","signal","disconnectAll","disconnectAllTo"];
+MochiKit.Signal.EXPORT=["connect","disconnect","signal","disconnectAll"];
MochiKit.Signal.__new__=function(win){
var m=MochiKit.Base;
this._document=document;
this._window=win;
-this._lock=false;
-this._dirty=false;
try{
this.connect(window,"onunload",this._unloadCache);
}
@@ -5450,7 +4385,7 @@ this.EXPORT_TAGS={":common":this.EXPORT,":all":m.concat(this.EXPORT,this.EXPORT_
m.nameFunctions(this);
};
MochiKit.Signal.__new__(this);
-if(MochiKit.__export__){
+if(!MochiKit.__compat__){
connect=MochiKit.Signal.connect;
disconnect=MochiKit.Signal.disconnect;
disconnectAll=MochiKit.Signal.disconnectAll;
@@ -5458,376 +4393,220 @@ signal=MochiKit.Signal.signal;
}
MochiKit.Base._exportSymbols(this,MochiKit.Signal);
if(typeof (dojo)!="undefined"){
-dojo.provide("MochiKit.Position");
-dojo.require("MochiKit.Base");
-dojo.require("MochiKit.DOM");
-dojo.require("MochiKit.Style");
-}
-if(typeof (JSAN)!="undefined"){
-JSAN.use("MochiKit.Base",[]);
-JSAN.use("MochiKit.DOM",[]);
-JSAN.use("MochiKit.Style",[]);
-}
-try{
-if(typeof (MochiKit.Base)=="undefined"||typeof (MochiKit.Style)=="undefined"||typeof (MochiKit.DOM)=="undefined"){
-throw "";
-}
-}
-catch(e){
-throw "MochiKit.Style depends on MochiKit.Base, MochiKit.DOM, and MochiKit.Style!";
-}
-if(typeof (MochiKit.Position)=="undefined"){
-MochiKit.Position={};
-}
-MochiKit.Position.NAME="MochiKit.Position";
-MochiKit.Position.VERSION="1.4";
-MochiKit.Position.__repr__=function(){
-return "["+this.NAME+" "+this.VERSION+"]";
-};
-MochiKit.Position.toString=function(){
-return this.__repr__();
-};
-MochiKit.Position.EXPORT_OK=[];
-MochiKit.Position.EXPORT=[];
-MochiKit.Base.update(MochiKit.Position,{includeScrollOffsets:false,prepare:function(){
-var _681=window.pageXOffset||document.documentElement.scrollLeft||document.body.scrollLeft||0;
-var _682=window.pageYOffset||document.documentElement.scrollTop||document.body.scrollTop||0;
-this.windowOffset=new MochiKit.Style.Coordinates(_681,_682);
-},cumulativeOffset:function(_683){
-var _684=0;
-var _685=0;
-do{
-_684+=_683.offsetTop||0;
-_685+=_683.offsetLeft||0;
-_683=_683.offsetParent;
-}while(_683);
-return new MochiKit.Style.Coordinates(_685,_684);
-},realOffset:function(_686){
-var _687=0;
-var _688=0;
-do{
-_687+=_686.scrollTop||0;
-_688+=_686.scrollLeft||0;
-_686=_686.parentNode;
-}while(_686);
-return new MochiKit.Style.Coordinates(_688,_687);
-},within:function(_689,x,y){
-if(this.includeScrollOffsets){
-return this.withinIncludingScrolloffsets(_689,x,y);
-}
-this.xcomp=x;
-this.ycomp=y;
-this.offset=this.cumulativeOffset(_689);
-if(_689.style.position=="fixed"){
-this.offset.x+=this.windowOffset.x;
-this.offset.y+=this.windowOffset.y;
-}
-return (y>=this.offset.y&&y=this.offset.x&&x=this.offset.y&&this.ycomp=this.offset.x&&this.xcomp"+el.innerHTML+"