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/13 03:59:06 UTC
svn commit: r528315 - 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: Thu Apr 12 18:59:06 2007
New Revision: 528315
URL: http://svn.apache.org/viewvc?view=rev&rev=528315
Log:
WW-1872 The autocompleter shoul accept a map of values also as its datasource
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=528315&r1=528314&r2=528315
==============================================================================
--- 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 Thu Apr 12 18:59:06 2007
@@ -27,32 +27,42 @@
formNode: dojo.byId(this.formId),
formFilter: window[this.formFilter],
handler: dojo.lang.hitch(this, function(type, data, evt) {
- this.firstRequest = false;
//hide indicator
dojo.html.hide(this.cbox.indicator);
//if notifyTopics is published on the first request (onload)
//the value of listeners will be reset
if(!this.firstRequest) {
+ this.firstRequest = false;
this.cbox.notify.apply(this.cbox, [data, type, evt]);
}
+ var arrData = null;
+ var dataByName = data[this.cbox.dataFieldName];
if(!dojo.lang.isArray(data)) {
//if there is a dataFieldName, take it
- if(!dojo.string.isBlank(this.cbox.dataFieldName) && data[this.cbox.dataFieldName] != null) {
- arrData = data[this.cbox.dataFieldName];
+ if(dataByName) {
+ if(dojo.lang.isArray(dataByName)) {
+ //ok, it is an array
+ arrData = dataByName;
+ } else if(dojo.lang.isObject(dataByName)) {
+ //it is an object, treat it like a map
+ arrData = [];
+ for(var key in dataByName){
+ arrData.push([dataByName[key], key]);
+ }
+ }
} else {
//try to find a match
- var arrData = null;
for(var key in data){
//does it start with the field name? take it
- if(key == this.cbox.name) {
+ if(dojo.string.startsWith(key, this.cbox.name)) {
arrData = data[key];
break;
}
//grab the first array found, we will use it if nothing else
//is found
if(!arrData && dojo.lang.isArray(data[key])) {
- arrData = data = data[key];
+ arrData = data[key];
}
}
}
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=528315&r1=528314&r2=528315
==============================================================================
--- 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 Thu Apr 12 18:59:06 2007
@@ -14783,23 +14783,33 @@
this.getData=function(url){
dojo.html.show(this.cbox.indicator);
dojo.io.bind({url:url,formNode:dojo.byId(this.formId),formFilter:window[this.formFilter],handler:dojo.lang.hitch(this,function(type,data,evt){
-this.firstRequest=false;
dojo.html.hide(this.cbox.indicator);
if(!this.firstRequest){
+this.firstRequest=false;
this.cbox.notify.apply(this.cbox,[data,type,evt]);
}
+var _c56=null;
+var _c57=data[this.cbox.dataFieldName];
if(!dojo.lang.isArray(data)){
-if(!dojo.string.isBlank(this.cbox.dataFieldName)&&data[this.cbox.dataFieldName]!=null){
-_c56=data[this.cbox.dataFieldName];
+if(_c57){
+if(dojo.lang.isArray(_c57)){
+_c56=_c57;
+}else{
+if(dojo.lang.isObject(_c57)){
+_c56=[];
+for(var key in _c57){
+_c56.push([_c57[key],key]);
+}
+}
+}
}else{
-var _c56=null;
for(var key in data){
-if(key==this.cbox.name){
+if(dojo.string.startsWith(key,this.cbox.name)){
_c56=data[key];
break;
}
if(!_c56&&dojo.lang.isArray(data[key])){
-_c56=data=data[key];
+_c56=data[key];
}
}
}
@@ -14808,14 +14818,14 @@
this.setData(data);
}),mimetype:"text/json"});
};
-this.startSearch=function(_c58,_c59){
-this._preformSearch(_c58,_c59);
+this.startSearch=function(_c59,_c5a){
+this._preformSearch(_c59,_c5a);
};
-this._preformSearch=function(_c5a,_c5b){
+this._preformSearch=function(_c5b,_c5c){
var st=this.searchType;
var ret=[];
if(!this.caseSensitive){
-_c5a=_c5a.toLowerCase();
+_c5b=_c5b.toLowerCase();
}
for(var x=0;x<this.data.length;x++){
if(!this.data[x]){
@@ -14824,37 +14834,37 @@
if((this.searchLimit>0)&&(ret.length>=this.searchLimit)){
break;
}
-var _c5f=new String((!this.caseSensitive)?this.data[x][0].toLowerCase():this.data[x][0]);
-if(_c5f.length<_c5a.length){
+var _c60=new String((!this.caseSensitive)?this.data[x][0].toLowerCase():this.data[x][0]);
+if(_c60.length<_c5b.length){
continue;
}
if(st=="STARTSTRING"){
-if(_c5a==_c5f.substr(0,_c5a.length)){
+if(_c5b==_c60.substr(0,_c5b.length)){
ret.push(this.data[x]);
}
}else{
if(st=="SUBSTRING"){
-if(_c5f.indexOf(_c5a)>=0){
+if(_c60.indexOf(_c5b)>=0){
ret.push(this.data[x]);
}
}else{
if(st=="STARTWORD"){
-var idx=_c5f.indexOf(_c5a);
+var idx=_c60.indexOf(_c5b);
if(idx==0){
ret.push(this.data[x]);
}
if(idx<=0){
continue;
}
-var _c61=false;
+var _c62=false;
while(idx!=-1){
-if(" ,/(".indexOf(_c5f.charAt(idx-1))!=-1){
-_c61=true;
+if(" ,/(".indexOf(_c60.charAt(idx-1))!=-1){
+_c62=true;
break;
}
-idx=_c5f.indexOf(_c5a,idx+1);
+idx=_c60.indexOf(_c5b,idx+1);
}
-if(!_c61){
+if(!_c62){
continue;
}else{
ret.push(this.data[x]);
@@ -14863,17 +14873,17 @@
}
}
}
-_c5b(ret);
+_c5c(ret);
};
-this.addData=function(_c62){
-this.data=this.data.concat(_c62);
+this.addData=function(_c63){
+this.data=this.data.concat(_c63);
};
-this.setData=function(_c63){
-this.data=_c63;
+this.setData=function(_c64){
+this.data=_c64;
for(var i=0;i<this.data.length;i++){
-var _c65=this.data[i];
-if(!dojo.lang.isArray(_c65)){
-this.data[i]=[_c65,_c65];
+var _c66=this.data[i];
+if(!dojo.lang.isArray(_c66)){
+this.data[i]=[_c66,_c66];
}
}
};
@@ -14886,10 +14896,10 @@
var data=[];
for(var x=0;x<ol;x++){
var text=opts[x].textContent||opts[x].innerText||opts[x].innerHTML;
-var _c6b=[String(text),String(opts[x].value)];
-data.push(_c6b);
+var _c6c=[String(text),String(opts[x].value)];
+data.push(_c6c);
if(opts[x].selected){
-this.cbox.setAllValues(_c6b[0],_c6b[1]);
+this.cbox.setAllValues(_c6c[0],_c6c[1]);
}
}
this.setData(data);
@@ -14897,55 +14907,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"),showResultList:function(){
-var _c6c=this.optionsListNode.childNodes;
-if(_c6c.length){
+var _c6d=this.optionsListNode.childNodes;
+if(_c6d.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(_c6c[0]).height;
+this.itemHeight=dojo.html.getMarginBox(_c6d[0]).height;
}
-var _c6d=this.itemHeight*_c6c.length;
-if(_c6d<this.dropdownHeight){
-this.optionsListNode.style.height=_c6d+2+"px";
+var _c6e=this.itemHeight*_c6d.length;
+if(_c6e<this.dropdownHeight){
+this.optionsListNode.style.height=_c6e+2+"px";
}
this.popupWidget.open(this.domNode,this,this.downArrowNode);
}else{
this._hideResultList();
}
-},_openResultList:function(_c6e){
+},_openResultList:function(_c6f){
if(this.disabled){
return;
}
this._clearResultList();
-if(!_c6e.length){
+if(!_c6f.length){
this._hideResultList();
}
-if((this.autoComplete)&&(_c6e.length)&&(!this._prev_key_backspace)&&(this.textInputNode.value.length>0)){
+if((this.autoComplete)&&(_c6f.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+=_c6e[0][0].substr(cpos);
+this.textInputNode.value+=_c6f[0][0].substr(cpos);
this._setSelectedRange(this.textInputNode,cpos,this.textInputNode.value.length);
}
}
-var _c70=this.textInputNode.value;
+var _c71=this.textInputNode.value;
var even=true;
-while(_c6e.length){
-var tr=_c6e.shift();
+while(_c6f.length){
+var tr=_c6f.shift();
if(tr){
var td=document.createElement("div");
var text=tr[0];
-var i=text.toLowerCase().indexOf(_c70.toLowerCase());
+var i=text.toLowerCase().indexOf(_c71.toLowerCase());
if(i>=0){
var pre=text.substring(0,i);
-var _c77=text.substring(i,i+_c70.length);
-var post=text.substring(i+_c70.length);
+var _c78=text.substring(i,i+_c71.length);
+var post=text.substring(i+_c71.length);
if(!dojo.string.isBlank(pre)){
td.appendChild(document.createTextNode(pre));
}
-var _c79=document.createElement("b");
-td.appendChild(_c79);
-_c79.appendChild(document.createTextNode(_c77));
+var _c7a=document.createElement("b");
+td.appendChild(_c7a);
+_c7a.appendChild(document.createTextNode(_c78));
td.appendChild(document.createTextNode(post));
}else{
td.appendChild(document.createTextNode(tr[0]));
@@ -14962,12 +14972,12 @@
struts.widget.ComboBox.superclass.postCreate.apply(this);
var self=this;
if(!dojo.string.isBlank(this.listenTopics)){
-var _c7b=this.listenTopics.split(",");
-for(var i=0;i<_c7b.length;i++){
-dojo.event.topic.subscribe(_c7b[i],function(){
-var _c7d={cancel:false};
-self.notify(this.widgetId,"before",_c7d);
-if(_c7d.cancel){
+var _c7c=this.listenTopics.split(",");
+for(var i=0;i<_c7c.length;i++){
+dojo.event.topic.subscribe(_c7c[i],function(){
+var _c7e={cancel:false};
+self.notify(this.widgetId,"before",_c7e);
+if(_c7e.cancel){
return;
}
self.clearValues();
@@ -15009,37 +15019,37 @@
},notify:function(data,type,e){
if(this.notifyTopicsArray){
var self=this;
-dojo.lang.forEach(this.notifyTopicsArray,function(_c83){
+dojo.lang.forEach(this.notifyTopicsArray,function(_c84){
try{
-dojo.event.topic.publish(_c83,data,type,e);
+dojo.event.topic.publish(_c84,data,type,e);
}
catch(ex){
self.log(ex);
}
});
}
-var _c84=null;
+var _c85=null;
switch(type){
case "before":
-_c84=this.beforeNotifyTopicsArray;
+_c85=this.beforeNotifyTopicsArray;
break;
case "load":
-_c84=this.afterNotifyTopicsArray;
+_c85=this.afterNotifyTopicsArray;
break;
case "error":
-_c84=this.errorNotifyTopicsArray;
+_c85=this.errorNotifyTopicsArray;
break;
case "valuechanged":
-_c84=this.valueNotifyTopicsArray;
+_c85=this.valueNotifyTopicsArray;
break;
}
-this.notifyTo(_c84,data,type,e);
-},notifyTo:function(_c85,data,type,e){
+this.notifyTo(_c85,data,type,e);
+},notifyTo:function(_c86,data,type,e){
var self=this;
-if(_c85){
-dojo.lang.forEach(_c85,function(_c8a){
+if(_c86){
+dojo.lang.forEach(_c86,function(_c8b){
try{
-dojo.event.topic.publish(_c8a,data,type,e);
+dojo.event.topic.publish(_c8b,data,type,e);
}
catch(ex){
self.log(ex);
@@ -15049,18 +15059,18 @@
},log:function(text){
dojo.debug("["+(this.widgetId?this.widgetId:"unknown")+"] "+text);
},startSearchFromInput:function(){
-var _c8c=this.textInputNode.value;
+var _c8d=this.textInputNode.value;
if(this.loadOnType){
-if(_c8c.length>=this.loadMinimum){
-var _c8d=this.dataUrl+(this.dataUrl.indexOf("?")>-1?"&":"?");
-_c8d+=this.name+"="+_c8c;
-this.dataProvider.getData(_c8d);
-this.startSearch(_c8c);
+if(_c8d.length>=this.loadMinimum){
+var _c8e=this.dataUrl+(this.dataUrl.indexOf("?")>-1?"&":"?");
+_c8e+=this.name+"="+_c8d;
+this.dataProvider.getData(_c8e);
+this.startSearch(_c8d);
}else{
this._hideResultList();
}
}else{
-this.startSearch(_c8c);
+this.startSearch(_c8d);
}
}});
dojo.provide("dojo.widget.DropdownContainer");
@@ -15108,197 +15118,197 @@
dojo.widget.DropdownContainer.superclass.disable.apply(this,arguments);
}});
dojo.provide("dojo.date.serialize");
-dojo.date.setIso8601=function(_c91,_c92){
-var _c93=(_c92.indexOf("T")==-1)?_c92.split(" "):_c92.split("T");
-_c91=dojo.date.setIso8601Date(_c91,_c93[0]);
-if(_c93.length==2){
-_c91=dojo.date.setIso8601Time(_c91,_c93[1]);
-}
-return _c91;
-};
-dojo.date.fromIso8601=function(_c94){
-return dojo.date.setIso8601(new Date(0,0),_c94);
-};
-dojo.date.setIso8601Date=function(_c95,_c96){
-var _c97="^([0-9]{4})((-?([0-9]{2})(-?([0-9]{2}))?)|"+"(-?([0-9]{3}))|(-?W([0-9]{2})(-?([1-7]))?))?$";
-var d=_c96.match(new RegExp(_c97));
+dojo.date.setIso8601=function(_c92,_c93){
+var _c94=(_c93.indexOf("T")==-1)?_c93.split(" "):_c93.split("T");
+_c92=dojo.date.setIso8601Date(_c92,_c94[0]);
+if(_c94.length==2){
+_c92=dojo.date.setIso8601Time(_c92,_c94[1]);
+}
+return _c92;
+};
+dojo.date.fromIso8601=function(_c95){
+return dojo.date.setIso8601(new Date(0,0),_c95);
+};
+dojo.date.setIso8601Date=function(_c96,_c97){
+var _c98="^([0-9]{4})((-?([0-9]{2})(-?([0-9]{2}))?)|"+"(-?([0-9]{3}))|(-?W([0-9]{2})(-?([1-7]))?))?$";
+var d=_c97.match(new RegExp(_c98));
if(!d){
-dojo.debug("invalid date string: "+_c96);
+dojo.debug("invalid date string: "+_c97);
return null;
}
var year=d[1];
-var _c9a=d[4];
+var _c9b=d[4];
var date=d[6];
-var _c9c=d[8];
+var _c9d=d[8];
var week=d[10];
-var _c9e=d[12]?d[12]:1;
-_c95.setFullYear(year);
-if(_c9c){
-_c95.setMonth(0);
-_c95.setDate(Number(_c9c));
+var _c9f=d[12]?d[12]:1;
+_c96.setFullYear(year);
+if(_c9d){
+_c96.setMonth(0);
+_c96.setDate(Number(_c9d));
}else{
if(week){
-_c95.setMonth(0);
-_c95.setDate(1);
-var gd=_c95.getDay();
+_c96.setMonth(0);
+_c96.setDate(1);
+var gd=_c96.getDay();
var day=gd?gd:7;
-var _ca1=Number(_c9e)+(7*Number(week));
+var _ca2=Number(_c9f)+(7*Number(week));
if(day<=4){
-_c95.setDate(_ca1+1-day);
+_c96.setDate(_ca2+1-day);
}else{
-_c95.setDate(_ca1+8-day);
+_c96.setDate(_ca2+8-day);
}
}else{
-if(_c9a){
-_c95.setDate(1);
-_c95.setMonth(_c9a-1);
+if(_c9b){
+_c96.setDate(1);
+_c96.setMonth(_c9b-1);
}
if(date){
-_c95.setDate(date);
+_c96.setDate(date);
}
}
}
-return _c95;
+return _c96;
};
-dojo.date.fromIso8601Date=function(_ca2){
-return dojo.date.setIso8601Date(new Date(0,0),_ca2);
+dojo.date.fromIso8601Date=function(_ca3){
+return dojo.date.setIso8601Date(new Date(0,0),_ca3);
};
-dojo.date.setIso8601Time=function(_ca3,_ca4){
-var _ca5="Z|(([-+])([0-9]{2})(:?([0-9]{2}))?)$";
-var d=_ca4.match(new RegExp(_ca5));
-var _ca7=0;
+dojo.date.setIso8601Time=function(_ca4,_ca5){
+var _ca6="Z|(([-+])([0-9]{2})(:?([0-9]{2}))?)$";
+var d=_ca5.match(new RegExp(_ca6));
+var _ca8=0;
if(d){
if(d[0]!="Z"){
-_ca7=(Number(d[3])*60)+Number(d[5]);
-_ca7*=((d[2]=="-")?1:-1);
+_ca8=(Number(d[3])*60)+Number(d[5]);
+_ca8*=((d[2]=="-")?1:-1);
}
-_ca7-=_ca3.getTimezoneOffset();
-_ca4=_ca4.substr(0,_ca4.length-d[0].length);
+_ca8-=_ca4.getTimezoneOffset();
+_ca5=_ca5.substr(0,_ca5.length-d[0].length);
}
-var _ca8="^([0-9]{2})(:?([0-9]{2})(:?([0-9]{2})(.([0-9]+))?)?)?$";
-d=_ca4.match(new RegExp(_ca8));
+var _ca9="^([0-9]{2})(:?([0-9]{2})(:?([0-9]{2})(.([0-9]+))?)?)?$";
+d=_ca5.match(new RegExp(_ca9));
if(!d){
-dojo.debug("invalid time string: "+_ca4);
+dojo.debug("invalid time string: "+_ca5);
return null;
}
-var _ca9=d[1];
+var _caa=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;
-_ca3.setHours(_ca9);
-_ca3.setMinutes(mins);
-_ca3.setSeconds(secs);
-_ca3.setMilliseconds(ms);
-if(_ca7!==0){
-_ca3.setTime(_ca3.getTime()+_ca7*60000);
-}
-return _ca3;
-};
-dojo.date.fromIso8601Time=function(_cad){
-return dojo.date.setIso8601Time(new Date(0,0),_cad);
-};
-dojo.date.toRfc3339=function(_cae,_caf){
-if(!_cae){
-_cae=new Date();
+_ca4.setHours(_caa);
+_ca4.setMinutes(mins);
+_ca4.setSeconds(secs);
+_ca4.setMilliseconds(ms);
+if(_ca8!==0){
+_ca4.setTime(_ca4.getTime()+_ca8*60000);
+}
+return _ca4;
+};
+dojo.date.fromIso8601Time=function(_cae){
+return dojo.date.setIso8601Time(new Date(0,0),_cae);
+};
+dojo.date.toRfc3339=function(_caf,_cb0){
+if(!_caf){
+_caf=new Date();
}
var _=dojo.string.pad;
-var _cb1=[];
-if(_caf!="timeOnly"){
-var date=[_(_cae.getFullYear(),4),_(_cae.getMonth()+1,2),_(_cae.getDate(),2)].join("-");
-_cb1.push(date);
-}
-if(_caf!="dateOnly"){
-var time=[_(_cae.getHours(),2),_(_cae.getMinutes(),2),_(_cae.getSeconds(),2)].join(":");
-var _cb4=_cae.getTimezoneOffset();
-time+=(_cb4>0?"-":"+")+_(Math.floor(Math.abs(_cb4)/60),2)+":"+_(Math.abs(_cb4)%60,2);
-_cb1.push(time);
-}
-return _cb1.join("T");
-};
-dojo.date.fromRfc3339=function(_cb5){
-if(_cb5.indexOf("Tany")!=-1){
-_cb5=_cb5.replace("Tany","");
+var _cb2=[];
+if(_cb0!="timeOnly"){
+var date=[_(_caf.getFullYear(),4),_(_caf.getMonth()+1,2),_(_caf.getDate(),2)].join("-");
+_cb2.push(date);
+}
+if(_cb0!="dateOnly"){
+var time=[_(_caf.getHours(),2),_(_caf.getMinutes(),2),_(_caf.getSeconds(),2)].join(":");
+var _cb5=_caf.getTimezoneOffset();
+time+=(_cb5>0?"-":"+")+_(Math.floor(Math.abs(_cb5)/60),2)+":"+_(Math.abs(_cb5)%60,2);
+_cb2.push(time);
+}
+return _cb2.join("T");
+};
+dojo.date.fromRfc3339=function(_cb6){
+if(_cb6.indexOf("Tany")!=-1){
+_cb6=_cb6.replace("Tany","");
}
-var _cb6=new Date();
-return dojo.date.setIso8601(_cb6,_cb5);
+var _cb7=new Date();
+return dojo.date.setIso8601(_cb7,_cb6);
};
dojo.provide("dojo.date.common");
-dojo.date.setDayOfYear=function(_cb7,_cb8){
-_cb7.setMonth(0);
-_cb7.setDate(_cb8);
-return _cb7;
-};
-dojo.date.getDayOfYear=function(_cb9){
-var _cba=_cb9.getFullYear();
-var _cbb=new Date(_cba-1,11,31);
-return Math.floor((_cb9.getTime()-_cbb.getTime())/86400000);
+dojo.date.setDayOfYear=function(_cb8,_cb9){
+_cb8.setMonth(0);
+_cb8.setDate(_cb9);
+return _cb8;
+};
+dojo.date.getDayOfYear=function(_cba){
+var _cbb=_cba.getFullYear();
+var _cbc=new Date(_cbb-1,11,31);
+return Math.floor((_cba.getTime()-_cbc.getTime())/86400000);
};
-dojo.date.setWeekOfYear=function(_cbc,week,_cbe){
+dojo.date.setWeekOfYear=function(_cbd,week,_cbf){
if(arguments.length==1){
-_cbe=0;
+_cbf=0;
}
dojo.unimplemented("dojo.date.setWeekOfYear");
};
-dojo.date.getWeekOfYear=function(_cbf,_cc0){
+dojo.date.getWeekOfYear=function(_cc0,_cc1){
if(arguments.length==1){
-_cc0=0;
+_cc1=0;
}
-var _cc1=new Date(_cbf.getFullYear(),0,1);
-var day=_cc1.getDay();
-_cc1.setDate(_cc1.getDate()-day+_cc0-(day>_cc0?7:0));
-return Math.floor((_cbf.getTime()-_cc1.getTime())/604800000);
+var _cc2=new Date(_cc0.getFullYear(),0,1);
+var day=_cc2.getDay();
+_cc2.setDate(_cc2.getDate()-day+_cc1-(day>_cc1?7:0));
+return Math.floor((_cc0.getTime()-_cc2.getTime())/604800000);
};
-dojo.date.setIsoWeekOfYear=function(_cc3,week,_cc5){
+dojo.date.setIsoWeekOfYear=function(_cc4,week,_cc6){
if(arguments.length==1){
-_cc5=1;
+_cc6=1;
}
dojo.unimplemented("dojo.date.setIsoWeekOfYear");
};
-dojo.date.getIsoWeekOfYear=function(_cc6,_cc7){
+dojo.date.getIsoWeekOfYear=function(_cc7,_cc8){
if(arguments.length==1){
-_cc7=1;
+_cc8=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(_cc8){
-var _cc9=_cc8.getMonth();
+dojo.date.getDaysInMonth=function(_cc9){
+var _cca=_cc9.getMonth();
var days=[31,28,31,30,31,30,31,31,30,31,30,31];
-if(_cc9==1&&dojo.date.isLeapYear(_cc8)){
+if(_cca==1&&dojo.date.isLeapYear(_cc9)){
return 29;
}else{
-return days[_cc9];
+return days[_cca];
}
};
-dojo.date.isLeapYear=function(_ccb){
-var year=_ccb.getFullYear();
+dojo.date.isLeapYear=function(_ccc){
+var year=_ccc.getFullYear();
return (year%400==0)?true:(year%100==0)?false:(year%4==0)?true:false;
};
-dojo.date.getTimezoneName=function(_ccd){
-var str=_ccd.toString();
+dojo.date.getTimezoneName=function(_cce){
+var str=_cce.toString();
var tz="";
-var _cd0;
+var _cd1;
var pos=str.indexOf("(");
if(pos>-1){
pos++;
tz=str.substring(pos,str.indexOf(")"));
}else{
var pat=/([A-Z\/]+) \d{4}$/;
-if((_cd0=str.match(pat))){
-tz=_cd0[1];
+if((_cd1=str.match(pat))){
+tz=_cd1[1];
}else{
-str=_ccd.toLocaleString();
+str=_cce.toLocaleString();
pat=/ ([A-Z\/]+)$/;
-if((_cd0=str.match(pat))){
-tz=_cd0[1];
+if((_cd1=str.match(pat))){
+tz=_cd1[1];
}
}
}
return tz=="AM"||tz=="PM"?"":tz;
};
-dojo.date.getOrdinal=function(_cd3){
-var date=_cd3.getDate();
+dojo.date.getOrdinal=function(_cd4){
+var date=_cd4.getDate();
if(date%100!=11&&date%10==1){
return "st";
}else{
@@ -15314,12 +15324,12 @@
}
};
dojo.date.compareTypes={DATE:1,TIME:2};
-dojo.date.compare=function(_cd5,_cd6,_cd7){
-var dA=_cd5;
-var dB=_cd6||new Date();
+dojo.date.compare=function(_cd6,_cd7,_cd8){
+var dA=_cd6;
+var dB=_cd7||new Date();
var now=new Date();
with(dojo.date.compareTypes){
-var opt=_cd7||(DATE|TIME);
+var opt=_cd8||(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);
}
@@ -15332,7 +15342,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,_cdf,incr){
+dojo.date.add=function(dt,_ce0,incr){
if(typeof dt=="number"){
dt=new Date(dt);
}
@@ -15343,7 +15353,7 @@
}
var sum=new Date(dt);
with(dojo.date.dateParts){
-switch(_cdf){
+switch(_ce0){
case YEAR:
sum.setFullYear(dt.getFullYear()+incr);
fixOvershoot();
@@ -15361,7 +15371,7 @@
break;
case WEEKDAY:
var dat=dt.getDate();
-var _ce3=0;
+var _ce4=0;
var days=0;
var strt=0;
var trgt=0;
@@ -15369,10 +15379,10 @@
var mod=incr%5;
if(mod==0){
days=(incr>0)?5:-5;
-_ce3=(incr>0)?((incr-5)/5):((incr+5)/5);
+_ce4=(incr>0)?((incr-5)/5):((incr+5)/5);
}else{
days=mod;
-_ce3=parseInt(incr/5);
+_ce4=parseInt(incr/5);
}
strt=dt.getDay();
if(strt==6&&incr>0){
@@ -15386,7 +15396,7 @@
if(trgt==0||trgt==6){
adj=(incr>0)?2:-2;
}
-sum.setDate(dat+(7*_ce3)+days+adj);
+sum.setDate(dat+(7*_ce4)+days+adj);
break;
case HOUR:
sum.setHours(sum.getHours()+incr);
@@ -15406,60 +15416,60 @@
}
return sum;
};
-dojo.date.diff=function(dtA,dtB,_ceb){
+dojo.date.diff=function(dtA,dtB,_cec){
if(typeof dtA=="number"){
dtA=new Date(dtA);
}
if(typeof dtB=="number"){
dtB=new Date(dtB);
}
-var _cec=dtB.getFullYear()-dtA.getFullYear();
-var _ced=(dtB.getMonth()-dtA.getMonth())+(_cec*12);
-var _cee=dtB.getTime()-dtA.getTime();
-var _cef=_cee/1000;
-var _cf0=_cef/60;
+var _ced=dtB.getFullYear()-dtA.getFullYear();
+var _cee=(dtB.getMonth()-dtA.getMonth())+(_ced*12);
+var _cef=dtB.getTime()-dtA.getTime();
+var _cf0=_cef/1000;
var _cf1=_cf0/60;
-var _cf2=_cf1/24;
-var _cf3=_cf2/7;
-var _cf4=0;
+var _cf2=_cf1/60;
+var _cf3=_cf2/24;
+var _cf4=_cf3/7;
+var _cf5=0;
with(dojo.date.dateParts){
-switch(_ceb){
+switch(_cec){
case YEAR:
-_cf4=_cec;
+_cf5=_ced;
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+=(_cec*4);
-_cf4=qB-qA;
+qB+=(_ced*4);
+_cf5=qB-qA;
break;
case MONTH:
-_cf4=_ced;
+_cf5=_cee;
break;
case WEEK:
-_cf4=parseInt(_cf3);
+_cf5=parseInt(_cf4);
break;
case DAY:
-_cf4=_cf2;
+_cf5=_cf3;
break;
case WEEKDAY:
-var days=Math.round(_cf2);
-var _cfa=parseInt(days/7);
+var days=Math.round(_cf3);
+var _cfb=parseInt(days/7);
var mod=days%7;
if(mod==0){
-days=_cfa*5;
+days=_cfb*5;
}else{
var adj=0;
var aDay=dtA.getDay();
var bDay=dtB.getDay();
-_cfa=parseInt(days/7);
+_cfb=parseInt(days/7);
mod=days%7;
-var _cff=new Date(dtA);
-_cff.setDate(_cff.getDate()+(_cfa*7));
-var _d00=_cff.getDay();
-if(_cf2>0){
+var _d00=new Date(dtA);
+_d00.setDate(_d00.getDate()+(_cfb*7));
+var _d01=_d00.getDay();
+if(_cf3>0){
switch(true){
case aDay==6:
adj=-1;
@@ -15473,14 +15483,14 @@
case bDay==0:
adj=-2;
break;
-case (_d00+mod)>5:
+case (_d01+mod)>5:
adj=-2;
break;
default:
break;
}
}else{
-if(_cf2<0){
+if(_cf3<0){
switch(true){
case aDay==6:
adj=0;
@@ -15494,7 +15504,7 @@
case bDay==0:
adj=1;
break;
-case (_d00+mod)<0:
+case (_d01+mod)<0:
adj=2;
break;
default:
@@ -15503,116 +15513,116 @@
}
}
days+=adj;
-days-=(_cfa*2);
+days-=(_cfb*2);
}
-_cf4=days;
+_cf5=days;
break;
case HOUR:
-_cf4=_cf1;
+_cf5=_cf2;
break;
case MINUTE:
-_cf4=_cf0;
+_cf5=_cf1;
break;
case SECOND:
-_cf4=_cef;
+_cf5=_cf0;
break;
case MILLISECOND:
-_cf4=_cee;
+_cf5=_cef;
break;
default:
break;
}
}
-return Math.round(_cf4);
+return Math.round(_cf5);
};
dojo.provide("dojo.date.supplemental");
-dojo.date.getFirstDayOfWeek=function(_d01){
-var _d02={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};
-_d01=dojo.hostenv.normalizeLocale(_d01);
-var _d03=_d01.split("-")[1];
-var dow=_d02[_d03];
+dojo.date.getFirstDayOfWeek=function(_d02){
+var _d03={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};
+_d02=dojo.hostenv.normalizeLocale(_d02);
+var _d04=_d02.split("-")[1];
+var dow=_d03[_d04];
return (typeof dow=="undefined")?1:dow;
};
-dojo.date.getWeekend=function(_d05){
-var _d06={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 _d07={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};
-_d05=dojo.hostenv.normalizeLocale(_d05);
-var _d08=_d05.split("-")[1];
-var _d09=_d06[_d08];
-var end=_d07[_d08];
-if(typeof _d09=="undefined"){
-_d09=6;
+dojo.date.getWeekend=function(_d06){
+var _d07={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 _d08={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};
+_d06=dojo.hostenv.normalizeLocale(_d06);
+var _d09=_d06.split("-")[1];
+var _d0a=_d07[_d09];
+var end=_d08[_d09];
+if(typeof _d0a=="undefined"){
+_d0a=6;
}
if(typeof end=="undefined"){
end=0;
}
-return {start:_d09,end:end};
+return {start:_d0a,end:end};
};
-dojo.date.isWeekend=function(_d0b,_d0c){
-var _d0d=dojo.date.getWeekend(_d0c);
-var day=(_d0b||new Date()).getDay();
-if(_d0d.end<_d0d.start){
-_d0d.end+=7;
-if(day<_d0d.start){
+dojo.date.isWeekend=function(_d0c,_d0d){
+var _d0e=dojo.date.getWeekend(_d0d);
+var day=(_d0c||new Date()).getDay();
+if(_d0e.end<_d0e.start){
+_d0e.end+=7;
+if(day<_d0e.start){
day+=7;
}
}
-return day>=_d0d.start&&day<=_d0d.end;
+return day>=_d0e.start&&day<=_d0e.end;
};
dojo.provide("dojo.i18n.common");
-dojo.i18n.getLocalization=function(_d0f,_d10,_d11){
+dojo.i18n.getLocalization=function(_d10,_d11,_d12){
dojo.hostenv.preloadLocalizations();
-_d11=dojo.hostenv.normalizeLocale(_d11);
-var _d12=_d11.split("-");
-var _d13=[_d0f,"nls",_d10].join(".");
-var _d14=dojo.hostenv.findModule(_d13,true);
-var _d15;
-for(var i=_d12.length;i>0;i--){
-var loc=_d12.slice(0,i).join("_");
-if(_d14[loc]){
-_d15=_d14[loc];
+_d12=dojo.hostenv.normalizeLocale(_d12);
+var _d13=_d12.split("-");
+var _d14=[_d10,"nls",_d11].join(".");
+var _d15=dojo.hostenv.findModule(_d14,true);
+var _d16;
+for(var i=_d13.length;i>0;i--){
+var loc=_d13.slice(0,i).join("_");
+if(_d15[loc]){
+_d16=_d15[loc];
break;
}
}
-if(!_d15){
-_d15=_d14.ROOT;
+if(!_d16){
+_d16=_d15.ROOT;
}
-if(_d15){
-var _d18=function(){
+if(_d16){
+var _d19=function(){
};
-_d18.prototype=_d15;
-return new _d18();
+_d19.prototype=_d16;
+return new _d19();
}
-dojo.raise("Bundle not found: "+_d10+" in "+_d0f+" , locale="+_d11);
+dojo.raise("Bundle not found: "+_d11+" in "+_d10+" , locale="+_d12);
};
-dojo.i18n.isLTR=function(_d19){
-var lang=dojo.hostenv.normalizeLocale(_d19).split("-")[0];
+dojo.i18n.isLTR=function(_d1a){
+var lang=dojo.hostenv.normalizeLocale(_d1a).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(_d1c,_d1d){
-if(typeof _d1d=="string"){
+dojo.date.format=function(_d1d,_d1e){
+if(typeof _d1e=="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(_d1c,_d1d);
+return dojo.date.strftime(_d1d,_d1e);
}
-function formatPattern(_d1e,_d1f){
-return _d1f.replace(/([a-z])\1*/ig,function(_d20){
+function formatPattern(_d1f,_d20){
+return _d20.replace(/([a-z])\1*/ig,function(_d21){
var s;
-var c=_d20.charAt(0);
-var l=_d20.length;
+var c=_d21.charAt(0);
+var l=_d21.length;
var pad;
-var _d25=["abbr","wide","narrow"];
+var _d26=["abbr","wide","narrow"];
switch(c){
case "G":
if(l>3){
dojo.unimplemented("Era format not implemented");
}
-s=info.eras[_d1e.getFullYear()<0?1:0];
+s=info.eras[_d1f.getFullYear()<0?1:0];
break;
case "y":
-s=_d1e.getFullYear();
+s=_d1f.getFullYear();
switch(l){
case 1:
break;
@@ -15625,7 +15635,7 @@
break;
case "Q":
case "q":
-s=Math.ceil((_d1e.getMonth()+1)/3);
+s=Math.ceil((_d1f.getMonth()+1)/3);
switch(l){
case 1:
case 2:
@@ -15638,8 +15648,8 @@
break;
case "M":
case "L":
-var m=_d1e.getMonth();
-var _d28;
+var m=_d1f.getMonth();
+var _d29;
switch(l){
case 1:
case 2:
@@ -15649,39 +15659,39 @@
case 3:
case 4:
case 5:
-_d28=_d25[l-3];
+_d29=_d26[l-3];
break;
}
-if(_d28){
+if(_d29){
var type=(c=="L")?"standalone":"format";
-var prop=["months",type,_d28].join("-");
+var prop=["months",type,_d29].join("-");
s=info[prop][m];
}
break;
case "w":
-var _d2b=0;
-s=dojo.date.getWeekOfYear(_d1e,_d2b);
+var _d2c=0;
+s=dojo.date.getWeekOfYear(_d1f,_d2c);
pad=true;
break;
case "d":
-s=_d1e.getDate();
+s=_d1f.getDate();
pad=true;
break;
case "D":
-s=dojo.date.getDayOfYear(_d1e);
+s=dojo.date.getDayOfYear(_d1f);
pad=true;
break;
case "E":
case "e":
case "c":
-var d=_d1e.getDay();
-var _d28;
+var d=_d1f.getDay();
+var _d29;
switch(l){
case 1:
case 2:
if(c=="e"){
-var _d2d=dojo.date.getFirstDayOfWeek(_d1d.locale);
-d=(d-_d2d+7)%7;
+var _d2e=dojo.date.getFirstDayOfWeek(_d1e.locale);
+d=(d-_d2e+7)%7;
}
if(c!="c"){
s=d+1;
@@ -15691,24 +15701,24 @@
case 3:
case 4:
case 5:
-_d28=_d25[l-3];
+_d29=_d26[l-3];
break;
}
-if(_d28){
+if(_d29){
var type=(c=="c")?"standalone":"format";
-var prop=["days",type,_d28].join("-");
+var prop=["days",type,_d29].join("-");
s=info[prop][d];
}
break;
case "a":
-var _d2e=(_d1e.getHours()<12)?"am":"pm";
-s=info[_d2e];
+var _d2f=(_d1f.getHours()<12)?"am":"pm";
+s=info[_d2f];
break;
case "h":
case "H":
case "K":
case "k":
-var h=_d1e.getHours();
+var h=_d1f.getHours();
switch(c){
case "h":
s=(h%12)||12;
@@ -15726,26 +15736,26 @@
pad=true;
break;
case "m":
-s=_d1e.getMinutes();
+s=_d1f.getMinutes();
pad=true;
break;
case "s":
-s=_d1e.getSeconds();
+s=_d1f.getSeconds();
pad=true;
break;
case "S":
-s=Math.round(_d1e.getMilliseconds()*Math.pow(10,l-3));
+s=Math.round(_d1f.getMilliseconds()*Math.pow(10,l-3));
break;
case "v":
case "z":
-s=dojo.date.getTimezoneName(_d1e);
+s=dojo.date.getTimezoneName(_d1f);
if(s){
break;
}
l=4;
case "Z":
-var _d30=_d1e.getTimezoneOffset();
-var tz=[(_d30<=0?"+":"-"),dojo.string.pad(Math.floor(Math.abs(_d30)/60),2),dojo.string.pad(Math.abs(_d30)%60,2)];
+var _d31=_d1f.getTimezoneOffset();
+var tz=[(_d31<=0?"+":"-"),dojo.string.pad(Math.floor(Math.abs(_d31)/60),2),dojo.string.pad(Math.abs(_d31)%60,2)];
if(l==4){
tz.splice(0,0,"GMT");
tz.splice(3,0,":");
@@ -15758,11 +15768,11 @@
case "F":
case "g":
case "A":
-dojo.debug(_d20+" modifier not yet implemented");
+dojo.debug(_d21+" modifier not yet implemented");
s="?";
break;
default:
-dojo.raise("dojo.date.format: invalid pattern char: "+_d1f);
+dojo.raise("dojo.date.format: invalid pattern char: "+_d20);
}
if(pad){
s=dojo.string.pad(s,l);
@@ -15770,126 +15780,126 @@
return s;
});
}
-_d1d=_d1d||{};
-var _d32=dojo.hostenv.normalizeLocale(_d1d.locale);
-var _d33=_d1d.formatLength||"full";
-var info=dojo.date._getGregorianBundle(_d32);
+_d1e=_d1e||{};
+var _d33=dojo.hostenv.normalizeLocale(_d1e.locale);
+var _d34=_d1e.formatLength||"full";
+var info=dojo.date._getGregorianBundle(_d33);
var str=[];
-var _d35=dojo.lang.curry(this,formatPattern,_d1c);
-if(_d1d.selector!="timeOnly"){
-var _d36=_d1d.datePattern||info["dateFormat-"+_d33];
-if(_d36){
-str.push(_processPattern(_d36,_d35));
+var _d36=dojo.lang.curry(this,formatPattern,_d1d);
+if(_d1e.selector!="timeOnly"){
+var _d37=_d1e.datePattern||info["dateFormat-"+_d34];
+if(_d37){
+str.push(_processPattern(_d37,_d36));
}
}
-if(_d1d.selector!="dateOnly"){
-var _d37=_d1d.timePattern||info["timeFormat-"+_d33];
-if(_d37){
-str.push(_processPattern(_d37,_d35));
+if(_d1e.selector!="dateOnly"){
+var _d38=_d1e.timePattern||info["timeFormat-"+_d34];
+if(_d38){
+str.push(_processPattern(_d38,_d36));
}
}
-var _d38=str.join(" ");
-return _d38;
+var _d39=str.join(" ");
+return _d39;
};
-dojo.date.parse=function(_d39,_d3a){
-_d3a=_d3a||{};
-var _d3b=dojo.hostenv.normalizeLocale(_d3a.locale);
-var info=dojo.date._getGregorianBundle(_d3b);
-var _d3d=_d3a.formatLength||"full";
-if(!_d3a.selector){
-_d3a.selector="dateOnly";
+dojo.date.parse=function(_d3a,_d3b){
+_d3b=_d3b||{};
+var _d3c=dojo.hostenv.normalizeLocale(_d3b.locale);
+var info=dojo.date._getGregorianBundle(_d3c);
+var _d3e=_d3b.formatLength||"full";
+if(!_d3b.selector){
+_d3b.selector="dateOnly";
}
-var _d3e=_d3a.datePattern||info["dateFormat-"+_d3d];
-var _d3f=_d3a.timePattern||info["timeFormat-"+_d3d];
-var _d40;
-if(_d3a.selector=="dateOnly"){
-_d40=_d3e;
+var _d3f=_d3b.datePattern||info["dateFormat-"+_d3e];
+var _d40=_d3b.timePattern||info["timeFormat-"+_d3e];
+var _d41;
+if(_d3b.selector=="dateOnly"){
+_d41=_d3f;
}else{
-if(_d3a.selector=="timeOnly"){
-_d40=_d3f;
+if(_d3b.selector=="timeOnly"){
+_d41=_d40;
}else{
-if(_d3a.selector=="dateTime"){
-_d40=_d3e+" "+_d3f;
+if(_d3b.selector=="dateTime"){
+_d41=_d3f+" "+_d40;
}else{
-var msg="dojo.date.parse: Unknown selector param passed: '"+_d3a.selector+"'.";
+var msg="dojo.date.parse: Unknown selector param passed: '"+_d3b.selector+"'.";
msg+=" Defaulting to date pattern.";
dojo.debug(msg);
-_d40=_d3e;
+_d41=_d3f;
}
}
}
-var _d42=[];
-var _d43=_processPattern(_d40,dojo.lang.curry(this,_buildDateTimeRE,_d42,info,_d3a));
-var _d44=new RegExp("^"+_d43+"$");
-var _d45=_d44.exec(_d39);
-if(!_d45){
+var _d43=[];
+var _d44=_processPattern(_d41,dojo.lang.curry(this,_buildDateTimeRE,_d43,info,_d3b));
+var _d45=new RegExp("^"+_d44+"$");
+var _d46=_d45.exec(_d3a);
+if(!_d46){
return null;
}
-var _d46=["abbr","wide","narrow"];
-var _d47=new Date(1972,0);
-var _d48={};
-for(var i=1;i<_d45.length;i++){
-var grp=_d42[i-1];
+var _d47=["abbr","wide","narrow"];
+var _d48=new Date(1972,0);
+var _d49={};
+for(var i=1;i<_d46.length;i++){
+var grp=_d43[i-1];
var l=grp.length;
-var v=_d45[i];
+var v=_d46[i];
switch(grp.charAt(0)){
case "y":
if(l!=2){
-_d47.setFullYear(v);
-_d48.year=v;
+_d48.setFullYear(v);
+_d49.year=v;
}else{
if(v<100){
v=Number(v);
var year=""+new Date().getFullYear();
-var _d4e=year.substring(0,2)*100;
-var _d4f=Number(year.substring(2,4));
-var _d50=Math.min(_d4f+20,99);
-var num=(v<_d50)?_d4e+v:_d4e-100+v;
-_d47.setFullYear(num);
-_d48.year=num;
+var _d4f=year.substring(0,2)*100;
+var _d50=Number(year.substring(2,4));
+var _d51=Math.min(_d50+20,99);
+var num=(v<_d51)?_d4f+v:_d4f-100+v;
+_d48.setFullYear(num);
+_d49.year=num;
}else{
-if(_d3a.strict){
+if(_d3b.strict){
return null;
}
-_d47.setFullYear(v);
-_d48.year=v;
+_d48.setFullYear(v);
+_d49.year=v;
}
}
break;
case "M":
if(l>2){
-if(!_d3a.strict){
+if(!_d3b.strict){
v=v.replace(/\./g,"");
v=v.toLowerCase();
}
-var _d52=info["months-format-"+_d46[l-3]].concat();
-for(var j=0;j<_d52.length;j++){
-if(!_d3a.strict){
-_d52[j]=_d52[j].toLowerCase();
+var _d53=info["months-format-"+_d47[l-3]].concat();
+for(var j=0;j<_d53.length;j++){
+if(!_d3b.strict){
+_d53[j]=_d53[j].toLowerCase();
}
-if(v==_d52[j]){
-_d47.setMonth(j);
-_d48.month=j;
+if(v==_d53[j]){
+_d48.setMonth(j);
+_d49.month=j;
break;
}
}
-if(j==_d52.length){
+if(j==_d53.length){
dojo.debug("dojo.date.parse: Could not parse month name: '"+v+"'.");
return null;
}
}else{
-_d47.setMonth(v-1);
-_d48.month=v-1;
+_d48.setMonth(v-1);
+_d49.month=v-1;
}
break;
case "E":
case "e":
-if(!_d3a.strict){
+if(!_d3b.strict){
v=v.toLowerCase();
}
-var days=info["days-format-"+_d46[l-3]].concat();
+var days=info["days-format-"+_d47[l-3]].concat();
for(var j=0;j<days.length;j++){
-if(!_d3a.strict){
+if(!_d3b.strict){
days[j]=days[j].toLowerCase();
}
if(v==days[j]){
@@ -15902,27 +15912,27 @@
}
break;
case "d":
-_d47.setDate(v);
-_d48.date=v;
+_d48.setDate(v);
+_d49.date=v;
break;
case "a":
-var am=_d3a.am||info.am;
-var pm=_d3a.pm||info.pm;
-if(!_d3a.strict){
+var am=_d3b.am||info.am;
+var pm=_d3b.pm||info.pm;
+if(!_d3b.strict){
v=v.replace(/\./g,"").toLowerCase();
am=am.replace(/\./g,"").toLowerCase();
pm=pm.replace(/\./g,"").toLowerCase();
}
-if(_d3a.strict&&v!=am&&v!=pm){
+if(_d3b.strict&&v!=am&&v!=pm){
dojo.debug("dojo.date.parse: Could not parse am/pm part.");
return null;
}
-var _d57=_d47.getHours();
-if(v==pm&&_d57<12){
-_d47.setHours(_d57+12);
+var _d58=_d48.getHours();
+if(v==pm&&_d58<12){
+_d48.setHours(_d58+12);
}else{
-if(v==am&&_d57==12){
-_d47.setHours(0);
+if(v==am&&_d58==12){
+_d48.setHours(0);
}
}
break;
@@ -15937,59 +15947,59 @@
dojo.debug("dojo.date.parse: Illegal hours value");
return null;
}
-_d47.setHours(v);
+_d48.setHours(v);
break;
case "m":
-_d47.setMinutes(v);
+_d48.setMinutes(v);
break;
case "s":
-_d47.setSeconds(v);
+_d48.setSeconds(v);
break;
case "S":
-_d47.setMilliseconds(v);
+_d48.setMilliseconds(v);
break;
default:
dojo.unimplemented("dojo.date.parse: unsupported pattern char="+grp.charAt(0));
}
}
-if(_d48.year&&_d47.getFullYear()!=_d48.year){
-dojo.debug("Parsed year: '"+_d47.getFullYear()+"' did not match input year: '"+_d48.year+"'.");
+if(_d49.year&&_d48.getFullYear()!=_d49.year){
+dojo.debug("Parsed year: '"+_d48.getFullYear()+"' did not match input year: '"+_d49.year+"'.");
return null;
}
-if(_d48.month&&_d47.getMonth()!=_d48.month){
-dojo.debug("Parsed month: '"+_d47.getMonth()+"' did not match input month: '"+_d48.month+"'.");
+if(_d49.month&&_d48.getMonth()!=_d49.month){
+dojo.debug("Parsed month: '"+_d48.getMonth()+"' did not match input month: '"+_d49.month+"'.");
return null;
}
-if(_d48.date&&_d47.getDate()!=_d48.date){
-dojo.debug("Parsed day of month: '"+_d47.getDate()+"' did not match input day of month: '"+_d48.date+"'.");
+if(_d49.date&&_d48.getDate()!=_d49.date){
+dojo.debug("Parsed day of month: '"+_d48.getDate()+"' did not match input day of month: '"+_d49.date+"'.");
return null;
}
-return _d47;
+return _d48;
};
-function _processPattern(_d58,_d59,_d5a,_d5b){
-var _d5c=function(x){
+function _processPattern(_d59,_d5a,_d5b,_d5c){
+var _d5d=function(x){
return x;
};
-_d59=_d59||_d5c;
-_d5a=_d5a||_d5c;
-_d5b=_d5b||_d5c;
-var _d5e=_d58.match(/(''|[^'])+/g);
-var _d5f=false;
-for(var i=0;i<_d5e.length;i++){
-if(!_d5e[i]){
-_d5e[i]="";
+_d5a=_d5a||_d5d;
+_d5b=_d5b||_d5d;
+_d5c=_d5c||_d5d;
+var _d5f=_d59.match(/(''|[^'])+/g);
+var _d60=false;
+for(var i=0;i<_d5f.length;i++){
+if(!_d5f[i]){
+_d5f[i]="";
}else{
-_d5e[i]=(_d5f?_d5a:_d59)(_d5e[i]);
-_d5f=!_d5f;
+_d5f[i]=(_d60?_d5b:_d5a)(_d5f[i]);
+_d60=!_d60;
}
}
-return _d5b(_d5e.join(""));
+return _d5c(_d5f.join(""));
}
-function _buildDateTimeRE(_d61,info,_d63,_d64){
-return _d64.replace(/([a-z])\1*/ig,function(_d65){
+function _buildDateTimeRE(_d62,info,_d64,_d65){
+return _d65.replace(/([a-z])\1*/ig,function(_d66){
var s;
-var c=_d65.charAt(0);
-var l=_d65.length;
+var c=_d66.charAt(0);
+var l=_d66.length;
switch(c){
case "y":
s="\\d"+((l==2)?"{2,4}":"+");
@@ -16017,9 +16027,9 @@
s="\\d{1,3}";
break;
case "a":
-var am=_d63.am||info.am||"AM";
-var pm=_d63.pm||info.pm||"PM";
-if(_d63.strict){
+var am=_d64.am||info.am||"AM";
+var pm=_d64.pm||info.pm||"PM";
+if(_d64.strict){
s=am+"|"+pm;
}else{
s=am;
@@ -16029,50 +16039,50 @@
}
break;
default:
-dojo.unimplemented("parse of date format, pattern="+_d64);
+dojo.unimplemented("parse of date format, pattern="+_d65);
}
-if(_d61){
-_d61.push(_d65);
+if(_d62){
+_d62.push(_d66);
}
return "\\s*("+s+")\\s*";
});
}
})();
-dojo.date.strftime=function(_d6b,_d6c,_d6d){
-var _d6e=null;
+dojo.date.strftime=function(_d6c,_d6d,_d6e){
+var _d6f=null;
function _(s,n){
-return dojo.string.pad(s,n||2,_d6e||"0");
+return dojo.string.pad(s,n||2,_d6f||"0");
}
-var info=dojo.date._getGregorianBundle(_d6d);
-function $(_d72){
-switch(_d72){
+var info=dojo.date._getGregorianBundle(_d6e);
+function $(_d73){
+switch(_d73){
case "a":
-return dojo.date.getDayShortName(_d6b,_d6d);
+return dojo.date.getDayShortName(_d6c,_d6e);
case "A":
-return dojo.date.getDayName(_d6b,_d6d);
+return dojo.date.getDayName(_d6c,_d6e);
case "b":
case "h":
-return dojo.date.getMonthShortName(_d6b,_d6d);
+return dojo.date.getMonthShortName(_d6c,_d6e);
case "B":
-return dojo.date.getMonthName(_d6b,_d6d);
+return dojo.date.getMonthName(_d6c,_d6e);
case "c":
-return dojo.date.format(_d6b,{locale:_d6d});
+return dojo.date.format(_d6c,{locale:_d6e});
case "C":
-return _(Math.floor(_d6b.getFullYear()/100));
+return _(Math.floor(_d6c.getFullYear()/100));
case "d":
-return _(_d6b.getDate());
+return _(_d6c.getDate());
case "D":
return $("m")+"/"+$("d")+"/"+$("y");
case "e":
-if(_d6e==null){
-_d6e=" ";
+if(_d6f==null){
+_d6f=" ";
}
-return _(_d6b.getDate());
+return _(_d6c.getDate());
case "f":
-if(_d6e==null){
-_d6e=" ";
+if(_d6f==null){
+_d6f=" ";
}
-return _(_d6b.getMonth()+1);
+return _(_d6c.getMonth()+1);
case "g":
break;
case "G":
@@ -16081,171 +16091,171 @@
case "F":
return $("Y")+"-"+$("m")+"-"+$("d");
case "H":
-return _(_d6b.getHours());
+return _(_d6c.getHours());
case "I":
-return _(_d6b.getHours()%12||12);
+return _(_d6c.getHours()%12||12);
case "j":
-return _(dojo.date.getDayOfYear(_d6b),3);
+return _(dojo.date.getDayOfYear(_d6c),3);
case "k":
-if(_d6e==null){
-_d6e=" ";
+if(_d6f==null){
+_d6f=" ";
}
-return _(_d6b.getHours());
+return _(_d6c.getHours());
case "l":
-if(_d6e==null){
-_d6e=" ";
+if(_d6f==null){
+_d6f=" ";
}
-return _(_d6b.getHours()%12||12);
+return _(_d6c.getHours()%12||12);
case "m":
-return _(_d6b.getMonth()+1);
+return _(_d6c.getMonth()+1);
case "M":
-return _(_d6b.getMinutes());
+return _(_d6c.getMinutes());
case "n":
return "\n";
case "p":
-return info[_d6b.getHours()<12?"am":"pm"];
+return info[_d6c.getHours()<12?"am":"pm"];
case "r":
return $("I")+":"+$("M")+":"+$("S")+" "+$("p");
case "R":
return $("H")+":"+$("M");
case "S":
-return _(_d6b.getSeconds());
+return _(_d6c.getSeconds());
case "t":
return "\t";
case "T":
return $("H")+":"+$("M")+":"+$("S");
case "u":
-return String(_d6b.getDay()||7);
+return String(_d6c.getDay()||7);
case "U":
-return _(dojo.date.getWeekOfYear(_d6b));
+return _(dojo.date.getWeekOfYear(_d6c));
case "V":
-return _(dojo.date.getIsoWeekOfYear(_d6b));
+return _(dojo.date.getIsoWeekOfYear(_d6c));
case "W":
-return _(dojo.date.getWeekOfYear(_d6b,1));
+return _(dojo.date.getWeekOfYear(_d6c,1));
case "w":
-return String(_d6b.getDay());
+return String(_d6c.getDay());
case "x":
-return dojo.date.format(_d6b,{selector:"dateOnly",locale:_d6d});
+return dojo.date.format(_d6c,{selector:"dateOnly",locale:_d6e});
case "X":
-return dojo.date.format(_d6b,{selector:"timeOnly",locale:_d6d});
+return dojo.date.format(_d6c,{selector:"timeOnly",locale:_d6e});
case "y":
-return _(_d6b.getFullYear()%100);
+return _(_d6c.getFullYear()%100);
case "Y":
-return String(_d6b.getFullYear());
+return String(_d6c.getFullYear());
case "z":
-var _d73=_d6b.getTimezoneOffset();
-return (_d73>0?"-":"+")+_(Math.floor(Math.abs(_d73)/60))+":"+_(Math.abs(_d73)%60);
+var _d74=_d6c.getTimezoneOffset();
+return (_d74>0?"-":"+")+_(Math.floor(Math.abs(_d74)/60))+":"+_(Math.abs(_d74)%60);
case "Z":
-return dojo.date.getTimezoneName(_d6b);
+return dojo.date.getTimezoneName(_d6c);
case "%":
return "%";
}
}
-var _d74="";
+var _d75="";
var i=0;
-var _d76=0;
-var _d77=null;
-while((_d76=_d6c.indexOf("%",i))!=-1){
-_d74+=_d6c.substring(i,_d76++);
-switch(_d6c.charAt(_d76++)){
+var _d77=0;
+var _d78=null;
+while((_d77=_d6d.indexOf("%",i))!=-1){
+_d75+=_d6d.substring(i,_d77++);
+switch(_d6d.charAt(_d77++)){
case "_":
-_d6e=" ";
+_d6f=" ";
break;
case "-":
-_d6e="";
+_d6f="";
break;
case "0":
-_d6e="0";
+_d6f="0";
break;
case "^":
-_d77="upper";
+_d78="upper";
break;
case "*":
-_d77="lower";
+_d78="lower";
break;
case "#":
-_d77="swap";
+_d78="swap";
break;
default:
-_d6e=null;
-_d76--;
+_d6f=null;
+_d77--;
break;
}
-var _d78=$(_d6c.charAt(_d76++));
-switch(_d77){
+var _d79=$(_d6d.charAt(_d77++));
+switch(_d78){
case "upper":
-_d78=_d78.toUpperCase();
+_d79=_d79.toUpperCase();
break;
case "lower":
-_d78=_d78.toLowerCase();
+_d79=_d79.toLowerCase();
break;
case "swap":
-var _d79=_d78.toLowerCase();
-var _d7a="";
+var _d7a=_d79.toLowerCase();
+var _d7b="";
var j=0;
var ch="";
-while(j<_d78.length){
-ch=_d78.charAt(j);
-_d7a+=(ch==_d79.charAt(j))?ch.toUpperCase():ch.toLowerCase();
+while(j<_d79.length){
+ch=_d79.charAt(j);
+_d7b+=(ch==_d7a.charAt(j))?ch.toUpperCase():ch.toLowerCase();
j++;
}
-_d78=_d7a;
+_d79=_d7b;
break;
default:
break;
}
-_d77=null;
-_d74+=_d78;
-i=_d76;
+_d78=null;
+_d75+=_d79;
+i=_d77;
}
-_d74+=_d6c.substring(i);
-return _d74;
+_d75+=_d6d.substring(i);
+return _d75;
};
(function(){
-var _d7d=[];
-dojo.date.addCustomFormats=function(_d7e,_d7f){
-_d7d.push({pkg:_d7e,name:_d7f});
-};
-dojo.date._getGregorianBundle=function(_d80){
-var _d81={};
-dojo.lang.forEach(_d7d,function(desc){
-var _d83=dojo.i18n.getLocalization(desc.pkg,desc.name,_d80);
-_d81=dojo.lang.mixin(_d81,_d83);
+var _d7e=[];
+dojo.date.addCustomFormats=function(_d7f,_d80){
+_d7e.push({pkg:_d7f,name:_d80});
+};
+dojo.date._getGregorianBundle=function(_d81){
+var _d82={};
+dojo.lang.forEach(_d7e,function(desc){
+var _d84=dojo.i18n.getLocalization(desc.pkg,desc.name,_d81);
+_d82=dojo.lang.mixin(_d82,_d84);
},this);
-return _d81;
+return _d82;
};
})();
dojo.date.addCustomFormats("dojo.i18n.calendar","gregorian");
dojo.date.addCustomFormats("dojo.i18n.calendar","gregorianExtras");
-dojo.date.getNames=function(item,type,use,_d87){
-var _d88;
-var _d89=dojo.date._getGregorianBundle(_d87);
-var _d8a=[item,use,type];
+dojo.date.getNames=function(item,type,use,_d88){
+var _d89;
+var _d8a=dojo.date._getGregorianBundle(_d88);
+var _d8b=[item,use,type];
if(use=="standAlone"){
-_d88=_d89[_d8a.join("-")];
+_d89=_d8a[_d8b.join("-")];
}
-_d8a[1]="format";
-return (_d88||_d89[_d8a.join("-")]).concat();
+_d8b[1]="format";
+return (_d89||_d8a[_d8b.join("-")]).concat();
};
-dojo.date.getDayName=function(_d8b,_d8c){
-return dojo.date.getNames("days","wide","format",_d8c)[_d8b.getDay()];
+dojo.date.getDayName=function(_d8c,_d8d){
+return dojo.date.getNames("days","wide","format",_d8d)[_d8c.getDay()];
};
-dojo.date.getDayShortName=function(_d8d,_d8e){
-return dojo.date.getNames("days","abbr","format",_d8e)[_d8d.getDay()];
+dojo.date.getDayShortName=function(_d8e,_d8f){
+return dojo.date.getNames("days","abbr","format",_d8f)[_d8e.getDay()];
};
-dojo.date.getMonthName=function(_d8f,_d90){
-return dojo.date.getNames("months","wide","format",_d90)[_d8f.getMonth()];
+dojo.date.getMonthName=function(_d90,_d91){
+return dojo.date.getNames("months","wide","format",_d91)[_d90.getMonth()];
};
-dojo.date.getMonthShortName=function(_d91,_d92){
-return dojo.date.getNames("months","abbr","format",_d92)[_d91.getMonth()];
+dojo.date.getMonthShortName=function(_d92,_d93){
+return dojo.date.getNames("months","abbr","format",_d93)[_d92.getMonth()];
};
-dojo.date.toRelativeString=function(_d93){
+dojo.date.toRelativeString=function(_d94){
var now=new Date();
-var diff=(now-_d93)/1000;
+var diff=(now-_d94)/1000;
var end=" ago";
-var _d97=false;
+var _d98=false;
if(diff<0){
-_d97=true;
+_d98=true;
end=" from now";
diff=-diff;
}
@@ -16264,22 +16274,22 @@
if(diff<60*60*24*7){
diff=Math.round(diff/(3600*24));
if(diff==1){
-return _d97?"Tomorrow":"Yesterday";
+return _d98?"Tomorrow":"Yesterday";
}else{
return diff+" days"+end;
}
}
-return dojo.date.format(_d93);
+return dojo.date.format(_d94);
};
-dojo.date.toSql=function(_d98,_d99){
-return dojo.date.strftime(_d98,"%F"+!_d99?" %T":"");
+dojo.date.toSql=function(_d99,_d9a){
+return dojo.date.strftime(_d99,"%F"+!_d9a?" %T":"");
};
-dojo.date.fromSql=function(_d9a){
-var _d9b=_d9a.split(/[\- :]/g);
-while(_d9b.length<6){
-_d9b.push(0);
+dojo.date.fromSql=function(_d9b){
+var _d9c=_d9b.split(/[\- :]/g);
+while(_d9c.length<6){
+_d9c.push(0);
}
-return new Date(_d9b[0],(parseInt(_d9b[1],10)-1),_d9b[2],_d9b[3],_d9b[4],_d9b[5]);
+return new Date(_d9c[0],(parseInt(_d9c[1],10)-1),_d9c[2],_d9c[3],_d9c[4],_d9c[5]);
};
dojo.provide("dojo.widget.TimePicker");
dojo.widget.defineWidget("dojo.widget.TimePicker",dojo.widget.HtmlWidget,function(){
@@ -16293,13 +16303,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(_d9c,frag){
+},{isContainer:false,templatePath:dojo.uri.moduleUri("dojo.widget","templates/TimePicker.html"),templateCssPath:dojo.uri.moduleUri("dojo.widget","templates/TimePicker.css"),postMixInProperties:function(_d9d,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 _da0=this.getFragNodeRef(frag);
-dojo.html.copyStyle(this.domNode,_da0);
+var _da1=this.getFragNodeRef(frag);
+dojo.html.copyStyle(this.domNode,_da1);
if(args.value){
if(args.value instanceof Date){
this.storedTime=dojo.date.toRfc3339(args.value);
@@ -16322,13 +16332,13 @@
}
},initUI:function(){
if(!this.selectedTime.anyTime&&this.time){
-var _da1=dojo.widget.TimePicker.util.toAmPmHour(this.time.getHours());
-var hour=_da1[0];
-var isAm=_da1[1];
-var _da4=this.time.getMinutes();
-var _da5=parseInt(_da4/5);
+var _da2=dojo.widget.TimePicker.util.toAmPmHour(this.time.getHours());
+var hour=_da2[0];
+var isAm=_da2[1];
+var _da5=this.time.getMinutes();
+var _da6=parseInt(_da5/5);
this.onSetSelectedHour(this.hourIndexMap[hour]);
-this.onSetSelectedMinute(this.minuteIndexMap[_da5]);
+this.onSetSelectedMinute(this.minuteIndexMap[_da6]);
this.onSetSelectedAmPm(isAm);
}else{
this.onSetSelectedAnyTime();
@@ -16342,8 +16352,8 @@
}
this.initData();
this.initUI();
-},setDateTime:function(_da7){
-this.storedTime=_da7;
+},setDateTime:function(_da8){
+this.storedTime=_da8;
},onClearSelectedHour:function(evt){
this.clearSelectedHour();
},onClearSelectedMinute:function(evt){
@@ -16358,19 +16368,19 @@
this.initUI();
}
},clearSelectedHour:function(){
-var _dac=this.hourContainerNode.getElementsByTagName("td");
-for(var i=0;i<_dac.length;i++){
-dojo.html.setClass(_dac.item(i),"");
+var _dad=this.hourContainerNode.getElementsByTagName("td");
+for(var i=0;i<_dad.length;i++){
+dojo.html.setClass(_dad.item(i),"");
}
},clearSelectedMinute:function(){
-var _dae=this.minuteContainerNode.getElementsByTagName("td");
-for(var i=0;i<_dae.length;i++){
-dojo.html.setClass(_dae.item(i),"");
+var _daf=this.minuteContainerNode.getElementsByTagName("td");
+for(var i=0;i<_daf.length;i++){
+dojo.html.setClass(_daf.item(i),"");
}
},clearSelectedAmPm:function(){
-var _db0=this.amPmContainerNode.getElementsByTagName("td");
-for(var i=0;i<_db0.length;i++){
-dojo.html.setClass(_db0.item(i),"");
+var _db1=this.amPmContainerNode.getElementsByTagName("td");
+for(var i=0;i<_db1.length;i++){
+dojo.html.setClass(_db1.item(i),"");
}
},clearSelectedAnyTime:function(){
dojo.html.setClass(this.anyTimeContainerNode,"anyTimeContainer");
@@ -16382,19 +16392,19 @@
},setSelectedHour:function(evt){
if(evt&&evt.target){
if(evt.target.nodeType==dojo.dom.ELEMENT_NODE){
-var _db4=evt.target;
+var _db5=evt.target;
}else{
-var _db4=evt.target.parentNode;
+var _db5=evt.target.parentNode;
}
dojo.event.browser.stopEvent(evt);
-dojo.html.setClass(_db4,this.classNames.selectedTime);
-this.selectedTime["hour"]=_db4.innerHTML;
+dojo.html.setClass(_db5,this.classNames.selectedTime);
+this.selectedTime["hour"]=_db5.innerHTML;
}else{
if(!isNaN(evt)){
-var _db5=this.hourContainerNode.getElementsByTagName("td");
-if(_db5.item(evt)){
-dojo.html.setClass(_db5.item(evt),this.classNames.selectedTime);
-this.selectedTime["hour"]=_db5.item(evt).innerHTML;
+var _db6=this.hourContainerNode.getElementsByTagName("td");
+if(_db6.item(evt)){
+dojo.html.setClass(_db6.item(evt),this.classNames.selectedTime);
+this.selectedTime["hour"]=_db6.item(evt).innerHTML;
}
}
}
@@ -16408,19 +16418,19 @@
},setSelectedMinute:function(evt){
if(evt&&evt.target){
if(evt.target.nodeType==dojo.dom.ELEMENT_NODE){
-var _db8=evt.target;
+var _db9=evt.target;
}else{
-var _db8=evt.target.parentNode;
+var _db9=evt.target.parentNode;
}
dojo.event.browser.stopEvent(evt);
-dojo.html.setClass(_db8,this.classNames.selectedTime);
-this.selectedTime["minute"]=_db8.innerHTML;
+dojo.html.setClass(_db9,this.classNames.selectedTime);
+this.selectedTime["minute"]=_db9.innerHTML;
}else{
if(!isNaN(evt)){
-var _db9=this.minuteContainerNode.getElementsByTagName("td");
-if(_db9.item(evt)){
-dojo.html.setClass(_db9.item(evt),this.classNames.selectedTime);
-this.selectedTime["minute"]=_db9.item(evt).innerHTML;
+var _dba=this.minuteContainerNode.getElementsByTagName("td");
+if(_dba.item(evt)){
+dojo.html.setClass(_dba.item(evt),this.classNames.selectedTime);
+this.selectedTime["minute"]=_dba.item(evt).innerHTML;
}
}
}
@@ -16431,20 +16441,20 @@
this.selectedTime.anyTime=false;
this.onSetTime();
},setSelectedAmPm:function(evt){
-var _dbc=evt.target;
-if(evt&&_dbc){
-if(_dbc.nodeType!=dojo.dom.ELEMENT_NODE){
-_dbc=_dbc.parentNode;
+var _dbd=evt.target;
+if(evt&&_dbd){
+if(_dbd.nodeType!=dojo.dom.ELEMENT_NODE){
+_dbd=_dbd.parentNode;
}
dojo.event.browser.stopEvent(evt);
-this.selectedTime.amPm=_dbc.id;
-dojo.html.setClass(_dbc,this.classNames.selectedTime);
+this.selectedTime.amPm=_dbd.id;
+dojo.html.setClass(_dbd,this.classNames.selectedTime);
}else{
evt=evt?0:1;
-var _dbd=this.amPmContainerNode.getElementsByTagName("td");
-if(_dbd.item(evt)){
-this.selectedTime.amPm=_dbd.item(evt).id;
-dojo.html.setClass(_dbd.item(evt),this.classNames.selectedTime);
+var _dbe=this.amPmContainerNode.getElementsByTagName("td");
+if(_dbe.item(evt)){
+this.selectedTime.amPm=_dbe.item(evt).id;
+dojo.html.setClass(_dbe.item(evt),this.classNames.selectedTime);
}
}
},onSetSelectedAnyTime:function(evt){
@@ -16461,72 +16471,72 @@
},onSetTime:function(){
if(this.selectedTime.anyTime){
this.time=new Date();
-var _dc1=dojo.widget.TimePicker.util.toRfcDateTime(this.time);
-this.setDateTime(_dc1.split("T")[0]);
+var _dc2=dojo.widget.TimePicker.util.toRfcDateTime(this.time);
+this.setDateTime(_dc2.split("T")[0]);
}else{
var hour=12;
-var _dc3=0;
+var _dc4=0;
var isAm=false;
if(this.selectedTime["hour"]){
hour=parseInt(this.selectedTime["hour"],10);
}
if(this.selectedTime["minute"]){
-_dc3=parseInt(this.selectedTime["minute"],10);
+_dc4=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(_dc3);
+this.time.setMinutes(_dc4);
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(_dc6){
-if(!_dc6){
-_dc6=new Date();
+this.toRfcDateTime=function(_dc7){
+if(!_dc7){
+_dc7=new Date();
}
-_dc6.setSeconds(0);
-return dojo.date.strftime(_dc6,"%Y-%m-%dT%H:%M:00%z");
+_dc7.setSeconds(0);
+return dojo.date.strftime(_dc7,"%Y-%m-%dT%H:%M:00%z");
};
-this.fromRfcDateTime=function(_dc7,_dc8,_dc9){
-var _dca=new Date();
-if(!_dc7||_dc7.indexOf("T")==-1){
-if(_dc8){
-_dca.setMinutes(Math.floor(_dca.getMinutes()/5)*5);
+this.fromRfcDateTime=function(_dc8,_dc9,_dca){
+var _dcb=new Date();
+if(!_dc8||_dc8.indexOf("T")==-1){
+if(_dc9){
+_dcb.setMinutes(Math.floor(_dcb.getMinutes()/5)*5);
}else{
-_dca.setMinutes(0);
+_dcb.setMinutes(0);
}
}else{
-var _dcb=_dc7.split("T")[1].split(":");
-var _dca=new Date();
-_dca.setHours(_dcb[0]);
-_dca.setMinutes(_dcb[1]);
+var _dcc=_dc8.split("T")[1].split(":");
+var _dcb=new Date();
+_dcb.setHours(_dcc[0]);
+_dcb.setMinutes(_dcc[1]);
}
-return _dca;
+return _dcb;
};
this.toAmPmHour=function(hour){
-var _dcd=hour;
+var _dce=hour;
var isAm=true;
-if(_dcd==0){
-_dcd=12;
+if(_dce==0){
+_dce=12;
}else{
-if(_dcd>12){
-_dcd=_dcd-12;
+if(_dce>12){
+_dce=_dce-12;
isAm=false;
}else{
-if(_dcd==12){
+if(_dce==12){
isAm=false;
}
}
}
-return [_dcd,isAm];
+return [_dce,isAm];
};
-this.fromAmPmHour=function(_dcf,isAm){
-var hour=parseInt(_dcf,10);
+this.fromAmPmHour=function(_dd0,isAm){
+var hour=parseInt(_dd0,10);
if(isAm&&hour==12){
hour=0;
}else{
@@ -16540,8 +16550,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 _dd2=dojo.i18n.getLocalization("dojo.widget","DropdownTimePicker",this.lang);
-this.iconAlt=_dd2.selectTime;
+var _dd3=dojo.i18n.getLocalization("dojo.widget","DropdownTimePicker",this.lang);
+this.iconAlt=_dd3.selectTime;
if(typeof (this.value)=="string"&&this.value.toLowerCase()=="today"){
this.value=new Date();
}
@@ -16566,9 +16576,9 @@
}
},fillInTemplate:function(){
dojo.widget.DropdownTimePicker.superclass.fillInTemplate.apply(this,arguments);
-var _dd7="";
+var _dd8="";
if(this.value instanceof Date){
-_dd7=this.value;
+_dd8=this.value;
}else{
if(this.value){
var orig=this.value;
@@ -16580,11 +16590,11 @@
}
}
orig=c.join(":");
-_dd7=dojo.date.fromRfc3339(d+"T"+orig);
+_dd8=dojo.date.fromRfc3339(d+"T"+orig);
}
}
-var _ddc={widgetContainerId:this.widgetId,lang:this.lang,value:_dd7};
-this.timePicker=dojo.widget.createWidget("TimePicker",_ddc,this.containerNode,"child");
+var _ddd={widgetContainerId:this.widgetId,lang:this.lang,value:_dd8};
+this.timePicker=dojo.widget.createWidget("TimePicker",_ddd,this.containerNode,"child");
dojo.event.connect(this.timePicker,"onValueChanged",this,"_updateText");
if(this.value){
this._updateText();
@@ -16596,12 +16606,12 @@
return this.valueNode.value;
},getTime:function(){
return this.timePicker.storedTime;
-},setValue:function(_ddd){
-this.setTime(_ddd);
-},setTime:function(_dde){
-var _ddf="";
-if(_dde instanceof Date){
-_ddf=_dde;
+},setValue:function(_dde){
+this.setTime(_dde);
+},setTime:function(_ddf){
+var _de0="";
+if(_ddf instanceof Date){
+_de0=_ddf;
}else{
if(this.value){
var orig=this.value;
@@ -16613,10 +16623,10 @@
}
}
orig=c.join(":");
-_ddf=dojo.date.fromRfc3339(d+"T"+orig);
+_de0=dojo.date.fromRfc3339(d+"T"+orig);
}
}
-this.timePicker.setTime(_ddf);
+this.timePicker.setTime(_de0);
this._syncValueNode();
},_updateText:function(){
if(this.timePicker.selectedTime.anyTime){
@@ -16632,43 +16642,43 @@
this._syncValueNode();
this.onValueChanged(this.getTime());
this.hideContainer();
-},onValueChanged:function(_de4){
+},onValueChanged:function(_de5){
},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 _de5=dojo.string.trim(this.inputNode.value);
-if(_de5){
-var _de6=dojo.date.parse(_de5,{formatLength:this.formatLength,timePattern:this.displayFormat,selector:"timeOnly",locale:this.lang});
+var _de6=dojo.string.trim(this.inputNode.value);
if(_de6){
-this.setTime(_de6);
+var _de7=dojo.date.parse(_de6,{formatLength:this.formatLength,timePattern:this.displayFormat,selector:"timeOnly",locale:this.lang});
+if(_de7){
+this.setTime(_de7);
}
}else{
-this.valueNode.value=_de5;
+this.valueNode.value=_de6;
}
}
-if(_de5){
+if(_de6){
this._updateText();
}
},_syncValueNode:function(){
var time=this.timePicker.time;
-var _de8;
+var _de9;
switch(this.saveFormat.toLowerCase()){
case "rfc":
case "iso":
case "":
-_de8=dojo.date.toRfc3339(time,"timeOnly");
+_de9=dojo.date.toRfc3339(time,"timeOnly");
break;
case "posix":
case "unix":
-_de8=Number(time);
+_de9=Number(time);
break;
default:
-_de8=dojo.date.format(time,{datePattern:this.saveFormat,selector:"timeOnly",locale:this.lang});
+_de9=dojo.date.format(time,{datePattern:this.saveFormat,selector:"timeOnly",locale:this.lang});
}
-this.valueNode.value=_de8;
-},destroy:function(_de9){
-this.timePicker.destroy(_de9);
+this.valueNode.value=_de9;
+},destroy:function(_dea){
+this.timePicker.destroy(_dea);
dojo.widget.DropdownTimePicker.superclass.destroy.apply(this,arguments);
}});
dojo.provide("struts.widget.StrutsTimePicker");
@@ -16711,19 +16721,19 @@
}
},fillInTemplate:function(args,frag){
dojo.widget.DatePicker.superclass.fillInTemplate.apply(this,arguments);
-var _dec=this.getFragNodeRef(frag);
-dojo.html.copyStyle(this.domNode,_dec);
+var _ded=this.getFragNodeRef(frag);
+dojo.html.copyStyle(this.domNode,_ded);
this.weekTemplate=dojo.dom.removeNode(this.calendarWeekTemplate);
this._preInitUI(this.value?this.value:this.today,false,true);
-var _ded=dojo.lang.unnest(dojo.date.getNames("days",this.dayWidth,"standAlone",this.lang));
+var _dee=dojo.lang.unnest(dojo.date.getNames("days",this.dayWidth,"standAlone",this.lang));
if(this.weekStartsOn>0){
for(var i=0;i<this.weekStartsOn;i++){
-_ded.push(_ded.shift());
+_dee.push(_dee.shift());
}
}
-var _def=this.dayLabelsRow.getElementsByTagName("td");
+var _df0=this.dayLabelsRow.getElementsByTagName("td");
for(i=0;i<7;i++){
-_def.item(i).innerHTML=_ded[i];
+_df0.item(i).innerHTML=_dee[i];
}
if(this.value){
this.setValue(this.value);
@@ -16732,18 +16742,18 @@
return dojo.date.toRfc3339(new Date(this.value),"dateOnly");
},getDate:function(){
return this.value;
-},setValue:function(_df0){
-this.setDate(_df0);
-},setDate:function(_df1){
-if(_df1==""){
+},setValue:function(_df1){
+this.setDate(_df1);
+},setDate:function(_df2){
+if(_df2==""){
this.value="";
this._preInitUI(this.curMonth,false,true);
}else{
-if(typeof _df1=="string"){
-this.value=dojo.date.fromRfc3339(_df1);
+if(typeof _df2=="string"){
+this.value=dojo.date.fromRfc3339(_df2);
this.value.setHours(0,0,0,0);
}else{
-this.value=new Date(_df1);
+this.value=new Date(_df2);
this.value.setHours(0,0,0,0);
}
}
@@ -16759,7 +16769,7 @@
}
this.clickedNode=null;
this.onValueChanged(this.value);
-},_preInitUI:function(_df2,_df3,_df4){
+},_preInitUI:function(_df3,_df4,_df5){
if(typeof (this.startDate)=="string"){
this.startDate=dojo.date.fromRfc3339(this.startDate);
}
@@ -16768,16 +16778,16 @@
}
this.startDate.setHours(0,0,0,0);
this.endDate.setHours(24,0,0,-1);
-if(_df2<this.startDate||_df2>this.endDate){
-_df2=new Date((_df2<this.startDate)?this.startDate:this.endDate);
+if(_df3<this.startDate||_df3>this.endDate){
+_df3=new Date((_df3<this.startDate)?this.startDate:this.endDate);
}
-this.firstDay=this._initFirstDay(_df2,_df3);
+this.firstDay=this._initFirstDay(_df3,_df4);
this.selectedIsUsed=false;
this.currentIsUsed=false;
-var _df5=new Date(this.firstDay);
-var _df6=_df5.getMonth();
-this.curMonth=new Date(_df5);
-this.curMonth.setDate(_df5.getDate()+6);
+var _df6=new Date(this.firstDay);
+var _df7=_df6.getMonth();
+this.curMonth=new Date(_df6);
+this.curMonth.setDate(_df6.getDate()+6);
this.curMonth.setDate(1);
if(this.displayWeeks==""||this.adjustWeeks){
this.adjustWeeks=true;
@@ -16786,16 +16796,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(_df5,this.endDate,dojo.date.dateParts.DAY)>days){
+if(dojo.date.diff(_df6,this.endDate,dojo.date.dateParts.DAY)>days){
this._preInitUI(this.startDate,true,false);
-_df5=new Date(this.firstDay);
+_df6=new Date(this.firstDay);
}
-this.curMonth=new Date(_df5);
-this.curMonth.setDate(_df5.getDate()+6);
+this.curMonth=new Date(_df6);
+this.curMonth.setDate(_df6.getDate()+6);
this.curMonth.setDate(1);
-var _df8=(_df5.getMonth()==this.curMonth.getMonth())?"current":"previous";
+var _df9=(_df6.getMonth()==this.curMonth.getMonth())?"current":"previous";
}
-if(_df4){
+if(_df5){
this._initUI(days);
}
},_initUI:function(days){
@@ -16803,72 +16813,72 @@
for(var i=0;i<this.displayWeeks;i++){
this.calendarDatesContainerNode.appendChild(this.weekTemplate.cloneNode(true));
}
-var _dfb=new Date(this.firstDay);
+var _dfc=new Date(this.firstDay);
this._setMonthLabel(this.curMonth.getMonth());
this._setYearLabels(this.curMonth.getFullYear());
-var _dfc=this.calendarDatesContainerNode.getElementsByTagName("td");
-var _dfd=this.calendarDatesContainerNode.getElementsByTagName("tr");
-var _dfe;
+var _dfd=this.calendarDatesContainerNode.getElementsByTagName("td");
+var _dfe=this.calendarDatesContainerNode.getElementsByTagName("tr");
+var _dff;
for(i=0;i<days;i++){
-_dfe=_dfc.item(i);
-_dfe.innerHTML=_dfb.getDate();
-_dfe.setAttribute("djDateValue",_dfb.valueOf());
-var _dff=(_dfb.getMonth()!=this.curMonth.getMonth()&&Number(_dfb)<Number(this.curMonth))?"previous":(_dfb.getMonth()==this.curMonth.getMonth())?"current":"next";
-var _e00=_dff;
-if(this._isDisabledDate(_dfb)){
-var _e01={previous:"disabledPrevious",current:"disabledCurrent",next:"disabledNext"};
-_e00=_e01[_dff];
-}
-dojo.html.setClass(_dfe,this._getDateClassName(_dfb,_e00));
-if(dojo.html.hasClass(_dfe,this.classNames.selectedDate)){
-this.selectedNode=_dfe;
+_dff=_dfd.item(i);
+_dff.innerHTML=_dfc.getDate();
+_dff.setAttribute("djDateValue",_dfc.valueOf());
+var _e00=(_dfc.getMonth()!=this.curMonth.getMonth()&&Number(_dfc)<Number(this.curMonth))?"previous":(_dfc.getMonth()==this.curMonth.getMonth())?"current":"next";
+var _e01=_e00;
+if(this._isDisabledDate(_dfc)){
+var _e02={previous:"disabledPrevious",current:"disabledCurrent",next:"disabledNext"};
+_e01=_e02[_e00];
+}
+dojo.html.setClass(_dff,this._getDateClassName(_dfc,_e01));
+if(dojo.html.hasClass(_dff,this.classNames.selectedDate)){
+this.selectedNode=_dff;
}
-_dfb=dojo.date.add(_dfb,dojo.date.dateParts.DAY,1);
+_dfc=dojo.date.add(_dfc,dojo.date.dateParts.DAY,1);
}
-this.lastDay=dojo.date.add(_dfb,dojo.date.dateParts.DAY,-1);
+this.lastDay=dojo.date.add(_dfc,dojo.date.dateParts.DAY,-1);
this._initControls();
},_initControls:function(){
var d=this.firstDay;
var d2=this.lastDay;
-var _e04,_e05,_e06,_e07,_e08,_e09;
-_e04=_e05=_e06=_e07=_e08=_e09=!this.staticDisplay;
+var _e05,_e06,_e07,_e08,_e09,_e0a;
+_e05=_e06=_e07=_e08=_e09=_e0a=!this.staticDisplay;
with(dojo.date.dateParts){
var add=dojo.date.add;
-if(_e04&&add(d,DAY,(-1*(this._getAdjustedDay(d)+1)))<this.startDate){
-_e04=_e06=_e08=false;
-}
-if(_e05&&d2>this.endDate){
+if(_e05&&add(d,DAY,(-1*(this._getAdjustedDay(d)+1)))<this.startDate){
_e05=_e07=_e09=false;
}
-if(_e06&&add(d,DAY,-1)<this.startDate){
-_e06=_e08=false;
+if(_e06&&d2>this.endDate){
+_e06=_e08=_e0a=false;
}
-if(_e07&&add(d2,DAY,1)>this.endDate){
+if(_e07&&add(d,DAY,-1)<this.startDate){
_e07=_e09=false;
}
-if(_e08&&add(d2,YEAR,-1)<this.startDate){
-_e08=false;
+if(_e08&&add(d2,DAY,1)>this.endDate){
+_e08=_e0a=false;
}
-if(_e09&&add(d,YEAR,1)>this.endDate){
+if(_e09&&add(d2,YEAR,-1)<this.startDate){
_e09=false;
}
+if(_e0a&&add(d,YEAR,1)>this.endDate){
+_e0a=false;
+}
}
-function enableControl(node,_e0c){
-dojo.html.setVisibility(node,_e0c?"":"hidden");
+function enableControl(node,_e0d){
+dojo.html.setVisibility(node,_e0d?"":"hidden");
}
-enableControl(this.decreaseWeekNode,_e04);
-enableControl(this.increaseWeekNode,_e05);
-enableControl(this.decreaseMonthNode,_e06);
-enableControl(this.increaseMonthNode,_e07);
-enableControl(this.previousYearLabelNode,_e08);
-enableControl(this.nextYearLabelNode,_e09);
+enableControl(this.decreaseWeekNode,_e05);
+enableControl(this.increaseWeekNode,_e06);
+enableControl(this.decreaseMonthNode,_e07);
+enableControl(this.increaseMonthNode,_e08);
+enableControl(this.previousYearLabelNode,_e09);
+enableControl(this.nextYearLabelNode,_e0a);
},_incrementWeek:function(evt){
var d=new Date(this.firstDay);
switch(evt.target){
case this.increaseWeekNode.getElementsByTagName("img").item(0):
case this.increaseWeekNode:
-var _e0f=dojo.date.add(d,dojo.date.dateParts.WEEK,1);
-if(_e0f<this.endDate){
+var _e10=dojo.date.add(d,dojo.date.dateParts.WEEK,1);
+if(_e10<this.endDate){
d=dojo.date.add(d,dojo.date.dateParts.WEEK,1);
}
break;
@@ -16882,60 +16892,60 @@
this._preInitUI(d,true,true);
},_incrementMonth:function(evt){
var d=new Date(this.curMonth);
-var _e12=new Date(this.firstDay);
+var _e13=new Date(this.firstDay);
switch(evt.currentTarget){
case this.increaseMonthNode.getElementsByTagName("img").item(0):
case this.increaseMonthNode:
-_e12=dojo.date.add(_e12,dojo.date.dateParts.DAY,this.displayWeeks*7);
-if(_e12<this.endDate){
+_e13=dojo.date.add(_e13,dojo.date.dateParts.DAY,this.displayWeeks*7);
+if(_e13<this.endDate){
d=dojo.date.add(d,dojo.date.dateParts.MONTH,1);
}else{
-var _e13=true;
+var _e14=true;
}
break;
case this.decreaseMonthNode.getElementsByTagName("img").item(0):
case this.decreaseMonthNode:
-if(_e12>this.startDate){
+if(_e13>this.startDate){
d=dojo.date.add(d,dojo.date.dateParts.MONTH,-1);
}else{
-var _e14=true;
+var _e15=true;
}
break;
}
-if(_e14){
+if(_e15){
d=new Date(this.startDate);
}else{
-if(_e13){
+if(_e14){
d=new Date(this.endDate);
}
}
this._preInitUI(d,false,true);
},_incrementYear:function(evt){
var year=this.curMonth.getFullYear();
-var _e17=new Date(this.firstDay);
+var _e18=new Date(this.firstDay);
switch(evt.target){
case this.nextYearLabelNode:
-_e17=dojo.date.add(_e17,dojo.date.dateParts.YEAR,1);
-if(_e17<this.endDate){
+_e18=dojo.date.add(_e18,dojo.date.dateParts.YEAR,1);
+if(_e18<this.endDate){
year++;
}else{
-var _e18=true;
+var _e19=true;
}
break;
case this.previousYearLabelNode:
-_e17=dojo.date.add(_e17,dojo.date.dateParts.YEAR,-1);
-if(_e17>this.startDate){
+_e18=dojo.date.add(_e18,dojo.date.dateParts.YEAR,-1);
+if(_e18>this.startDate){
year--;
}else{
-var _e19=true;
+var _e1a=true;
}
break;
}
var d;
-if(_e19){
+if(_e1a){
d=new Date(this.startDate);
}else{
-if(_e18){
+if(_e19){
d=new Date(this.endDate);
}else{
d=new Date(year,this.curMonth.getMonth(),1);
@@ -16957,8 +16967,8 @@
if(!this.staticDisplay){
this._incrementYear(evt);
}
-},_setMonthLabel:function(_e1e){
-this.monthLabelNode.innerHTML=dojo.date.getNames("months","wide","standAlone",this.lang)[_e1e];
+},_setMonthLabel:function(_e1f){
+this.monthLabelNode.innerHTML=dojo.date.getNames("months","wide","standAlone",this.lang)[_e1f];
},_setYearLabels:function(year){
var y=year-1;
var that=this;
@@ -16968,64 +16978,64 @@
f("previous");
f("current");
f("next");
-},_getDateClassName:function(date,_e24){
-var _e25=this.classNames[_e24];
+},_getDateClassName:function(date,_e25){
+var _e26=this.classNames[_e25];
if((!this.selectedIsUsed&&this.value)&&(Number(date)==Number(this.value))){
-_e25=this.classNames.selectedDate+" "+_e25;
+_e26=this.classNames.selectedDate+" "+_e26;
this.selectedIsUsed=true;
}
if((!this.currentIsUsed)&&(Number(date)==Number(this.today))){
-_e25=_e25+" "+this.classNames.currentDate;
+_e26=_e26+" "+this.classNames.currentDate;
this.currentIsUsed=true;
}
-return _e25;
+return _e26;
},onClick:function(evt){
dojo.event.browser.stopEvent(evt);
},_handleUiClick:function(evt){
-var _e28=evt.target;
-if(_e28.nodeType!=dojo.dom.ELEMENT_NODE){
-_e28=_e28.parentNode;
+var _e29=evt.target;
+if(_e29.nodeType!=dojo.dom.ELEMENT_NODE){
+_e29=_e29.parentNode;
}
dojo.event.browser.stopEvent(evt);
this.selectedIsUsed=this.todayIsUsed=false;
-if(dojo.html.hasClass(_e28,this.classNames["disabledPrevious"])||dojo.html.hasClass(_e28,this.classNames["disabledCurrent"])||dojo.html.hasClass(_e28,this.classNames["disabledNext"])){
+if(dojo.html.hasClass(_e29,this.classNames["disabledPrevious"])||dojo.html.hasClass(_e29,this.classNames["disabledCurrent"])||dojo.html.hasClass(_e29,this.classNames["disabledNext"])){
return;
}
-this.clickedNode=_e28;
-this.setDate(new Date(Number(dojo.html.getAttribute(_e28,"djDateValue"))));
+this.clickedNode=_e29;
+this.setDate(new Date(Number(dojo.html.getAttribute(_e29,"djDateValue"))));
},onValueChanged:function(date){
-},_isDisabledDate:function(_e2a){
-if(_e2a<this.startDate||_e2a>this.endDate){
+},_isDisabledDate:function(_e2b){
+if(_e2b<this.startDate||_e2b>this.endDate){
return true;
}
-return this.isDisabledDate(_e2a,this.lang);
-},isDisabledDate:function(_e2b,_e2c){
+return this.isDisabledDate(_e2b,this.lang);
+},isDisabledDate:function(_e2c,_e2d){
return false;
-},_initFirstDay:function(_e2d,adj){
-var d=new Date(_e2d);
+},_initFirstDay:function(_e2e,adj){
+var d=new Date(_e2e);
if(!adj){
d.setDate(1);
}
d.setDate(d.getDate()-this._getAdjustedDay(d,this.weekStartsOn));
d.setHours(0,0,0,0);
return d;
-},_getAdjustedDay:function(_e30){
+},_getAdjustedDay:function(_e31){
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[_e30.getDay()];
+return days[_e31.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(_e33,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(_e34,frag){
dojo.widget.DropdownDatePicker.superclass.postMixInProperties.apply(this,arguments);
-var _e35=dojo.i18n.getLocalization("dojo.widget","DropdownDatePicker",this.lang);
-this.iconAlt=_e35.selectDate;
+var _e36=dojo.i18n.getLocalization("dojo.widget","DropdownDatePicker",this.lang);
+this.iconAlt=_e36.selectDate;
if(typeof (this.value)=="string"&&this.value.toLowerCase()=="today"){
this.value=new Date();
}
@@ -17042,8 +17052,8 @@
}
},fillInTemplate:function(args,frag){
dojo.widget.DropdownDatePicker.superclass.fillInTemplate.call(this,args,frag);
-var _e39={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",_e39,this.containerNode,"child");
+var _e3a={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",_e3a,this.containerNode,"child");
dojo.event.connect(this.datePicker,"onValueChanged",this,"_updateText");
dojo.event.connect(this.inputNode,"onChange",this,"_updateText");
if(this.value){
@@ -17055,10 +17065,10 @@
return this.valueNode.value;
},getDate:function(){
return this.datePicker.value;
-},setValue:function(_e3a){
-this.setDate(_e3a);
-},setDate:function(_e3b){
-this.datePicker.setDate(_e3b);
+},setValue:function(_e3b){
+this.setDate(_e3b);
+},setDate:function(_e3c){
+this.datePicker.setDate(_e3c);
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}):"";
@@ -17068,44 +17078,44 @@
this._syncValueNode();
this.onValueChanged(this.getDate());
this.hideContainer();
-},onValueChanged:function(_e3c){
+},onValueChanged:function(_e3d){
},onInputChange:function(){
-var _e3d=dojo.string.trim(this.inputNode.value);
-if(_e3d){
-var _e3e=dojo.date.parse(_e3d,{formatLength:this.formatLength,datePattern:this.displayFormat,selector:"dateOnly",locale:this.lang});
-if(!this.datePicker._isDisabledDate(_e3e)){
-this.setDate(_e3e);
+var _e3e=dojo.string.trim(this.inputNode.value);
+if(_e3e){
+var _e3f=dojo.date.parse(_e3e,{formatLength:this.formatLength,datePattern:this.displayFormat,selector:"dateOnly",locale:this.lang});
+if(!this.datePicker._isDisabledDate(_e3f)){
+this.setDate(_e3f);
}
}else{
-if(_e3d==""){
+if(_e3e==""){
this.datePicker.setDate("");
}
-this.valueNode.value=_e3d;
+this.valueNode.value=_e3e;
}
-if(_e3d){
+if(_e3e){
this._updateText();
}
},_syncValueNode:function(){
var date=this.datePicker.value;
-var _e40="";
+var _e41="";
switch(this.saveFormat.toLowerCase()){
case "rfc":
case "iso":
case "":
-_e40=dojo.date.toRfc3339(date,"dateOnly");
+_e41=dojo.date.toRfc3339(date,"dateOnly");
break;
case "posix":
case "unix":
-_e40=Number(date);
+_e41=Number(date);
break;
default:
if(date){
-_e40=dojo.date.format(date,{datePattern:this.saveFormat,selector:"dateOnly",locale:this.lang});
+_e41=dojo.date.format(date,{datePattern:this.saveFormat,selector:"dateOnly",locale:this.lang});
}
}
-this.valueNode.value=_e40;
-},destroy:function(_e41){
-this.datePicker.destroy(_e41);
+this.valueNode.value=_e41;
+},destroy:function(_e42){
+this.datePicker.destroy(_e42);
dojo.widget.DropdownDatePicker.superclass.destroy.apply(this,arguments);
}});
dojo.provide("struts.widget.StrutsDatePicker");
@@ -17123,14 +17133,14 @@
struts.widget.BindEvent.superclass.postCreate.apply(this);
var self=this;
if(!dojo.string.isBlank(this.events)&&!dojo.string.isBlank(this.sources)){
-var _e43=this.events.split(",");
-var _e44=this.sources.split(",");
-if(_e43&&this.domNode){
-dojo.lang.forEach(_e43,function(_e45){
+var _e44=this.events.split(",");
+var _e45=this.sources.split(",");
+if(_e44&&this.domNode){
dojo.lang.forEach(_e44,function(_e46){
-var _e47=dojo.byId(_e46);
-if(_e47){
-dojo.event.connect(_e47,_e45,function(evt){
+dojo.lang.forEach(_e45,function(_e47){
+var _e48=dojo.byId(_e47);
+if(_e48){
+dojo.event.connect(_e48,_e46,function(evt){
evt.preventDefault();
evt.stopPropagation();
self.reloadContents();
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=528315&r1=528314&r2=528315
==============================================================================
--- 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 Thu Apr 12 18:59:06 2007
@@ -24021,32 +24021,42 @@
formNode: dojo.byId(this.formId),
formFilter: window[this.formFilter],
handler: dojo.lang.hitch(this, function(type, data, evt) {
- this.firstRequest = false;
//hide indicator
dojo.html.hide(this.cbox.indicator);
//if notifyTopics is published on the first request (onload)
//the value of listeners will be reset
if(!this.firstRequest) {
+ this.firstRequest = false;
this.cbox.notify.apply(this.cbox, [data, type, evt]);
}
+ var arrData = null;
+ var dataByName = data[this.cbox.dataFieldName];
if(!dojo.lang.isArray(data)) {
//if there is a dataFieldName, take it
- if(!dojo.string.isBlank(this.cbox.dataFieldName) && data[this.cbox.dataFieldName] != null) {
- arrData = data[this.cbox.dataFieldName];
+ if(dataByName) {
+ if(dojo.lang.isArray(dataByName)) {
+ //ok, it is an array
+ arrData = dataByName;
+ } else if(dojo.lang.isObject(dataByName)) {
+ //it is an object, treat it like a map
+ arrData = [];
+ for(var key in dataByName){
+ arrData.push([dataByName[key], key]);
+ }
+ }
} else {
//try to find a match
- var arrData = null;
for(var key in data){
//does it start with the field name? take it
- if(key == this.cbox.name) {
+ if(dojo.string.startsWith(key, this.cbox.name)) {
arrData = data[key];
break;
}
//grab the first array found, we will use it if nothing else
//is found
if(!arrData && dojo.lang.isArray(data[key])) {
- arrData = data = data[key];
+ arrData = data[key];
}
}
}