svn commit: r539946 [2/3] - in /struts/struts2/trunk/plugins/dojo/src: main/java/org/apache/struts2/dojo/components/ main/java/org/apache/struts2/dojo/views/jsp/ui/ main/resources/org/apache/struts2/static/dojo/ main/resources/org/apache/struts2/static...

[mu...@apache.org]

Modified: struts/struts2/trunk/plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/struts_dojo.js
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/struts_dojo.js?view=diff&rev=539946&r1=539945&r2=539946
==============================================================================
--- struts/struts2/trunk/plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/struts_dojo.js (original)
+++ struts/struts2/trunk/plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/struts_dojo.js Sun May 20 14:29:37 2007
@@ -13599,7 +13599,7 @@
 });
 }});
 dojo.provide("struts.widget.Bind");
-dojo.widget.defineWidget("struts.widget.Bind",dojo.widget.HtmlWidget,{widgetType:"Bind",executeScripts:false,targets:"",targetsArray:null,href:"",handler:"",loadingText:"Loading...",errorText:"",showError:true,showLoading:false,listenTopics:"",notifyTopics:"",notifyTopicsArray:null,beforeNotifyTopics:"",beforeNotifyTopicsArray:null,afterNotifyTopics:"",afterNotifyTopicsArray:null,errorNotifyTopics:"",errorNotifyTopicsArray:null,formId:"",formFilter:"",formNode:null,events:"",indicator:"",parseContent:true,highlightColor:"",highlightDuration:2000,validate:false,ajaxAfterValidation:false,postCreate:function(){
+dojo.widget.defineWidget("struts.widget.Bind",dojo.widget.HtmlWidget,{widgetType:"Bind",executeScripts:false,scriptSeparation:false,targets:"",targetsArray:null,href:"",handler:"",loadingText:"Loading...",errorText:"",showError:true,showLoading:false,listenTopics:"",notifyTopics:"",notifyTopicsArray:null,beforeNotifyTopics:"",beforeNotifyTopicsArray:null,afterNotifyTopics:"",afterNotifyTopicsArray:null,errorNotifyTopics:"",errorNotifyTopicsArray:null,formId:"",formFilter:"",formNode:null,events:"",indicator:"",parseContent:true,highlightColor:"",highlightDuration:2000,validate:false,ajaxAfterValidation:false,cacheContent:true,scriptSeparation:true,scriptScope:null,postCreate:function(){
 var self=this;
 if(!dojo.string.isBlank(this.listenTopics)){
 this.log("Listening to "+this.listenTopics+" to refresh");
@@ -13698,13 +13698,7 @@
 }
 if(this.executeScripts){
 var _b87=this.parse(data);
-if(_b87.scripts&&_b87.scripts.length>0){
-var _b88="";
-for(var i=0;i<_b87.scripts.length;i++){
-_b88+=_b87.scripts[i];
-}
-(new Function("_container_",_b88+"; return this;"))(this);
-}
+this._executeScripts(_b87.scripts);
 this.setContent(_b87.text);
 }else{
 this.setContent(data);
@@ -13712,23 +13706,23 @@
 this.highlight();
 }else{
 if(this.showError){
-var _b8a=dojo.string.isBlank(this.errorText)?e.message:this.errorText;
-this.setContent(_b8a);
+var _b88=dojo.string.isBlank(this.errorText)?e.message:this.errorText;
+this.setContent(_b88);
 }
 }
 },notify:function(data,type,e){
 var self=this;
 if(this.notifyTopicsArray){
-dojo.lang.forEach(this.notifyTopicsArray,function(_b8f){
+dojo.lang.forEach(this.notifyTopicsArray,function(_b8d){
 try{
-dojo.event.topic.publish(_b8f,data,type,e,self);
+dojo.event.topic.publish(_b8d,data,type,e,self);
 }
 catch(ex){
 self.log(ex);
 }
 });
 }
-var _b90=null;
+var _b8e=null;
 switch(type){
 case "before":
 this.notifyTo(this.beforeNotifyTopicsArray,null,e);
@@ -13740,15 +13734,15 @@
 this.notifyTo(this.errorNotifyTopicsArray,data,e);
 break;
 }
-},notifyTo:function(_b91,data,e){
+},notifyTo:function(_b8f,data,e){
 var self=this;
-if(_b91){
-dojo.lang.forEach(_b91,function(_b95){
+if(_b8f){
+dojo.lang.forEach(_b8f,function(_b93){
 try{
 if(data){
-dojo.event.topic.publish(_b95,data,e,self);
+dojo.event.topic.publish(_b93,data,e,self);
 }else{
-dojo.event.topic.publish(_b95,e,self);
+dojo.event.topic.publish(_b93,e,self);
 }
 }
 catch(ex){
@@ -13756,9 +13750,9 @@
 }
 });
 }
-},onDownloadStart:function(_b96){
+},onDownloadStart:function(_b94){
 if(this.showLoading&&!dojo.string.isBlank(this.loadingText)){
-_b96.text=this.loadingText;
+_b94.text=this.loadingText;
 }
 },reloadContents:function(evt){
 if(!dojo.string.isBlank(this.handler)){
@@ -13767,9 +13761,9 @@
 }else{
 try{
 var self=this;
-var _b99={cancel:false};
-this.notify(this.widgetId,"before",_b99);
-if(_b99.cancel){
+var _b97={cancel:false};
+this.notify(this.widgetId,"before",_b97);
+if(_b97.cancel){
 this.log("Request canceled");
 return;
 }
@@ -13777,8 +13771,8 @@
 return;
 }
 if(!this.validate&&this.formNode&&this.formNode.onsubmit!=null){
-var _b9a=this.formNode.onsubmit.call(evt);
-if(_b9a!=null&&!_b9a){
+var _b98=this.formNode.onsubmit.call(evt);
+if(_b98!=null&&!_b98){
 this.log("Request canceled by 'onsubmit' of the form");
 return;
 }
@@ -13787,33 +13781,33 @@
 if(this.showLoading){
 this.setContent(this.loadingText);
 }
-var _b9b=this.href;
+var _b99=this.href;
 if(!this.ajaxAfterValidation&&this.validate){
-_b9b=_b9b+(_b9b.indexOf("?")>-1?"&":"?")+"struts.validateOnly=true";
+_b99=_b99+(_b99.indexOf("?")>-1?"&":"?")+"struts.validateOnly=true";
 }
-dojo.io.bind({url:_b9b,useCache:false,preventCache:true,formNode:self.formNode,formFilter:window[self.formFilter],handler:function(type,data,e){
+dojo.io.bind({url:_b99,useCache:false,preventCache:true,formNode:self.formNode,formFilter:window[self.formFilter],handler:function(type,data,e){
 dojo.lang.hitch(self,"bindHandler")(type,data,e);
 },mimetype:"text/html"});
 }
 catch(ex){
 if(this.showError){
-var _b9f=dojo.string.isBlank(this.errorText)?ex:this.errorText;
-this.setContent(_b9f);
+var _b9d=dojo.string.isBlank(this.errorText)?ex:this.errorText;
+this.setContent(_b9d);
 }
 }
 }
 },parse:function(s){
 this.log("Parsing: "+s);
-var _ba1=[];
+var _b9f=[];
 var tmp=[];
-var _ba3=[];
-while(_ba1){
-_ba1=s.match(/<script([^>]*)>([\s\S]*?)<\/script>/i);
-if(!_ba1){
+var _ba1=[];
+while(_b9f){
+_b9f=s.match(/<script([^>]*)>([\s\S]*?)<\/script>/i);
+if(!_b9f){
 break;
 }
-if(_ba1[1]){
-attr=_ba1[1].match(/src=(['"]?)([^"']*)\1/i);
+if(_b9f[1]){
+attr=_b9f[1].match(/src=(['"]?)([^"']*)\1/i);
 if(attr){
 var tmp2=attr[2].search(/.*(\bdojo\b(?:\.uncompressed)?\.js)$/);
 if(tmp2>-1){
@@ -13821,8 +13815,8 @@
 }
 }
 }
-if(_ba1[2]){
-var sc=_ba1[2].replace(/(?:var )?\bdjConfig\b(?:[\s]*=[\s]*\{[^}]+\}|\.[\w]*[\s]*=[\s]*[^;\n]*)?;?|dojo\.hostenv\.writeIncludes\(\s*\);?/g,"");
+if(_b9f[2]){
+var sc=_b9f[2].replace(/(?:var )?\bdjConfig\b(?:[\s]*=[\s]*\{[^}]+\}|\.[\w]*[\s]*=[\s]*[^;\n]*)?;?|dojo\.hostenv\.writeIncludes\(\s*\);?/g,"");
 if(!sc){
 continue;
 }
@@ -13834,26 +13828,78 @@
 }
 sc=sc.replace(tmp[0],"");
 }
-_ba3.push(sc);
+_ba1.push(sc);
 }
 s=s.replace(/<script[^>]*>[\s\S]*?<\/script>/i,"");
 }
-return {text:s,scripts:_ba3};
+return {text:s,scripts:_ba1};
+},_executeScripts:function(_ba4){
+var self=this;
+var tmp="",code="";
+for(var i=0;i<_ba4.length;i++){
+if(_ba4[i].path){
+dojo.io.bind(this._cacheSetting({"url":_ba4[i].path,"load":function(type,_baa){
+dojo.lang.hitch(self,tmp=";"+_baa);
+},"error":function(type,_bac){
+_bac.text=type+" downloading remote script";
+self._handleDefaults.call(self,_bac,"onExecError","debug");
+},"mimetype":"text/plain","sync":true},this.cacheContent));
+code+=tmp;
+}else{
+code+=_ba4[i];
+}
+}
+try{
+if(this.scriptSeparation){
+delete this.scriptScope;
+this.scriptScope=new (new Function("_container_",code+"; return this;"))(self);
+}else{
+var djg=dojo.global();
+if(djg.execScript){
+djg.execScript(code);
+}else{
+var djd=dojo.doc();
+var sc=djd.createElement("script");
+sc.appendChild(djd.createTextNode(code));
+(this.containerNode||this.domNode).appendChild(sc);
+}
+}
+}
+catch(e){
+e.text="Error running scripts from content:\n"+e.description;
+this.log(e);
+}
+},_cacheSetting:function(_bb0,_bb1){
+for(var x in this.bindArgs){
+if(dojo.lang.isUndefined(_bb0[x])){
+_bb0[x]=this.bindArgs[x];
+}
+}
+if(dojo.lang.isUndefined(_bb0.useCache)){
+_bb0.useCache=_bb1;
+}
+if(dojo.lang.isUndefined(_bb0.preventCache)){
+_bb0.preventCache=!_bb1;
+}
+if(dojo.lang.isUndefined(_bb0.mimetype)){
+_bb0.mimetype="text/html";
+}
+return _bb0;
 }});
 dojo.provide("dojo.lang.timing.Timer");
-dojo.lang.timing.Timer=function(_ba6){
+dojo.lang.timing.Timer=function(_bb3){
 this.timer=null;
 this.isRunning=false;
-this.interval=_ba6;
+this.interval=_bb3;
 this.onStart=null;
 this.onStop=null;
 };
 dojo.extend(dojo.lang.timing.Timer,{onTick:function(){
-},setInterval:function(_ba7){
+},setInterval:function(_bb4){
 if(this.isRunning){
 dj_global.clearInterval(this.timer);
 }
-this.interval=_ba7;
+this.interval=_bb4;
 if(this.isRunning){
 this.timer=dj_global.setInterval(dojo.lang.hitch(this,"onTick"),this.interval);
 }
@@ -13871,46 +13917,46 @@
 dj_global.clearInterval(this.timer);
 }});
 dojo.provide("struts.widget.BindDiv");
-dojo.widget.defineWidget("struts.widget.BindDiv",dojo.widget.ContentPane,{widgetType:"BindDiv",href:"",extractContent:false,parseContent:false,cacheContent:false,refreshOnShow:false,executeScripts:false,preload:true,updateFreq:0,delay:0,autoStart:true,timer:null,loadingText:"Loading...",showLoading:false,errorText:"",showError:true,listenTopics:"",notifyTopics:"",notifyTopicsArray:null,stopTimerListenTopics:"",startTimerListenTopics:"",beforeNotifyTopics:"",beforeNotifyTopicsArray:null,afterNotifyTopics:"",afterNotifyTopicsArray:null,errorNotifyTopics:"",errorNotifyTopicsArray:null,beforeLoading:"",afterLoading:"",formId:"",formFilter:"",indicator:"",parseContent:true,highlightColor:"",highlightDuration:2000,disabled:false,onDownloadStart:function(_ba8){
+dojo.widget.defineWidget("struts.widget.BindDiv",dojo.widget.ContentPane,{widgetType:"BindDiv",href:"",extractContent:false,parseContent:false,cacheContent:false,refreshOnShow:false,executeScripts:false,preload:true,updateFreq:0,delay:0,autoStart:true,timer:null,loadingText:"Loading...",showLoading:false,errorText:"",showError:true,listenTopics:"",notifyTopics:"",notifyTopicsArray:null,stopTimerListenTopics:"",startTimerListenTopics:"",beforeNotifyTopics:"",beforeNotifyTopicsArray:null,afterNotifyTopics:"",afterNotifyTopicsArray:null,errorNotifyTopics:"",errorNotifyTopicsArray:null,beforeLoading:"",afterLoading:"",formId:"",formFilter:"",indicator:"",parseContent:true,highlightColor:"",highlightDuration:2000,disabled:false,onDownloadStart:function(_bb5){
 if(!this.showLoading){
-_ba8.returnValue=false;
+_bb5.returnValue=false;
 return;
 }
 if(this.showLoading&&!dojo.string.isBlank(this.loadingText)){
-_ba8.text=this.loadingText;
+_bb5.text=this.loadingText;
 }
 },highlight:function(){
 if(!dojo.string.isBlank(this.highlightColor)){
-var _ba9=dojo.lfx.html.highlight([this.domNode],this.highlightColor,this.highlightDuration);
-_ba9.play();
+var _bb6=dojo.lfx.html.highlight([this.domNode],this.highlightColor,this.highlightDuration);
+_bb6.play();
 }
-},onDownloadError:function(_baa){
-this.onError(_baa);
-},onContentError:function(_bab){
-this.onError(_bab);
-},onExecError:function(_bac){
-this.onError(_bac);
-},onError:function(_bad){
+},onDownloadError:function(_bb7){
+this.onError(_bb7);
+},onContentError:function(_bb8){
+this.onError(_bb8);
+},onExecError:function(_bb9){
+this.onError(_bb9);
+},onError:function(_bba){
 if(this.showError){
 if(!dojo.string.isBlank(this.errorText)){
-_bad.text=this.errorText;
+_bba.text=this.errorText;
 }
 }else{
-_bad.text="";
+_bba.text="";
 }
 },notify:function(data,type,e){
 if(this.notifyTopicsArray){
 var self=this;
-dojo.lang.forEach(this.notifyTopicsArray,function(_bb2){
+dojo.lang.forEach(this.notifyTopicsArray,function(_bbf){
 try{
-dojo.event.topic.publish(_bb2,data,type,e,self);
+dojo.event.topic.publish(_bbf,data,type,e,self);
 }
 catch(ex){
 self.log(ex);
 }
 });
 }
-var _bb3=null;
+var _bc0=null;
 switch(type){
 case "before":
 this.notifyTo(this.beforeNotifyTopicsArray,null,e);
@@ -13922,15 +13968,15 @@
 this.notifyTo(this.errorNotifyTopicsArray,data,e);
 break;
 }
-},notifyTo:function(_bb4,data,e){
+},notifyTo:function(_bc1,data,e){
 var self=this;
-if(_bb4){
-dojo.lang.forEach(_bb4,function(_bb8){
+if(_bc1){
+dojo.lang.forEach(_bc1,function(_bc5){
 try{
 if(data){
-dojo.event.topic.publish(_bb8,data,e,self);
+dojo.event.topic.publish(_bc5,data,e,self);
 }else{
-dojo.event.topic.publish(_bb8,e,self);
+dojo.event.topic.publish(_bc5,e,self);
 }
 }
 catch(ex){
@@ -13943,51 +13989,51 @@
 this.setHandler(this.handler);
 }
 var self=this;
-var _bbc=function(){
+var _bc9=function(){
 dojo.lang.hitch(self,"refresh")();
 };
-var _bbd=function(){
+var _bca=function(){
 dojo.lang.hitch(self,"startTimer")();
 };
 if(this.updateFreq>0){
 this.timer=new dojo.lang.timing.Timer(this.updateFreq);
-this.timer.onTick=_bbc;
+this.timer.onTick=_bc9;
 if(this.autoStart){
 if(this.delay>0){
-dojo.lang.setTimeout(_bbd,this.delay);
+dojo.lang.setTimeout(_bca,this.delay);
 }else{
 this.startTimer();
 }
 }
 }else{
 if(this.delay>0){
-dojo.lang.setTimeout(_bbc,this.delay);
+dojo.lang.setTimeout(_bc9,this.delay);
 }
 }
 if(!dojo.string.isBlank(this.listenTopics)){
 this.log("Listening to "+this.listenTopics+" to refresh");
-var _bbe=this.listenTopics.split(",");
-if(_bbe){
-dojo.lang.forEach(_bbe,function(_bbf){
-dojo.event.topic.subscribe(_bbf,self,"refresh");
+var _bcb=this.listenTopics.split(",");
+if(_bcb){
+dojo.lang.forEach(_bcb,function(_bcc){
+dojo.event.topic.subscribe(_bcc,self,"refresh");
 });
 }
 }
 if(!dojo.string.isBlank(this.stopTimerListenTopics)){
 this.log("Listening to "+this.stopTimerListenTopics+" to stop timer");
-var _bc0=this.stopTimerListenTopics.split(",");
-if(_bc0){
-dojo.lang.forEach(_bc0,function(_bc1){
-dojo.event.topic.subscribe(_bc1,self,"stopTimer");
+var _bcd=this.stopTimerListenTopics.split(",");
+if(_bcd){
+dojo.lang.forEach(_bcd,function(_bce){
+dojo.event.topic.subscribe(_bce,self,"stopTimer");
 });
 }
 }
 if(!dojo.string.isBlank(this.startTimerListenTopics)){
 this.log("Listening to "+this.stopTimerListenTopics+" to start timer");
-var _bc2=this.startTimerListenTopics.split(",");
-if(_bc2){
-dojo.lang.forEach(_bc2,function(_bc3){
-dojo.event.topic.subscribe(_bc3,self,"startTimer");
+var _bcf=this.startTimerListenTopics.split(",");
+if(_bcf){
+dojo.lang.forEach(_bcf,function(_bd0){
+dojo.event.topic.subscribe(_bd0,self,"startTimer");
 });
 }
 }
@@ -14006,16 +14052,16 @@
 if(this.isShowing()&&this.preload&&this.updateFreq<=0&&this.delay<=0){
 this.refresh();
 }
-},_downloadExternalContent:function(url,_bc5){
-var _bc6={cancel:false};
-this.notify(this.widgetId,"before",_bc6);
-if(_bc6.cancel){
+},_downloadExternalContent:function(url,_bd2){
+var _bd3={cancel:false};
+this.notify(this.widgetId,"before",_bd3);
+if(_bd3.cancel){
 return;
 }
 dojo.html.show(this.indicator);
 this._handleDefaults("Loading...","onDownloadStart");
 var self=this;
-dojo.io.bind({url:url,useCache:_bc5,preventCache:!_bc5,mimetype:"text/html",formNode:dojo.byId(self.formId),formFilter:window[self.formFilter],handler:function(type,data,e){
+dojo.io.bind({url:url,useCache:_bd2,preventCache:!_bd2,mimetype:"text/html",formNode:dojo.byId(self.formId),formFilter:window[self.formFilter],handler:function(type,data,e){
 dojo.html.hide(self.indicator);
 self.notify(data,type,e);
 if(type=="load"){
@@ -14039,109 +14085,109 @@
 this.timer.start();
 }
 },splitAndFixPaths:function(s,url){
-var _bce=[],_bcf=[],tmp=[];
-var _bd1=[],_bd2=[],attr=[],_bd4=[];
-var str="",path="",fix="",_bd8="",tag="",_bda="";
+var _bdb=[],_bdc=[],tmp=[];
+var _bde=[],_bdf=[],attr=[],_be1=[];
+var str="",path="",fix="",_be5="",tag="",_be7="";
 if(!url){
 url="./";
 }
 if(s){
-var _bdb=/<title[^>]*>([\s\S]*?)<\/title>/i;
-while(_bd1=_bdb.exec(s)){
-_bce.push(_bd1[1]);
-s=s.substring(0,_bd1.index)+s.substr(_bd1.index+_bd1[0].length);
+var _be8=/<title[^>]*>([\s\S]*?)<\/title>/i;
+while(_bde=_be8.exec(s)){
+_bdb.push(_bde[1]);
+s=s.substring(0,_bde.index)+s.substr(_bde.index+_bde[0].length);
 }
 if(this.adjustPaths){
-var _bdc=/<[a-z][a-z0-9]*[^>]*\s(?:(?:src|href|style)=[^>])+[^>]*>/i;
-var _bdd=/\s(src|href|style)=(['"]?)([\w()\[\]\/.,\\'"-:;#=&?\s@!]+?)\2/i;
-var _bde=/^(?:[#]|(?:(?:https?|ftps?|file|javascript|mailto|news):))/;
-while(tag=_bdc.exec(s)){
+var _be9=/<[a-z][a-z0-9]*[^>]*\s(?:(?:src|href|style)=[^>])+[^>]*>/i;
+var _bea=/\s(src|href|style)=(['"]?)([\w()\[\]\/.,\\'"-:;#=&?\s@!]+?)\2/i;
+var _beb=/^(?:[#]|(?:(?:https?|ftps?|file|javascript|mailto|news):))/;
+while(tag=_be9.exec(s)){
 str+=s.substring(0,tag.index);
 s=s.substring((tag.index+tag[0].length),s.length);
 tag=tag[0];
-_bd8="";
-while(attr=_bdd.exec(tag)){
+_be5="";
+while(attr=_bea.exec(tag)){
 path="";
-_bda=attr[3];
+_be7=attr[3];
 switch(attr[1].toLowerCase()){
 case "src":
 case "href":
-if(_bde.exec(_bda)){
-path=_bda;
+if(_beb.exec(_be7)){
+path=_be7;
 }else{
-path=(new dojo.uri.Uri(url,_bda).toString());
+path=(new dojo.uri.Uri(url,_be7).toString());
 }
 break;
 case "style":
-path=dojo.html.fixPathsInCssText(_bda,url);
+path=dojo.html.fixPathsInCssText(_be7,url);
 break;
 default:
-path=_bda;
+path=_be7;
 }
 fix=" "+attr[1]+"="+attr[2]+path+attr[2];
-_bd8+=tag.substring(0,attr.index)+fix;
+_be5+=tag.substring(0,attr.index)+fix;
 tag=tag.substring((attr.index+attr[0].length),tag.length);
 }
-str+=_bd8+tag;
+str+=_be5+tag;
 }
 s=str+s;
 }
-_bdb=/(?:<(style)[^>]*>([\s\S]*?)<\/style>|<link ([^>]*rel=['"]?stylesheet['"]?[^>]*)>)/i;
-while(_bd1=_bdb.exec(s)){
-if(_bd1[1]&&_bd1[1].toLowerCase()=="style"){
-_bd4.push(dojo.html.fixPathsInCssText(_bd1[2],url));
-}else{
-if(attr=_bd1[3].match(/href=(['"]?)([^'">]*)\1/i)){
-_bd4.push({path:attr[2]});
-}
-}
-s=s.substring(0,_bd1.index)+s.substr(_bd1.index+_bd1[0].length);
-}
-var _bdb=/<script([^>]*)>([\s\S]*?)<\/script>/i;
-var _bdf=/src=(['"]?)([^"']*)\1/i;
-var _be0=/.*(\bdojo\b\.js(?:\.uncompressed\.js)?)$/;
-var _be1=/(?:var )?\bdjConfig\b(?:[\s]*=[\s]*\{[^}]+\}|\.[\w]*[\s]*=[\s]*[^;\n]*)?;?|dojo\.hostenv\.writeIncludes\(\s*\);?/g;
-var _be2=/dojo\.(?:(?:require(?:After)?(?:If)?)|(?:widget\.(?:manager\.)?registerWidgetPackage)|(?:(?:hostenv\.)?setModulePrefix|registerModulePath)|defineNamespace)\((['"]).*?\1\)\s*;?/;
-while(_bd1=_bdb.exec(s)){
-if(this.executeScripts&&_bd1[1]){
-if(attr=_bdf.exec(_bd1[1])){
-if(_be0.exec(attr[2])){
+_be8=/(?:<(style)[^>]*>([\s\S]*?)<\/style>|<link ([^>]*rel=['"]?stylesheet['"]?[^>]*)>)/i;
+while(_bde=_be8.exec(s)){
+if(_bde[1]&&_bde[1].toLowerCase()=="style"){
+_be1.push(dojo.html.fixPathsInCssText(_bde[2],url));
+}else{
+if(attr=_bde[3].match(/href=(['"]?)([^'">]*)\1/i)){
+_be1.push({path:attr[2]});
+}
+}
+s=s.substring(0,_bde.index)+s.substr(_bde.index+_bde[0].length);
+}
+var _be8=/<script([^>]*)>([\s\S]*?)<\/script>/i;
+var _bec=/src=(['"]?)([^"']*)\1/i;
+var _bed=/.*(\bdojo\b\.js(?:\.uncompressed\.js)?)$/;
+var _bee=/(?:var )?\bdjConfig\b(?:[\s]*=[\s]*\{[^}]+\}|\.[\w]*[\s]*=[\s]*[^;\n]*)?;?|dojo\.hostenv\.writeIncludes\(\s*\);?/g;
+var _bef=/dojo\.(?:(?:require(?:After)?(?:If)?)|(?:widget\.(?:manager\.)?registerWidgetPackage)|(?:(?:hostenv\.)?setModulePrefix|registerModulePath)|defineNamespace)\((['"]).*?\1\)\s*;?/;
+while(_bde=_be8.exec(s)){
+if(this.executeScripts&&_bde[1]){
+if(attr=_bec.exec(_bde[1])){
+if(_bed.exec(attr[2])){
 dojo.debug("Security note! inhibit:"+attr[2]+" from  being loaded again.");
 }else{
-_bcf.push({path:attr[2]});
+_bdc.push({path:attr[2]});
 }
 }
 }
-if(_bd1[2]){
-var sc=_bd1[2].replace(_be1,"");
+if(_bde[2]){
+var sc=_bde[2].replace(_bee,"");
 if(!sc){
 continue;
 }
-while(tmp=_be2.exec(sc)){
-_bd2.push(tmp[0]);
+while(tmp=_bef.exec(sc)){
+_bdf.push(tmp[0]);
 sc=sc.substring(0,tmp.index)+sc.substr(tmp.index+tmp[0].length);
 }
 if(this.executeScripts){
-_bcf.push(sc);
+_bdc.push(sc);
 }
 }
-s=s.substr(0,_bd1.index)+s.substr(_bd1.index+_bd1[0].length);
+s=s.substr(0,_bde.index)+s.substr(_bde.index+_bde[0].length);
 }
 if(this.extractContent){
-_bd1=s.match(/<body[^>]*>\s*([\s\S]+)\s*<\/body>/im);
-if(_bd1){
-s=_bd1[1];
+_bde=s.match(/<body[^>]*>\s*([\s\S]+)\s*<\/body>/im);
+if(_bde){
+s=_bde[1];
 }
 }
 if(this.executeScripts&&this.scriptSeparation){
-var _bdb=/(<[a-zA-Z][a-zA-Z0-9]*\s[^>]*?\S=)((['"])[^>]*scriptScope[^>]*>)/;
-var _be4=/([\s'";:\(])scriptScope(.*)/;
+var _be8=/(<[a-zA-Z][a-zA-Z0-9]*\s[^>]*?\S=)((['"])[^>]*scriptScope[^>]*>)/;
+var _bf1=/([\s'";:\(])scriptScope(.*)/;
 str="";
-while(tag=_bdb.exec(s)){
+while(tag=_be8.exec(s)){
 tmp=((tag[3]=="'")?"\"":"'");
 fix="";
 str+=s.substring(0,tag.index)+tag[1];
-while(attr=_be4.exec(tag[2])){
+while(attr=_bf1.exec(tag[2])){
 tag[2]=tag[2].substring(0,attr.index)+attr[1]+"dojo.widget.byId("+tmp+this.widgetId+tmp+").scriptScope"+attr[2];
 }
 str+=tag[2];
@@ -14150,7 +14196,7 @@
 s=str+s;
 }
 }
-return {"xml":s,"styles":_bd4,"titles":_bce,"requires":_bd2,"scripts":_bcf,"url":url};
+return {"xml":s,"styles":_be1,"titles":_bdb,"requires":_bdf,"scripts":_bdc,"url":url};
 }});
 dojo.provide("struts.widget.BindAnchor");
 dojo.widget.defineWidget("struts.widget.BindAnchor",struts.widget.Bind,{widgetType:"BindAnchor",events:"onclick",postCreate:function(){
@@ -14163,10 +14209,10 @@
 dojo.widget.html.stabile.setup();
 return dojo.widget.html.stabile.widgetState[id];
 };
-dojo.widget.html.stabile.setState=function(id,_be7,_be8){
+dojo.widget.html.stabile.setState=function(id,_bf4,_bf5){
 dojo.widget.html.stabile.setup();
-dojo.widget.html.stabile.widgetState[id]=_be7;
-if(_be8){
+dojo.widget.html.stabile.widgetState[id]=_bf4;
+if(_bf5){
 dojo.widget.html.stabile.commit(dojo.widget.html.stabile.widgetState);
 }
 };
@@ -14176,12 +14222,12 @@
 dojo.widget.html.stabile.widgetState=text?dj_eval("("+text+")"):{};
 }
 };
-dojo.widget.html.stabile.commit=function(_bea){
-dojo.widget.html.stabile._getStorage().value=dojo.widget.html.stabile.description(_bea);
+dojo.widget.html.stabile.commit=function(_bf7){
+dojo.widget.html.stabile._getStorage().value=dojo.widget.html.stabile.description(_bf7);
 };
-dojo.widget.html.stabile.description=function(v,_bec){
-var _bed=dojo.widget.html.stabile._depth;
-var _bee=function(){
+dojo.widget.html.stabile.description=function(v,_bf9){
+var _bfa=dojo.widget.html.stabile._depth;
+var _bfb=function(){
 return this.description(this,true);
 };
 try{
@@ -14205,53 +14251,53 @@
 }
 var d;
 if(v instanceof Array||v.push){
-if(_bed>=dojo.widget.html.stabile.depthLimit){
+if(_bfa>=dojo.widget.html.stabile.depthLimit){
 return "[ ... ]";
 }
 d="[";
-var _bf1=true;
+var _bfe=true;
 dojo.widget.html.stabile._depth++;
 for(var i=0;i<v.length;i++){
-if(_bf1){
-_bf1=false;
+if(_bfe){
+_bfe=false;
 }else{
 d+=",";
 }
-d+=arguments.callee(v[i],_bec);
+d+=arguments.callee(v[i],_bf9);
 }
 return d+"]";
 }
-if(v.constructor==Object||v.toString==_bee){
-if(_bed>=dojo.widget.html.stabile.depthLimit){
+if(v.constructor==Object||v.toString==_bfb){
+if(_bfa>=dojo.widget.html.stabile.depthLimit){
 return "{ ... }";
 }
 if(typeof (v.hasOwnProperty)!="function"&&v.prototype){
 throw new Error("description: "+v+" not supported by script engine");
 }
-var _bf1=true;
+var _bfe=true;
 d="{";
 dojo.widget.html.stabile._depth++;
 for(var key in v){
 if(v[key]==void (0)||typeof (v[key])=="function"){
 continue;
 }
-if(_bf1){
-_bf1=false;
+if(_bfe){
+_bfe=false;
 }else{
 d+=", ";
 }
 var kd=key;
 if(!kd.match(/^[a-zA-Z_][a-zA-Z0-9_]*$/)){
-kd=arguments.callee(key,_bec);
+kd=arguments.callee(key,_bf9);
 }
-d+=kd+": "+arguments.callee(v[key],_bec);
+d+=kd+": "+arguments.callee(v[key],_bf9);
 }
 return d+"}";
 }
-if(_bec){
+if(_bf9){
 if(dojo.widget.html.stabile._recur){
-var _bf5=Object.prototype.toString;
-return _bf5.apply(v,[]);
+var _c02=Object.prototype.toString;
+return _c02.apply(v,[]);
 }else{
 dojo.widget.html.stabile._recur=true;
 return v.toString();
@@ -14262,7 +14308,7 @@
 }
 }
 finally{
-dojo.widget.html.stabile._depth=_bed;
+dojo.widget.html.stabile._depth=_bfa;
 }
 };
 dojo.widget.html.stabile._getStorage=function(){
@@ -14273,45 +14319,45 @@
 return dojo.widget.html.stabile.dataField=form?form.stabile:{value:""};
 };
 dojo.provide("dojo.widget.ComboBox");
-dojo.declare("dojo.widget.incrementalComboBoxDataProvider",null,function(_bf7){
-this.searchUrl=_bf7.dataUrl;
+dojo.declare("dojo.widget.incrementalComboBoxDataProvider",null,function(_c04){
+this.searchUrl=_c04.dataUrl;
 this._cache={};
 this._inFlight=false;
 this._lastRequest=null;
 this.allowCache=false;
-},{_addToCache:function(_bf8,data){
+},{_addToCache:function(_c05,data){
 if(this.allowCache){
-this._cache[_bf8]=data;
+this._cache[_c05]=data;
 }
-},startSearch:function(_bfa,_bfb){
+},startSearch:function(_c07,_c08){
 if(this._inFlight){
 }
-var tss=encodeURIComponent(_bfa);
-var _bfd=dojo.string.substituteParams(this.searchUrl,{"searchString":tss});
-var _bfe=this;
-var _bff=this._lastRequest=dojo.io.bind({url:_bfd,method:"get",mimetype:"text/json",load:function(type,data,evt){
-_bfe._inFlight=false;
+var tss=encodeURIComponent(_c07);
+var _c0a=dojo.string.substituteParams(this.searchUrl,{"searchString":tss});
+var _c0b=this;
+var _c0c=this._lastRequest=dojo.io.bind({url:_c0a,method:"get",mimetype:"text/json",load:function(type,data,evt){
+_c0b._inFlight=false;
 if(!dojo.lang.isArray(data)){
-var _c03=[];
+var _c10=[];
 for(var key in data){
-_c03.push([data[key],key]);
+_c10.push([data[key],key]);
 }
-data=_c03;
+data=_c10;
 }
-_bfe._addToCache(_bfa,data);
-if(_bff==_bfe._lastRequest){
-_bfb(data);
+_c0b._addToCache(_c07,data);
+if(_c0c==_c0b._lastRequest){
+_c08(data);
 }
 }});
 this._inFlight=true;
 }});
-dojo.declare("dojo.widget.basicComboBoxDataProvider",null,function(_c05,node){
+dojo.declare("dojo.widget.basicComboBoxDataProvider",null,function(_c12,node){
 this._data=[];
 this.searchLimit=30;
 this.searchType="STARTSTRING";
 this.caseSensitive=false;
-if(!dj_undef("dataUrl",_c05)&&!dojo.string.isBlank(_c05.dataUrl)){
-this._getData(_c05.dataUrl);
+if(!dj_undef("dataUrl",_c12)&&!dojo.string.isBlank(_c12.dataUrl)){
+this._getData(_c12.dataUrl);
 }else{
 if((node)&&(node.nodeName.toLowerCase()=="select")){
 var opts=node.getElementsByTagName("option");
@@ -14319,10 +14365,10 @@
 var data=[];
 for(var x=0;x<ol;x++){
 var text=opts[x].textContent||opts[x].innerText||opts[x].innerHTML;
-var _c0c=[String(text),String(opts[x].value)];
-data.push(_c0c);
+var _c19=[String(text),String(opts[x].value)];
+data.push(_c19);
 if(opts[x].selected){
-_c05.setAllValues(_c0c[0],_c0c[1]);
+_c12.setAllValues(_c19[0],_c19[1]);
 }
 }
 this.setData(data);
@@ -14331,57 +14377,57 @@
 },{_getData:function(url){
 dojo.io.bind({url:url,load:dojo.lang.hitch(this,function(type,data,evt){
 if(!dojo.lang.isArray(data)){
-var _c11=[];
+var _c1e=[];
 for(var key in data){
-_c11.push([data[key],key]);
+_c1e.push([data[key],key]);
 }
-data=_c11;
+data=_c1e;
 }
 this.setData(data);
 }),mimetype:"text/json"});
-},startSearch:function(_c13,_c14){
-this._performSearch(_c13,_c14);
-},_performSearch:function(_c15,_c16){
+},startSearch:function(_c20,_c21){
+this._performSearch(_c20,_c21);
+},_performSearch:function(_c22,_c23){
 var st=this.searchType;
 var ret=[];
 if(!this.caseSensitive){
-_c15=_c15.toLowerCase();
+_c22=_c22.toLowerCase();
 }
 for(var x=0;x<this._data.length;x++){
 if((this.searchLimit>0)&&(ret.length>=this.searchLimit)){
 break;
 }
-var _c1a=new String((!this.caseSensitive)?this._data[x][0].toLowerCase():this._data[x][0]);
-if(_c1a.length<_c15.length){
+var _c27=new String((!this.caseSensitive)?this._data[x][0].toLowerCase():this._data[x][0]);
+if(_c27.length<_c22.length){
 continue;
 }
 if(st=="STARTSTRING"){
-if(_c15==_c1a.substr(0,_c15.length)){
+if(_c22==_c27.substr(0,_c22.length)){
 ret.push(this._data[x]);
 }
 }else{
 if(st=="SUBSTRING"){
-if(_c1a.indexOf(_c15)>=0){
+if(_c27.indexOf(_c22)>=0){
 ret.push(this._data[x]);
 }
 }else{
 if(st=="STARTWORD"){
-var idx=_c1a.indexOf(_c15);
+var idx=_c27.indexOf(_c22);
 if(idx==0){
 ret.push(this._data[x]);
 }
 if(idx<=0){
 continue;
 }
-var _c1c=false;
+var _c29=false;
 while(idx!=-1){
-if(" ,/(".indexOf(_c1a.charAt(idx-1))!=-1){
-_c1c=true;
+if(" ,/(".indexOf(_c27.charAt(idx-1))!=-1){
+_c29=true;
 break;
 }
-idx=_c1a.indexOf(_c15,idx+1);
+idx=_c27.indexOf(_c22,idx+1);
 }
-if(!_c1c){
+if(!_c29){
 continue;
 }else{
 ret.push(this._data[x]);
@@ -14390,37 +14436,37 @@
 }
 }
 }
-_c16(ret);
-},setData:function(_c1d){
-this._data=_c1d;
+_c23(ret);
+},setData:function(_c2a){
+this._data=_c2a;
 }});
-dojo.widget.defineWidget("dojo.widget.ComboBox",dojo.widget.HtmlWidget,{forceValidOption:false,searchType:"stringstart",dataProvider:null,autoComplete:true,searchDelay:100,dataUrl:"",fadeTime:200,maxListLength:8,mode:"local",selectedResult:null,dataProviderClass:"",buttonSrc:dojo.uri.moduleUri("dojo.widget","templates/images/combo_box_arrow.png"),dropdownToggle:"fade",templateString:"<span _=\"whitespace and CR's between tags adds &nbsp; in FF\"\n\tclass=\"dojoComboBoxOuter\"\n\t><input style=\"display:none\"  tabindex=\"-1\" name=\"\" value=\"\" \n\t\tdojoAttachPoint=\"comboBoxValue\"\n\t><input style=\"display:none\"  tabindex=\"-1\" name=\"\" value=\"\" \n\t\tdojoAttachPoint=\"comboBoxSelectionValue\"\n\t><input type=\"text\" autocomplete=\"off\" class=\"dojoComboBox\"\n\t\tdojoAttachEvent=\"key:_handleKeyEvents; keyUp: onKeyUp; compositionEnd; onResize;\"\n\t\tdojoAttachPoint=\"textInputNode\"\n\t><img hspace=\"0\"\n\t\tvspace=\"0\"\n\t\tclass=\"dojoComboBox\"\n\t\tdojoA
 ttachPoint=\"downArrowNode\"\n\t\tdojoAttachEvent=\"onMouseUp: handleArrowClick; onResize;\"\n\t\tsrc=\"${this.buttonSrc}\"\n></span>\n",templateCssString:".dojoComboBoxOuter {\n\tborder: 0px !important;\n\tmargin: 0px !important;\n\tpadding: 0px !important;\n\tbackground: transparent !important;\n\twhite-space: nowrap !important;\n}\n\n.dojoComboBox {\n\tborder: 1px inset #afafaf;\n\tmargin: 0px;\n\tpadding: 0px;\n\tvertical-align: middle !important;\n\tfloat: none !important;\n\tposition: static !important;\n\tdisplay: inline !important;\n}\n\n/* the input box */\ninput.dojoComboBox {\n\tborder-right-width: 0px !important; \n\tmargin-right: 0px !important;\n\tpadding-right: 0px !important;\n}\n\n/* the down arrow */\nimg.dojoComboBox {\n\tborder-left-width: 0px !important;\n\tpadding-left: 0px !important;\n\tmargin-left: 0px !important;\n}\n\n/* IE vertical-alignment calculations can be off by +-1 but these margins are collapsed away */\n.dj_ie img.dojoComboBox {\n\tmargin
 -top: 1px; \n\tmargin-bottom: 1px; \n}\n\n/* the drop down */\n.dojoComboBoxOptions {\n\tfont-family: Verdana, Helvetica, Garamond, sans-serif;\n\t/* font-size: 0.7em; */\n\tbackground-color: white;\n\tborder: 1px solid #afafaf;\n\tposition: absolute;\n\tz-index: 1000; \n\toverflow: auto;\n\tcursor: default;\n}\n\n.dojoComboBoxItem {\n\tpadding-left: 2px;\n\tpadding-top: 2px;\n\tmargin: 0px;\n}\n\n.dojoComboBoxItemEven {\n\tbackground-color: #f4f4f4;\n}\n\n.dojoComboBoxItemOdd {\n\tbackground-color: white;\n}\n\n.dojoComboBoxItemHighlight {\n\tbackground-color: #63709A;\n\tcolor: white;\n}\n",templateCssPath:dojo.uri.moduleUri("dojo.widget","templates/ComboBox.css"),setValue:function(_c1e){
-this.comboBoxValue.value=_c1e;
-if(this.textInputNode.value!=_c1e){
-this.textInputNode.value=_c1e;
+dojo.widget.defineWidget("dojo.widget.ComboBox",dojo.widget.HtmlWidget,{forceValidOption:false,searchType:"stringstart",dataProvider:null,autoComplete:true,searchDelay:100,dataUrl:"",fadeTime:200,maxListLength:8,mode:"local",selectedResult:null,dataProviderClass:"",buttonSrc:dojo.uri.moduleUri("dojo.widget","templates/images/combo_box_arrow.png"),dropdownToggle:"fade",templateString:"<span _=\"whitespace and CR's between tags adds &nbsp; in FF\"\n\tclass=\"dojoComboBoxOuter\"\n\t><input style=\"display:none\"  tabindex=\"-1\" name=\"\" value=\"\" \n\t\tdojoAttachPoint=\"comboBoxValue\"\n\t><input style=\"display:none\"  tabindex=\"-1\" name=\"\" value=\"\" \n\t\tdojoAttachPoint=\"comboBoxSelectionValue\"\n\t><input type=\"text\" autocomplete=\"off\" class=\"dojoComboBox\"\n\t\tdojoAttachEvent=\"key:_handleKeyEvents; keyUp: onKeyUp; compositionEnd; onResize;\"\n\t\tdojoAttachPoint=\"textInputNode\"\n\t><img hspace=\"0\"\n\t\tvspace=\"0\"\n\t\tclass=\"dojoComboBox\"\n\t\tdojoA
 ttachPoint=\"downArrowNode\"\n\t\tdojoAttachEvent=\"onMouseUp: handleArrowClick; onResize;\"\n\t\tsrc=\"${this.buttonSrc}\"\n></span>\n",templateCssString:".dojoComboBoxOuter {\n\tborder: 0px !important;\n\tmargin: 0px !important;\n\tpadding: 0px !important;\n\tbackground: transparent !important;\n\twhite-space: nowrap !important;\n}\n\n.dojoComboBox {\n\tborder: 1px inset #afafaf;\n\tmargin: 0px;\n\tpadding: 0px;\n\tvertical-align: middle !important;\n\tfloat: none !important;\n\tposition: static !important;\n\tdisplay: inline !important;\n}\n\n/* the input box */\ninput.dojoComboBox {\n\tborder-right-width: 0px !important; \n\tmargin-right: 0px !important;\n\tpadding-right: 0px !important;\n}\n\n/* the down arrow */\nimg.dojoComboBox {\n\tborder-left-width: 0px !important;\n\tpadding-left: 0px !important;\n\tmargin-left: 0px !important;\n}\n\n/* IE vertical-alignment calculations can be off by +-1 but these margins are collapsed away */\n.dj_ie img.dojoComboBox {\n\tmargin
 -top: 1px; \n\tmargin-bottom: 1px; \n}\n\n/* the drop down */\n.dojoComboBoxOptions {\n\tfont-family: Verdana, Helvetica, Garamond, sans-serif;\n\t/* font-size: 0.7em; */\n\tbackground-color: white;\n\tborder: 1px solid #afafaf;\n\tposition: absolute;\n\tz-index: 1000; \n\toverflow: auto;\n\tcursor: default;\n}\n\n.dojoComboBoxItem {\n\tpadding-left: 2px;\n\tpadding-top: 2px;\n\tmargin: 0px;\n}\n\n.dojoComboBoxItemEven {\n\tbackground-color: #f4f4f4;\n}\n\n.dojoComboBoxItemOdd {\n\tbackground-color: white;\n}\n\n.dojoComboBoxItemHighlight {\n\tbackground-color: #63709A;\n\tcolor: white;\n}\n",templateCssPath:dojo.uri.moduleUri("dojo.widget","templates/ComboBox.css"),setValue:function(_c2b){
+this.comboBoxValue.value=_c2b;
+if(this.textInputNode.value!=_c2b){
+this.textInputNode.value=_c2b;
 dojo.widget.html.stabile.setState(this.widgetId,this.getState(),true);
-this.onValueChanged(_c1e);
+this.onValueChanged(_c2b);
 }
-},onValueChanged:function(_c1f){
+},onValueChanged:function(_c2c){
 },getValue:function(){
 return this.comboBoxValue.value;
 },getState:function(){
 return {value:this.getValue()};
-},setState:function(_c20){
-this.setValue(_c20.value);
+},setState:function(_c2d){
+this.setValue(_c2d.value);
 },enable:function(){
 this.disabled=false;
 this.textInputNode.removeAttribute("disabled");
 },disable:function(){
 this.disabled=true;
 this.textInputNode.setAttribute("disabled",true);
-},_getCaretPos:function(_c21){
-if(dojo.lang.isNumber(_c21.selectionStart)){
-return _c21.selectionStart;
+},_getCaretPos:function(_c2e){
+if(dojo.lang.isNumber(_c2e.selectionStart)){
+return _c2e.selectionStart;
 }else{
 if(dojo.render.html.ie){
 var tr=document.selection.createRange().duplicate();
-var ntr=_c21.createTextRange();
+var ntr=_c2e.createTextRange();
 tr.move("character",0);
 ntr.move("character",0);
 try{
@@ -14432,36 +14478,36 @@
 }
 }
 }
-},_setCaretPos:function(_c24,_c25){
-_c25=parseInt(_c25);
-this._setSelectedRange(_c24,_c25,_c25);
-},_setSelectedRange:function(_c26,_c27,end){
+},_setCaretPos:function(_c31,_c32){
+_c32=parseInt(_c32);
+this._setSelectedRange(_c31,_c32,_c32);
+},_setSelectedRange:function(_c33,_c34,end){
 if(!end){
-end=_c26.value.length;
+end=_c33.value.length;
 }
-if(_c26.setSelectionRange){
-_c26.focus();
-_c26.setSelectionRange(_c27,end);
-}else{
-if(_c26.createTextRange){
-var _c29=_c26.createTextRange();
-with(_c29){
+if(_c33.setSelectionRange){
+_c33.focus();
+_c33.setSelectionRange(_c34,end);
+}else{
+if(_c33.createTextRange){
+var _c36=_c33.createTextRange();
+with(_c36){
 collapse(true);
 moveEnd("character",end);
-moveStart("character",_c27);
+moveStart("character",_c34);
 select();
 }
 }else{
-_c26.value=_c26.value;
-_c26.blur();
-_c26.focus();
-var dist=parseInt(_c26.value.length)-end;
-var _c2b=String.fromCharCode(37);
-var tcc=_c2b.charCodeAt(0);
+_c33.value=_c33.value;
+_c33.blur();
+_c33.focus();
+var dist=parseInt(_c33.value.length)-end;
+var _c38=String.fromCharCode(37);
+var tcc=_c38.charCodeAt(0);
 for(var x=0;x<dist;x++){
 var te=document.createEvent("KeyEvents");
 te.initKeyEvent("keypress",true,true,null,false,false,false,false,tcc,tcc);
-_c26.dispatchEvent(te);
+_c33.dispatchEvent(te);
 }
 }
 }
@@ -14472,7 +14518,7 @@
 this._prev_key_backspace=false;
 this._prev_key_esc=false;
 var k=dojo.event.browser.keys;
-var _c31=true;
+var _c3e=true;
 switch(evt.key){
 case k.KEY_DOWN_ARROW:
 if(!this.popupWidget.isShowingNow){
@@ -14520,22 +14566,22 @@
 if(!this.textInputNode.value.length){
 this.setAllValues("","");
 this._hideResultList();
-_c31=false;
+_c3e=false;
 }
 break;
 case k.KEY_RIGHT_ARROW:
 case k.KEY_LEFT_ARROW:
-_c31=false;
+_c3e=false;
 break;
 default:
 if(evt.charCode==0){
-_c31=false;
+_c3e=false;
 }
 }
 if(this.searchTimer){
 clearTimeout(this.searchTimer);
 }
-if(_c31){
+if(_c3e){
 this._blurOptionNode();
 this.searchTimer=setTimeout(dojo.lang.hitch(this,this._startSearchFromInput),this.searchDelay);
 }
@@ -14544,11 +14590,11 @@
 this._handleKeyEvents(evt);
 },onKeyUp:function(evt){
 this.setValue(this.textInputNode.value);
-},setSelectedValue:function(_c34){
-this.comboBoxSelectionValue.value=_c34;
-},setAllValues:function(_c35,_c36){
-this.setSelectedValue(_c36);
-this.setValue(_c35);
+},setSelectedValue:function(_c41){
+this.comboBoxSelectionValue.value=_c41;
+},setAllValues:function(_c42,_c43){
+this.setSelectedValue(_c43);
+this.setValue(_c42);
 },_focusOptionNode:function(node){
 if(this._highlighted_option!=node){
 this._blurOptionNode();
@@ -14590,43 +14636,43 @@
 }
 this._blurOptionNode();
 },onResize:function(){
-var _c3a=dojo.html.getContentBox(this.textInputNode);
-if(_c3a.height<=0){
+var _c47=dojo.html.getContentBox(this.textInputNode);
+if(_c47.height<=0){
 dojo.lang.setTimeout(this,"onResize",100);
 return;
 }
-var _c3b={width:_c3a.height,height:_c3a.height};
-dojo.html.setContentBox(this.downArrowNode,_c3b);
+var _c48={width:_c47.height,height:_c47.height};
+dojo.html.setContentBox(this.downArrowNode,_c48);
 },fillInTemplate:function(args,frag){
 dojo.html.applyBrowserClass(this.domNode);
-var _c3e=this.getFragNodeRef(frag);
-if(!this.name&&_c3e.name){
-this.name=_c3e.name;
+var _c4b=this.getFragNodeRef(frag);
+if(!this.name&&_c4b.name){
+this.name=_c4b.name;
 }
 this.comboBoxValue.name=this.name;
 this.comboBoxSelectionValue.name=this.name+"_selected";
-dojo.html.copyStyle(this.domNode,_c3e);
-dojo.html.copyStyle(this.textInputNode,_c3e);
-dojo.html.copyStyle(this.downArrowNode,_c3e);
+dojo.html.copyStyle(this.domNode,_c4b);
+dojo.html.copyStyle(this.textInputNode,_c4b);
+dojo.html.copyStyle(this.downArrowNode,_c4b);
 with(this.downArrowNode.style){
 width="0px";
 height="0px";
 }
-var _c3f;
+var _c4c;
 if(this.dataProviderClass){
 if(typeof this.dataProviderClass=="string"){
-_c3f=dojo.evalObjPath(this.dataProviderClass);
+_c4c=dojo.evalObjPath(this.dataProviderClass);
 }else{
-_c3f=this.dataProviderClass;
+_c4c=this.dataProviderClass;
 }
 }else{
 if(this.mode=="remote"){
-_c3f=dojo.widget.incrementalComboBoxDataProvider;
+_c4c=dojo.widget.incrementalComboBoxDataProvider;
 }else{
-_c3f=dojo.widget.basicComboBoxDataProvider;
+_c4c=dojo.widget.basicComboBoxDataProvider;
 }
 }
-this.dataProvider=new _c3f(this,this.getFragNodeRef(frag));
+this.dataProvider=new _c4c(this,this.getFragNodeRef(frag));
 this.popupWidget=new dojo.widget.createWidget("PopupContainer",{toggle:this.dropdownToggle,toggleDuration:this.toggleDuration});
 dojo.event.connect(this,"destroy",this.popupWidget,"destroy");
 this.optionsListNode=this.popupWidget.domNode;
@@ -14637,24 +14683,24 @@
 dojo.event.connect(this.optionsListNode,"onmouseout",this,"_onMouseOut");
 dojo.event.connect(this.optionsListNode,"onmouseover",this,"_itemMouseOver");
 dojo.event.connect(this.optionsListNode,"onmouseout",this,"_itemMouseOut");
-},_openResultList:function(_c40){
+},_openResultList:function(_c4d){
 if(this.disabled){
 return;
 }
 this._clearResultList();
-if(!_c40.length){
+if(!_c4d.length){
 this._hideResultList();
 }
-if((this.autoComplete)&&(_c40.length)&&(!this._prev_key_backspace)&&(this.textInputNode.value.length>0)){
+if((this.autoComplete)&&(_c4d.length)&&(!this._prev_key_backspace)&&(this.textInputNode.value.length>0)){
 var cpos=this._getCaretPos(this.textInputNode);
 if((cpos+1)>this.textInputNode.value.length){
-this.textInputNode.value+=_c40[0][0].substr(cpos);
+this.textInputNode.value+=_c4d[0][0].substr(cpos);
 this._setSelectedRange(this.textInputNode,cpos,this.textInputNode.value.length);
 }
 }
 var even=true;
-while(_c40.length){
-var tr=_c40.shift();
+while(_c4d.length){
+var tr=_c4d.shift();
 if(tr){
 var td=document.createElement("div");
 td.appendChild(document.createTextNode(tr[0]));
@@ -14671,12 +14717,12 @@
 },_onBlurInput:function(){
 this._hasFocus=false;
 this._handleBlurTimer(true,500);
-},_handleBlurTimer:function(_c45,_c46){
-if(this.blurTimer&&(_c45||_c46)){
+},_handleBlurTimer:function(_c52,_c53){
+if(this.blurTimer&&(_c52||_c53)){
 clearTimeout(this.blurTimer);
 }
-if(_c46){
-this.blurTimer=dojo.lang.setTimeout(this,"_checkBlurred",_c46);
+if(_c53){
+this.blurTimer=dojo.lang.setTimeout(this,"_checkBlurred",_c53);
 }
 },_onMouseOver:function(evt){
 if(!this._mouseover_list){
@@ -14684,9 +14730,9 @@
 this._mouseover_list=true;
 }
 },_onMouseOut:function(evt){
-var _c49=evt.relatedTarget;
+var _c56=evt.relatedTarget;
 try{
-if(!_c49||_c49.parentNode!=this.optionsListNode){
+if(!_c56||_c56.parentNode!=this.optionsListNode){
 this._mouseover_list=false;
 this._handleBlurTimer(true,100);
 this._tryFocus();
@@ -14694,24 +14740,24 @@
 }
 catch(e){
 }
-},_isInputEqualToResult:function(_c4a){
-var _c4b=this.textInputNode.value;
+},_isInputEqualToResult:function(_c57){
+var _c58=this.textInputNode.value;
 if(!this.dataProvider.caseSensitive){
-_c4b=_c4b.toLowerCase();
-_c4a=_c4a.toLowerCase();
+_c58=_c58.toLowerCase();
+_c57=_c57.toLowerCase();
 }
-return (_c4b==_c4a);
+return (_c58==_c57);
 },_isValidOption:function(){
 var tgt=dojo.html.firstElement(this.optionsListNode);
-var _c4d=false;
-while(!_c4d&&tgt){
+var _c5a=false;
+while(!_c5a&&tgt){
 if(this._isInputEqualToResult(tgt.getAttribute("resultName"))){
-_c4d=true;
+_c5a=true;
 }else{
 tgt=dojo.html.nextElement(tgt);
 }
 }
-return _c4d;
+return _c5a;
 },_checkBlurred:function(){
 if(!this._hasFocus&&!this._mouseover_list){
 this._hideResultList();
@@ -14719,12 +14765,12 @@
 this.setAllValues("","");
 return;
 }
-var _c4e=this._isValidOption();
-if(this.forceValidOption&&!_c4e){
+var _c5b=this._isValidOption();
+if(this.forceValidOption&&!_c5b){
 this.setAllValues("","");
 return;
 }
-if(!_c4e){
+if(!_c5b){
 this.setSelectedValue("");
 }
 }
@@ -14764,15 +14810,15 @@
 },_hideResultList:function(){
 this.popupWidget.close();
 },_showResultList:function(){
-var _c51=this.optionsListNode.childNodes;
-if(_c51.length){
-var _c52=Math.min(_c51.length,this.maxListLength);
+var _c5e=this.optionsListNode.childNodes;
+if(_c5e.length){
+var _c5f=Math.min(_c5e.length,this.maxListLength);
 with(this.optionsListNode.style){
 display="";
-if(_c52==_c51.length){
+if(_c5f==_c5e.length){
 height="";
 }else{
-height=_c52*dojo.html.getMarginBox(_c51[0]).height+"px";
+height=_c5f*dojo.html.getMarginBox(_c5e[0]).height+"px";
 }
 width=(dojo.html.getMarginBox(this.domNode).width-2)+"px";
 }
@@ -14811,15 +14857,15 @@
 }
 }});
 dojo.provide("struts.widget.ComboBox");
-struts.widget.ComboBoxDataProvider=function(_c55,node){
+struts.widget.ComboBoxDataProvider=function(_c62,node){
 this.data=[];
-this.searchLimit=_c55.searchLimit;
+this.searchLimit=_c62.searchLimit;
 this.searchType="STARTSTRING";
 this.caseSensitive=false;
 this._lastSearch="";
 this._lastSearchResults=null;
 this.firstRequest=true;
-this.cbox=_c55;
+this.cbox=_c62;
 this.formId=this.cbox.formId;
 this.formFilter=this.cbox.formFilter;
 this.getData=function(url){
@@ -14830,50 +14876,50 @@
 this.firstRequest=false;
 this.cbox.notify.apply(this.cbox,[data,type,evt]);
 }
-var _c5b=null;
-var _c5c=data[this.cbox.dataFieldName];
+var _c68=null;
+var _c69=data[this.cbox.dataFieldName];
 if(!dojo.lang.isArray(data)){
-if(_c5c){
-if(dojo.lang.isArray(_c5c)){
-_c5b=_c5c;
+if(_c69){
+if(dojo.lang.isArray(_c69)){
+_c68=_c69;
 }else{
-if(dojo.lang.isObject(_c5c)){
-_c5b=[];
-for(var key in _c5c){
-_c5b.push([_c5c[key],key]);
+if(dojo.lang.isObject(_c69)){
+_c68=[];
+for(var key in _c69){
+_c68.push([_c69[key],key]);
 }
 }
 }
 }else{
-var _c5e=[];
+var _c6b=[];
 for(var key in data){
 if(dojo.string.startsWith(key,this.cbox.name)){
-_c5b=data[key];
+_c68=data[key];
 break;
 }else{
-_c5e.push([data[key],key]);
+_c6b.push([data[key],key]);
 }
-if(!_c5b&&dojo.lang.isArray(data[key])&&!dojo.lang.isString(data[key])){
-_c5b=data[key];
+if(!_c68&&dojo.lang.isArray(data[key])&&!dojo.lang.isString(data[key])){
+_c68=data[key];
 }
 }
-if(!_c5b){
-_c5b=_c5e;
+if(!_c68){
+_c68=_c6b;
 }
 }
-data=_c5b;
+data=_c68;
 }
 this.setData(data);
 }),mimetype:"text/json"});
 };
-this.startSearch=function(_c5f,_c60){
-this._preformSearch(_c5f,_c60);
+this.startSearch=function(_c6c,_c6d){
+this._preformSearch(_c6c,_c6d);
 };
-this._preformSearch=function(_c61,_c62){
+this._preformSearch=function(_c6e,_c6f){
 var st=this.searchType;
 var ret=[];
 if(!this.caseSensitive){
-_c61=_c61.toLowerCase();
+_c6e=_c6e.toLowerCase();
 }
 for(var x=0;x<this.data.length;x++){
 if(!this.data[x]){
@@ -14882,37 +14928,37 @@
 if((this.searchLimit>0)&&(ret.length>=this.searchLimit)){
 break;
 }
-var _c66=new String((!this.caseSensitive)?this.data[x][0].toLowerCase():this.data[x][0]);
-if(_c66.length<_c61.length){
+var _c73=new String((!this.caseSensitive)?this.data[x][0].toLowerCase():this.data[x][0]);
+if(_c73.length<_c6e.length){
 continue;
 }
 if(st=="STARTSTRING"){
-if(_c61==_c66.substr(0,_c61.length)){
+if(_c6e==_c73.substr(0,_c6e.length)){
 ret.push(this.data[x]);
 }
 }else{
 if(st=="SUBSTRING"){
-if(_c66.indexOf(_c61)>=0){
+if(_c73.indexOf(_c6e)>=0){
 ret.push(this.data[x]);
 }
 }else{
 if(st=="STARTWORD"){
-var idx=_c66.indexOf(_c61);
+var idx=_c73.indexOf(_c6e);
 if(idx==0){
 ret.push(this.data[x]);
 }
 if(idx<=0){
 continue;
 }
-var _c68=false;
+var _c75=false;
 while(idx!=-1){
-if(" ,/(".indexOf(_c66.charAt(idx-1))!=-1){
-_c68=true;
+if(" ,/(".indexOf(_c73.charAt(idx-1))!=-1){
+_c75=true;
 break;
 }
-idx=_c66.indexOf(_c61,idx+1);
+idx=_c73.indexOf(_c6e,idx+1);
 }
-if(!_c68){
+if(!_c75){
 continue;
 }else{
 ret.push(this.data[x]);
@@ -14921,17 +14967,17 @@
 }
 }
 }
-_c62(ret);
+_c6f(ret);
 };
-this.addData=function(_c69){
-this.data=this.data.concat(_c69);
+this.addData=function(_c76){
+this.data=this.data.concat(_c76);
 };
-this.setData=function(_c6a){
-this.data=_c6a;
+this.setData=function(_c77){
+this.data=_c77;
 for(var i=0;i<this.data.length;i++){
-var _c6c=this.data[i];
-if(!dojo.lang.isArray(_c6c)){
-this.data[i]=[_c6c,_c6c];
+var _c79=this.data[i];
+if(!dojo.lang.isArray(_c79)){
+this.data[i]=[_c79,_c79];
 }
 }
 };
@@ -14944,10 +14990,10 @@
 var data=[];
 for(var x=0;x<ol;x++){
 var text=opts[x].textContent||opts[x].innerText||opts[x].innerHTML;
-var _c72=[String(text),String(opts[x].value)];
-data.push(_c72);
+var _c7f=[String(text),String(opts[x].value)];
+data.push(_c7f);
 if(opts[x].selected){
-this.cbox.setAllValues(_c72[0],_c72[1]);
+this.cbox.setAllValues(_c7f[0],_c7f[1]);
 }
 }
 this.setData(data);
@@ -14955,55 +15001,55 @@
 }
 };
 dojo.widget.defineWidget("struts.widget.ComboBox",dojo.widget.ComboBox,{widgetType:"ComboBox",dropdownHeight:120,dropdownWidth:0,itemHeight:0,listenTopics:"",notifyTopics:"",notifyTopicsArray:null,beforeNotifyTopics:"",beforeNotifyTopicsArray:null,afterNotifyTopics:"",afterNotifyTopicsArray:null,errorNotifyTopics:"",errorNotifyTopicsArray:null,valueNotifyTopics:"",valueNotifyTopicsArray:null,indicator:"",formId:"",formFilter:"",dataProviderClass:"struts.widget.ComboBoxDataProvider",loadOnType:false,loadMinimum:3,initialValue:"",initialKey:"",visibleDownArrow:true,fadeTime:100,searchType:"STARTSTRING",dataFieldName:"",keyName:"",templateCssString:null,templateCssString:".dojoComboBoxOuter {\n\tborder: 0px !important;\n\tmargin: 0px !important;\n\tpadding: 0px !important;\n\tbackground: transparent !important;\n\twhite-space: nowrap !important;\n}\n\n.dojoComboBox {\n\tborder: 1px inset #afafaf;\n\tmargin: 0px;\n\tpadding: 0px;\n\tvertical-align: middle !important;\n\tfloat: n
 one !important;\n\tposition: static !important;\n\tdisplay: inline;\n}\n\n/* the input box */\ninput.dojoComboBox {\n\tborder-right-width: 1px !important;\n\tmargin-right: 0px !important;\n\tpadding-right: 0px !important;\n}\n\n/* the down arrow */\nimg.dojoComboBox {\n\tborder-left-width: 0px !important;\n\tpadding-left: 0px !important;\n\tmargin-left: 0px !important;\n}\n\n/* IE vertical-alignment calculations can be off by +-1 but these margins are collapsed away */\n.dj_ie img.dojoComboBox {\n\tmargin-top: 1px;\n\tmargin-bottom: 1px;\n}\n\n/* the drop down */\n.dojoComboBoxOptions {\n\tfont-family: Verdana, Helvetica, Garamond, sans-serif;\n\t/* font-size: 0.7em; */\n\tbackground-color: white;\n\tborder: 1px solid #afafaf;\n\tposition: absolute;\n\tz-index: 1000;\n\toverflow: auto;\n\tcursor: default;\n}\n\n.dojoComboBoxItem {\n\tpadding-left: 2px;\n\tpadding-top: 2px;\n\tmargin: 0px;\n}\n\n.dojoComboBoxItemEven {\n\tbackground-color: #f4f4f4;\n}\n\n.dojoComboBoxItemOdd 
 {\n\tbackground-color: white;\n}\n\n.dojoComboBoxItemHighlight {\n\tbackground-color: #63709A;\n\tcolor: white;\n}\n",templateCssPath:dojo.uri.dojoUri("struts/ComboBox.css"),searchLimit:30,showResultList:function(){
-var _c73=this.optionsListNode.childNodes;
-if(_c73.length){
+var _c80=this.optionsListNode.childNodes;
+if(_c80.length){
 this.optionsListNode.style.width=this.dropdownWidth===0?(dojo.html.getMarginBox(this.domNode).width-2)+"px":this.dropdownWidth+"px";
 if(this.itemHeight===0||dojo.string.isBlank(this.textInputNode.value)){
 this.optionsListNode.style.height=this.dropdownHeight+"px";
 this.optionsListNode.style.display="";
-this.itemHeight=dojo.html.getMarginBox(_c73[0]).height;
+this.itemHeight=dojo.html.getMarginBox(_c80[0]).height;
 }
-var _c74=this.itemHeight*_c73.length;
-if(_c74<this.dropdownHeight){
-this.optionsListNode.style.height=_c74+2+"px";
+var _c81=this.itemHeight*_c80.length;
+if(_c81<this.dropdownHeight){
+this.optionsListNode.style.height=_c81+2+"px";
 }
 this.popupWidget.open(this.domNode,this,this.downArrowNode);
 }else{
 this._hideResultList();
 }
-},_openResultList:function(_c75){
+},_openResultList:function(_c82){
 if(this.disabled){
 return;
 }
 this._clearResultList();
-if(!_c75.length){
+if(!_c82.length){
 this._hideResultList();
 }
-if((this.autoComplete)&&(_c75.length)&&(!this._prev_key_backspace)&&(this.textInputNode.value.length>0)){
+if((this.autoComplete)&&(_c82.length)&&(!this._prev_key_backspace)&&(this.textInputNode.value.length>0)){
 var cpos=this._getCaretPos(this.textInputNode);
 if((cpos+1)>this.textInputNode.value.length){
-this.textInputNode.value+=_c75[0][0].substr(cpos);
+this.textInputNode.value+=_c82[0][0].substr(cpos);
 this._setSelectedRange(this.textInputNode,cpos,this.textInputNode.value.length);
 }
 }
-var _c77=this.textInputNode.value;
+var _c84=this.textInputNode.value;
 var even=true;
-while(_c75.length){
-var tr=_c75.shift();
+while(_c82.length){
+var tr=_c82.shift();
 if(tr){
 var td=document.createElement("div");
 var text=tr[0];
-var i=text.toLowerCase().indexOf(_c77.toLowerCase());
+var i=text.toLowerCase().indexOf(_c84.toLowerCase());
 if(i>=0){
 var pre=text.substring(0,i);
-var _c7e=text.substring(i,i+_c77.length);
-var post=text.substring(i+_c77.length);
+var _c8b=text.substring(i,i+_c84.length);
+var post=text.substring(i+_c84.length);
 if(!dojo.string.isBlank(pre)){
 td.appendChild(document.createTextNode(pre));
 }
-var _c80=document.createElement("b");
-td.appendChild(_c80);
-_c80.appendChild(document.createTextNode(_c7e));
+var _c8d=document.createElement("b");
+td.appendChild(_c8d);
+_c8d.appendChild(document.createTextNode(_c8b));
 td.appendChild(document.createTextNode(post));
 }else{
 td.appendChild(document.createTextNode(tr[0]));
@@ -15020,12 +15066,12 @@
 struts.widget.ComboBox.superclass.postCreate.apply(this);
 var self=this;
 if(!dojo.string.isBlank(this.listenTopics)){
-var _c82=this.listenTopics.split(",");
-for(var i=0;i<_c82.length;i++){
-dojo.event.topic.subscribe(_c82[i],function(){
-var _c84={cancel:false};
-self.notify(this.widgetId,"before",_c84);
-if(_c84.cancel){
+var _c8f=this.listenTopics.split(",");
+for(var i=0;i<_c8f.length;i++){
+dojo.event.topic.subscribe(_c8f[i],function(){
+var _c91={cancel:false};
+self.notify(this.widgetId,"before",_c91);
+if(_c91.cancel){
 return;
 }
 self.clearValues();
@@ -15067,37 +15113,37 @@
 },notify:function(data,type,e){
 if(this.notifyTopicsArray){
 var self=this;
-dojo.lang.forEach(this.notifyTopicsArray,function(_c8a){
+dojo.lang.forEach(this.notifyTopicsArray,function(_c97){
 try{
-dojo.event.topic.publish(_c8a,data,type,e);
+dojo.event.topic.publish(_c97,data,type,e);
 }
 catch(ex){
 self.log(ex);
 }
 });
 }
-var _c8b=null;
+var _c98=null;
 switch(type){
 case "before":
-_c8b=this.beforeNotifyTopicsArray;
+_c98=this.beforeNotifyTopicsArray;
 break;
 case "load":
-_c8b=this.afterNotifyTopicsArray;
+_c98=this.afterNotifyTopicsArray;
 break;
 case "error":
-_c8b=this.errorNotifyTopicsArray;
+_c98=this.errorNotifyTopicsArray;
 break;
 case "valuechanged":
-_c8b=this.valueNotifyTopicsArray;
+_c98=this.valueNotifyTopicsArray;
 break;
 }
-this.notifyTo(_c8b,data,type,e);
-},notifyTo:function(_c8c,data,type,e){
+this.notifyTo(_c98,data,type,e);
+},notifyTo:function(_c99,data,type,e){
 var self=this;
-if(_c8c){
-dojo.lang.forEach(_c8c,function(_c91){
+if(_c99){
+dojo.lang.forEach(_c99,function(_c9e){
 try{
-dojo.event.topic.publish(_c91,data,type,e);
+dojo.event.topic.publish(_c9e,data,type,e);
 }
 catch(ex){
 self.log(ex);
@@ -15107,18 +15153,18 @@
 },log:function(text){
 dojo.debug("["+(this.widgetId?this.widgetId:"unknown")+"] "+text);
 },_startSearchFromInput:function(){
-var _c93=this.textInputNode.value;
+var _ca0=this.textInputNode.value;
 if(this.loadOnType){
-if(_c93.length>=this.loadMinimum){
-var _c94=this.dataUrl+(this.dataUrl.indexOf("?")>-1?"&":"?");
-_c94+=this.name+"="+_c93;
-this.dataProvider.getData(_c94);
-this._startSearch(_c93);
+if(_ca0.length>=this.loadMinimum){
+var _ca1=this.dataUrl+(this.dataUrl.indexOf("?")>-1?"&":"?");
+_ca1+=this.name+"="+_ca0;
+this.dataProvider.getData(_ca1);
+this._startSearch(_ca0);
 }else{
 this._hideResultList();
 }
 }else{
-this._startSearch(_c93);
+this._startSearch(_ca0);
 }
 }});
 dojo.provide("dojo.widget.DropdownContainer");
@@ -15166,197 +15212,197 @@
 dojo.widget.DropdownContainer.superclass.disable.apply(this,arguments);
 }});
 dojo.provide("dojo.date.serialize");
-dojo.date.setIso8601=function(_c98,_c99){
-var _c9a=(_c99.indexOf("T")==-1)?_c99.split(" "):_c99.split("T");
-_c98=dojo.date.setIso8601Date(_c98,_c9a[0]);
-if(_c9a.length==2){
-_c98=dojo.date.setIso8601Time(_c98,_c9a[1]);
-}
-return _c98;
-};
-dojo.date.fromIso8601=function(_c9b){
-return dojo.date.setIso8601(new Date(0,0),_c9b);
-};
-dojo.date.setIso8601Date=function(_c9c,_c9d){
-var _c9e="^([0-9]{4})((-?([0-9]{2})(-?([0-9]{2}))?)|"+"(-?([0-9]{3}))|(-?W([0-9]{2})(-?([1-7]))?))?$";
-var d=_c9d.match(new RegExp(_c9e));
+dojo.date.setIso8601=function(_ca5,_ca6){
+var _ca7=(_ca6.indexOf("T")==-1)?_ca6.split(" "):_ca6.split("T");
+_ca5=dojo.date.setIso8601Date(_ca5,_ca7[0]);
+if(_ca7.length==2){
+_ca5=dojo.date.setIso8601Time(_ca5,_ca7[1]);
+}
+return _ca5;
+};
+dojo.date.fromIso8601=function(_ca8){
+return dojo.date.setIso8601(new Date(0,0),_ca8);
+};
+dojo.date.setIso8601Date=function(_ca9,_caa){
+var _cab="^([0-9]{4})((-?([0-9]{2})(-?([0-9]{2}))?)|"+"(-?([0-9]{3}))|(-?W([0-9]{2})(-?([1-7]))?))?$";
+var d=_caa.match(new RegExp(_cab));
 if(!d){
-dojo.debug("invalid date string: "+_c9d);
+dojo.debug("invalid date string: "+_caa);
 return null;
 }
 var year=d[1];
-var _ca1=d[4];
+var _cae=d[4];
 var date=d[6];
-var _ca3=d[8];
+var _cb0=d[8];
 var week=d[10];
-var _ca5=d[12]?d[12]:1;
-_c9c.setFullYear(year);
-if(_ca3){
-_c9c.setMonth(0);
-_c9c.setDate(Number(_ca3));
+var _cb2=d[12]?d[12]:1;
+_ca9.setFullYear(year);
+if(_cb0){
+_ca9.setMonth(0);
+_ca9.setDate(Number(_cb0));
 }else{
 if(week){
-_c9c.setMonth(0);
-_c9c.setDate(1);
-var gd=_c9c.getDay();
+_ca9.setMonth(0);
+_ca9.setDate(1);
+var gd=_ca9.getDay();
 var day=gd?gd:7;
-var _ca8=Number(_ca5)+(7*Number(week));
+var _cb5=Number(_cb2)+(7*Number(week));
 if(day<=4){
-_c9c.setDate(_ca8+1-day);
+_ca9.setDate(_cb5+1-day);
 }else{
-_c9c.setDate(_ca8+8-day);
+_ca9.setDate(_cb5+8-day);
 }
 }else{
-if(_ca1){
-_c9c.setDate(1);
-_c9c.setMonth(_ca1-1);
+if(_cae){
+_ca9.setDate(1);
+_ca9.setMonth(_cae-1);
 }
 if(date){
-_c9c.setDate(date);
+_ca9.setDate(date);
 }
 }
 }
-return _c9c;
+return _ca9;
 };
-dojo.date.fromIso8601Date=function(_ca9){
-return dojo.date.setIso8601Date(new Date(0,0),_ca9);
+dojo.date.fromIso8601Date=function(_cb6){
+return dojo.date.setIso8601Date(new Date(0,0),_cb6);
 };
-dojo.date.setIso8601Time=function(_caa,_cab){
-var _cac="Z|(([-+])([0-9]{2})(:?([0-9]{2}))?)$";
-var d=_cab.match(new RegExp(_cac));
-var _cae=0;
+dojo.date.setIso8601Time=function(_cb7,_cb8){
+var _cb9="Z|(([-+])([0-9]{2})(:?([0-9]{2}))?)$";
+var d=_cb8.match(new RegExp(_cb9));
+var _cbb=0;
 if(d){
 if(d[0]!="Z"){
-_cae=(Number(d[3])*60)+Number(d[5]);
-_cae*=((d[2]=="-")?1:-1);
+_cbb=(Number(d[3])*60)+Number(d[5]);
+_cbb*=((d[2]=="-")?1:-1);
 }
-_cae-=_caa.getTimezoneOffset();
-_cab=_cab.substr(0,_cab.length-d[0].length);
+_cbb-=_cb7.getTimezoneOffset();
+_cb8=_cb8.substr(0,_cb8.length-d[0].length);
 }
-var _caf="^([0-9]{2})(:?([0-9]{2})(:?([0-9]{2})(.([0-9]+))?)?)?$";
-d=_cab.match(new RegExp(_caf));
+var _cbc="^([0-9]{2})(:?([0-9]{2})(:?([0-9]{2})(.([0-9]+))?)?)?$";
+d=_cb8.match(new RegExp(_cbc));
 if(!d){
-dojo.debug("invalid time string: "+_cab);
+dojo.debug("invalid time string: "+_cb8);
 return null;
 }
-var _cb0=d[1];
+var _cbd=d[1];
 var mins=Number((d[3])?d[3]:0);
 var secs=(d[5])?d[5]:0;
 var ms=d[7]?(Number("0."+d[7])*1000):0;
-_caa.setHours(_cb0);
-_caa.setMinutes(mins);
-_caa.setSeconds(secs);
-_caa.setMilliseconds(ms);
-if(_cae!==0){
-_caa.setTime(_caa.getTime()+_cae*60000);
-}
-return _caa;
-};
-dojo.date.fromIso8601Time=function(_cb4){
-return dojo.date.setIso8601Time(new Date(0,0),_cb4);
-};
-dojo.date.toRfc3339=function(_cb5,_cb6){
-if(!_cb5){
-_cb5=new Date();
+_cb7.setHours(_cbd);
+_cb7.setMinutes(mins);
+_cb7.setSeconds(secs);
+_cb7.setMilliseconds(ms);
+if(_cbb!==0){
+_cb7.setTime(_cb7.getTime()+_cbb*60000);
+}
+return _cb7;
+};
+dojo.date.fromIso8601Time=function(_cc1){
+return dojo.date.setIso8601Time(new Date(0,0),_cc1);
+};
+dojo.date.toRfc3339=function(_cc2,_cc3){
+if(!_cc2){
+_cc2=new Date();
 }
 var _=dojo.string.pad;
-var _cb8=[];
-if(_cb6!="timeOnly"){
-var date=[_(_cb5.getFullYear(),4),_(_cb5.getMonth()+1,2),_(_cb5.getDate(),2)].join("-");
-_cb8.push(date);
-}
-if(_cb6!="dateOnly"){
-var time=[_(_cb5.getHours(),2),_(_cb5.getMinutes(),2),_(_cb5.getSeconds(),2)].join(":");
-var _cbb=_cb5.getTimezoneOffset();
-time+=(_cbb>0?"-":"+")+_(Math.floor(Math.abs(_cbb)/60),2)+":"+_(Math.abs(_cbb)%60,2);
-_cb8.push(time);
-}
-return _cb8.join("T");
-};
-dojo.date.fromRfc3339=function(_cbc){
-if(_cbc.indexOf("Tany")!=-1){
-_cbc=_cbc.replace("Tany","");
+var _cc5=[];
+if(_cc3!="timeOnly"){
+var date=[_(_cc2.getFullYear(),4),_(_cc2.getMonth()+1,2),_(_cc2.getDate(),2)].join("-");
+_cc5.push(date);
+}
+if(_cc3!="dateOnly"){
+var time=[_(_cc2.getHours(),2),_(_cc2.getMinutes(),2),_(_cc2.getSeconds(),2)].join(":");
+var _cc8=_cc2.getTimezoneOffset();
+time+=(_cc8>0?"-":"+")+_(Math.floor(Math.abs(_cc8)/60),2)+":"+_(Math.abs(_cc8)%60,2);
+_cc5.push(time);
+}
+return _cc5.join("T");
+};
+dojo.date.fromRfc3339=function(_cc9){
+if(_cc9.indexOf("Tany")!=-1){
+_cc9=_cc9.replace("Tany","");
 }
-var _cbd=new Date();
-return dojo.date.setIso8601(_cbd,_cbc);
+var _cca=new Date();
+return dojo.date.setIso8601(_cca,_cc9);
 };
 dojo.provide("dojo.date.common");
-dojo.date.setDayOfYear=function(_cbe,_cbf){
-_cbe.setMonth(0);
-_cbe.setDate(_cbf);
-return _cbe;
-};
-dojo.date.getDayOfYear=function(_cc0){
-var _cc1=_cc0.getFullYear();
-var _cc2=new Date(_cc1-1,11,31);
-return Math.floor((_cc0.getTime()-_cc2.getTime())/86400000);
+dojo.date.setDayOfYear=function(_ccb,_ccc){
+_ccb.setMonth(0);
+_ccb.setDate(_ccc);
+return _ccb;
+};
+dojo.date.getDayOfYear=function(_ccd){
+var _cce=_ccd.getFullYear();
+var _ccf=new Date(_cce-1,11,31);
+return Math.floor((_ccd.getTime()-_ccf.getTime())/86400000);
 };
-dojo.date.setWeekOfYear=function(_cc3,week,_cc5){
+dojo.date.setWeekOfYear=function(_cd0,week,_cd2){
 if(arguments.length==1){
-_cc5=0;
+_cd2=0;
 }
 dojo.unimplemented("dojo.date.setWeekOfYear");
 };
-dojo.date.getWeekOfYear=function(_cc6,_cc7){
+dojo.date.getWeekOfYear=function(_cd3,_cd4){
 if(arguments.length==1){
-_cc7=0;
+_cd4=0;
 }
-var _cc8=new Date(_cc6.getFullYear(),0,1);
-var day=_cc8.getDay();
-_cc8.setDate(_cc8.getDate()-day+_cc7-(day>_cc7?7:0));
-return Math.floor((_cc6.getTime()-_cc8.getTime())/604800000);
+var _cd5=new Date(_cd3.getFullYear(),0,1);
+var day=_cd5.getDay();
+_cd5.setDate(_cd5.getDate()-day+_cd4-(day>_cd4?7:0));
+return Math.floor((_cd3.getTime()-_cd5.getTime())/604800000);
 };
-dojo.date.setIsoWeekOfYear=function(_cca,week,_ccc){
+dojo.date.setIsoWeekOfYear=function(_cd7,week,_cd9){
 if(arguments.length==1){
-_ccc=1;
+_cd9=1;
 }
 dojo.unimplemented("dojo.date.setIsoWeekOfYear");
 };
-dojo.date.getIsoWeekOfYear=function(_ccd,_cce){
+dojo.date.getIsoWeekOfYear=function(_cda,_cdb){
 if(arguments.length==1){
-_cce=1;
+_cdb=1;
 }
 dojo.unimplemented("dojo.date.getIsoWeekOfYear");
 };
 dojo.date.shortTimezones=["IDLW","BET","HST","MART","AKST","PST","MST","CST","EST","AST","NFT","BST","FST","AT","GMT","CET","EET","MSK","IRT","GST","AFT","AGTT","IST","NPT","ALMT","MMT","JT","AWST","JST","ACST","AEST","LHST","VUT","NFT","NZT","CHAST","PHOT","LINT"];
 dojo.date.timezoneOffsets=[-720,-660,-600,-570,-540,-480,-420,-360,-300,-240,-210,-180,-120,-60,0,60,120,180,210,240,270,300,330,345,360,390,420,480,540,570,600,630,660,690,720,765,780,840];
-dojo.date.getDaysInMonth=function(_ccf){
-var _cd0=_ccf.getMonth();
+dojo.date.getDaysInMonth=function(_cdc){
+var _cdd=_cdc.getMonth();
 var days=[31,28,31,30,31,30,31,31,30,31,30,31];
-if(_cd0==1&&dojo.date.isLeapYear(_ccf)){
+if(_cdd==1&&dojo.date.isLeapYear(_cdc)){
 return 29;
 }else{
-return days[_cd0];
+return days[_cdd];
 }
 };
-dojo.date.isLeapYear=function(_cd2){
-var year=_cd2.getFullYear();
+dojo.date.isLeapYear=function(_cdf){
+var year=_cdf.getFullYear();
 return (year%400==0)?true:(year%100==0)?false:(year%4==0)?true:false;
 };
-dojo.date.getTimezoneName=function(_cd4){
-var str=_cd4.toString();
+dojo.date.getTimezoneName=function(_ce1){
+var str=_ce1.toString();
 var tz="";
-var _cd7;
+var _ce4;
 var pos=str.indexOf("(");
 if(pos>-1){
 pos++;
 tz=str.substring(pos,str.indexOf(")"));
 }else{
 var pat=/([A-Z\/]+) \d{4}$/;
-if((_cd7=str.match(pat))){
-tz=_cd7[1];
+if((_ce4=str.match(pat))){
+tz=_ce4[1];
 }else{
-str=_cd4.toLocaleString();
+str=_ce1.toLocaleString();
 pat=/ ([A-Z\/]+)$/;
-if((_cd7=str.match(pat))){
-tz=_cd7[1];
+if((_ce4=str.match(pat))){
+tz=_ce4[1];
 }
 }
 }
 return tz=="AM"||tz=="PM"?"":tz;
 };
-dojo.date.getOrdinal=function(_cda){
-var date=_cda.getDate();
+dojo.date.getOrdinal=function(_ce7){
+var date=_ce7.getDate();
 if(date%100!=11&&date%10==1){
 return "st";
 }else{
@@ -15372,12 +15418,12 @@
 }
 };
 dojo.date.compareTypes={DATE:1,TIME:2};
-dojo.date.compare=function(_cdc,_cdd,_cde){
-var dA=_cdc;
-var dB=_cdd||new Date();
+dojo.date.compare=function(_ce9,_cea,_ceb){
+var dA=_ce9;
+var dB=_cea||new Date();
 var now=new Date();
 with(dojo.date.compareTypes){
-var opt=_cde||(DATE|TIME);
+var opt=_ceb||(DATE|TIME);
 var d1=new Date((opt&DATE)?dA.getFullYear():now.getFullYear(),(opt&DATE)?dA.getMonth():now.getMonth(),(opt&DATE)?dA.getDate():now.getDate(),(opt&TIME)?dA.getHours():0,(opt&TIME)?dA.getMinutes():0,(opt&TIME)?dA.getSeconds():0);
 var d2=new Date((opt&DATE)?dB.getFullYear():now.getFullYear(),(opt&DATE)?dB.getMonth():now.getMonth(),(opt&DATE)?dB.getDate():now.getDate(),(opt&TIME)?dB.getHours():0,(opt&TIME)?dB.getMinutes():0,(opt&TIME)?dB.getSeconds():0);
 }
@@ -15390,7 +15436,7 @@
 return 0;
 };
 dojo.date.dateParts={YEAR:0,MONTH:1,DAY:2,HOUR:3,MINUTE:4,SECOND:5,MILLISECOND:6,QUARTER:7,WEEK:8,WEEKDAY:9};
-dojo.date.add=function(dt,_ce6,incr){
+dojo.date.add=function(dt,_cf3,incr){
 if(typeof dt=="number"){
 dt=new Date(dt);
 }
@@ -15401,7 +15447,7 @@
 }
 var sum=new Date(dt);
 with(dojo.date.dateParts){
-switch(_ce6){
+switch(_cf3){
 case YEAR:
 sum.setFullYear(dt.getFullYear()+incr);
 fixOvershoot();
@@ -15419,7 +15465,7 @@
 break;
 case WEEKDAY:
 var dat=dt.getDate();
-var _cea=0;
+var _cf7=0;
 var days=0;
 var strt=0;
 var trgt=0;
@@ -15427,10 +15473,10 @@
 var mod=incr%5;
 if(mod==0){
 days=(incr>0)?5:-5;
-_cea=(incr>0)?((incr-5)/5):((incr+5)/5);
+_cf7=(incr>0)?((incr-5)/5):((incr+5)/5);
 }else{
 days=mod;
-_cea=parseInt(incr/5);
+_cf7=parseInt(incr/5);
 }
 strt=dt.getDay();
 if(strt==6&&incr>0){
@@ -15444,7 +15490,7 @@
 if(trgt==0||trgt==6){
 adj=(incr>0)?2:-2;
 }
-sum.setDate(dat+(7*_cea)+days+adj);
+sum.setDate(dat+(7*_cf7)+days+adj);
 break;
 case HOUR:
 sum.setHours(sum.getHours()+incr);
@@ -15464,60 +15510,60 @@
 }
 return sum;
 };
-dojo.date.diff=function(dtA,dtB,_cf2){
+dojo.date.diff=function(dtA,dtB,_cff){
 if(typeof dtA=="number"){
 dtA=new Date(dtA);
 }
 if(typeof dtB=="number"){
 dtB=new Date(dtB);
 }
-var _cf3=dtB.getFullYear()-dtA.getFullYear();
-var _cf4=(dtB.getMonth()-dtA.getMonth())+(_cf3*12);
-var _cf5=dtB.getTime()-dtA.getTime();
-var _cf6=_cf5/1000;
-var _cf7=_cf6/60;
-var _cf8=_cf7/60;
-var _cf9=_cf8/24;
-var _cfa=_cf9/7;
-var _cfb=0;
+var _d00=dtB.getFullYear()-dtA.getFullYear();
+var _d01=(dtB.getMonth()-dtA.getMonth())+(_d00*12);
+var _d02=dtB.getTime()-dtA.getTime();
+var _d03=_d02/1000;
+var _d04=_d03/60;
+var _d05=_d04/60;
+var _d06=_d05/24;
+var _d07=_d06/7;
+var _d08=0;
 with(dojo.date.dateParts){
-switch(_cf2){
+switch(_cff){
 case YEAR:
-_cfb=_cf3;
+_d08=_d00;
 break;
 case QUARTER:
 var mA=dtA.getMonth();
 var mB=dtB.getMonth();
 var qA=Math.floor(mA/3)+1;
 var qB=Math.floor(mB/3)+1;
-qB+=(_cf3*4);
-_cfb=qB-qA;
+qB+=(_d00*4);
+_d08=qB-qA;
 break;
 case MONTH:
-_cfb=_cf4;
+_d08=_d01;
 break;
 case WEEK:
-_cfb=parseInt(_cfa);
+_d08=parseInt(_d07);
 break;
 case DAY:
-_cfb=_cf9;
+_d08=_d06;
 break;
 case WEEKDAY:
-var days=Math.round(_cf9);
-var _d01=parseInt(days/7);
+var days=Math.round(_d06);
+var _d0e=parseInt(days/7);
 var mod=days%7;
 if(mod==0){
-days=_d01*5;
+days=_d0e*5;
 }else{
 var adj=0;
 var aDay=dtA.getDay();
 var bDay=dtB.getDay();
-_d01=parseInt(days/7);
+_d0e=parseInt(days/7);
 mod=days%7;
-var _d06=new Date(dtA);
-_d06.setDate(_d06.getDate()+(_d01*7));
-var _d07=_d06.getDay();
-if(_cf9>0){
+var _d13=new Date(dtA);
+_d13.setDate(_d13.getDate()+(_d0e*7));
+var _d14=_d13.getDay();
+if(_d06>0){
 switch(true){
 case aDay==6:
 adj=-1;
@@ -15531,14 +15577,14 @@
 case bDay==0:
 adj=-2;
 break;
-case (_d07+mod)>5:
+case (_d14+mod)>5:
 adj=-2;
 break;
 default:
 break;
 }
 }else{
-if(_cf9<0){
+if(_d06<0){
 switch(true){
 case aDay==6:
 adj=0;
@@ -15552,7 +15598,7 @@
 case bDay==0:
 adj=1;
 break;
-case (_d07+mod)<0:
+case (_d14+mod)<0:
 adj=2;
 break;
 default:
@@ -15561,116 +15607,116 @@
 }
 }
 days+=adj;
-days-=(_d01*2);
+days-=(_d0e*2);
 }
-_cfb=days;
+_d08=days;
 break;
 case HOUR:
-_cfb=_cf8;
+_d08=_d05;
 break;
 case MINUTE:
-_cfb=_cf7;
+_d08=_d04;
 break;
 case SECOND:
-_cfb=_cf6;
+_d08=_d03;
 break;
 case MILLISECOND:
-_cfb=_cf5;
+_d08=_d02;
 break;
 default:
 break;
 }
 }
-return Math.round(_cfb);
+return Math.round(_d08);
 };
 dojo.provide("dojo.date.supplemental");
-dojo.date.getFirstDayOfWeek=function(_d08){
-var _d09={mv:5,ae:6,af:6,bh:6,dj:6,dz:6,eg:6,er:6,et:6,iq:6,ir:6,jo:6,ke:6,kw:6,lb:6,ly:6,ma:6,om:6,qa:6,sa:6,sd:6,so:6,tn:6,ye:6,as:0,au:0,az:0,bw:0,ca:0,cn:0,fo:0,ge:0,gl:0,gu:0,hk:0,ie:0,il:0,is:0,jm:0,jp:0,kg:0,kr:0,la:0,mh:0,mo:0,mp:0,mt:0,nz:0,ph:0,pk:0,sg:0,th:0,tt:0,tw:0,um:0,us:0,uz:0,vi:0,za:0,zw:0,et:0,mw:0,ng:0,tj:0,gb:0,sy:4};
-_d08=dojo.hostenv.normalizeLocale(_d08);
-var _d0a=_d08.split("-")[1];
-var dow=_d09[_d0a];
+dojo.date.getFirstDayOfWeek=function(_d15){
+var _d16={mv:5,ae:6,af:6,bh:6,dj:6,dz:6,eg:6,er:6,et:6,iq:6,ir:6,jo:6,ke:6,kw:6,lb:6,ly:6,ma:6,om:6,qa:6,sa:6,sd:6,so:6,tn:6,ye:6,as:0,au:0,az:0,bw:0,ca:0,cn:0,fo:0,ge:0,gl:0,gu:0,hk:0,ie:0,il:0,is:0,jm:0,jp:0,kg:0,kr:0,la:0,mh:0,mo:0,mp:0,mt:0,nz:0,ph:0,pk:0,sg:0,th:0,tt:0,tw:0,um:0,us:0,uz:0,vi:0,za:0,zw:0,et:0,mw:0,ng:0,tj:0,gb:0,sy:4};
+_d15=dojo.hostenv.normalizeLocale(_d15);
+var _d17=_d15.split("-")[1];
+var dow=_d16[_d17];
 return (typeof dow=="undefined")?1:dow;
 };
-dojo.date.getWeekend=function(_d0c){
-var _d0d={eg:5,il:5,sy:5,"in":0,ae:4,bh:4,dz:4,iq:4,jo:4,kw:4,lb:4,ly:4,ma:4,om:4,qa:4,sa:4,sd:4,tn:4,ye:4};
-var _d0e={ae:5,bh:5,dz:5,iq:5,jo:5,kw:5,lb:5,ly:5,ma:5,om:5,qa:5,sa:5,sd:5,tn:5,ye:5,af:5,ir:5,eg:6,il:6,sy:6};
-_d0c=dojo.hostenv.normalizeLocale(_d0c);
-var _d0f=_d0c.split("-")[1];
-var _d10=_d0d[_d0f];
-var end=_d0e[_d0f];
-if(typeof _d10=="undefined"){
-_d10=6;
+dojo.date.getWeekend=function(_d19){
+var _d1a={eg:5,il:5,sy:5,"in":0,ae:4,bh:4,dz:4,iq:4,jo:4,kw:4,lb:4,ly:4,ma:4,om:4,qa:4,sa:4,sd:4,tn:4,ye:4};
+var _d1b={ae:5,bh:5,dz:5,iq:5,jo:5,kw:5,lb:5,ly:5,ma:5,om:5,qa:5,sa:5,sd:5,tn:5,ye:5,af:5,ir:5,eg:6,il:6,sy:6};
+_d19=dojo.hostenv.normalizeLocale(_d19);
+var _d1c=_d19.split("-")[1];
+var _d1d=_d1a[_d1c];
+var end=_d1b[_d1c];
+if(typeof _d1d=="undefined"){
+_d1d=6;
 }
 if(typeof end=="undefined"){
 end=0;
 }
-return {start:_d10,end:end};
+return {start:_d1d,end:end};
 };
-dojo.date.isWeekend=function(_d12,_d13){
-var _d14=dojo.date.getWeekend(_d13);
-var day=(_d12||new Date()).getDay();
-if(_d14.end<_d14.start){
-_d14.end+=7;
-if(day<_d14.start){
+dojo.date.isWeekend=function(_d1f,_d20){
+var _d21=dojo.date.getWeekend(_d20);
+var day=(_d1f||new Date()).getDay();
+if(_d21.end<_d21.start){
+_d21.end+=7;
+if(day<_d21.start){
 day+=7;
 }
 }
-return day>=_d14.start&&day<=_d14.end;
+return day>=_d21.start&&day<=_d21.end;
 };
 dojo.provide("dojo.i18n.common");
-dojo.i18n.getLocalization=function(_d16,_d17,_d18){
+dojo.i18n.getLocalization=function(_d23,_d24,_d25){
 dojo.hostenv.preloadLocalizations();
-_d18=dojo.hostenv.normalizeLocale(_d18);
-var _d19=_d18.split("-");
-var _d1a=[_d16,"nls",_d17].join(".");
-var _d1b=dojo.hostenv.findModule(_d1a,true);
-var _d1c;
-for(var i=_d19.length;i>0;i--){
-var loc=_d19.slice(0,i).join("_");
-if(_d1b[loc]){
-_d1c=_d1b[loc];
+_d25=dojo.hostenv.normalizeLocale(_d25);
+var _d26=_d25.split("-");
+var _d27=[_d23,"nls",_d24].join(".");
+var _d28=dojo.hostenv.findModule(_d27,true);
+var _d29;
+for(var i=_d26.length;i>0;i--){
+var loc=_d26.slice(0,i).join("_");
+if(_d28[loc]){
+_d29=_d28[loc];
 break;
 }
 }
-if(!_d1c){
-_d1c=_d1b.ROOT;
+if(!_d29){
+_d29=_d28.ROOT;
 }
-if(_d1c){
-var _d1f=function(){
+if(_d29){
+var _d2c=function(){
 };
-_d1f.prototype=_d1c;
-return new _d1f();
+_d2c.prototype=_d29;
+return new _d2c();
 }
-dojo.raise("Bundle not found: "+_d17+" in "+_d16+" , locale="+_d18);
+dojo.raise("Bundle not found: "+_d24+" in "+_d23+" , locale="+_d25);
 };
-dojo.i18n.isLTR=function(_d20){
-var lang=dojo.hostenv.normalizeLocale(_d20).split("-")[0];
+dojo.i18n.isLTR=function(_d2d){
+var lang=dojo.hostenv.normalizeLocale(_d2d).split("-")[0];
 var RTL={ar:true,fa:true,he:true,ur:true,yi:true};
 return !RTL[lang];
 };
 dojo.provide("dojo.date.format");
 (function(){
-dojo.date.format=function(_d23,_d24){
-if(typeof _d24=="string"){
+dojo.date.format=function(_d30,_d31){
+if(typeof _d31=="string"){
 dojo.deprecated("dojo.date.format","To format dates with POSIX-style strings, please use dojo.date.strftime instead","0.5");
-return dojo.date.strftime(_d23,_d24);
+return dojo.date.strftime(_d30,_d31);
 }
-function formatPattern(_d25,_d26){
-return _d26.replace(/([a-z])\1*/ig,function(_d27){
+function formatPattern(_d32,_d33){
+return _d33.replace(/([a-z])\1*/ig,function(_d34){
 var s;
-var c=_d27.charAt(0);
-var l=_d27.length;
+var c=_d34.charAt(0);
+var l=_d34.length;
 var pad;
-var _d2c=["abbr","wide","narrow"];
+var _d39=["abbr","wide","narrow"];
 switch(c){
 case "G":
 if(l>3){
 dojo.unimplemented("Era format not implemented");
 }
-s=info.eras[_d25.getFullYear()<0?1:0];
+s=info.eras[_d32.getFullYear()<0?1:0];
 break;
 case "y":
-s=_d25.getFullYear();
+s=_d32.getFullYear();
 switch(l){
 case 1:
 break;
@@ -15683,7 +15729,7 @@
 break;
 case "Q":
 case "q":
-s=Math.ceil((_d25.getMonth()+1)/3);
+s=Math.ceil((_d32.getMonth()+1)/3);
 switch(l){
 case 1:
 case 2:
@@ -15696,8 +15742,8 @@
 break;
 case "M":
 case "L":
-var m=_d25.getMonth();
-var _d2f;
+var m=_d32.getMonth();
+var _d3c;
 switch(l){
 case 1:
 case 2:
@@ -15707,39 +15753,39 @@
 case 3:
 case 4:
 case 5:
-_d2f=_d2c[l-3];
+_d3c=_d39[l-3];
 break;
 }
-if(_d2f){
+if(_d3c){
 var type=(c=="L")?"standalone":"format";
-var prop=["months",type,_d2f].join("-");
+var prop=["months",type,_d3c].join("-");
 s=info[prop][m];
 }
 break;
 case "w":
-var _d32=0;
-s=dojo.date.getWeekOfYear(_d25,_d32);
+var _d3f=0;
+s=dojo.date.getWeekOfYear(_d32,_d3f);
 pad=true;
 break;
 case "d":
-s=_d25.getDate();
+s=_d32.getDate();
 pad=true;
 break;
 case "D":
-s=dojo.date.getDayOfYear(_d25);
+s=dojo.date.getDayOfYear(_d32);
 pad=true;
 break;
 case "E":
 case "e":
 case "c":
-var d=_d25.getDay();
-var _d2f;
+var d=_d32.getDay();
+var _d3c;
 switch(l){
 case 1:
 case 2:
 if(c=="e"){
-var _d34=dojo.date.getFirstDayOfWeek(_d24.locale);
-d=(d-_d34+7)%7;
+var _d41=dojo.date.getFirstDayOfWeek(_d31.locale);
+d=(d-_d41+7)%7;
 }
 if(c!="c"){
 s=d+1;
@@ -15749,24 +15795,24 @@
 case 3:
 case 4:
 case 5:
-_d2f=_d2c[l-3];
+_d3c=_d39[l-3];
 break;
 }
-if(_d2f){
+if(_d3c){
 var type=(c=="c")?"standalone":"format";
-var prop=["days",type,_d2f].join("-");
+var prop=["days",type,_d3c].join("-");
 s=info[prop][d];
 }
 break;
 case "a":
-var _d35=(_d25.getHours()<12)?"am":"pm";
-s=info[_d35];
+var _d42=(_d32.getHours()<12)?"am":"pm";
+s=info[_d42];
 break;
 case "h":
 case "H":
 case "K":
 case "k":
-var h=_d25.getHours();
+var h=_d32.getHours();
 switch(c){
 case "h":
 s=(h%12)||12;
@@ -15784,26 +15830,26 @@
 pad=true;
 break;
 case "m":
-s=_d25.getMinutes();
+s=_d32.getMinutes();
 pad=true;
 break;
 case "s":
-s=_d25.getSeconds();
+s=_d32.getSeconds();
 pad=true;
 break;
 case "S":
-s=Math.round(_d25.getMilliseconds()*Math.pow(10,l-3));
+s=Math.round(_d32.getMilliseconds()*Math.pow(10,l-3));
 break;
 case "v":
 case "z":
-s=dojo.date.getTimezoneName(_d25);
+s=dojo.date.getTimezoneName(_d32);
 if(s){
 break;
 }
 l=4;
 case "Z":
-var _d37=_d25.getTimezoneOffset();
-var tz=[(_d37<=0?"+":"-"),dojo.string.pad(Math.floor(Math.abs(_d37)/60),2),dojo.string.pad(Math.abs(_d37)%60,2)];
+var _d44=_d32.getTimezoneOffset();
+var tz=[(_d44<=0?"+":"-"),dojo.string.pad(Math.floor(Math.abs(_d44)/60),2),dojo.string.pad(Math.abs(_d44)%60,2)];
 if(l==4){
 tz.splice(0,0,"GMT");
 tz.splice(3,0,":");
@@ -15816,11 +15862,11 @@
 case "F":
 case "g":
 case "A":
-dojo.debug(_d27+" modifier not yet implemented");
+dojo.debug(_d34+" modifier not yet implemented");
 s="?";
 break;
 default:
-dojo.raise("dojo.date.format: invalid pattern char: "+_d26);
+dojo.raise("dojo.date.format: invalid pattern char: "+_d33);
 }
 if(pad){
 s=dojo.string.pad(s,l);
@@ -15828,126 +15874,126 @@
 return s;
 });
 }
-_d24=_d24||{};
-var _d39=dojo.hostenv.normalizeLocale(_d24.locale);
-var _d3a=_d24.formatLength||"full";
-var info=dojo.date._getGregorianBundle(_d39);
+_d31=_d31||{};
+var _d46=dojo.hostenv.normalizeLocale(_d31.locale);
+var _d47=_d31.formatLength||"full";
+var info=dojo.date._getGregorianBundle(_d46);
 var str=[];
-var _d3c=dojo.lang.curry(this,formatPattern,_d23);
-if(_d24.selector!="timeOnly"){
-var _d3d=_d24.datePattern||info["dateFormat-"+_d3a];
-if(_d3d){
-str.push(_processPattern(_d3d,_d3c));
-}
-}
-if(_d24.selector!="dateOnly"){
-var _d3e=_d24.timePattern||info["timeFormat-"+_d3a];
-if(_d3e){
-str.push(_processPattern(_d3e,_d3c));
-}
-}
-var _d3f=str.join(" ");
-return _d3f;
-};
-dojo.date.parse=function(_d40,_d41){
-_d41=_d41||{};
-var _d42=dojo.hostenv.normalizeLocale(_d41.locale);
-var info=dojo.date._getGregorianBundle(_d42);
-var _d44=_d41.formatLength||"full";
-if(!_d41.selector){
-_d41.selector="dateOnly";
-}
-var _d45=_d41.datePattern||info["dateFormat-"+_d44];
-var _d46=_d41.timePattern||info["timeFormat-"+_d44];
-var _d47;
-if(_d41.selector=="dateOnly"){
-_d47=_d45;
+var _d49=dojo.lang.curry(this,formatPattern,_d30);
+if(_d31.selector!="timeOnly"){
+var _d4a=_d31.datePattern||info["dateFormat-"+_d47];
+if(_d4a){
+str.push(_processPattern(_d4a,_d49));
+}
+}
+if(_d31.selector!="dateOnly"){
+var _d4b=_d31.timePattern||info["timeFormat-"+_d47];
+if(_d4b){
+str.push(_processPattern(_d4b,_d49));
+}
+}
+var _d4c=str.join(" ");
+return _d4c;
+};
+dojo.date.parse=function(_d4d,_d4e){
+_d4e=_d4e||{};
+var _d4f=dojo.hostenv.normalizeLocale(_d4e.locale);
+var info=dojo.date._getGregorianBundle(_d4f);
+var _d51=_d4e.formatLength||"full";
+if(!_d4e.selector){
+_d4e.selector="dateOnly";
+}
+var _d52=_d4e.datePattern||info["dateFormat-"+_d51];
+var _d53=_d4e.timePattern||info["timeFormat-"+_d51];
+var _d54;
+if(_d4e.selector=="dateOnly"){
+_d54=_d52;
 }else{
-if(_d41.selector=="timeOnly"){
-_d47=_d46;
+if(_d4e.selector=="timeOnly"){
+_d54=_d53;
 }else{
-if(_d41.selector=="dateTime"){
-_d47=_d45+" "+_d46;
+if(_d4e.selector=="dateTime"){
+_d54=_d52+" "+_d53;
 }else{
-var msg="dojo.date.parse: Unknown selector param passed: '"+_d41.selector+"'.";
+var msg="dojo.date.parse: Unknown selector param passed: '"+_d4e.selector+"'.";
 msg+=" Defaulting to date pattern.";
 dojo.debug(msg);
-_d47=_d45;
+_d54=_d52;
 }
 }
 }
-var _d49=[];
-var _d4a=_processPattern(_d47,dojo.lang.curry(this,_buildDateTimeRE,_d49,info,_d41));
-var _d4b=new RegExp("^"+_d4a+"$");
-var _d4c=_d4b.exec(_d40);
-if(!_d4c){
+var _d56=[];
+var _d57=_processPattern(_d54,dojo.lang.curry(this,_buildDateTimeRE,_d56,info,_d4e));
+var _d58=new RegExp("^"+_d57+"$");
+var _d59=_d58.exec(_d4d);
+if(!_d59){
 return null;
 }
-var _d4d=["abbr","wide","narrow"];
-var _d4e=new Date(1972,0);
-var _d4f={};
-for(var i=1;i<_d4c.length;i++){
-var grp=_d49[i-1];
+var _d5a=["abbr","wide","narrow"];
+var _d5b=new Date(1972,0);
+var _d5c={};
+for(var i=1;i<_d59.length;i++){
+var grp=_d56[i-1];
 var l=grp.length;
-var v=_d4c[i];
+var v=_d59[i];
 switch(grp.charAt(0)){
 case "y":
 if(l!=2){
-_d4e.setFullYear(v);
-_d4f.year=v;
+_d5b.setFullYear(v);
+_d5c.year=v;
 }else{
 if(v<100){
 v=Number(v);
 var year=""+new Date().getFullYear();
-var _d55=year.substring(0,2)*100;
-var _d56=Number(year.substring(2,4));
-var _d57=Math.min(_d56+20,99);
-var num=(v<_d57)?_d55+v:_d55-100+v;
-_d4e.setFullYear(num);
-_d4f.year=num;
+var _d62=year.substring(0,2)*100;
+var _d63=Number(year.substring(2,4));
+var _d64=Math.min(_d63+20,99);
+var num=(v<_d64)?_d62+v:_d62-100+v;
+_d5b.setFullYear(num);
+_d5c.year=num;
 }else{
-if(_d41.strict){
+if(_d4e.strict){
 return null;
 }
-_d4e.setFullYear(v);
-_d4f.year=v;
+_d5b.setFullYear(v);
+_d5c.year=v;
 }
 }
 break;
 case "M":
 if(l>2){
-if(!_d41.strict){
+if(!_d4e.strict){
 v=v.replace(/\./g,"");
 v=v.toLowerCase();
 }
-var _d59=info["months-format-"+_d4d[l-3]].concat();
-for(var j=0;j<_d59.length;j++){
-if(!_d41.strict){
-_d59[j]=_d59[j].toLowerCase();
+var _d66=info["months-format-"+_d5a[l-3]].concat();
+for(var j=0;j<_d66.length;j++){
+if(!_d4e.strict){
+_d66[j]=_d66[j].toLowerCase();
 }
-if(v==_d59[j]){
-_d4e.setMonth(j);
-_d4f.month=j;
+if(v==_d66[j]){
+_d5b.setMonth(j);
+_d5c.month=j;
 break;
 }
 }
-if(j==_d59.length){
+if(j==_d66.length){
 dojo.debug("dojo.date.parse: Could not parse month name: '"+v+"'.");
 return null;
 }
 }else{
-_d4e.setMonth(v-1);
-_d4f.month=v-1;
+_d5b.setMonth(v-1);
+_d5c.month=v-1;
 }
 break;
 case "E":
 case "e":
-if(!_d41.strict){
+if(!_d4e.strict){
 v=v.toLowerCase();
 }
-var days=info["days-format-"+_d4d[l-3]].concat();
+var days=info["days-format-"+_d5a[l-3]].concat();
 for(var j=0;j<days.length;j++){
-if(!_d41.strict){
+if(!_d4e.strict){
 days[j]=days[j].toLowerCase();
 }
 if(v==days[j]){
@@ -15960,27 +16006,27 @@
 }
 break;
 case "d":
-_d4e.setDate(v);
-_d4f.date=v;
+_d5b.setDate(v);
+_d5c.date=v;
 break;
 case "a":
-var am=_d41.am||info.am;
-var pm=_d41.pm||info.pm;
-if(!_d41.strict){
+var am=_d4e.am||info.am;
+var pm=_d4e.pm||info.pm;
+if(!_d4e.strict){
 v=v.replace(/\./g,"").toLowerCase();
 am=am.replace(/\./g,"").toLowerCase();
 pm=pm.replace(/\./g,"").toLowerCase();
 }
-if(_d41.strict&&v!=am&&v!=pm){
+if(_d4e.strict&&v!=am&&v!=pm){
 dojo.debug("dojo.date.parse: Could not parse am/pm part.");
 return null;
 }
-var _d5e=_d4e.getHours();
-if(v==pm&&_d5e<12){
-_d4e.setHours(_d5e+12);
+var _d6b=_d5b.getHours();
+if(v==pm&&_d6b<12){
+_d5b.setHours(_d6b+12);
 }else{
-if(v==am&&_d5e==12){
-_d4e.setHours(0);
+if(v==am&&_d6b==12){
+_d5b.setHours(0);
 }
 }
 break;
@@ -15995,59 +16041,59 @@
 dojo.debug("dojo.date.parse: Illegal hours value");
 return null;
 }
-_d4e.setHours(v);
+_d5b.setHours(v);
 break;
 case "m":
-_d4e.setMinutes(v);
+_d5b.setMinutes(v);
 break;
 case "s":
-_d4e.setSeconds(v);
+_d5b.setSeconds(v);
 break;
 case "S":
-_d4e.setMilliseconds(v);
+_d5b.setMilliseconds(v);
 break;
 default:
 dojo.unimplemented("dojo.date.parse: unsupported pattern char="+grp.charAt(0));
 }
 }
-if(_d4f.year&&_d4e.getFullYear()!=_d4f.year){
-dojo.debug("Parsed year: '"+_d4e.getFullYear()+"' did not match input year: '"+_d4f.year+"'.");
+if(_d5c.year&&_d5b.getFullYear()!=_d5c.year){
+dojo.debug("Parsed year: '"+_d5b.getFullYear()+"' did not match input year: '"+_d5c.year+"'.");
 return null;
 }
-if(_d4f.month&&_d4e.getMonth()!=_d4f.month){
-dojo.debug("Parsed month: '"+_d4e.getMonth()+"' did not match input month: '"+_d4f.month+"'.");
+if(_d5c.month&&_d5b.getMonth()!=_d5c.month){
+dojo.debug("Parsed month: '"+_d5b.getMonth()+"' did not match input month: '"+_d5c.month+"'.");
 return null;
 }
-if(_d4f.date&&_d4e.getDate()!=_d4f.date){
-dojo.debug("Parsed day of month: '"+_d4e.getDate()+"' did not match input day of month: '"+_d4f.date+"'.");
+if(_d5c.date&&_d5b.getDate()!=_d5c.date){
+dojo.debug("Parsed day of month: '"+_d5b.getDate()+"' did not match input day of month: '"+_d5c.date+"'.");
 return null;
 }
-return _d4e;
+return _d5b;
 };
-function _processPattern(_d5f,_d60,_d61,_d62){
-var _d63=function(x){
+function _processPattern(_d6c,_d6d,_d6e,_d6f){
+var _d70=function(x){
 return x;
 };
-_d60=_d60||_d63;
-_d61=_d61||_d63;
-_d62=_d62||_d63;
-var _d65=_d5f.match(/(''|[^'])+/g);
-var _d66=false;
-for(var i=0;i<_d65.length;i++){
-if(!_d65[i]){
-_d65[i]="";
+_d6d=_d6d||_d70;
+_d6e=_d6e||_d70;
+_d6f=_d6f||_d70;
+var _d72=_d6c.match(/(''|[^'])+/g);
+var _d73=false;
+for(var i=0;i<_d72.length;i++){
+if(!_d72[i]){
+_d72[i]="";
 }else{
-_d65[i]=(_d66?_d61:_d60)(_d65[i]);
-_d66=!_d66;
+_d72[i]=(_d73?_d6e:_d6d)(_d72[i]);
+_d73=!_d73;
 }
 }
-return _d62(_d65.join(""));
+return _d6f(_d72.join(""));
 }
-function _buildDateTimeRE(_d68,info,_d6a,_d6b){
-return _d6b.replace(/([a-z])\1*/ig,function(_d6c){
+function _buildDateTimeRE(_d75,info,_d77,_d78){
+return _d78.replace(/([a-z])\1*/ig,function(_d79){
 var s;
-var c=_d6c.charAt(0);
-var l=_d6c.length;
+var c=_d79.charAt(0);
+var l=_d79.length;
 switch(c){
 case "y":
 s="\\d"+((l==2)?"{2,4}":"+");
@@ -16075,9 +16121,9 @@
 s="\\d{1,3}";
 break;
 case "a":
-var am=_d6a.am||info.am||"AM";
-var pm=_d6a.pm||info.pm||"PM";
-if(_d6a.strict){
+var am=_d77.am||info.am||"AM";
+var pm=_d77.pm||info.pm||"PM";
+if(_d77.strict){
 s=am+"|"+pm;
 }else{
 s=am;
@@ -16087,50 +16133,50 @@
 }
 break;
 default:
-dojo.unimplemented("parse of date format, pattern="+_d6b);
+dojo.unimplemented("parse of date format, pattern="+_d78);
 }
-if(_d68){
-_d68.push(_d6c);
+if(_d75){
+_d75.push(_d79);
 }
 return "\\s*("+s+")\\s*";
 });
 }
 })();
-dojo.date.strftime=function(_d72,_d73,_d74){
-var _d75=null;
+dojo.date.strftime=function(_d7f,_d80,_d81){
+var _d82=null;
 function _(s,n){
-return dojo.string.pad(s,n||2,_d75||"0");
+return dojo.string.pad(s,n||2,_d82||"0");
 }
-var info=dojo.date._getGregorianBundle(_d74);
-function $(_d79){
-switch(_d79){
+var info=dojo.date._getGregorianBundle(_d81);
+function $(_d86){
+switch(_d86){
 case "a":
-return dojo.date.getDayShortName(_d72,_d74);
+return dojo.date.getDayShortName(_d7f,_d81);
 case "A":
-return dojo.date.getDayName(_d72,_d74);
+return dojo.date.getDayName(_d7f,_d81);
 case "b":
 case "h":
-return dojo.date.getMonthShortName(_d72,_d74);
+return dojo.date.getMonthShortName(_d7f,_d81);
 case "B":
-return dojo.date.getMonthName(_d72,_d74);
+return dojo.date.getMonthName(_d7f,_d81);
 case "c":
-return dojo.date.format(_d72,{locale:_d74});
+return dojo.date.format(_d7f,{locale:_d81});
 case "C":
-return _(Math.floor(_d72.getFullYear()/100));
+return _(Math.floor(_d7f.getFullYear()/100));
 case "d":
-return _(_d72.getDate());
+return _(_d7f.getDate());
 case "D":
 return $("m")+"/"+$("d")+"/"+$("y");
 case "e":
-if(_d75==null){
-_d75=" ";
+if(_d82==null){
+_d82=" ";
 }
-return _(_d72.getDate());
+return _(_d7f.getDate());
 case "f":
-if(_d75==null){
-_d75=" ";
+if(_d82==null){
+_d82=" ";
 }
-return _(_d72.getMonth()+1);
+return _(_d7f.getMonth()+1);
 case "g":
 break;
 case "G":
@@ -16139,171 +16185,171 @@
 case "F":
 return $("Y")+"-"+$("m")+"-"+$("d");
 case "H":
-return _(_d72.getHours());
+return _(_d7f.getHours());
 case "I":
-return _(_d72.getHours()%12||12);
+return _(_d7f.getHours()%12||12);
 case "j":
-return _(dojo.date.getDayOfYear(_d72),3);
+return _(dojo.date.getDayOfYear(_d7f),3);
 case "k":
-if(_d75==null){
-_d75=" ";
+if(_d82==null){
+_d82=" ";
 }
-return _(_d72.getHours());
+return _(_d7f.getHours());
 case "l":
-if(_d75==null){
-_d75=" ";
+if(_d82==null){
+_d82=" ";
 }
-return _(_d72.getHours()%12||12);
+return _(_d7f.getHours()%12||12);
 case "m":
-return _(_d72.getMonth()+1);
+return _(_d7f.getMonth()+1);
 case "M":
-return _(_d72.getMinutes());
+return _(_d7f.getMinutes());
 case "n":
 return "\n";
 case "p":
-return info[_d72.getHours()<12?"am":"pm"];
+return info[_d7f.getHours()<12?"am":"pm"];
 case "r":
 return $("I")+":"+$("M")+":"+$("S")+" "+$("p");
 case "R":
 return $("H")+":"+$("M");
 case "S":
-return _(_d72.getSeconds());
+return _(_d7f.getSeconds());
 case "t":
 return "\t";
 case "T":
 return $("H")+":"+$("M")+":"+$("S");
 case "u":
-return String(_d72.getDay()||7);
+return String(_d7f.getDay()||7);
 case "U":
-return _(dojo.date.getWeekOfYear(_d72));
+return _(dojo.date.getWeekOfYear(_d7f));
 case "V":
-return _(dojo.date.getIsoWeekOfYear(_d72));
+return _(dojo.date.getIsoWeekOfYear(_d7f));
 case "W":
-return _(dojo.date.getWeekOfYear(_d72,1));
+return _(dojo.date.getWeekOfYear(_d7f,1));
 case "w":
-return String(_d72.getDay());
+return String(_d7f.getDay());
 case "x":
-return dojo.date.format(_d72,{selector:"dateOnly",locale:_d74});
+return dojo.date.format(_d7f,{selector:"dateOnly",locale:_d81});
 case "X":
-return dojo.date.format(_d72,{selector:"timeOnly",locale:_d74});
+return dojo.date.format(_d7f,{selector:"timeOnly",locale:_d81});
 case "y":
-return _(_d72.getFullYear()%100);
+return _(_d7f.getFullYear()%100);
 case "Y":
-return String(_d72.getFullYear());
+return String(_d7f.getFullYear());
 case "z":
-var _d7a=_d72.getTimezoneOffset();
-return (_d7a>0?"-":"+")+_(Math.floor(Math.abs(_d7a)/60))+":"+_(Math.abs(_d7a)%60);
+var _d87=_d7f.getTimezoneOffset();
+return (_d87>0?"-":"+")+_(Math.floor(Math.abs(_d87)/60))+":"+_(Math.abs(_d87)%60);
 case "Z":
-return dojo.date.getTimezoneName(_d72);
+return dojo.date.getTimezoneName(_d7f);
 case "%":
 return "%";
 }
 }
-var _d7b="";
+var _d88="";
 var i=0;
-var _d7d=0;
-var _d7e=null;
-while((_d7d=_d73.indexOf("%",i))!=-1){
-_d7b+=_d73.substring(i,_d7d++);
-switch(_d73.charAt(_d7d++)){
+var _d8a=0;
+var _d8b=null;
+while((_d8a=_d80.indexOf("%",i))!=-1){
+_d88+=_d80.substring(i,_d8a++);
+switch(_d80.charAt(_d8a++)){
 case "_":
-_d75=" ";
+_d82=" ";
 break;
 case "-":
-_d75="";
+_d82="";
 break;
 case "0":
-_d75="0";
+_d82="0";
 break;
 case "^":
-_d7e="upper";
+_d8b="upper";
 break;
 case "*":
-_d7e="lower";
+_d8b="lower";
 break;
 case "#":
-_d7e="swap";
+_d8b="swap";
 break;
 default:
-_d75=null;
-_d7d--;
+_d82=null;
+_d8a--;
 break;
 }
-var _d7f=$(_d73.charAt(_d7d++));
-switch(_d7e){
+var _d8c=$(_d80.charAt(_d8a++));
+switch(_d8b){
 case "upper":
-_d7f=_d7f.toUpperCase();
+_d8c=_d8c.toUpperCase();
 break;
 case "lower":
-_d7f=_d7f.toLowerCase();
+_d8c=_d8c.toLowerCase();
 break;
 case "swap":
-var _d80=_d7f.toLowerCase();
-var _d81="";
+var _d8d=_d8c.toLowerCase();
+var _d8e="";
 var j=0;
 var ch="";
-while(j<_d7f.length){
-ch=_d7f.charAt(j);
-_d81+=(ch==_d80.charAt(j))?ch.toUpperCase():ch.toLowerCase();
+while(j<_d8c.length){
+ch=_d8c.charAt(j);
+_d8e+=(ch==_d8d.charAt(j))?ch.toUpperCase():ch.toLowerCase();
 j++;
 }
-_d7f=_d81;
+_d8c=_d8e;
 break;
 default:
 break;
 }
-_d7e=null;
-_d7b+=_d7f;
-i=_d7d;
+_d8b=null;
+_d88+=_d8c;
+i=_d8a;
 }
-_d7b+=_d73.substring(i);
-return _d7b;
+_d88+=_d80.substring(i);
+return _d88;
 };
 (function(){
-var _d84=[];
-dojo.date.addCustomFormats=function(_d85,_d86){
-_d84.push({pkg:_d85,name:_d86});
-};
-dojo.date._getGregorianBundle=function(_d87){
-var _d88={};
-dojo.lang.forEach(_d84,function(desc){
-var _d8a=dojo.i18n.getLocalization(desc.pkg,desc.name,_d87);
-_d88=dojo.lang.mixin(_d88,_d8a);
+var _d91=[];
+dojo.date.addCustomFormats=function(_d92,_d93){
+_d91.push({pkg:_d92,name:_d93});
+};
+dojo.date._getGregorianBundle=function(_d94){
+var _d95={};
+dojo.lang.forEach(_d91,function(desc){
+var _d97=dojo.i18n.getLocalization(desc.pkg,desc.name,_d94);
+_d95=dojo.lang.mixin(_d95,_d97);
 },this);
-return _d88;
+return _d95;
 };
 })();
 dojo.date.addCustomFormats("dojo.i18n.calendar","gregorian");
 dojo.date.addCustomFormats("dojo.i18n.calendar","gregorianExtras");
-dojo.date.getNames=function(item,type,use,_d8e){
-var _d8f;
-var _d90=dojo.date._getGregorianBundle(_d8e);
-var _d91=[item,use,type];

[... 2388 lines stripped ...]