diff --git a/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/Bind.java b/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/Bind.java new file mode 100644 index 000000000..bee8dcc98 --- /dev/null +++ b/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/Bind.java @@ -0,0 +1,213 @@ +/* + * $Id$ + * + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package org.apache.struts2.dojo.components; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import org.apache.struts2.views.annotations.StrutsTag; +import org.apache.struts2.views.annotations.StrutsTagAttribute; +import org.apache.struts2.views.annotations.StrutsTagSkipInheritance; + +import com.opensymphony.xwork2.util.ValueStack; + +/** + * + *

+ * This tag will generated event listeners for multiple events on multiple sources, + * making an asynchronous request to the specified href, and updating multiple targets. + *

+ * + *

Examples

+ * + * 
+ * <img id="indicator" src="${pageContext.request.contextPath}/images/indicator.gif" alt="Loading..." style="display:none"/>
+ * <sx:bind id="ex1" href="%{#ajaxTest}" sources="button" targets="div1" events="onclick" indicator="indicator" />
+ * <s:submit theme="simple" type="submit" value="submit" id="button"/>
+ *
+ * + * + * 
+ * <sx:bind id="ex3" href="%{#ajaxTest}" sources="chk1" targets="div1" events="onchange" formId="form1" />
+ * <form id="form1">
+ *     <s:checkbox name="data" label="Hit me" id="chk1"/>
+ * </form>
+ *
+ * + */ +@StrutsTag(name="bind", tldTagClass="org.apache.struts2.dojo.views.jsp.ui.BindTag", description="Attach event listeners to elements to make AJAX calls") +@StrutsTagSkipInheritance +public class Bind extends AbstractRemoteCallUIBean { + public static final String TEMPLATE = "bind-close"; + public static final String OPEN_TEMPLATE = "bind"; + + protected String targets; + protected String sources; + protected String events; + + public Bind(ValueStack stack, HttpServletRequest request, HttpServletResponse response) { + super(stack, request, response); + } + + public String getDefaultOpenTemplate() { + return OPEN_TEMPLATE; + } + + protected String getDefaultTemplate() { + return TEMPLATE; + } + + public void evaluateExtraParams() { + super.evaluateExtraParams(); + + if(targets != null) + addParameter("targets", findString(targets)); + if(sources != null) + addParameter("sources", findString(sources)); + if(events != null) + addParameter("events", findString(events)); + } + + @StrutsTagAttribute(description="Comma delimited list of event names to attach to", required=true) + public void setEvents(String events) { + this.events = events; + } + + @StrutsTagAttribute(description="Comma delimited list of ids of the elements to attach to", required=true) + public void setSources(String sources) { + this.sources = sources; + } + + @StrutsTagAttribute(description="Comma delimited list of ids of the elements whose content will be updated") + public void setTargets(String targets) { + this.targets = targets; + } + + @Override + @StrutsTagSkipInheritance + public void setTheme(String theme) { + super.setTheme(theme); + } + + @Override + public String getTheme() { + return "ajax"; + } + + @StrutsTagAttribute(description="Topic that will trigger the remote call") + public void setListenTopics(String listenTopics) { + this.listenTopics = listenTopics; + } + + @StrutsTagAttribute(description="The URL to call to obtain the content. Note: If used with ajax context, the value must be set as an url tag value.") + public void setHref(String href) { + this.href = href; + } + + + @StrutsTagAttribute(description="The text to display to the user if the is an error fetching the content") + public void setErrorText(String errorText) { + this.errorText = errorText; + } + + @StrutsTagAttribute(description="Javascript code in the fetched content will be executed", type="Boolean", defaultValue="false") + public void setExecuteScripts(String executeScripts) { + this.executeScripts = executeScripts; + } + + @StrutsTagAttribute(description="Text to be shown while content is being fetched", defaultValue="Loading...") + public void setLoadingText(String loadingText) { + this.loadingText = loadingText; + } + + + @StrutsTagAttribute(description="Javascript function name that will make the request") + public void setHandler(String handler) { + this.handler = handler; + } + + + @StrutsTagAttribute(description="Function name used to filter the fields of the form.") + public void setFormFilter(String formFilter) { + this.formFilter = formFilter; + } + + @StrutsTagAttribute(description="Form id whose fields will be serialized and passed as parameters") + public void setFormId(String formId) { + this.formId = formId; + } + + @StrutsTagAttribute(description="Comma delimmited list of topics that will published before and after the request, and on errors") + public void setNotifyTopics(String notifyTopics) { + this.notifyTopics = notifyTopics; + } + + + @StrutsTagAttribute(description="Set whether errors will be shown or not", type="Boolean", defaultValue="true") + public void setShowErrorTransportText(String showError) { + this.showErrorTransportText = showError; + } + + @StrutsTagAttribute(description="Id of element that will be shown while making request") + public void setIndicator(String indicator) { + this.indicator = indicator; + } + + @StrutsTagAttribute(description="Show loading text on targets", type="Boolean", defaultValue="true") + public void setShowLoadingText(String showLoadingText) { + this.showLoadingText = showLoadingText; + } + + @StrutsTagSkipInheritance + public void setCssClass(String cssClass) { + super.setCssClass(cssClass); + } + + @StrutsTagSkipInheritance + public void setCssStyle(String cssStyle) { + super.setCssStyle(cssStyle); + } + + @StrutsTagSkipInheritance + public void setName(String name) { + super.setName(name); + } + + @StrutsTagAttribute(description="Comma delimmited list of topics that will published after the request(if the request succeeds)") + public void setAfterNotifyTopics(String afterNotifyTopics) { + this.afterNotifyTopics = afterNotifyTopics; + } + + @StrutsTagAttribute(description="Comma delimmited list of topics that will published before the request") + public void setBeforeNotifyTopics(String beforeNotifyTopics) { + this.beforeNotifyTopics = beforeNotifyTopics; + } + + @StrutsTagAttribute(description="Comma delimmited list of topics that will published after the request(if the request fails)") + public void setErrorNotifyTopics(String errorNotifyTopics) { + this.errorNotifyTopics = errorNotifyTopics; + } + + @StrutsTagAttribute(description="The id to use for the element") + public void setId(String id) { + super.setId(id); + } +} diff --git a/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/DojoTagLibrary.java b/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/DojoTagLibrary.java index 45204e8dc..b30bfccea 100644 --- a/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/DojoTagLibrary.java +++ b/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/DojoTagLibrary.java @@ -6,13 +6,14 @@ import java.util.List; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import org.apache.struts2.components.Head; import org.apache.struts2.dojo.views.freemarker.tags.DojoModels; import org.apache.struts2.dojo.views.velocity.components.AnchorDirective; import org.apache.struts2.dojo.views.velocity.components.AutocompleterDirective; +import org.apache.struts2.dojo.views.velocity.components.BindDirective; import org.apache.struts2.dojo.views.velocity.components.DateTimePickerDirective; import org.apache.struts2.dojo.views.velocity.components.DivDirective; import org.apache.struts2.dojo.views.velocity.components.FormDirective; +import org.apache.struts2.dojo.views.velocity.components.HeadDirective; import org.apache.struts2.dojo.views.velocity.components.SubmitDirective; import org.apache.struts2.dojo.views.velocity.components.TabbedPanelDirective; import org.apache.struts2.dojo.views.velocity.components.TreeDirective; @@ -40,7 +41,8 @@ public class DojoTagLibrary implements TagLibrary { TreeDirective.class, TreeNodeDirective.class, FormDirective.class, - Head.class + HeadDirective.class, + BindDirective.class }; return Arrays.asList(directives); } diff --git a/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/freemarker/tags/BindModel.java b/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/freemarker/tags/BindModel.java new file mode 100644 index 000000000..a8a73305a --- /dev/null +++ b/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/freemarker/tags/BindModel.java @@ -0,0 +1,43 @@ +/* + * $Id: DivModel.java 471756 2006-11-06 15:01:43Z husted $ + * + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package org.apache.struts2.dojo.views.freemarker.tags; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import org.apache.struts2.components.Component; +import org.apache.struts2.dojo.components.Bind; +import org.apache.struts2.views.freemarker.tags.TagModel; + +import com.opensymphony.xwork2.util.ValueStack; + +/** + * @see Bind + */ +public class BindModel extends TagModel { + public BindModel(ValueStack stack, HttpServletRequest req, HttpServletResponse res) { + super(stack, req, res); + } + + protected Component getBean() { + return new Bind(stack, req, res); + } +} diff --git a/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/freemarker/tags/DojoModels.java b/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/freemarker/tags/DojoModels.java index 4d6804c7b..8c6cc03f7 100644 --- a/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/freemarker/tags/DojoModels.java +++ b/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/freemarker/tags/DojoModels.java @@ -19,6 +19,7 @@ public class DojoModels { protected AnchorModel a; protected SubmitModel submit; protected FormModel form; + protected BindModel bind; private ValueStack stack; private HttpServletRequest req; @@ -30,6 +31,14 @@ public class DojoModels { this.res = res; } + public BindModel getBind() { + if (bind == null) { + bind = new BindModel(stack, req, res); + } + + return bind; + } + public DateTimePickerModel getDatetimepicker() { if (dateTimePicker == null) { dateTimePicker = new DateTimePickerModel(stack, req, res); diff --git a/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/jsp/ui/BindTag.java b/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/jsp/ui/BindTag.java new file mode 100644 index 000000000..154f355ab --- /dev/null +++ b/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/jsp/ui/BindTag.java @@ -0,0 +1,60 @@ +/* + * $Id$ + * + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package org.apache.struts2.dojo.views.jsp.ui; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import org.apache.struts2.components.Component; +import org.apache.struts2.dojo.components.Bind; + +import com.opensymphony.xwork2.util.ValueStack; + +public class BindTag extends AbstractRemoteCallUITag { + protected String targets; + protected String sources; + protected String events; + + public Component getBean(ValueStack stack, HttpServletRequest req, HttpServletResponse res) { + return new Bind(stack, req, res); + } + + protected void populateParams() { + super.populateParams(); + + Bind bind = (Bind) component; + bind.setTargets(targets); + bind.setSources(sources); + bind.setEvents(events); + } + + public void setEvents(String events) { + this.events = events; + } + + public void setSources(String sources) { + this.sources = sources; + } + + public void setTargets(String targets) { + this.targets = targets; + } +} diff --git a/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/velocity/components/BindDirective.java b/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/velocity/components/BindDirective.java new file mode 100644 index 000000000..34e167a5a --- /dev/null +++ b/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/velocity/components/BindDirective.java @@ -0,0 +1,43 @@ +/* + * $Id$ + * + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package org.apache.struts2.dojo.views.velocity.components; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import org.apache.struts2.components.Component; +import org.apache.struts2.dojo.components.Bind; +import org.apache.struts2.views.velocity.components.AbstractDirective; + +import com.opensymphony.xwork2.util.ValueStack; + +/** + * @see Bind + */ +public class BindDirective extends AbstractDirective { + public String getBeanName() { + return "bind"; + } + + protected Component getBean(ValueStack stack, HttpServletRequest req, HttpServletResponse res) { + return new Bind(stack, req, res); + } +} \ No newline at end of file diff --git a/plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/struts/widget/Bind.js b/plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/struts/widget/Bind.js index e947089c2..58c571979 100644 --- a/plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/struts/widget/Bind.js +++ b/plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/struts/widget/Bind.js @@ -1,7 +1,7 @@ dojo.provide("struts.widget.Bind"); dojo.require("dojo.widget.HtmlWidget"); -dojo.require("dojo.io"); +dojo.require("dojo.io.*"); dojo.widget.defineWidget( "struts.widget.Bind", @@ -34,7 +34,7 @@ dojo.widget.defineWidget( formFilter : "", formNode : null, - event : "", + events : "", indicator : "", parseContent : true, @@ -77,14 +77,20 @@ dojo.widget.defineWidget( this.targetsArray = this.targets.split(","); } - if(!dojo.string.isBlank(this.event)) { - dojo.event.connect(this.domNode, this.event, function(evt) { - evt.preventDefault(); - evt.stopPropagation(); - self.reloadContents(); - }); + if(!dojo.string.isBlank(this.events)) { + var eventsArray = this.events.split(","); + if(eventsArray && this.domNode) { + dojo.lang.forEach(eventsArray, function(event){ + dojo.event.connect(self.domNode, event, function(evt) { + evt.preventDefault(); + evt.stopPropagation(); + self.reloadContents(); + }); + }); + } } + if(dojo.string.isBlank(this.href) && dojo.string.isBlank(this.formId)) { //no href and no formId, we must be inside a form this.formNode = dojo.dom.getFirstAncestorByTag(this.domNode, "form"); @@ -111,12 +117,16 @@ dojo.widget.defineWidget( var xmlParser = new dojo.xml.Parse(); dojo.lang.forEach(this.targetsArray, function(target) { var node = dojo.byId(target); - node.innerHTML = text; - - if(self.parseContent && text != self.loadingText){ - var frag = xmlParser.parseElement(node, null, true); - dojo.widget.getParser().createSubComponents(frag, dojo.widget.byId(target)); - } + if(node) { + node.innerHTML = text; + + if(self.parseContent && text != self.loadingText){ + var frag = xmlParser.parseElement(node, null, true); + dojo.widget.getParser().createSubComponents(frag, dojo.widget.byId(target)); + } + } else { + self.log("Unable to find target: " + node); + } }); } }, @@ -187,11 +197,11 @@ dojo.widget.defineWidget( var self = this; if(topicsArray) { dojo.lang.forEach(topicsArray, function(topic) { - try { - dojo.event.topic.publish(topic, data, type, e); - } catch(ex){ - self.log(ex); - } + try { + dojo.event.topic.publish(topic, data, type, e); + } catch(ex){ + self.log(ex); + } }); } }, diff --git a/plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/struts/widget/BindAnchor.js b/plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/struts/widget/BindAnchor.js index 20d8de7f1..0592ae1c0 100644 --- a/plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/struts/widget/BindAnchor.js +++ b/plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/struts/widget/BindAnchor.js @@ -1,7 +1,7 @@ dojo.provide("struts.widget.BindAnchor"); dojo.require("dojo.widget.HtmlWidget"); -dojo.require("dojo.io"); +dojo.require("dojo.io.*"); dojo.require("struts.widget.Bind"); dojo.widget.defineWidget( @@ -9,7 +9,7 @@ dojo.widget.defineWidget( struts.widget.Bind, { widgetType : "BindAnchor", - event: "onclick", + events: "onclick", postCreate : function() { struts.widget.BindAnchor.superclass.postCreate.apply(this); diff --git a/plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/struts/widget/BindDiv.js b/plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/struts/widget/BindDiv.js index 7c5810d08..0509d184d 100644 --- a/plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/struts/widget/BindDiv.js +++ b/plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/struts/widget/BindDiv.js @@ -1,6 +1,6 @@ dojo.provide("struts.widget.BindDiv"); -dojo.require("dojo.io"); +dojo.require("dojo.io.*"); dojo.require("dojo.widget.ContentPane"); dojo.require("dojo.lang.timing.Timer"); diff --git a/plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/struts/widget/BindEvent.js b/plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/struts/widget/BindEvent.js new file mode 100644 index 000000000..7d4cdbcc1 --- /dev/null +++ b/plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/struts/widget/BindEvent.js @@ -0,0 +1,38 @@ +dojo.provide("struts.widget.BindEvent"); + +dojo.require("struts.widget.Bind"); + +dojo.widget.defineWidget( + "struts.widget.BindEvent", + struts.widget.Bind, { + widgetType : "BindEvent", + + sources: "", + + postCreate : function() { + struts.widget.BindEvent.superclass.postCreate.apply(this); + var self = this; + + if(!dojo.string.isBlank(this.events) && !dojo.string.isBlank(this.sources)) { + var eventsArray = this.events.split(","); + var sourcesArray = this.sources.split(","); + + if(eventsArray && this.domNode) { + //events + dojo.lang.forEach(eventsArray, function(event) { + //sources + dojo.lang.forEach(sourcesArray, function(source) { + var sourceObject = dojo.byId(source); + if(sourceObject) { + dojo.event.connect(sourceObject, event, function(evt) { + evt.preventDefault(); + evt.stopPropagation(); + self.reloadContents(); + }); + } + }); + }); + } + } + } +}); \ No newline at end of file diff --git a/plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/struts/widget/StrutsDatePicker.js b/plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/struts/widget/StrutsDatePicker.js index e311f640a..323faf2e9 100644 --- a/plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/struts/widget/StrutsDatePicker.js +++ b/plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/struts/widget/StrutsDatePicker.js @@ -1,7 +1,6 @@ dojo.provide("struts.widget.StrutsDatePicker"); dojo.require("dojo.widget.DropdownDatePicker"); -dojo.requireLocalization("dojo.widget", "StrutsDatePicker"); dojo.widget.defineWidget( "struts.widget.StrutsDatePicker", dojo.widget.DropdownDatePicker, { diff --git a/plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/struts/widget/__package__.js b/plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/struts/widget/__package__.js index 14d1127ba..24a44b119 100644 --- a/plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/struts/widget/__package__.js +++ b/plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/struts/widget/__package__.js @@ -4,6 +4,7 @@ dojo.kwCompoundRequire({ "struts.widget.BindAnchor", "struts.widget.ComboBox", "struts.widget.StrutsTimePicker", - "struts.widget.StrutsDatePicker"] + "struts.widget.StrutsDatePicker", + "struts.widget.BindEvent"] }); dojo.provide("struts.widget.*"); 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 08f624816..e4448db4f 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 @@ -13599,7 +13599,7 @@ self.addKeyHandler(item[1]?item[1]:item[0].charAt(0),item[2]==undefined?self.KEY }); }}); dojo.provide("struts.widget.Bind"); -dojo.widget.defineWidget("struts.widget.Bind",dojo.widget.HtmlWidget,{widgetType:"Bind",executeScripts:false,targets:"",targetsArray:null,href:"",handler:"",loadingText:"Loading...",errorText:"",showError:true,showLoading:true,listenTopics:"",notifyTopics:"",notifyTopicsArray:null,beforeNotifyTopics:"",beforeNotifyTopicsArray:null,afterNotifyTopics:"",afterNotifyTopicsArray:null,errorNotifyTopics:"",errorNotifyTopicsArray:null,formId:"",formFilter:"",formNode:null,event:"",indicator:"",parseContent:true,postCreate:function(){ +dojo.widget.defineWidget("struts.widget.Bind",dojo.widget.HtmlWidget,{widgetType:"Bind",executeScripts:false,targets:"",targetsArray:null,href:"",handler:"",loadingText:"Loading...",errorText:"",showError:true,showLoading:true,listenTopics:"",notifyTopics:"",notifyTopicsArray:null,beforeNotifyTopics:"",beforeNotifyTopicsArray:null,afterNotifyTopics:"",afterNotifyTopicsArray:null,errorNotifyTopics:"",errorNotifyTopicsArray:null,formId:"",formFilter:"",formNode:null,events:"",indicator:"",parseContent:true,postCreate:function(){ var self=this; if(!dojo.string.isBlank(this.listenTopics)){ this.log("Listening to "+this.listenTopics+" to refresh"); @@ -13625,12 +13625,17 @@ this.errorNotifyTopicsArray=this.errorNotifyTopics.split(","); if(!dojo.string.isBlank(this.targets)){ this.targetsArray=this.targets.split(","); } -if(!dojo.string.isBlank(this.event)){ -dojo.event.connect(this.domNode,this.event,function(evt){ +if(!dojo.string.isBlank(this.events)){ +var _b75=this.events.split(","); +if(_b75&&this.domNode){ +dojo.lang.forEach(_b75,function(_b76){ +dojo.event.connect(self.domNode,_b76,function(evt){ evt.preventDefault(); evt.stopPropagation(); self.reloadContents(); }); +}); +} } if(dojo.string.isBlank(this.href)&&dojo.string.isBlank(this.formId)){ this.formNode=dojo.dom.getFirstAncestorByTag(this.domNode,"form"); @@ -13648,13 +13653,17 @@ dojo.debug("["+(this.widgetId?this.widgetId:"unknown")+"] "+text); },setContent:function(text){ if(this.targetsArray){ var self=this; -var _b79=new dojo.xml.Parse(); -dojo.lang.forEach(this.targetsArray,function(_b7a){ -var node=dojo.byId(_b7a); +var _b7b=new dojo.xml.Parse(); +dojo.lang.forEach(this.targetsArray,function(_b7c){ +var node=dojo.byId(_b7c); +if(node){ node.innerHTML=text; if(self.parseContent&&text!=self.loadingText){ -var frag=_b79.parseElement(node,null,true); -dojo.widget.getParser().createSubComponents(frag,dojo.widget.byId(_b7a)); +var frag=_b7b.parseElement(node,null,true); +dojo.widget.getParser().createSubComponents(frag,dojo.widget.byId(_b7c)); +} +}else{ +self.log("Unable to find target: "+node); } }); } @@ -13663,64 +13672,64 @@ dojo.html.hide(this.indicator); this.notify(data,type,e); if(type=="load"){ if(this.executeScripts){ -var _b80=this.parse(data); -if(_b80.scripts&&_b80.scripts.length>0){ -var _b81=""; -for(var i=0;i<_b80.scripts.length;i++){ -_b81+=_b80.scripts[i]; +var _b82=this.parse(data); +if(_b82.scripts&&_b82.scripts.length>0){ +var _b83=""; +for(var i=0;i<_b82.scripts.length;i++){ +_b83+=_b82.scripts[i]; } -(new Function("_container_",_b81+"; return this;"))(this); +(new Function("_container_",_b83+"; return this;"))(this); } -this.setContent(_b80.text); +this.setContent(_b82.text); }else{ this.setContent(data); } }else{ if(this.showError){ -var _b83=dojo.string.isBlank(this.errorText)?e.message:this.errorText; -this.setContent(_b83); +var _b85=dojo.string.isBlank(this.errorText)?e.message:this.errorText; +this.setContent(_b85); } } },notify:function(data,type,e){ var self=this; if(this.notifyTopicsArray){ -dojo.lang.forEach(this.notifyTopicsArray,function(_b88){ +dojo.lang.forEach(this.notifyTopicsArray,function(_b8a){ try{ -dojo.event.topic.publish(_b88,data,type,e); +dojo.event.topic.publish(_b8a,data,type,e); } catch(ex){ self.log(ex); } }); } -var _b89=null; +var _b8b=null; switch(type){ case "before": -_b89=this.beforeNotifyTopicsArray; +_b8b=this.beforeNotifyTopicsArray; break; case "load": -_b89=this.afterNotifyTopicsArray; +_b8b=this.afterNotifyTopicsArray; break; case "error": -_b89=this.errorNotifyTopicsArray; +_b8b=this.errorNotifyTopicsArray; break; } -this.notifyTo(_b89,data,type,e); -},notifyTo:function(_b8a,data,type,e){ +this.notifyTo(_b8b,data,type,e); +},notifyTo:function(_b8c,data,type,e){ var self=this; -if(_b8a){ -dojo.lang.forEach(_b8a,function(_b8f){ +if(_b8c){ +dojo.lang.forEach(_b8c,function(_b91){ try{ -dojo.event.topic.publish(_b8f,data,type,e); +dojo.event.topic.publish(_b91,data,type,e); } catch(ex){ self.log(ex); } }); } -},onDownloadStart:function(_b90){ +},onDownloadStart:function(_b92){ if(this.showLoading&&!dojo.string.isBlank(this.loadingText)){ -_b90.text=this.loadingText; +_b92.text=this.loadingText; } },reloadContents:function(evt){ if(!dojo.string.isBlank(this.handler)){ @@ -13729,9 +13738,9 @@ window[this.handler](this,this.domNode); }else{ try{ var self=this; -var _b93={cancel:false}; -this.notify(this.widgetId,"before",_b93); -if(_b93.cancel){ +var _b95={cancel:false}; +this.notify(this.widgetId,"before",_b95); +if(_b95.cancel){ this.log("Request canceled"); return; } @@ -13739,8 +13748,8 @@ if(dojo.string.isBlank(this.href)){ return; } if(this.formNode&&this.formNode.onsubmit!=null){ -var _b94=this.formNode.onsubmit.call(evt); -if(_b94!=null&&!_b94){ +var _b96=this.formNode.onsubmit.call(evt); +if(_b96!=null&&!_b96){ this.log("Request canceled by 'onsubmit' of the form"); return; } @@ -13755,23 +13764,23 @@ dojo.lang.hitch(self,"bindHandler")(type,data,e); } catch(ex){ if(this.showError){ -var _b98=dojo.string.isBlank(this.errorText)?ex:this.errorText; -this.setContent(_b98); +var _b9a=dojo.string.isBlank(this.errorText)?ex:this.errorText; +this.setContent(_b9a); } } } },parse:function(s){ this.log("Parsing: "+s); -var _b9a=[]; -var tmp=[]; var _b9c=[]; -while(_b9a){ -_b9a=s.match(/]*)>([\s\S]*?)<\/script>/i); -if(!_b9a){ +var tmp=[]; +var _b9e=[]; +while(_b9c){ +_b9c=s.match(/]*)>([\s\S]*?)<\/script>/i); +if(!_b9c){ break; } -if(_b9a[1]){ -attr=_b9a[1].match(/src=(['"]?)([^"']*)\1/i); +if(_b9c[1]){ +attr=_b9c[1].match(/src=(['"]?)([^"']*)\1/i); if(attr){ var tmp2=attr[2].search(/.*(\bdojo\b(?:\.uncompressed)?\.js)$/); if(tmp2>-1){ @@ -13779,8 +13788,8 @@ this.log("Security note! inhibit:"+attr[2]+" from beeing loaded again."); } } } -if(_b9a[2]){ -var sc=_b9a[2].replace(/(?:var )?\bdjConfig\b(?:[\s]*=[\s]*\{[^}]+\}|\.[\w]*[\s]*=[\s]*[^;\n]*)?;?|dojo\.hostenv\.writeIncludes\(\s*\);?/g,""); +if(_b9c[2]){ +var sc=_b9c[2].replace(/(?:var )?\bdjConfig\b(?:[\s]*=[\s]*\{[^}]+\}|\.[\w]*[\s]*=[\s]*[^;\n]*)?;?|dojo\.hostenv\.writeIncludes\(\s*\);?/g,""); if(!sc){ continue; } @@ -13792,26 +13801,26 @@ break; } sc=sc.replace(tmp[0],""); } -_b9c.push(sc); +_b9e.push(sc); } s=s.replace(/]*>[\s\S]*?<\/script>/i,""); } -return {text:s,scripts:_b9c}; +return {text:s,scripts:_b9e}; }}); dojo.provide("dojo.lang.timing.Timer"); -dojo.lang.timing.Timer=function(_b9f){ +dojo.lang.timing.Timer=function(_ba1){ this.timer=null; this.isRunning=false; -this.interval=_b9f; +this.interval=_ba1; this.onStart=null; this.onStop=null; }; dojo.extend(dojo.lang.timing.Timer,{onTick:function(){ -},setInterval:function(_ba0){ +},setInterval:function(_ba2){ if(this.isRunning){ dj_global.clearInterval(this.timer); } -this.interval=_ba0; +this.interval=_ba2; if(this.isRunning){ this.timer=dj_global.setInterval(dojo.lang.hitch(this,"onTick"),this.interval); } @@ -13829,59 +13838,59 @@ this.isRunning=false; dj_global.clearInterval(this.timer); }}); dojo.provide("struts.widget.BindDiv"); -dojo.widget.defineWidget("struts.widget.BindDiv",dojo.widget.ContentPane,{widgetType:"BindDiv",href:"",extractContent:false,parseContent:false,cacheContent:false,refreshOnShow:false,executeScripts:false,preload:true,updateFreq:0,delay:0,autoStart:true,timer:null,loadingText:"Loading...",showLoading:true,errorText:"",showError:true,listenTopics:"",notifyTopics:"",notifyTopicsArray:null,stopTimerListenTopics:"",startTimerListenTopics:"",beforeNotifyTopics:"",beforeNotifyTopicsArray:null,afterNotifyTopics:"",afterNotifyTopicsArray:null,errorNotifyTopics:"",errorNotifyTopicsArray:null,beforeLoading:"",afterLoading:"",formId:"",formFilter:"",indicator:"",parseContent:true,onDownloadStart:function(_ba1){ +dojo.widget.defineWidget("struts.widget.BindDiv",dojo.widget.ContentPane,{widgetType:"BindDiv",href:"",extractContent:false,parseContent:false,cacheContent:false,refreshOnShow:false,executeScripts:false,preload:true,updateFreq:0,delay:0,autoStart:true,timer:null,loadingText:"Loading...",showLoading:true,errorText:"",showError:true,listenTopics:"",notifyTopics:"",notifyTopicsArray:null,stopTimerListenTopics:"",startTimerListenTopics:"",beforeNotifyTopics:"",beforeNotifyTopicsArray:null,afterNotifyTopics:"",afterNotifyTopicsArray:null,errorNotifyTopics:"",errorNotifyTopicsArray:null,beforeLoading:"",afterLoading:"",formId:"",formFilter:"",indicator:"",parseContent:true,onDownloadStart:function(_ba3){ if(!this.showLoading){ -_ba1.returnValue=false; +_ba3.returnValue=false; return; } if(this.showLoading&&!dojo.string.isBlank(this.loadingText)){ -_ba1.text=this.loadingText; +_ba3.text=this.loadingText; } -},onDownloadError:function(_ba2){ -this.onError(_ba2); -},onContentError:function(_ba3){ -this.onError(_ba3); -},onExecError:function(_ba4){ +},onDownloadError:function(_ba4){ this.onError(_ba4); -},onError:function(_ba5){ +},onContentError:function(_ba5){ +this.onError(_ba5); +},onExecError:function(_ba6){ +this.onError(_ba6); +},onError:function(_ba7){ if(this.showError){ if(!dojo.string.isBlank(this.errorText)){ -_ba5.text=this.errorText; +_ba7.text=this.errorText; } }else{ -_ba5.text=""; +_ba7.text=""; } },notify:function(data,type,e){ if(this.notifyTopicsArray){ var self=this; -dojo.lang.forEach(this.notifyTopicsArray,function(_baa){ +dojo.lang.forEach(this.notifyTopicsArray,function(_bac){ try{ -dojo.event.topic.publish(_baa,data,type,e); +dojo.event.topic.publish(_bac,data,type,e); } catch(ex){ self.log(ex); } }); } -var _bab=null; +var _bad=null; switch(type){ case "before": -_bab=this.beforeNotifyTopicsArray; +_bad=this.beforeNotifyTopicsArray; break; case "load": -_bab=this.afterNotifyTopicsArray; +_bad=this.afterNotifyTopicsArray; break; case "error": -_bab=this.errorNotifyTopicsArray; +_bad=this.errorNotifyTopicsArray; break; } -this.notifyTo(_bab,data,type,e); -},notifyTo:function(_bac,data,type,e){ +this.notifyTo(_bad,data,type,e); +},notifyTo:function(_bae,data,type,e){ var self=this; -if(_bac){ -dojo.lang.forEach(_bac,function(_bb1){ +if(_bae){ +dojo.lang.forEach(_bae,function(_bb3){ try{ -dojo.event.topic.publish(_bb1,data,type,e); +dojo.event.topic.publish(_bb3,data,type,e); } catch(ex){ self.log(ex); @@ -13893,51 +13902,51 @@ if(this.handler!==""){ this.setHandler(this.handler); } var self=this; -var _bb5=function(){ +var _bb7=function(){ dojo.lang.hitch(self,"refresh")(); }; -var _bb6=function(){ +var _bb8=function(){ dojo.lang.hitch(self,"startTimer")(); }; if(this.updateFreq>0){ this.timer=new dojo.lang.timing.Timer(this.updateFreq); -this.timer.onTick=_bb5; +this.timer.onTick=_bb7; if(this.autoStart){ if(this.delay>0){ -dojo.lang.setTimeout(_bb6,this.delay); +dojo.lang.setTimeout(_bb8,this.delay); }else{ this.startTimer(); } } }else{ if(this.delay>0){ -dojo.lang.setTimeout(_bb5,this.delay); +dojo.lang.setTimeout(_bb7,this.delay); } } if(!dojo.string.isBlank(this.listenTopics)){ this.log("Listening to "+this.listenTopics+" to refresh"); -var _bb7=this.listenTopics.split(","); -if(_bb7){ -dojo.lang.forEach(_bb7,function(_bb8){ -dojo.event.topic.subscribe(_bb8,self,"refresh"); +var _bb9=this.listenTopics.split(","); +if(_bb9){ +dojo.lang.forEach(_bb9,function(_bba){ +dojo.event.topic.subscribe(_bba,self,"refresh"); }); } } if(!dojo.string.isBlank(this.stopTimerListenTopics)){ this.log("Listening to "+this.stopTimerListenTopics+" to stop timer"); -var _bb9=this.stopTimerListenTopics.split(","); -if(_bb9){ -dojo.lang.forEach(_bb9,function(_bba){ -dojo.event.topic.subscribe(_bba,self,"stopTimer"); +var _bbb=this.stopTimerListenTopics.split(","); +if(_bbb){ +dojo.lang.forEach(_bbb,function(_bbc){ +dojo.event.topic.subscribe(_bbc,self,"stopTimer"); }); } } if(!dojo.string.isBlank(this.startTimerListenTopics)){ this.log("Listening to "+this.stopTimerListenTopics+" to start timer"); -var _bbb=this.startTimerListenTopics.split(","); -if(_bbb){ -dojo.lang.forEach(_bbb,function(_bbc){ -dojo.event.topic.subscribe(_bbc,self,"startTimer"); +var _bbd=this.startTimerListenTopics.split(","); +if(_bbd){ +dojo.lang.forEach(_bbd,function(_bbe){ +dojo.event.topic.subscribe(_bbe,self,"startTimer"); }); } } @@ -13956,16 +13965,16 @@ this.errorNotifyTopicsArray=this.errorNotifyTopics.split(","); if(this.isShowing()&&this.preload&&this.updateFreq<=0&&this.delay<=0){ this.refresh(); } -},_downloadExternalContent:function(url,_bbe){ -var _bbf={cancel:false}; -this.notify(this.widgetId,"before",_bbf); -if(_bbf.cancel){ +},_downloadExternalContent:function(url,_bc0){ +var _bc1={cancel:false}; +this.notify(this.widgetId,"before",_bc1); +if(_bc1.cancel){ return; } dojo.html.show(this.indicator); this._handleDefaults("Loading...","onDownloadStart"); var self=this; -dojo.io.bind({url:url,useCache:_bbe,preventCache:!_bbe,mimetype:"text/html",formNode:dojo.byId(self.formId),formFilter:window[self.formFilter],handler:function(type,data,e){ +dojo.io.bind({url:url,useCache:_bc0,preventCache:!_bc0,mimetype:"text/html",formNode:dojo.byId(self.formId),formFilter:window[self.formFilter],handler:function(type,data,e){ dojo.html.hide(self.indicator); self.notify(data,type,e); if(type=="load"){ @@ -13988,109 +13997,109 @@ this.log("starting timer with update interval "+this.updateFreq); this.timer.start(); } },splitAndFixPaths:function(s,url){ -var _bc7=[],_bc8=[],tmp=[]; -var _bca=[],_bcb=[],attr=[],_bcd=[]; -var str="",path="",fix="",_bd1="",tag="",_bd3=""; +var _bc9=[],_bca=[],tmp=[]; +var _bcc=[],_bcd=[],attr=[],_bcf=[]; +var str="",path="",fix="",_bd3="",tag="",_bd5=""; if(!url){ url="./"; } if(s){ -var _bd4=/]*>([\s\S]*?)<\/title>/i; -while(_bca=_bd4.exec(s)){ -_bc7.push(_bca[1]); -s=s.substring(0,_bca.index)+s.substr(_bca.index+_bca[0].length); +var _bd6=/]*>([\s\S]*?)<\/title>/i; +while(_bcc=_bd6.exec(s)){ +_bc9.push(_bcc[1]); +s=s.substring(0,_bcc.index)+s.substr(_bcc.index+_bcc[0].length); } if(this.adjustPaths){ -var _bd5=/<[a-z][a-z0-9]*[^>]*\s(?:(?:src|href|style)=[^>])+[^>]*>/i; -var _bd6=/\s(src|href|style)=(['"]?)([\w()\[\]\/.,\\'"-:;#=&?\s@!]+?)\2/i; -var _bd7=/^(?:[#]|(?:(?:https?|ftps?|file|javascript|mailto|news):))/; -while(tag=_bd5.exec(s)){ +var _bd7=/<[a-z][a-z0-9]*[^>]*\s(?:(?:src|href|style)=[^>])+[^>]*>/i; +var _bd8=/\s(src|href|style)=(['"]?)([\w()\[\]\/.,\\'"-:;#=&?\s@!]+?)\2/i; +var _bd9=/^(?:[#]|(?:(?:https?|ftps?|file|javascript|mailto|news):))/; +while(tag=_bd7.exec(s)){ str+=s.substring(0,tag.index); s=s.substring((tag.index+tag[0].length),s.length); tag=tag[0]; -_bd1=""; -while(attr=_bd6.exec(tag)){ +_bd3=""; +while(attr=_bd8.exec(tag)){ path=""; -_bd3=attr[3]; +_bd5=attr[3]; switch(attr[1].toLowerCase()){ case "src": case "href": -if(_bd7.exec(_bd3)){ -path=_bd3; +if(_bd9.exec(_bd5)){ +path=_bd5; }else{ -path=(new dojo.uri.Uri(url,_bd3).toString()); +path=(new dojo.uri.Uri(url,_bd5).toString()); } break; case "style": -path=dojo.html.fixPathsInCssText(_bd3,url); +path=dojo.html.fixPathsInCssText(_bd5,url); break; default: -path=_bd3; +path=_bd5; } fix=" "+attr[1]+"="+attr[2]+path+attr[2]; -_bd1+=tag.substring(0,attr.index)+fix; +_bd3+=tag.substring(0,attr.index)+fix; tag=tag.substring((attr.index+attr[0].length),tag.length); } -str+=_bd1+tag; +str+=_bd3+tag; } s=str+s; } -_bd4=/(?:<(style)[^>]*>([\s\S]*?)<\/style>|]*rel=['"]?stylesheet['"]?[^>]*)>)/i; -while(_bca=_bd4.exec(s)){ -if(_bca[1]&&_bca[1].toLowerCase()=="style"){ -_bcd.push(dojo.html.fixPathsInCssText(_bca[2],url)); +_bd6=/(?:<(style)[^>]*>([\s\S]*?)<\/style>|]*rel=['"]?stylesheet['"]?[^>]*)>)/i; +while(_bcc=_bd6.exec(s)){ +if(_bcc[1]&&_bcc[1].toLowerCase()=="style"){ +_bcf.push(dojo.html.fixPathsInCssText(_bcc[2],url)); }else{ -if(attr=_bca[3].match(/href=(['"]?)([^'">]*)\1/i)){ -_bcd.push({path:attr[2]}); +if(attr=_bcc[3].match(/href=(['"]?)([^'">]*)\1/i)){ +_bcf.push({path:attr[2]}); } } -s=s.substring(0,_bca.index)+s.substr(_bca.index+_bca[0].length); +s=s.substring(0,_bcc.index)+s.substr(_bcc.index+_bcc[0].length); } -var _bd4=/]*)>([\s\S]*?)<\/script>/i; -var _bd8=/src=(['"]?)([^"']*)\1/i; -var _bd9=/.*(\bdojo\b\.js(?:\.uncompressed\.js)?)$/; -var _bda=/(?:var )?\bdjConfig\b(?:[\s]*=[\s]*\{[^}]+\}|\.[\w]*[\s]*=[\s]*[^;\n]*)?;?|dojo\.hostenv\.writeIncludes\(\s*\);?/g; -var _bdb=/dojo\.(?:(?:require(?:After)?(?:If)?)|(?:widget\.(?:manager\.)?registerWidgetPackage)|(?:(?:hostenv\.)?setModulePrefix|registerModulePath)|defineNamespace)\((['"]).*?\1\)\s*;?/; -while(_bca=_bd4.exec(s)){ -if(this.executeScripts&&_bca[1]){ -if(attr=_bd8.exec(_bca[1])){ -if(_bd9.exec(attr[2])){ +var _bd6=/]*)>([\s\S]*?)<\/script>/i; +var _bda=/src=(['"]?)([^"']*)\1/i; +var _bdb=/.*(\bdojo\b\.js(?:\.uncompressed\.js)?)$/; +var _bdc=/(?:var )?\bdjConfig\b(?:[\s]*=[\s]*\{[^}]+\}|\.[\w]*[\s]*=[\s]*[^;\n]*)?;?|dojo\.hostenv\.writeIncludes\(\s*\);?/g; +var _bdd=/dojo\.(?:(?:require(?:After)?(?:If)?)|(?:widget\.(?:manager\.)?registerWidgetPackage)|(?:(?:hostenv\.)?setModulePrefix|registerModulePath)|defineNamespace)\((['"]).*?\1\)\s*;?/; +while(_bcc=_bd6.exec(s)){ +if(this.executeScripts&&_bcc[1]){ +if(attr=_bda.exec(_bcc[1])){ +if(_bdb.exec(attr[2])){ dojo.debug("Security note! inhibit:"+attr[2]+" from being loaded again."); }else{ -_bc8.push({path:attr[2]}); +_bca.push({path:attr[2]}); } } } -if(_bca[2]){ -var sc=_bca[2].replace(_bda,""); +if(_bcc[2]){ +var sc=_bcc[2].replace(_bdc,""); if(!sc){ continue; } -while(tmp=_bdb.exec(sc)){ -_bcb.push(tmp[0]); +while(tmp=_bdd.exec(sc)){ +_bcd.push(tmp[0]); sc=sc.substring(0,tmp.index)+sc.substr(tmp.index+tmp[0].length); } if(this.executeScripts){ -_bc8.push(sc); +_bca.push(sc); } } -s=s.substr(0,_bca.index)+s.substr(_bca.index+_bca[0].length); +s=s.substr(0,_bcc.index)+s.substr(_bcc.index+_bcc[0].length); } if(this.extractContent){ -_bca=s.match(/]*>\s*([\s\S]+)\s*<\/body>/im); -if(_bca){ -s=_bca[1]; +_bcc=s.match(/]*>\s*([\s\S]+)\s*<\/body>/im); +if(_bcc){ +s=_bcc[1]; } } if(this.executeScripts&&this.scriptSeparation){ -var _bd4=/(<[a-zA-Z][a-zA-Z0-9]*\s[^>]*?\S=)((['"])[^>]*scriptScope[^>]*>)/; -var _bdd=/([\s'";:\(])scriptScope(.*)/; +var _bd6=/(<[a-zA-Z][a-zA-Z0-9]*\s[^>]*?\S=)((['"])[^>]*scriptScope[^>]*>)/; +var _bdf=/([\s'";:\(])scriptScope(.*)/; str=""; -while(tag=_bd4.exec(s)){ +while(tag=_bd6.exec(s)){ tmp=((tag[3]=="'")?"\"":"'"); fix=""; str+=s.substring(0,tag.index)+tag[1]; -while(attr=_bdd.exec(tag[2])){ +while(attr=_bdf.exec(tag[2])){ tag[2]=tag[2].substring(0,attr.index)+attr[1]+"dojo.widget.byId("+tmp+this.widgetId+tmp+").scriptScope"+attr[2]; } str+=tag[2]; @@ -14099,10 +14108,10 @@ s=s.substr(tag.index+tag[0].length); s=str+s; } } -return {"xml":s,"styles":_bcd,"titles":_bc7,"requires":_bcb,"scripts":_bc8,"url":url}; +return {"xml":s,"styles":_bcf,"titles":_bc9,"requires":_bcd,"scripts":_bca,"url":url}; }}); dojo.provide("struts.widget.BindAnchor"); -dojo.widget.defineWidget("struts.widget.BindAnchor",struts.widget.Bind,{widgetType:"BindAnchor",event:"onclick",postCreate:function(){ +dojo.widget.defineWidget("struts.widget.BindAnchor",struts.widget.Bind,{widgetType:"BindAnchor",events:"onclick",postCreate:function(){ struts.widget.BindAnchor.superclass.postCreate.apply(this); this.domNode.href="#"; }}); @@ -14112,10 +14121,10 @@ dojo.widget.html.stabile.getState=function(id){ dojo.widget.html.stabile.setup(); return dojo.widget.html.stabile.widgetState[id]; }; -dojo.widget.html.stabile.setState=function(id,_be0,_be1){ +dojo.widget.html.stabile.setState=function(id,_be2,_be3){ dojo.widget.html.stabile.setup(); -dojo.widget.html.stabile.widgetState[id]=_be0; -if(_be1){ +dojo.widget.html.stabile.widgetState[id]=_be2; +if(_be3){ dojo.widget.html.stabile.commit(dojo.widget.html.stabile.widgetState); } }; @@ -14125,12 +14134,12 @@ var text=dojo.widget.html.stabile._getStorage().value; dojo.widget.html.stabile.widgetState=text?dj_eval("("+text+")"):{}; } }; -dojo.widget.html.stabile.commit=function(_be3){ -dojo.widget.html.stabile._getStorage().value=dojo.widget.html.stabile.description(_be3); +dojo.widget.html.stabile.commit=function(_be5){ +dojo.widget.html.stabile._getStorage().value=dojo.widget.html.stabile.description(_be5); }; -dojo.widget.html.stabile.description=function(v,_be5){ -var _be6=dojo.widget.html.stabile._depth; -var _be7=function(){ +dojo.widget.html.stabile.description=function(v,_be7){ +var _be8=dojo.widget.html.stabile._depth; +var _be9=function(){ return this.description(this,true); }; try{ @@ -14154,53 +14163,53 @@ return "new Date("+d.getFullYear+","+d.getMonth()+","+d.getDate()+")"; } var d; if(v instanceof Array||v.push){ -if(_be6>=dojo.widget.html.stabile.depthLimit){ +if(_be8>=dojo.widget.html.stabile.depthLimit){ return "[ ... ]"; } d="["; -var _bea=true; +var _bec=true; dojo.widget.html.stabile._depth++; for(var i=0;i=dojo.widget.html.stabile.depthLimit){ +if(v.constructor==Object||v.toString==_be9){ +if(_be8>=dojo.widget.html.stabile.depthLimit){ return "{ ... }"; } if(typeof (v.hasOwnProperty)!="function"&&v.prototype){ throw new Error("description: "+v+" not supported by script engine"); } -var _bea=true; +var _bec=true; d="{"; dojo.widget.html.stabile._depth++; for(var key in v){ if(v[key]==void (0)||typeof (v[key])=="function"){ continue; } -if(_bea){ -_bea=false; +if(_bec){ +_bec=false; }else{ d+=", "; } var kd=key; if(!kd.match(/^[a-zA-Z_][a-zA-Z0-9_]*$/)){ -kd=arguments.callee(key,_be5); +kd=arguments.callee(key,_be7); } -d+=kd+": "+arguments.callee(v[key],_be5); +d+=kd+": "+arguments.callee(v[key],_be7); } return d+"}"; } -if(_be5){ +if(_be7){ if(dojo.widget.html.stabile._recur){ -var _bee=Object.prototype.toString; -return _bee.apply(v,[]); +var _bf0=Object.prototype.toString; +return _bf0.apply(v,[]); }else{ dojo.widget.html.stabile._recur=true; return v.toString(); @@ -14211,7 +14220,7 @@ return "'unknown'"; } } finally{ -dojo.widget.html.stabile._depth=_be6; +dojo.widget.html.stabile._depth=_be8; } }; dojo.widget.html.stabile._getStorage=function(){ @@ -14222,45 +14231,45 @@ var form=document.forms._dojo_form; return dojo.widget.html.stabile.dataField=form?form.stabile:{value:""}; }; dojo.provide("dojo.widget.ComboBox"); -dojo.declare("dojo.widget.incrementalComboBoxDataProvider",null,function(_bf0){ -this.searchUrl=_bf0.dataUrl; +dojo.declare("dojo.widget.incrementalComboBoxDataProvider",null,function(_bf2){ +this.searchUrl=_bf2.dataUrl; this._cache={}; this._inFlight=false; this._lastRequest=null; this.allowCache=false; -},{_addToCache:function(_bf1,data){ +},{_addToCache:function(_bf3,data){ if(this.allowCache){ -this._cache[_bf1]=data; +this._cache[_bf3]=data; } -},startSearch:function(_bf3,_bf4){ +},startSearch:function(_bf5,_bf6){ if(this._inFlight){ } -var tss=encodeURIComponent(_bf3); -var _bf6=dojo.string.substituteParams(this.searchUrl,{"searchString":tss}); -var _bf7=this; -var _bf8=this._lastRequest=dojo.io.bind({url:_bf6,method:"get",mimetype:"text/json",load:function(type,data,evt){ -_bf7._inFlight=false; +var tss=encodeURIComponent(_bf5); +var _bf8=dojo.string.substituteParams(this.searchUrl,{"searchString":tss}); +var _bf9=this; +var _bfa=this._lastRequest=dojo.io.bind({url:_bf8,method:"get",mimetype:"text/json",load:function(type,data,evt){ +_bf9._inFlight=false; if(!dojo.lang.isArray(data)){ -var _bfc=[]; +var _bfe=[]; for(var key in data){ -_bfc.push([data[key],key]); +_bfe.push([data[key],key]); } -data=_bfc; +data=_bfe; } -_bf7._addToCache(_bf3,data); -if(_bf8==_bf7._lastRequest){ -_bf4(data); +_bf9._addToCache(_bf5,data); +if(_bfa==_bf9._lastRequest){ +_bf6(data); } }}); this._inFlight=true; }}); -dojo.declare("dojo.widget.basicComboBoxDataProvider",null,function(_bfe,node){ +dojo.declare("dojo.widget.basicComboBoxDataProvider",null,function(_c00,node){ this._data=[]; this.searchLimit=30; this.searchType="STARTSTRING"; this.caseSensitive=false; -if(!dj_undef("dataUrl",_bfe)&&!dojo.string.isBlank(_bfe.dataUrl)){ -this._getData(_bfe.dataUrl); +if(!dj_undef("dataUrl",_c00)&&!dojo.string.isBlank(_c00.dataUrl)){ +this._getData(_c00.dataUrl); }else{ if((node)&&(node.nodeName.toLowerCase()=="select")){ var opts=node.getElementsByTagName("option"); @@ -14268,10 +14277,10 @@ var ol=opts.length; var data=[]; for(var x=0;x0)&&(ret.length>=this.searchLimit)){ break; } -var _c13=new String((!this.caseSensitive)?this._data[x][0].toLowerCase():this._data[x][0]); -if(_c13.length<_c0e.length){ +var _c15=new String((!this.caseSensitive)?this._data[x][0].toLowerCase():this._data[x][0]); +if(_c15.length<_c10.length){ continue; } if(st=="STARTSTRING"){ -if(_c0e==_c13.substr(0,_c0e.length)){ +if(_c10==_c15.substr(0,_c10.length)){ ret.push(this._data[x]); } }else{ if(st=="SUBSTRING"){ -if(_c13.indexOf(_c0e)>=0){ +if(_c15.indexOf(_c10)>=0){ ret.push(this._data[x]); } }else{ if(st=="STARTWORD"){ -var idx=_c13.indexOf(_c0e); +var idx=_c15.indexOf(_c10); if(idx==0){ ret.push(this._data[x]); } if(idx<=0){ continue; } -var _c15=false; +var _c17=false; while(idx!=-1){ -if(" ,/(".indexOf(_c13.charAt(idx-1))!=-1){ -_c15=true; +if(" ,/(".indexOf(_c15.charAt(idx-1))!=-1){ +_c17=true; break; } -idx=_c13.indexOf(_c0e,idx+1); +idx=_c15.indexOf(_c10,idx+1); } -if(!_c15){ +if(!_c17){ continue; }else{ ret.push(this._data[x]); @@ -14339,37 +14348,37 @@ ret.push(this._data[x]); } } } -_c0f(ret); -},setData:function(_c16){ -this._data=_c16; +_c11(ret); +},setData:function(_c18){ +this._data=_c18; }}); -dojo.widget.defineWidget("dojo.widget.ComboBox",dojo.widget.HtmlWidget,{forceValidOption:false,searchType:"stringstart",dataProvider:null,autoComplete:true,searchDelay:100,dataUrl:"",fadeTime:200,maxListLength:8,mode:"local",selectedResult:null,dataProviderClass:"",buttonSrc:dojo.uri.moduleUri("dojo.widget","templates/images/combo_box_arrow.png"),dropdownToggle:"fade",templatePath:dojo.uri.moduleUri("dojo.widget","templates/ComboBox.html"),templateCssPath:dojo.uri.moduleUri("dojo.widget","templates/ComboBox.css"),setValue:function(_c17){ -this.comboBoxValue.value=_c17; -if(this.textInputNode.value!=_c17){ -this.textInputNode.value=_c17; +dojo.widget.defineWidget("dojo.widget.ComboBox",dojo.widget.HtmlWidget,{forceValidOption:false,searchType:"stringstart",dataProvider:null,autoComplete:true,searchDelay:100,dataUrl:"",fadeTime:200,maxListLength:8,mode:"local",selectedResult:null,dataProviderClass:"",buttonSrc:dojo.uri.moduleUri("dojo.widget","templates/images/combo_box_arrow.png"),dropdownToggle:"fade",templatePath:dojo.uri.moduleUri("dojo.widget","templates/ComboBox.html"),templateCssPath:dojo.uri.moduleUri("dojo.widget","templates/ComboBox.css"),setValue:function(_c19){ +this.comboBoxValue.value=_c19; +if(this.textInputNode.value!=_c19){ +this.textInputNode.value=_c19; dojo.widget.html.stabile.setState(this.widgetId,this.getState(),true); -this.onValueChanged(_c17); +this.onValueChanged(_c19); } -},onValueChanged:function(_c18){ +},onValueChanged:function(_c1a){ },getValue:function(){ return this.comboBoxValue.value; },getState:function(){ return {value:this.getValue()}; -},setState:function(_c19){ -this.setValue(_c19.value); +},setState:function(_c1b){ +this.setValue(_c1b.value); },enable:function(){ this.disabled=false; this.textInputNode.removeAttribute("disabled"); },disable:function(){ this.disabled=true; this.textInputNode.setAttribute("disabled",true); -},_getCaretPos:function(_c1a){ -if(dojo.lang.isNumber(_c1a.selectionStart)){ -return _c1a.selectionStart; +},_getCaretPos:function(_c1c){ +if(dojo.lang.isNumber(_c1c.selectionStart)){ +return _c1c.selectionStart; }else{ if(dojo.render.html.ie){ var tr=document.selection.createRange().duplicate(); -var ntr=_c1a.createTextRange(); +var ntr=_c1c.createTextRange(); tr.move("character",0); ntr.move("character",0); try{ @@ -14381,36 +14390,36 @@ return 0; } } } -},_setCaretPos:function(_c1d,_c1e){ -_c1e=parseInt(_c1e); -this._setSelectedRange(_c1d,_c1e,_c1e); -},_setSelectedRange:function(_c1f,_c20,end){ +},_setCaretPos:function(_c1f,_c20){ +_c20=parseInt(_c20); +this._setSelectedRange(_c1f,_c20,_c20); +},_setSelectedRange:function(_c21,_c22,end){ if(!end){ -end=_c1f.value.length; +end=_c21.value.length; } -if(_c1f.setSelectionRange){ -_c1f.focus(); -_c1f.setSelectionRange(_c20,end); +if(_c21.setSelectionRange){ +_c21.focus(); +_c21.setSelectionRange(_c22,end); }else{ -if(_c1f.createTextRange){ -var _c22=_c1f.createTextRange(); -with(_c22){ +if(_c21.createTextRange){ +var _c24=_c21.createTextRange(); +with(_c24){ collapse(true); moveEnd("character",end); -moveStart("character",_c20); +moveStart("character",_c22); select(); } }else{ -_c1f.value=_c1f.value; -_c1f.blur(); -_c1f.focus(); -var dist=parseInt(_c1f.value.length)-end; -var _c24=String.fromCharCode(37); -var tcc=_c24.charCodeAt(0); +_c21.value=_c21.value; +_c21.blur(); +_c21.focus(); +var dist=parseInt(_c21.value.length)-end; +var _c26=String.fromCharCode(37); +var tcc=_c26.charCodeAt(0); for(var x=0;x0)){ +if((this.autoComplete)&&(_c3b.length)&&(!this._prev_key_backspace)&&(this.textInputNode.value.length>0)){ var cpos=this._getCaretPos(this.textInputNode); if((cpos+1)>this.textInputNode.value.length){ -this.textInputNode.value+=_c39[0][0].substr(cpos); +this.textInputNode.value+=_c3b[0][0].substr(cpos); this._setSelectedRange(this.textInputNode,cpos,this.textInputNode.value.length); } } var even=true; -while(_c39.length){ -var tr=_c39.shift(); +while(_c3b.length){ +var tr=_c3b.shift(); if(tr){ var td=document.createElement("div"); td.appendChild(document.createTextNode(tr[0])); @@ -14620,12 +14629,12 @@ this._hasFocus=true; },_onBlurInput:function(){ this._hasFocus=false; this._handleBlurTimer(true,500); -},_handleBlurTimer:function(_c3e,_c3f){ -if(this.blurTimer&&(_c3e||_c3f)){ +},_handleBlurTimer:function(_c40,_c41){ +if(this.blurTimer&&(_c40||_c41)){ clearTimeout(this.blurTimer); } -if(_c3f){ -this.blurTimer=dojo.lang.setTimeout(this,"_checkBlurred",_c3f); +if(_c41){ +this.blurTimer=dojo.lang.setTimeout(this,"_checkBlurred",_c41); } },_onMouseOver:function(evt){ if(!this._mouseover_list){ @@ -14633,9 +14642,9 @@ this._handleBlurTimer(true,0); this._mouseover_list=true; } },_onMouseOut:function(evt){ -var _c42=evt.relatedTarget; +var _c44=evt.relatedTarget; try{ -if(!_c42||_c42.parentNode!=this.optionsListNode){ +if(!_c44||_c44.parentNode!=this.optionsListNode){ this._mouseover_list=false; this._handleBlurTimer(true,100); this._tryFocus(); @@ -14643,24 +14652,24 @@ this._tryFocus(); } catch(e){ } -},_isInputEqualToResult:function(_c43){ -var _c44=this.textInputNode.value; +},_isInputEqualToResult:function(_c45){ +var _c46=this.textInputNode.value; if(!this.dataProvider.caseSensitive){ -_c44=_c44.toLowerCase(); -_c43=_c43.toLowerCase(); +_c46=_c46.toLowerCase(); +_c45=_c45.toLowerCase(); } -return (_c44==_c43); +return (_c46==_c45); },_isValidOption:function(){ var tgt=dojo.html.firstElement(this.optionsListNode); -var _c46=false; -while(!_c46&&tgt){ +var _c48=false; +while(!_c48&&tgt){ if(this._isInputEqualToResult(tgt.getAttribute("resultName"))){ -_c46=true; +_c48=true; }else{ tgt=dojo.html.nextElement(tgt); } } -return _c46; +return _c48; },_checkBlurred:function(){ if(!this._hasFocus&&!this._mouseover_list){ this._hideResultList(); @@ -14668,12 +14677,12 @@ if(!this.textInputNode.value.length){ this.setAllValues("",""); return; } -var _c47=this._isValidOption(); -if(this.forceValidOption&&!_c47){ +var _c49=this._isValidOption(); +if(this.forceValidOption&&!_c49){ this.setAllValues("",""); return; } -if(!_c47){ +if(!_c49){ this.setSelectedValue(""); } } @@ -14713,15 +14722,15 @@ this.optionsListNode.innerHTML=""; },_hideResultList:function(){ this.popupWidget.close(); },_showResultList:function(){ -var _c4a=this.optionsListNode.childNodes; -if(_c4a.length){ -var _c4b=Math.min(_c4a.length,this.maxListLength); +var _c4c=this.optionsListNode.childNodes; +if(_c4c.length){ +var _c4d=Math.min(_c4c.length,this.maxListLength); with(this.optionsListNode.style){ display=""; -if(_c4b==_c4a.length){ +if(_c4d==_c4c.length){ height=""; }else{ -height=_c4b*dojo.html.getMarginBox(_c4a[0]).height+"px"; +height=_c4d*dojo.html.getMarginBox(_c4c[0]).height+"px"; } width=(dojo.html.getMarginBox(this.domNode).width-2)+"px"; } @@ -14760,7 +14769,7 @@ this.setState(s); } }}); dojo.provide("struts.widget.ComboBox"); -struts.widget.ComboBoxDataProvider=function(_c4e,node){ +struts.widget.ComboBoxDataProvider=function(_c50,node){ this.data=[]; this.searchLimit=30; this.searchType="STARTSTRING"; @@ -14768,7 +14777,7 @@ this.caseSensitive=false; this._lastSearch=""; this._lastSearchResults=null; this.firstRequest=true; -this.cbox=_c4e; +this.cbox=_c50; this.formId=this.cbox.formId; this.formFilter=this.cbox.formFilter; this.getData=function(url){ @@ -14781,32 +14790,32 @@ this.cbox.notify.apply(this.cbox,[data,type,evt]); } if(!dojo.lang.isArray(data)){ if(!dojo.string.isBlank(this.cbox.dataFieldName)&&data[this.cbox.dataFieldName]!=null){ -_c54=data[this.cbox.dataFieldName]; +_c56=data[this.cbox.dataFieldName]; }else{ -var _c54=null; +var _c56=null; for(var key in data){ if(key==this.cbox.name){ -_c54=data[key]; +_c56=data[key]; break; } -if(!_c54&&dojo.lang.isArray(data[key])){ -_c54=data=data[key]; +if(!_c56&&dojo.lang.isArray(data[key])){ +_c56=data=data[key]; } } } -data=_c54; +data=_c56; } this.setData(data); }),mimetype:"text/json"}); }; -this.startSearch=function(_c56,_c57){ -this._preformSearch(_c56,_c57); +this.startSearch=function(_c58,_c59){ +this._preformSearch(_c58,_c59); }; -this._preformSearch=function(_c58,_c59){ +this._preformSearch=function(_c5a,_c5b){ var st=this.searchType; var ret=[]; if(!this.caseSensitive){ -_c58=_c58.toLowerCase(); +_c5a=_c5a.toLowerCase(); } for(var x=0;x0)&&(ret.length>=this.searchLimit)){ break; } -var _c5d=new String((!this.caseSensitive)?this.data[x][0].toLowerCase():this.data[x][0]); -if(_c5d.length<_c58.length){ +var _c5f=new String((!this.caseSensitive)?this.data[x][0].toLowerCase():this.data[x][0]); +if(_c5f.length<_c5a.length){ continue; } if(st=="STARTSTRING"){ -if(_c58==_c5d.substr(0,_c58.length)){ +if(_c5a==_c5f.substr(0,_c5a.length)){ ret.push(this.data[x]); } }else{ if(st=="SUBSTRING"){ -if(_c5d.indexOf(_c58)>=0){ +if(_c5f.indexOf(_c5a)>=0){ ret.push(this.data[x]); } }else{ if(st=="STARTWORD"){ -var idx=_c5d.indexOf(_c58); +var idx=_c5f.indexOf(_c5a); if(idx==0){ ret.push(this.data[x]); } if(idx<=0){ continue; } -var _c5f=false; +var _c61=false; while(idx!=-1){ -if(" ,/(".indexOf(_c5d.charAt(idx-1))!=-1){ -_c5f=true; +if(" ,/(".indexOf(_c5f.charAt(idx-1))!=-1){ +_c61=true; break; } -idx=_c5d.indexOf(_c58,idx+1); +idx=_c5f.indexOf(_c5a,idx+1); } -if(!_c5f){ +if(!_c61){ continue; }else{ ret.push(this.data[x]); @@ -14854,17 +14863,17 @@ ret.push(this.data[x]); } } } -_c59(ret); +_c5b(ret); }; -this.addData=function(_c60){ -this.data=this.data.concat(_c60); +this.addData=function(_c62){ +this.data=this.data.concat(_c62); }; -this.setData=function(_c61){ -this.data=_c61; +this.setData=function(_c63){ +this.data=_c63; for(var i=0;i0)){ +if((this.autoComplete)&&(_c6e.length)&&(!this._prev_key_backspace)&&(this.textInputNode.value.length>0)){ var cpos=this._getCaretPos(this.textInputNode); if((cpos+1)>this.textInputNode.value.length){ -this.textInputNode.value+=_c6c[0][0].substr(cpos); +this.textInputNode.value+=_c6e[0][0].substr(cpos); this._setSelectedRange(this.textInputNode,cpos,this.textInputNode.value.length); } } -var _c6e=this.textInputNode.value; +var _c70=this.textInputNode.value; var even=true; -while(_c6c.length){ -var tr=_c6c.shift(); +while(_c6e.length){ +var tr=_c6e.shift(); if(tr){ var td=document.createElement("div"); var text=tr[0]; -var i=text.toLowerCase().indexOf(_c6e.toLowerCase()); +var i=text.toLowerCase().indexOf(_c70.toLowerCase()); if(i>=0){ var pre=text.substring(0,i); -var _c75=text.substring(i,i+_c6e.length); -var post=text.substring(i+_c6e.length); +var _c77=text.substring(i,i+_c70.length); +var post=text.substring(i+_c70.length); if(!dojo.string.isBlank(pre)){ td.appendChild(document.createTextNode(pre)); } -var _c77=document.createElement("b"); -td.appendChild(_c77); -_c77.appendChild(document.createTextNode(_c75)); +var _c79=document.createElement("b"); +td.appendChild(_c79); +_c79.appendChild(document.createTextNode(_c77)); td.appendChild(document.createTextNode(post)); }else{ td.appendChild(document.createTextNode(tr[0])); @@ -14953,12 +14962,12 @@ this.showResultList(); struts.widget.ComboBox.superclass.postCreate.apply(this); var self=this; if(!dojo.string.isBlank(this.listenTopics)){ -var _c79=this.listenTopics.split(","); -for(var i=0;i<_c79.length;i++){ -dojo.event.topic.subscribe(_c79[i],function(){ -var _c7b={cancel:false}; -self.notify(this.widgetId,"before",_c7b); -if(_c7b.cancel){ +var _c7b=this.listenTopics.split(","); +for(var i=0;i<_c7b.length;i++){ +dojo.event.topic.subscribe(_c7b[i],function(){ +var _c7d={cancel:false}; +self.notify(this.widgetId,"before",_c7d); +if(_c7d.cancel){ return; } self.clearValues(); @@ -15000,37 +15009,37 @@ this.notify(data,"valuechanged",null); },notify:function(data,type,e){ if(this.notifyTopicsArray){ var self=this; -dojo.lang.forEach(this.notifyTopicsArray,function(_c81){ +dojo.lang.forEach(this.notifyTopicsArray,function(_c83){ try{ -dojo.event.topic.publish(_c81,data,type,e); +dojo.event.topic.publish(_c83,data,type,e); } catch(ex){ self.log(ex); } }); } -var _c82=null; +var _c84=null; switch(type){ case "before": -_c82=this.beforeNotifyTopicsArray; +_c84=this.beforeNotifyTopicsArray; break; case "load": -_c82=this.afterNotifyTopicsArray; +_c84=this.afterNotifyTopicsArray; break; case "error": -_c82=this.errorNotifyTopicsArray; +_c84=this.errorNotifyTopicsArray; break; case "valuechanged": -_c82=this.valueNotifyTopicsArray; +_c84=this.valueNotifyTopicsArray; break; } -this.notifyTo(_c82,data,type,e); -},notifyTo:function(_c83,data,type,e){ +this.notifyTo(_c84,data,type,e); +},notifyTo:function(_c85,data,type,e){ var self=this; -if(_c83){ -dojo.lang.forEach(_c83,function(_c88){ +if(_c85){ +dojo.lang.forEach(_c85,function(_c8a){ try{ -dojo.event.topic.publish(_c88,data,type,e); +dojo.event.topic.publish(_c8a,data,type,e); } catch(ex){ self.log(ex); @@ -15040,18 +15049,18 @@ self.log(ex); },log:function(text){ dojo.debug("["+(this.widgetId?this.widgetId:"unknown")+"] "+text); },startSearchFromInput:function(){ -var _c8a=this.textInputNode.value; +var _c8c=this.textInputNode.value; if(this.loadOnType){ -if(_c8a.length>=this.loadMinimum){ -var _c8b=this.dataUrl+(this.dataUrl.indexOf("?")>-1?"&":"?"); -_c8b+=this.name+"="+_c8a; -this.dataProvider.getData(_c8b); -this.startSearch(_c8a); +if(_c8c.length>=this.loadMinimum){ +var _c8d=this.dataUrl+(this.dataUrl.indexOf("?")>-1?"&":"?"); +_c8d+=this.name+"="+_c8c; +this.dataProvider.getData(_c8d); +this.startSearch(_c8c); }else{ this._hideResultList(); } }else{ -this.startSearch(_c8a); +this.startSearch(_c8c); } }}); dojo.provide("dojo.widget.DropdownContainer"); @@ -15099,197 +15108,197 @@ this.inputNode.disabled=true; dojo.widget.DropdownContainer.superclass.disable.apply(this,arguments); }}); dojo.provide("dojo.date.serialize"); -dojo.date.setIso8601=function(_c8f,_c90){ -var _c91=(_c90.indexOf("T")==-1)?_c90.split(" "):_c90.split("T"); -_c8f=dojo.date.setIso8601Date(_c8f,_c91[0]); -if(_c91.length==2){ -_c8f=dojo.date.setIso8601Time(_c8f,_c91[1]); +dojo.date.setIso8601=function(_c91,_c92){ +var _c93=(_c92.indexOf("T")==-1)?_c92.split(" "):_c92.split("T"); +_c91=dojo.date.setIso8601Date(_c91,_c93[0]); +if(_c93.length==2){ +_c91=dojo.date.setIso8601Time(_c91,_c93[1]); } -return _c8f; +return _c91; }; -dojo.date.fromIso8601=function(_c92){ -return dojo.date.setIso8601(new Date(0,0),_c92); +dojo.date.fromIso8601=function(_c94){ +return dojo.date.setIso8601(new Date(0,0),_c94); }; -dojo.date.setIso8601Date=function(_c93,_c94){ -var _c95="^([0-9]{4})((-?([0-9]{2})(-?([0-9]{2}))?)|"+"(-?([0-9]{3}))|(-?W([0-9]{2})(-?([1-7]))?))?$"; -var d=_c94.match(new RegExp(_c95)); +dojo.date.setIso8601Date=function(_c95,_c96){ +var _c97="^([0-9]{4})((-?([0-9]{2})(-?([0-9]{2}))?)|"+"(-?([0-9]{3}))|(-?W([0-9]{2})(-?([1-7]))?))?$"; +var d=_c96.match(new RegExp(_c97)); if(!d){ -dojo.debug("invalid date string: "+_c94); +dojo.debug("invalid date string: "+_c96); return null; } var year=d[1]; -var _c98=d[4]; +var _c9a=d[4]; var date=d[6]; -var _c9a=d[8]; +var _c9c=d[8]; var week=d[10]; -var _c9c=d[12]?d[12]:1; -_c93.setFullYear(year); -if(_c9a){ -_c93.setMonth(0); -_c93.setDate(Number(_c9a)); +var _c9e=d[12]?d[12]:1; +_c95.setFullYear(year); +if(_c9c){ +_c95.setMonth(0); +_c95.setDate(Number(_c9c)); }else{ if(week){ -_c93.setMonth(0); -_c93.setDate(1); -var gd=_c93.getDay(); +_c95.setMonth(0); +_c95.setDate(1); +var gd=_c95.getDay(); var day=gd?gd:7; -var _c9f=Number(_c9c)+(7*Number(week)); +var _ca1=Number(_c9e)+(7*Number(week)); if(day<=4){ -_c93.setDate(_c9f+1-day); +_c95.setDate(_ca1+1-day); }else{ -_c93.setDate(_c9f+8-day); +_c95.setDate(_ca1+8-day); } }else{ -if(_c98){ -_c93.setDate(1); -_c93.setMonth(_c98-1); +if(_c9a){ +_c95.setDate(1); +_c95.setMonth(_c9a-1); } if(date){ -_c93.setDate(date); +_c95.setDate(date); } } } -return _c93; +return _c95; }; -dojo.date.fromIso8601Date=function(_ca0){ -return dojo.date.setIso8601Date(new Date(0,0),_ca0); +dojo.date.fromIso8601Date=function(_ca2){ +return dojo.date.setIso8601Date(new Date(0,0),_ca2); }; -dojo.date.setIso8601Time=function(_ca1,_ca2){ -var _ca3="Z|(([-+])([0-9]{2})(:?([0-9]{2}))?)$"; -var d=_ca2.match(new RegExp(_ca3)); -var _ca5=0; +dojo.date.setIso8601Time=function(_ca3,_ca4){ +var _ca5="Z|(([-+])([0-9]{2})(:?([0-9]{2}))?)$"; +var d=_ca4.match(new RegExp(_ca5)); +var _ca7=0; if(d){ if(d[0]!="Z"){ -_ca5=(Number(d[3])*60)+Number(d[5]); -_ca5*=((d[2]=="-")?1:-1); +_ca7=(Number(d[3])*60)+Number(d[5]); +_ca7*=((d[2]=="-")?1:-1); } -_ca5-=_ca1.getTimezoneOffset(); -_ca2=_ca2.substr(0,_ca2.length-d[0].length); +_ca7-=_ca3.getTimezoneOffset(); +_ca4=_ca4.substr(0,_ca4.length-d[0].length); } -var _ca6="^([0-9]{2})(:?([0-9]{2})(:?([0-9]{2})(.([0-9]+))?)?)?$"; -d=_ca2.match(new RegExp(_ca6)); +var _ca8="^([0-9]{2})(:?([0-9]{2})(:?([0-9]{2})(.([0-9]+))?)?)?$"; +d=_ca4.match(new RegExp(_ca8)); if(!d){ -dojo.debug("invalid time string: "+_ca2); +dojo.debug("invalid time string: "+_ca4); return null; } -var _ca7=d[1]; +var _ca9=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; -_ca1.setHours(_ca7); -_ca1.setMinutes(mins); -_ca1.setSeconds(secs); -_ca1.setMilliseconds(ms); -if(_ca5!==0){ -_ca1.setTime(_ca1.getTime()+_ca5*60000); +_ca3.setHours(_ca9); +_ca3.setMinutes(mins); +_ca3.setSeconds(secs); +_ca3.setMilliseconds(ms); +if(_ca7!==0){ +_ca3.setTime(_ca3.getTime()+_ca7*60000); } -return _ca1; +return _ca3; }; -dojo.date.fromIso8601Time=function(_cab){ -return dojo.date.setIso8601Time(new Date(0,0),_cab); +dojo.date.fromIso8601Time=function(_cad){ +return dojo.date.setIso8601Time(new Date(0,0),_cad); }; -dojo.date.toRfc3339=function(_cac,_cad){ -if(!_cac){ -_cac=new Date(); +dojo.date.toRfc3339=function(_cae,_caf){ +if(!_cae){ +_cae=new Date(); } var _=dojo.string.pad; -var _caf=[]; -if(_cad!="timeOnly"){ -var date=[_(_cac.getFullYear(),4),_(_cac.getMonth()+1,2),_(_cac.getDate(),2)].join("-"); -_caf.push(date); +var _cb1=[]; +if(_caf!="timeOnly"){ +var date=[_(_cae.getFullYear(),4),_(_cae.getMonth()+1,2),_(_cae.getDate(),2)].join("-"); +_cb1.push(date); } -if(_cad!="dateOnly"){ -var time=[_(_cac.getHours(),2),_(_cac.getMinutes(),2),_(_cac.getSeconds(),2)].join(":"); -var _cb2=_cac.getTimezoneOffset(); -time+=(_cb2>0?"-":"+")+_(Math.floor(Math.abs(_cb2)/60),2)+":"+_(Math.abs(_cb2)%60,2); -_caf.push(time); +if(_caf!="dateOnly"){ +var time=[_(_cae.getHours(),2),_(_cae.getMinutes(),2),_(_cae.getSeconds(),2)].join(":"); +var _cb4=_cae.getTimezoneOffset(); +time+=(_cb4>0?"-":"+")+_(Math.floor(Math.abs(_cb4)/60),2)+":"+_(Math.abs(_cb4)%60,2); +_cb1.push(time); } -return _caf.join("T"); +return _cb1.join("T"); }; -dojo.date.fromRfc3339=function(_cb3){ -if(_cb3.indexOf("Tany")!=-1){ -_cb3=_cb3.replace("Tany",""); +dojo.date.fromRfc3339=function(_cb5){ +if(_cb5.indexOf("Tany")!=-1){ +_cb5=_cb5.replace("Tany",""); } -var _cb4=new Date(); -return dojo.date.setIso8601(_cb4,_cb3); +var _cb6=new Date(); +return dojo.date.setIso8601(_cb6,_cb5); }; dojo.provide("dojo.date.common"); -dojo.date.setDayOfYear=function(_cb5,_cb6){ -_cb5.setMonth(0); -_cb5.setDate(_cb6); -return _cb5; +dojo.date.setDayOfYear=function(_cb7,_cb8){ +_cb7.setMonth(0); +_cb7.setDate(_cb8); +return _cb7; }; -dojo.date.getDayOfYear=function(_cb7){ -var _cb8=_cb7.getFullYear(); -var _cb9=new Date(_cb8-1,11,31); -return Math.floor((_cb7.getTime()-_cb9.getTime())/86400000); +dojo.date.getDayOfYear=function(_cb9){ +var _cba=_cb9.getFullYear(); +var _cbb=new Date(_cba-1,11,31); +return Math.floor((_cb9.getTime()-_cbb.getTime())/86400000); }; -dojo.date.setWeekOfYear=function(_cba,week,_cbc){ -if(arguments.length==1){ -_cbc=0; -} -dojo.unimplemented("dojo.date.setWeekOfYear"); -}; -dojo.date.getWeekOfYear=function(_cbd,_cbe){ +dojo.date.setWeekOfYear=function(_cbc,week,_cbe){ if(arguments.length==1){ _cbe=0; } -var _cbf=new Date(_cbd.getFullYear(),0,1); -var day=_cbf.getDay(); -_cbf.setDate(_cbf.getDate()-day+_cbe-(day>_cbe?7:0)); -return Math.floor((_cbd.getTime()-_cbf.getTime())/604800000); +dojo.unimplemented("dojo.date.setWeekOfYear"); }; -dojo.date.setIsoWeekOfYear=function(_cc1,week,_cc3){ +dojo.date.getWeekOfYear=function(_cbf,_cc0){ if(arguments.length==1){ -_cc3=1; +_cc0=0; +} +var _cc1=new Date(_cbf.getFullYear(),0,1); +var day=_cc1.getDay(); +_cc1.setDate(_cc1.getDate()-day+_cc0-(day>_cc0?7:0)); +return Math.floor((_cbf.getTime()-_cc1.getTime())/604800000); +}; +dojo.date.setIsoWeekOfYear=function(_cc3,week,_cc5){ +if(arguments.length==1){ +_cc5=1; } dojo.unimplemented("dojo.date.setIsoWeekOfYear"); }; -dojo.date.getIsoWeekOfYear=function(_cc4,_cc5){ +dojo.date.getIsoWeekOfYear=function(_cc6,_cc7){ if(arguments.length==1){ -_cc5=1; +_cc7=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(_cc6){ -var _cc7=_cc6.getMonth(); +dojo.date.getDaysInMonth=function(_cc8){ +var _cc9=_cc8.getMonth(); var days=[31,28,31,30,31,30,31,31,30,31,30,31]; -if(_cc7==1&&dojo.date.isLeapYear(_cc6)){ +if(_cc9==1&&dojo.date.isLeapYear(_cc8)){ return 29; }else{ -return days[_cc7]; +return days[_cc9]; } }; -dojo.date.isLeapYear=function(_cc9){ -var year=_cc9.getFullYear(); +dojo.date.isLeapYear=function(_ccb){ +var year=_ccb.getFullYear(); return (year%400==0)?true:(year%100==0)?false:(year%4==0)?true:false; }; -dojo.date.getTimezoneName=function(_ccb){ -var str=_ccb.toString(); +dojo.date.getTimezoneName=function(_ccd){ +var str=_ccd.toString(); var tz=""; -var _cce; +var _cd0; var pos=str.indexOf("("); if(pos>-1){ pos++; tz=str.substring(pos,str.indexOf(")")); }else{ var pat=/([A-Z\/]+) \d{4}$/; -if((_cce=str.match(pat))){ -tz=_cce[1]; +if((_cd0=str.match(pat))){ +tz=_cd0[1]; }else{ -str=_ccb.toLocaleString(); +str=_ccd.toLocaleString(); pat=/ ([A-Z\/]+)$/; -if((_cce=str.match(pat))){ -tz=_cce[1]; +if((_cd0=str.match(pat))){ +tz=_cd0[1]; } } } return tz=="AM"||tz=="PM"?"":tz; }; -dojo.date.getOrdinal=function(_cd1){ -var date=_cd1.getDate(); +dojo.date.getOrdinal=function(_cd3){ +var date=_cd3.getDate(); if(date%100!=11&&date%10==1){ return "st"; }else{ @@ -15305,12 +15314,12 @@ return "th"; } }; dojo.date.compareTypes={DATE:1,TIME:2}; -dojo.date.compare=function(_cd3,_cd4,_cd5){ -var dA=_cd3; -var dB=_cd4||new Date(); +dojo.date.compare=function(_cd5,_cd6,_cd7){ +var dA=_cd5; +var dB=_cd6||new Date(); var now=new Date(); with(dojo.date.compareTypes){ -var opt=_cd5||(DATE|TIME); +var opt=_cd7||(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); } @@ -15323,7 +15332,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,_cdd,incr){ +dojo.date.add=function(dt,_cdf,incr){ if(typeof dt=="number"){ dt=new Date(dt); } @@ -15334,7 +15343,7 @@ sum.setDate(0); } var sum=new Date(dt); with(dojo.date.dateParts){ -switch(_cdd){ +switch(_cdf){ case YEAR: sum.setFullYear(dt.getFullYear()+incr); fixOvershoot(); @@ -15352,7 +15361,7 @@ sum.setDate(dt.getDate()+incr); break; case WEEKDAY: var dat=dt.getDate(); -var _ce1=0; +var _ce3=0; var days=0; var strt=0; var trgt=0; @@ -15360,10 +15369,10 @@ var adj=0; var mod=incr%5; if(mod==0){ days=(incr>0)?5:-5; -_ce1=(incr>0)?((incr-5)/5):((incr+5)/5); +_ce3=(incr>0)?((incr-5)/5):((incr+5)/5); }else{ days=mod; -_ce1=parseInt(incr/5); +_ce3=parseInt(incr/5); } strt=dt.getDay(); if(strt==6&&incr>0){ @@ -15377,7 +15386,7 @@ trgt=(strt+days); if(trgt==0||trgt==6){ adj=(incr>0)?2:-2; } -sum.setDate(dat+(7*_ce1)+days+adj); +sum.setDate(dat+(7*_ce3)+days+adj); break; case HOUR: sum.setHours(sum.getHours()+incr); @@ -15397,60 +15406,60 @@ break; } return sum; }; -dojo.date.diff=function(dtA,dtB,_ce9){ +dojo.date.diff=function(dtA,dtB,_ceb){ if(typeof dtA=="number"){ dtA=new Date(dtA); } if(typeof dtB=="number"){ dtB=new Date(dtB); } -var _cea=dtB.getFullYear()-dtA.getFullYear(); -var _ceb=(dtB.getMonth()-dtA.getMonth())+(_cea*12); -var _cec=dtB.getTime()-dtA.getTime(); -var _ced=_cec/1000; -var _cee=_ced/60; -var _cef=_cee/60; -var _cf0=_cef/24; -var _cf1=_cf0/7; -var _cf2=0; +var _cec=dtB.getFullYear()-dtA.getFullYear(); +var _ced=(dtB.getMonth()-dtA.getMonth())+(_cec*12); +var _cee=dtB.getTime()-dtA.getTime(); +var _cef=_cee/1000; +var _cf0=_cef/60; +var _cf1=_cf0/60; +var _cf2=_cf1/24; +var _cf3=_cf2/7; +var _cf4=0; with(dojo.date.dateParts){ -switch(_ce9){ +switch(_ceb){ case YEAR: -_cf2=_cea; +_cf4=_cec; 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+=(_cea*4); -_cf2=qB-qA; +qB+=(_cec*4); +_cf4=qB-qA; break; case MONTH: -_cf2=_ceb; +_cf4=_ced; break; case WEEK: -_cf2=parseInt(_cf1); +_cf4=parseInt(_cf3); break; case DAY: -_cf2=_cf0; +_cf4=_cf2; break; case WEEKDAY: -var days=Math.round(_cf0); -var _cf8=parseInt(days/7); +var days=Math.round(_cf2); +var _cfa=parseInt(days/7); var mod=days%7; if(mod==0){ -days=_cf8*5; +days=_cfa*5; }else{ var adj=0; var aDay=dtA.getDay(); var bDay=dtB.getDay(); -_cf8=parseInt(days/7); +_cfa=parseInt(days/7); mod=days%7; -var _cfd=new Date(dtA); -_cfd.setDate(_cfd.getDate()+(_cf8*7)); -var _cfe=_cfd.getDay(); -if(_cf0>0){ +var _cff=new Date(dtA); +_cff.setDate(_cff.getDate()+(_cfa*7)); +var _d00=_cff.getDay(); +if(_cf2>0){ switch(true){ case aDay==6: adj=-1; @@ -15464,14 +15473,14 @@ break; case bDay==0: adj=-2; break; -case (_cfe+mod)>5: +case (_d00+mod)>5: adj=-2; break; default: break; } }else{ -if(_cf0<0){ +if(_cf2<0){ switch(true){ case aDay==6: adj=0; @@ -15485,7 +15494,7 @@ break; case bDay==0: adj=1; break; -case (_cfe+mod)<0: +case (_d00+mod)<0: adj=2; break; default: @@ -15494,116 +15503,116 @@ break; } } days+=adj; -days-=(_cf8*2); +days-=(_cfa*2); } -_cf2=days; +_cf4=days; break; case HOUR: -_cf2=_cef; +_cf4=_cf1; break; case MINUTE: -_cf2=_cee; +_cf4=_cf0; break; case SECOND: -_cf2=_ced; +_cf4=_cef; break; case MILLISECOND: -_cf2=_cec; +_cf4=_cee; break; default: break; } } -return Math.round(_cf2); +return Math.round(_cf4); }; dojo.provide("dojo.date.supplemental"); -dojo.date.getFirstDayOfWeek=function(_cff){ -var _d00={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}; -_cff=dojo.hostenv.normalizeLocale(_cff); -var _d01=_cff.split("-")[1]; -var dow=_d00[_d01]; +dojo.date.getFirstDayOfWeek=function(_d01){ +var _d02={mv:5,ae:6,af:6,bh:6,dj:6,dz:6,eg:6,er:6,et:6,iq:6,ir:6,jo:6,ke:6,kw:6,lb:6,ly:6,ma:6,om:6,qa:6,sa:6,sd:6,so:6,tn:6,ye:6,as:0,au:0,az:0,bw:0,ca:0,cn:0,fo:0,ge:0,gl:0,gu:0,hk:0,ie:0,il:0,is:0,jm:0,jp:0,kg:0,kr:0,la:0,mh:0,mo:0,mp:0,mt:0,nz:0,ph:0,pk:0,sg:0,th:0,tt:0,tw:0,um:0,us:0,uz:0,vi:0,za:0,zw:0,et:0,mw:0,ng:0,tj:0,gb:0,sy:4}; +_d01=dojo.hostenv.normalizeLocale(_d01); +var _d03=_d01.split("-")[1]; +var dow=_d02[_d03]; return (typeof dow=="undefined")?1:dow; }; -dojo.date.getWeekend=function(_d03){ -var _d04={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 _d05={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}; -_d03=dojo.hostenv.normalizeLocale(_d03); -var _d06=_d03.split("-")[1]; -var _d07=_d04[_d06]; -var end=_d05[_d06]; -if(typeof _d07=="undefined"){ -_d07=6; +dojo.date.getWeekend=function(_d05){ +var _d06={eg:5,il:5,sy:5,"in":0,ae:4,bh:4,dz:4,iq:4,jo:4,kw:4,lb:4,ly:4,ma:4,om:4,qa:4,sa:4,sd:4,tn:4,ye:4}; +var _d07={ae:5,bh:5,dz:5,iq:5,jo:5,kw:5,lb:5,ly:5,ma:5,om:5,qa:5,sa:5,sd:5,tn:5,ye:5,af:5,ir:5,eg:6,il:6,sy:6}; +_d05=dojo.hostenv.normalizeLocale(_d05); +var _d08=_d05.split("-")[1]; +var _d09=_d06[_d08]; +var end=_d07[_d08]; +if(typeof _d09=="undefined"){ +_d09=6; } if(typeof end=="undefined"){ end=0; } -return {start:_d07,end:end}; +return {start:_d09,end:end}; }; -dojo.date.isWeekend=function(_d09,_d0a){ -var _d0b=dojo.date.getWeekend(_d0a); -var day=(_d09||new Date()).getDay(); -if(_d0b.end<_d0b.start){ -_d0b.end+=7; -if(day<_d0b.start){ +dojo.date.isWeekend=function(_d0b,_d0c){ +var _d0d=dojo.date.getWeekend(_d0c); +var day=(_d0b||new Date()).getDay(); +if(_d0d.end<_d0d.start){ +_d0d.end+=7; +if(day<_d0d.start){ day+=7; } } -return day>=_d0b.start&&day<=_d0b.end; +return day>=_d0d.start&&day<=_d0d.end; }; dojo.provide("dojo.i18n.common"); -dojo.i18n.getLocalization=function(_d0d,_d0e,_d0f){ +dojo.i18n.getLocalization=function(_d0f,_d10,_d11){ dojo.hostenv.preloadLocalizations(); -_d0f=dojo.hostenv.normalizeLocale(_d0f); -var _d10=_d0f.split("-"); -var _d11=[_d0d,"nls",_d0e].join("."); -var _d12=dojo.hostenv.findModule(_d11,true); -var _d13; -for(var i=_d10.length;i>0;i--){ -var loc=_d10.slice(0,i).join("_"); -if(_d12[loc]){ -_d13=_d12[loc]; +_d11=dojo.hostenv.normalizeLocale(_d11); +var _d12=_d11.split("-"); +var _d13=[_d0f,"nls",_d10].join("."); +var _d14=dojo.hostenv.findModule(_d13,true); +var _d15; +for(var i=_d12.length;i>0;i--){ +var loc=_d12.slice(0,i).join("_"); +if(_d14[loc]){ +_d15=_d14[loc]; break; } } -if(!_d13){ -_d13=_d12.ROOT; +if(!_d15){ +_d15=_d14.ROOT; } -if(_d13){ -var _d16=function(){ +if(_d15){ +var _d18=function(){ }; -_d16.prototype=_d13; -return new _d16(); +_d18.prototype=_d15; +return new _d18(); } -dojo.raise("Bundle not found: "+_d0e+" in "+_d0d+" , locale="+_d0f); +dojo.raise("Bundle not found: "+_d10+" in "+_d0f+" , locale="+_d11); }; -dojo.i18n.isLTR=function(_d17){ -var lang=dojo.hostenv.normalizeLocale(_d17).split("-")[0]; +dojo.i18n.isLTR=function(_d19){ +var lang=dojo.hostenv.normalizeLocale(_d19).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(_d1a,_d1b){ -if(typeof _d1b=="string"){ +dojo.date.format=function(_d1c,_d1d){ +if(typeof _d1d=="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(_d1a,_d1b); +return dojo.date.strftime(_d1c,_d1d); } -function formatPattern(_d1c,_d1d){ -return _d1d.replace(/([a-z])\1*/ig,function(_d1e){ +function formatPattern(_d1e,_d1f){ +return _d1f.replace(/([a-z])\1*/ig,function(_d20){ var s; -var c=_d1e.charAt(0); -var l=_d1e.length; +var c=_d20.charAt(0); +var l=_d20.length; var pad; -var _d23=["abbr","wide","narrow"]; +var _d25=["abbr","wide","narrow"]; switch(c){ case "G": if(l>3){ dojo.unimplemented("Era format not implemented"); } -s=info.eras[_d1c.getFullYear()<0?1:0]; +s=info.eras[_d1e.getFullYear()<0?1:0]; break; case "y": -s=_d1c.getFullYear(); +s=_d1e.getFullYear(); switch(l){ case 1: break; @@ -15616,7 +15625,7 @@ pad=true; break; case "Q": case "q": -s=Math.ceil((_d1c.getMonth()+1)/3); +s=Math.ceil((_d1e.getMonth()+1)/3); switch(l){ case 1: case 2: @@ -15629,8 +15638,8 @@ dojo.unimplemented("Quarter format not implemented"); break; case "M": case "L": -var m=_d1c.getMonth(); -var _d26; +var m=_d1e.getMonth(); +var _d28; switch(l){ case 1: case 2: @@ -15640,39 +15649,39 @@ break; case 3: case 4: case 5: -_d26=_d23[l-3]; +_d28=_d25[l-3]; break; } -if(_d26){ +if(_d28){ var type=(c=="L")?"standalone":"format"; -var prop=["months",type,_d26].join("-"); +var prop=["months",type,_d28].join("-"); s=info[prop][m]; } break; case "w": -var _d29=0; -s=dojo.date.getWeekOfYear(_d1c,_d29); +var _d2b=0; +s=dojo.date.getWeekOfYear(_d1e,_d2b); pad=true; break; case "d": -s=_d1c.getDate(); +s=_d1e.getDate(); pad=true; break; case "D": -s=dojo.date.getDayOfYear(_d1c); +s=dojo.date.getDayOfYear(_d1e); pad=true; break; case "E": case "e": case "c": -var d=_d1c.getDay(); -var _d26; +var d=_d1e.getDay(); +var _d28; switch(l){ case 1: case 2: if(c=="e"){ -var _d2b=dojo.date.getFirstDayOfWeek(_d1b.locale); -d=(d-_d2b+7)%7; +var _d2d=dojo.date.getFirstDayOfWeek(_d1d.locale); +d=(d-_d2d+7)%7; } if(c!="c"){ s=d+1; @@ -15682,24 +15691,24 @@ break; case 3: case 4: case 5: -_d26=_d23[l-3]; +_d28=_d25[l-3]; break; } -if(_d26){ +if(_d28){ var type=(c=="c")?"standalone":"format"; -var prop=["days",type,_d26].join("-"); +var prop=["days",type,_d28].join("-"); s=info[prop][d]; } break; case "a": -var _d2c=(_d1c.getHours()<12)?"am":"pm"; -s=info[_d2c]; +var _d2e=(_d1e.getHours()<12)?"am":"pm"; +s=info[_d2e]; break; case "h": case "H": case "K": case "k": -var h=_d1c.getHours(); +var h=_d1e.getHours(); switch(c){ case "h": s=(h%12)||12; @@ -15717,26 +15726,26 @@ break; pad=true; break; case "m": -s=_d1c.getMinutes(); +s=_d1e.getMinutes(); pad=true; break; case "s": -s=_d1c.getSeconds(); +s=_d1e.getSeconds(); pad=true; break; case "S": -s=Math.round(_d1c.getMilliseconds()*Math.pow(10,l-3)); +s=Math.round(_d1e.getMilliseconds()*Math.pow(10,l-3)); break; case "v": case "z": -s=dojo.date.getTimezoneName(_d1c); +s=dojo.date.getTimezoneName(_d1e); if(s){ break; } l=4; case "Z": -var _d2e=_d1c.getTimezoneOffset(); -var tz=[(_d2e<=0?"+":"-"),dojo.string.pad(Math.floor(Math.abs(_d2e)/60),2),dojo.string.pad(Math.abs(_d2e)%60,2)]; +var _d30=_d1e.getTimezoneOffset(); +var tz=[(_d30<=0?"+":"-"),dojo.string.pad(Math.floor(Math.abs(_d30)/60),2),dojo.string.pad(Math.abs(_d30)%60,2)]; if(l==4){ tz.splice(0,0,"GMT"); tz.splice(3,0,":"); @@ -15749,11 +15758,11 @@ case "W": case "F": case "g": case "A": -dojo.debug(_d1e+" modifier not yet implemented"); +dojo.debug(_d20+" modifier not yet implemented"); s="?"; break; default: -dojo.raise("dojo.date.format: invalid pattern char: "+_d1d); +dojo.raise("dojo.date.format: invalid pattern char: "+_d1f); } if(pad){ s=dojo.string.pad(s,l); @@ -15761,126 +15770,126 @@ s=dojo.string.pad(s,l); return s; }); } -_d1b=_d1b||{}; -var _d30=dojo.hostenv.normalizeLocale(_d1b.locale); -var _d31=_d1b.formatLength||"full"; -var info=dojo.date._getGregorianBundle(_d30); +_d1d=_d1d||{}; +var _d32=dojo.hostenv.normalizeLocale(_d1d.locale); +var _d33=_d1d.formatLength||"full"; +var info=dojo.date._getGregorianBundle(_d32); var str=[]; -var _d33=dojo.lang.curry(this,formatPattern,_d1a); -if(_d1b.selector!="timeOnly"){ -var _d34=_d1b.datePattern||info["dateFormat-"+_d31]; -if(_d34){ -str.push(_processPattern(_d34,_d33)); +var _d35=dojo.lang.curry(this,formatPattern,_d1c); +if(_d1d.selector!="timeOnly"){ +var _d36=_d1d.datePattern||info["dateFormat-"+_d33]; +if(_d36){ +str.push(_processPattern(_d36,_d35)); } } -if(_d1b.selector!="dateOnly"){ -var _d35=_d1b.timePattern||info["timeFormat-"+_d31]; -if(_d35){ -str.push(_processPattern(_d35,_d33)); +if(_d1d.selector!="dateOnly"){ +var _d37=_d1d.timePattern||info["timeFormat-"+_d33]; +if(_d37){ +str.push(_processPattern(_d37,_d35)); } } -var _d36=str.join(" "); -return _d36; +var _d38=str.join(" "); +return _d38; }; -dojo.date.parse=function(_d37,_d38){ -_d38=_d38||{}; -var _d39=dojo.hostenv.normalizeLocale(_d38.locale); -var info=dojo.date._getGregorianBundle(_d39); -var _d3b=_d38.formatLength||"full"; -if(!_d38.selector){ -_d38.selector="dateOnly"; +dojo.date.parse=function(_d39,_d3a){ +_d3a=_d3a||{}; +var _d3b=dojo.hostenv.normalizeLocale(_d3a.locale); +var info=dojo.date._getGregorianBundle(_d3b); +var _d3d=_d3a.formatLength||"full"; +if(!_d3a.selector){ +_d3a.selector="dateOnly"; } -var _d3c=_d38.datePattern||info["dateFormat-"+_d3b]; -var _d3d=_d38.timePattern||info["timeFormat-"+_d3b]; -var _d3e; -if(_d38.selector=="dateOnly"){ -_d3e=_d3c; +var _d3e=_d3a.datePattern||info["dateFormat-"+_d3d]; +var _d3f=_d3a.timePattern||info["timeFormat-"+_d3d]; +var _d40; +if(_d3a.selector=="dateOnly"){ +_d40=_d3e; }else{ -if(_d38.selector=="timeOnly"){ -_d3e=_d3d; +if(_d3a.selector=="timeOnly"){ +_d40=_d3f; }else{ -if(_d38.selector=="dateTime"){ -_d3e=_d3c+" "+_d3d; +if(_d3a.selector=="dateTime"){ +_d40=_d3e+" "+_d3f; }else{ -var msg="dojo.date.parse: Unknown selector param passed: '"+_d38.selector+"'."; +var msg="dojo.date.parse: Unknown selector param passed: '"+_d3a.selector+"'."; msg+=" Defaulting to date pattern."; dojo.debug(msg); -_d3e=_d3c; +_d40=_d3e; } } } -var _d40=[]; -var _d41=_processPattern(_d3e,dojo.lang.curry(this,_buildDateTimeRE,_d40,info,_d38)); -var _d42=new RegExp("^"+_d41+"$"); -var _d43=_d42.exec(_d37); -if(!_d43){ +var _d42=[]; +var _d43=_processPattern(_d40,dojo.lang.curry(this,_buildDateTimeRE,_d42,info,_d3a)); +var _d44=new RegExp("^"+_d43+"$"); +var _d45=_d44.exec(_d39); +if(!_d45){ return null; } -var _d44=["abbr","wide","narrow"]; -var _d45=new Date(1972,0); -var _d46={}; -for(var i=1;i<_d43.length;i++){ -var grp=_d40[i-1]; +var _d46=["abbr","wide","narrow"]; +var _d47=new Date(1972,0); +var _d48={}; +for(var i=1;i<_d45.length;i++){ +var grp=_d42[i-1]; var l=grp.length; -var v=_d43[i]; +var v=_d45[i]; switch(grp.charAt(0)){ case "y": if(l!=2){ -_d45.setFullYear(v); -_d46.year=v; +_d47.setFullYear(v); +_d48.year=v; }else{ if(v<100){ v=Number(v); var year=""+new Date().getFullYear(); -var _d4c=year.substring(0,2)*100; -var _d4d=Number(year.substring(2,4)); -var _d4e=Math.min(_d4d+20,99); -var num=(v<_d4e)?_d4c+v:_d4c-100+v; -_d45.setFullYear(num); -_d46.year=num; +var _d4e=year.substring(0,2)*100; +var _d4f=Number(year.substring(2,4)); +var _d50=Math.min(_d4f+20,99); +var num=(v<_d50)?_d4e+v:_d4e-100+v; +_d47.setFullYear(num); +_d48.year=num; }else{ -if(_d38.strict){ +if(_d3a.strict){ return null; } -_d45.setFullYear(v); -_d46.year=v; +_d47.setFullYear(v); +_d48.year=v; } } break; case "M": if(l>2){ -if(!_d38.strict){ +if(!_d3a.strict){ v=v.replace(/\./g,""); v=v.toLowerCase(); } -var _d50=info["months-format-"+_d44[l-3]].concat(); -for(var j=0;j<_d50.length;j++){ -if(!_d38.strict){ -_d50[j]=_d50[j].toLowerCase(); +var _d52=info["months-format-"+_d46[l-3]].concat(); +for(var j=0;j<_d52.length;j++){ +if(!_d3a.strict){ +_d52[j]=_d52[j].toLowerCase(); } -if(v==_d50[j]){ -_d45.setMonth(j); -_d46.month=j; +if(v==_d52[j]){ +_d47.setMonth(j); +_d48.month=j; break; } } -if(j==_d50.length){ +if(j==_d52.length){ dojo.debug("dojo.date.parse: Could not parse month name: '"+v+"'."); return null; } }else{ -_d45.setMonth(v-1); -_d46.month=v-1; +_d47.setMonth(v-1); +_d48.month=v-1; } break; case "E": case "e": -if(!_d38.strict){ +if(!_d3a.strict){ v=v.toLowerCase(); } -var days=info["days-format-"+_d44[l-3]].concat(); +var days=info["days-format-"+_d46[l-3]].concat(); for(var j=0;j23){ dojo.debug("dojo.date.parse: Illegal hours value"); return null; } -_d45.setHours(v); +_d47.setHours(v); break; case "m": -_d45.setMinutes(v); +_d47.setMinutes(v); break; case "s": -_d45.setSeconds(v); +_d47.setSeconds(v); break; case "S": -_d45.setMilliseconds(v); +_d47.setMilliseconds(v); break; default: dojo.unimplemented("dojo.date.parse: unsupported pattern char="+grp.charAt(0)); } } -if(_d46.year&&_d45.getFullYear()!=_d46.year){ -dojo.debug("Parsed year: '"+_d45.getFullYear()+"' did not match input year: '"+_d46.year+"'."); +if(_d48.year&&_d47.getFullYear()!=_d48.year){ +dojo.debug("Parsed year: '"+_d47.getFullYear()+"' did not match input year: '"+_d48.year+"'."); return null; } -if(_d46.month&&_d45.getMonth()!=_d46.month){ -dojo.debug("Parsed month: '"+_d45.getMonth()+"' did not match input month: '"+_d46.month+"'."); +if(_d48.month&&_d47.getMonth()!=_d48.month){ +dojo.debug("Parsed month: '"+_d47.getMonth()+"' did not match input month: '"+_d48.month+"'."); return null; } -if(_d46.date&&_d45.getDate()!=_d46.date){ -dojo.debug("Parsed day of month: '"+_d45.getDate()+"' did not match input day of month: '"+_d46.date+"'."); +if(_d48.date&&_d47.getDate()!=_d48.date){ +dojo.debug("Parsed day of month: '"+_d47.getDate()+"' did not match input day of month: '"+_d48.date+"'."); return null; } -return _d45; +return _d47; }; -function _processPattern(_d56,_d57,_d58,_d59){ -var _d5a=function(x){ +function _processPattern(_d58,_d59,_d5a,_d5b){ +var _d5c=function(x){ return x; }; -_d57=_d57||_d5a; -_d58=_d58||_d5a; -_d59=_d59||_d5a; -var _d5c=_d56.match(/(''|[^'])+/g); -var _d5d=false; -for(var i=0;i<_d5c.length;i++){ -if(!_d5c[i]){ -_d5c[i]=""; +_d59=_d59||_d5c; +_d5a=_d5a||_d5c; +_d5b=_d5b||_d5c; +var _d5e=_d58.match(/(''|[^'])+/g); +var _d5f=false; +for(var i=0;i<_d5e.length;i++){ +if(!_d5e[i]){ +_d5e[i]=""; }else{ -_d5c[i]=(_d5d?_d58:_d57)(_d5c[i]); -_d5d=!_d5d; +_d5e[i]=(_d5f?_d5a:_d59)(_d5e[i]); +_d5f=!_d5f; } } -return _d59(_d5c.join("")); +return _d5b(_d5e.join("")); } -function _buildDateTimeRE(_d5f,info,_d61,_d62){ -return _d62.replace(/([a-z])\1*/ig,function(_d63){ +function _buildDateTimeRE(_d61,info,_d63,_d64){ +return _d64.replace(/([a-z])\1*/ig,function(_d65){ var s; -var c=_d63.charAt(0); -var l=_d63.length; +var c=_d65.charAt(0); +var l=_d65.length; switch(c){ case "y": s="\\d"+((l==2)?"{2,4}":"+"); @@ -16008,9 +16017,9 @@ case "S": s="\\d{1,3}"; break; case "a": -var am=_d61.am||info.am||"AM"; -var pm=_d61.pm||info.pm||"PM"; -if(_d61.strict){ +var am=_d63.am||info.am||"AM"; +var pm=_d63.pm||info.pm||"PM"; +if(_d63.strict){ s=am+"|"+pm; }else{ s=am; @@ -16020,50 +16029,50 @@ s+=(pm!=pm.toLowerCase())?pm+"|"+pm.toLowerCase():pm; } break; default: -dojo.unimplemented("parse of date format, pattern="+_d62); +dojo.unimplemented("parse of date format, pattern="+_d64); } -if(_d5f){ -_d5f.push(_d63); +if(_d61){ +_d61.push(_d65); } return "\\s*("+s+")\\s*"; }); } })(); -dojo.date.strftime=function(_d69,_d6a,_d6b){ -var _d6c=null; +dojo.date.strftime=function(_d6b,_d6c,_d6d){ +var _d6e=null; function _(s,n){ -return dojo.string.pad(s,n||2,_d6c||"0"); +return dojo.string.pad(s,n||2,_d6e||"0"); } -var info=dojo.date._getGregorianBundle(_d6b); -function $(_d70){ -switch(_d70){ +var info=dojo.date._getGregorianBundle(_d6d); +function $(_d72){ +switch(_d72){ case "a": -return dojo.date.getDayShortName(_d69,_d6b); +return dojo.date.getDayShortName(_d6b,_d6d); case "A": -return dojo.date.getDayName(_d69,_d6b); +return dojo.date.getDayName(_d6b,_d6d); case "b": case "h": -return dojo.date.getMonthShortName(_d69,_d6b); +return dojo.date.getMonthShortName(_d6b,_d6d); case "B": -return dojo.date.getMonthName(_d69,_d6b); +return dojo.date.getMonthName(_d6b,_d6d); case "c": -return dojo.date.format(_d69,{locale:_d6b}); +return dojo.date.format(_d6b,{locale:_d6d}); case "C": -return _(Math.floor(_d69.getFullYear()/100)); +return _(Math.floor(_d6b.getFullYear()/100)); case "d": -return _(_d69.getDate()); +return _(_d6b.getDate()); case "D": return $("m")+"/"+$("d")+"/"+$("y"); case "e": -if(_d6c==null){ -_d6c=" "; +if(_d6e==null){ +_d6e=" "; } -return _(_d69.getDate()); +return _(_d6b.getDate()); case "f": -if(_d6c==null){ -_d6c=" "; +if(_d6e==null){ +_d6e=" "; } -return _(_d69.getMonth()+1); +return _(_d6b.getMonth()+1); case "g": break; case "G": @@ -16072,171 +16081,171 @@ break; case "F": return $("Y")+"-"+$("m")+"-"+$("d"); case "H": -return _(_d69.getHours()); +return _(_d6b.getHours()); case "I": -return _(_d69.getHours()%12||12); +return _(_d6b.getHours()%12||12); case "j": -return _(dojo.date.getDayOfYear(_d69),3); +return _(dojo.date.getDayOfYear(_d6b),3); case "k": -if(_d6c==null){ -_d6c=" "; +if(_d6e==null){ +_d6e=" "; } -return _(_d69.getHours()); +return _(_d6b.getHours()); case "l": -if(_d6c==null){ -_d6c=" "; +if(_d6e==null){ +_d6e=" "; } -return _(_d69.getHours()%12||12); +return _(_d6b.getHours()%12||12); case "m": -return _(_d69.getMonth()+1); +return _(_d6b.getMonth()+1); case "M": -return _(_d69.getMinutes()); +return _(_d6b.getMinutes()); case "n": return "\n"; case "p": -return info[_d69.getHours()<12?"am":"pm"]; +return info[_d6b.getHours()<12?"am":"pm"]; case "r": return $("I")+":"+$("M")+":"+$("S")+" "+$("p"); case "R": return $("H")+":"+$("M"); case "S": -return _(_d69.getSeconds()); +return _(_d6b.getSeconds()); case "t": return "\t"; case "T": return $("H")+":"+$("M")+":"+$("S"); case "u": -return String(_d69.getDay()||7); +return String(_d6b.getDay()||7); case "U": -return _(dojo.date.getWeekOfYear(_d69)); +return _(dojo.date.getWeekOfYear(_d6b)); case "V": -return _(dojo.date.getIsoWeekOfYear(_d69)); +return _(dojo.date.getIsoWeekOfYear(_d6b)); case "W": -return _(dojo.date.getWeekOfYear(_d69,1)); +return _(dojo.date.getWeekOfYear(_d6b,1)); case "w": -return String(_d69.getDay()); +return String(_d6b.getDay()); case "x": -return dojo.date.format(_d69,{selector:"dateOnly",locale:_d6b}); +return dojo.date.format(_d6b,{selector:"dateOnly",locale:_d6d}); case "X": -return dojo.date.format(_d69,{selector:"timeOnly",locale:_d6b}); +return dojo.date.format(_d6b,{selector:"timeOnly",locale:_d6d}); case "y": -return _(_d69.getFullYear()%100); +return _(_d6b.getFullYear()%100); case "Y": -return String(_d69.getFullYear()); +return String(_d6b.getFullYear()); case "z": -var _d71=_d69.getTimezoneOffset(); -return (_d71>0?"-":"+")+_(Math.floor(Math.abs(_d71)/60))+":"+_(Math.abs(_d71)%60); +var _d73=_d6b.getTimezoneOffset(); +return (_d73>0?"-":"+")+_(Math.floor(Math.abs(_d73)/60))+":"+_(Math.abs(_d73)%60); case "Z": -return dojo.date.getTimezoneName(_d69); +return dojo.date.getTimezoneName(_d6b); case "%": return "%"; } } -var _d72=""; +var _d74=""; var i=0; -var _d74=0; -var _d75=null; -while((_d74=_d6a.indexOf("%",i))!=-1){ -_d72+=_d6a.substring(i,_d74++); -switch(_d6a.charAt(_d74++)){ +var _d76=0; +var _d77=null; +while((_d76=_d6c.indexOf("%",i))!=-1){ +_d74+=_d6c.substring(i,_d76++); +switch(_d6c.charAt(_d76++)){ case "_": -_d6c=" "; +_d6e=" "; break; case "-": -_d6c=""; +_d6e=""; break; case "0": -_d6c="0"; +_d6e="0"; break; case "^": -_d75="upper"; +_d77="upper"; break; case "*": -_d75="lower"; +_d77="lower"; break; case "#": -_d75="swap"; +_d77="swap"; break; default: -_d6c=null; -_d74--; +_d6e=null; +_d76--; break; } -var _d76=$(_d6a.charAt(_d74++)); -switch(_d75){ +var _d78=$(_d6c.charAt(_d76++)); +switch(_d77){ case "upper": -_d76=_d76.toUpperCase(); +_d78=_d78.toUpperCase(); break; case "lower": -_d76=_d76.toLowerCase(); +_d78=_d78.toLowerCase(); break; case "swap": -var _d77=_d76.toLowerCase(); -var _d78=""; +var _d79=_d78.toLowerCase(); +var _d7a=""; var j=0; var ch=""; -while(j<_d76.length){ -ch=_d76.charAt(j); -_d78+=(ch==_d77.charAt(j))?ch.toUpperCase():ch.toLowerCase(); +while(j<_d78.length){ +ch=_d78.charAt(j); +_d7a+=(ch==_d79.charAt(j))?ch.toUpperCase():ch.toLowerCase(); j++; } -_d76=_d78; +_d78=_d7a; break; default: break; } -_d75=null; -_d72+=_d76; -i=_d74; +_d77=null; +_d74+=_d78; +i=_d76; } -_d72+=_d6a.substring(i); -return _d72; +_d74+=_d6c.substring(i); +return _d74; }; (function(){ -var _d7b=[]; -dojo.date.addCustomFormats=function(_d7c,_d7d){ -_d7b.push({pkg:_d7c,name:_d7d}); +var _d7d=[]; +dojo.date.addCustomFormats=function(_d7e,_d7f){ +_d7d.push({pkg:_d7e,name:_d7f}); }; -dojo.date._getGregorianBundle=function(_d7e){ -var _d7f={}; -dojo.lang.forEach(_d7b,function(desc){ -var _d81=dojo.i18n.getLocalization(desc.pkg,desc.name,_d7e); -_d7f=dojo.lang.mixin(_d7f,_d81); +dojo.date._getGregorianBundle=function(_d80){ +var _d81={}; +dojo.lang.forEach(_d7d,function(desc){ +var _d83=dojo.i18n.getLocalization(desc.pkg,desc.name,_d80); +_d81=dojo.lang.mixin(_d81,_d83); },this); -return _d7f; +return _d81; }; })(); dojo.date.addCustomFormats("dojo.i18n.calendar","gregorian"); dojo.date.addCustomFormats("dojo.i18n.calendar","gregorianExtras"); -dojo.date.getNames=function(item,type,use,_d85){ -var _d86; -var _d87=dojo.date._getGregorianBundle(_d85); -var _d88=[item,use,type]; +dojo.date.getNames=function(item,type,use,_d87){ +var _d88; +var _d89=dojo.date._getGregorianBundle(_d87); +var _d8a=[item,use,type]; if(use=="standAlone"){ -_d86=_d87[_d88.join("-")]; +_d88=_d89[_d8a.join("-")]; } -_d88[1]="format"; -return (_d86||_d87[_d88.join("-")]).concat(); +_d8a[1]="format"; +return (_d88||_d89[_d8a.join("-")]).concat(); }; -dojo.date.getDayName=function(_d89,_d8a){ -return dojo.date.getNames("days","wide","format",_d8a)[_d89.getDay()]; +dojo.date.getDayName=function(_d8b,_d8c){ +return dojo.date.getNames("days","wide","format",_d8c)[_d8b.getDay()]; }; -dojo.date.getDayShortName=function(_d8b,_d8c){ -return dojo.date.getNames("days","abbr","format",_d8c)[_d8b.getDay()]; +dojo.date.getDayShortName=function(_d8d,_d8e){ +return dojo.date.getNames("days","abbr","format",_d8e)[_d8d.getDay()]; }; -dojo.date.getMonthName=function(_d8d,_d8e){ -return dojo.date.getNames("months","wide","format",_d8e)[_d8d.getMonth()]; +dojo.date.getMonthName=function(_d8f,_d90){ +return dojo.date.getNames("months","wide","format",_d90)[_d8f.getMonth()]; }; -dojo.date.getMonthShortName=function(_d8f,_d90){ -return dojo.date.getNames("months","abbr","format",_d90)[_d8f.getMonth()]; +dojo.date.getMonthShortName=function(_d91,_d92){ +return dojo.date.getNames("months","abbr","format",_d92)[_d91.getMonth()]; }; -dojo.date.toRelativeString=function(_d91){ +dojo.date.toRelativeString=function(_d93){ var now=new Date(); -var diff=(now-_d91)/1000; +var diff=(now-_d93)/1000; var end=" ago"; -var _d95=false; +var _d97=false; if(diff<0){ -_d95=true; +_d97=true; end=" from now"; diff=-diff; } @@ -16255,22 +16264,22 @@ return diff+" hour"+(diff==1?"":"s")+end; if(diff<60*60*24*7){ diff=Math.round(diff/(3600*24)); if(diff==1){ -return _d95?"Tomorrow":"Yesterday"; +return _d97?"Tomorrow":"Yesterday"; }else{ return diff+" days"+end; } } -return dojo.date.format(_d91); +return dojo.date.format(_d93); }; -dojo.date.toSql=function(_d96,_d97){ -return dojo.date.strftime(_d96,"%F"+!_d97?" %T":""); +dojo.date.toSql=function(_d98,_d99){ +return dojo.date.strftime(_d98,"%F"+!_d99?" %T":""); }; -dojo.date.fromSql=function(_d98){ -var _d99=_d98.split(/[\- :]/g); -while(_d99.length<6){ -_d99.push(0); +dojo.date.fromSql=function(_d9a){ +var _d9b=_d9a.split(/[\- :]/g); +while(_d9b.length<6){ +_d9b.push(0); } -return new Date(_d99[0],(parseInt(_d99[1],10)-1),_d99[2],_d99[3],_d99[4],_d99[5]); +return new Date(_d9b[0],(parseInt(_d9b[1],10)-1),_d9b[2],_d9b[3],_d9b[4],_d9b[5]); }; dojo.provide("dojo.widget.TimePicker"); dojo.widget.defineWidget("dojo.widget.TimePicker",dojo.widget.HtmlWidget,function(){ @@ -16284,13 +16293,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,templatePath:dojo.uri.moduleUri("dojo.widget","templates/TimePicker.html"),templateCssPath:dojo.uri.moduleUri("dojo.widget","templates/TimePicker.css"),postMixInProperties:function(_d9a,frag){ +},{isContainer:false,templatePath:dojo.uri.moduleUri("dojo.widget","templates/TimePicker.html"),templateCssPath:dojo.uri.moduleUri("dojo.widget","templates/TimePicker.css"),postMixInProperties:function(_d9c,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 _d9e=this.getFragNodeRef(frag); -dojo.html.copyStyle(this.domNode,_d9e); +var _da0=this.getFragNodeRef(frag); +dojo.html.copyStyle(this.domNode,_da0); if(args.value){ if(args.value instanceof Date){ this.storedTime=dojo.date.toRfc3339(args.value); @@ -16313,13 +16322,13 @@ this.time=dojo.widget.TimePicker.util.fromRfcDateTime("",0,1); } },initUI:function(){ if(!this.selectedTime.anyTime&&this.time){ -var _d9f=dojo.widget.TimePicker.util.toAmPmHour(this.time.getHours()); -var hour=_d9f[0]; -var isAm=_d9f[1]; -var _da2=this.time.getMinutes(); -var _da3=parseInt(_da2/5); +var _da1=dojo.widget.TimePicker.util.toAmPmHour(this.time.getHours()); +var hour=_da1[0]; +var isAm=_da1[1]; +var _da4=this.time.getMinutes(); +var _da5=parseInt(_da4/5); this.onSetSelectedHour(this.hourIndexMap[hour]); -this.onSetSelectedMinute(this.minuteIndexMap[_da3]); +this.onSetSelectedMinute(this.minuteIndexMap[_da5]); this.onSetSelectedAmPm(isAm); }else{ this.onSetSelectedAnyTime(); @@ -16333,8 +16342,8 @@ this.selectedTime.anyTime=true; } this.initData(); this.initUI(); -},setDateTime:function(_da5){ -this.storedTime=_da5; +},setDateTime:function(_da7){ +this.storedTime=_da7; },onClearSelectedHour:function(evt){ this.clearSelectedHour(); },onClearSelectedMinute:function(evt){ @@ -16349,20 +16358,20 @@ this.time=dojo.widget.TimePicker.util.fromRfcDateTime("",this.useDefaultMinutes) this.initUI(); } },clearSelectedHour:function(){ -var _daa=this.hourContainerNode.getElementsByTagName("td"); -for(var i=0;i<_daa.length;i++){ -dojo.html.setClass(_daa.item(i),""); -} -},clearSelectedMinute:function(){ -var _dac=this.minuteContainerNode.getElementsByTagName("td"); +var _dac=this.hourContainerNode.getElementsByTagName("td"); for(var i=0;i<_dac.length;i++){ dojo.html.setClass(_dac.item(i),""); } -},clearSelectedAmPm:function(){ -var _dae=this.amPmContainerNode.getElementsByTagName("td"); +},clearSelectedMinute:function(){ +var _dae=this.minuteContainerNode.getElementsByTagName("td"); for(var i=0;i<_dae.length;i++){ dojo.html.setClass(_dae.item(i),""); } +},clearSelectedAmPm:function(){ +var _db0=this.amPmContainerNode.getElementsByTagName("td"); +for(var i=0;i<_db0.length;i++){ +dojo.html.setClass(_db0.item(i),""); +} },clearSelectedAnyTime:function(){ dojo.html.setClass(this.anyTimeContainerNode,"anyTimeContainer"); },onSetSelectedHour:function(evt){ @@ -16373,19 +16382,19 @@ this.onSetTime(); },setSelectedHour:function(evt){ if(evt&&evt.target){ if(evt.target.nodeType==dojo.dom.ELEMENT_NODE){ -var _db2=evt.target; +var _db4=evt.target; }else{ -var _db2=evt.target.parentNode; +var _db4=evt.target.parentNode; } dojo.event.browser.stopEvent(evt); -dojo.html.setClass(_db2,this.classNames.selectedTime); -this.selectedTime["hour"]=_db2.innerHTML; +dojo.html.setClass(_db4,this.classNames.selectedTime); +this.selectedTime["hour"]=_db4.innerHTML; }else{ if(!isNaN(evt)){ -var _db3=this.hourContainerNode.getElementsByTagName("td"); -if(_db3.item(evt)){ -dojo.html.setClass(_db3.item(evt),this.classNames.selectedTime); -this.selectedTime["hour"]=_db3.item(evt).innerHTML; +var _db5=this.hourContainerNode.getElementsByTagName("td"); +if(_db5.item(evt)){ +dojo.html.setClass(_db5.item(evt),this.classNames.selectedTime); +this.selectedTime["hour"]=_db5.item(evt).innerHTML; } } } @@ -16399,19 +16408,19 @@ this.onSetTime(); },setSelectedMinute:function(evt){ if(evt&&evt.target){ if(evt.target.nodeType==dojo.dom.ELEMENT_NODE){ -var _db6=evt.target; +var _db8=evt.target; }else{ -var _db6=evt.target.parentNode; +var _db8=evt.target.parentNode; } dojo.event.browser.stopEvent(evt); -dojo.html.setClass(_db6,this.classNames.selectedTime); -this.selectedTime["minute"]=_db6.innerHTML; +dojo.html.setClass(_db8,this.classNames.selectedTime); +this.selectedTime["minute"]=_db8.innerHTML; }else{ if(!isNaN(evt)){ -var _db7=this.minuteContainerNode.getElementsByTagName("td"); -if(_db7.item(evt)){ -dojo.html.setClass(_db7.item(evt),this.classNames.selectedTime); -this.selectedTime["minute"]=_db7.item(evt).innerHTML; +var _db9=this.minuteContainerNode.getElementsByTagName("td"); +if(_db9.item(evt)){ +dojo.html.setClass(_db9.item(evt),this.classNames.selectedTime); +this.selectedTime["minute"]=_db9.item(evt).innerHTML; } } } @@ -16422,20 +16431,20 @@ this.setSelectedAmPm(evt); this.selectedTime.anyTime=false; this.onSetTime(); },setSelectedAmPm:function(evt){ -var _dba=evt.target; -if(evt&&_dba){ -if(_dba.nodeType!=dojo.dom.ELEMENT_NODE){ -_dba=_dba.parentNode; +var _dbc=evt.target; +if(evt&&_dbc){ +if(_dbc.nodeType!=dojo.dom.ELEMENT_NODE){ +_dbc=_dbc.parentNode; } dojo.event.browser.stopEvent(evt); -this.selectedTime.amPm=_dba.id; -dojo.html.setClass(_dba,this.classNames.selectedTime); +this.selectedTime.amPm=_dbc.id; +dojo.html.setClass(_dbc,this.classNames.selectedTime); }else{ evt=evt?0:1; -var _dbb=this.amPmContainerNode.getElementsByTagName("td"); -if(_dbb.item(evt)){ -this.selectedTime.amPm=_dbb.item(evt).id; -dojo.html.setClass(_dbb.item(evt),this.classNames.selectedTime); +var _dbd=this.amPmContainerNode.getElementsByTagName("td"); +if(_dbd.item(evt)){ +this.selectedTime.amPm=_dbd.item(evt).id; +dojo.html.setClass(_dbd.item(evt),this.classNames.selectedTime); } } },onSetSelectedAnyTime:function(evt){ @@ -16452,72 +16461,72 @@ dojo.event.browser.stopEvent(evt); },onSetTime:function(){ if(this.selectedTime.anyTime){ this.time=new Date(); -var _dbf=dojo.widget.TimePicker.util.toRfcDateTime(this.time); -this.setDateTime(_dbf.split("T")[0]); +var _dc1=dojo.widget.TimePicker.util.toRfcDateTime(this.time); +this.setDateTime(_dc1.split("T")[0]); }else{ var hour=12; -var _dc1=0; +var _dc3=0; var isAm=false; if(this.selectedTime["hour"]){ hour=parseInt(this.selectedTime["hour"],10); } if(this.selectedTime["minute"]){ -_dc1=parseInt(this.selectedTime["minute"],10); +_dc3=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(_dc1); +this.time.setMinutes(_dc3); 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(_dc4){ -if(!_dc4){ -_dc4=new Date(); +this.toRfcDateTime=function(_dc6){ +if(!_dc6){ +_dc6=new Date(); } -_dc4.setSeconds(0); -return dojo.date.strftime(_dc4,"%Y-%m-%dT%H:%M:00%z"); +_dc6.setSeconds(0); +return dojo.date.strftime(_dc6,"%Y-%m-%dT%H:%M:00%z"); }; -this.fromRfcDateTime=function(_dc5,_dc6,_dc7){ -var _dc8=new Date(); -if(!_dc5||_dc5.indexOf("T")==-1){ -if(_dc6){ -_dc8.setMinutes(Math.floor(_dc8.getMinutes()/5)*5); +this.fromRfcDateTime=function(_dc7,_dc8,_dc9){ +var _dca=new Date(); +if(!_dc7||_dc7.indexOf("T")==-1){ +if(_dc8){ +_dca.setMinutes(Math.floor(_dca.getMinutes()/5)*5); }else{ -_dc8.setMinutes(0); +_dca.setMinutes(0); } }else{ -var _dc9=_dc5.split("T")[1].split(":"); -var _dc8=new Date(); -_dc8.setHours(_dc9[0]); -_dc8.setMinutes(_dc9[1]); +var _dcb=_dc7.split("T")[1].split(":"); +var _dca=new Date(); +_dca.setHours(_dcb[0]); +_dca.setMinutes(_dcb[1]); } -return _dc8; +return _dca; }; this.toAmPmHour=function(hour){ -var _dcb=hour; +var _dcd=hour; var isAm=true; -if(_dcb==0){ -_dcb=12; +if(_dcd==0){ +_dcd=12; }else{ -if(_dcb>12){ -_dcb=_dcb-12; +if(_dcd>12){ +_dcd=_dcd-12; isAm=false; }else{ -if(_dcb==12){ +if(_dcd==12){ isAm=false; } } } -return [_dcb,isAm]; +return [_dcd,isAm]; }; -this.fromAmPmHour=function(_dcd,isAm){ -var hour=parseInt(_dcd,10); +this.fromAmPmHour=function(_dcf,isAm){ +var hour=parseInt(_dcf,10); if(isAm&&hour==12){ hour=0; }else{ @@ -16531,8 +16540,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 _dd0=dojo.i18n.getLocalization("dojo.widget","DropdownTimePicker",this.lang); -this.iconAlt=_dd0.selectTime; +var _dd2=dojo.i18n.getLocalization("dojo.widget","DropdownTimePicker",this.lang); +this.iconAlt=_dd2.selectTime; if(typeof (this.value)=="string"&&this.value.toLowerCase()=="today"){ this.value=new Date(); } @@ -16557,9 +16566,9 @@ this.value=new Date(this.value); } },fillInTemplate:function(){ dojo.widget.DropdownTimePicker.superclass.fillInTemplate.apply(this,arguments); -var _dd5=""; +var _dd7=""; if(this.value instanceof Date){ -_dd5=this.value; +_dd7=this.value; }else{ if(this.value){ var orig=this.value; @@ -16571,11 +16580,11 @@ c[i]="0"+c[i]; } } orig=c.join(":"); -_dd5=dojo.date.fromRfc3339(d+"T"+orig); +_dd7=dojo.date.fromRfc3339(d+"T"+orig); } } -var _dda={widgetContainerId:this.widgetId,lang:this.lang,value:_dd5}; -this.timePicker=dojo.widget.createWidget("TimePicker",_dda,this.containerNode,"child"); +var _ddc={widgetContainerId:this.widgetId,lang:this.lang,value:_dd7}; +this.timePicker=dojo.widget.createWidget("TimePicker",_ddc,this.containerNode,"child"); dojo.event.connect(this.timePicker,"onValueChanged",this,"_updateText"); if(this.value){ this._updateText(); @@ -16587,12 +16596,12 @@ this.valueNode.name=this.name; return this.valueNode.value; },getTime:function(){ return this.timePicker.storedTime; -},setValue:function(_ddb){ -this.setTime(_ddb); -},setTime:function(_ddc){ -var _ddd=""; -if(_ddc instanceof Date){ -_ddd=_ddc; +},setValue:function(_ddd){ +this.setTime(_ddd); +},setTime:function(_dde){ +var _ddf=""; +if(_dde instanceof Date){ +_ddf=_dde; }else{ if(this.value){ var orig=this.value; @@ -16604,10 +16613,10 @@ c[i]="0"+c[i]; } } orig=c.join(":"); -_ddd=dojo.date.fromRfc3339(d+"T"+orig); +_ddf=dojo.date.fromRfc3339(d+"T"+orig); } } -this.timePicker.setTime(_ddd); +this.timePicker.setTime(_ddf); this._syncValueNode(); },_updateText:function(){ if(this.timePicker.selectedTime.anyTime){ @@ -16623,43 +16632,43 @@ this.inputNode.value=dojo.date.format(this.timePicker.time,{formatLength:this.fo this._syncValueNode(); this.onValueChanged(this.getTime()); this.hideContainer(); -},onValueChanged:function(_de2){ +},onValueChanged:function(_de4){ },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 _de3=dojo.string.trim(this.inputNode.value); -if(_de3){ -var _de4=dojo.date.parse(_de3,{formatLength:this.formatLength,timePattern:this.displayFormat,selector:"timeOnly",locale:this.lang}); -if(_de4){ -this.setTime(_de4); +var _de5=dojo.string.trim(this.inputNode.value); +if(_de5){ +var _de6=dojo.date.parse(_de5,{formatLength:this.formatLength,timePattern:this.displayFormat,selector:"timeOnly",locale:this.lang}); +if(_de6){ +this.setTime(_de6); } }else{ -this.valueNode.value=_de3; +this.valueNode.value=_de5; } } -if(_de3){ +if(_de5){ this._updateText(); } },_syncValueNode:function(){ var time=this.timePicker.time; -var _de6; +var _de8; switch(this.saveFormat.toLowerCase()){ case "rfc": case "iso": case "": -_de6=dojo.date.toRfc3339(time,"timeOnly"); +_de8=dojo.date.toRfc3339(time,"timeOnly"); break; case "posix": case "unix": -_de6=Number(time); +_de8=Number(time); break; default: -_de6=dojo.date.format(time,{datePattern:this.saveFormat,selector:"timeOnly",locale:this.lang}); +_de8=dojo.date.format(time,{datePattern:this.saveFormat,selector:"timeOnly",locale:this.lang}); } -this.valueNode.value=_de6; -},destroy:function(_de7){ -this.timePicker.destroy(_de7); +this.valueNode.value=_de8; +},destroy:function(_de9){ +this.timePicker.destroy(_de9); dojo.widget.DropdownTimePicker.superclass.destroy.apply(this,arguments); }}); dojo.provide("struts.widget.StrutsTimePicker"); @@ -16702,19 +16711,19 @@ this.value.setHours(0,0,0,0); } },fillInTemplate:function(args,frag){ dojo.widget.DatePicker.superclass.fillInTemplate.apply(this,arguments); -var _dea=this.getFragNodeRef(frag); -dojo.html.copyStyle(this.domNode,_dea); +var _dec=this.getFragNodeRef(frag); +dojo.html.copyStyle(this.domNode,_dec); this.weekTemplate=dojo.dom.removeNode(this.calendarWeekTemplate); this._preInitUI(this.value?this.value:this.today,false,true); -var _deb=dojo.lang.unnest(dojo.date.getNames("days",this.dayWidth,"standAlone",this.lang)); +var _ded=dojo.lang.unnest(dojo.date.getNames("days",this.dayWidth,"standAlone",this.lang)); if(this.weekStartsOn>0){ for(var i=0;ithis.endDate){ -_df0=new Date((_df0this.endDate){ +_df2=new Date((_df2days){ +if(dojo.date.diff(_df5,this.endDate,dojo.date.dateParts.DAY)>days){ this._preInitUI(this.startDate,true,false); -_df3=new Date(this.firstDay); +_df5=new Date(this.firstDay); } -this.curMonth=new Date(_df3); -this.curMonth.setDate(_df3.getDate()+6); +this.curMonth=new Date(_df5); +this.curMonth.setDate(_df5.getDate()+6); this.curMonth.setDate(1); -var _df6=(_df3.getMonth()==this.curMonth.getMonth())?"current":"previous"; +var _df8=(_df5.getMonth()==this.curMonth.getMonth())?"current":"previous"; } -if(_df2){ +if(_df4){ this._initUI(days); } },_initUI:function(days){ @@ -16794,72 +16803,72 @@ dojo.dom.removeChildren(this.calendarDatesContainerNode); for(var i=0;ithis.endDate){ -_e03=_e05=_e07=false; +if(_e05&&d2>this.endDate){ +_e05=_e07=_e09=false; } -if(_e04&&add(d,DAY,-1)this.endDate){ -_e05=_e07=false; +if(_e07&&add(d2,DAY,1)>this.endDate){ +_e07=_e09=false; } -if(_e06&&add(d2,YEAR,-1)this.endDate){ -_e07=false; +if(_e09&&add(d,YEAR,1)>this.endDate){ +_e09=false; } } -function enableControl(node,_e0a){ -dojo.html.setVisibility(node,_e0a?"":"hidden"); +function enableControl(node,_e0c){ +dojo.html.setVisibility(node,_e0c?"":"hidden"); } -enableControl(this.decreaseWeekNode,_e02); -enableControl(this.increaseWeekNode,_e03); -enableControl(this.decreaseMonthNode,_e04); -enableControl(this.increaseMonthNode,_e05); -enableControl(this.previousYearLabelNode,_e06); -enableControl(this.nextYearLabelNode,_e07); +enableControl(this.decreaseWeekNode,_e04); +enableControl(this.increaseWeekNode,_e05); +enableControl(this.decreaseMonthNode,_e06); +enableControl(this.increaseMonthNode,_e07); +enableControl(this.previousYearLabelNode,_e08); +enableControl(this.nextYearLabelNode,_e09); },_incrementWeek:function(evt){ var d=new Date(this.firstDay); switch(evt.target){ case this.increaseWeekNode.getElementsByTagName("img").item(0): case this.increaseWeekNode: -var _e0d=dojo.date.add(d,dojo.date.dateParts.WEEK,1); -if(_e0dthis.startDate){ +if(_e12>this.startDate){ d=dojo.date.add(d,dojo.date.dateParts.MONTH,-1); }else{ -var _e12=true; +var _e14=true; } break; } -if(_e12){ +if(_e14){ d=new Date(this.startDate); }else{ -if(_e11){ +if(_e13){ d=new Date(this.endDate); } } this._preInitUI(d,false,true); },_incrementYear:function(evt){ var year=this.curMonth.getFullYear(); -var _e15=new Date(this.firstDay); +var _e17=new Date(this.firstDay); switch(evt.target){ case this.nextYearLabelNode: -_e15=dojo.date.add(_e15,dojo.date.dateParts.YEAR,1); -if(_e15this.startDate){ +_e17=dojo.date.add(_e17,dojo.date.dateParts.YEAR,-1); +if(_e17>this.startDate){ year--; }else{ -var _e17=true; +var _e19=true; } break; } var d; -if(_e17){ +if(_e19){ d=new Date(this.startDate); }else{ -if(_e16){ +if(_e18){ d=new Date(this.endDate); }else{ d=new Date(year,this.curMonth.getMonth(),1); @@ -16948,8 +16957,8 @@ evt.stopPropagation(); if(!this.staticDisplay){ this._incrementYear(evt); } -},_setMonthLabel:function(_e1c){ -this.monthLabelNode.innerHTML=dojo.date.getNames("months","wide","standAlone",this.lang)[_e1c]; +},_setMonthLabel:function(_e1e){ +this.monthLabelNode.innerHTML=dojo.date.getNames("months","wide","standAlone",this.lang)[_e1e]; },_setYearLabels:function(year){ var y=year-1; var that=this; @@ -16959,64 +16968,64 @@ that[n+"YearLabelNode"].innerHTML=dojo.date.format(new Date(y++,0),{formatLength f("previous"); f("current"); f("next"); -},_getDateClassName:function(date,_e22){ -var _e23=this.classNames[_e22]; +},_getDateClassName:function(date,_e24){ +var _e25=this.classNames[_e24]; if((!this.selectedIsUsed&&this.value)&&(Number(date)==Number(this.value))){ -_e23=this.classNames.selectedDate+" "+_e23; +_e25=this.classNames.selectedDate+" "+_e25; this.selectedIsUsed=true; } if((!this.currentIsUsed)&&(Number(date)==Number(this.today))){ -_e23=_e23+" "+this.classNames.currentDate; +_e25=_e25+" "+this.classNames.currentDate; this.currentIsUsed=true; } -return _e23; +return _e25; },onClick:function(evt){ dojo.event.browser.stopEvent(evt); },_handleUiClick:function(evt){ -var _e26=evt.target; -if(_e26.nodeType!=dojo.dom.ELEMENT_NODE){ -_e26=_e26.parentNode; +var _e28=evt.target; +if(_e28.nodeType!=dojo.dom.ELEMENT_NODE){ +_e28=_e28.parentNode; } dojo.event.browser.stopEvent(evt); this.selectedIsUsed=this.todayIsUsed=false; -if(dojo.html.hasClass(_e26,this.classNames["disabledPrevious"])||dojo.html.hasClass(_e26,this.classNames["disabledCurrent"])||dojo.html.hasClass(_e26,this.classNames["disabledNext"])){ +if(dojo.html.hasClass(_e28,this.classNames["disabledPrevious"])||dojo.html.hasClass(_e28,this.classNames["disabledCurrent"])||dojo.html.hasClass(_e28,this.classNames["disabledNext"])){ return; } -this.clickedNode=_e26; -this.setDate(new Date(Number(dojo.html.getAttribute(_e26,"djDateValue")))); +this.clickedNode=_e28; +this.setDate(new Date(Number(dojo.html.getAttribute(_e28,"djDateValue")))); },onValueChanged:function(date){ -},_isDisabledDate:function(_e28){ -if(_e28this.endDate){ +},_isDisabledDate:function(_e2a){ +if(_e2athis.endDate){ return true; } -return this.isDisabledDate(_e28,this.lang); -},isDisabledDate:function(_e29,_e2a){ +return this.isDisabledDate(_e2a,this.lang); +},isDisabledDate:function(_e2b,_e2c){ return false; -},_initFirstDay:function(_e2b,adj){ -var d=new Date(_e2b); +},_initFirstDay:function(_e2d,adj){ +var d=new Date(_e2d); if(!adj){ d.setDate(1); } d.setDate(d.getDate()-this._getAdjustedDay(d,this.weekStartsOn)); d.setHours(0,0,0,0); return d; -},_getAdjustedDay:function(_e2e){ +},_getAdjustedDay:function(_e30){ var days=[0,1,2,3,4,5,6]; if(this.weekStartsOn>0){ for(var i=0;i + dojo.addOnLoad(function() { + dojo.widget.createWidget("struts:BindEvent", { + "sources": "${parameters.sources?html}", + "events": "${parameters.events?html}", + <#if parameters.id?if_exists != ""> + "id": "${parameters.id?html}", + + <#if parameters.formId?if_exists != ""> + "formId": "${parameters.formId?html}", + + <#if parameters.formFilter?if_exists != ""> + "formFilter": "${parameters.formFilter?html}", + + <#if parameters.href?if_exists != ""> + "href": "${parameters.href}", + + <#if parameters.loadingText?if_exists != ""> + "loadingText" : "${parameters.loadingText?html}", + + <#if parameters.errorText?if_exists != ""> + "errorText" : "${parameters.errorText?html}", + + <#if parameters.executeScripts?exists> + "executeScripts": "${parameters.executeScripts?string?html}", + + <#if parameters.listenTopics?if_exists != ""> + "listenTopics": "${parameters.listenTopics?html}", + + <#if parameters.notifyTopics?if_exists != ""> + "notifyTopics": "${parameters.notifyTopics?html}", + + <#if parameters.targets?if_exists != ""> + "targets": "${parameters.targets?html}", + + <#if parameters.indicator?if_exists != ""> + "indicator": "${parameters.indicator?html}", + + <#if parameters.showErrorTransportText?exists> + "showError": "${parameters.showErrorTransportText?string?html}", + + <#if parameters.handler?if_exists != ""> + "handler": "${parameters.handler?html}" + + }); + }); + \ No newline at end of file diff --git a/plugins/dojo/src/main/resources/template/ajax/dojoRequire.js b/plugins/dojo/src/main/resources/template/ajax/dojoRequire.js index 822ca7126..988c43010 100644 --- a/plugins/dojo/src/main/resources/template/ajax/dojoRequire.js +++ b/plugins/dojo/src/main/resources/template/ajax/dojoRequire.js @@ -5,11 +5,6 @@ dojo.hostenv.setModulePrefix('struts', 'struts'); dojo.require('dojo.widget.*'); dojo.widget.manager.registerWidgetPackage('struts.widget'); -dojo.require("struts.widget.Bind"); -dojo.require("struts.widget.BindDiv"); -dojo.require("struts.widget.BindAnchor"); -dojo.require("struts.widget.ComboBox"); -dojo.require("struts.widget.StrutsTimePicker") -dojo.require("struts.widget.StrutsDatePicker") +dojo.require("struts.widget.*"); dojo.require("dojo.widget.Editor2"); dojo.hostenv.writeIncludes(); // not needed, but allows the Venkman debugger to work with the includes diff --git a/plugins/dojo/src/main/resources/template/ajax/submit.ftl b/plugins/dojo/src/main/resources/template/ajax/submit.ftl index b35eda110..0ce7d4eb3 100644 --- a/plugins/dojo/src/main/resources/template/ajax/submit.ftl +++ b/plugins/dojo/src/main/resources/template/ajax/submit.ftl @@ -1,5 +1,5 @@ <#if parameters.type?exists && parameters.type=="button"> - + <#include "/${parameters.templateDir}/ajax/ajax-common.ftl"/> <#include "/${parameters.templateDir}/simple/scripting-events.ftl"/> <#include "/${parameters.templateDir}/simple/common-attributes.ftl" /> @@ -9,7 +9,7 @@ /> <#else> <#if parameters.type?exists && parameters.type=="image"> - + <#if parameters.label?if_exists != ""> alt="${parameters.label?html}"<#rt/> @@ -17,7 +17,7 @@ src="${parameters.src?html}"<#rt/> <#else> - + <#if parameters.nameValue?if_exists != ""> value="${parameters.nameValue?html}"<#rt/> diff --git a/plugins/dojo/src/test/java/org/apache/struts2/dojo/views/jsp/ui/BindTest.java b/plugins/dojo/src/test/java/org/apache/struts2/dojo/views/jsp/ui/BindTest.java new file mode 100644 index 000000000..e8976494e --- /dev/null +++ b/plugins/dojo/src/test/java/org/apache/struts2/dojo/views/jsp/ui/BindTest.java @@ -0,0 +1,33 @@ +package org.apache.struts2.dojo.views.jsp.ui; + +import org.apache.struts2.dojo.TestAction; + +public class BindTest extends AbstractUITagTest { + public void testSubmit() throws Exception { + TestAction testAction = (TestAction) action; + testAction.setFoo("bar"); + + BindTag tag = new BindTag(); + tag.setPageContext(pageContext); + + tag.setId("a"); + tag.setHref("b"); + tag.setLoadingText("c"); + tag.setErrorText("d"); + tag.setListenTopics("e"); + tag.setBeforeNotifyTopics("f"); + tag.setAfterNotifyTopics("g"); + tag.setHandler("h"); + tag.setLabel("i"); + tag.setNotifyTopics("k"); + tag.setIndicator("l"); + tag.setShowLoadingText("true"); + tag.setErrorNotifyTopics("m"); + tag.setSources("n"); + tag.setEvents("o"); + tag.doStartTag(); + tag.doEndTag(); + + verify(BindTest.class.getResource("Bind-1.txt")); + } +} diff --git a/plugins/dojo/src/test/resources/org/apache/struts2/dojo/views/jsp/ui/Bind-1.txt b/plugins/dojo/src/test/resources/org/apache/struts2/dojo/views/jsp/ui/Bind-1.txt new file mode 100644 index 000000000..a69b122b8 --- /dev/null +++ b/plugins/dojo/src/test/resources/org/apache/struts2/dojo/views/jsp/ui/Bind-1.txt @@ -0,0 +1,17 @@ + \ No newline at end of file diff --git a/plugins/dojo/src/test/resources/org/apache/struts2/dojo/views/jsp/ui/submit-ajax-1.txt b/plugins/dojo/src/test/resources/org/apache/struts2/dojo/views/jsp/ui/submit-ajax-1.txt index d13a55632..b9321d6d3 100644 --- a/plugins/dojo/src/test/resources/org/apache/struts2/dojo/views/jsp/ui/submit-ajax-1.txt +++ b/plugins/dojo/src/test/resources/org/apache/struts2/dojo/views/jsp/ui/submit-ajax-1.txt @@ -1,7 +1,7 @@