You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@struts.apache.org by mu...@apache.org on 2007/04/29 20:53:09 UTC
svn commit: r533543 - in
/struts/struts2/trunk/plugins/dojo/src/main/resources/org/apache/struts2/static/dojo:
struts/widget/ComboBox.js struts_dojo.js struts_dojo.js.uncompressed.js
Author: musachy
Date: Sun Apr 29 11:53:08 2007
New Revision: 533543
URL: http://svn.apache.org/viewvc?view=rev&rev=533543
Log:
Improve how the autocompleter gets the data from the JSON response
Modified:
struts/struts2/trunk/plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/struts/widget/ComboBox.js
struts/struts2/trunk/plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/struts_dojo.js
struts/struts2/trunk/plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/struts_dojo.js.uncompressed.js
Modified: struts/struts2/trunk/plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/struts/widget/ComboBox.js
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/struts/widget/ComboBox.js?view=diff&rev=533543&r1=533542&r2=533543
==============================================================================
--- struts/struts2/trunk/plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/struts/widget/ComboBox.js (original)
+++ struts/struts2/trunk/plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/struts/widget/ComboBox.js Sun Apr 29 11:53:08 2007
@@ -53,17 +53,25 @@
}
} else {
//try to find a match
+ var tmpArrData = [];
for(var key in data){
//does it start with the field name? take it
if(dojo.string.startsWith(key, this.cbox.name)) {
arrData = data[key];
break;
+ } else {
+ //if nathing else is found, we will use values in this
+ //object as the data
+ tmpArrData.push([data[key], key]);
}
//grab the first array found, we will use it if nothing else
//is found
- if(!arrData && dojo.lang.isArray(data[key])) {
+ if(!arrData && dojo.lang.isArray(data[key]) && !dojo.lang.isString(data[key])) {
arrData = data[key];
}
+ }
+ if(!arrData) {
+ arrData = tmpArrData;
}
}
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=533543&r1=533542&r2=533543
==============================================================================
--- 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 Apr 29 11:53:08 2007
@@ -14839,29 +14839,35 @@
}
}
}else{
+var _c60=[];
for(var key in data){
if(dojo.string.startsWith(key,this.cbox.name)){
_c5d=data[key];
break;
+}else{
+_c60.push([data[key],key]);
}
-if(!_c5d&&dojo.lang.isArray(data[key])){
+if(!_c5d&&dojo.lang.isArray(data[key])&&!dojo.lang.isString(data[key])){
_c5d=data[key];
}
}
+if(!_c5d){
+_c5d=_c60;
+}
}
data=_c5d;
}
this.setData(data);
}),mimetype:"text/json"});
};
-this.startSearch=function(_c60,_c61){
-this._preformSearch(_c60,_c61);
+this.startSearch=function(_c61,_c62){
+this._preformSearch(_c61,_c62);
};
-this._preformSearch=function(_c62,_c63){
+this._preformSearch=function(_c63,_c64){
var st=this.searchType;
var ret=[];
if(!this.caseSensitive){
-_c62=_c62.toLowerCase();
+_c63=_c63.toLowerCase();
}
for(var x=0;x<this.data.length;x++){
if(!this.data[x]){
@@ -14870,37 +14876,37 @@
if((this.searchLimit>0)&&(ret.length>=this.searchLimit)){
break;
}
-var _c67=new String((!this.caseSensitive)?this.data[x][0].toLowerCase():this.data[x][0]);
-if(_c67.length<_c62.length){
+var _c68=new String((!this.caseSensitive)?this.data[x][0].toLowerCase():this.data[x][0]);
+if(_c68.length<_c63.length){
continue;
}
if(st=="STARTSTRING"){
-if(_c62==_c67.substr(0,_c62.length)){
+if(_c63==_c68.substr(0,_c63.length)){
ret.push(this.data[x]);
}
}else{
if(st=="SUBSTRING"){
-if(_c67.indexOf(_c62)>=0){
+if(_c68.indexOf(_c63)>=0){
ret.push(this.data[x]);
}
}else{
if(st=="STARTWORD"){
-var idx=_c67.indexOf(_c62);
+var idx=_c68.indexOf(_c63);
if(idx==0){
ret.push(this.data[x]);
}
if(idx<=0){
continue;
}
-var _c69=false;
+var _c6a=false;
while(idx!=-1){
-if(" ,/(".indexOf(_c67.charAt(idx-1))!=-1){
-_c69=true;
+if(" ,/(".indexOf(_c68.charAt(idx-1))!=-1){
+_c6a=true;
break;
}
-idx=_c67.indexOf(_c62,idx+1);
+idx=_c68.indexOf(_c63,idx+1);
}
-if(!_c69){
+if(!_c6a){
continue;
}else{
ret.push(this.data[x]);
@@ -14909,17 +14915,17 @@
}
}
}
-_c63(ret);
+_c64(ret);
};
-this.addData=function(_c6a){
-this.data=this.data.concat(_c6a);
+this.addData=function(_c6b){
+this.data=this.data.concat(_c6b);
};
-this.setData=function(_c6b){
-this.data=_c6b;
+this.setData=function(_c6c){
+this.data=_c6c;
for(var i=0;i<this.data.length;i++){
-var _c6d=this.data[i];
-if(!dojo.lang.isArray(_c6d)){
-this.data[i]=[_c6d,_c6d];
+var _c6e=this.data[i];
+if(!dojo.lang.isArray(_c6e)){
+this.data[i]=[_c6e,_c6e];
}
}
};
@@ -14932,10 +14938,10 @@
var data=[];
for(var x=0;x<ol;x++){
var text=opts[x].textContent||opts[x].innerText||opts[x].innerHTML;
-var _c73=[String(text),String(opts[x].value)];
-data.push(_c73);
+var _c74=[String(text),String(opts[x].value)];
+data.push(_c74);
if(opts[x].selected){
-this.cbox.setAllValues(_c73[0],_c73[1]);
+this.cbox.setAllValues(_c74[0],_c74[1]);
}
}
this.setData(data);
@@ -14943,55 +14949,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:"",templateCssPath:dojo.uri.dojoUri("struts/ComboBox.css"),searchLimit:30,showResultList:function(){
-var _c74=this.optionsListNode.childNodes;
-if(_c74.length){
+var _c75=this.optionsListNode.childNodes;
+if(_c75.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(_c74[0]).height;
+this.itemHeight=dojo.html.getMarginBox(_c75[0]).height;
}
-var _c75=this.itemHeight*_c74.length;
-if(_c75<this.dropdownHeight){
-this.optionsListNode.style.height=_c75+2+"px";
+var _c76=this.itemHeight*_c75.length;
+if(_c76<this.dropdownHeight){
+this.optionsListNode.style.height=_c76+2+"px";
}
this.popupWidget.open(this.domNode,this,this.downArrowNode);
}else{
this._hideResultList();
}
-},_openResultList:function(_c76){
+},_openResultList:function(_c77){
if(this.disabled){
return;
}
this._clearResultList();
-if(!_c76.length){
+if(!_c77.length){
this._hideResultList();
}
-if((this.autoComplete)&&(_c76.length)&&(!this._prev_key_backspace)&&(this.textInputNode.value.length>0)){
+if((this.autoComplete)&&(_c77.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+=_c76[0][0].substr(cpos);
+this.textInputNode.value+=_c77[0][0].substr(cpos);
this._setSelectedRange(this.textInputNode,cpos,this.textInputNode.value.length);
}
}
-var _c78=this.textInputNode.value;
+var _c79=this.textInputNode.value;
var even=true;
-while(_c76.length){
-var tr=_c76.shift();
+while(_c77.length){
+var tr=_c77.shift();
if(tr){
var td=document.createElement("div");
var text=tr[0];
-var i=text.toLowerCase().indexOf(_c78.toLowerCase());
+var i=text.toLowerCase().indexOf(_c79.toLowerCase());
if(i>=0){
var pre=text.substring(0,i);
-var _c7f=text.substring(i,i+_c78.length);
-var post=text.substring(i+_c78.length);
+var _c80=text.substring(i,i+_c79.length);
+var post=text.substring(i+_c79.length);
if(!dojo.string.isBlank(pre)){
td.appendChild(document.createTextNode(pre));
}
-var _c81=document.createElement("b");
-td.appendChild(_c81);
-_c81.appendChild(document.createTextNode(_c7f));
+var _c82=document.createElement("b");
+td.appendChild(_c82);
+_c82.appendChild(document.createTextNode(_c80));
td.appendChild(document.createTextNode(post));
}else{
td.appendChild(document.createTextNode(tr[0]));
@@ -15008,12 +15014,12 @@
struts.widget.ComboBox.superclass.postCreate.apply(this);
var self=this;
if(!dojo.string.isBlank(this.listenTopics)){
-var _c83=this.listenTopics.split(",");
-for(var i=0;i<_c83.length;i++){
-dojo.event.topic.subscribe(_c83[i],function(){
-var _c85={cancel:false};
-self.notify(this.widgetId,"before",_c85);
-if(_c85.cancel){
+var _c84=this.listenTopics.split(",");
+for(var i=0;i<_c84.length;i++){
+dojo.event.topic.subscribe(_c84[i],function(){
+var _c86={cancel:false};
+self.notify(this.widgetId,"before",_c86);
+if(_c86.cancel){
return;
}
self.clearValues();
@@ -15055,37 +15061,37 @@
},notify:function(data,type,e){
if(this.notifyTopicsArray){
var self=this;
-dojo.lang.forEach(this.notifyTopicsArray,function(_c8b){
+dojo.lang.forEach(this.notifyTopicsArray,function(_c8c){
try{
-dojo.event.topic.publish(_c8b,data,type,e);
+dojo.event.topic.publish(_c8c,data,type,e);
}
catch(ex){
self.log(ex);
}
});
}
-var _c8c=null;
+var _c8d=null;
switch(type){
case "before":
-_c8c=this.beforeNotifyTopicsArray;
+_c8d=this.beforeNotifyTopicsArray;
break;
case "load":
-_c8c=this.afterNotifyTopicsArray;
+_c8d=this.afterNotifyTopicsArray;
break;
case "error":
-_c8c=this.errorNotifyTopicsArray;
+_c8d=this.errorNotifyTopicsArray;
break;
case "valuechanged":
-_c8c=this.valueNotifyTopicsArray;
+_c8d=this.valueNotifyTopicsArray;
break;
}
-this.notifyTo(_c8c,data,type,e);
-},notifyTo:function(_c8d,data,type,e){
+this.notifyTo(_c8d,data,type,e);
+},notifyTo:function(_c8e,data,type,e){
var self=this;
-if(_c8d){
-dojo.lang.forEach(_c8d,function(_c92){
+if(_c8e){
+dojo.lang.forEach(_c8e,function(_c93){
try{
-dojo.event.topic.publish(_c92,data,type,e);
+dojo.event.topic.publish(_c93,data,type,e);
}
catch(ex){
self.log(ex);
@@ -15095,18 +15101,18 @@
},log:function(text){
dojo.debug("["+(this.widgetId?this.widgetId:"unknown")+"] "+text);
},_startSearchFromInput:function(){
-var _c94=this.textInputNode.value;
+var _c95=this.textInputNode.value;
if(this.loadOnType){
-if(_c94.length>=this.loadMinimum){
-var _c95=this.dataUrl+(this.dataUrl.indexOf("?")>-1?"&":"?");
-_c95+=this.name+"="+_c94;
-this.dataProvider.getData(_c95);
-this._startSearch(_c94);
+if(_c95.length>=this.loadMinimum){
+var _c96=this.dataUrl+(this.dataUrl.indexOf("?")>-1?"&":"?");
+_c96+=this.name+"="+_c95;
+this.dataProvider.getData(_c96);
+this._startSearch(_c95);
}else{
this._hideResultList();
}
}else{
-this._startSearch(_c94);
+this._startSearch(_c95);
}
}});
dojo.provide("dojo.widget.DropdownContainer");
@@ -15154,197 +15160,197 @@
dojo.widget.DropdownContainer.superclass.disable.apply(this,arguments);
}});
dojo.provide("dojo.date.serialize");
-dojo.date.setIso8601=function(_c99,_c9a){
-var _c9b=(_c9a.indexOf("T")==-1)?_c9a.split(" "):_c9a.split("T");
-_c99=dojo.date.setIso8601Date(_c99,_c9b[0]);
-if(_c9b.length==2){
-_c99=dojo.date.setIso8601Time(_c99,_c9b[1]);
-}
-return _c99;
-};
-dojo.date.fromIso8601=function(_c9c){
-return dojo.date.setIso8601(new Date(0,0),_c9c);
-};
-dojo.date.setIso8601Date=function(_c9d,_c9e){
-var _c9f="^([0-9]{4})((-?([0-9]{2})(-?([0-9]{2}))?)|"+"(-?([0-9]{3}))|(-?W([0-9]{2})(-?([1-7]))?))?$";
-var d=_c9e.match(new RegExp(_c9f));
+dojo.date.setIso8601=function(_c9a,_c9b){
+var _c9c=(_c9b.indexOf("T")==-1)?_c9b.split(" "):_c9b.split("T");
+_c9a=dojo.date.setIso8601Date(_c9a,_c9c[0]);
+if(_c9c.length==2){
+_c9a=dojo.date.setIso8601Time(_c9a,_c9c[1]);
+}
+return _c9a;
+};
+dojo.date.fromIso8601=function(_c9d){
+return dojo.date.setIso8601(new Date(0,0),_c9d);
+};
+dojo.date.setIso8601Date=function(_c9e,_c9f){
+var _ca0="^([0-9]{4})((-?([0-9]{2})(-?([0-9]{2}))?)|"+"(-?([0-9]{3}))|(-?W([0-9]{2})(-?([1-7]))?))?$";
+var d=_c9f.match(new RegExp(_ca0));
if(!d){
-dojo.debug("invalid date string: "+_c9e);
+dojo.debug("invalid date string: "+_c9f);
return null;
}
var year=d[1];
-var _ca2=d[4];
+var _ca3=d[4];
var date=d[6];
-var _ca4=d[8];
+var _ca5=d[8];
var week=d[10];
-var _ca6=d[12]?d[12]:1;
-_c9d.setFullYear(year);
-if(_ca4){
-_c9d.setMonth(0);
-_c9d.setDate(Number(_ca4));
+var _ca7=d[12]?d[12]:1;
+_c9e.setFullYear(year);
+if(_ca5){
+_c9e.setMonth(0);
+_c9e.setDate(Number(_ca5));
}else{
if(week){
-_c9d.setMonth(0);
-_c9d.setDate(1);
-var gd=_c9d.getDay();
+_c9e.setMonth(0);
+_c9e.setDate(1);
+var gd=_c9e.getDay();
var day=gd?gd:7;
-var _ca9=Number(_ca6)+(7*Number(week));
+var _caa=Number(_ca7)+(7*Number(week));
if(day<=4){
-_c9d.setDate(_ca9+1-day);
+_c9e.setDate(_caa+1-day);
}else{
-_c9d.setDate(_ca9+8-day);
+_c9e.setDate(_caa+8-day);
}
}else{
-if(_ca2){
-_c9d.setDate(1);
-_c9d.setMonth(_ca2-1);
+if(_ca3){
+_c9e.setDate(1);
+_c9e.setMonth(_ca3-1);
}
if(date){
-_c9d.setDate(date);
+_c9e.setDate(date);
}
}
}
-return _c9d;
+return _c9e;
};
-dojo.date.fromIso8601Date=function(_caa){
-return dojo.date.setIso8601Date(new Date(0,0),_caa);
+dojo.date.fromIso8601Date=function(_cab){
+return dojo.date.setIso8601Date(new Date(0,0),_cab);
};
-dojo.date.setIso8601Time=function(_cab,_cac){
-var _cad="Z|(([-+])([0-9]{2})(:?([0-9]{2}))?)$";
-var d=_cac.match(new RegExp(_cad));
-var _caf=0;
+dojo.date.setIso8601Time=function(_cac,_cad){
+var _cae="Z|(([-+])([0-9]{2})(:?([0-9]{2}))?)$";
+var d=_cad.match(new RegExp(_cae));
+var _cb0=0;
if(d){
if(d[0]!="Z"){
-_caf=(Number(d[3])*60)+Number(d[5]);
-_caf*=((d[2]=="-")?1:-1);
+_cb0=(Number(d[3])*60)+Number(d[5]);
+_cb0*=((d[2]=="-")?1:-1);
}
-_caf-=_cab.getTimezoneOffset();
-_cac=_cac.substr(0,_cac.length-d[0].length);
+_cb0-=_cac.getTimezoneOffset();
+_cad=_cad.substr(0,_cad.length-d[0].length);
}
-var _cb0="^([0-9]{2})(:?([0-9]{2})(:?([0-9]{2})(.([0-9]+))?)?)?$";
-d=_cac.match(new RegExp(_cb0));
+var _cb1="^([0-9]{2})(:?([0-9]{2})(:?([0-9]{2})(.([0-9]+))?)?)?$";
+d=_cad.match(new RegExp(_cb1));
if(!d){
-dojo.debug("invalid time string: "+_cac);
+dojo.debug("invalid time string: "+_cad);
return null;
}
-var _cb1=d[1];
+var _cb2=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;
-_cab.setHours(_cb1);
-_cab.setMinutes(mins);
-_cab.setSeconds(secs);
-_cab.setMilliseconds(ms);
-if(_caf!==0){
-_cab.setTime(_cab.getTime()+_caf*60000);
-}
-return _cab;
-};
-dojo.date.fromIso8601Time=function(_cb5){
-return dojo.date.setIso8601Time(new Date(0,0),_cb5);
-};
-dojo.date.toRfc3339=function(_cb6,_cb7){
-if(!_cb6){
-_cb6=new Date();
+_cac.setHours(_cb2);
+_cac.setMinutes(mins);
+_cac.setSeconds(secs);
+_cac.setMilliseconds(ms);
+if(_cb0!==0){
+_cac.setTime(_cac.getTime()+_cb0*60000);
+}
+return _cac;
+};
+dojo.date.fromIso8601Time=function(_cb6){
+return dojo.date.setIso8601Time(new Date(0,0),_cb6);
+};
+dojo.date.toRfc3339=function(_cb7,_cb8){
+if(!_cb7){
+_cb7=new Date();
}
var _=dojo.string.pad;
-var _cb9=[];
-if(_cb7!="timeOnly"){
-var date=[_(_cb6.getFullYear(),4),_(_cb6.getMonth()+1,2),_(_cb6.getDate(),2)].join("-");
-_cb9.push(date);
-}
-if(_cb7!="dateOnly"){
-var time=[_(_cb6.getHours(),2),_(_cb6.getMinutes(),2),_(_cb6.getSeconds(),2)].join(":");
-var _cbc=_cb6.getTimezoneOffset();
-time+=(_cbc>0?"-":"+")+_(Math.floor(Math.abs(_cbc)/60),2)+":"+_(Math.abs(_cbc)%60,2);
-_cb9.push(time);
-}
-return _cb9.join("T");
-};
-dojo.date.fromRfc3339=function(_cbd){
-if(_cbd.indexOf("Tany")!=-1){
-_cbd=_cbd.replace("Tany","");
+var _cba=[];
+if(_cb8!="timeOnly"){
+var date=[_(_cb7.getFullYear(),4),_(_cb7.getMonth()+1,2),_(_cb7.getDate(),2)].join("-");
+_cba.push(date);
+}
+if(_cb8!="dateOnly"){
+var time=[_(_cb7.getHours(),2),_(_cb7.getMinutes(),2),_(_cb7.getSeconds(),2)].join(":");
+var _cbd=_cb7.getTimezoneOffset();
+time+=(_cbd>0?"-":"+")+_(Math.floor(Math.abs(_cbd)/60),2)+":"+_(Math.abs(_cbd)%60,2);
+_cba.push(time);
+}
+return _cba.join("T");
+};
+dojo.date.fromRfc3339=function(_cbe){
+if(_cbe.indexOf("Tany")!=-1){
+_cbe=_cbe.replace("Tany","");
}
-var _cbe=new Date();
-return dojo.date.setIso8601(_cbe,_cbd);
+var _cbf=new Date();
+return dojo.date.setIso8601(_cbf,_cbe);
};
dojo.provide("dojo.date.common");
-dojo.date.setDayOfYear=function(_cbf,_cc0){
-_cbf.setMonth(0);
-_cbf.setDate(_cc0);
-return _cbf;
-};
-dojo.date.getDayOfYear=function(_cc1){
-var _cc2=_cc1.getFullYear();
-var _cc3=new Date(_cc2-1,11,31);
-return Math.floor((_cc1.getTime()-_cc3.getTime())/86400000);
+dojo.date.setDayOfYear=function(_cc0,_cc1){
+_cc0.setMonth(0);
+_cc0.setDate(_cc1);
+return _cc0;
+};
+dojo.date.getDayOfYear=function(_cc2){
+var _cc3=_cc2.getFullYear();
+var _cc4=new Date(_cc3-1,11,31);
+return Math.floor((_cc2.getTime()-_cc4.getTime())/86400000);
};
-dojo.date.setWeekOfYear=function(_cc4,week,_cc6){
+dojo.date.setWeekOfYear=function(_cc5,week,_cc7){
if(arguments.length==1){
-_cc6=0;
+_cc7=0;
}
dojo.unimplemented("dojo.date.setWeekOfYear");
};
-dojo.date.getWeekOfYear=function(_cc7,_cc8){
+dojo.date.getWeekOfYear=function(_cc8,_cc9){
if(arguments.length==1){
-_cc8=0;
+_cc9=0;
}
-var _cc9=new Date(_cc7.getFullYear(),0,1);
-var day=_cc9.getDay();
-_cc9.setDate(_cc9.getDate()-day+_cc8-(day>_cc8?7:0));
-return Math.floor((_cc7.getTime()-_cc9.getTime())/604800000);
+var _cca=new Date(_cc8.getFullYear(),0,1);
+var day=_cca.getDay();
+_cca.setDate(_cca.getDate()-day+_cc9-(day>_cc9?7:0));
+return Math.floor((_cc8.getTime()-_cca.getTime())/604800000);
};
-dojo.date.setIsoWeekOfYear=function(_ccb,week,_ccd){
+dojo.date.setIsoWeekOfYear=function(_ccc,week,_cce){
if(arguments.length==1){
-_ccd=1;
+_cce=1;
}
dojo.unimplemented("dojo.date.setIsoWeekOfYear");
};
-dojo.date.getIsoWeekOfYear=function(_cce,_ccf){
+dojo.date.getIsoWeekOfYear=function(_ccf,_cd0){
if(arguments.length==1){
-_ccf=1;
+_cd0=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(_cd0){
-var _cd1=_cd0.getMonth();
+dojo.date.getDaysInMonth=function(_cd1){
+var _cd2=_cd1.getMonth();
var days=[31,28,31,30,31,30,31,31,30,31,30,31];
-if(_cd1==1&&dojo.date.isLeapYear(_cd0)){
+if(_cd2==1&&dojo.date.isLeapYear(_cd1)){
return 29;
}else{
-return days[_cd1];
+return days[_cd2];
}
};
-dojo.date.isLeapYear=function(_cd3){
-var year=_cd3.getFullYear();
+dojo.date.isLeapYear=function(_cd4){
+var year=_cd4.getFullYear();
return (year%400==0)?true:(year%100==0)?false:(year%4==0)?true:false;
};
-dojo.date.getTimezoneName=function(_cd5){
-var str=_cd5.toString();
+dojo.date.getTimezoneName=function(_cd6){
+var str=_cd6.toString();
var tz="";
-var _cd8;
+var _cd9;
var pos=str.indexOf("(");
if(pos>-1){
pos++;
tz=str.substring(pos,str.indexOf(")"));
}else{
var pat=/([A-Z\/]+) \d{4}$/;
-if((_cd8=str.match(pat))){
-tz=_cd8[1];
+if((_cd9=str.match(pat))){
+tz=_cd9[1];
}else{
-str=_cd5.toLocaleString();
+str=_cd6.toLocaleString();
pat=/ ([A-Z\/]+)$/;
-if((_cd8=str.match(pat))){
-tz=_cd8[1];
+if((_cd9=str.match(pat))){
+tz=_cd9[1];
}
}
}
return tz=="AM"||tz=="PM"?"":tz;
};
-dojo.date.getOrdinal=function(_cdb){
-var date=_cdb.getDate();
+dojo.date.getOrdinal=function(_cdc){
+var date=_cdc.getDate();
if(date%100!=11&&date%10==1){
return "st";
}else{
@@ -15360,12 +15366,12 @@
}
};
dojo.date.compareTypes={DATE:1,TIME:2};
-dojo.date.compare=function(_cdd,_cde,_cdf){
-var dA=_cdd;
-var dB=_cde||new Date();
+dojo.date.compare=function(_cde,_cdf,_ce0){
+var dA=_cde;
+var dB=_cdf||new Date();
var now=new Date();
with(dojo.date.compareTypes){
-var opt=_cdf||(DATE|TIME);
+var opt=_ce0||(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);
}
@@ -15378,7 +15384,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,_ce7,incr){
+dojo.date.add=function(dt,_ce8,incr){
if(typeof dt=="number"){
dt=new Date(dt);
}
@@ -15389,7 +15395,7 @@
}
var sum=new Date(dt);
with(dojo.date.dateParts){
-switch(_ce7){
+switch(_ce8){
case YEAR:
sum.setFullYear(dt.getFullYear()+incr);
fixOvershoot();
@@ -15407,7 +15413,7 @@
break;
case WEEKDAY:
var dat=dt.getDate();
-var _ceb=0;
+var _cec=0;
var days=0;
var strt=0;
var trgt=0;
@@ -15415,10 +15421,10 @@
var mod=incr%5;
if(mod==0){
days=(incr>0)?5:-5;
-_ceb=(incr>0)?((incr-5)/5):((incr+5)/5);
+_cec=(incr>0)?((incr-5)/5):((incr+5)/5);
}else{
days=mod;
-_ceb=parseInt(incr/5);
+_cec=parseInt(incr/5);
}
strt=dt.getDay();
if(strt==6&&incr>0){
@@ -15432,7 +15438,7 @@
if(trgt==0||trgt==6){
adj=(incr>0)?2:-2;
}
-sum.setDate(dat+(7*_ceb)+days+adj);
+sum.setDate(dat+(7*_cec)+days+adj);
break;
case HOUR:
sum.setHours(sum.getHours()+incr);
@@ -15452,60 +15458,60 @@
}
return sum;
};
-dojo.date.diff=function(dtA,dtB,_cf3){
+dojo.date.diff=function(dtA,dtB,_cf4){
if(typeof dtA=="number"){
dtA=new Date(dtA);
}
if(typeof dtB=="number"){
dtB=new Date(dtB);
}
-var _cf4=dtB.getFullYear()-dtA.getFullYear();
-var _cf5=(dtB.getMonth()-dtA.getMonth())+(_cf4*12);
-var _cf6=dtB.getTime()-dtA.getTime();
-var _cf7=_cf6/1000;
-var _cf8=_cf7/60;
+var _cf5=dtB.getFullYear()-dtA.getFullYear();
+var _cf6=(dtB.getMonth()-dtA.getMonth())+(_cf5*12);
+var _cf7=dtB.getTime()-dtA.getTime();
+var _cf8=_cf7/1000;
var _cf9=_cf8/60;
-var _cfa=_cf9/24;
-var _cfb=_cfa/7;
-var _cfc=0;
+var _cfa=_cf9/60;
+var _cfb=_cfa/24;
+var _cfc=_cfb/7;
+var _cfd=0;
with(dojo.date.dateParts){
-switch(_cf3){
+switch(_cf4){
case YEAR:
-_cfc=_cf4;
+_cfd=_cf5;
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+=(_cf4*4);
-_cfc=qB-qA;
+qB+=(_cf5*4);
+_cfd=qB-qA;
break;
case MONTH:
-_cfc=_cf5;
+_cfd=_cf6;
break;
case WEEK:
-_cfc=parseInt(_cfb);
+_cfd=parseInt(_cfc);
break;
case DAY:
-_cfc=_cfa;
+_cfd=_cfb;
break;
case WEEKDAY:
-var days=Math.round(_cfa);
-var _d02=parseInt(days/7);
+var days=Math.round(_cfb);
+var _d03=parseInt(days/7);
var mod=days%7;
if(mod==0){
-days=_d02*5;
+days=_d03*5;
}else{
var adj=0;
var aDay=dtA.getDay();
var bDay=dtB.getDay();
-_d02=parseInt(days/7);
+_d03=parseInt(days/7);
mod=days%7;
-var _d07=new Date(dtA);
-_d07.setDate(_d07.getDate()+(_d02*7));
-var _d08=_d07.getDay();
-if(_cfa>0){
+var _d08=new Date(dtA);
+_d08.setDate(_d08.getDate()+(_d03*7));
+var _d09=_d08.getDay();
+if(_cfb>0){
switch(true){
case aDay==6:
adj=-1;
@@ -15519,14 +15525,14 @@
case bDay==0:
adj=-2;
break;
-case (_d08+mod)>5:
+case (_d09+mod)>5:
adj=-2;
break;
default:
break;
}
}else{
-if(_cfa<0){
+if(_cfb<0){
switch(true){
case aDay==6:
adj=0;
@@ -15540,7 +15546,7 @@
case bDay==0:
adj=1;
break;
-case (_d08+mod)<0:
+case (_d09+mod)<0:
adj=2;
break;
default:
@@ -15549,116 +15555,116 @@
}
}
days+=adj;
-days-=(_d02*2);
+days-=(_d03*2);
}
-_cfc=days;
+_cfd=days;
break;
case HOUR:
-_cfc=_cf9;
+_cfd=_cfa;
break;
case MINUTE:
-_cfc=_cf8;
+_cfd=_cf9;
break;
case SECOND:
-_cfc=_cf7;
+_cfd=_cf8;
break;
case MILLISECOND:
-_cfc=_cf6;
+_cfd=_cf7;
break;
default:
break;
}
}
-return Math.round(_cfc);
+return Math.round(_cfd);
};
dojo.provide("dojo.date.supplemental");
-dojo.date.getFirstDayOfWeek=function(_d09){
-var _d0a={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};
-_d09=dojo.hostenv.normalizeLocale(_d09);
-var _d0b=_d09.split("-")[1];
-var dow=_d0a[_d0b];
+dojo.date.getFirstDayOfWeek=function(_d0a){
+var _d0b={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};
+_d0a=dojo.hostenv.normalizeLocale(_d0a);
+var _d0c=_d0a.split("-")[1];
+var dow=_d0b[_d0c];
return (typeof dow=="undefined")?1:dow;
};
-dojo.date.getWeekend=function(_d0d){
-var _d0e={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 _d0f={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};
-_d0d=dojo.hostenv.normalizeLocale(_d0d);
-var _d10=_d0d.split("-")[1];
-var _d11=_d0e[_d10];
-var end=_d0f[_d10];
-if(typeof _d11=="undefined"){
-_d11=6;
+dojo.date.getWeekend=function(_d0e){
+var _d0f={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 _d10={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};
+_d0e=dojo.hostenv.normalizeLocale(_d0e);
+var _d11=_d0e.split("-")[1];
+var _d12=_d0f[_d11];
+var end=_d10[_d11];
+if(typeof _d12=="undefined"){
+_d12=6;
}
if(typeof end=="undefined"){
end=0;
}
-return {start:_d11,end:end};
+return {start:_d12,end:end};
};
-dojo.date.isWeekend=function(_d13,_d14){
-var _d15=dojo.date.getWeekend(_d14);
-var day=(_d13||new Date()).getDay();
-if(_d15.end<_d15.start){
-_d15.end+=7;
-if(day<_d15.start){
+dojo.date.isWeekend=function(_d14,_d15){
+var _d16=dojo.date.getWeekend(_d15);
+var day=(_d14||new Date()).getDay();
+if(_d16.end<_d16.start){
+_d16.end+=7;
+if(day<_d16.start){
day+=7;
}
}
-return day>=_d15.start&&day<=_d15.end;
+return day>=_d16.start&&day<=_d16.end;
};
dojo.provide("dojo.i18n.common");
-dojo.i18n.getLocalization=function(_d17,_d18,_d19){
+dojo.i18n.getLocalization=function(_d18,_d19,_d1a){
dojo.hostenv.preloadLocalizations();
-_d19=dojo.hostenv.normalizeLocale(_d19);
-var _d1a=_d19.split("-");
-var _d1b=[_d17,"nls",_d18].join(".");
-var _d1c=dojo.hostenv.findModule(_d1b,true);
-var _d1d;
-for(var i=_d1a.length;i>0;i--){
-var loc=_d1a.slice(0,i).join("_");
-if(_d1c[loc]){
-_d1d=_d1c[loc];
+_d1a=dojo.hostenv.normalizeLocale(_d1a);
+var _d1b=_d1a.split("-");
+var _d1c=[_d18,"nls",_d19].join(".");
+var _d1d=dojo.hostenv.findModule(_d1c,true);
+var _d1e;
+for(var i=_d1b.length;i>0;i--){
+var loc=_d1b.slice(0,i).join("_");
+if(_d1d[loc]){
+_d1e=_d1d[loc];
break;
}
}
-if(!_d1d){
-_d1d=_d1c.ROOT;
+if(!_d1e){
+_d1e=_d1d.ROOT;
}
-if(_d1d){
-var _d20=function(){
+if(_d1e){
+var _d21=function(){
};
-_d20.prototype=_d1d;
-return new _d20();
+_d21.prototype=_d1e;
+return new _d21();
}
-dojo.raise("Bundle not found: "+_d18+" in "+_d17+" , locale="+_d19);
+dojo.raise("Bundle not found: "+_d19+" in "+_d18+" , locale="+_d1a);
};
-dojo.i18n.isLTR=function(_d21){
-var lang=dojo.hostenv.normalizeLocale(_d21).split("-")[0];
+dojo.i18n.isLTR=function(_d22){
+var lang=dojo.hostenv.normalizeLocale(_d22).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(_d24,_d25){
-if(typeof _d25=="string"){
+dojo.date.format=function(_d25,_d26){
+if(typeof _d26=="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(_d24,_d25);
+return dojo.date.strftime(_d25,_d26);
}
-function formatPattern(_d26,_d27){
-return _d27.replace(/([a-z])\1*/ig,function(_d28){
+function formatPattern(_d27,_d28){
+return _d28.replace(/([a-z])\1*/ig,function(_d29){
var s;
-var c=_d28.charAt(0);
-var l=_d28.length;
+var c=_d29.charAt(0);
+var l=_d29.length;
var pad;
-var _d2d=["abbr","wide","narrow"];
+var _d2e=["abbr","wide","narrow"];
switch(c){
case "G":
if(l>3){
dojo.unimplemented("Era format not implemented");
}
-s=info.eras[_d26.getFullYear()<0?1:0];
+s=info.eras[_d27.getFullYear()<0?1:0];
break;
case "y":
-s=_d26.getFullYear();
+s=_d27.getFullYear();
switch(l){
case 1:
break;
@@ -15671,7 +15677,7 @@
break;
case "Q":
case "q":
-s=Math.ceil((_d26.getMonth()+1)/3);
+s=Math.ceil((_d27.getMonth()+1)/3);
switch(l){
case 1:
case 2:
@@ -15684,8 +15690,8 @@
break;
case "M":
case "L":
-var m=_d26.getMonth();
-var _d30;
+var m=_d27.getMonth();
+var _d31;
switch(l){
case 1:
case 2:
@@ -15695,39 +15701,39 @@
case 3:
case 4:
case 5:
-_d30=_d2d[l-3];
+_d31=_d2e[l-3];
break;
}
-if(_d30){
+if(_d31){
var type=(c=="L")?"standalone":"format";
-var prop=["months",type,_d30].join("-");
+var prop=["months",type,_d31].join("-");
s=info[prop][m];
}
break;
case "w":
-var _d33=0;
-s=dojo.date.getWeekOfYear(_d26,_d33);
+var _d34=0;
+s=dojo.date.getWeekOfYear(_d27,_d34);
pad=true;
break;
case "d":
-s=_d26.getDate();
+s=_d27.getDate();
pad=true;
break;
case "D":
-s=dojo.date.getDayOfYear(_d26);
+s=dojo.date.getDayOfYear(_d27);
pad=true;
break;
case "E":
case "e":
case "c":
-var d=_d26.getDay();
-var _d30;
+var d=_d27.getDay();
+var _d31;
switch(l){
case 1:
case 2:
if(c=="e"){
-var _d35=dojo.date.getFirstDayOfWeek(_d25.locale);
-d=(d-_d35+7)%7;
+var _d36=dojo.date.getFirstDayOfWeek(_d26.locale);
+d=(d-_d36+7)%7;
}
if(c!="c"){
s=d+1;
@@ -15737,24 +15743,24 @@
case 3:
case 4:
case 5:
-_d30=_d2d[l-3];
+_d31=_d2e[l-3];
break;
}
-if(_d30){
+if(_d31){
var type=(c=="c")?"standalone":"format";
-var prop=["days",type,_d30].join("-");
+var prop=["days",type,_d31].join("-");
s=info[prop][d];
}
break;
case "a":
-var _d36=(_d26.getHours()<12)?"am":"pm";
-s=info[_d36];
+var _d37=(_d27.getHours()<12)?"am":"pm";
+s=info[_d37];
break;
case "h":
case "H":
case "K":
case "k":
-var h=_d26.getHours();
+var h=_d27.getHours();
switch(c){
case "h":
s=(h%12)||12;
@@ -15772,26 +15778,26 @@
pad=true;
break;
case "m":
-s=_d26.getMinutes();
+s=_d27.getMinutes();
pad=true;
break;
case "s":
-s=_d26.getSeconds();
+s=_d27.getSeconds();
pad=true;
break;
case "S":
-s=Math.round(_d26.getMilliseconds()*Math.pow(10,l-3));
+s=Math.round(_d27.getMilliseconds()*Math.pow(10,l-3));
break;
case "v":
case "z":
-s=dojo.date.getTimezoneName(_d26);
+s=dojo.date.getTimezoneName(_d27);
if(s){
break;
}
l=4;
case "Z":
-var _d38=_d26.getTimezoneOffset();
-var tz=[(_d38<=0?"+":"-"),dojo.string.pad(Math.floor(Math.abs(_d38)/60),2),dojo.string.pad(Math.abs(_d38)%60,2)];
+var _d39=_d27.getTimezoneOffset();
+var tz=[(_d39<=0?"+":"-"),dojo.string.pad(Math.floor(Math.abs(_d39)/60),2),dojo.string.pad(Math.abs(_d39)%60,2)];
if(l==4){
tz.splice(0,0,"GMT");
tz.splice(3,0,":");
@@ -15804,11 +15810,11 @@
case "F":
case "g":
case "A":
-dojo.debug(_d28+" modifier not yet implemented");
+dojo.debug(_d29+" modifier not yet implemented");
s="?";
break;
default:
-dojo.raise("dojo.date.format: invalid pattern char: "+_d27);
+dojo.raise("dojo.date.format: invalid pattern char: "+_d28);
}
if(pad){
s=dojo.string.pad(s,l);
@@ -15816,126 +15822,126 @@
return s;
});
}
-_d25=_d25||{};
-var _d3a=dojo.hostenv.normalizeLocale(_d25.locale);
-var _d3b=_d25.formatLength||"full";
-var info=dojo.date._getGregorianBundle(_d3a);
+_d26=_d26||{};
+var _d3b=dojo.hostenv.normalizeLocale(_d26.locale);
+var _d3c=_d26.formatLength||"full";
+var info=dojo.date._getGregorianBundle(_d3b);
var str=[];
-var _d3d=dojo.lang.curry(this,formatPattern,_d24);
-if(_d25.selector!="timeOnly"){
-var _d3e=_d25.datePattern||info["dateFormat-"+_d3b];
-if(_d3e){
-str.push(_processPattern(_d3e,_d3d));
+var _d3e=dojo.lang.curry(this,formatPattern,_d25);
+if(_d26.selector!="timeOnly"){
+var _d3f=_d26.datePattern||info["dateFormat-"+_d3c];
+if(_d3f){
+str.push(_processPattern(_d3f,_d3e));
}
}
-if(_d25.selector!="dateOnly"){
-var _d3f=_d25.timePattern||info["timeFormat-"+_d3b];
-if(_d3f){
-str.push(_processPattern(_d3f,_d3d));
+if(_d26.selector!="dateOnly"){
+var _d40=_d26.timePattern||info["timeFormat-"+_d3c];
+if(_d40){
+str.push(_processPattern(_d40,_d3e));
}
}
-var _d40=str.join(" ");
-return _d40;
+var _d41=str.join(" ");
+return _d41;
};
-dojo.date.parse=function(_d41,_d42){
-_d42=_d42||{};
-var _d43=dojo.hostenv.normalizeLocale(_d42.locale);
-var info=dojo.date._getGregorianBundle(_d43);
-var _d45=_d42.formatLength||"full";
-if(!_d42.selector){
-_d42.selector="dateOnly";
+dojo.date.parse=function(_d42,_d43){
+_d43=_d43||{};
+var _d44=dojo.hostenv.normalizeLocale(_d43.locale);
+var info=dojo.date._getGregorianBundle(_d44);
+var _d46=_d43.formatLength||"full";
+if(!_d43.selector){
+_d43.selector="dateOnly";
}
-var _d46=_d42.datePattern||info["dateFormat-"+_d45];
-var _d47=_d42.timePattern||info["timeFormat-"+_d45];
-var _d48;
-if(_d42.selector=="dateOnly"){
-_d48=_d46;
+var _d47=_d43.datePattern||info["dateFormat-"+_d46];
+var _d48=_d43.timePattern||info["timeFormat-"+_d46];
+var _d49;
+if(_d43.selector=="dateOnly"){
+_d49=_d47;
}else{
-if(_d42.selector=="timeOnly"){
-_d48=_d47;
+if(_d43.selector=="timeOnly"){
+_d49=_d48;
}else{
-if(_d42.selector=="dateTime"){
-_d48=_d46+" "+_d47;
+if(_d43.selector=="dateTime"){
+_d49=_d47+" "+_d48;
}else{
-var msg="dojo.date.parse: Unknown selector param passed: '"+_d42.selector+"'.";
+var msg="dojo.date.parse: Unknown selector param passed: '"+_d43.selector+"'.";
msg+=" Defaulting to date pattern.";
dojo.debug(msg);
-_d48=_d46;
+_d49=_d47;
}
}
}
-var _d4a=[];
-var _d4b=_processPattern(_d48,dojo.lang.curry(this,_buildDateTimeRE,_d4a,info,_d42));
-var _d4c=new RegExp("^"+_d4b+"$");
-var _d4d=_d4c.exec(_d41);
-if(!_d4d){
+var _d4b=[];
+var _d4c=_processPattern(_d49,dojo.lang.curry(this,_buildDateTimeRE,_d4b,info,_d43));
+var _d4d=new RegExp("^"+_d4c+"$");
+var _d4e=_d4d.exec(_d42);
+if(!_d4e){
return null;
}
-var _d4e=["abbr","wide","narrow"];
-var _d4f=new Date(1972,0);
-var _d50={};
-for(var i=1;i<_d4d.length;i++){
-var grp=_d4a[i-1];
+var _d4f=["abbr","wide","narrow"];
+var _d50=new Date(1972,0);
+var _d51={};
+for(var i=1;i<_d4e.length;i++){
+var grp=_d4b[i-1];
var l=grp.length;
-var v=_d4d[i];
+var v=_d4e[i];
switch(grp.charAt(0)){
case "y":
if(l!=2){
-_d4f.setFullYear(v);
-_d50.year=v;
+_d50.setFullYear(v);
+_d51.year=v;
}else{
if(v<100){
v=Number(v);
var year=""+new Date().getFullYear();
-var _d56=year.substring(0,2)*100;
-var _d57=Number(year.substring(2,4));
-var _d58=Math.min(_d57+20,99);
-var num=(v<_d58)?_d56+v:_d56-100+v;
-_d4f.setFullYear(num);
-_d50.year=num;
+var _d57=year.substring(0,2)*100;
+var _d58=Number(year.substring(2,4));
+var _d59=Math.min(_d58+20,99);
+var num=(v<_d59)?_d57+v:_d57-100+v;
+_d50.setFullYear(num);
+_d51.year=num;
}else{
-if(_d42.strict){
+if(_d43.strict){
return null;
}
-_d4f.setFullYear(v);
-_d50.year=v;
+_d50.setFullYear(v);
+_d51.year=v;
}
}
break;
case "M":
if(l>2){
-if(!_d42.strict){
+if(!_d43.strict){
v=v.replace(/\./g,"");
v=v.toLowerCase();
}
-var _d5a=info["months-format-"+_d4e[l-3]].concat();
-for(var j=0;j<_d5a.length;j++){
-if(!_d42.strict){
-_d5a[j]=_d5a[j].toLowerCase();
+var _d5b=info["months-format-"+_d4f[l-3]].concat();
+for(var j=0;j<_d5b.length;j++){
+if(!_d43.strict){
+_d5b[j]=_d5b[j].toLowerCase();
}
-if(v==_d5a[j]){
-_d4f.setMonth(j);
-_d50.month=j;
+if(v==_d5b[j]){
+_d50.setMonth(j);
+_d51.month=j;
break;
}
}
-if(j==_d5a.length){
+if(j==_d5b.length){
dojo.debug("dojo.date.parse: Could not parse month name: '"+v+"'.");
return null;
}
}else{
-_d4f.setMonth(v-1);
-_d50.month=v-1;
+_d50.setMonth(v-1);
+_d51.month=v-1;
}
break;
case "E":
case "e":
-if(!_d42.strict){
+if(!_d43.strict){
v=v.toLowerCase();
}
-var days=info["days-format-"+_d4e[l-3]].concat();
+var days=info["days-format-"+_d4f[l-3]].concat();
for(var j=0;j<days.length;j++){
-if(!_d42.strict){
+if(!_d43.strict){
days[j]=days[j].toLowerCase();
}
if(v==days[j]){
@@ -15948,27 +15954,27 @@
}
break;
case "d":
-_d4f.setDate(v);
-_d50.date=v;
+_d50.setDate(v);
+_d51.date=v;
break;
case "a":
-var am=_d42.am||info.am;
-var pm=_d42.pm||info.pm;
-if(!_d42.strict){
+var am=_d43.am||info.am;
+var pm=_d43.pm||info.pm;
+if(!_d43.strict){
v=v.replace(/\./g,"").toLowerCase();
am=am.replace(/\./g,"").toLowerCase();
pm=pm.replace(/\./g,"").toLowerCase();
}
-if(_d42.strict&&v!=am&&v!=pm){
+if(_d43.strict&&v!=am&&v!=pm){
dojo.debug("dojo.date.parse: Could not parse am/pm part.");
return null;
}
-var _d5f=_d4f.getHours();
-if(v==pm&&_d5f<12){
-_d4f.setHours(_d5f+12);
+var _d60=_d50.getHours();
+if(v==pm&&_d60<12){
+_d50.setHours(_d60+12);
}else{
-if(v==am&&_d5f==12){
-_d4f.setHours(0);
+if(v==am&&_d60==12){
+_d50.setHours(0);
}
}
break;
@@ -15983,59 +15989,59 @@
dojo.debug("dojo.date.parse: Illegal hours value");
return null;
}
-_d4f.setHours(v);
+_d50.setHours(v);
break;
case "m":
-_d4f.setMinutes(v);
+_d50.setMinutes(v);
break;
case "s":
-_d4f.setSeconds(v);
+_d50.setSeconds(v);
break;
case "S":
-_d4f.setMilliseconds(v);
+_d50.setMilliseconds(v);
break;
default:
dojo.unimplemented("dojo.date.parse: unsupported pattern char="+grp.charAt(0));
}
}
-if(_d50.year&&_d4f.getFullYear()!=_d50.year){
-dojo.debug("Parsed year: '"+_d4f.getFullYear()+"' did not match input year: '"+_d50.year+"'.");
+if(_d51.year&&_d50.getFullYear()!=_d51.year){
+dojo.debug("Parsed year: '"+_d50.getFullYear()+"' did not match input year: '"+_d51.year+"'.");
return null;
}
-if(_d50.month&&_d4f.getMonth()!=_d50.month){
-dojo.debug("Parsed month: '"+_d4f.getMonth()+"' did not match input month: '"+_d50.month+"'.");
+if(_d51.month&&_d50.getMonth()!=_d51.month){
+dojo.debug("Parsed month: '"+_d50.getMonth()+"' did not match input month: '"+_d51.month+"'.");
return null;
}
-if(_d50.date&&_d4f.getDate()!=_d50.date){
-dojo.debug("Parsed day of month: '"+_d4f.getDate()+"' did not match input day of month: '"+_d50.date+"'.");
+if(_d51.date&&_d50.getDate()!=_d51.date){
+dojo.debug("Parsed day of month: '"+_d50.getDate()+"' did not match input day of month: '"+_d51.date+"'.");
return null;
}
-return _d4f;
+return _d50;
};
-function _processPattern(_d60,_d61,_d62,_d63){
-var _d64=function(x){
+function _processPattern(_d61,_d62,_d63,_d64){
+var _d65=function(x){
return x;
};
-_d61=_d61||_d64;
-_d62=_d62||_d64;
-_d63=_d63||_d64;
-var _d66=_d60.match(/(''|[^'])+/g);
-var _d67=false;
-for(var i=0;i<_d66.length;i++){
-if(!_d66[i]){
-_d66[i]="";
+_d62=_d62||_d65;
+_d63=_d63||_d65;
+_d64=_d64||_d65;
+var _d67=_d61.match(/(''|[^'])+/g);
+var _d68=false;
+for(var i=0;i<_d67.length;i++){
+if(!_d67[i]){
+_d67[i]="";
}else{
-_d66[i]=(_d67?_d62:_d61)(_d66[i]);
-_d67=!_d67;
+_d67[i]=(_d68?_d63:_d62)(_d67[i]);
+_d68=!_d68;
}
}
-return _d63(_d66.join(""));
+return _d64(_d67.join(""));
}
-function _buildDateTimeRE(_d69,info,_d6b,_d6c){
-return _d6c.replace(/([a-z])\1*/ig,function(_d6d){
+function _buildDateTimeRE(_d6a,info,_d6c,_d6d){
+return _d6d.replace(/([a-z])\1*/ig,function(_d6e){
var s;
-var c=_d6d.charAt(0);
-var l=_d6d.length;
+var c=_d6e.charAt(0);
+var l=_d6e.length;
switch(c){
case "y":
s="\\d"+((l==2)?"{2,4}":"+");
@@ -16063,9 +16069,9 @@
s="\\d{1,3}";
break;
case "a":
-var am=_d6b.am||info.am||"AM";
-var pm=_d6b.pm||info.pm||"PM";
-if(_d6b.strict){
+var am=_d6c.am||info.am||"AM";
+var pm=_d6c.pm||info.pm||"PM";
+if(_d6c.strict){
s=am+"|"+pm;
}else{
s=am;
@@ -16075,50 +16081,50 @@
}
break;
default:
-dojo.unimplemented("parse of date format, pattern="+_d6c);
+dojo.unimplemented("parse of date format, pattern="+_d6d);
}
-if(_d69){
-_d69.push(_d6d);
+if(_d6a){
+_d6a.push(_d6e);
}
return "\\s*("+s+")\\s*";
});
}
})();
-dojo.date.strftime=function(_d73,_d74,_d75){
-var _d76=null;
+dojo.date.strftime=function(_d74,_d75,_d76){
+var _d77=null;
function _(s,n){
-return dojo.string.pad(s,n||2,_d76||"0");
+return dojo.string.pad(s,n||2,_d77||"0");
}
-var info=dojo.date._getGregorianBundle(_d75);
-function $(_d7a){
-switch(_d7a){
+var info=dojo.date._getGregorianBundle(_d76);
+function $(_d7b){
+switch(_d7b){
case "a":
-return dojo.date.getDayShortName(_d73,_d75);
+return dojo.date.getDayShortName(_d74,_d76);
case "A":
-return dojo.date.getDayName(_d73,_d75);
+return dojo.date.getDayName(_d74,_d76);
case "b":
case "h":
-return dojo.date.getMonthShortName(_d73,_d75);
+return dojo.date.getMonthShortName(_d74,_d76);
case "B":
-return dojo.date.getMonthName(_d73,_d75);
+return dojo.date.getMonthName(_d74,_d76);
case "c":
-return dojo.date.format(_d73,{locale:_d75});
+return dojo.date.format(_d74,{locale:_d76});
case "C":
-return _(Math.floor(_d73.getFullYear()/100));
+return _(Math.floor(_d74.getFullYear()/100));
case "d":
-return _(_d73.getDate());
+return _(_d74.getDate());
case "D":
return $("m")+"/"+$("d")+"/"+$("y");
case "e":
-if(_d76==null){
-_d76=" ";
+if(_d77==null){
+_d77=" ";
}
-return _(_d73.getDate());
+return _(_d74.getDate());
case "f":
-if(_d76==null){
-_d76=" ";
+if(_d77==null){
+_d77=" ";
}
-return _(_d73.getMonth()+1);
+return _(_d74.getMonth()+1);
case "g":
break;
case "G":
@@ -16127,171 +16133,171 @@
case "F":
return $("Y")+"-"+$("m")+"-"+$("d");
case "H":
-return _(_d73.getHours());
+return _(_d74.getHours());
case "I":
-return _(_d73.getHours()%12||12);
+return _(_d74.getHours()%12||12);
case "j":
-return _(dojo.date.getDayOfYear(_d73),3);
+return _(dojo.date.getDayOfYear(_d74),3);
case "k":
-if(_d76==null){
-_d76=" ";
+if(_d77==null){
+_d77=" ";
}
-return _(_d73.getHours());
+return _(_d74.getHours());
case "l":
-if(_d76==null){
-_d76=" ";
+if(_d77==null){
+_d77=" ";
}
-return _(_d73.getHours()%12||12);
+return _(_d74.getHours()%12||12);
case "m":
-return _(_d73.getMonth()+1);
+return _(_d74.getMonth()+1);
case "M":
-return _(_d73.getMinutes());
+return _(_d74.getMinutes());
case "n":
return "\n";
case "p":
-return info[_d73.getHours()<12?"am":"pm"];
+return info[_d74.getHours()<12?"am":"pm"];
case "r":
return $("I")+":"+$("M")+":"+$("S")+" "+$("p");
case "R":
return $("H")+":"+$("M");
case "S":
-return _(_d73.getSeconds());
+return _(_d74.getSeconds());
case "t":
return "\t";
case "T":
return $("H")+":"+$("M")+":"+$("S");
case "u":
-return String(_d73.getDay()||7);
+return String(_d74.getDay()||7);
case "U":
-return _(dojo.date.getWeekOfYear(_d73));
+return _(dojo.date.getWeekOfYear(_d74));
case "V":
-return _(dojo.date.getIsoWeekOfYear(_d73));
+return _(dojo.date.getIsoWeekOfYear(_d74));
case "W":
-return _(dojo.date.getWeekOfYear(_d73,1));
+return _(dojo.date.getWeekOfYear(_d74,1));
case "w":
-return String(_d73.getDay());
+return String(_d74.getDay());
case "x":
-return dojo.date.format(_d73,{selector:"dateOnly",locale:_d75});
+return dojo.date.format(_d74,{selector:"dateOnly",locale:_d76});
case "X":
-return dojo.date.format(_d73,{selector:"timeOnly",locale:_d75});
+return dojo.date.format(_d74,{selector:"timeOnly",locale:_d76});
case "y":
-return _(_d73.getFullYear()%100);
+return _(_d74.getFullYear()%100);
case "Y":
-return String(_d73.getFullYear());
+return String(_d74.getFullYear());
case "z":
-var _d7b=_d73.getTimezoneOffset();
-return (_d7b>0?"-":"+")+_(Math.floor(Math.abs(_d7b)/60))+":"+_(Math.abs(_d7b)%60);
+var _d7c=_d74.getTimezoneOffset();
+return (_d7c>0?"-":"+")+_(Math.floor(Math.abs(_d7c)/60))+":"+_(Math.abs(_d7c)%60);
case "Z":
-return dojo.date.getTimezoneName(_d73);
+return dojo.date.getTimezoneName(_d74);
case "%":
return "%";
}
}
-var _d7c="";
+var _d7d="";
var i=0;
-var _d7e=0;
-var _d7f=null;
-while((_d7e=_d74.indexOf("%",i))!=-1){
-_d7c+=_d74.substring(i,_d7e++);
-switch(_d74.charAt(_d7e++)){
+var _d7f=0;
+var _d80=null;
+while((_d7f=_d75.indexOf("%",i))!=-1){
+_d7d+=_d75.substring(i,_d7f++);
+switch(_d75.charAt(_d7f++)){
case "_":
-_d76=" ";
+_d77=" ";
break;
case "-":
-_d76="";
+_d77="";
break;
case "0":
-_d76="0";
+_d77="0";
break;
case "^":
-_d7f="upper";
+_d80="upper";
break;
case "*":
-_d7f="lower";
+_d80="lower";
break;
case "#":
-_d7f="swap";
+_d80="swap";
break;
default:
-_d76=null;
-_d7e--;
+_d77=null;
+_d7f--;
break;
}
-var _d80=$(_d74.charAt(_d7e++));
-switch(_d7f){
+var _d81=$(_d75.charAt(_d7f++));
+switch(_d80){
case "upper":
-_d80=_d80.toUpperCase();
+_d81=_d81.toUpperCase();
break;
case "lower":
-_d80=_d80.toLowerCase();
+_d81=_d81.toLowerCase();
break;
case "swap":
-var _d81=_d80.toLowerCase();
-var _d82="";
+var _d82=_d81.toLowerCase();
+var _d83="";
var j=0;
var ch="";
-while(j<_d80.length){
-ch=_d80.charAt(j);
-_d82+=(ch==_d81.charAt(j))?ch.toUpperCase():ch.toLowerCase();
+while(j<_d81.length){
+ch=_d81.charAt(j);
+_d83+=(ch==_d82.charAt(j))?ch.toUpperCase():ch.toLowerCase();
j++;
}
-_d80=_d82;
+_d81=_d83;
break;
default:
break;
}
-_d7f=null;
-_d7c+=_d80;
-i=_d7e;
+_d80=null;
+_d7d+=_d81;
+i=_d7f;
}
-_d7c+=_d74.substring(i);
-return _d7c;
+_d7d+=_d75.substring(i);
+return _d7d;
};
(function(){
-var _d85=[];
-dojo.date.addCustomFormats=function(_d86,_d87){
-_d85.push({pkg:_d86,name:_d87});
-};
-dojo.date._getGregorianBundle=function(_d88){
-var _d89={};
-dojo.lang.forEach(_d85,function(desc){
-var _d8b=dojo.i18n.getLocalization(desc.pkg,desc.name,_d88);
-_d89=dojo.lang.mixin(_d89,_d8b);
+var _d86=[];
+dojo.date.addCustomFormats=function(_d87,_d88){
+_d86.push({pkg:_d87,name:_d88});
+};
+dojo.date._getGregorianBundle=function(_d89){
+var _d8a={};
+dojo.lang.forEach(_d86,function(desc){
+var _d8c=dojo.i18n.getLocalization(desc.pkg,desc.name,_d89);
+_d8a=dojo.lang.mixin(_d8a,_d8c);
},this);
-return _d89;
+return _d8a;
};
})();
dojo.date.addCustomFormats("dojo.i18n.calendar","gregorian");
dojo.date.addCustomFormats("dojo.i18n.calendar","gregorianExtras");
-dojo.date.getNames=function(item,type,use,_d8f){
-var _d90;
-var _d91=dojo.date._getGregorianBundle(_d8f);
-var _d92=[item,use,type];
+dojo.date.getNames=function(item,type,use,_d90){
+var _d91;
+var _d92=dojo.date._getGregorianBundle(_d90);
+var _d93=[item,use,type];
if(use=="standAlone"){
-_d90=_d91[_d92.join("-")];
+_d91=_d92[_d93.join("-")];
}
-_d92[1]="format";
-return (_d90||_d91[_d92.join("-")]).concat();
+_d93[1]="format";
+return (_d91||_d92[_d93.join("-")]).concat();
};
-dojo.date.getDayName=function(_d93,_d94){
-return dojo.date.getNames("days","wide","format",_d94)[_d93.getDay()];
+dojo.date.getDayName=function(_d94,_d95){
+return dojo.date.getNames("days","wide","format",_d95)[_d94.getDay()];
};
-dojo.date.getDayShortName=function(_d95,_d96){
-return dojo.date.getNames("days","abbr","format",_d96)[_d95.getDay()];
+dojo.date.getDayShortName=function(_d96,_d97){
+return dojo.date.getNames("days","abbr","format",_d97)[_d96.getDay()];
};
-dojo.date.getMonthName=function(_d97,_d98){
-return dojo.date.getNames("months","wide","format",_d98)[_d97.getMonth()];
+dojo.date.getMonthName=function(_d98,_d99){
+return dojo.date.getNames("months","wide","format",_d99)[_d98.getMonth()];
};
-dojo.date.getMonthShortName=function(_d99,_d9a){
-return dojo.date.getNames("months","abbr","format",_d9a)[_d99.getMonth()];
+dojo.date.getMonthShortName=function(_d9a,_d9b){
+return dojo.date.getNames("months","abbr","format",_d9b)[_d9a.getMonth()];
};
-dojo.date.toRelativeString=function(_d9b){
+dojo.date.toRelativeString=function(_d9c){
var now=new Date();
-var diff=(now-_d9b)/1000;
+var diff=(now-_d9c)/1000;
var end=" ago";
-var _d9f=false;
+var _da0=false;
if(diff<0){
-_d9f=true;
+_da0=true;
end=" from now";
diff=-diff;
}
@@ -16310,22 +16316,22 @@
if(diff<60*60*24*7){
diff=Math.round(diff/(3600*24));
if(diff==1){
-return _d9f?"Tomorrow":"Yesterday";
+return _da0?"Tomorrow":"Yesterday";
}else{
return diff+" days"+end;
}
}
-return dojo.date.format(_d9b);
+return dojo.date.format(_d9c);
};
-dojo.date.toSql=function(_da0,_da1){
-return dojo.date.strftime(_da0,"%F"+!_da1?" %T":"");
+dojo.date.toSql=function(_da1,_da2){
+return dojo.date.strftime(_da1,"%F"+!_da2?" %T":"");
};
-dojo.date.fromSql=function(_da2){
-var _da3=_da2.split(/[\- :]/g);
-while(_da3.length<6){
-_da3.push(0);
+dojo.date.fromSql=function(_da3){
+var _da4=_da3.split(/[\- :]/g);
+while(_da4.length<6){
+_da4.push(0);
}
-return new Date(_da3[0],(parseInt(_da3[1],10)-1),_da3[2],_da3[3],_da3[4],_da3[5]);
+return new Date(_da4[0],(parseInt(_da4[1],10)-1),_da4[2],_da4[3],_da4[4],_da4[5]);
};
dojo.provide("dojo.widget.TimePicker");
dojo.widget.defineWidget("dojo.widget.TimePicker",dojo.widget.HtmlWidget,function(){
@@ -16339,13 +16345,13 @@
this.selectedTime={hour:"",minute:"",amPm:"",anyTime:false};
this.hourIndexMap=["",2,4,6,8,10,1,3,5,7,9,11,0];
this.minuteIndexMap=[0,2,4,6,8,10,1,3,5,7,9,11];
-},{isContainer:false,templatePath:dojo.uri.moduleUri("dojo.widget","templates/TimePicker.html"),templateCssPath:dojo.uri.moduleUri("dojo.widget","templates/TimePicker.css"),postMixInProperties:function(_da4,frag){
+},{isContainer:false,templatePath:dojo.uri.moduleUri("dojo.widget","templates/TimePicker.html"),templateCssPath:dojo.uri.moduleUri("dojo.widget","templates/TimePicker.css"),postMixInProperties:function(_da5,frag){
dojo.widget.TimePicker.superclass.postMixInProperties.apply(this,arguments);
this.calendar=dojo.i18n.getLocalization("dojo.i18n.calendar","gregorian",this.lang);
this.widgetStrings=dojo.i18n.getLocalization("dojo.widget","TimePicker",this.lang);
},fillInTemplate:function(args,frag){
-var _da8=this.getFragNodeRef(frag);
-dojo.html.copyStyle(this.domNode,_da8);
+var _da9=this.getFragNodeRef(frag);
+dojo.html.copyStyle(this.domNode,_da9);
if(args.value){
if(args.value instanceof Date){
this.storedTime=dojo.date.toRfc3339(args.value);
@@ -16368,13 +16374,13 @@
}
},initUI:function(){
if(!this.selectedTime.anyTime&&this.time){
-var _da9=dojo.widget.TimePicker.util.toAmPmHour(this.time.getHours());
-var hour=_da9[0];
-var isAm=_da9[1];
-var _dac=this.time.getMinutes();
-var _dad=parseInt(_dac/5);
+var _daa=dojo.widget.TimePicker.util.toAmPmHour(this.time.getHours());
+var hour=_daa[0];
+var isAm=_daa[1];
+var _dad=this.time.getMinutes();
+var _dae=parseInt(_dad/5);
this.onSetSelectedHour(this.hourIndexMap[hour]);
-this.onSetSelectedMinute(this.minuteIndexMap[_dad]);
+this.onSetSelectedMinute(this.minuteIndexMap[_dae]);
this.onSetSelectedAmPm(isAm);
}else{
this.onSetSelectedAnyTime();
@@ -16388,8 +16394,8 @@
}
this.initData();
this.initUI();
-},setDateTime:function(_daf){
-this.storedTime=_daf;
+},setDateTime:function(_db0){
+this.storedTime=_db0;
},onClearSelectedHour:function(evt){
this.clearSelectedHour();
},onClearSelectedMinute:function(evt){
@@ -16404,19 +16410,19 @@
this.initUI();
}
},clearSelectedHour:function(){
-var _db4=this.hourContainerNode.getElementsByTagName("td");
-for(var i=0;i<_db4.length;i++){
-dojo.html.setClass(_db4.item(i),"");
+var _db5=this.hourContainerNode.getElementsByTagName("td");
+for(var i=0;i<_db5.length;i++){
+dojo.html.setClass(_db5.item(i),"");
}
},clearSelectedMinute:function(){
-var _db6=this.minuteContainerNode.getElementsByTagName("td");
-for(var i=0;i<_db6.length;i++){
-dojo.html.setClass(_db6.item(i),"");
+var _db7=this.minuteContainerNode.getElementsByTagName("td");
+for(var i=0;i<_db7.length;i++){
+dojo.html.setClass(_db7.item(i),"");
}
},clearSelectedAmPm:function(){
-var _db8=this.amPmContainerNode.getElementsByTagName("td");
-for(var i=0;i<_db8.length;i++){
-dojo.html.setClass(_db8.item(i),"");
+var _db9=this.amPmContainerNode.getElementsByTagName("td");
+for(var i=0;i<_db9.length;i++){
+dojo.html.setClass(_db9.item(i),"");
}
},clearSelectedAnyTime:function(){
dojo.html.setClass(this.anyTimeContainerNode,"anyTimeContainer");
@@ -16428,19 +16434,19 @@
},setSelectedHour:function(evt){
if(evt&&evt.target){
if(evt.target.nodeType==dojo.dom.ELEMENT_NODE){
-var _dbc=evt.target;
+var _dbd=evt.target;
}else{
-var _dbc=evt.target.parentNode;
+var _dbd=evt.target.parentNode;
}
dojo.event.browser.stopEvent(evt);
-dojo.html.setClass(_dbc,this.classNames.selectedTime);
-this.selectedTime["hour"]=_dbc.innerHTML;
+dojo.html.setClass(_dbd,this.classNames.selectedTime);
+this.selectedTime["hour"]=_dbd.innerHTML;
}else{
if(!isNaN(evt)){
-var _dbd=this.hourContainerNode.getElementsByTagName("td");
-if(_dbd.item(evt)){
-dojo.html.setClass(_dbd.item(evt),this.classNames.selectedTime);
-this.selectedTime["hour"]=_dbd.item(evt).innerHTML;
+var _dbe=this.hourContainerNode.getElementsByTagName("td");
+if(_dbe.item(evt)){
+dojo.html.setClass(_dbe.item(evt),this.classNames.selectedTime);
+this.selectedTime["hour"]=_dbe.item(evt).innerHTML;
}
}
}
@@ -16454,19 +16460,19 @@
},setSelectedMinute:function(evt){
if(evt&&evt.target){
if(evt.target.nodeType==dojo.dom.ELEMENT_NODE){
-var _dc0=evt.target;
+var _dc1=evt.target;
}else{
-var _dc0=evt.target.parentNode;
+var _dc1=evt.target.parentNode;
}
dojo.event.browser.stopEvent(evt);
-dojo.html.setClass(_dc0,this.classNames.selectedTime);
-this.selectedTime["minute"]=_dc0.innerHTML;
+dojo.html.setClass(_dc1,this.classNames.selectedTime);
+this.selectedTime["minute"]=_dc1.innerHTML;
}else{
if(!isNaN(evt)){
-var _dc1=this.minuteContainerNode.getElementsByTagName("td");
-if(_dc1.item(evt)){
-dojo.html.setClass(_dc1.item(evt),this.classNames.selectedTime);
-this.selectedTime["minute"]=_dc1.item(evt).innerHTML;
+var _dc2=this.minuteContainerNode.getElementsByTagName("td");
+if(_dc2.item(evt)){
+dojo.html.setClass(_dc2.item(evt),this.classNames.selectedTime);
+this.selectedTime["minute"]=_dc2.item(evt).innerHTML;
}
}
}
@@ -16477,20 +16483,20 @@
this.selectedTime.anyTime=false;
this.onSetTime();
},setSelectedAmPm:function(evt){
-var _dc4=evt.target;
-if(evt&&_dc4){
-if(_dc4.nodeType!=dojo.dom.ELEMENT_NODE){
-_dc4=_dc4.parentNode;
+var _dc5=evt.target;
+if(evt&&_dc5){
+if(_dc5.nodeType!=dojo.dom.ELEMENT_NODE){
+_dc5=_dc5.parentNode;
}
dojo.event.browser.stopEvent(evt);
-this.selectedTime.amPm=_dc4.id;
-dojo.html.setClass(_dc4,this.classNames.selectedTime);
+this.selectedTime.amPm=_dc5.id;
+dojo.html.setClass(_dc5,this.classNames.selectedTime);
}else{
evt=evt?0:1;
-var _dc5=this.amPmContainerNode.getElementsByTagName("td");
-if(_dc5.item(evt)){
-this.selectedTime.amPm=_dc5.item(evt).id;
-dojo.html.setClass(_dc5.item(evt),this.classNames.selectedTime);
+var _dc6=this.amPmContainerNode.getElementsByTagName("td");
+if(_dc6.item(evt)){
+this.selectedTime.amPm=_dc6.item(evt).id;
+dojo.html.setClass(_dc6.item(evt),this.classNames.selectedTime);
}
}
},onSetSelectedAnyTime:function(evt){
@@ -16507,72 +16513,72 @@
},onSetTime:function(){
if(this.selectedTime.anyTime){
this.time=new Date();
-var _dc9=dojo.widget.TimePicker.util.toRfcDateTime(this.time);
-this.setDateTime(_dc9.split("T")[0]);
+var _dca=dojo.widget.TimePicker.util.toRfcDateTime(this.time);
+this.setDateTime(_dca.split("T")[0]);
}else{
var hour=12;
-var _dcb=0;
+var _dcc=0;
var isAm=false;
if(this.selectedTime["hour"]){
hour=parseInt(this.selectedTime["hour"],10);
}
if(this.selectedTime["minute"]){
-_dcb=parseInt(this.selectedTime["minute"],10);
+_dcc=parseInt(this.selectedTime["minute"],10);
}
if(this.selectedTime["amPm"]){
isAm=(this.selectedTime["amPm"].toLowerCase()=="am");
}
this.time=new Date();
this.time.setHours(dojo.widget.TimePicker.util.fromAmPmHour(hour,isAm));
-this.time.setMinutes(_dcb);
+this.time.setMinutes(_dcc);
this.setDateTime(dojo.widget.TimePicker.util.toRfcDateTime(this.time));
}
this.onValueChanged(this.time);
},onValueChanged:function(date){
}});
dojo.widget.TimePicker.util=new function(){
-this.toRfcDateTime=function(_dce){
-if(!_dce){
-_dce=new Date();
+this.toRfcDateTime=function(_dcf){
+if(!_dcf){
+_dcf=new Date();
}
-_dce.setSeconds(0);
-return dojo.date.strftime(_dce,"%Y-%m-%dT%H:%M:00%z");
+_dcf.setSeconds(0);
+return dojo.date.strftime(_dcf,"%Y-%m-%dT%H:%M:00%z");
};
-this.fromRfcDateTime=function(_dcf,_dd0,_dd1){
-var _dd2=new Date();
-if(!_dcf||_dcf.indexOf("T")==-1){
-if(_dd0){
-_dd2.setMinutes(Math.floor(_dd2.getMinutes()/5)*5);
+this.fromRfcDateTime=function(_dd0,_dd1,_dd2){
+var _dd3=new Date();
+if(!_dd0||_dd0.indexOf("T")==-1){
+if(_dd1){
+_dd3.setMinutes(Math.floor(_dd3.getMinutes()/5)*5);
}else{
-_dd2.setMinutes(0);
+_dd3.setMinutes(0);
}
}else{
-var _dd3=_dcf.split("T")[1].split(":");
-var _dd2=new Date();
-_dd2.setHours(_dd3[0]);
-_dd2.setMinutes(_dd3[1]);
+var _dd4=_dd0.split("T")[1].split(":");
+var _dd3=new Date();
+_dd3.setHours(_dd4[0]);
+_dd3.setMinutes(_dd4[1]);
}
-return _dd2;
+return _dd3;
};
this.toAmPmHour=function(hour){
-var _dd5=hour;
+var _dd6=hour;
var isAm=true;
-if(_dd5==0){
-_dd5=12;
+if(_dd6==0){
+_dd6=12;
}else{
-if(_dd5>12){
-_dd5=_dd5-12;
+if(_dd6>12){
+_dd6=_dd6-12;
isAm=false;
}else{
-if(_dd5==12){
+if(_dd6==12){
isAm=false;
}
}
}
-return [_dd5,isAm];
+return [_dd6,isAm];
};
-this.fromAmPmHour=function(_dd7,isAm){
-var hour=parseInt(_dd7,10);
+this.fromAmPmHour=function(_dd8,isAm){
+var hour=parseInt(_dd8,10);
if(isAm&&hour==12){
hour=0;
}else{
@@ -16586,8 +16592,8 @@
dojo.provide("dojo.widget.DropdownTimePicker");
dojo.widget.defineWidget("dojo.widget.DropdownTimePicker",dojo.widget.DropdownContainer,{iconURL:dojo.uri.moduleUri("dojo.widget","templates/images/timeIcon.gif"),formatLength:"short",displayFormat:"",timeFormat:"",saveFormat:"",value:"",name:"",postMixInProperties:function(){
dojo.widget.DropdownTimePicker.superclass.postMixInProperties.apply(this,arguments);
-var _dda=dojo.i18n.getLocalization("dojo.widget","DropdownTimePicker",this.lang);
-this.iconAlt=_dda.selectTime;
+var _ddb=dojo.i18n.getLocalization("dojo.widget","DropdownTimePicker",this.lang);
+this.iconAlt=_ddb.selectTime;
if(typeof (this.value)=="string"&&this.value.toLowerCase()=="today"){
this.value=new Date();
}
@@ -16612,9 +16618,9 @@
}
},fillInTemplate:function(){
dojo.widget.DropdownTimePicker.superclass.fillInTemplate.apply(this,arguments);
-var _ddf="";
+var _de0="";
if(this.value instanceof Date){
-_ddf=this.value;
+_de0=this.value;
}else{
if(this.value){
var orig=this.value;
@@ -16626,11 +16632,11 @@
}
}
orig=c.join(":");
-_ddf=dojo.date.fromRfc3339(d+"T"+orig);
+_de0=dojo.date.fromRfc3339(d+"T"+orig);
}
}
-var _de4={widgetContainerId:this.widgetId,lang:this.lang,value:_ddf};
-this.timePicker=dojo.widget.createWidget("TimePicker",_de4,this.containerNode,"child");
+var _de5={widgetContainerId:this.widgetId,lang:this.lang,value:_de0};
+this.timePicker=dojo.widget.createWidget("TimePicker",_de5,this.containerNode,"child");
dojo.event.connect(this.timePicker,"onValueChanged",this,"_updateText");
if(this.value){
this._updateText();
@@ -16642,12 +16648,12 @@
return this.valueNode.value;
},getTime:function(){
return this.timePicker.storedTime;
-},setValue:function(_de5){
-this.setTime(_de5);
-},setTime:function(_de6){
-var _de7="";
-if(_de6 instanceof Date){
-_de7=_de6;
+},setValue:function(_de6){
+this.setTime(_de6);
+},setTime:function(_de7){
+var _de8="";
+if(_de7 instanceof Date){
+_de8=_de7;
}else{
if(this.value){
var orig=this.value;
@@ -16659,10 +16665,10 @@
}
}
orig=c.join(":");
-_de7=dojo.date.fromRfc3339(d+"T"+orig);
+_de8=dojo.date.fromRfc3339(d+"T"+orig);
}
}
-this.timePicker.setTime(_de7);
+this.timePicker.setTime(_de8);
this._syncValueNode();
},_updateText:function(){
if(this.timePicker.selectedTime.anyTime){
@@ -16678,43 +16684,43 @@
this._syncValueNode();
this.onValueChanged(this.getTime());
this.hideContainer();
-},onValueChanged:function(_dec){
+},onValueChanged:function(_ded){
},onInputChange:function(){
if(this.dateFormat){
dojo.deprecated("dojo.widget.DropdownTimePicker","Cannot parse user input. Must use displayFormat attribute instead of dateFormat. See dojo.date.format for specification.","0.5");
}else{
-var _ded=dojo.string.trim(this.inputNode.value);
-if(_ded){
-var _dee=dojo.date.parse(_ded,{formatLength:this.formatLength,timePattern:this.displayFormat,selector:"timeOnly",locale:this.lang});
+var _dee=dojo.string.trim(this.inputNode.value);
if(_dee){
-this.setTime(_dee);
+var _def=dojo.date.parse(_dee,{formatLength:this.formatLength,timePattern:this.displayFormat,selector:"timeOnly",locale:this.lang});
+if(_def){
+this.setTime(_def);
}
}else{
-this.valueNode.value=_ded;
+this.valueNode.value=_dee;
}
}
-if(_ded){
+if(_dee){
this._updateText();
}
},_syncValueNode:function(){
var time=this.timePicker.time;
-var _df0;
+var _df1;
switch(this.saveFormat.toLowerCase()){
case "rfc":
case "iso":
case "":
-_df0=dojo.date.toRfc3339(time,"timeOnly");
+_df1=dojo.date.toRfc3339(time,"timeOnly");
break;
case "posix":
case "unix":
-_df0=Number(time);
+_df1=Number(time);
break;
default:
-_df0=dojo.date.format(time,{datePattern:this.saveFormat,selector:"timeOnly",locale:this.lang});
+_df1=dojo.date.format(time,{datePattern:this.saveFormat,selector:"timeOnly",locale:this.lang});
}
-this.valueNode.value=_df0;
-},destroy:function(_df1){
-this.timePicker.destroy(_df1);
+this.valueNode.value=_df1;
+},destroy:function(_df2){
+this.timePicker.destroy(_df2);
dojo.widget.DropdownTimePicker.superclass.destroy.apply(this,arguments);
}});
dojo.provide("struts.widget.StrutsTimePicker");
@@ -16733,29 +16739,29 @@
}
},_syncValueNode:function(){
var time=this.timePicker.time;
-var _df3;
+var _df4;
switch(this.saveFormat.toLowerCase()){
case "rfc":
case "iso":
case "":
-_df3=dojo.date.toRfc3339(time);
+_df4=dojo.date.toRfc3339(time);
break;
case "posix":
case "unix":
-_df3=Number(time);
+_df4=Number(time);
break;
default:
-_df3=dojo.date.format(time,{datePattern:this.saveFormat,selector:"timeOnly",locale:this.lang});
+_df4=dojo.date.format(time,{datePattern:this.saveFormat,selector:"timeOnly",locale:this.lang});
}
-this.valueNode.value=_df3;
+this.valueNode.value=_df4;
},_updateText:function(){
struts.widget.StrutsTimePicker.superclass._updateText.apply(this,arguments);
if(this.valueNotifyTopicsArray!=null){
for(var i=0;i<this.valueNotifyTopicsArray.length;i++){
-var _df5=this.valueNotifyTopicsArray[i];
-if(!dojo.string.isBlank(_df5)){
+var _df6=this.valueNotifyTopicsArray[i];
+if(!dojo.string.isBlank(_df6)){
try{
-dojo.event.topic.publish(_df5,this.inputNode.value);
+dojo.event.topic.publish(_df6,this.inputNode.value);
}
catch(ex){
dojo.debug(ex);
@@ -16782,19 +16788,19 @@
}
},fillInTemplate:function(args,frag){
dojo.widget.DatePicker.superclass.fillInTemplate.apply(this,arguments);
-var _df8=this.getFragNodeRef(frag);
-dojo.html.copyStyle(this.domNode,_df8);
+var _df9=this.getFragNodeRef(frag);
+dojo.html.copyStyle(this.domNode,_df9);
this.weekTemplate=dojo.dom.removeNode(this.calendarWeekTemplate);
this._preInitUI(this.value?this.value:this.today,false,true);
-var _df9=dojo.lang.unnest(dojo.date.getNames("days",this.dayWidth,"standAlone",this.lang));
+var _dfa=dojo.lang.unnest(dojo.date.getNames("days",this.dayWidth,"standAlone",this.lang));
if(this.weekStartsOn>0){
for(var i=0;i<this.weekStartsOn;i++){
-_df9.push(_df9.shift());
+_dfa.push(_dfa.shift());
}
}
-var _dfb=this.dayLabelsRow.getElementsByTagName("td");
+var _dfc=this.dayLabelsRow.getElementsByTagName("td");
for(i=0;i<7;i++){
-_dfb.item(i).innerHTML=_df9[i];
+_dfc.item(i).innerHTML=_dfa[i];
}
if(this.value){
this.setValue(this.value);
@@ -16803,18 +16809,18 @@
return dojo.date.toRfc3339(new Date(this.value),"dateOnly");
},getDate:function(){
return this.value;
-},setValue:function(_dfc){
-this.setDate(_dfc);
-},setDate:function(_dfd){
-if(_dfd==""){
+},setValue:function(_dfd){
+this.setDate(_dfd);
+},setDate:function(_dfe){
+if(_dfe==""){
this.value="";
this._preInitUI(this.curMonth,false,true);
}else{
-if(typeof _dfd=="string"){
-this.value=dojo.date.fromRfc3339(_dfd);
+if(typeof _dfe=="string"){
+this.value=dojo.date.fromRfc3339(_dfe);
this.value.setHours(0,0,0,0);
}else{
-this.value=new Date(_dfd);
+this.value=new Date(_dfe);
this.value.setHours(0,0,0,0);
}
}
@@ -16830,7 +16836,7 @@
}
this.clickedNode=null;
this.onValueChanged(this.value);
-},_preInitUI:function(_dfe,_dff,_e00){
+},_preInitUI:function(_dff,_e00,_e01){
if(typeof (this.startDate)=="string"){
this.startDate=dojo.date.fromRfc3339(this.startDate);
}
@@ -16839,16 +16845,16 @@
}
this.startDate.setHours(0,0,0,0);
this.endDate.setHours(24,0,0,-1);
-if(_dfe<this.startDate||_dfe>this.endDate){
-_dfe=new Date((_dfe<this.startDate)?this.startDate:this.endDate);
+if(_dff<this.startDate||_dff>this.endDate){
+_dff=new Date((_dff<this.startDate)?this.startDate:this.endDate);
}
-this.firstDay=this._initFirstDay(_dfe,_dff);
+this.firstDay=this._initFirstDay(_dff,_e00);
this.selectedIsUsed=false;
this.currentIsUsed=false;
-var _e01=new Date(this.firstDay);
-var _e02=_e01.getMonth();
-this.curMonth=new Date(_e01);
-this.curMonth.setDate(_e01.getDate()+6);
+var _e02=new Date(this.firstDay);
+var _e03=_e02.getMonth();
+this.curMonth=new Date(_e02);
+this.curMonth.setDate(_e02.getDate()+6);
this.curMonth.setDate(1);
if(this.displayWeeks==""||this.adjustWeeks){
this.adjustWeeks=true;
@@ -16857,16 +16863,16 @@
var days=this.displayWeeks*7;
if(dojo.date.diff(this.startDate,this.endDate,dojo.date.dateParts.DAY)<days){
this.staticDisplay=true;
-if(dojo.date.diff(_e01,this.endDate,dojo.date.dateParts.DAY)>days){
+if(dojo.date.diff(_e02,this.endDate,dojo.date.dateParts.DAY)>days){
this._preInitUI(this.startDate,true,false);
-_e01=new Date(this.firstDay);
+_e02=new Date(this.firstDay);
}
-this.curMonth=new Date(_e01);
-this.curMonth.setDate(_e01.getDate()+6);
+this.curMonth=new Date(_e02);
+this.curMonth.setDate(_e02.getDate()+6);
this.curMonth.setDate(1);
-var _e04=(_e01.getMonth()==this.curMonth.getMonth())?"current":"previous";
+var _e05=(_e02.getMonth()==this.curMonth.getMonth())?"current":"previous";
}
-if(_e00){
+if(_e01){
this._initUI(days);
}
},_initUI:function(days){
@@ -16874,72 +16880,72 @@
for(var i=0;i<this.displayWeeks;i++){
this.calendarDatesContainerNode.appendChild(this.weekTemplate.cloneNode(true));
}
-var _e07=new Date(this.firstDay);
+var _e08=new Date(this.firstDay);
this._setMonthLabel(this.curMonth.getMonth());
this._setYearLabels(this.curMonth.getFullYear());
-var _e08=this.calendarDatesContainerNode.getElementsByTagName("td");
-var _e09=this.calendarDatesContainerNode.getElementsByTagName("tr");
-var _e0a;
+var _e09=this.calendarDatesContainerNode.getElementsByTagName("td");
+var _e0a=this.calendarDatesContainerNode.getElementsByTagName("tr");
+var _e0b;
for(i=0;i<days;i++){
-_e0a=_e08.item(i);
-_e0a.innerHTML=_e07.getDate();
-_e0a.setAttribute("djDateValue",_e07.valueOf());
-var _e0b=(_e07.getMonth()!=this.curMonth.getMonth()&&Number(_e07)<Number(this.curMonth))?"previous":(_e07.getMonth()==this.curMonth.getMonth())?"current":"next";
-var _e0c=_e0b;
-if(this._isDisabledDate(_e07)){
-var _e0d={previous:"disabledPrevious",current:"disabledCurrent",next:"disabledNext"};
-_e0c=_e0d[_e0b];
-}
-dojo.html.setClass(_e0a,this._getDateClassName(_e07,_e0c));
-if(dojo.html.hasClass(_e0a,this.classNames.selectedDate)){
-this.selectedNode=_e0a;
+_e0b=_e09.item(i);
+_e0b.innerHTML=_e08.getDate();
+_e0b.setAttribute("djDateValue",_e08.valueOf());
+var _e0c=(_e08.getMonth()!=this.curMonth.getMonth()&&Number(_e08)<Number(this.curMonth))?"previous":(_e08.getMonth()==this.curMonth.getMonth())?"current":"next";
+var _e0d=_e0c;
+if(this._isDisabledDate(_e08)){
+var _e0e={previous:"disabledPrevious",current:"disabledCurrent",next:"disabledNext"};
+_e0d=_e0e[_e0c];
+}
+dojo.html.setClass(_e0b,this._getDateClassName(_e08,_e0d));
+if(dojo.html.hasClass(_e0b,this.classNames.selectedDate)){
+this.selectedNode=_e0b;
}
-_e07=dojo.date.add(_e07,dojo.date.dateParts.DAY,1);
+_e08=dojo.date.add(_e08,dojo.date.dateParts.DAY,1);
}
-this.lastDay=dojo.date.add(_e07,dojo.date.dateParts.DAY,-1);
+this.lastDay=dojo.date.add(_e08,dojo.date.dateParts.DAY,-1);
this._initControls();
},_initControls:function(){
var d=this.firstDay;
var d2=this.lastDay;
-var _e10,_e11,_e12,_e13,_e14,_e15;
-_e10=_e11=_e12=_e13=_e14=_e15=!this.staticDisplay;
+var _e11,_e12,_e13,_e14,_e15,_e16;
+_e11=_e12=_e13=_e14=_e15=_e16=!this.staticDisplay;
with(dojo.date.dateParts){
var add=dojo.date.add;
-if(_e10&&add(d,DAY,(-1*(this._getAdjustedDay(d)+1)))<this.startDate){
-_e10=_e12=_e14=false;
-}
-if(_e11&&d2>this.endDate){
+if(_e11&&add(d,DAY,(-1*(this._getAdjustedDay(d)+1)))<this.startDate){
_e11=_e13=_e15=false;
}
-if(_e12&&add(d,DAY,-1)<this.startDate){
-_e12=_e14=false;
+if(_e12&&d2>this.endDate){
+_e12=_e14=_e16=false;
}
-if(_e13&&add(d2,DAY,1)>this.endDate){
+if(_e13&&add(d,DAY,-1)<this.startDate){
_e13=_e15=false;
}
-if(_e14&&add(d2,YEAR,-1)<this.startDate){
-_e14=false;
+if(_e14&&add(d2,DAY,1)>this.endDate){
+_e14=_e16=false;
}
-if(_e15&&add(d,YEAR,1)>this.endDate){
+if(_e15&&add(d2,YEAR,-1)<this.startDate){
_e15=false;
}
+if(_e16&&add(d,YEAR,1)>this.endDate){
+_e16=false;
+}
}
-function enableControl(node,_e18){
-dojo.html.setVisibility(node,_e18?"":"hidden");
+function enableControl(node,_e19){
+dojo.html.setVisibility(node,_e19?"":"hidden");
}
-enableControl(this.decreaseWeekNode,_e10);
-enableControl(this.increaseWeekNode,_e11);
-enableControl(this.decreaseMonthNode,_e12);
-enableControl(this.increaseMonthNode,_e13);
-enableControl(this.previousYearLabelNode,_e14);
-enableControl(this.nextYearLabelNode,_e15);
+enableControl(this.decreaseWeekNode,_e11);
+enableControl(this.increaseWeekNode,_e12);
+enableControl(this.decreaseMonthNode,_e13);
+enableControl(this.increaseMonthNode,_e14);
+enableControl(this.previousYearLabelNode,_e15);
+enableControl(this.nextYearLabelNode,_e16);
},_incrementWeek:function(evt){
var d=new Date(this.firstDay);
switch(evt.target){
case this.increaseWeekNode.getElementsByTagName("img").item(0):
case this.increaseWeekNode:
-var _e1b=dojo.date.add(d,dojo.date.dateParts.WEEK,1);
-if(_e1b<this.endDate){
+var _e1c=dojo.date.add(d,dojo.date.dateParts.WEEK,1);
+if(_e1c<this.endDate){
d=dojo.date.add(d,dojo.date.dateParts.WEEK,1);
}
break;
@@ -16953,60 +16959,60 @@
this._preInitUI(d,true,true);
},_incrementMonth:function(evt){
var d=new Date(this.curMonth);
-var _e1e=new Date(this.firstDay);
+var _e1f=new Date(this.firstDay);
switch(evt.currentTarget){
case this.increaseMonthNode.getElementsByTagName("img").item(0):
case this.increaseMonthNode:
-_e1e=dojo.date.add(_e1e,dojo.date.dateParts.DAY,this.displayWeeks*7);
-if(_e1e<this.endDate){
+_e1f=dojo.date.add(_e1f,dojo.date.dateParts.DAY,this.displayWeeks*7);
+if(_e1f<this.endDate){
d=dojo.date.add(d,dojo.date.dateParts.MONTH,1);
}else{
-var _e1f=true;
+var _e20=true;
}
break;
case this.decreaseMonthNode.getElementsByTagName("img").item(0):
case this.decreaseMonthNode:
-if(_e1e>this.startDate){
+if(_e1f>this.startDate){
d=dojo.date.add(d,dojo.date.dateParts.MONTH,-1);
}else{
-var _e20=true;
+var _e21=true;
}
break;
}
-if(_e20){
+if(_e21){
d=new Date(this.startDate);
}else{
-if(_e1f){
+if(_e20){
d=new Date(this.endDate);
}
}
this._preInitUI(d,false,true);
},_incrementYear:function(evt){
var year=this.curMonth.getFullYear();
-var _e23=new Date(this.firstDay);
+var _e24=new Date(this.firstDay);
switch(evt.target){
case this.nextYearLabelNode:
-_e23=dojo.date.add(_e23,dojo.date.dateParts.YEAR,1);
-if(_e23<this.endDate){
+_e24=dojo.date.add(_e24,dojo.date.dateParts.YEAR,1);
+if(_e24<this.endDate){
year++;
}else{
-var _e24=true;
+var _e25=true;
}
break;
case this.previousYearLabelNode:
-_e23=dojo.date.add(_e23,dojo.date.dateParts.YEAR,-1);
-if(_e23>this.startDate){
+_e24=dojo.date.add(_e24,dojo.date.dateParts.YEAR,-1);
+if(_e24>this.startDate){
year--;
}else{
-var _e25=true;
+var _e26=true;
}
break;
}
var d;
-if(_e25){
+if(_e26){
d=new Date(this.startDate);
}else{
-if(_e24){
+if(_e25){
d=new Date(this.endDate);
}else{
d=new Date(year,this.curMonth.getMonth(),1);
@@ -17028,8 +17034,8 @@
if(!this.staticDisplay){
this._incrementYear(evt);
}
-},_setMonthLabel:function(_e2a){
-this.monthLabelNode.innerHTML=dojo.date.getNames("months","wide","standAlone",this.lang)[_e2a];
+},_setMonthLabel:function(_e2b){
+this.monthLabelNode.innerHTML=dojo.date.getNames("months","wide","standAlone",this.lang)[_e2b];
},_setYearLabels:function(year){
var y=year-1;
var that=this;
@@ -17039,64 +17045,64 @@
f("previous");
f("current");
f("next");
-},_getDateClassName:function(date,_e30){
-var _e31=this.classNames[_e30];
+},_getDateClassName:function(date,_e31){
+var _e32=this.classNames[_e31];
if((!this.selectedIsUsed&&this.value)&&(Number(date)==Number(this.value))){
-_e31=this.classNames.selectedDate+" "+_e31;
+_e32=this.classNames.selectedDate+" "+_e32;
this.selectedIsUsed=true;
}
if((!this.currentIsUsed)&&(Number(date)==Number(this.today))){
-_e31=_e31+" "+this.classNames.currentDate;
+_e32=_e32+" "+this.classNames.currentDate;
this.currentIsUsed=true;
}
-return _e31;
+return _e32;
},onClick:function(evt){
dojo.event.browser.stopEvent(evt);
},_handleUiClick:function(evt){
-var _e34=evt.target;
-if(_e34.nodeType!=dojo.dom.ELEMENT_NODE){
-_e34=_e34.parentNode;
+var _e35=evt.target;
+if(_e35.nodeType!=dojo.dom.ELEMENT_NODE){
+_e35=_e35.parentNode;
}
dojo.event.browser.stopEvent(evt);
this.selectedIsUsed=this.todayIsUsed=false;
-if(dojo.html.hasClass(_e34,this.classNames["disabledPrevious"])||dojo.html.hasClass(_e34,this.classNames["disabledCurrent"])||dojo.html.hasClass(_e34,this.classNames["disabledNext"])){
+if(dojo.html.hasClass(_e35,this.classNames["disabledPrevious"])||dojo.html.hasClass(_e35,this.classNames["disabledCurrent"])||dojo.html.hasClass(_e35,this.classNames["disabledNext"])){
return;
}
-this.clickedNode=_e34;
-this.setDate(new Date(Number(dojo.html.getAttribute(_e34,"djDateValue"))));
+this.clickedNode=_e35;
+this.setDate(new Date(Number(dojo.html.getAttribute(_e35,"djDateValue"))));
},onValueChanged:function(date){
-},_isDisabledDate:function(_e36){
-if(_e36<this.startDate||_e36>this.endDate){
+},_isDisabledDate:function(_e37){
+if(_e37<this.startDate||_e37>this.endDate){
return true;
}
-return this.isDisabledDate(_e36,this.lang);
-},isDisabledDate:function(_e37,_e38){
+return this.isDisabledDate(_e37,this.lang);
+},isDisabledDate:function(_e38,_e39){
return false;
-},_initFirstDay:function(_e39,adj){
-var d=new Date(_e39);
+},_initFirstDay:function(_e3a,adj){
+var d=new Date(_e3a);
if(!adj){
d.setDate(1);
}
d.setDate(d.getDate()-this._getAdjustedDay(d,this.weekStartsOn));
d.setHours(0,0,0,0);
return d;
-},_getAdjustedDay:function(_e3c){
+},_getAdjustedDay:function(_e3d){
var days=[0,1,2,3,4,5,6];
if(this.weekStartsOn>0){
for(var i=0;i<this.weekStartsOn;i++){
days.unshift(days.pop());
}
}
-return days[_e3c.getDay()];
+return days[_e3d.getDay()];
},destroy:function(){
dojo.widget.DatePicker.superclass.destroy.apply(this,arguments);
dojo.html.destroyNode(this.weekTemplate);
}});
dojo.provide("dojo.widget.DropdownDatePicker");
-dojo.widget.defineWidget("dojo.widget.DropdownDatePicker",dojo.widget.DropdownContainer,{iconURL:dojo.uri.moduleUri("dojo.widget","templates/images/dateIcon.gif"),formatLength:"short",displayFormat:"",saveFormat:"",value:"",name:"",displayWeeks:6,adjustWeeks:false,startDate:"1492-10-12",endDate:"2941-10-12",weekStartsOn:"",staticDisplay:false,postMixInProperties:function(_e3f,frag){
+dojo.widget.defineWidget("dojo.widget.DropdownDatePicker",dojo.widget.DropdownContainer,{iconURL:dojo.uri.moduleUri("dojo.widget","templates/images/dateIcon.gif"),formatLength:"short",displayFormat:"",saveFormat:"",value:"",name:"",displayWeeks:6,adjustWeeks:false,startDate:"1492-10-12",endDate:"2941-10-12",weekStartsOn:"",staticDisplay:false,postMixInProperties:function(_e40,frag){
dojo.widget.DropdownDatePicker.superclass.postMixInProperties.apply(this,arguments);
-var _e41=dojo.i18n.getLocalization("dojo.widget","DropdownDatePicker",this.lang);
-this.iconAlt=_e41.selectDate;
+var _e42=dojo.i18n.getLocalization("dojo.widget","DropdownDatePicker",this.lang);
+this.iconAlt=_e42.selectDate;
if(typeof (this.value)=="string"&&this.value.toLowerCase()=="today"){
this.value=new Date();
}
@@ -17113,8 +17119,8 @@
}
},fillInTemplate:function(args,frag){
dojo.widget.DropdownDatePicker.superclass.fillInTemplate.call(this,args,frag);
-var _e45={widgetContainerId:this.widgetId,lang:this.lang,value:this.value,startDate:this.startDate,endDate:this.endDate,displayWeeks:this.displayWeeks,weekStartsOn:this.weekStartsOn,adjustWeeks:this.adjustWeeks,staticDisplay:this.staticDisplay};
-this.datePicker=dojo.widget.createWidget("DatePicker",_e45,this.containerNode,"child");
+var _e46={widgetContainerId:this.widgetId,lang:this.lang,value:this.value,startDate:this.startDate,endDate:this.endDate,displayWeeks:this.displayWeeks,weekStartsOn:this.weekStartsOn,adjustWeeks:this.adjustWeeks,staticDisplay:this.staticDisplay};
+this.datePicker=dojo.widget.createWidget("DatePicker",_e46,this.containerNode,"child");
dojo.event.connect(this.datePicker,"onValueChanged",this,"_updateText");
dojo.event.connect(this.inputNode,"onChange",this,"_updateText");
if(this.value){
@@ -17126,10 +17132,10 @@
return this.valueNode.value;
},getDate:function(){
return this.datePicker.value;
-},setValue:function(_e46){
-this.setDate(_e46);
-},setDate:function(_e47){
-this.datePicker.setDate(_e47);
+},setValue:function(_e47){
+this.setDate(_e47);
+},setDate:function(_e48){
+this.datePicker.setDate(_e48);
this._syncValueNode();
},_updateText:function(){
this.inputNode.value=this.datePicker.value?dojo.date.format(this.datePicker.value,{formatLength:this.formatLength,datePattern:this.displayFormat,selector:"dateOnly",locale:this.lang}):"";
@@ -17139,44 +17145,44 @@
this._syncValueNode();
this.onValueChanged(this.getDate());
this.hideContainer();
-},onValueChanged:function(_e48){
+},onValueChanged:function(_e49){
},onInputChange:function(){
-var _e49=dojo.string.trim(this.inputNode.value);
-if(_e49){
-var _e4a=dojo.date.parse(_e49,{formatLength:this.formatLength,datePattern:this.displayFormat,selector:"dateOnly",locale:this.lang});
-if(!this.datePicker._isDisabledDate(_e4a)){
-this.setDate(_e4a);
+var _e4a=dojo.string.trim(this.inputNode.value);
+if(_e4a){
+var _e4b=dojo.date.parse(_e4a,{formatLength:this.formatLength,datePattern:this.displayFormat,selector:"dateOnly",locale:this.lang});
+if(!this.datePicker._isDisabledDate(_e4b)){
+this.setDate(_e4b);
}
}else{
-if(_e49==""){
+if(_e4a==""){
this.datePicker.setDate("");
}
-this.valueNode.value=_e49;
+this.valueNode.value=_e4a;
}
-if(_e49){
+if(_e4a){
this._updateText();
}
},_syncValueNode:function(){
var date=this.datePicker.value;
-var _e4c="";
+var _e4d="";
switch(this.saveFormat.toLowerCase()){
case "rfc":
case "iso":
case "":
-_e4c=dojo.date.toRfc3339(date,"dateOnly");
+_e4d=dojo.date.toRfc3339(date,"dateOnly");
break;
case "posix":
case "unix":
-_e4c=Number(date);
+_e4d=Number(date);
break;
default:
if(date){
-_e4c=dojo.date.format(date,{datePattern:this.saveFormat,selector:"dateOnly",locale:this.lang});
+_e4d=dojo.date.format(date,{datePattern:this.saveFormat,selector:"dateOnly",locale:this.lang});
}
}
-this.valueNode.value=_e4c;
-},destroy:function(_e4d){
-this.datePicker.destroy(_e4d);
+this.valueNode.value=_e4d;
+},destroy:function(_e4e){
+this.datePicker.destroy(_e4e);
dojo.widget.DropdownDatePicker.superclass.destroy.apply(this,arguments);
}});
dojo.provide("struts.widget.StrutsDatePicker");
@@ -17195,10 +17201,10 @@
struts.widget.StrutsDatePicker.superclass._updateText.apply(this,arguments);
if(this.valueNotifyTopicsArray!=null){
for(var i=0;i<this.valueNotifyTopicsArray.length;i++){
-var _e4f=this.valueNotifyTopicsArray[i];
-if(!dojo.string.isBlank(_e4f)){
+var _e50=this.valueNotifyTopicsArray[i];
+if(!dojo.string.isBlank(_e50)){
try{
-dojo.event.topic.publish(_e4f,this.inputNode.value);
+dojo.event.topic.publish(_e50,this.inputNode.value);
}
catch(ex){
dojo.debug(ex);
@@ -17212,14 +17218,14 @@
struts.widget.BindEvent.superclass.postCreate.apply(this);
var self=this;
if(!dojo.string.isBlank(this.events)&&!dojo.string.isBlank(this.sources)){
-var _e51=this.events.split(",");
-var _e52=this.sources.split(",");
-if(_e51&&this.domNode){
-dojo.lang.forEach(_e51,function(_e53){
+var _e52=this.events.split(",");
+var _e53=this.sources.split(",");
+if(_e52&&this.domNode){
dojo.lang.forEach(_e52,function(_e54){
-var _e55=dojo.byId(_e54);
-if(_e55){
-dojo.event.connect(_e55,_e53,function(evt){
+dojo.lang.forEach(_e53,function(_e55){
+var _e56=dojo.byId(_e55);
+if(_e56){
+dojo.event.connect(_e56,_e54,function(evt){
evt.preventDefault();
evt.stopPropagation();
self.reloadContents();
@@ -17264,26 +17270,26 @@
break;
}
}
-},onTreeDestroy:function(_e5a){
-this.unlistenTree(_e5a.source);
+},onTreeDestroy:function(_e5b){
+this.unlistenTree(_e5b.source);
if(this.dieWithTree){
this.destroy();
}
-},onCollapse:function(_e5b){
+},onCollapse:function(_e5c){
if(!this.selectedNode){
return;
}
-var node=_e5b.source;
-var _e5d=this.selectedNode.parent;
-while(_e5d!==node&&_e5d.isTreeNode){
-_e5d=_e5d.parent;
+var node=_e5c.source;
+var _e5e=this.selectedNode.parent;
+while(_e5e!==node&&_e5e.isTreeNode){
+_e5e=_e5e.parent;
}
-if(_e5d.isTreeNode){
+if(_e5e.isTreeNode){
this.deselect();
}
-},select:function(_e5e){
-var node=_e5e.source;
-var e=_e5e.event;
+},select:function(_e5f){
+var node=_e5f.source;
+var e=_e5f.event;
if(this.selectedNode===node){
if(e.ctrlKey||e.shiftKey||e.metaKey){
this.deselect();
@@ -17297,15 +17303,15 @@
}
this.doSelect(node);
dojo.event.topic.publish(this.eventNames.select,{node:node});
-},onMoveFrom:function(_e61){
-if(_e61.child!==this.selectedNode){
+},onMoveFrom:function(_e62){
+if(_e62.child!==this.selectedNode){
return;
}
-if(!dojo.lang.inArray(this.listenedTrees,_e61.newTree)){
+if(!dojo.lang.inArray(this.listenedTrees,_e62.newTree)){
this.deselect();
}
-},onRemoveNode:function(_e62){
-if(_e62.child!==this.selectedNode){
+},onRemoveNode:function(_e63){
+if(_e63.child!==this.selectedNode){
return;
}
this.deselect();
@@ -17338,13 +17344,13 @@
dojo.event.topic.unsubscribe(tree.eventNames.collapse,this,"collapse");
dojo.event.topic.unsubscribe(tree.eventNames.expand,this,"expand");
struts.widget.StrutsTreeSelector.superclass.unlistenTree.apply(this,[tree]);
-},publishTopics:function(_e67,node){
-if(_e67!=null){
-for(var i=0;i<_e67.length;i++){
-var _e6a=_e67[i];
-if(!dojo.string.isBlank(_e6a)){
+},publishTopics:function(_e68,node){
+if(_e68!=null){
+for(var i=0;i<_e68.length;i++){
+var _e6b=_e68[i];
+if(!dojo.string.isBlank(_e6b)){
try{
-dojo.event.topic.publish(_e6a,node);
+dojo.event.topic.publish(_e6b,node);
}
catch(ex){
dojo.debug(ex);
@@ -17352,9 +17358,9 @@
}
}
}
-},select:function(_e6b){
-var node=_e6b.source;
-var e=_e6b.event;
+},select:function(_e6c){
+var node=_e6c.source;
+var e=_e6c.event;
if(this.selectedNode===node){
if(e.ctrlKey||e.shiftKey||e.metaKey){
this.deselect();
@@ -17368,11 +17374,11 @@
}
this.doSelect(node);
this.publishTopics(this.selectedNotifyTopicsArray,{node:node});
-},expand:function(_e6e){
-var node=_e6e.source;
+},expand:function(_e6f){
+var node=_e6f.source;
this.publishTopics(this.expandedNotifyTopicsArray,{node:node});
-},collapse:function(_e70){
-var node=_e70.source;
+},collapse:function(_e71){
+var node=_e71.source;
this.publishTopics(this.collapsedNotifyTopicsArray,{node:node});
},});
dojo.kwCompoundRequire({common:["struts.widget.Bind","struts.widget.BindDiv","struts.widget.BindAnchor","struts.widget.ComboBox","struts.widget.StrutsTimePicker","struts.widget.StrutsDatePicker","struts.widget.BindEvent","struts.widget.StrutsTreeSelector"]});
Modified: struts/struts2/trunk/plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/struts_dojo.js.uncompressed.js
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/struts_dojo.js.uncompressed.js?view=diff&rev=533543&r1=533542&r2=533543
==============================================================================
--- struts/struts2/trunk/plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/struts_dojo.js.uncompressed.js (original)
+++ struts/struts2/trunk/plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/struts_dojo.js.uncompressed.js Sun Apr 29 11:53:08 2007
@@ -24106,17 +24106,25 @@
}
} else {
//try to find a match
+ var tmpArrData = [];
for(var key in data){
//does it start with the field name? take it
if(dojo.string.startsWith(key, this.cbox.name)) {
arrData = data[key];
break;
+ } else {
+ //if nathing else is found, we will use values in this
+ //object as the data
+ tmpArrData.push([data[key], key]);
}
//grab the first array found, we will use it if nothing else
//is found
- if(!arrData && dojo.lang.isArray(data[key])) {
+ if(!arrData && dojo.lang.isArray(data[key]) && !dojo.lang.isString(data[key])) {
arrData = data[key];
}
+ }
+ if(!arrData) {
+ arrData = tmpArrData;
}
}