From 3f2e01dd3aa391456abfef1324a64774e5cd36dd Mon Sep 17 00:00:00 2001 From: Musachy Barroso Date: Wed, 6 Jun 2007 23:14:00 +0000 Subject: [PATCH] Fix autocompleter bug when reading data as a field of an object from the JSON returned from action git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@544985 13f79535-47bb-0310-9956-ffa450edef68 --- .../dojo/components/Autocompleter.java | 94 +- .../static/dojo/struts/widget/ComboBox.js | 55 +- .../apache/struts2/static/dojo/struts_dojo.js | 2256 ++++++++--------- .../dojo/struts_dojo.js.uncompressed.js | 55 +- 4 files changed, 1239 insertions(+), 1221 deletions(-) diff --git a/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/Autocompleter.java b/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/Autocompleter.java index 6858051f0..dbd7661b6 100644 --- a/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/Autocompleter.java +++ b/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/Autocompleter.java @@ -38,18 +38,11 @@ import com.opensymphony.xwork2.util.ValueStack; *

1. If the response is an array, assume that it contains 2-dimension array elements, like: * 

  * [
- *      ["Text1", "Value1"],
- *      ["Text2", "Value2"]
+ *      ["Alabama", "AL"],
+ *      ["Alaska", "AK"]
  * ]
  *
- *

2. If the response is a map, use it (recommended as it is the easiest one to generate): - * 

- * {
- *      "Alabama" : "AL",
- *      "Alaska"  : "AL"
- * }
- *
- *

3. If a value is specified in the "dataFieldName" attribute, and the response has a field with that + *

2. If a value is specified in the "dataFieldName" attribute, and the response has a field with that * name, assume that's the datasource, which can be an array of 2-dimension array elements, or a map, * like (assuming dataFieldName="state"):

* 
@@ -65,11 +58,12 @@ import com.opensymphony.xwork2.util.ValueStack;
  * {
  *      "state" : {
  *            "Alabama" : "AL",
- *            "Alaska"  : "AK"
+ *            "Alaska" : "AK"
  *      }
  * }
  *
- *

4. If there is a field that starts with the value specified on the "name" attribute, assume + * + *

3. If there is a field that starts with the value specified on the "name" attribute, assume * that's the datasource, like (assuming name="state"):

* 
  * {
@@ -79,14 +73,20 @@ import com.opensymphony.xwork2.util.ValueStack;
  *      ]
  * }
  *
- *

5. Use first array that is found, like:

+ *

4. Use first array that is found, like:

* 

  * {
  *      "anything" : [
- *            ["Text1", "Value1"],
- *            ["Text2", "Value2"]
+ *            ["Alabama", "AL"],
+ *            ["Alaska", "AK"]
  *     ]       
  * }
+ * 
5. If the response is a map, use it (recommended as it is the easiest one to generate):
+ * 
+ * {
+ *      "Alabama" : "AL",
+ *      "Alaska" : "AK"
+ * }
  * 

  * 
  * 
Examples

@@ -153,11 +153,73 @@ import com.opensymphony.xwork2.util.ValueStack;
  *      autoCompleter.setSelectedKey("AL");
  *      
  *      //value (key will be set to "AL" and value to "Alabama")
- *      autoCompleter.setSelectedValue("Alabama");
+ *      autoCompleter.setAllValues("AL", "Alabama");
  *   }
  * </script>
  *
* + * + * + *

Using beforeNotifyTopics:

+ * 
+ * <script type="text/javascript">
+ * dojo.event.topic.subscribe("/before", function(event, widget){
+ *     alert('inside a topic event. before request');
+ *     //event: set event.cancel = true, to cancel request
+ *     //widget: widget that published the topic
+ * });
+ * </script>         
+ * 
+ * <sx:autocompleter beforeNotifyTopics="/before" href="%{#ajaxTest} />
+ *
+ * + * + * + *

Using afterNotifyTopics:

+ * 
+ * <script type="text/javascript">
+ * dojo.event.topic.subscribe("/after", function(data, request, widget){
+ *     alert('inside a topic event. after request');
+ *     //data : JavaScript object from parsing response
+ *     //request: XMLHttpRequest object
+ *     //widget: widget that published the topic
+ * });
+ * </script>        
+ * 
+ * <sx:autocompleter afterNotifyTopics="/after" href="%{#ajaxTest}" />
+ *
+ * + * + * + *

Using errorNotifyTopics:

+ * 
+ * <script type="text/javascript">
+ * dojo.event.topic.subscribe("/error", function(error, request, widget){
+ *     alert('inside a topic event. on error');
+ *     //error : error object (error.message has the error message)
+ *     //request: XMLHttpRequest object
+ *     //widget: widget that published the topic
+ * });
+ * </script>
+ * 
+ * <sx:autocompleter errorNotifyTopics="/error" href="%{#ajaxTest}" />
+ *
+ * + * + * + *

Using valueNotifyTopics and indicator:

+ * 
+ * <script type="text/javascript">
+ * dojo.event.topic.subscribe("/value", function(value, key, text, widget){
+ *     alert('inside a topic event. after value changed');
+ *     //value : selected value (like "Florida" in example above)
+ *     //key: selected key (like "FL" in example above)
+ *     //text: text typed into textbox
+ *     //widget: widget that published the topic
+ * });
+ * </script>   
+ * 
+ * 
  */
 @StrutsTag(name="autocompleter", tldTagClass="org.apache.struts2.dojo.views.jsp.ui.AutocompleterTag", description="Renders a combobox with autocomplete and AJAX capabilities")
 public class Autocompleter extends ComboBox {
diff --git a/plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/struts/widget/ComboBox.js b/plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/struts/widget/ComboBox.js
index a58ee4c7a..e959939c8 100644
--- a/plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/struts/widget/ComboBox.js
+++ b/plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/struts/widget/ComboBox.js
@@ -34,12 +34,13 @@ struts.widget.ComboBoxDataProvider = function(combobox, node){
 
         //if notifyTopics is published on the first request (onload)
         //the value of listeners will be reset
-        if(!this.firstRequest) {
-          this.firstRequest = false;
+        if(!this.firstRequest || type == "error") {
           this.cbox.notify.apply(this.cbox, [data, type, evt]);
         }
+        
+        this.firstRequest = false;
         var arrData = null;
-        var dataByName = data[this.cbox.dataFieldName];
+        var dataByName = data[dojo.string.isBlank(this.cbox.dataFieldName) ? this.cbox.name : this.cbox.dataFieldName];
         if(!dojo.lang.isArray(data)) {
            //if there is a dataFieldName, take it
            if(dataByName) {
@@ -50,7 +51,7 @@ struts.widget.ComboBoxDataProvider = function(combobox, node){
                 //it is an object, treat it like a map
                 arrData = [];
                 for(var key in dataByName){
-                    arrData.push([dataByName[key], key]);
+                    arrData.push([key, dataByName[key]]);
                 }
              }
            } else {
@@ -64,7 +65,7 @@ struts.widget.ComboBoxDataProvider = function(combobox, node){
                } else {
                  //if nathing else is found, we will use values in this 
                  //object as the data
-                 tmpArrData.push([data[key], key]);
+                 tmpArrData.push([key, data[key]]);
                }
                //grab the first array found, we will use it if nothing else
                //is found
@@ -413,12 +414,13 @@ dojo.widget.defineWidget(
   },
 
   notify : function(data, type, e) {
+    var self = this;
+    //general topics
     if(this.notifyTopicsArray) {
-      var self = this;
       dojo.lang.forEach(this.notifyTopicsArray, function(topic) {
         try {
-          dojo.event.topic.publish(topic, data, type, e);
-        } catch(ex) {
+          dojo.event.topic.publish(topic, data, type, e, self);
+        } catch(ex){
           self.log(ex);
         }
       });
@@ -428,28 +430,26 @@ dojo.widget.defineWidget(
     var topicsArray = null;
     switch(type) {
       case "before":
-        topicsArray = this.beforeNotifyTopicsArray;
+        this.notifyTo(this.beforeNotifyTopicsArray, [e, this]);
         break;
       case "load":
-        topicsArray = this.afterNotifyTopicsArray;
+        this.notifyTo(this.afterNotifyTopicsArray, [data, e, this]);
         break;
       case "error":
-        topicsArray = this.errorNotifyTopicsArray;
-        break;
-      case "valuechanged":
-        topicsArray = this.valueNotifyTopicsArray;
+        this.notifyTo(this.errorNotifyTopicsArray, [data, e, this]);
         break;
+       case "valuechanged":
+        this.notifyTo(this.valueNotifyTopicsArray, [this.getSelectedValue(), this.getSelectedKey(), this.getText(), this]);
+        break;  
     }
-  
-    this.notifyTo(topicsArray, data, type, e);
   },
   
-  notifyTo : function(topicsArray, data, type, e) {
+  notifyTo : function(topicsArray, params) {
     var self = this;
     if(topicsArray) {
       dojo.lang.forEach(topicsArray, function(topic) {
         try {
-          dojo.event.topic.publish(topic, data, type, e);
+          dojo.event.topic.publishApply(topic, params);
         } catch(ex){
           self.log(ex);
         }
@@ -492,27 +492,12 @@ dojo.widget.defineWidget(
   getSelectedKey : function() {
     return this.comboBoxSelectionValue.value;
   },
-  
-  setSelectedValue : function(text) {
-    if(this.dataProvider) {
-      var data = this.dataProvider.data;
-      for(element in data) {
-         var obj = data[element];
-         if(obj[0].toString() == text) {
-           this.setValue(obj[0].toString());
-           this.comboBoxSelectionValue.value = obj[1].toString();
-         }
-      }
-    } else {
-      this.comboBoxSelectionValue.value = text;
-    }
-  },
-  
+ 
   getSelectedValue : function() {
     return this.comboBoxValue.value;
   },
   
   getText : function() {
-    return this.textInputNode.value();
+    return this.textInputNode.value;
   }
 });
diff --git a/plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/struts_dojo.js b/plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/struts_dojo.js
index de5c63448..a2756119e 100644
--- a/plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/struts_dojo.js
+++ b/plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/struts_dojo.js
@@ -14873,12 +14873,12 @@ this.getData=function(url){
 dojo.html.show(this.cbox.indicator);
 dojo.io.bind({url:url,formNode:dojo.byId(this.formId),formFilter:window[this.formFilter],transport:this.transport,handler:dojo.lang.hitch(this,function(type,data,evt){
 dojo.html.hide(this.cbox.indicator);
-if(!this.firstRequest){
-this.firstRequest=false;
+if(!this.firstRequest||type=="error"){
 this.cbox.notify.apply(this.cbox,[data,type,evt]);
 }
+this.firstRequest=false;
 var _c68=null;
-var _c69=data[this.cbox.dataFieldName];
+var _c69=data[dojo.string.isBlank(this.cbox.dataFieldName)?this.cbox.name:this.cbox.dataFieldName];
 if(!dojo.lang.isArray(data)){
 if(_c69){
 if(dojo.lang.isArray(_c69)){
@@ -14887,7 +14887,7 @@ _c68=_c69;
 if(dojo.lang.isObject(_c69)){
 _c68=[];
 for(var key in _c69){
-_c68.push([_c69[key],key]);
+_c68.push([key,_c69[key]]);
 }
 }
 }
@@ -14898,7 +14898,7 @@ if(dojo.string.startsWith(key,this.cbox.name)){
 _c68=data[key];
 break;
 }else{
-_c6b.push([data[key],key]);
+_c6b.push([key,data[key]]);
 }
 if(!_c68&&dojo.lang.isArray(data[key])&&!dojo.lang.isString(data[key])){
 _c68=data[key];
@@ -15112,11 +15112,11 @@ this.textInputNode.value="";
 },onValueChanged:function(data){
 this.notify(data,"valuechanged",null);
 },notify:function(data,type,e){
-if(this.notifyTopicsArray){
 var self=this;
+if(this.notifyTopicsArray){
 dojo.lang.forEach(this.notifyTopicsArray,function(_c97){
 try{
-dojo.event.topic.publish(_c97,data,type,e);
+dojo.event.topic.publish(_c97,data,type,e,self);
 }
 catch(ex){
 self.log(ex);
@@ -15126,25 +15126,24 @@ self.log(ex);
 var _c98=null;
 switch(type){
 case "before":
-_c98=this.beforeNotifyTopicsArray;
+this.notifyTo(this.beforeNotifyTopicsArray,[e,this]);
 break;
 case "load":
-_c98=this.afterNotifyTopicsArray;
+this.notifyTo(this.afterNotifyTopicsArray,[data,e,this]);
 break;
 case "error":
-_c98=this.errorNotifyTopicsArray;
+this.notifyTo(this.errorNotifyTopicsArray,[data,e,this]);
 break;
 case "valuechanged":
-_c98=this.valueNotifyTopicsArray;
+this.notifyTo(this.valueNotifyTopicsArray,[this.getSelectedValue(),this.getSelectedKey(),this.getText(),this]);
 break;
 }
-this.notifyTo(_c98,data,type,e);
-},notifyTo:function(_c99,data,type,e){
+},notifyTo:function(_c99,_c9a){
 var self=this;
 if(_c99){
-dojo.lang.forEach(_c99,function(_c9e){
+dojo.lang.forEach(_c99,function(_c9c){
 try{
-dojo.event.topic.publish(_c9e,data,type,e);
+dojo.event.topic.publishApply(_c9c,_c9a);
 }
 catch(ex){
 self.log(ex);
@@ -15154,18 +15153,18 @@ self.log(ex);
 },log:function(text){
 dojo.debug("["+(this.widgetId?this.widgetId:"unknown")+"] "+text);
 },_startSearchFromInput:function(){
-var _ca0=this.textInputNode.value;
+var _c9e=this.textInputNode.value;
 if(this.loadOnType){
-if(_ca0.length>=this.loadMinimum){
-var _ca1=this.dataUrl+(this.dataUrl.indexOf("?")>-1?"&":"?");
-_ca1+=this.name+"="+_ca0;
-this.dataProvider.getData(_ca1);
-this._startSearch(_ca0);
+if(_c9e.length>=this.loadMinimum){
+var _c9f=this.dataUrl+(this.dataUrl.indexOf("?")>-1?"&":"?");
+_c9f+=this.name+"="+_c9e;
+this.dataProvider.getData(_c9f);
+this._startSearch(_c9e);
 }else{
 this._hideResultList();
 }
 }else{
-this._startSearch(_ca0);
+this._startSearch(_c9e);
 }
 },setSelectedKey:function(key){
 var data=this.dataProvider.data;
@@ -15178,23 +15177,10 @@ this.comboBoxSelectionValue.value=obj[1].toString();
 }
 },getSelectedKey:function(){
 return this.comboBoxSelectionValue.value;
-},setSelectedValue:function(text){
-if(this.dataProvider){
-var data=this.dataProvider.data;
-for(element in data){
-var obj=data[element];
-if(obj[0].toString()==text){
-this.setValue(obj[0].toString());
-this.comboBoxSelectionValue.value=obj[1].toString();
-}
-}
-}else{
-this.comboBoxSelectionValue.value=text;
-}
 },getSelectedValue:function(){
 return this.comboBoxValue.value;
 },getText:function(){
-return this.textInputNode.value();
+return this.textInputNode.value;
 }});
 dojo.provide("dojo.widget.DropdownContainer");
 dojo.widget.defineWidget("dojo.widget.DropdownContainer",dojo.widget.HtmlWidget,{inputWidth:"7em",id:"",inputId:"",inputName:"",iconURL:dojo.uri.moduleUri("dojo.widget","templates/images/combo_box_arrow.png"),copyClasses:false,iconAlt:"",containerToggle:"plain",containerToggleDuration:150,templateString:" \"${this.iconAlt}\"",templateCssPath:"",isContainer:true,attachTemplateNodes:function(){
@@ -15241,197 +15227,197 @@ this.inputNode.disabled=true;
 dojo.widget.DropdownContainer.superclass.disable.apply(this,arguments);
 }});
 dojo.provide("dojo.date.serialize");
-dojo.date.setIso8601=function(_cab,_cac){
-var _cad=(_cac.indexOf("T")==-1)?_cac.split(" "):_cac.split("T");
-_cab=dojo.date.setIso8601Date(_cab,_cad[0]);
-if(_cad.length==2){
-_cab=dojo.date.setIso8601Time(_cab,_cad[1]);
+dojo.date.setIso8601=function(_ca6,_ca7){
+var _ca8=(_ca7.indexOf("T")==-1)?_ca7.split(" "):_ca7.split("T");
+_ca6=dojo.date.setIso8601Date(_ca6,_ca8[0]);
+if(_ca8.length==2){
+_ca6=dojo.date.setIso8601Time(_ca6,_ca8[1]);
 }
-return _cab;
+return _ca6;
 };
-dojo.date.fromIso8601=function(_cae){
-return dojo.date.setIso8601(new Date(0,0),_cae);
+dojo.date.fromIso8601=function(_ca9){
+return dojo.date.setIso8601(new Date(0,0),_ca9);
 };
-dojo.date.setIso8601Date=function(_caf,_cb0){
-var _cb1="^([0-9]{4})((-?([0-9]{2})(-?([0-9]{2}))?)|"+"(-?([0-9]{3}))|(-?W([0-9]{2})(-?([1-7]))?))?$";
-var d=_cb0.match(new RegExp(_cb1));
+dojo.date.setIso8601Date=function(_caa,_cab){
+var _cac="^([0-9]{4})((-?([0-9]{2})(-?([0-9]{2}))?)|"+"(-?([0-9]{3}))|(-?W([0-9]{2})(-?([1-7]))?))?$";
+var d=_cab.match(new RegExp(_cac));
 if(!d){
-dojo.debug("invalid date string: "+_cb0);
+dojo.debug("invalid date string: "+_cab);
 return null;
 }
 var year=d[1];
-var _cb4=d[4];
+var _caf=d[4];
 var date=d[6];
-var _cb6=d[8];
+var _cb1=d[8];
 var week=d[10];
-var _cb8=d[12]?d[12]:1;
-_caf.setFullYear(year);
-if(_cb6){
-_caf.setMonth(0);
-_caf.setDate(Number(_cb6));
+var _cb3=d[12]?d[12]:1;
+_caa.setFullYear(year);
+if(_cb1){
+_caa.setMonth(0);
+_caa.setDate(Number(_cb1));
 }else{
 if(week){
-_caf.setMonth(0);
-_caf.setDate(1);
-var gd=_caf.getDay();
+_caa.setMonth(0);
+_caa.setDate(1);
+var gd=_caa.getDay();
 var day=gd?gd:7;
-var _cbb=Number(_cb8)+(7*Number(week));
+var _cb6=Number(_cb3)+(7*Number(week));
 if(day<=4){
-_caf.setDate(_cbb+1-day);
+_caa.setDate(_cb6+1-day);
 }else{
-_caf.setDate(_cbb+8-day);
+_caa.setDate(_cb6+8-day);
 }
 }else{
-if(_cb4){
-_caf.setDate(1);
-_caf.setMonth(_cb4-1);
+if(_caf){
+_caa.setDate(1);
+_caa.setMonth(_caf-1);
 }
 if(date){
-_caf.setDate(date);
+_caa.setDate(date);
 }
 }
 }
-return _caf;
+return _caa;
 };
-dojo.date.fromIso8601Date=function(_cbc){
-return dojo.date.setIso8601Date(new Date(0,0),_cbc);
+dojo.date.fromIso8601Date=function(_cb7){
+return dojo.date.setIso8601Date(new Date(0,0),_cb7);
 };
-dojo.date.setIso8601Time=function(_cbd,_cbe){
-var _cbf="Z|(([-+])([0-9]{2})(:?([0-9]{2}))?)$";
-var d=_cbe.match(new RegExp(_cbf));
-var _cc1=0;
+dojo.date.setIso8601Time=function(_cb8,_cb9){
+var _cba="Z|(([-+])([0-9]{2})(:?([0-9]{2}))?)$";
+var d=_cb9.match(new RegExp(_cba));
+var _cbc=0;
 if(d){
 if(d[0]!="Z"){
-_cc1=(Number(d[3])*60)+Number(d[5]);
-_cc1*=((d[2]=="-")?1:-1);
+_cbc=(Number(d[3])*60)+Number(d[5]);
+_cbc*=((d[2]=="-")?1:-1);
 }
-_cc1-=_cbd.getTimezoneOffset();
-_cbe=_cbe.substr(0,_cbe.length-d[0].length);
+_cbc-=_cb8.getTimezoneOffset();
+_cb9=_cb9.substr(0,_cb9.length-d[0].length);
 }
-var _cc2="^([0-9]{2})(:?([0-9]{2})(:?([0-9]{2})(.([0-9]+))?)?)?$";
-d=_cbe.match(new RegExp(_cc2));
+var _cbd="^([0-9]{2})(:?([0-9]{2})(:?([0-9]{2})(.([0-9]+))?)?)?$";
+d=_cb9.match(new RegExp(_cbd));
 if(!d){
-dojo.debug("invalid time string: "+_cbe);
+dojo.debug("invalid time string: "+_cb9);
 return null;
 }
-var _cc3=d[1];
+var _cbe=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;
-_cbd.setHours(_cc3);
-_cbd.setMinutes(mins);
-_cbd.setSeconds(secs);
-_cbd.setMilliseconds(ms);
-if(_cc1!==0){
-_cbd.setTime(_cbd.getTime()+_cc1*60000);
+_cb8.setHours(_cbe);
+_cb8.setMinutes(mins);
+_cb8.setSeconds(secs);
+_cb8.setMilliseconds(ms);
+if(_cbc!==0){
+_cb8.setTime(_cb8.getTime()+_cbc*60000);
 }
-return _cbd;
+return _cb8;
 };
-dojo.date.fromIso8601Time=function(_cc7){
-return dojo.date.setIso8601Time(new Date(0,0),_cc7);
+dojo.date.fromIso8601Time=function(_cc2){
+return dojo.date.setIso8601Time(new Date(0,0),_cc2);
 };
-dojo.date.toRfc3339=function(_cc8,_cc9){
-if(!_cc8){
-_cc8=new Date();
+dojo.date.toRfc3339=function(_cc3,_cc4){
+if(!_cc3){
+_cc3=new Date();
 }
 var _=dojo.string.pad;
-var _ccb=[];
-if(_cc9!="timeOnly"){
-var date=[_(_cc8.getFullYear(),4),_(_cc8.getMonth()+1,2),_(_cc8.getDate(),2)].join("-");
-_ccb.push(date);
+var _cc6=[];
+if(_cc4!="timeOnly"){
+var date=[_(_cc3.getFullYear(),4),_(_cc3.getMonth()+1,2),_(_cc3.getDate(),2)].join("-");
+_cc6.push(date);
 }
-if(_cc9!="dateOnly"){
-var time=[_(_cc8.getHours(),2),_(_cc8.getMinutes(),2),_(_cc8.getSeconds(),2)].join(":");
-var _cce=_cc8.getTimezoneOffset();
-time+=(_cce>0?"-":"+")+_(Math.floor(Math.abs(_cce)/60),2)+":"+_(Math.abs(_cce)%60,2);
-_ccb.push(time);
+if(_cc4!="dateOnly"){
+var time=[_(_cc3.getHours(),2),_(_cc3.getMinutes(),2),_(_cc3.getSeconds(),2)].join(":");
+var _cc9=_cc3.getTimezoneOffset();
+time+=(_cc9>0?"-":"+")+_(Math.floor(Math.abs(_cc9)/60),2)+":"+_(Math.abs(_cc9)%60,2);
+_cc6.push(time);
 }
-return _ccb.join("T");
+return _cc6.join("T");
 };
-dojo.date.fromRfc3339=function(_ccf){
-if(_ccf.indexOf("Tany")!=-1){
-_ccf=_ccf.replace("Tany","");
+dojo.date.fromRfc3339=function(_cca){
+if(_cca.indexOf("Tany")!=-1){
+_cca=_cca.replace("Tany","");
 }
-var _cd0=new Date();
-return dojo.date.setIso8601(_cd0,_ccf);
+var _ccb=new Date();
+return dojo.date.setIso8601(_ccb,_cca);
 };
 dojo.provide("dojo.date.common");
-dojo.date.setDayOfYear=function(_cd1,_cd2){
-_cd1.setMonth(0);
-_cd1.setDate(_cd2);
-return _cd1;
+dojo.date.setDayOfYear=function(_ccc,_ccd){
+_ccc.setMonth(0);
+_ccc.setDate(_ccd);
+return _ccc;
 };
-dojo.date.getDayOfYear=function(_cd3){
-var _cd4=_cd3.getFullYear();
-var _cd5=new Date(_cd4-1,11,31);
-return Math.floor((_cd3.getTime()-_cd5.getTime())/86400000);
+dojo.date.getDayOfYear=function(_cce){
+var _ccf=_cce.getFullYear();
+var _cd0=new Date(_ccf-1,11,31);
+return Math.floor((_cce.getTime()-_cd0.getTime())/86400000);
 };
-dojo.date.setWeekOfYear=function(_cd6,week,_cd8){
+dojo.date.setWeekOfYear=function(_cd1,week,_cd3){
 if(arguments.length==1){
-_cd8=0;
+_cd3=0;
 }
 dojo.unimplemented("dojo.date.setWeekOfYear");
 };
-dojo.date.getWeekOfYear=function(_cd9,_cda){
+dojo.date.getWeekOfYear=function(_cd4,_cd5){
 if(arguments.length==1){
-_cda=0;
+_cd5=0;
 }
-var _cdb=new Date(_cd9.getFullYear(),0,1);
-var day=_cdb.getDay();
-_cdb.setDate(_cdb.getDate()-day+_cda-(day>_cda?7:0));
-return Math.floor((_cd9.getTime()-_cdb.getTime())/604800000);
+var _cd6=new Date(_cd4.getFullYear(),0,1);
+var day=_cd6.getDay();
+_cd6.setDate(_cd6.getDate()-day+_cd5-(day>_cd5?7:0));
+return Math.floor((_cd4.getTime()-_cd6.getTime())/604800000);
 };
-dojo.date.setIsoWeekOfYear=function(_cdd,week,_cdf){
+dojo.date.setIsoWeekOfYear=function(_cd8,week,_cda){
 if(arguments.length==1){
-_cdf=1;
+_cda=1;
 }
 dojo.unimplemented("dojo.date.setIsoWeekOfYear");
 };
-dojo.date.getIsoWeekOfYear=function(_ce0,_ce1){
+dojo.date.getIsoWeekOfYear=function(_cdb,_cdc){
 if(arguments.length==1){
-_ce1=1;
+_cdc=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(_ce2){
-var _ce3=_ce2.getMonth();
+dojo.date.getDaysInMonth=function(_cdd){
+var _cde=_cdd.getMonth();
 var days=[31,28,31,30,31,30,31,31,30,31,30,31];
-if(_ce3==1&&dojo.date.isLeapYear(_ce2)){
+if(_cde==1&&dojo.date.isLeapYear(_cdd)){
 return 29;
 }else{
-return days[_ce3];
+return days[_cde];
 }
 };
-dojo.date.isLeapYear=function(_ce5){
-var year=_ce5.getFullYear();
+dojo.date.isLeapYear=function(_ce0){
+var year=_ce0.getFullYear();
 return (year%400==0)?true:(year%100==0)?false:(year%4==0)?true:false;
 };
-dojo.date.getTimezoneName=function(_ce7){
-var str=_ce7.toString();
+dojo.date.getTimezoneName=function(_ce2){
+var str=_ce2.toString();
 var tz="";
-var _cea;
+var _ce5;
 var pos=str.indexOf("(");
 if(pos>-1){
 pos++;
 tz=str.substring(pos,str.indexOf(")"));
 }else{
 var pat=/([A-Z\/]+) \d{4}$/;
-if((_cea=str.match(pat))){
-tz=_cea[1];
+if((_ce5=str.match(pat))){
+tz=_ce5[1];
 }else{
-str=_ce7.toLocaleString();
+str=_ce2.toLocaleString();
 pat=/ ([A-Z\/]+)$/;
-if((_cea=str.match(pat))){
-tz=_cea[1];
+if((_ce5=str.match(pat))){
+tz=_ce5[1];
 }
 }
 }
 return tz=="AM"||tz=="PM"?"":tz;
 };
-dojo.date.getOrdinal=function(_ced){
-var date=_ced.getDate();
+dojo.date.getOrdinal=function(_ce8){
+var date=_ce8.getDate();
 if(date%100!=11&&date%10==1){
 return "st";
 }else{
@@ -15447,12 +15433,12 @@ return "th";
 }
 };
 dojo.date.compareTypes={DATE:1,TIME:2};
-dojo.date.compare=function(_cef,_cf0,_cf1){
-var dA=_cef;
-var dB=_cf0||new Date();
+dojo.date.compare=function(_cea,_ceb,_cec){
+var dA=_cea;
+var dB=_ceb||new Date();
 var now=new Date();
 with(dojo.date.compareTypes){
-var opt=_cf1||(DATE|TIME);
+var opt=_cec||(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);
 }
@@ -15465,7 +15451,7 @@ return -1;
 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,_cf9,incr){
+dojo.date.add=function(dt,_cf4,incr){
 if(typeof dt=="number"){
 dt=new Date(dt);
 }
@@ -15476,7 +15462,7 @@ sum.setDate(0);
 }
 var sum=new Date(dt);
 with(dojo.date.dateParts){
-switch(_cf9){
+switch(_cf4){
 case YEAR:
 sum.setFullYear(dt.getFullYear()+incr);
 fixOvershoot();
@@ -15494,7 +15480,7 @@ sum.setDate(dt.getDate()+incr);
 break;
 case WEEKDAY:
 var dat=dt.getDate();
-var _cfd=0;
+var _cf8=0;
 var days=0;
 var strt=0;
 var trgt=0;
@@ -15502,10 +15488,10 @@ var adj=0;
 var mod=incr%5;
 if(mod==0){
 days=(incr>0)?5:-5;
-_cfd=(incr>0)?((incr-5)/5):((incr+5)/5);
+_cf8=(incr>0)?((incr-5)/5):((incr+5)/5);
 }else{
 days=mod;
-_cfd=parseInt(incr/5);
+_cf8=parseInt(incr/5);
 }
 strt=dt.getDay();
 if(strt==6&&incr>0){
@@ -15519,7 +15505,7 @@ trgt=(strt+days);
 if(trgt==0||trgt==6){
 adj=(incr>0)?2:-2;
 }
-sum.setDate(dat+(7*_cfd)+days+adj);
+sum.setDate(dat+(7*_cf8)+days+adj);
 break;
 case HOUR:
 sum.setHours(sum.getHours()+incr);
@@ -15539,60 +15525,60 @@ break;
 }
 return sum;
 };
-dojo.date.diff=function(dtA,dtB,_d05){
+dojo.date.diff=function(dtA,dtB,_d00){
 if(typeof dtA=="number"){
 dtA=new Date(dtA);
 }
 if(typeof dtB=="number"){
 dtB=new Date(dtB);
 }
-var _d06=dtB.getFullYear()-dtA.getFullYear();
-var _d07=(dtB.getMonth()-dtA.getMonth())+(_d06*12);
-var _d08=dtB.getTime()-dtA.getTime();
-var _d09=_d08/1000;
-var _d0a=_d09/60;
-var _d0b=_d0a/60;
-var _d0c=_d0b/24;
-var _d0d=_d0c/7;
-var _d0e=0;
+var _d01=dtB.getFullYear()-dtA.getFullYear();
+var _d02=(dtB.getMonth()-dtA.getMonth())+(_d01*12);
+var _d03=dtB.getTime()-dtA.getTime();
+var _d04=_d03/1000;
+var _d05=_d04/60;
+var _d06=_d05/60;
+var _d07=_d06/24;
+var _d08=_d07/7;
+var _d09=0;
 with(dojo.date.dateParts){
-switch(_d05){
+switch(_d00){
 case YEAR:
-_d0e=_d06;
+_d09=_d01;
 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+=(_d06*4);
-_d0e=qB-qA;
+qB+=(_d01*4);
+_d09=qB-qA;
 break;
 case MONTH:
-_d0e=_d07;
+_d09=_d02;
 break;
 case WEEK:
-_d0e=parseInt(_d0d);
+_d09=parseInt(_d08);
 break;
 case DAY:
-_d0e=_d0c;
+_d09=_d07;
 break;
 case WEEKDAY:
-var days=Math.round(_d0c);
-var _d14=parseInt(days/7);
+var days=Math.round(_d07);
+var _d0f=parseInt(days/7);
 var mod=days%7;
 if(mod==0){
-days=_d14*5;
+days=_d0f*5;
 }else{
 var adj=0;
 var aDay=dtA.getDay();
 var bDay=dtB.getDay();
-_d14=parseInt(days/7);
+_d0f=parseInt(days/7);
 mod=days%7;
-var _d19=new Date(dtA);
-_d19.setDate(_d19.getDate()+(_d14*7));
-var _d1a=_d19.getDay();
-if(_d0c>0){
+var _d14=new Date(dtA);
+_d14.setDate(_d14.getDate()+(_d0f*7));
+var _d15=_d14.getDay();
+if(_d07>0){
 switch(true){
 case aDay==6:
 adj=-1;
@@ -15606,14 +15592,14 @@ break;
 case bDay==0:
 adj=-2;
 break;
-case (_d1a+mod)>5:
+case (_d15+mod)>5:
 adj=-2;
 break;
 default:
 break;
 }
 }else{
-if(_d0c<0){
+if(_d07<0){
 switch(true){
 case aDay==6:
 adj=0;
@@ -15627,7 +15613,7 @@ break;
 case bDay==0:
 adj=1;
 break;
-case (_d1a+mod)<0:
+case (_d15+mod)<0:
 adj=2;
 break;
 default:
@@ -15636,116 +15622,116 @@ break;
 }
 }
 days+=adj;
-days-=(_d14*2);
+days-=(_d0f*2);
 }
-_d0e=days;
+_d09=days;
 break;
 case HOUR:
-_d0e=_d0b;
+_d09=_d06;
 break;
 case MINUTE:
-_d0e=_d0a;
+_d09=_d05;
 break;
 case SECOND:
-_d0e=_d09;
+_d09=_d04;
 break;
 case MILLISECOND:
-_d0e=_d08;
+_d09=_d03;
 break;
 default:
 break;
 }
 }
-return Math.round(_d0e);
+return Math.round(_d09);
 };
 dojo.provide("dojo.date.supplemental");
-dojo.date.getFirstDayOfWeek=function(_d1b){
-var _d1c={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};
-_d1b=dojo.hostenv.normalizeLocale(_d1b);
-var _d1d=_d1b.split("-")[1];
-var dow=_d1c[_d1d];
+dojo.date.getFirstDayOfWeek=function(_d16){
+var _d17={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};
+_d16=dojo.hostenv.normalizeLocale(_d16);
+var _d18=_d16.split("-")[1];
+var dow=_d17[_d18];
 return (typeof dow=="undefined")?1:dow;
 };
-dojo.date.getWeekend=function(_d1f){
-var _d20={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 _d21={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};
-_d1f=dojo.hostenv.normalizeLocale(_d1f);
-var _d22=_d1f.split("-")[1];
-var _d23=_d20[_d22];
-var end=_d21[_d22];
-if(typeof _d23=="undefined"){
-_d23=6;
+dojo.date.getWeekend=function(_d1a){
+var _d1b={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 _d1c={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};
+_d1a=dojo.hostenv.normalizeLocale(_d1a);
+var _d1d=_d1a.split("-")[1];
+var _d1e=_d1b[_d1d];
+var end=_d1c[_d1d];
+if(typeof _d1e=="undefined"){
+_d1e=6;
 }
 if(typeof end=="undefined"){
 end=0;
 }
-return {start:_d23,end:end};
+return {start:_d1e,end:end};
 };
-dojo.date.isWeekend=function(_d25,_d26){
-var _d27=dojo.date.getWeekend(_d26);
-var day=(_d25||new Date()).getDay();
-if(_d27.end<_d27.start){
-_d27.end+=7;
-if(day<_d27.start){
+dojo.date.isWeekend=function(_d20,_d21){
+var _d22=dojo.date.getWeekend(_d21);
+var day=(_d20||new Date()).getDay();
+if(_d22.end<_d22.start){
+_d22.end+=7;
+if(day<_d22.start){
 day+=7;
 }
 }
-return day>=_d27.start&&day<=_d27.end;
+return day>=_d22.start&&day<=_d22.end;
 };
 dojo.provide("dojo.i18n.common");
-dojo.i18n.getLocalization=function(_d29,_d2a,_d2b){
+dojo.i18n.getLocalization=function(_d24,_d25,_d26){
 dojo.hostenv.preloadLocalizations();
-_d2b=dojo.hostenv.normalizeLocale(_d2b);
-var _d2c=_d2b.split("-");
-var _d2d=[_d29,"nls",_d2a].join(".");
-var _d2e=dojo.hostenv.findModule(_d2d,true);
-var _d2f;
-for(var i=_d2c.length;i>0;i--){
-var loc=_d2c.slice(0,i).join("_");
-if(_d2e[loc]){
-_d2f=_d2e[loc];
+_d26=dojo.hostenv.normalizeLocale(_d26);
+var _d27=_d26.split("-");
+var _d28=[_d24,"nls",_d25].join(".");
+var _d29=dojo.hostenv.findModule(_d28,true);
+var _d2a;
+for(var i=_d27.length;i>0;i--){
+var loc=_d27.slice(0,i).join("_");
+if(_d29[loc]){
+_d2a=_d29[loc];
 break;
 }
 }
-if(!_d2f){
-_d2f=_d2e.ROOT;
+if(!_d2a){
+_d2a=_d29.ROOT;
 }
-if(_d2f){
-var _d32=function(){
+if(_d2a){
+var _d2d=function(){
 };
-_d32.prototype=_d2f;
-return new _d32();
+_d2d.prototype=_d2a;
+return new _d2d();
 }
-dojo.raise("Bundle not found: "+_d2a+" in "+_d29+" , locale="+_d2b);
+dojo.raise("Bundle not found: "+_d25+" in "+_d24+" , locale="+_d26);
 };
-dojo.i18n.isLTR=function(_d33){
-var lang=dojo.hostenv.normalizeLocale(_d33).split("-")[0];
+dojo.i18n.isLTR=function(_d2e){
+var lang=dojo.hostenv.normalizeLocale(_d2e).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(_d36,_d37){
-if(typeof _d37=="string"){
+dojo.date.format=function(_d31,_d32){
+if(typeof _d32=="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(_d36,_d37);
+return dojo.date.strftime(_d31,_d32);
 }
-function formatPattern(_d38,_d39){
-return _d39.replace(/([a-z])\1*/ig,function(_d3a){
+function formatPattern(_d33,_d34){
+return _d34.replace(/([a-z])\1*/ig,function(_d35){
 var s;
-var c=_d3a.charAt(0);
-var l=_d3a.length;
+var c=_d35.charAt(0);
+var l=_d35.length;
 var pad;
-var _d3f=["abbr","wide","narrow"];
+var _d3a=["abbr","wide","narrow"];
 switch(c){
 case "G":
 if(l>3){
 dojo.unimplemented("Era format not implemented");
 }
-s=info.eras[_d38.getFullYear()<0?1:0];
+s=info.eras[_d33.getFullYear()<0?1:0];
 break;
 case "y":
-s=_d38.getFullYear();
+s=_d33.getFullYear();
 switch(l){
 case 1:
 break;
@@ -15758,7 +15744,7 @@ pad=true;
 break;
 case "Q":
 case "q":
-s=Math.ceil((_d38.getMonth()+1)/3);
+s=Math.ceil((_d33.getMonth()+1)/3);
 switch(l){
 case 1:
 case 2:
@@ -15771,8 +15757,8 @@ dojo.unimplemented("Quarter format not implemented");
 break;
 case "M":
 case "L":
-var m=_d38.getMonth();
-var _d42;
+var m=_d33.getMonth();
+var _d3d;
 switch(l){
 case 1:
 case 2:
@@ -15782,39 +15768,39 @@ break;
 case 3:
 case 4:
 case 5:
-_d42=_d3f[l-3];
+_d3d=_d3a[l-3];
 break;
 }
-if(_d42){
+if(_d3d){
 var type=(c=="L")?"standalone":"format";
-var prop=["months",type,_d42].join("-");
+var prop=["months",type,_d3d].join("-");
 s=info[prop][m];
 }
 break;
 case "w":
-var _d45=0;
-s=dojo.date.getWeekOfYear(_d38,_d45);
+var _d40=0;
+s=dojo.date.getWeekOfYear(_d33,_d40);
 pad=true;
 break;
 case "d":
-s=_d38.getDate();
+s=_d33.getDate();
 pad=true;
 break;
 case "D":
-s=dojo.date.getDayOfYear(_d38);
+s=dojo.date.getDayOfYear(_d33);
 pad=true;
 break;
 case "E":
 case "e":
 case "c":
-var d=_d38.getDay();
-var _d42;
+var d=_d33.getDay();
+var _d3d;
 switch(l){
 case 1:
 case 2:
 if(c=="e"){
-var _d47=dojo.date.getFirstDayOfWeek(_d37.locale);
-d=(d-_d47+7)%7;
+var _d42=dojo.date.getFirstDayOfWeek(_d32.locale);
+d=(d-_d42+7)%7;
 }
 if(c!="c"){
 s=d+1;
@@ -15824,24 +15810,24 @@ break;
 case 3:
 case 4:
 case 5:
-_d42=_d3f[l-3];
+_d3d=_d3a[l-3];
 break;
 }
-if(_d42){
+if(_d3d){
 var type=(c=="c")?"standalone":"format";
-var prop=["days",type,_d42].join("-");
+var prop=["days",type,_d3d].join("-");
 s=info[prop][d];
 }
 break;
 case "a":
-var _d48=(_d38.getHours()<12)?"am":"pm";
-s=info[_d48];
+var _d43=(_d33.getHours()<12)?"am":"pm";
+s=info[_d43];
 break;
 case "h":
 case "H":
 case "K":
 case "k":
-var h=_d38.getHours();
+var h=_d33.getHours();
 switch(c){
 case "h":
 s=(h%12)||12;
@@ -15859,26 +15845,26 @@ break;
 pad=true;
 break;
 case "m":
-s=_d38.getMinutes();
+s=_d33.getMinutes();
 pad=true;
 break;
 case "s":
-s=_d38.getSeconds();
+s=_d33.getSeconds();
 pad=true;
 break;
 case "S":
-s=Math.round(_d38.getMilliseconds()*Math.pow(10,l-3));
+s=Math.round(_d33.getMilliseconds()*Math.pow(10,l-3));
 break;
 case "v":
 case "z":
-s=dojo.date.getTimezoneName(_d38);
+s=dojo.date.getTimezoneName(_d33);
 if(s){
 break;
 }
 l=4;
 case "Z":
-var _d4a=_d38.getTimezoneOffset();
-var tz=[(_d4a<=0?"+":"-"),dojo.string.pad(Math.floor(Math.abs(_d4a)/60),2),dojo.string.pad(Math.abs(_d4a)%60,2)];
+var _d45=_d33.getTimezoneOffset();
+var tz=[(_d45<=0?"+":"-"),dojo.string.pad(Math.floor(Math.abs(_d45)/60),2),dojo.string.pad(Math.abs(_d45)%60,2)];
 if(l==4){
 tz.splice(0,0,"GMT");
 tz.splice(3,0,":");
@@ -15891,11 +15877,11 @@ case "W":
 case "F":
 case "g":
 case "A":
-dojo.debug(_d3a+" modifier not yet implemented");
+dojo.debug(_d35+" modifier not yet implemented");
 s="?";
 break;
 default:
-dojo.raise("dojo.date.format: invalid pattern char: "+_d39);
+dojo.raise("dojo.date.format: invalid pattern char: "+_d34);
 }
 if(pad){
 s=dojo.string.pad(s,l);
@@ -15903,126 +15889,126 @@ s=dojo.string.pad(s,l);
 return s;
 });
 }
-_d37=_d37||{};
-var _d4c=dojo.hostenv.normalizeLocale(_d37.locale);
-var _d4d=_d37.formatLength||"full";
-var info=dojo.date._getGregorianBundle(_d4c);
+_d32=_d32||{};
+var _d47=dojo.hostenv.normalizeLocale(_d32.locale);
+var _d48=_d32.formatLength||"full";
+var info=dojo.date._getGregorianBundle(_d47);
 var str=[];
-var _d4f=dojo.lang.curry(this,formatPattern,_d36);
-if(_d37.selector!="timeOnly"){
-var _d50=_d37.datePattern||info["dateFormat-"+_d4d];
-if(_d50){
-str.push(_processPattern(_d50,_d4f));
+var _d4a=dojo.lang.curry(this,formatPattern,_d31);
+if(_d32.selector!="timeOnly"){
+var _d4b=_d32.datePattern||info["dateFormat-"+_d48];
+if(_d4b){
+str.push(_processPattern(_d4b,_d4a));
 }
 }
-if(_d37.selector!="dateOnly"){
-var _d51=_d37.timePattern||info["timeFormat-"+_d4d];
-if(_d51){
-str.push(_processPattern(_d51,_d4f));
+if(_d32.selector!="dateOnly"){
+var _d4c=_d32.timePattern||info["timeFormat-"+_d48];
+if(_d4c){
+str.push(_processPattern(_d4c,_d4a));
 }
 }
-var _d52=str.join(" ");
-return _d52;
+var _d4d=str.join(" ");
+return _d4d;
 };
-dojo.date.parse=function(_d53,_d54){
-_d54=_d54||{};
-var _d55=dojo.hostenv.normalizeLocale(_d54.locale);
-var info=dojo.date._getGregorianBundle(_d55);
-var _d57=_d54.formatLength||"full";
-if(!_d54.selector){
-_d54.selector="dateOnly";
+dojo.date.parse=function(_d4e,_d4f){
+_d4f=_d4f||{};
+var _d50=dojo.hostenv.normalizeLocale(_d4f.locale);
+var info=dojo.date._getGregorianBundle(_d50);
+var _d52=_d4f.formatLength||"full";
+if(!_d4f.selector){
+_d4f.selector="dateOnly";
 }
-var _d58=_d54.datePattern||info["dateFormat-"+_d57];
-var _d59=_d54.timePattern||info["timeFormat-"+_d57];
-var _d5a;
-if(_d54.selector=="dateOnly"){
-_d5a=_d58;
+var _d53=_d4f.datePattern||info["dateFormat-"+_d52];
+var _d54=_d4f.timePattern||info["timeFormat-"+_d52];
+var _d55;
+if(_d4f.selector=="dateOnly"){
+_d55=_d53;
 }else{
-if(_d54.selector=="timeOnly"){
-_d5a=_d59;
+if(_d4f.selector=="timeOnly"){
+_d55=_d54;
 }else{
-if(_d54.selector=="dateTime"){
-_d5a=_d58+" "+_d59;
+if(_d4f.selector=="dateTime"){
+_d55=_d53+" "+_d54;
 }else{
-var msg="dojo.date.parse: Unknown selector param passed: '"+_d54.selector+"'.";
+var msg="dojo.date.parse: Unknown selector param passed: '"+_d4f.selector+"'.";
 msg+=" Defaulting to date pattern.";
 dojo.debug(msg);
-_d5a=_d58;
+_d55=_d53;
 }
 }
 }
-var _d5c=[];
-var _d5d=_processPattern(_d5a,dojo.lang.curry(this,_buildDateTimeRE,_d5c,info,_d54));
-var _d5e=new RegExp("^"+_d5d+"$");
-var _d5f=_d5e.exec(_d53);
-if(!_d5f){
+var _d57=[];
+var _d58=_processPattern(_d55,dojo.lang.curry(this,_buildDateTimeRE,_d57,info,_d4f));
+var _d59=new RegExp("^"+_d58+"$");
+var _d5a=_d59.exec(_d4e);
+if(!_d5a){
 return null;
 }
-var _d60=["abbr","wide","narrow"];
-var _d61=new Date(1972,0);
-var _d62={};
-for(var i=1;i<_d5f.length;i++){
-var grp=_d5c[i-1];
+var _d5b=["abbr","wide","narrow"];
+var _d5c=new Date(1972,0);
+var _d5d={};
+for(var i=1;i<_d5a.length;i++){
+var grp=_d57[i-1];
 var l=grp.length;
-var v=_d5f[i];
+var v=_d5a[i];
 switch(grp.charAt(0)){
 case "y":
 if(l!=2){
-_d61.setFullYear(v);
-_d62.year=v;
+_d5c.setFullYear(v);
+_d5d.year=v;
 }else{
 if(v<100){
 v=Number(v);
 var year=""+new Date().getFullYear();
-var _d68=year.substring(0,2)*100;
-var _d69=Number(year.substring(2,4));
-var _d6a=Math.min(_d69+20,99);
-var num=(v<_d6a)?_d68+v:_d68-100+v;
-_d61.setFullYear(num);
-_d62.year=num;
+var _d63=year.substring(0,2)*100;
+var _d64=Number(year.substring(2,4));
+var _d65=Math.min(_d64+20,99);
+var num=(v<_d65)?_d63+v:_d63-100+v;
+_d5c.setFullYear(num);
+_d5d.year=num;
 }else{
-if(_d54.strict){
+if(_d4f.strict){
 return null;
 }
-_d61.setFullYear(v);
-_d62.year=v;
+_d5c.setFullYear(v);
+_d5d.year=v;
 }
 }
 break;
 case "M":
 if(l>2){
-if(!_d54.strict){
+if(!_d4f.strict){
 v=v.replace(/\./g,"");
 v=v.toLowerCase();
 }
-var _d6c=info["months-format-"+_d60[l-3]].concat();
-for(var j=0;j<_d6c.length;j++){
-if(!_d54.strict){
-_d6c[j]=_d6c[j].toLowerCase();
+var _d67=info["months-format-"+_d5b[l-3]].concat();
+for(var j=0;j<_d67.length;j++){
+if(!_d4f.strict){
+_d67[j]=_d67[j].toLowerCase();
 }
-if(v==_d6c[j]){
-_d61.setMonth(j);
-_d62.month=j;
+if(v==_d67[j]){
+_d5c.setMonth(j);
+_d5d.month=j;
 break;
 }
 }
-if(j==_d6c.length){
+if(j==_d67.length){
 dojo.debug("dojo.date.parse: Could not parse month name: '"+v+"'.");
 return null;
 }
 }else{
-_d61.setMonth(v-1);
-_d62.month=v-1;
+_d5c.setMonth(v-1);
+_d5d.month=v-1;
 }
 break;
 case "E":
 case "e":
-if(!_d54.strict){
+if(!_d4f.strict){
 v=v.toLowerCase();
 }
-var days=info["days-format-"+_d60[l-3]].concat();
+var days=info["days-format-"+_d5b[l-3]].concat();
 for(var j=0;j23){
 dojo.debug("dojo.date.parse: Illegal hours value");
 return null;
 }
-_d61.setHours(v);
+_d5c.setHours(v);
 break;
 case "m":
-_d61.setMinutes(v);
+_d5c.setMinutes(v);
 break;
 case "s":
-_d61.setSeconds(v);
+_d5c.setSeconds(v);
 break;
 case "S":
-_d61.setMilliseconds(v);
+_d5c.setMilliseconds(v);
 break;
 default:
 dojo.unimplemented("dojo.date.parse: unsupported pattern char="+grp.charAt(0));
 }
 }
-if(_d62.year&&_d61.getFullYear()!=_d62.year){
-dojo.debug("Parsed year: '"+_d61.getFullYear()+"' did not match input year: '"+_d62.year+"'.");
+if(_d5d.year&&_d5c.getFullYear()!=_d5d.year){
+dojo.debug("Parsed year: '"+_d5c.getFullYear()+"' did not match input year: '"+_d5d.year+"'.");
 return null;
 }
-if(_d62.month&&_d61.getMonth()!=_d62.month){
-dojo.debug("Parsed month: '"+_d61.getMonth()+"' did not match input month: '"+_d62.month+"'.");
+if(_d5d.month&&_d5c.getMonth()!=_d5d.month){
+dojo.debug("Parsed month: '"+_d5c.getMonth()+"' did not match input month: '"+_d5d.month+"'.");
 return null;
 }
-if(_d62.date&&_d61.getDate()!=_d62.date){
-dojo.debug("Parsed day of month: '"+_d61.getDate()+"' did not match input day of month: '"+_d62.date+"'.");
+if(_d5d.date&&_d5c.getDate()!=_d5d.date){
+dojo.debug("Parsed day of month: '"+_d5c.getDate()+"' did not match input day of month: '"+_d5d.date+"'.");
 return null;
 }
-return _d61;
+return _d5c;
 };
-function _processPattern(_d72,_d73,_d74,_d75){
-var _d76=function(x){
+function _processPattern(_d6d,_d6e,_d6f,_d70){
+var _d71=function(x){
 return x;
 };
-_d73=_d73||_d76;
-_d74=_d74||_d76;
-_d75=_d75||_d76;
-var _d78=_d72.match(/(''|[^'])+/g);
-var _d79=false;
-for(var i=0;i<_d78.length;i++){
-if(!_d78[i]){
-_d78[i]="";
+_d6e=_d6e||_d71;
+_d6f=_d6f||_d71;
+_d70=_d70||_d71;
+var _d73=_d6d.match(/(''|[^'])+/g);
+var _d74=false;
+for(var i=0;i<_d73.length;i++){
+if(!_d73[i]){
+_d73[i]="";
 }else{
-_d78[i]=(_d79?_d74:_d73)(_d78[i]);
-_d79=!_d79;
+_d73[i]=(_d74?_d6f:_d6e)(_d73[i]);
+_d74=!_d74;
 }
 }
-return _d75(_d78.join(""));
+return _d70(_d73.join(""));
 }
-function _buildDateTimeRE(_d7b,info,_d7d,_d7e){
-return _d7e.replace(/([a-z])\1*/ig,function(_d7f){
+function _buildDateTimeRE(_d76,info,_d78,_d79){
+return _d79.replace(/([a-z])\1*/ig,function(_d7a){
 var s;
-var c=_d7f.charAt(0);
-var l=_d7f.length;
+var c=_d7a.charAt(0);
+var l=_d7a.length;
 switch(c){
 case "y":
 s="\\d"+((l==2)?"{2,4}":"+");
@@ -16150,9 +16136,9 @@ case "S":
 s="\\d{1,3}";
 break;
 case "a":
-var am=_d7d.am||info.am||"AM";
-var pm=_d7d.pm||info.pm||"PM";
-if(_d7d.strict){
+var am=_d78.am||info.am||"AM";
+var pm=_d78.pm||info.pm||"PM";
+if(_d78.strict){
 s=am+"|"+pm;
 }else{
 s=am;
@@ -16162,50 +16148,50 @@ s+=(pm!=pm.toLowerCase())?pm+"|"+pm.toLowerCase():pm;
 }
 break;
 default:
-dojo.unimplemented("parse of date format, pattern="+_d7e);
+dojo.unimplemented("parse of date format, pattern="+_d79);
 }
-if(_d7b){
-_d7b.push(_d7f);
+if(_d76){
+_d76.push(_d7a);
 }
 return "\\s*("+s+")\\s*";
 });
 }
 })();
-dojo.date.strftime=function(_d85,_d86,_d87){
-var _d88=null;
+dojo.date.strftime=function(_d80,_d81,_d82){
+var _d83=null;
 function _(s,n){
-return dojo.string.pad(s,n||2,_d88||"0");
+return dojo.string.pad(s,n||2,_d83||"0");
 }
-var info=dojo.date._getGregorianBundle(_d87);
-function $(_d8c){
-switch(_d8c){
+var info=dojo.date._getGregorianBundle(_d82);
+function $(_d87){
+switch(_d87){
 case "a":
-return dojo.date.getDayShortName(_d85,_d87);
+return dojo.date.getDayShortName(_d80,_d82);
 case "A":
-return dojo.date.getDayName(_d85,_d87);
+return dojo.date.getDayName(_d80,_d82);
 case "b":
 case "h":
-return dojo.date.getMonthShortName(_d85,_d87);
+return dojo.date.getMonthShortName(_d80,_d82);
 case "B":
-return dojo.date.getMonthName(_d85,_d87);
+return dojo.date.getMonthName(_d80,_d82);
 case "c":
-return dojo.date.format(_d85,{locale:_d87});
+return dojo.date.format(_d80,{locale:_d82});
 case "C":
-return _(Math.floor(_d85.getFullYear()/100));
+return _(Math.floor(_d80.getFullYear()/100));
 case "d":
-return _(_d85.getDate());
+return _(_d80.getDate());
 case "D":
 return $("m")+"/"+$("d")+"/"+$("y");
 case "e":
-if(_d88==null){
-_d88=" ";
+if(_d83==null){
+_d83=" ";
 }
-return _(_d85.getDate());
+return _(_d80.getDate());
 case "f":
-if(_d88==null){
-_d88=" ";
+if(_d83==null){
+_d83=" ";
 }
-return _(_d85.getMonth()+1);
+return _(_d80.getMonth()+1);
 case "g":
 break;
 case "G":
@@ -16214,171 +16200,171 @@ break;
 case "F":
 return $("Y")+"-"+$("m")+"-"+$("d");
 case "H":
-return _(_d85.getHours());
+return _(_d80.getHours());
 case "I":
-return _(_d85.getHours()%12||12);
+return _(_d80.getHours()%12||12);
 case "j":
-return _(dojo.date.getDayOfYear(_d85),3);
+return _(dojo.date.getDayOfYear(_d80),3);
 case "k":
-if(_d88==null){
-_d88=" ";
+if(_d83==null){
+_d83=" ";
 }
-return _(_d85.getHours());
+return _(_d80.getHours());
 case "l":
-if(_d88==null){
-_d88=" ";
+if(_d83==null){
+_d83=" ";
 }
-return _(_d85.getHours()%12||12);
+return _(_d80.getHours()%12||12);
 case "m":
-return _(_d85.getMonth()+1);
+return _(_d80.getMonth()+1);
 case "M":
-return _(_d85.getMinutes());
+return _(_d80.getMinutes());
 case "n":
 return "\n";
 case "p":
-return info[_d85.getHours()<12?"am":"pm"];
+return info[_d80.getHours()<12?"am":"pm"];
 case "r":
 return $("I")+":"+$("M")+":"+$("S")+" "+$("p");
 case "R":
 return $("H")+":"+$("M");
 case "S":
-return _(_d85.getSeconds());
+return _(_d80.getSeconds());
 case "t":
 return "\t";
 case "T":
 return $("H")+":"+$("M")+":"+$("S");
 case "u":
-return String(_d85.getDay()||7);
+return String(_d80.getDay()||7);
 case "U":
-return _(dojo.date.getWeekOfYear(_d85));
+return _(dojo.date.getWeekOfYear(_d80));
 case "V":
-return _(dojo.date.getIsoWeekOfYear(_d85));
+return _(dojo.date.getIsoWeekOfYear(_d80));
 case "W":
-return _(dojo.date.getWeekOfYear(_d85,1));
+return _(dojo.date.getWeekOfYear(_d80,1));
 case "w":
-return String(_d85.getDay());
+return String(_d80.getDay());
 case "x":
-return dojo.date.format(_d85,{selector:"dateOnly",locale:_d87});
+return dojo.date.format(_d80,{selector:"dateOnly",locale:_d82});
 case "X":
-return dojo.date.format(_d85,{selector:"timeOnly",locale:_d87});
+return dojo.date.format(_d80,{selector:"timeOnly",locale:_d82});
 case "y":
-return _(_d85.getFullYear()%100);
+return _(_d80.getFullYear()%100);
 case "Y":
-return String(_d85.getFullYear());
+return String(_d80.getFullYear());
 case "z":
-var _d8d=_d85.getTimezoneOffset();
-return (_d8d>0?"-":"+")+_(Math.floor(Math.abs(_d8d)/60))+":"+_(Math.abs(_d8d)%60);
+var _d88=_d80.getTimezoneOffset();
+return (_d88>0?"-":"+")+_(Math.floor(Math.abs(_d88)/60))+":"+_(Math.abs(_d88)%60);
 case "Z":
-return dojo.date.getTimezoneName(_d85);
+return dojo.date.getTimezoneName(_d80);
 case "%":
 return "%";
 }
 }
-var _d8e="";
+var _d89="";
 var i=0;
-var _d90=0;
-var _d91=null;
-while((_d90=_d86.indexOf("%",i))!=-1){
-_d8e+=_d86.substring(i,_d90++);
-switch(_d86.charAt(_d90++)){
+var _d8b=0;
+var _d8c=null;
+while((_d8b=_d81.indexOf("%",i))!=-1){
+_d89+=_d81.substring(i,_d8b++);
+switch(_d81.charAt(_d8b++)){
 case "_":
-_d88=" ";
+_d83=" ";
 break;
 case "-":
-_d88="";
+_d83="";
 break;
 case "0":
-_d88="0";
+_d83="0";
 break;
 case "^":
-_d91="upper";
+_d8c="upper";
 break;
 case "*":
-_d91="lower";
+_d8c="lower";
 break;
 case "#":
-_d91="swap";
+_d8c="swap";
 break;
 default:
-_d88=null;
-_d90--;
+_d83=null;
+_d8b--;
 break;
 }
-var _d92=$(_d86.charAt(_d90++));
-switch(_d91){
+var _d8d=$(_d81.charAt(_d8b++));
+switch(_d8c){
 case "upper":
-_d92=_d92.toUpperCase();
+_d8d=_d8d.toUpperCase();
 break;
 case "lower":
-_d92=_d92.toLowerCase();
+_d8d=_d8d.toLowerCase();
 break;
 case "swap":
-var _d93=_d92.toLowerCase();
-var _d94="";
+var _d8e=_d8d.toLowerCase();
+var _d8f="";
 var j=0;
 var ch="";
-while(j<_d92.length){
-ch=_d92.charAt(j);
-_d94+=(ch==_d93.charAt(j))?ch.toUpperCase():ch.toLowerCase();
+while(j<_d8d.length){
+ch=_d8d.charAt(j);
+_d8f+=(ch==_d8e.charAt(j))?ch.toUpperCase():ch.toLowerCase();
 j++;
 }
-_d92=_d94;
+_d8d=_d8f;
 break;
 default:
 break;
 }
-_d91=null;
-_d8e+=_d92;
-i=_d90;
+_d8c=null;
+_d89+=_d8d;
+i=_d8b;
 }
-_d8e+=_d86.substring(i);
-return _d8e;
+_d89+=_d81.substring(i);
+return _d89;
 };
 (function(){
-var _d97=[];
-dojo.date.addCustomFormats=function(_d98,_d99){
-_d97.push({pkg:_d98,name:_d99});
+var _d92=[];
+dojo.date.addCustomFormats=function(_d93,_d94){
+_d92.push({pkg:_d93,name:_d94});
 };
-dojo.date._getGregorianBundle=function(_d9a){
-var _d9b={};
-dojo.lang.forEach(_d97,function(desc){
-var _d9d=dojo.i18n.getLocalization(desc.pkg,desc.name,_d9a);
-_d9b=dojo.lang.mixin(_d9b,_d9d);
+dojo.date._getGregorianBundle=function(_d95){
+var _d96={};
+dojo.lang.forEach(_d92,function(desc){
+var _d98=dojo.i18n.getLocalization(desc.pkg,desc.name,_d95);
+_d96=dojo.lang.mixin(_d96,_d98);
 },this);
-return _d9b;
+return _d96;
 };
 })();
 dojo.date.addCustomFormats("dojo.i18n.calendar","gregorian");
 dojo.date.addCustomFormats("dojo.i18n.calendar","gregorianExtras");
-dojo.date.getNames=function(item,type,use,_da1){
-var _da2;
-var _da3=dojo.date._getGregorianBundle(_da1);
-var _da4=[item,use,type];
+dojo.date.getNames=function(item,type,use,_d9c){
+var _d9d;
+var _d9e=dojo.date._getGregorianBundle(_d9c);
+var _d9f=[item,use,type];
 if(use=="standAlone"){
-_da2=_da3[_da4.join("-")];
+_d9d=_d9e[_d9f.join("-")];
 }
-_da4[1]="format";
-return (_da2||_da3[_da4.join("-")]).concat();
+_d9f[1]="format";
+return (_d9d||_d9e[_d9f.join("-")]).concat();
 };
-dojo.date.getDayName=function(_da5,_da6){
-return dojo.date.getNames("days","wide","format",_da6)[_da5.getDay()];
+dojo.date.getDayName=function(_da0,_da1){
+return dojo.date.getNames("days","wide","format",_da1)[_da0.getDay()];
 };
-dojo.date.getDayShortName=function(_da7,_da8){
-return dojo.date.getNames("days","abbr","format",_da8)[_da7.getDay()];
+dojo.date.getDayShortName=function(_da2,_da3){
+return dojo.date.getNames("days","abbr","format",_da3)[_da2.getDay()];
 };
-dojo.date.getMonthName=function(_da9,_daa){
-return dojo.date.getNames("months","wide","format",_daa)[_da9.getMonth()];
+dojo.date.getMonthName=function(_da4,_da5){
+return dojo.date.getNames("months","wide","format",_da5)[_da4.getMonth()];
 };
-dojo.date.getMonthShortName=function(_dab,_dac){
-return dojo.date.getNames("months","abbr","format",_dac)[_dab.getMonth()];
+dojo.date.getMonthShortName=function(_da6,_da7){
+return dojo.date.getNames("months","abbr","format",_da7)[_da6.getMonth()];
 };
-dojo.date.toRelativeString=function(_dad){
+dojo.date.toRelativeString=function(_da8){
 var now=new Date();
-var diff=(now-_dad)/1000;
+var diff=(now-_da8)/1000;
 var end=" ago";
-var _db1=false;
+var _dac=false;
 if(diff<0){
-_db1=true;
+_dac=true;
 end=" from now";
 diff=-diff;
 }
@@ -16397,22 +16383,22 @@ return diff+" hour"+(diff==1?"":"s")+end;
 if(diff<60*60*24*7){
 diff=Math.round(diff/(3600*24));
 if(diff==1){
-return _db1?"Tomorrow":"Yesterday";
+return _dac?"Tomorrow":"Yesterday";
 }else{
 return diff+" days"+end;
 }
 }
-return dojo.date.format(_dad);
+return dojo.date.format(_da8);
 };
-dojo.date.toSql=function(_db2,_db3){
-return dojo.date.strftime(_db2,"%F"+!_db3?" %T":"");
+dojo.date.toSql=function(_dad,_dae){
+return dojo.date.strftime(_dad,"%F"+!_dae?" %T":"");
 };
-dojo.date.fromSql=function(_db4){
-var _db5=_db4.split(/[\- :]/g);
-while(_db5.length<6){
-_db5.push(0);
+dojo.date.fromSql=function(_daf){
+var _db0=_daf.split(/[\- :]/g);
+while(_db0.length<6){
+_db0.push(0);
 }
-return new Date(_db5[0],(parseInt(_db5[1],10)-1),_db5[2],_db5[3],_db5[4],_db5[5]);
+return new Date(_db0[0],(parseInt(_db0[1],10)-1),_db0[2],_db0[3],_db0[4],_db0[5]);
 };
 dojo.provide("dojo.widget.TimePicker");
 dojo.widget.defineWidget("dojo.widget.TimePicker",dojo.widget.HtmlWidget,function(){
@@ -16426,13 +16412,13 @@ this.any="any";
 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,templateString:"
\n\t\n\t\t\n\t\t\t\n\t\t\t\t\n\t\t\t\t\n\t\t\t\t\n\t\t\t\t\n\t\t\t\n\t\t\n\t\t\n\t\t\t\n\t\t\t\t\n\t\t\t\t\n\t\t\t\n\t\t\t\n\t\t\t\t\n\t\t\t\t\n\t\t\t\t\n\t\t\t\t\n\t\t\t\n\t\t\n\t
 ${this.calendar.field-hour}${this.calendar.field-minute} 
\n\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t
126
17
28
39
410
511
\n\t\t\t\t		\n\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t
0030
0535
1040
1545
2050
2555
\n\t\t\t\t
 \n\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t
${this.calendar.am}${this.calendar.pm}
\n\t\t\t\t		\n\t\t\t\t\t
${this.widgetStrings.any}
\n\t\t\t\t		 
\n
\n",templateCssString:"/*Time Picker */\n.timePickerContainer {\n\twidth:122px;\n\tfont-family:Tahoma, Myriad, Helvetica, Arial, Verdana, sans-serif;\n\tfont-size:16px;\n}\n\n.timeContainer {\n\tborder-collapse:collapse;\n\tborder-spacing:0;\n}\n\n.timeContainer thead {\n\tcolor:#293a4b;\n\tfont-size:0.9em;\n\tfont-weight:700;\n}\n\n.timeContainer thead td {\n\tpadding:0.25em;\n\tfont-size:0.80em;\n\tborder-bottom:1px solid #6782A8;\n}\n\n.timeCorner {\n\twidth:10px;\n}\n\n.cornerTopLeft {\n\tbackground: url(\"images/dpCurveTL.png\") top left no-repeat;\n}\n\n.cornerTopRight {\n\tbackground: url(\"images/dpCurveTR.png\") top right no-repeat;\n}\n\n.timeLabelContainer {\n\tbackground: url(\"images/dpMonthBg.png\") top left repeat-x;\n}\n\n.hours, .minutes, .timeBorder {\n\tbackground: #7591bc url(\"images/dpBg.gif\") top left repeat-x;\n\n}\n\n.hours td, .minutes td {\n\tpadding:0.2em;\n\ttext-align:center;\n\tfont-size:0.7em;\n\tfont-weight:bold;\n\tcursor:pointer;\n\tcursor:hand;\n\tcolor:#fff;\n}\n\n.minutes {\n\tborder-left:1px solid #f5d1db;\n}\n\n.hours {\n\tborder-right:1px solid #6782A8;\n}\n\n.hourSelector {\n\tborder-right:1px solid #6782A8;\n\tpadding:5px;\n\tpadding-right:10px;\n}\n\n.minutesSelector {\n\tpadding:5px;\n\tborder-left:1px solid #f5c7d4;\n\ttext-align:center;\n}\n\n.minutesHeading {\n\tpadding-left:9px !important;\n}\n\n.timeOptions {\n\tbackground-color:#F9C9D7;\n}\n\n.timeContainer .cornerBottomLeft, .timeContainer .cornerBottomRight, .timeContainer .timeOptions {\n\tborder-top:1px solid #6782A8;\n}\n\n.timeContainer .cornerBottomLeft {\n\tbackground: url(\"images/dpCurveBL.png\") bottom left no-repeat !important;\n\twidth:9px !important;\n\tpadding:0;\n\tmargin:0;\n}\n\n.timeContainer .cornerBottomRight {\n\tbackground: url(\"images/dpCurveBR.png\") bottom right no-repeat !important;\n\twidth:9px !important;\n\tpadding:0;\n\tmargin:0;\n}\n\n.timeOptions {\n\tcolor:#fff;\n\tbackground:url(\"images/dpYearBg.png\") top left repeat-x;\n\n}\n\n.selectedItem {\n\tbackground-color:#fff;\n\tcolor:#6782a8 !important;\n}\n\n.timeOptions .selectedItem {\n\tcolor:#fff !important;\n\tbackground-color:#9ec3fb !important;\n}\n\n.anyTimeContainer {\n\ttext-align:center;\n\tfont-weight:bold;\n\tfont-size:0.7em;\n\tpadding:0.1em;\n\tcursor:pointer;\n\tcursor:hand;\n\tcolor:#fff !important;\n}\n\n.amPmContainer {\n\twidth:100%;\n}\n\n.amPmContainer td {\n\ttext-align:center;\n\tfont-size:0.7em;\n\tfont-weight:bold;\n\tcursor:pointer;\n\tcursor:hand;\n\tcolor:#fff;\n}\n\n\n\n/*.timePickerContainer {\n\tmargin:1.75em 0 0.5em 0;\n\twidth:10em;\n\tfloat:left;\n}\n\n.timeContainer {\n\tborder-collapse:collapse;\n\tborder-spacing:0;\n}\n\n.timeContainer thead td{\n\tborder-bottom:1px solid #e6e6e6;\n\tpadding:0 0.4em 0.2em 0.4em;\n}\n\n.timeContainer td {\n\tfont-size:0.9em;\n\tpadding:0 0.25em 0 0.25em;\n\ttext-align:left;\n\tcursor:pointer;cursor:hand;\n}\n\n.timeContainer td.minutesHeading {\n\tborder-left:1px solid #e6e6e6;\n\tborder-right:1px solid #e6e6e6;\t\n}\n\n.timeContainer .minutes {\n\tborder-left:1px solid #e6e6e6;\n\tborder-right:1px solid #e6e6e6;\n}\n\n.selectedItem {\n\tbackground-color:#3a3a3a;\n\tcolor:#ffffff;\n}*/\n",templateCssPath:dojo.uri.moduleUri("dojo.widget","templates/TimePicker.css"),postMixInProperties:function(_db6,frag){
+},{isContainer:false,templateString:"
\n\t\n\t\t\n\t\t\t\n\t\t\t\t\n\t\t\t\t\n\t\t\t\t\n\t\t\t\t\n\t\t\t\n\t\t\n\t\t\n\t\t\t\n\t\t\t\t\n\t\t\t\t\n\t\t\t\n\t\t\t\n\t\t\t\t\n\t\t\t\t\n\t\t\t\t\n\t\t\t\t\n\t\t\t\n\t\t\n\t
 ${this.calendar.field-hour}${this.calendar.field-minute} 
\n\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t
126
17
28
39
410
511
\n\t\t\t\t		\n\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t
0030
0535
1040
1545
2050
2555
\n\t\t\t\t
 \n\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t
${this.calendar.am}${this.calendar.pm}
\n\t\t\t\t		\n\t\t\t\t\t
${this.widgetStrings.any}
\n\t\t\t\t		 
\n
\n",templateCssString:"/*Time Picker */\n.timePickerContainer {\n\twidth:122px;\n\tfont-family:Tahoma, Myriad, Helvetica, Arial, Verdana, sans-serif;\n\tfont-size:16px;\n}\n\n.timeContainer {\n\tborder-collapse:collapse;\n\tborder-spacing:0;\n}\n\n.timeContainer thead {\n\tcolor:#293a4b;\n\tfont-size:0.9em;\n\tfont-weight:700;\n}\n\n.timeContainer thead td {\n\tpadding:0.25em;\n\tfont-size:0.80em;\n\tborder-bottom:1px solid #6782A8;\n}\n\n.timeCorner {\n\twidth:10px;\n}\n\n.cornerTopLeft {\n\tbackground: url(\"images/dpCurveTL.png\") top left no-repeat;\n}\n\n.cornerTopRight {\n\tbackground: url(\"images/dpCurveTR.png\") top right no-repeat;\n}\n\n.timeLabelContainer {\n\tbackground: url(\"images/dpMonthBg.png\") top left repeat-x;\n}\n\n.hours, .minutes, .timeBorder {\n\tbackground: #7591bc url(\"images/dpBg.gif\") top left repeat-x;\n\n}\n\n.hours td, .minutes td {\n\tpadding:0.2em;\n\ttext-align:center;\n\tfont-size:0.7em;\n\tfont-weight:bold;\n\tcursor:pointer;\n\tcursor:hand;\n\tcolor:#fff;\n}\n\n.minutes {\n\tborder-left:1px solid #f5d1db;\n}\n\n.hours {\n\tborder-right:1px solid #6782A8;\n}\n\n.hourSelector {\n\tborder-right:1px solid #6782A8;\n\tpadding:5px;\n\tpadding-right:10px;\n}\n\n.minutesSelector {\n\tpadding:5px;\n\tborder-left:1px solid #f5c7d4;\n\ttext-align:center;\n}\n\n.minutesHeading {\n\tpadding-left:9px !important;\n}\n\n.timeOptions {\n\tbackground-color:#F9C9D7;\n}\n\n.timeContainer .cornerBottomLeft, .timeContainer .cornerBottomRight, .timeContainer .timeOptions {\n\tborder-top:1px solid #6782A8;\n}\n\n.timeContainer .cornerBottomLeft {\n\tbackground: url(\"images/dpCurveBL.png\") bottom left no-repeat !important;\n\twidth:9px !important;\n\tpadding:0;\n\tmargin:0;\n}\n\n.timeContainer .cornerBottomRight {\n\tbackground: url(\"images/dpCurveBR.png\") bottom right no-repeat !important;\n\twidth:9px !important;\n\tpadding:0;\n\tmargin:0;\n}\n\n.timeOptions {\n\tcolor:#fff;\n\tbackground:url(\"images/dpYearBg.png\") top left repeat-x;\n\n}\n\n.selectedItem {\n\tbackground-color:#fff;\n\tcolor:#6782a8 !important;\n}\n\n.timeOptions .selectedItem {\n\tcolor:#fff !important;\n\tbackground-color:#9ec3fb !important;\n}\n\n.anyTimeContainer {\n\ttext-align:center;\n\tfont-weight:bold;\n\tfont-size:0.7em;\n\tpadding:0.1em;\n\tcursor:pointer;\n\tcursor:hand;\n\tcolor:#fff !important;\n}\n\n.amPmContainer {\n\twidth:100%;\n}\n\n.amPmContainer td {\n\ttext-align:center;\n\tfont-size:0.7em;\n\tfont-weight:bold;\n\tcursor:pointer;\n\tcursor:hand;\n\tcolor:#fff;\n}\n\n\n\n/*.timePickerContainer {\n\tmargin:1.75em 0 0.5em 0;\n\twidth:10em;\n\tfloat:left;\n}\n\n.timeContainer {\n\tborder-collapse:collapse;\n\tborder-spacing:0;\n}\n\n.timeContainer thead td{\n\tborder-bottom:1px solid #e6e6e6;\n\tpadding:0 0.4em 0.2em 0.4em;\n}\n\n.timeContainer td {\n\tfont-size:0.9em;\n\tpadding:0 0.25em 0 0.25em;\n\ttext-align:left;\n\tcursor:pointer;cursor:hand;\n}\n\n.timeContainer td.minutesHeading {\n\tborder-left:1px solid #e6e6e6;\n\tborder-right:1px solid #e6e6e6;\t\n}\n\n.timeContainer .minutes {\n\tborder-left:1px solid #e6e6e6;\n\tborder-right:1px solid #e6e6e6;\n}\n\n.selectedItem {\n\tbackground-color:#3a3a3a;\n\tcolor:#ffffff;\n}*/\n",templateCssPath:dojo.uri.moduleUri("dojo.widget","templates/TimePicker.css"),postMixInProperties:function(_db1,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 _dba=this.getFragNodeRef(frag);
-dojo.html.copyStyle(this.domNode,_dba);
+var _db5=this.getFragNodeRef(frag);
+dojo.html.copyStyle(this.domNode,_db5);
 if(args.value){
 if(args.value instanceof Date){
 this.storedTime=dojo.date.toRfc3339(args.value);
@@ -16455,13 +16441,13 @@ this.time=dojo.widget.TimePicker.util.fromRfcDateTime("",0,1);
 }
 },initUI:function(){
 if(!this.selectedTime.anyTime&&this.time){
-var _dbb=dojo.widget.TimePicker.util.toAmPmHour(this.time.getHours());
-var hour=_dbb[0];
-var isAm=_dbb[1];
-var _dbe=this.time.getMinutes();
-var _dbf=parseInt(_dbe/5);
+var _db6=dojo.widget.TimePicker.util.toAmPmHour(this.time.getHours());
+var hour=_db6[0];
+var isAm=_db6[1];
+var _db9=this.time.getMinutes();
+var _dba=parseInt(_db9/5);
 this.onSetSelectedHour(this.hourIndexMap[hour]);
-this.onSetSelectedMinute(this.minuteIndexMap[_dbf]);
+this.onSetSelectedMinute(this.minuteIndexMap[_dba]);
 this.onSetSelectedAmPm(isAm);
 }else{
 this.onSetSelectedAnyTime();
@@ -16475,8 +16461,8 @@ this.selectedTime.anyTime=true;
 }
 this.initData();
 this.initUI();
-},setDateTime:function(_dc1){
-this.storedTime=_dc1;
+},setDateTime:function(_dbc){
+this.storedTime=_dbc;
 },onClearSelectedHour:function(evt){
 this.clearSelectedHour();
 },onClearSelectedMinute:function(evt){
@@ -16491,19 +16477,19 @@ this.time=dojo.widget.TimePicker.util.fromRfcDateTime("",this.useDefaultMinutes)
 this.initUI();
 }
 },clearSelectedHour:function(){
-var _dc6=this.hourContainerNode.getElementsByTagName("td");
-for(var i=0;i<_dc6.length;i++){
-dojo.html.setClass(_dc6.item(i),"");
+var _dc1=this.hourContainerNode.getElementsByTagName("td");
+for(var i=0;i<_dc1.length;i++){
+dojo.html.setClass(_dc1.item(i),"");
 }
 },clearSelectedMinute:function(){
-var _dc8=this.minuteContainerNode.getElementsByTagName("td");
-for(var i=0;i<_dc8.length;i++){
-dojo.html.setClass(_dc8.item(i),"");
+var _dc3=this.minuteContainerNode.getElementsByTagName("td");
+for(var i=0;i<_dc3.length;i++){
+dojo.html.setClass(_dc3.item(i),"");
 }
 },clearSelectedAmPm:function(){
-var _dca=this.amPmContainerNode.getElementsByTagName("td");
-for(var i=0;i<_dca.length;i++){
-dojo.html.setClass(_dca.item(i),"");
+var _dc5=this.amPmContainerNode.getElementsByTagName("td");
+for(var i=0;i<_dc5.length;i++){
+dojo.html.setClass(_dc5.item(i),"");
 }
 },clearSelectedAnyTime:function(){
 dojo.html.setClass(this.anyTimeContainerNode,"anyTimeContainer");
@@ -16515,19 +16501,19 @@ this.onSetTime();
 },setSelectedHour:function(evt){
 if(evt&&evt.target){
 if(evt.target.nodeType==dojo.dom.ELEMENT_NODE){
-var _dce=evt.target;
+var _dc9=evt.target;
 }else{
-var _dce=evt.target.parentNode;
+var _dc9=evt.target.parentNode;
 }
 dojo.event.browser.stopEvent(evt);
-dojo.html.setClass(_dce,this.classNames.selectedTime);
-this.selectedTime["hour"]=_dce.innerHTML;
+dojo.html.setClass(_dc9,this.classNames.selectedTime);
+this.selectedTime["hour"]=_dc9.innerHTML;
 }else{
 if(!isNaN(evt)){
-var _dcf=this.hourContainerNode.getElementsByTagName("td");
-if(_dcf.item(evt)){
-dojo.html.setClass(_dcf.item(evt),this.classNames.selectedTime);
-this.selectedTime["hour"]=_dcf.item(evt).innerHTML;
+var _dca=this.hourContainerNode.getElementsByTagName("td");
+if(_dca.item(evt)){
+dojo.html.setClass(_dca.item(evt),this.classNames.selectedTime);
+this.selectedTime["hour"]=_dca.item(evt).innerHTML;
 }
 }
 }
@@ -16541,19 +16527,19 @@ this.onSetTime();
 },setSelectedMinute:function(evt){
 if(evt&&evt.target){
 if(evt.target.nodeType==dojo.dom.ELEMENT_NODE){
-var _dd2=evt.target;
+var _dcd=evt.target;
 }else{
-var _dd2=evt.target.parentNode;
+var _dcd=evt.target.parentNode;
 }
 dojo.event.browser.stopEvent(evt);
-dojo.html.setClass(_dd2,this.classNames.selectedTime);
-this.selectedTime["minute"]=_dd2.innerHTML;
+dojo.html.setClass(_dcd,this.classNames.selectedTime);
+this.selectedTime["minute"]=_dcd.innerHTML;
 }else{
 if(!isNaN(evt)){
-var _dd3=this.minuteContainerNode.getElementsByTagName("td");
-if(_dd3.item(evt)){
-dojo.html.setClass(_dd3.item(evt),this.classNames.selectedTime);
-this.selectedTime["minute"]=_dd3.item(evt).innerHTML;
+var _dce=this.minuteContainerNode.getElementsByTagName("td");
+if(_dce.item(evt)){
+dojo.html.setClass(_dce.item(evt),this.classNames.selectedTime);
+this.selectedTime["minute"]=_dce.item(evt).innerHTML;
 }
 }
 }
@@ -16564,20 +16550,20 @@ this.setSelectedAmPm(evt);
 this.selectedTime.anyTime=false;
 this.onSetTime();
 },setSelectedAmPm:function(evt){
-var _dd6=evt.target;
-if(evt&&_dd6){
-if(_dd6.nodeType!=dojo.dom.ELEMENT_NODE){
-_dd6=_dd6.parentNode;
+var _dd1=evt.target;
+if(evt&&_dd1){
+if(_dd1.nodeType!=dojo.dom.ELEMENT_NODE){
+_dd1=_dd1.parentNode;
 }
 dojo.event.browser.stopEvent(evt);
-this.selectedTime.amPm=_dd6.id;
-dojo.html.setClass(_dd6,this.classNames.selectedTime);
+this.selectedTime.amPm=_dd1.id;
+dojo.html.setClass(_dd1,this.classNames.selectedTime);
 }else{
 evt=evt?0:1;
-var _dd7=this.amPmContainerNode.getElementsByTagName("td");
-if(_dd7.item(evt)){
-this.selectedTime.amPm=_dd7.item(evt).id;
-dojo.html.setClass(_dd7.item(evt),this.classNames.selectedTime);
+var _dd2=this.amPmContainerNode.getElementsByTagName("td");
+if(_dd2.item(evt)){
+this.selectedTime.amPm=_dd2.item(evt).id;
+dojo.html.setClass(_dd2.item(evt),this.classNames.selectedTime);
 }
 }
 },onSetSelectedAnyTime:function(evt){
@@ -16594,72 +16580,72 @@ dojo.event.browser.stopEvent(evt);
 },onSetTime:function(){
 if(this.selectedTime.anyTime){
 this.time=new Date();
-var _ddb=dojo.widget.TimePicker.util.toRfcDateTime(this.time);
-this.setDateTime(_ddb.split("T")[0]);
+var _dd6=dojo.widget.TimePicker.util.toRfcDateTime(this.time);
+this.setDateTime(_dd6.split("T")[0]);
 }else{
 var hour=12;
-var _ddd=0;
+var _dd8=0;
 var isAm=false;
 if(this.selectedTime["hour"]){
 hour=parseInt(this.selectedTime["hour"],10);
 }
 if(this.selectedTime["minute"]){
-_ddd=parseInt(this.selectedTime["minute"],10);
+_dd8=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(_ddd);
+this.time.setMinutes(_dd8);
 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(_de0){
-if(!_de0){
-_de0=new Date();
+this.toRfcDateTime=function(_ddb){
+if(!_ddb){
+_ddb=new Date();
 }
-_de0.setSeconds(0);
-return dojo.date.strftime(_de0,"%Y-%m-%dT%H:%M:00%z");
+_ddb.setSeconds(0);
+return dojo.date.strftime(_ddb,"%Y-%m-%dT%H:%M:00%z");
 };
-this.fromRfcDateTime=function(_de1,_de2,_de3){
-var _de4=new Date();
-if(!_de1||_de1.indexOf("T")==-1){
-if(_de2){
-_de4.setMinutes(Math.floor(_de4.getMinutes()/5)*5);
+this.fromRfcDateTime=function(_ddc,_ddd,_dde){
+var _ddf=new Date();
+if(!_ddc||_ddc.indexOf("T")==-1){
+if(_ddd){
+_ddf.setMinutes(Math.floor(_ddf.getMinutes()/5)*5);
 }else{
-_de4.setMinutes(0);
+_ddf.setMinutes(0);
 }
 }else{
-var _de5=_de1.split("T")[1].split(":");
-var _de4=new Date();
-_de4.setHours(_de5[0]);
-_de4.setMinutes(_de5[1]);
+var _de0=_ddc.split("T")[1].split(":");
+var _ddf=new Date();
+_ddf.setHours(_de0[0]);
+_ddf.setMinutes(_de0[1]);
 }
-return _de4;
+return _ddf;
 };
 this.toAmPmHour=function(hour){
-var _de7=hour;
+var _de2=hour;
 var isAm=true;
-if(_de7==0){
-_de7=12;
+if(_de2==0){
+_de2=12;
 }else{
-if(_de7>12){
-_de7=_de7-12;
+if(_de2>12){
+_de2=_de2-12;
 isAm=false;
 }else{
-if(_de7==12){
+if(_de2==12){
 isAm=false;
 }
 }
 }
-return [_de7,isAm];
+return [_de2,isAm];
 };
-this.fromAmPmHour=function(_de9,isAm){
-var hour=parseInt(_de9,10);
+this.fromAmPmHour=function(_de4,isAm){
+var hour=parseInt(_de4,10);
 if(isAm&&hour==12){
 hour=0;
 }else{
@@ -16673,8 +16659,8 @@ return hour;
 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 _dec=dojo.i18n.getLocalization("dojo.widget","DropdownTimePicker",this.lang);
-this.iconAlt=_dec.selectTime;
+var _de7=dojo.i18n.getLocalization("dojo.widget","DropdownTimePicker",this.lang);
+this.iconAlt=_de7.selectTime;
 if(typeof (this.value)=="string"&&this.value.toLowerCase()=="today"){
 this.value=new Date();
 }
@@ -16699,9 +16685,9 @@ this.value=new Date(this.value);
 }
 },fillInTemplate:function(){
 dojo.widget.DropdownTimePicker.superclass.fillInTemplate.apply(this,arguments);
-var _df1="";
+var _dec="";
 if(this.value instanceof Date){
-_df1=this.value;
+_dec=this.value;
 }else{
 if(this.value){
 var orig=this.value;
@@ -16713,11 +16699,11 @@ c[i]="0"+c[i];
 }
 }
 orig=c.join(":");
-_df1=dojo.date.fromRfc3339(d+"T"+orig);
+_dec=dojo.date.fromRfc3339(d+"T"+orig);
 }
 }
-var _df6={widgetContainerId:this.widgetId,lang:this.lang,value:_df1};
-this.timePicker=dojo.widget.createWidget("TimePicker",_df6,this.containerNode,"child");
+var _df1={widgetContainerId:this.widgetId,lang:this.lang,value:_dec};
+this.timePicker=dojo.widget.createWidget("TimePicker",_df1,this.containerNode,"child");
 dojo.event.connect(this.timePicker,"onValueChanged",this,"_updateText");
 if(this.value){
 this._updateText();
@@ -16729,12 +16715,12 @@ this.valueNode.name=this.name;
 return this.valueNode.value;
 },getTime:function(){
 return this.timePicker.storedTime;
-},setValue:function(_df7){
-this.setTime(_df7);
-},setTime:function(_df8){
-var _df9="";
-if(_df8 instanceof Date){
-_df9=_df8;
+},setValue:function(_df2){
+this.setTime(_df2);
+},setTime:function(_df3){
+var _df4="";
+if(_df3 instanceof Date){
+_df4=_df3;
 }else{
 if(this.value){
 var orig=this.value;
@@ -16746,10 +16732,10 @@ c[i]="0"+c[i];
 }
 }
 orig=c.join(":");
-_df9=dojo.date.fromRfc3339(d+"T"+orig);
+_df4=dojo.date.fromRfc3339(d+"T"+orig);
 }
 }
-this.timePicker.setTime(_df9);
+this.timePicker.setTime(_df4);
 this._syncValueNode();
 },_updateText:function(){
 if(this.timePicker.selectedTime.anyTime){
@@ -16765,43 +16751,43 @@ this.inputNode.value=dojo.date.format(this.timePicker.time,{formatLength:this.fo
 this._syncValueNode();
 this.onValueChanged(this.getTime());
 this.hideContainer();
-},onValueChanged:function(_dfe){
+},onValueChanged:function(_df9){
 },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 _dff=dojo.string.trim(this.inputNode.value);
-if(_dff){
-var _e00=dojo.date.parse(_dff,{formatLength:this.formatLength,timePattern:this.displayFormat,selector:"timeOnly",locale:this.lang});
-if(_e00){
-this.setTime(_e00);
+var _dfa=dojo.string.trim(this.inputNode.value);
+if(_dfa){
+var _dfb=dojo.date.parse(_dfa,{formatLength:this.formatLength,timePattern:this.displayFormat,selector:"timeOnly",locale:this.lang});
+if(_dfb){
+this.setTime(_dfb);
 }
 }else{
-this.valueNode.value=_dff;
+this.valueNode.value=_dfa;
 }
 }
-if(_dff){
+if(_dfa){
 this._updateText();
 }
 },_syncValueNode:function(){
 var time=this.timePicker.time;
-var _e02;
+var _dfd;
 switch(this.saveFormat.toLowerCase()){
 case "rfc":
 case "iso":
 case "":
-_e02=dojo.date.toRfc3339(time,"timeOnly");
+_dfd=dojo.date.toRfc3339(time,"timeOnly");
 break;
 case "posix":
 case "unix":
-_e02=Number(time);
+_dfd=Number(time);
 break;
 default:
-_e02=dojo.date.format(time,{datePattern:this.saveFormat,selector:"timeOnly",locale:this.lang});
+_dfd=dojo.date.format(time,{datePattern:this.saveFormat,selector:"timeOnly",locale:this.lang});
 }
-this.valueNode.value=_e02;
-},destroy:function(_e03){
-this.timePicker.destroy(_e03);
+this.valueNode.value=_dfd;
+},destroy:function(_dfe){
+this.timePicker.destroy(_dfe);
 dojo.widget.DropdownTimePicker.superclass.destroy.apply(this,arguments);
 }});
 dojo.provide("struts.widget.StrutsTimePicker");
@@ -16818,29 +16804,29 @@ this.valueNotifyTopicsArray=this.valueNotifyTopics.split(",");
 }
 },_syncValueNode:function(){
 var time=this.timePicker.time;
-var _e05;
+var _e00;
 switch(this.saveFormat.toLowerCase()){
 case "rfc":
 case "iso":
 case "":
-_e05=dojo.date.toRfc3339(time);
+_e00=dojo.date.toRfc3339(time);
 break;
 case "posix":
 case "unix":
-_e05=Number(time);
+_e00=Number(time);
 break;
 default:
-_e05=dojo.date.format(time,{datePattern:this.saveFormat,selector:"timeOnly",locale:this.lang});
+_e00=dojo.date.format(time,{datePattern:this.saveFormat,selector:"timeOnly",locale:this.lang});
 }
-this.valueNode.value=_e05;
+this.valueNode.value=_e00;
 },_updateText:function(){
 struts.widget.StrutsTimePicker.superclass._updateText.apply(this,arguments);
 if(this.valueNotifyTopicsArray!=null){
 for(var i=0;i0){
 for(var i=0;ithis.endDate){
-_e10=new Date((_e10this.endDate){
+_e0b=new Date((_e0bdays){
+if(dojo.date.diff(_e0e,this.endDate,dojo.date.dateParts.DAY)>days){
 this._preInitUI(this.startDate,true,false);
-_e13=new Date(this.firstDay);
+_e0e=new Date(this.firstDay);
 }
-this.curMonth=new Date(_e13);
-this.curMonth.setDate(_e13.getDate()+6);
+this.curMonth=new Date(_e0e);
+this.curMonth.setDate(_e0e.getDate()+6);
 this.curMonth.setDate(1);
-var _e16=(_e13.getMonth()==this.curMonth.getMonth())?"current":"previous";
+var _e11=(_e0e.getMonth()==this.curMonth.getMonth())?"current":"previous";
 }
-if(_e12){
+if(_e0d){
 this._initUI(days);
 }
 },_initUI:function(days){
@@ -16959,72 +16945,72 @@ dojo.dom.removeChildren(this.calendarDatesContainerNode);
 for(var i=0;ithis.endDate){
-_e23=_e25=_e27=false;
+if(_e1e&&d2>this.endDate){
+_e1e=_e20=_e22=false;
 }
-if(_e24&&add(d,DAY,-1)this.endDate){
-_e25=_e27=false;
+if(_e20&&add(d2,DAY,1)>this.endDate){
+_e20=_e22=false;
 }
-if(_e26&&add(d2,YEAR,-1)this.endDate){
-_e27=false;
+if(_e22&&add(d,YEAR,1)>this.endDate){
+_e22=false;
 }
 }
-function enableControl(node,_e2a){
-dojo.html.setVisibility(node,_e2a?"":"hidden");
+function enableControl(node,_e25){
+dojo.html.setVisibility(node,_e25?"":"hidden");
 }
-enableControl(this.decreaseWeekNode,_e22);
-enableControl(this.increaseWeekNode,_e23);
-enableControl(this.decreaseMonthNode,_e24);
-enableControl(this.increaseMonthNode,_e25);
-enableControl(this.previousYearLabelNode,_e26);
-enableControl(this.nextYearLabelNode,_e27);
+enableControl(this.decreaseWeekNode,_e1d);
+enableControl(this.increaseWeekNode,_e1e);
+enableControl(this.decreaseMonthNode,_e1f);
+enableControl(this.increaseMonthNode,_e20);
+enableControl(this.previousYearLabelNode,_e21);
+enableControl(this.nextYearLabelNode,_e22);
 },_incrementWeek:function(evt){
 var d=new Date(this.firstDay);
 switch(evt.target){
 case this.increaseWeekNode.getElementsByTagName("img").item(0):
 case this.increaseWeekNode:
-var _e2d=dojo.date.add(d,dojo.date.dateParts.WEEK,1);
-if(_e2dthis.startDate){
+if(_e2b>this.startDate){
 d=dojo.date.add(d,dojo.date.dateParts.MONTH,-1);
 }else{
-var _e32=true;
+var _e2d=true;
 }
 break;
 }
-if(_e32){
+if(_e2d){
 d=new Date(this.startDate);
 }else{
-if(_e31){
+if(_e2c){
 d=new Date(this.endDate);
 }
 }
 this._preInitUI(d,false,true);
 },_incrementYear:function(evt){
 var year=this.curMonth.getFullYear();
-var _e35=new Date(this.firstDay);
+var _e30=new Date(this.firstDay);
 switch(evt.target){
 case this.nextYearLabelNode:
-_e35=dojo.date.add(_e35,dojo.date.dateParts.YEAR,1);
-if(_e35this.startDate){
+_e30=dojo.date.add(_e30,dojo.date.dateParts.YEAR,-1);
+if(_e30>this.startDate){
 year--;
 }else{
-var _e37=true;
+var _e32=true;
 }
 break;
 }
 var d;
-if(_e37){
+if(_e32){
 d=new Date(this.startDate);
 }else{
-if(_e36){
+if(_e31){
 d=new Date(this.endDate);
 }else{
 d=new Date(year,this.curMonth.getMonth(),1);
@@ -17113,8 +17099,8 @@ evt.stopPropagation();
 if(!this.staticDisplay){
 this._incrementYear(evt);
 }
-},_setMonthLabel:function(_e3c){
-this.monthLabelNode.innerHTML=dojo.date.getNames("months","wide","standAlone",this.lang)[_e3c];
+},_setMonthLabel:function(_e37){
+this.monthLabelNode.innerHTML=dojo.date.getNames("months","wide","standAlone",this.lang)[_e37];
 },_setYearLabels:function(year){
 var y=year-1;
 var that=this;
@@ -17124,64 +17110,64 @@ that[n+"YearLabelNode"].innerHTML=dojo.date.format(new Date(y++,0),{formatLength
 f("previous");
 f("current");
 f("next");
-},_getDateClassName:function(date,_e42){
-var _e43=this.classNames[_e42];
+},_getDateClassName:function(date,_e3d){
+var _e3e=this.classNames[_e3d];
 if((!this.selectedIsUsed&&this.value)&&(Number(date)==Number(this.value))){
-_e43=this.classNames.selectedDate+" "+_e43;
+_e3e=this.classNames.selectedDate+" "+_e3e;
 this.selectedIsUsed=true;
 }
 if((!this.currentIsUsed)&&(Number(date)==Number(this.today))){
-_e43=_e43+" "+this.classNames.currentDate;
+_e3e=_e3e+" "+this.classNames.currentDate;
 this.currentIsUsed=true;
 }
-return _e43;
+return _e3e;
 },onClick:function(evt){
 dojo.event.browser.stopEvent(evt);
 },_handleUiClick:function(evt){
-var _e46=evt.target;
-if(_e46.nodeType!=dojo.dom.ELEMENT_NODE){
-_e46=_e46.parentNode;
+var _e41=evt.target;
+if(_e41.nodeType!=dojo.dom.ELEMENT_NODE){
+_e41=_e41.parentNode;
 }
 dojo.event.browser.stopEvent(evt);
 this.selectedIsUsed=this.todayIsUsed=false;
-if(dojo.html.hasClass(_e46,this.classNames["disabledPrevious"])||dojo.html.hasClass(_e46,this.classNames["disabledCurrent"])||dojo.html.hasClass(_e46,this.classNames["disabledNext"])){
+if(dojo.html.hasClass(_e41,this.classNames["disabledPrevious"])||dojo.html.hasClass(_e41,this.classNames["disabledCurrent"])||dojo.html.hasClass(_e41,this.classNames["disabledNext"])){
 return;
 }
-this.clickedNode=_e46;
-this.setDate(new Date(Number(dojo.html.getAttribute(_e46,"djDateValue"))));
+this.clickedNode=_e41;
+this.setDate(new Date(Number(dojo.html.getAttribute(_e41,"djDateValue"))));
 },onValueChanged:function(date){
-},_isDisabledDate:function(_e48){
-if(_e48this.endDate){
+},_isDisabledDate:function(_e43){
+if(_e43this.endDate){
 return true;
 }
-return this.isDisabledDate(_e48,this.lang);
-},isDisabledDate:function(_e49,_e4a){
+return this.isDisabledDate(_e43,this.lang);
+},isDisabledDate:function(_e44,_e45){
 return false;
-},_initFirstDay:function(_e4b,adj){
-var d=new Date(_e4b);
+},_initFirstDay:function(_e46,adj){
+var d=new Date(_e46);
 if(!adj){
 d.setDate(1);
 }
 d.setDate(d.getDate()-this._getAdjustedDay(d,this.weekStartsOn));
 d.setHours(0,0,0,0);
 return d;
-},_getAdjustedDay:function(_e4e){
+},_getAdjustedDay:function(_e49){
 var days=[0,1,2,3,4,5,6];
 if(this.weekStartsOn>0){
 for(var i=0;i",selectedChild:"",fillInTemplate:function(args,frag){
-var _e88=this.getFragNodeRef(frag);
-dojo.html.copyStyle(this.domNode,_e88);
+var _e83=this.getFragNodeRef(frag);
+dojo.html.copyStyle(this.domNode,_e83);
 dojo.widget.PageContainer.superclass.fillInTemplate.apply(this,arguments);
 },postCreate:function(args,frag){
 if(this.children.length){
 dojo.lang.forEach(this.children,this._setupChild,this);
-var _e8b;
+var _e86;
 if(this.selectedChild){
 this.selectChild(this.selectedChild);
 }else{
@@ -17502,12 +17488,12 @@ this.selectChild(this.children[0]);
 }
 }
 }
-},addChild:function(_e8d){
+},addChild:function(_e88){
 dojo.widget.PageContainer.superclass.addChild.apply(this,arguments);
-this._setupChild(_e8d);
+this._setupChild(_e88);
 this.onResized();
 if(!this.selectedChildWidget){
-this.selectChild(_e8d);
+this.selectChild(_e88);
 }
 },_setupChild:function(page){
 page.hide();
@@ -17526,9 +17512,9 @@ if(this.children.length>0){
 this.selectChild(this.children[0],true);
 }
 }
-},selectChild:function(page,_e91){
+},selectChild:function(page,_e8c){
 page=dojo.widget.byId(page);
-this.correspondingPageButton=_e91;
+this.correspondingPageButton=_e8c;
 if(this.selectedChildWidget){
 this._hideChild(this.selectedChildWidget);
 }
@@ -17539,24 +17525,24 @@ page.isFirstChild=(page==this.children[0]);
 page.isLastChild=(page==this.children[this.children.length-1]);
 dojo.event.topic.publish(this.widgetId+"-selectChild",page);
 },forward:function(){
-var _e92=dojo.lang.find(this.children,this.selectedChildWidget);
-this.selectChild(this.children[_e92+1]);
+var _e8d=dojo.lang.find(this.children,this.selectedChildWidget);
+this.selectChild(this.children[_e8d+1]);
 },back:function(){
-var _e93=dojo.lang.find(this.children,this.selectedChildWidget);
-this.selectChild(this.children[_e93-1]);
+var _e8e=dojo.lang.find(this.children,this.selectedChildWidget);
+this.selectChild(this.children[_e8e-1]);
 },onResized:function(){
 if(this.doLayout&&this.selectedChildWidget){
 with(this.selectedChildWidget.domNode.style){
 top=dojo.html.getPixelValue(this.containerNode,"padding-top",true);
 left=dojo.html.getPixelValue(this.containerNode,"padding-left",true);
 }
-var _e94=dojo.html.getContentBox(this.containerNode);
-this.selectedChildWidget.resizeTo(_e94.width,_e94.height);
+var _e8f=dojo.html.getContentBox(this.containerNode);
+this.selectedChildWidget.resizeTo(_e8f.width,_e8f.height);
 }
 },_showChild:function(page){
 if(this.doLayout){
-var _e96=dojo.html.getContentBox(this.containerNode);
-page.resizeTo(_e96.width,_e96.height);
+var _e91=dojo.html.getContentBox(this.containerNode);
+page.resizeTo(_e91.width,_e91.height);
 }
 page.selected=true;
 page.show();
@@ -17564,8 +17550,8 @@ page.show();
 page.selected=false;
 page.hide();
 },closeChild:function(page){
-var _e99=page.onClose(this,page);
-if(_e99){
+var _e94=page.onClose(this,page);
+if(_e94){
 this.removeChild(page);
 page.destroy();
 }
@@ -17581,9 +17567,9 @@ dojo.html.addClass(this.domNode,this["class"]);
 dojo.widget.wai.setAttr(this.domNode,"waiRole","role","tablist");
 },postCreate:function(){
 this.pane2button={};
-var _e9a=dojo.widget.byId(this.containerId);
-if(_e9a){
-dojo.lang.forEach(_e9a.children,this.onAddChild,this);
+var _e95=dojo.widget.byId(this.containerId);
+if(_e95){
+dojo.lang.forEach(_e95.children,this.onAddChild,this);
 }
 dojo.event.topic.subscribe(this.containerId+"-addChild",this,"onAddChild");
 dojo.event.topic.subscribe(this.containerId+"-removeChild",this,"onRemoveChild");
@@ -17594,50 +17580,50 @@ dojo.event.topic.unsubscribe(this.containerId+"-removeChild",this,"onRemoveChild
 dojo.event.topic.unsubscribe(this.containerId+"-selectChild",this,"onSelectChild");
 dojo.widget.PageController.superclass.destroy.apply(this,arguments);
 },onAddChild:function(page){
-var _e9c=dojo.widget.createWidget(this.buttonWidget,{label:page.label,closeButton:page.closable});
-this.addChild(_e9c);
-this.domNode.appendChild(_e9c.domNode);
-this.pane2button[page]=_e9c;
-page.controlButton=_e9c;
-var _e9d=this;
-dojo.event.connect(_e9c,"onClick",function(){
-_e9d.onButtonClick(page);
+var _e97=dojo.widget.createWidget(this.buttonWidget,{label:page.label,closeButton:page.closable});
+this.addChild(_e97);
+this.domNode.appendChild(_e97.domNode);
+this.pane2button[page]=_e97;
+page.controlButton=_e97;
+var _e98=this;
+dojo.event.connect(_e97,"onClick",function(){
+_e98.onButtonClick(page);
 });
-dojo.event.connect(_e9c,"onCloseButtonClick",function(){
-_e9d.onCloseButtonClick(page);
+dojo.event.connect(_e97,"onCloseButtonClick",function(){
+_e98.onCloseButtonClick(page);
 });
 },onRemoveChild:function(page){
 if(this._currentChild==page){
 this._currentChild=null;
 }
-var _e9f=this.pane2button[page];
-if(_e9f){
-_e9f.destroy();
+var _e9a=this.pane2button[page];
+if(_e9a){
+_e9a.destroy();
 }
 this.pane2button[page]=null;
 },onSelectChild:function(page){
 if(this._currentChild){
-var _ea1=this.pane2button[this._currentChild];
-_ea1.clearSelected();
+var _e9c=this.pane2button[this._currentChild];
+_e9c.clearSelected();
 }
-var _ea2=this.pane2button[page];
-_ea2.setSelected();
+var _e9d=this.pane2button[page];
+_e9d.setSelected();
 this._currentChild=page;
 },onButtonClick:function(page){
-var _ea4=dojo.widget.byId(this.containerId);
-_ea4.selectChild(page,false,this);
+var _e9f=dojo.widget.byId(this.containerId);
+_e9f.selectChild(page,false,this);
 },onCloseButtonClick:function(page){
-var _ea6=dojo.widget.byId(this.containerId);
-_ea6.closeChild(page);
+var _ea1=dojo.widget.byId(this.containerId);
+_ea1.closeChild(page);
 },onKey:function(evt){
 if((evt.keyCode==evt.KEY_RIGHT_ARROW)||(evt.keyCode==evt.KEY_LEFT_ARROW)){
-var _ea8=0;
+var _ea3=0;
 var next=null;
-var _ea8=dojo.lang.find(this.children,this.pane2button[this._currentChild]);
+var _ea3=dojo.lang.find(this.children,this.pane2button[this._currentChild]);
 if(evt.keyCode==evt.KEY_RIGHT_ARROW){
-next=this.children[(_ea8+1)%this.children.length];
+next=this.children[(_ea3+1)%this.children.length];
 }else{
-next=this.children[(_ea8+(this.children.length-1))%this.children.length];
+next=this.children[(_ea3+(this.children.length-1))%this.children.length];
 }
 dojo.event.browser.stopEvent(evt);
 next.onClick();
@@ -17690,20 +17676,20 @@ dojo.widget.TabContainer.superclass._setupChild.apply(this,arguments);
 if(!this.doLayout){
 return;
 }
-var _eae=this.labelPosition.replace(/-h/,"");
-var _eaf=[{domNode:this.tablist.domNode,layoutAlign:_eae},{domNode:this.containerNode,layoutAlign:"client"}];
-dojo.widget.html.layout(this.domNode,_eaf);
+var _ea9=this.labelPosition.replace(/-h/,"");
+var _eaa=[{domNode:this.tablist.domNode,layoutAlign:_ea9},{domNode:this.containerNode,layoutAlign:"client"}];
+dojo.widget.html.layout(this.domNode,_eaa);
 if(this.selectedChildWidget){
-var _eb0=dojo.html.getContentBox(this.containerNode);
-this.selectedChildWidget.resizeTo(_eb0.width,_eb0.height);
+var _eab=dojo.html.getContentBox(this.containerNode);
+this.selectedChildWidget.resizeTo(_eab.width,_eab.height);
 }
-},selectTab:function(tab,_eb2){
+},selectTab:function(tab,_ead){
 dojo.deprecated("use selectChild() rather than selectTab(), selectTab() will be removed in","0.5");
-this.selectChild(tab,_eb2);
+this.selectChild(tab,_ead);
 },onKey:function(e){
 if(e.keyCode==e.KEY_UP_ARROW&&e.ctrlKey){
-var _eb4=this.correspondingTabButton||this.selectedTabWidget.tabButton;
-_eb4.focus();
+var _eaf=this.correspondingTabButton||this.selectedTabWidget.tabButton;
+_eaf.focus();
 dojo.event.browser.stopEvent(e);
 }else{
 if(e.keyCode==e.KEY_DELETE&&e.altKey){
@@ -17750,27 +17736,27 @@ this.disableTab(div);
 }
 });
 }
-},selectChild:function(tab,_eb8){
+},selectChild:function(tab,_eb3){
 if(!tab.disabled){
-var _eb9={"cancel":false};
+var _eb4={"cancel":false};
 if(this.beforeSelectTabNotifyTopicsArray){
 var self=this;
-dojo.lang.forEach(this.beforeSelectTabNotifyTopicsArray,function(_ebb){
+dojo.lang.forEach(this.beforeSelectTabNotifyTopicsArray,function(_eb6){
 try{
-dojo.event.topic.publish(_ebb,_eb9,tab,self);
+dojo.event.topic.publish(_eb6,_eb4,tab,self);
 }
 catch(ex){
 dojo.debug(ex);
 }
 });
 }
-if(!_eb9.cancel){
-struts.widget.StrutsTabContainer.superclass.selectChild.apply(this,[tab,_eb8]);
+if(!_eb4.cancel){
+struts.widget.StrutsTabContainer.superclass.selectChild.apply(this,[tab,_eb3]);
 if(this.afterSelectTabNotifyTopicsArray){
 var self=this;
-dojo.lang.forEach(this.afterSelectTabNotifyTopicsArray,function(_ebc){
+dojo.lang.forEach(this.afterSelectTabNotifyTopicsArray,function(_eb7){
 try{
-dojo.event.topic.publish(_ebc,tab,self);
+dojo.event.topic.publish(_eb7,tab,self);
 }
 catch(ex){
 dojo.debug(ex);
@@ -17780,13 +17766,13 @@ dojo.debug(ex);
 }
 }
 },disableTab:function(t){
-var _ebe=this.getTabWidget(t);
-_ebe.disabled=true;
-dojo.html.addClass(_ebe.controlButton.domNode,this.disabledTabCssClass);
+var _eb9=this.getTabWidget(t);
+_eb9.disabled=true;
+dojo.html.addClass(_eb9.controlButton.domNode,this.disabledTabCssClass);
 },enableTab:function(t){
-var _ec0=this.getTabWidget(t);
-_ec0.disabled=false;
-dojo.html.removeClass(_ec0.controlButton.domNode,this.disabledTabCssClass);
+var _ebb=this.getTabWidget(t);
+_ebb.disabled=false;
+dojo.html.removeClass(_ebb.controlButton.domNode,this.disabledTabCssClass);
 },getTabWidget:function(t){
 if(dojo.lang.isNumber(t)){
 return this.children[t];
@@ -17813,19 +17799,19 @@ return this.tree.unlock.apply(this,arguments);
 return this.tree.isLocked.apply(this,arguments);
 },cleanLock:function(){
 return this.tree.cleanLock.apply(this,arguments);
-},actionIsDisabled:function(_ec2){
-var _ec3=this;
-var _ec4=false;
-if(this.tree.strictFolders&&_ec2==this.actions.ADDCHILD&&!this.isFolder){
-_ec4=true;
+},actionIsDisabled:function(_ebd){
+var _ebe=this;
+var _ebf=false;
+if(this.tree.strictFolders&&_ebd==this.actions.ADDCHILD&&!this.isFolder){
+_ebf=true;
 }
-if(dojo.lang.inArray(_ec3.actionsDisabled,_ec2)){
-_ec4=true;
+if(dojo.lang.inArray(_ebe.actionsDisabled,_ebd)){
+_ebf=true;
 }
 if(this.isLocked()){
-_ec4=true;
+_ebf=true;
 }
-return _ec4;
+return _ebf;
 },getInfo:function(){
 var info={widgetId:this.widgetId,objectId:this.objectId,index:this.getParentIndex(),isFolder:this.isFolder};
 return info;
@@ -17835,20 +17821,20 @@ for(var i=0;i0){
-for(var i=0;i<_ec9;i++){
+this.depth+=_ec4;
+if(_ec4>0){
+for(var i=0;i<_ec4;i++){
 var img=this.tree.makeBlankImg();
 this.imgs.unshift(img);
 dojo.html.insertBefore(this.imgs[0],this.domNode.firstChild);
 }
 }
-if(_ec9<0){
-for(var i=0;i<-_ec9;i++){
+if(_ec4<0){
+for(var i=0;i<-_ec4;i++){
 this.imgs.shift();
 dojo.html.removeNode(this.domNode.firstChild);
 }
@@ -17870,9 +17856,9 @@ this._markLoadingSavedIcon=null;
 dojo.event.connect(this.expandIcon,"onclick",this,"onTreeClick");
 this.expandIcon.src=this.isExpanded?this.tree.expandIconSrcMinus:this.tree.expandIconSrcPlus;
 this.isFolder=true;
-},createDOMNode:function(tree,_ece){
+},createDOMNode:function(tree,_ec9){
 this.tree=tree;
-this.depth=_ece;
+this.depth=_ec9;
 this.imgs=[];
 for(var i=0;i-1?"&":"?")+"nodeId="+this.widgetId;
+var _ede=href+(href.indexOf("?")>-1?"&":"?")+"nodeId="+this.widgetId;
 var self=this;
 this.markLoading();
-dojo.io.bind({url:_ee3,useCache:false,preventCache:true,handler:function(type,data,e){
+dojo.io.bind({url:_ede,useCache:false,preventCache:true,handler:function(type,data,e){
 if(type=="load"){
 if(data){
-dojo.lang.forEach(data,function(_ee8){
-var _ee9=dojo.widget.createWidget("struts:StrutsTreeNode",{title:_ee8.label,isFolder:_ee8.hasChildren,widgetId:_ee8.id});
-self.addChild(_ee9);
+dojo.lang.forEach(data,function(_ee3){
+var _ee4=dojo.widget.createWidget("struts:StrutsTreeNode",{title:_ee3.label,isFolder:_ee3.hasChildren,widgetId:_ee3.id});
+self.addChild(_ee4);
 });
 }
 }
@@ -18062,8 +18048,8 @@ self.unMarkLoading();
 }
 }});
 dojo.provide("dojo.json");
-dojo.json={jsonRegistry:new dojo.AdapterRegistry(),register:function(name,_eeb,wrap,_eed){
-dojo.json.jsonRegistry.register(name,_eeb,wrap,_eed);
+dojo.json={jsonRegistry:new dojo.AdapterRegistry(),register:function(name,_ee6,wrap,_ee8){
+dojo.json.jsonRegistry.register(name,_ee6,wrap,_ee8);
 },evalJson:function(json){
 try{
 return eval("("+json+")");
@@ -18073,11 +18059,11 @@ dojo.debug(e);
 return json;
 }
 },serialize:function(o){
-var _ef0=typeof (o);
-if(_ef0=="undefined"){
+var _eeb=typeof (o);
+if(_eeb=="undefined"){
 return "undefined";
 }else{
-if((_ef0=="number")||(_ef0=="boolean")){
+if((_eeb=="number")||(_eeb=="boolean")){
 return o+"";
 }else{
 if(o===null){
@@ -18085,24 +18071,24 @@ return "null";
 }
 }
 }
-if(_ef0=="string"){
+if(_eeb=="string"){
 return dojo.string.escapeString(o);
 }
 var me=arguments.callee;
-var _ef2;
+var _eed;
 if(typeof (o.__json__)=="function"){
-_ef2=o.__json__();
-if(o!==_ef2){
-return me(_ef2);
+_eed=o.__json__();
+if(o!==_eed){
+return me(_eed);
 }
 }
 if(typeof (o.json)=="function"){
-_ef2=o.json();
-if(o!==_ef2){
-return me(_ef2);
+_eed=o.json();
+if(o!==_eed){
+return me(_eed);
 }
 }
-if(_ef0!="function"&&typeof (o.length)=="number"){
+if(_eeb!="function"&&typeof (o.length)=="number"){
 var res=[];
 for(var i=0;i_f24.getParentIndex()){
-_f26--;
+return _f1e;
+},getTargetParentIndex:function(_f1f,_f20){
+var _f21=_f20=="before"?this.treeNode.getParentIndex():this.treeNode.getParentIndex()+1;
+if(this.treeNode.parent===_f1f.parent&&this.treeNode.getParentIndex()>_f1f.getParentIndex()){
+_f21--;
 }
-return _f26;
+return _f21;
 },onDrop:function(e){
-var _f28=this.position;
+var _f23=this.position;
 this.onDragOut(e);
-var _f29=e.dragObject.treeNode;
-if(!dojo.lang.isObject(_f29)){
+var _f24=e.dragObject.treeNode;
+if(!dojo.lang.isObject(_f24)){
 dojo.raise("TreeNode not found in dragObject");
 }
-if(_f28=="onto"){
-return this.controller.move(_f29,this.treeNode,0);
+if(_f23=="onto"){
+return this.controller.move(_f24,this.treeNode,0);
 }else{
-var _f2a=this.getTargetParentIndex(_f29,_f28);
-return this.controller.move(_f29,this.treeNode.parent,_f2a);
+var _f25=this.getTargetParentIndex(_f24,_f23);
+return this.controller.move(_f24,this.treeNode.parent,_f25);
 }
 }});
-dojo.dnd.TreeDNDController=function(_f2b){
-this.treeController=_f2b;
+dojo.dnd.TreeDNDController=function(_f26){
+this.treeController=_f26;
 this.dragSources={};
 this.dropTargets={};
 };
@@ -18340,34 +18326,34 @@ dojo.event.topic.unsubscribe(tree.eventNames.moveTo,this,"onMoveTo");
 dojo.event.topic.unsubscribe(tree.eventNames.addChild,this,"onAddChild");
 dojo.event.topic.unsubscribe(tree.eventNames.removeNode,this,"onRemoveNode");
 dojo.event.topic.unsubscribe(tree.eventNames.treeDestroy,this,"onTreeDestroy");
-},onTreeDestroy:function(_f2e){
-this.unlistenTree(_f2e.source);
-},onCreateDOMNode:function(_f2f){
-this.registerDNDNode(_f2f.source);
-},onAddChild:function(_f30){
-this.registerDNDNode(_f30.child);
-},onMoveFrom:function(_f31){
-var _f32=this;
-dojo.lang.forEach(_f31.child.getDescendants(),function(node){
-_f32.unregisterDNDNode(node);
+},onTreeDestroy:function(_f29){
+this.unlistenTree(_f29.source);
+},onCreateDOMNode:function(_f2a){
+this.registerDNDNode(_f2a.source);
+},onAddChild:function(_f2b){
+this.registerDNDNode(_f2b.child);
+},onMoveFrom:function(_f2c){
+var _f2d=this;
+dojo.lang.forEach(_f2c.child.getDescendants(),function(node){
+_f2d.unregisterDNDNode(node);
 });
-},onMoveTo:function(_f34){
-var _f35=this;
-dojo.lang.forEach(_f34.child.getDescendants(),function(node){
-_f35.registerDNDNode(node);
+},onMoveTo:function(_f2f){
+var _f30=this;
+dojo.lang.forEach(_f2f.child.getDescendants(),function(node){
+_f30.registerDNDNode(node);
 });
 },registerDNDNode:function(node){
 if(!node.tree.DNDMode){
 return;
 }
-var _f38=null;
-var _f39=null;
+var _f33=null;
+var _f34=null;
 if(!node.actionIsDisabled(node.actions.MOVE)){
-var _f38=new dojo.dnd.TreeDragSource(node.labelNode,this,node.tree.widgetId,node);
-this.dragSources[node.widgetId]=_f38;
+var _f33=new dojo.dnd.TreeDragSource(node.labelNode,this,node.tree.widgetId,node);
+this.dragSources[node.widgetId]=_f33;
 }
-var _f39=new dojo.dnd.TreeDropTarget(node.labelNode,this.treeController,node.tree.DNDAcceptTypes,node);
-this.dropTargets[node.widgetId]=_f39;
+var _f34=new dojo.dnd.TreeDropTarget(node.labelNode,this.treeController,node.tree.DNDAcceptTypes,node);
+this.dropTargets[node.widgetId]=_f34;
 },unregisterDNDNode:function(node){
 if(this.dragSources[node.widgetId]){
 dojo.dnd.dragManager.unregisterDragSource(this.dragSources[node.widgetId]);
@@ -18396,45 +18382,45 @@ dojo.event.topic.unsubscribe(tree.eventNames.createDOMNode,this,"onCreateDOMNode
 dojo.event.topic.unsubscribe(tree.eventNames.treeClick,this,"onTreeClick");
 dojo.event.topic.unsubscribe(tree.eventNames.treeCreate,this,"onTreeCreate");
 dojo.event.topic.unsubscribe(tree.eventNames.treeDestroy,this,"onTreeDestroy");
-},onTreeDestroy:function(_f3f){
-var tree=_f3f.source;
+},onTreeDestroy:function(_f3a){
+var tree=_f3a.source;
 this.unlistenTree(tree);
 if(this.dieWithTree){
 this.destroy();
 }
-},onCreateDOMNode:function(_f41){
-var node=_f41.source;
+},onCreateDOMNode:function(_f3c){
+var node=_f3c.source;
 if(node.expandLevel>0){
 this.expandToLevel(node,node.expandLevel);
 }
-},onTreeCreate:function(_f43){
-var tree=_f43.source;
-var _f45=this;
+},onTreeCreate:function(_f3e){
+var tree=_f3e.source;
+var _f40=this;
 if(tree.expandLevel){
-dojo.lang.forEach(tree.children,function(_f46){
-_f45.expandToLevel(_f46,tree.expandLevel-1);
+dojo.lang.forEach(tree.children,function(_f41){
+_f40.expandToLevel(_f41,tree.expandLevel-1);
 });
 }
-},expandToLevel:function(node,_f48){
-if(_f48==0){
+},expandToLevel:function(node,_f43){
+if(_f43==0){
 return;
 }
-var _f49=node.children;
-var _f4a=this;
-var _f4b=function(node,_f4d){
+var _f44=node.children;
+var _f45=this;
+var _f46=function(node,_f48){
 this.node=node;
-this.expandLevel=_f4d;
+this.expandLevel=_f48;
 this.process=function(){
 for(var i=0;i",isExpanded:true,isTree:true,objectId:"",controller:"",selector:"",menu:"",expandLevel:"",blankIconSrc:dojo.uri.moduleUri("dojo.widget","templates/images/Tree/treenode_blank.gif"),gridIconSrcT:dojo.uri.moduleUri("dojo.widget","templates/images/Tree/treenode_grid_t.gif"),gridIconSrcL:dojo.uri.moduleUri("dojo.widget","templates/images/Tree/treenode_grid_l.gif"),gridIconSrcV:dojo.uri.moduleUri("dojo.widget","templates/images/Tree/treenode_grid_v.gif"),gridIconSrcP:dojo.uri.moduleUri("dojo.widget","templates/images/Tree/treenode_grid_p.gif"),gridIconSrcC:dojo.uri.moduleUri("dojo.widget","templates/images/Tree/treenode_grid_c.gif"),gridIconSrcX:dojo.uri.moduleUri("dojo.widget","templates/images/Tree/treenode_grid_x.gif"),gridIconSrcY:dojo.uri.moduleUri("dojo.widget","templates/images/Tree/treenode_grid_y.gif"),gridIconSrcZ:dojo.uri.moduleUri("dojo.widget","templates/images/Tree/treenode_grid_z.gif"),expandIconSrcPlus:dojo.uri.moduleUri("dojo.widget","templates/images/Tree/treenode_expand_plus.gif"),expandIconSrcMinus:dojo.uri.moduleUri("dojo.widget","templates/images/Tree/treenode_expand_minus.gif"),expandIconSrcLoading:dojo.uri.moduleUri("dojo.widget","templates/images/Tree/treenode_loading.gif"),iconWidth:18,iconHeight:18,showGrid:true,showRootGrid:true,actionIsDisabled:function(_f78){
-var _f79=this;
-return dojo.lang.inArray(_f79.actionsDisabled,_f78);
+},{widgetType:"Tree",eventNamesDefault:{createDOMNode:"createDOMNode",treeCreate:"treeCreate",treeDestroy:"treeDestroy",treeClick:"treeClick",iconClick:"iconClick",titleClick:"titleClick",moveFrom:"moveFrom",moveTo:"moveTo",addChild:"addChild",removeNode:"removeNode",expand:"expand",collapse:"collapse"},isContainer:true,DNDMode:"off",lockLevel:0,strictFolders:true,DNDModes:{BETWEEN:1,ONTO:2},DNDAcceptTypes:"",templateCssString:"\n.dojoTree {\n\tfont: caption;\n\tfont-size: 11px;\n\tfont-weight: normal;\n\toverflow: auto;\n}\n\n\n.dojoTreeNodeLabelTitle {\n\tpadding-left: 2px;\n\tcolor: WindowText;\n}\n\n.dojoTreeNodeLabel {\n\tcursor:hand;\n\tcursor:pointer;\n}\n\n.dojoTreeNodeLabelTitle:hover {\n\ttext-decoration: underline;\n}\n\n.dojoTreeNodeLabelSelected {\n\tbackground-color: Highlight;\n\tcolor: HighlightText;\n}\n\n.dojoTree div {\n\twhite-space: nowrap;\n}\n\n.dojoTree img, .dojoTreeNodeLabel img {\n\tvertical-align: middle;\n}\n\n",templateCssPath:dojo.uri.moduleUri("dojo.widget","templates/images/Tree/Tree.css"),templateString:"
",isExpanded:true,isTree:true,objectId:"",controller:"",selector:"",menu:"",expandLevel:"",blankIconSrc:dojo.uri.moduleUri("dojo.widget","templates/images/Tree/treenode_blank.gif"),gridIconSrcT:dojo.uri.moduleUri("dojo.widget","templates/images/Tree/treenode_grid_t.gif"),gridIconSrcL:dojo.uri.moduleUri("dojo.widget","templates/images/Tree/treenode_grid_l.gif"),gridIconSrcV:dojo.uri.moduleUri("dojo.widget","templates/images/Tree/treenode_grid_v.gif"),gridIconSrcP:dojo.uri.moduleUri("dojo.widget","templates/images/Tree/treenode_grid_p.gif"),gridIconSrcC:dojo.uri.moduleUri("dojo.widget","templates/images/Tree/treenode_grid_c.gif"),gridIconSrcX:dojo.uri.moduleUri("dojo.widget","templates/images/Tree/treenode_grid_x.gif"),gridIconSrcY:dojo.uri.moduleUri("dojo.widget","templates/images/Tree/treenode_grid_y.gif"),gridIconSrcZ:dojo.uri.moduleUri("dojo.widget","templates/images/Tree/treenode_grid_z.gif"),expandIconSrcPlus:dojo.uri.moduleUri("dojo.widget","templates/images/Tree/treenode_expand_plus.gif"),expandIconSrcMinus:dojo.uri.moduleUri("dojo.widget","templates/images/Tree/treenode_expand_minus.gif"),expandIconSrcLoading:dojo.uri.moduleUri("dojo.widget","templates/images/Tree/treenode_loading.gif"),iconWidth:18,iconHeight:18,showGrid:true,showRootGrid:true,actionIsDisabled:function(_f73){
+var _f74=this;
+return dojo.lang.inArray(_f74.actionsDisabled,_f73);
 },actions:{ADDCHILD:"ADDCHILD"},getInfo:function(){
 var info={widgetId:this.widgetId,objectId:this.objectId};
 return info;
@@ -18550,7 +18536,7 @@ this.selector.listenTree(this);
 this.selector=null;
 }
 },initialize:function(args,frag){
-var _f7d=this;
+var _f78=this;
 for(name in this.eventNamesDefault){
 if(dojo.lang.isUndefined(this.eventNames[name])){
 this.eventNames[name]=this.widgetId+"/"+this.eventNamesDefault[name];
@@ -18596,15 +18582,15 @@ dojo.event.topic.publish(this.eventNames.treeCreate,{source:this});
 },destroy:function(){
 dojo.event.topic.publish(this.tree.eventNames.treeDestroy,{source:this});
 return dojo.widget.HtmlWidget.prototype.destroy.apply(this,arguments);
-},addChild:function(_f81,_f82){
-var _f83={child:_f81,index:_f82,parent:this,domNodeInitialized:_f81.domNodeInitialized};
+},addChild:function(_f7c,_f7d){
+var _f7e={child:_f7c,index:_f7d,parent:this,domNodeInitialized:_f7c.domNodeInitialized};
 this.doAddChild.apply(this,arguments);
-dojo.event.topic.publish(this.tree.eventNames.addChild,_f83);
-},doAddChild:function(_f84,_f85){
-if(dojo.lang.isUndefined(_f85)){
-_f85=this.children.length;
+dojo.event.topic.publish(this.tree.eventNames.addChild,_f7e);
+},doAddChild:function(_f7f,_f80){
+if(dojo.lang.isUndefined(_f80)){
+_f80=this.children.length;
 }
-if(!_f84.isTreeNode){
+if(!_f7f.isTreeNode){
 dojo.raise("You can only add TreeNode widgets to a "+this.widgetType+" widget!");
 return;
 }
@@ -18613,34 +18599,34 @@ if(!this.isFolder){
 this.setFolder();
 }
 }
-var _f86=this;
-dojo.lang.forEach(_f84.getDescendants(),function(elem){
-elem.tree=_f86.tree;
+var _f81=this;
+dojo.lang.forEach(_f7f.getDescendants(),function(elem){
+elem.tree=_f81.tree;
 });
-_f84.parent=this;
+_f7f.parent=this;
 if(this.isTreeNode){
 this.state=this.loadStates.LOADED;
 }
-if(_f850){
-_f9c[_f9d-1].updateExpandGridColumn();
+if(_f98==_f97.length&&_f98>0){
+_f97[_f98-1].updateExpandGridColumn();
 }
-if(_f9b instanceof dojo.widget.Tree&&_f9d==0&&_f9c.length>0){
-_f9c[0].updateExpandGrid();
+if(_f96 instanceof dojo.widget.Tree&&_f98==0&&_f97.length>0){
+_f97[0].updateExpandGrid();
 }
-_f9a.parent=_f9a.tree=null;
-return _f9a;
+_f95.parent=_f95.tree=null;
+return _f95;
 },markLoading:function(){
 },unMarkLoading:function(){
 },lock:function(){
@@ -18740,16 +18726,16 @@ if(!dojo.string.isBlank(this.href)){
 dojo.io.bind({url:this.href,useCache:false,preventCache:true,handler:function(type,data,e){
 if(type=="load"){
 if(data){
-dojo.lang.forEach(data,function(_fa3){
-var _fa4=dojo.widget.createWidget("struts:StrutsTreeNode",{title:_fa3.label,isFolder:_fa3.hasChildren,widgetId:_fa3.id});
-self.addChild(_fa4);
+dojo.lang.forEach(data,function(_f9e){
+var _f9f=dojo.widget.createWidget("struts:StrutsTreeNode",{title:_f9e.label,isFolder:_f9e.hasChildren,widgetId:_f9e.id});
+self.addChild(_f9f);
 });
 }
 }else{
 if(self.errorNotifyTopicsArray){
-dojo.lang.forEach(self.errorNotifyTopicsArray,function(_fa5){
+dojo.lang.forEach(self.errorNotifyTopicsArray,function(_fa0){
 try{
-dojo.event.topic.publish(_fa5,data,e,self);
+dojo.event.topic.publish(_fa0,data,e,self);
 }
 catch(ex){
 dojo.debug(ex);
diff --git a/plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/struts_dojo.js.uncompressed.js b/plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/struts_dojo.js.uncompressed.js
index b47835594..042b038e9 100644
--- a/plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/struts_dojo.js.uncompressed.js
+++ b/plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/struts_dojo.js.uncompressed.js
@@ -24162,12 +24162,13 @@ struts.widget.ComboBoxDataProvider = function(combobox, node){
 
         //if notifyTopics is published on the first request (onload)
         //the value of listeners will be reset
-        if(!this.firstRequest) {
-          this.firstRequest = false;
+        if(!this.firstRequest || type == "error") {
           this.cbox.notify.apply(this.cbox, [data, type, evt]);
         }
+        
+        this.firstRequest = false;
         var arrData = null;
-        var dataByName = data[this.cbox.dataFieldName];
+        var dataByName = data[dojo.string.isBlank(this.cbox.dataFieldName) ? this.cbox.name : this.cbox.dataFieldName];
         if(!dojo.lang.isArray(data)) {
            //if there is a dataFieldName, take it
            if(dataByName) {
@@ -24178,7 +24179,7 @@ struts.widget.ComboBoxDataProvider = function(combobox, node){
                 //it is an object, treat it like a map
                 arrData = [];
                 for(var key in dataByName){
-                    arrData.push([dataByName[key], key]);
+                    arrData.push([key, dataByName[key]]);
                 }
              }
            } else {
@@ -24192,7 +24193,7 @@ struts.widget.ComboBoxDataProvider = function(combobox, node){
                } else {
                  //if nathing else is found, we will use values in this 
                  //object as the data
-                 tmpArrData.push([data[key], key]);
+                 tmpArrData.push([key, data[key]]);
                }
                //grab the first array found, we will use it if nothing else
                //is found
@@ -24541,12 +24542,13 @@ dojo.widget.defineWidget(
   },
 
   notify : function(data, type, e) {
+    var self = this;
+    //general topics
     if(this.notifyTopicsArray) {
-      var self = this;
       dojo.lang.forEach(this.notifyTopicsArray, function(topic) {
         try {
-          dojo.event.topic.publish(topic, data, type, e);
-        } catch(ex) {
+          dojo.event.topic.publish(topic, data, type, e, self);
+        } catch(ex){
           self.log(ex);
         }
       });
@@ -24556,28 +24558,26 @@ dojo.widget.defineWidget(
     var topicsArray = null;
     switch(type) {
       case "before":
-        topicsArray = this.beforeNotifyTopicsArray;
+        this.notifyTo(this.beforeNotifyTopicsArray, [e, this]);
         break;
       case "load":
-        topicsArray = this.afterNotifyTopicsArray;
+        this.notifyTo(this.afterNotifyTopicsArray, [data, e, this]);
         break;
       case "error":
-        topicsArray = this.errorNotifyTopicsArray;
-        break;
-      case "valuechanged":
-        topicsArray = this.valueNotifyTopicsArray;
+        this.notifyTo(this.errorNotifyTopicsArray, [data, e, this]);
         break;
+       case "valuechanged":
+        this.notifyTo(this.valueNotifyTopicsArray, [this.getSelectedValue(), this.getSelectedKey(), this.getText(), this]);
+        break;  
     }
-  
-    this.notifyTo(topicsArray, data, type, e);
   },
   
-  notifyTo : function(topicsArray, data, type, e) {
+  notifyTo : function(topicsArray, params) {
     var self = this;
     if(topicsArray) {
       dojo.lang.forEach(topicsArray, function(topic) {
         try {
-          dojo.event.topic.publish(topic, data, type, e);
+          dojo.event.topic.publishApply(topic, params);
         } catch(ex){
           self.log(ex);
         }
@@ -24620,28 +24620,13 @@ dojo.widget.defineWidget(
   getSelectedKey : function() {
     return this.comboBoxSelectionValue.value;
   },
-  
-  setSelectedValue : function(text) {
-    if(this.dataProvider) {
-      var data = this.dataProvider.data;
-      for(element in data) {
-         var obj = data[element];
-         if(obj[0].toString() == text) {
-           this.setValue(obj[0].toString());
-           this.comboBoxSelectionValue.value = obj[1].toString();
-         }
-      }
-    } else {
-      this.comboBoxSelectionValue.value = text;
-    }
-  },
-  
+ 
   getSelectedValue : function() {
     return this.comboBoxValue.value;
   },
   
   getText : function() {
-    return this.textInputNode.value();
+    return this.textInputNode.value;
   }
 });