From 65131d66a5d94cc27fcc82853ed5a6465069a9a3 Mon Sep 17 00:00:00 2001
From: Musachy Barroso <musachy@apache.org>
Date: Tue, 6 Mar 2007 01:11:06 +0000
Subject: [PATCH] Move classes to "dojo" package so they don't conflict with
 the ones from core

git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@514940 13f79535-47bb-0310-9956-ffa450edef68
---
 .../components/AbstractRemoteCallUIBean.java  |     8 +-
 .../struts2/{ => dojo}/components/Anchor.java |     4 +-
 .../{ => dojo}/components/Autocompleter.java  |    10 +-
 .../{ => dojo}/components/DateTimePicker.java |    10 +-
 .../struts2/{ => dojo}/components/Div.java    |     4 +-
 .../components/RemoteUICallBean.java          |     2 +-
 .../struts2/{ => dojo}/components/Submit.java |    10 +-
 .../{ => dojo}/components/TabbedPanel.java    |    10 +-
 .../struts2/{ => dojo}/components/Tree.java   |     5 +-
 .../{ => dojo}/components/TreeNode.java       |     5 +-
 .../{ => dojo}/views/DojoTagLibrary.java      |    19 +-
 .../freemarker/tags/AutocompleterModel.java   |     5 +-
 .../freemarker/tags/DateTimePickerModel.java  |     5 +-
 .../views/freemarker/tags/DojoModels.java     |     6 +-
 .../freemarker/tags/TabbedPanelModel.java     |     5 +-
 .../views/freemarker/tags/TreeModel.java      |     5 +-
 .../views/freemarker/tags/TreeNodeModel.java  |     5 +-
 .../views/jsp/ui/AbstractRemoteCallUITag.java |     5 +-
 .../{ => dojo}/views/jsp/ui/AnchorTag.java    |     6 +-
 .../views/jsp/ui/AutocompleterTag.java        |     5 +-
 .../views/jsp/ui/DateTimePickerTag.java       |     5 +-
 .../{ => dojo}/views/jsp/ui/DivTag.java       |     4 +-
 .../{ => dojo}/views/jsp/ui/SubmitTag.java    |     5 +-
 .../views/jsp/ui/TabbedPanelTag.java          |     5 +-
 .../{ => dojo}/views/jsp/ui/TreeNodeTag.java  |     5 +-
 .../{ => dojo}/views/jsp/ui/TreeTag.java      |     5 +-
 .../velocity/components/AnchorDirective.java  |    47 +
 .../components/AutocompleterDirective.java    |     6 +-
 .../components/DateTimePickerDirective.java   |     5 +-
 .../velocity/components/DivDirective.java     |     5 +-
 .../velocity/components/SubmitDirective.java  |    43 +
 .../components/TabbedPanelDirective.java      |     5 +-
 .../velocity/components/TreeDirective.java    |     5 +-
 .../components/TreeNodeDirective.java         |     5 +-
 .../org/apache/struts2/static/dojo/dojo.js    | 27492 ++++++++++------
 .../src/main/resources/template/ajax/a.ftl    |     1 -
 .../apache/struts2/{ => dojo}/TestAction.java |     2 +-
 .../views/jsp/ui/AbstractTagTest.java         |     4 +-
 .../views/jsp/ui/AbstractUITagTest.java       |     3 +-
 .../{ => dojo}/views/jsp/ui/AnchorTest.java   |     7 +-
 .../views/jsp/ui/AutocompleterTest.java       |     7 +-
 .../{ => dojo}/views/jsp/ui/Category.java     |     2 +-
 .../views/jsp/ui/DateTimePickerTagTest.java   |    26 +-
 .../{ => dojo}/views/jsp/ui/DivTest.java      |    23 +-
 .../jsp/ui/StrutsMockHttpServletRequest.java  |     2 +-
 .../jsp/ui/StrutsMockHttpServletResponse.java |     2 +-
 .../views/jsp/ui/StrutsMockHttpSession.java   |     2 +-
 .../views/jsp/ui/StrutsMockJspWriter.java     |     2 +-
 .../views/jsp/ui/StrutsMockPageContext.java   |     2 +-
 .../jsp/ui/StrutsMockServletContext.java      |     2 +-
 .../views/jsp/ui/SubmitAjaxTest.java          |    24 +-
 .../{ => dojo}/views/jsp/ui/TreeTest.java     |     6 +-
 .../views/jsp/ui/Autocompleter-1.txt          |     0
 .../views/jsp/ui/Autocompleter-2.txt          |     0
 .../views/jsp/ui/DateTimePickerTagTest-1.txt  |     0
 .../{ => dojo}/views/jsp/ui/TabbedPanel-1.txt |     0
 .../{ => dojo}/views/jsp/ui/TabbedPanel-2.txt |     0
 .../{ => dojo}/views/jsp/ui/TabbedPanel-3.txt |     0
 .../{ => dojo}/views/jsp/ui/TabbedPanel-4.txt |     0
 .../struts2/{ => dojo}/views/jsp/ui/div-1.txt |     0
 .../{ => dojo}/views/jsp/ui/href-1.txt        |     0
 .../{ => dojo}/views/jsp/ui/submit-ajax-1.txt |     0
 .../{ => dojo}/views/jsp/ui/submit-ajax-2.txt |     0
 .../{ => dojo}/views/jsp/ui/submit-ajax-3.txt |     0
 .../{ => dojo}/views/jsp/ui/tree-1.txt        |     0
 .../{ => dojo}/views/jsp/ui/tree-2.txt        |     0
 66 files changed, 16987 insertions(+), 10906 deletions(-)
 rename plugins/dojo/src/main/java/org/apache/struts2/{ => dojo}/components/AbstractRemoteCallUIBean.java (97%)
 rename plugins/dojo/src/main/java/org/apache/struts2/{ => dojo}/components/Anchor.java (93%)
 rename plugins/dojo/src/main/java/org/apache/struts2/{ => dojo}/components/Autocompleter.java (97%)
 rename plugins/dojo/src/main/java/org/apache/struts2/{ => dojo}/components/DateTimePicker.java (97%)
 rename plugins/dojo/src/main/java/org/apache/struts2/{ => dojo}/components/Div.java (96%)
 rename plugins/dojo/src/main/java/org/apache/struts2/{ => dojo}/components/RemoteUICallBean.java (97%)
 rename plugins/dojo/src/main/java/org/apache/struts2/{ => dojo}/components/Submit.java (97%)
 rename plugins/dojo/src/main/java/org/apache/struts2/{ => dojo}/components/TabbedPanel.java (94%)
 rename plugins/dojo/src/main/java/org/apache/struts2/{ => dojo}/components/Tree.java (98%)
 rename plugins/dojo/src/main/java/org/apache/struts2/{ => dojo}/components/TreeNode.java (94%)
 rename plugins/dojo/src/main/java/org/apache/struts2/{ => dojo}/views/DojoTagLibrary.java (58%)
 rename plugins/dojo/src/main/java/org/apache/struts2/{ => dojo}/views/freemarker/tags/AutocompleterModel.java (89%)
 rename plugins/dojo/src/main/java/org/apache/struts2/{ => dojo}/views/freemarker/tags/DateTimePickerModel.java (87%)
 rename plugins/dojo/src/main/java/org/apache/struts2/{ => dojo}/views/freemarker/tags/DojoModels.java (90%)
 rename plugins/dojo/src/main/java/org/apache/struts2/{ => dojo}/views/freemarker/tags/TabbedPanelModel.java (89%)
 rename plugins/dojo/src/main/java/org/apache/struts2/{ => dojo}/views/freemarker/tags/TreeModel.java (89%)
 rename plugins/dojo/src/main/java/org/apache/struts2/{ => dojo}/views/freemarker/tags/TreeNodeModel.java (89%)
 rename plugins/dojo/src/main/java/org/apache/struts2/{ => dojo}/views/jsp/ui/AbstractRemoteCallUITag.java (95%)
 rename plugins/dojo/src/main/java/org/apache/struts2/{ => dojo}/views/jsp/ui/AnchorTag.java (91%)
 rename plugins/dojo/src/main/java/org/apache/struts2/{ => dojo}/views/jsp/ui/AutocompleterTag.java (97%)
 rename plugins/dojo/src/main/java/org/apache/struts2/{ => dojo}/views/jsp/ui/DateTimePickerTag.java (96%)
 rename plugins/dojo/src/main/java/org/apache/struts2/{ => dojo}/views/jsp/ui/DivTag.java (96%)
 rename plugins/dojo/src/main/java/org/apache/struts2/{ => dojo}/views/jsp/ui/SubmitTag.java (97%)
 rename plugins/dojo/src/main/java/org/apache/struts2/{ => dojo}/views/jsp/ui/TabbedPanelTag.java (93%)
 rename plugins/dojo/src/main/java/org/apache/struts2/{ => dojo}/views/jsp/ui/TreeNodeTag.java (91%)
 rename plugins/dojo/src/main/java/org/apache/struts2/{ => dojo}/views/jsp/ui/TreeTag.java (98%)
 create mode 100644 plugins/dojo/src/main/java/org/apache/struts2/dojo/views/velocity/components/AnchorDirective.java
 rename plugins/dojo/src/main/java/org/apache/struts2/{ => dojo}/views/velocity/components/AutocompleterDirective.java (88%)
 rename plugins/dojo/src/main/java/org/apache/struts2/{ => dojo}/views/velocity/components/DateTimePickerDirective.java (86%)
 rename plugins/dojo/src/main/java/org/apache/struts2/{ => dojo}/views/velocity/components/DivDirective.java (88%)
 create mode 100644 plugins/dojo/src/main/java/org/apache/struts2/dojo/views/velocity/components/SubmitDirective.java
 rename plugins/dojo/src/main/java/org/apache/struts2/{ => dojo}/views/velocity/components/TabbedPanelDirective.java (88%)
 rename plugins/dojo/src/main/java/org/apache/struts2/{ => dojo}/views/velocity/components/TreeDirective.java (88%)
 rename plugins/dojo/src/main/java/org/apache/struts2/{ => dojo}/views/velocity/components/TreeNodeDirective.java (88%)
 rename plugins/dojo/src/test/java/org/apache/struts2/{ => dojo}/TestAction.java (98%)
 rename plugins/dojo/src/test/java/org/apache/struts2/{ => dojo}/views/jsp/ui/AbstractTagTest.java (98%)
 rename plugins/dojo/src/test/java/org/apache/struts2/{ => dojo}/views/jsp/ui/AbstractUITagTest.java (99%)
 rename plugins/dojo/src/test/java/org/apache/struts2/{ => dojo}/views/jsp/ui/AnchorTest.java (91%)
 rename plugins/dojo/src/test/java/org/apache/struts2/{ => dojo}/views/jsp/ui/AutocompleterTest.java (94%)
 rename plugins/dojo/src/test/java/org/apache/struts2/{ => dojo}/views/jsp/ui/Category.java (98%)
 rename plugins/dojo/src/test/java/org/apache/struts2/{ => dojo}/views/jsp/ui/DateTimePickerTagTest.java (64%)
 rename plugins/dojo/src/test/java/org/apache/struts2/{ => dojo}/views/jsp/ui/DivTest.java (68%)
 rename plugins/dojo/src/test/java/org/apache/struts2/{ => dojo}/views/jsp/ui/StrutsMockHttpServletRequest.java (99%)
 rename plugins/dojo/src/test/java/org/apache/struts2/{ => dojo}/views/jsp/ui/StrutsMockHttpServletResponse.java (98%)
 rename plugins/dojo/src/test/java/org/apache/struts2/{ => dojo}/views/jsp/ui/StrutsMockHttpSession.java (97%)
 rename plugins/dojo/src/test/java/org/apache/struts2/{ => dojo}/views/jsp/ui/StrutsMockJspWriter.java (98%)
 rename plugins/dojo/src/test/java/org/apache/struts2/{ => dojo}/views/jsp/ui/StrutsMockPageContext.java (98%)
 rename plugins/dojo/src/test/java/org/apache/struts2/{ => dojo}/views/jsp/ui/StrutsMockServletContext.java (98%)
 rename plugins/dojo/src/test/java/org/apache/struts2/{ => dojo}/views/jsp/ui/SubmitAjaxTest.java (77%)
 rename plugins/dojo/src/test/java/org/apache/struts2/{ => dojo}/views/jsp/ui/TreeTest.java (96%)
 rename plugins/dojo/src/test/resources/org/apache/struts2/{ => dojo}/views/jsp/ui/Autocompleter-1.txt (100%)
 rename plugins/dojo/src/test/resources/org/apache/struts2/{ => dojo}/views/jsp/ui/Autocompleter-2.txt (100%)
 rename plugins/dojo/src/test/resources/org/apache/struts2/{ => dojo}/views/jsp/ui/DateTimePickerTagTest-1.txt (100%)
 rename plugins/dojo/src/test/resources/org/apache/struts2/{ => dojo}/views/jsp/ui/TabbedPanel-1.txt (100%)
 rename plugins/dojo/src/test/resources/org/apache/struts2/{ => dojo}/views/jsp/ui/TabbedPanel-2.txt (100%)
 rename plugins/dojo/src/test/resources/org/apache/struts2/{ => dojo}/views/jsp/ui/TabbedPanel-3.txt (100%)
 rename plugins/dojo/src/test/resources/org/apache/struts2/{ => dojo}/views/jsp/ui/TabbedPanel-4.txt (100%)
 rename plugins/dojo/src/test/resources/org/apache/struts2/{ => dojo}/views/jsp/ui/div-1.txt (100%)
 rename plugins/dojo/src/test/resources/org/apache/struts2/{ => dojo}/views/jsp/ui/href-1.txt (100%)
 rename plugins/dojo/src/test/resources/org/apache/struts2/{ => dojo}/views/jsp/ui/submit-ajax-1.txt (100%)
 rename plugins/dojo/src/test/resources/org/apache/struts2/{ => dojo}/views/jsp/ui/submit-ajax-2.txt (100%)
 rename plugins/dojo/src/test/resources/org/apache/struts2/{ => dojo}/views/jsp/ui/submit-ajax-3.txt (100%)
 rename plugins/dojo/src/test/resources/org/apache/struts2/{ => dojo}/views/jsp/ui/tree-1.txt (100%)
 rename plugins/dojo/src/test/resources/org/apache/struts2/{ => dojo}/views/jsp/ui/tree-2.txt (100%)

diff --git a/plugins/dojo/src/main/java/org/apache/struts2/components/AbstractRemoteCallUIBean.java b/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/AbstractRemoteCallUIBean.java
similarity index 97%
rename from plugins/dojo/src/main/java/org/apache/struts2/components/AbstractRemoteCallUIBean.java
rename to plugins/dojo/src/main/java/org/apache/struts2/dojo/components/AbstractRemoteCallUIBean.java
index 6a5ae4ca7..08cddca7e 100644
--- a/plugins/dojo/src/main/java/org/apache/struts2/components/AbstractRemoteCallUIBean.java
+++ b/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/AbstractRemoteCallUIBean.java
@@ -15,11 +15,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.struts2.components;
+package org.apache.struts2.dojo.components;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
+import org.apache.struts2.components.ClosingUIBean;
 import org.apache.struts2.views.annotations.StrutsTagAttribute;
 import org.apache.struts2.views.annotations.StrutsTagSkipInheritance;
 
@@ -88,6 +89,11 @@ public abstract class AbstractRemoteCallUIBean extends ClosingUIBean implements
     }
 
 
+    @Override
+    public String getTheme() {
+        return "ajax";
+    }
+
     @StrutsTagAttribute(description="Topic that will trigger the remote call")
     public void setListenTopics(String listenTopics) {
         this.listenTopics = listenTopics;
diff --git a/plugins/dojo/src/main/java/org/apache/struts2/components/Anchor.java b/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/Anchor.java
similarity index 93%
rename from plugins/dojo/src/main/java/org/apache/struts2/components/Anchor.java
rename to plugins/dojo/src/main/java/org/apache/struts2/dojo/components/Anchor.java
index 51e11e6a2..34e4491a8 100644
--- a/plugins/dojo/src/main/java/org/apache/struts2/components/Anchor.java
+++ b/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/Anchor.java
@@ -18,7 +18,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.struts2.components;
+package org.apache.struts2.dojo.components;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
@@ -80,7 +80,7 @@ import com.opensymphony.xwork2.util.ValueStack;
  * </pre>
  *
  */
-@StrutsTag(name="a", tldTagClass="org.apache.struts2.views.jsp.ui.AnchorTag", description="Render a HTML href element that when clicked can optionally call a URL via remote XMLHttpRequest and updates its targets")
+@StrutsTag(name="a", tldTagClass="org.apache.struts2.dojo.views.jsp.ui.AnchorTag", description="Render a HTML href element that when clicked can optionally call a URL via remote XMLHttpRequest and updates its targets")
 public class Anchor extends AbstractRemoteCallUIBean {
     public static final String OPEN_TEMPLATE = "a";
     public static final String TEMPLATE = "a-close";
diff --git a/plugins/dojo/src/main/java/org/apache/struts2/components/Autocompleter.java b/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/Autocompleter.java
similarity index 97%
rename from plugins/dojo/src/main/java/org/apache/struts2/components/Autocompleter.java
rename to plugins/dojo/src/main/java/org/apache/struts2/dojo/components/Autocompleter.java
index 57bf634c5..c2e1f8dd2 100644
--- a/plugins/dojo/src/main/java/org/apache/struts2/components/Autocompleter.java
+++ b/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/Autocompleter.java
@@ -18,11 +18,12 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.struts2.components;
+package org.apache.struts2.dojo.components;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
+import org.apache.struts2.components.ComboBox;
 import org.apache.struts2.views.annotations.StrutsTag;
 import org.apache.struts2.views.annotations.StrutsTagAttribute;
 import org.apache.struts2.views.annotations.StrutsTagSkipInheritance;
@@ -45,7 +46,7 @@ import com.opensymphony.xwork2.util.ValueStack;
  *<br/>
  *<!-- END SNIPPET: example -->
  */
-@StrutsTag(name="autocompleter", tldTagClass="org.apache.struts2.views.jsp.ui.AutocompleterTag", description="Renders a combobox with autocomplete and AJAX capabilities")
+@StrutsTag(name="autocompleter", tldTagClass="org.apache.struts2.dojo.views.jsp.ui.AutocompleterTag", description="Renders a combobox with autocomplete and AJAX capabilities")
 @StrutsTagSkipInheritance
 public class Autocompleter extends ComboBox {
     public static final String TEMPLATE = "autocompleter";
@@ -146,6 +147,11 @@ public class Autocompleter extends ComboBox {
         addParameter("key", findString(keyNameExpr));
     }
 
+    @Override
+    public String getTheme() {
+        return "ajax";
+    }
+    
     protected Object findListValue() {
         return (list != null) ? findValue(list, Object.class) : null;
     }
diff --git a/plugins/dojo/src/main/java/org/apache/struts2/components/DateTimePicker.java b/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/DateTimePicker.java
similarity index 97%
rename from plugins/dojo/src/main/java/org/apache/struts2/components/DateTimePicker.java
rename to plugins/dojo/src/main/java/org/apache/struts2/dojo/components/DateTimePicker.java
index f1e08fe8f..a40654952 100644
--- a/plugins/dojo/src/main/java/org/apache/struts2/components/DateTimePicker.java
+++ b/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/DateTimePicker.java
@@ -18,7 +18,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.struts2.components;
+package org.apache.struts2.dojo.components;
 
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
@@ -29,6 +29,7 @@ import javax.servlet.http.HttpServletResponse;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+import org.apache.struts2.components.UIBean;
 import org.apache.struts2.views.annotations.StrutsTag;
 import org.apache.struts2.views.annotations.StrutsTagAttribute;
 import org.apache.struts2.views.annotations.StrutsTagSkipInheritance;
@@ -126,7 +127,7 @@ import com.opensymphony.xwork2.util.ValueStack;
  * </pre>
  *
  */
-@StrutsTag(name="datetimepicker", tldTagClass="org.apache.struts2.views.jsp.ui.DateTimePickerTag", description="Render datetimepicker")
+@StrutsTag(name="datetimepicker", tldTagClass="org.apache.struts2.dojo.views.jsp.ui.DateTimePickerTag", description="Render datetimepicker")
 @StrutsTagSkipInheritance
 public class DateTimePicker extends UIBean {
 
@@ -213,6 +214,11 @@ public class DateTimePicker extends UIBean {
         }
     }
 
+    @Override
+    public String getTheme() {
+        return "ajax";
+    }
+    
     @StrutsTagAttribute(description="If true, weekly size of calendar changes to acomodate the month if false," +
                 " 42 day format is used", type="Boolean", defaultValue="false")
     public void setAdjustWeeks(String adjustWeeks) {
diff --git a/plugins/dojo/src/main/java/org/apache/struts2/components/Div.java b/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/Div.java
similarity index 96%
rename from plugins/dojo/src/main/java/org/apache/struts2/components/Div.java
rename to plugins/dojo/src/main/java/org/apache/struts2/dojo/components/Div.java
index f6ac44ee7..f01791f91 100644
--- a/plugins/dojo/src/main/java/org/apache/struts2/components/Div.java
+++ b/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/Div.java
@@ -18,7 +18,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.struts2.components;
+package org.apache.struts2.dojo.components;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
@@ -58,7 +58,7 @@ import com.opensymphony.xwork2.util.ValueStack;
  * </p>
  *
  */
-@StrutsTag(name="div", tldTagClass="org.apache.struts2.views.jsp.ui.DivTag", description="Render HTML div providing content from remote call via AJAX")
+@StrutsTag(name="div", tldTagClass="org.apache.struts2.dojo.views.jsp.ui.DivTag", description="Render HTML div providing content from remote call via AJAX")
 public class Div extends AbstractRemoteCallUIBean {
 
     public static final String TEMPLATE = "div";
diff --git a/plugins/dojo/src/main/java/org/apache/struts2/components/RemoteUICallBean.java b/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/RemoteUICallBean.java
similarity index 97%
rename from plugins/dojo/src/main/java/org/apache/struts2/components/RemoteUICallBean.java
rename to plugins/dojo/src/main/java/org/apache/struts2/dojo/components/RemoteUICallBean.java
index 7e040e3b4..2f7524dd5 100644
--- a/plugins/dojo/src/main/java/org/apache/struts2/components/RemoteUICallBean.java
+++ b/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/RemoteUICallBean.java
@@ -18,7 +18,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.struts2.components;
+package org.apache.struts2.dojo.components;
 
 
 public interface RemoteUICallBean {
diff --git a/plugins/dojo/src/main/java/org/apache/struts2/components/Submit.java b/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/Submit.java
similarity index 97%
rename from plugins/dojo/src/main/java/org/apache/struts2/components/Submit.java
rename to plugins/dojo/src/main/java/org/apache/struts2/dojo/components/Submit.java
index c6d1a0ef2..67a0f7573 100644
--- a/plugins/dojo/src/main/java/org/apache/struts2/components/Submit.java
+++ b/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/Submit.java
@@ -18,7 +18,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.struts2.components;
+package org.apache.struts2.dojo.components;
 
 import java.io.Writer;
 
@@ -27,6 +27,7 @@ import javax.servlet.http.HttpServletResponse;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+import org.apache.struts2.components.FormButton;
 import org.apache.struts2.views.annotations.StrutsTag;
 import org.apache.struts2.views.annotations.StrutsTagAttribute;
 import org.apache.struts2.views.annotations.StrutsTagSkipInheritance;
@@ -91,7 +92,7 @@ import com.opensymphony.xwork2.util.ValueStack;
  * </pre>
  *
  */
-@StrutsTag(name="submit", tldTagClass="org.apache.struts2.views.jsp.ui.SubmitTag", description="Render a submit button")
+@StrutsTag(name="submit", tldTagClass="org.apache.struts2.dojo.views.jsp.ui.SubmitTag", description="Render a submit button")
 @StrutsTagSkipInheritance
 public class Submit extends FormButton implements RemoteUICallBean {
     
@@ -175,6 +176,11 @@ public class Submit extends FormButton implements RemoteUICallBean {
             addParameter("showLoadingText", findString(showLoadingText));
     }
 
+    @Override
+    public String getTheme() {
+        return "ajax";
+    }
+    
     /**
      * Indicate whether the concrete button supports the type "image".
      *
diff --git a/plugins/dojo/src/main/java/org/apache/struts2/components/TabbedPanel.java b/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/TabbedPanel.java
similarity index 94%
rename from plugins/dojo/src/main/java/org/apache/struts2/components/TabbedPanel.java
rename to plugins/dojo/src/main/java/org/apache/struts2/dojo/components/TabbedPanel.java
index abc08d838..0ee307b1c 100644
--- a/plugins/dojo/src/main/java/org/apache/struts2/components/TabbedPanel.java
+++ b/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/TabbedPanel.java
@@ -18,11 +18,12 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.struts2.components;
+package org.apache.struts2.dojo.components;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
+import org.apache.struts2.components.ClosingUIBean;
 import org.apache.struts2.views.annotations.StrutsTag;
 import org.apache.struts2.views.annotations.StrutsTagAttribute;
 import org.apache.struts2.views.annotations.StrutsTagSkipInheritance;
@@ -58,7 +59,7 @@ import com.opensymphony.xwork2.util.ValueStack;
  * </pre>
  *
  */
-@StrutsTag(name="tabbedPanel", tldTagClass="org.apache.struts2.views.jsp.ui.TabbedPanelTag", description="Render a tabbedPanel widget.")
+@StrutsTag(name="tabbedPanel", tldTagClass="org.apache.struts2.dojo.views.jsp.ui.TabbedPanelTag", description="Render a tabbedPanel widget.")
 @StrutsTagSkipInheritance
 public class TabbedPanel extends ClosingUIBean {
     public static final String TEMPLATE = "tabbedpanel";
@@ -96,6 +97,11 @@ public class TabbedPanel extends ClosingUIBean {
             addParameter("templateCssPath", findString(templateCssPath));
     }
 
+    @Override
+    public String getTheme() {
+        return "ajax";
+    }
+    
     public String getDefaultOpenTemplate() {
         return TEMPLATE;
     }
diff --git a/plugins/dojo/src/main/java/org/apache/struts2/components/Tree.java b/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/Tree.java
similarity index 98%
rename from plugins/dojo/src/main/java/org/apache/struts2/components/Tree.java
rename to plugins/dojo/src/main/java/org/apache/struts2/dojo/components/Tree.java
index 29ddfc378..c35a38e67 100644
--- a/plugins/dojo/src/main/java/org/apache/struts2/components/Tree.java
+++ b/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/Tree.java
@@ -18,13 +18,14 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.struts2.components;
+package org.apache.struts2.dojo.components;
 
 import java.io.Writer;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
+import org.apache.struts2.components.ClosingUIBean;
 import org.apache.struts2.views.annotations.StrutsTag;
 import org.apache.struts2.views.annotations.StrutsTagAttribute;
 import org.apache.struts2.views.annotations.StrutsTagSkipInheritance;
@@ -68,7 +69,7 @@ import com.opensymphony.xwork2.util.ValueStack;
  * </pre>
  *
  */
-@StrutsTag(name="tree", tldTagClass="org.apache.struts2.views.jsp.ui.TreeTag", description="Render a tree widget.")
+@StrutsTag(name="tree", tldTagClass="org.apache.struts2.dojo.views.jsp.ui.TreeTag", description="Render a tree widget.")
 @StrutsTagSkipInheritance
 public class Tree extends ClosingUIBean {
 
diff --git a/plugins/dojo/src/main/java/org/apache/struts2/components/TreeNode.java b/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/TreeNode.java
similarity index 94%
rename from plugins/dojo/src/main/java/org/apache/struts2/components/TreeNode.java
rename to plugins/dojo/src/main/java/org/apache/struts2/dojo/components/TreeNode.java
index 077f727ee..b9b93e16e 100644
--- a/plugins/dojo/src/main/java/org/apache/struts2/components/TreeNode.java
+++ b/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/TreeNode.java
@@ -18,11 +18,12 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.struts2.components;
+package org.apache.struts2.dojo.components;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
+import org.apache.struts2.components.ClosingUIBean;
 import org.apache.struts2.views.annotations.StrutsTag;
 import org.apache.struts2.views.annotations.StrutsTagAttribute;
 import org.apache.struts2.views.annotations.StrutsTagSkipInheritance;
@@ -80,7 +81,7 @@ import com.opensymphony.xwork2.util.ValueStack;
  * </pre>
  *
  */
-@StrutsTag(name="treenode", tldTagClass="org.apache.struts2.views.jsp.ui.TreeNodeTag", description="Render a tree node within a tree widget.")
+@StrutsTag(name="treenode", tldTagClass="org.apache.struts2.dojo.views.jsp.ui.TreeNodeTag", description="Render a tree node within a tree widget.")
 @StrutsTagSkipInheritance
 public class TreeNode extends ClosingUIBean {
     private static final String TEMPLATE = "treenode-close";
diff --git a/plugins/dojo/src/main/java/org/apache/struts2/views/DojoTagLibrary.java b/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/DojoTagLibrary.java
similarity index 58%
rename from plugins/dojo/src/main/java/org/apache/struts2/views/DojoTagLibrary.java
rename to plugins/dojo/src/main/java/org/apache/struts2/dojo/views/DojoTagLibrary.java
index 829e3dc8f..b49864909 100644
--- a/plugins/dojo/src/main/java/org/apache/struts2/views/DojoTagLibrary.java
+++ b/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/DojoTagLibrary.java
@@ -1,4 +1,4 @@
-package org.apache.struts2.views;
+package org.apache.struts2.dojo.views;
 
 import java.util.Arrays;
 import java.util.List;
@@ -6,15 +6,16 @@ import java.util.List;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
+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.DateTimePickerDirective;
+import org.apache.struts2.dojo.views.velocity.components.DivDirective;
+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;
+import org.apache.struts2.dojo.views.velocity.components.TreeNodeDirective;
+import org.apache.struts2.views.TagLibrary;
 import org.apache.struts2.views.freemarker.tags.StrutsModels;
-import org.apache.struts2.views.velocity.components.AnchorDirective;
-import org.apache.struts2.views.velocity.components.AutocompleterDirective;
-import org.apache.struts2.views.velocity.components.DateTimePickerDirective;
-import org.apache.struts2.views.velocity.components.DivDirective;
-import org.apache.struts2.views.velocity.components.SubmitDirective;
-import org.apache.struts2.views.velocity.components.TabbedPanelDirective;
-import org.apache.struts2.views.velocity.components.TreeDirective;
-import org.apache.struts2.views.velocity.components.TreeNodeDirective;
 
 import com.opensymphony.xwork2.util.ValueStack;
 
diff --git a/plugins/dojo/src/main/java/org/apache/struts2/views/freemarker/tags/AutocompleterModel.java b/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/freemarker/tags/AutocompleterModel.java
similarity index 89%
rename from plugins/dojo/src/main/java/org/apache/struts2/views/freemarker/tags/AutocompleterModel.java
rename to plugins/dojo/src/main/java/org/apache/struts2/dojo/views/freemarker/tags/AutocompleterModel.java
index 38d139003..3c2784a6b 100644
--- a/plugins/dojo/src/main/java/org/apache/struts2/views/freemarker/tags/AutocompleterModel.java
+++ b/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/freemarker/tags/AutocompleterModel.java
@@ -18,13 +18,14 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.struts2.views.freemarker.tags;
+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.components.Autocompleter;
+import org.apache.struts2.dojo.components.Autocompleter;
+import org.apache.struts2.views.freemarker.tags.TagModel;
 
 import com.opensymphony.xwork2.util.ValueStack;
 
diff --git a/plugins/dojo/src/main/java/org/apache/struts2/views/freemarker/tags/DateTimePickerModel.java b/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/freemarker/tags/DateTimePickerModel.java
similarity index 87%
rename from plugins/dojo/src/main/java/org/apache/struts2/views/freemarker/tags/DateTimePickerModel.java
rename to plugins/dojo/src/main/java/org/apache/struts2/dojo/views/freemarker/tags/DateTimePickerModel.java
index 18bd2a22a..07e368ff8 100644
--- a/plugins/dojo/src/main/java/org/apache/struts2/views/freemarker/tags/DateTimePickerModel.java
+++ b/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/freemarker/tags/DateTimePickerModel.java
@@ -15,13 +15,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.struts2.views.freemarker.tags;
+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.components.DateTimePicker;
+import org.apache.struts2.dojo.components.DateTimePicker;
+import org.apache.struts2.views.freemarker.tags.TextFieldModel;
 
 import com.opensymphony.xwork2.util.ValueStack;
 
diff --git a/plugins/dojo/src/main/java/org/apache/struts2/views/freemarker/tags/DojoModels.java b/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/freemarker/tags/DojoModels.java
similarity index 90%
rename from plugins/dojo/src/main/java/org/apache/struts2/views/freemarker/tags/DojoModels.java
rename to plugins/dojo/src/main/java/org/apache/struts2/dojo/views/freemarker/tags/DojoModels.java
index 72d3447c3..1281eb6e6 100644
--- a/plugins/dojo/src/main/java/org/apache/struts2/views/freemarker/tags/DojoModels.java
+++ b/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/freemarker/tags/DojoModels.java
@@ -1,8 +1,12 @@
-package org.apache.struts2.views.freemarker.tags;
+package org.apache.struts2.dojo.views.freemarker.tags;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
+import org.apache.struts2.views.freemarker.tags.AnchorModel;
+import org.apache.struts2.views.freemarker.tags.DivModel;
+import org.apache.struts2.views.freemarker.tags.SubmitModel;
+
 import com.opensymphony.xwork2.util.ValueStack;
 
 public class DojoModels {
diff --git a/plugins/dojo/src/main/java/org/apache/struts2/views/freemarker/tags/TabbedPanelModel.java b/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/freemarker/tags/TabbedPanelModel.java
similarity index 89%
rename from plugins/dojo/src/main/java/org/apache/struts2/views/freemarker/tags/TabbedPanelModel.java
rename to plugins/dojo/src/main/java/org/apache/struts2/dojo/views/freemarker/tags/TabbedPanelModel.java
index ac0ae5e40..fc2222b11 100644
--- a/plugins/dojo/src/main/java/org/apache/struts2/views/freemarker/tags/TabbedPanelModel.java
+++ b/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/freemarker/tags/TabbedPanelModel.java
@@ -18,13 +18,14 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.struts2.views.freemarker.tags;
+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.components.TabbedPanel;
+import org.apache.struts2.dojo.components.TabbedPanel;
+import org.apache.struts2.views.freemarker.tags.TagModel;
 
 import com.opensymphony.xwork2.util.ValueStack;
 
diff --git a/plugins/dojo/src/main/java/org/apache/struts2/views/freemarker/tags/TreeModel.java b/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/freemarker/tags/TreeModel.java
similarity index 89%
rename from plugins/dojo/src/main/java/org/apache/struts2/views/freemarker/tags/TreeModel.java
rename to plugins/dojo/src/main/java/org/apache/struts2/dojo/views/freemarker/tags/TreeModel.java
index 763e1ee77..9d067e57a 100644
--- a/plugins/dojo/src/main/java/org/apache/struts2/views/freemarker/tags/TreeModel.java
+++ b/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/freemarker/tags/TreeModel.java
@@ -18,13 +18,14 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.struts2.views.freemarker.tags;
+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.components.Tree;
+import org.apache.struts2.dojo.components.Tree;
+import org.apache.struts2.views.freemarker.tags.TagModel;
 
 import com.opensymphony.xwork2.util.ValueStack;
 
diff --git a/plugins/dojo/src/main/java/org/apache/struts2/views/freemarker/tags/TreeNodeModel.java b/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/freemarker/tags/TreeNodeModel.java
similarity index 89%
rename from plugins/dojo/src/main/java/org/apache/struts2/views/freemarker/tags/TreeNodeModel.java
rename to plugins/dojo/src/main/java/org/apache/struts2/dojo/views/freemarker/tags/TreeNodeModel.java
index 2c1ecd757..fc88a457b 100644
--- a/plugins/dojo/src/main/java/org/apache/struts2/views/freemarker/tags/TreeNodeModel.java
+++ b/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/freemarker/tags/TreeNodeModel.java
@@ -18,13 +18,14 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.struts2.views.freemarker.tags;
+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.components.TreeNode;
+import org.apache.struts2.dojo.components.TreeNode;
+import org.apache.struts2.views.freemarker.tags.TagModel;
 
 import com.opensymphony.xwork2.util.ValueStack;
 
diff --git a/plugins/dojo/src/main/java/org/apache/struts2/views/jsp/ui/AbstractRemoteCallUITag.java b/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/jsp/ui/AbstractRemoteCallUITag.java
similarity index 95%
rename from plugins/dojo/src/main/java/org/apache/struts2/views/jsp/ui/AbstractRemoteCallUITag.java
rename to plugins/dojo/src/main/java/org/apache/struts2/dojo/views/jsp/ui/AbstractRemoteCallUITag.java
index f21d9e18c..abcf0b41a 100644
--- a/plugins/dojo/src/main/java/org/apache/struts2/views/jsp/ui/AbstractRemoteCallUITag.java
+++ b/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/jsp/ui/AbstractRemoteCallUITag.java
@@ -15,9 +15,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.struts2.views.jsp.ui;
+package org.apache.struts2.dojo.views.jsp.ui;
 
-import org.apache.struts2.components.RemoteUICallBean;
+import org.apache.struts2.dojo.components.RemoteUICallBean;
+import org.apache.struts2.views.jsp.ui.AbstractClosingTag;
 
 public abstract class AbstractRemoteCallUITag extends AbstractClosingTag {
 
diff --git a/plugins/dojo/src/main/java/org/apache/struts2/views/jsp/ui/AnchorTag.java b/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/jsp/ui/AnchorTag.java
similarity index 91%
rename from plugins/dojo/src/main/java/org/apache/struts2/views/jsp/ui/AnchorTag.java
rename to plugins/dojo/src/main/java/org/apache/struts2/dojo/views/jsp/ui/AnchorTag.java
index 346269f1b..c3bf92f5f 100644
--- a/plugins/dojo/src/main/java/org/apache/struts2/views/jsp/ui/AnchorTag.java
+++ b/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/jsp/ui/AnchorTag.java
@@ -18,13 +18,13 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.struts2.views.jsp.ui;
+package org.apache.struts2.dojo.views.jsp.ui;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import org.apache.struts2.components.Anchor;
 import org.apache.struts2.components.Component;
+import org.apache.struts2.dojo.components.Anchor;
 
 import com.opensymphony.xwork2.util.ValueStack;
 
@@ -33,7 +33,7 @@ import com.opensymphony.xwork2.util.ValueStack;
  */
 public class AnchorTag extends AbstractRemoteCallUITag {
 
-	private static final long serialVersionUID = -1034616578492431113L;
+    private static final long serialVersionUID = -1034616578492431113L;
 
     protected String targets;
     protected String preInvokeJS;
diff --git a/plugins/dojo/src/main/java/org/apache/struts2/views/jsp/ui/AutocompleterTag.java b/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/jsp/ui/AutocompleterTag.java
similarity index 97%
rename from plugins/dojo/src/main/java/org/apache/struts2/views/jsp/ui/AutocompleterTag.java
rename to plugins/dojo/src/main/java/org/apache/struts2/dojo/views/jsp/ui/AutocompleterTag.java
index 57ae71a7e..95890cc0d 100644
--- a/plugins/dojo/src/main/java/org/apache/struts2/views/jsp/ui/AutocompleterTag.java
+++ b/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/jsp/ui/AutocompleterTag.java
@@ -18,13 +18,14 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.struts2.views.jsp.ui;
+package org.apache.struts2.dojo.views.jsp.ui;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import org.apache.struts2.components.Autocompleter;
 import org.apache.struts2.components.Component;
+import org.apache.struts2.dojo.components.Autocompleter;
+import org.apache.struts2.views.jsp.ui.ComboBoxTag;
 
 import com.opensymphony.xwork2.util.ValueStack;
 
diff --git a/plugins/dojo/src/main/java/org/apache/struts2/views/jsp/ui/DateTimePickerTag.java b/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/jsp/ui/DateTimePickerTag.java
similarity index 96%
rename from plugins/dojo/src/main/java/org/apache/struts2/views/jsp/ui/DateTimePickerTag.java
rename to plugins/dojo/src/main/java/org/apache/struts2/dojo/views/jsp/ui/DateTimePickerTag.java
index 290696846..742c7bc1d 100644
--- a/plugins/dojo/src/main/java/org/apache/struts2/views/jsp/ui/DateTimePickerTag.java
+++ b/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/jsp/ui/DateTimePickerTag.java
@@ -18,13 +18,14 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.struts2.views.jsp.ui;
+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.components.DateTimePicker;
+import org.apache.struts2.dojo.components.DateTimePicker;
+import org.apache.struts2.views.jsp.ui.AbstractUITag;
 
 import com.opensymphony.xwork2.util.ValueStack;
 
diff --git a/plugins/dojo/src/main/java/org/apache/struts2/views/jsp/ui/DivTag.java b/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/jsp/ui/DivTag.java
similarity index 96%
rename from plugins/dojo/src/main/java/org/apache/struts2/views/jsp/ui/DivTag.java
rename to plugins/dojo/src/main/java/org/apache/struts2/dojo/views/jsp/ui/DivTag.java
index 5c965b07c..7831cbde1 100644
--- a/plugins/dojo/src/main/java/org/apache/struts2/views/jsp/ui/DivTag.java
+++ b/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/jsp/ui/DivTag.java
@@ -18,13 +18,13 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.struts2.views.jsp.ui;
+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.components.Div;
+import org.apache.struts2.dojo.components.Div;
 
 import com.opensymphony.xwork2.util.ValueStack;
 
diff --git a/plugins/dojo/src/main/java/org/apache/struts2/views/jsp/ui/SubmitTag.java b/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/jsp/ui/SubmitTag.java
similarity index 97%
rename from plugins/dojo/src/main/java/org/apache/struts2/views/jsp/ui/SubmitTag.java
rename to plugins/dojo/src/main/java/org/apache/struts2/dojo/views/jsp/ui/SubmitTag.java
index f12bd511e..313002ac4 100644
--- a/plugins/dojo/src/main/java/org/apache/struts2/views/jsp/ui/SubmitTag.java
+++ b/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/jsp/ui/SubmitTag.java
@@ -18,13 +18,14 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.struts2.views.jsp.ui;
+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.components.Submit;
+import org.apache.struts2.dojo.components.Submit;
+import org.apache.struts2.views.jsp.ui.AbstractUITag;
 
 import com.opensymphony.xwork2.util.ValueStack;
 
diff --git a/plugins/dojo/src/main/java/org/apache/struts2/views/jsp/ui/TabbedPanelTag.java b/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/jsp/ui/TabbedPanelTag.java
similarity index 93%
rename from plugins/dojo/src/main/java/org/apache/struts2/views/jsp/ui/TabbedPanelTag.java
rename to plugins/dojo/src/main/java/org/apache/struts2/dojo/views/jsp/ui/TabbedPanelTag.java
index 11b9aec93..4fca002c8 100644
--- a/plugins/dojo/src/main/java/org/apache/struts2/views/jsp/ui/TabbedPanelTag.java
+++ b/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/jsp/ui/TabbedPanelTag.java
@@ -18,13 +18,14 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.struts2.views.jsp.ui;
+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.components.TabbedPanel;
+import org.apache.struts2.dojo.components.TabbedPanel;
+import org.apache.struts2.views.jsp.ui.AbstractClosingTag;
 
 import com.opensymphony.xwork2.util.ValueStack;
 
diff --git a/plugins/dojo/src/main/java/org/apache/struts2/views/jsp/ui/TreeNodeTag.java b/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/jsp/ui/TreeNodeTag.java
similarity index 91%
rename from plugins/dojo/src/main/java/org/apache/struts2/views/jsp/ui/TreeNodeTag.java
rename to plugins/dojo/src/main/java/org/apache/struts2/dojo/views/jsp/ui/TreeNodeTag.java
index d845ce42e..4522f3233 100644
--- a/plugins/dojo/src/main/java/org/apache/struts2/views/jsp/ui/TreeNodeTag.java
+++ b/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/jsp/ui/TreeNodeTag.java
@@ -18,13 +18,14 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.struts2.views.jsp.ui;
+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.components.TreeNode;
+import org.apache.struts2.dojo.components.TreeNode;
+import org.apache.struts2.views.jsp.ui.AbstractClosingTag;
 
 import com.opensymphony.xwork2.util.ValueStack;
 
diff --git a/plugins/dojo/src/main/java/org/apache/struts2/views/jsp/ui/TreeTag.java b/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/jsp/ui/TreeTag.java
similarity index 98%
rename from plugins/dojo/src/main/java/org/apache/struts2/views/jsp/ui/TreeTag.java
rename to plugins/dojo/src/main/java/org/apache/struts2/dojo/views/jsp/ui/TreeTag.java
index 2fc8fbebe..e50f9ffc7 100644
--- a/plugins/dojo/src/main/java/org/apache/struts2/views/jsp/ui/TreeTag.java
+++ b/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/jsp/ui/TreeTag.java
@@ -18,13 +18,14 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.struts2.views.jsp.ui;
+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.components.Tree;
+import org.apache.struts2.dojo.components.Tree;
+import org.apache.struts2.views.jsp.ui.AbstractClosingTag;
 
 import com.opensymphony.xwork2.util.ValueStack;
 
diff --git a/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/velocity/components/AnchorDirective.java b/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/velocity/components/AnchorDirective.java
new file mode 100644
index 000000000..c528f5a38
--- /dev/null
+++ b/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/velocity/components/AnchorDirective.java
@@ -0,0 +1,47 @@
+/*
+ * $Id: AnchorDirective.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.velocity.components;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.apache.struts2.components.Anchor;
+import org.apache.struts2.components.Component;
+import org.apache.struts2.views.velocity.components.AbstractDirective;
+
+import com.opensymphony.xwork2.util.ValueStack;
+
+/**
+ * @see Anchor
+ */
+public class AnchorDirective extends AbstractDirective {
+    public String getBeanName() {
+        return "a";
+    }
+
+    protected Component getBean(ValueStack stack, HttpServletRequest req, HttpServletResponse res) {
+        return new Anchor(stack, req, res);
+    }
+
+    public int getType() {
+        return BLOCK;
+    }
+}
diff --git a/plugins/dojo/src/main/java/org/apache/struts2/views/velocity/components/AutocompleterDirective.java b/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/velocity/components/AutocompleterDirective.java
similarity index 88%
rename from plugins/dojo/src/main/java/org/apache/struts2/views/velocity/components/AutocompleterDirective.java
rename to plugins/dojo/src/main/java/org/apache/struts2/dojo/views/velocity/components/AutocompleterDirective.java
index 58c0afc0e..87058a06c 100644
--- a/plugins/dojo/src/main/java/org/apache/struts2/views/velocity/components/AutocompleterDirective.java
+++ b/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/velocity/components/AutocompleterDirective.java
@@ -18,14 +18,14 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.struts2.views.velocity.components;
+package org.apache.struts2.dojo.views.velocity.components;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import org.apache.struts2.components.Autocompleter;
-import org.apache.struts2.components.Bean;
 import org.apache.struts2.components.Component;
+import org.apache.struts2.dojo.components.Autocompleter;
+import org.apache.struts2.views.velocity.components.AbstractDirective;
 
 import com.opensymphony.xwork2.util.ValueStack;
 
diff --git a/plugins/dojo/src/main/java/org/apache/struts2/views/velocity/components/DateTimePickerDirective.java b/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/velocity/components/DateTimePickerDirective.java
similarity index 86%
rename from plugins/dojo/src/main/java/org/apache/struts2/views/velocity/components/DateTimePickerDirective.java
rename to plugins/dojo/src/main/java/org/apache/struts2/dojo/views/velocity/components/DateTimePickerDirective.java
index e0b208815..ff90b620b 100644
--- a/plugins/dojo/src/main/java/org/apache/struts2/views/velocity/components/DateTimePickerDirective.java
+++ b/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/velocity/components/DateTimePickerDirective.java
@@ -15,13 +15,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.struts2.views.velocity.components;
+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.components.DateTimePicker;
+import org.apache.struts2.dojo.components.DateTimePicker;
+import org.apache.struts2.views.velocity.components.TextFieldDirective;
 
 import com.opensymphony.xwork2.util.ValueStack;
 
diff --git a/plugins/dojo/src/main/java/org/apache/struts2/views/velocity/components/DivDirective.java b/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/velocity/components/DivDirective.java
similarity index 88%
rename from plugins/dojo/src/main/java/org/apache/struts2/views/velocity/components/DivDirective.java
rename to plugins/dojo/src/main/java/org/apache/struts2/dojo/views/velocity/components/DivDirective.java
index 71df9da19..bc651b4c7 100644
--- a/plugins/dojo/src/main/java/org/apache/struts2/views/velocity/components/DivDirective.java
+++ b/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/velocity/components/DivDirective.java
@@ -18,13 +18,14 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.struts2.views.velocity.components;
+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.components.Div;
+import org.apache.struts2.dojo.components.Div;
+import org.apache.struts2.views.velocity.components.AbstractDirective;
 
 import com.opensymphony.xwork2.util.ValueStack;
 
diff --git a/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/velocity/components/SubmitDirective.java b/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/velocity/components/SubmitDirective.java
new file mode 100644
index 000000000..bc140dcf1
--- /dev/null
+++ b/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/velocity/components/SubmitDirective.java
@@ -0,0 +1,43 @@
+/*
+ * $Id: SubmitDirective.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.velocity.components;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.apache.struts2.components.Component;
+import org.apache.struts2.components.Submit;
+import org.apache.struts2.views.velocity.components.AbstractDirective;
+
+import com.opensymphony.xwork2.util.ValueStack;
+
+/**
+ * @see Submit
+ */
+public class SubmitDirective extends AbstractDirective {
+    public String getBeanName() {
+        return "submit";
+    }
+
+    protected Component getBean(ValueStack stack, HttpServletRequest req, HttpServletResponse res) {
+        return new Submit(stack, req, res);
+    }
+}
diff --git a/plugins/dojo/src/main/java/org/apache/struts2/views/velocity/components/TabbedPanelDirective.java b/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/velocity/components/TabbedPanelDirective.java
similarity index 88%
rename from plugins/dojo/src/main/java/org/apache/struts2/views/velocity/components/TabbedPanelDirective.java
rename to plugins/dojo/src/main/java/org/apache/struts2/dojo/views/velocity/components/TabbedPanelDirective.java
index cd2106b4e..762c9b710 100644
--- a/plugins/dojo/src/main/java/org/apache/struts2/views/velocity/components/TabbedPanelDirective.java
+++ b/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/velocity/components/TabbedPanelDirective.java
@@ -18,13 +18,14 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.struts2.views.velocity.components;
+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.components.TabbedPanel;
+import org.apache.struts2.dojo.components.TabbedPanel;
+import org.apache.struts2.views.velocity.components.AbstractDirective;
 
 import com.opensymphony.xwork2.util.ValueStack;
 
diff --git a/plugins/dojo/src/main/java/org/apache/struts2/views/velocity/components/TreeDirective.java b/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/velocity/components/TreeDirective.java
similarity index 88%
rename from plugins/dojo/src/main/java/org/apache/struts2/views/velocity/components/TreeDirective.java
rename to plugins/dojo/src/main/java/org/apache/struts2/dojo/views/velocity/components/TreeDirective.java
index 933e904e6..43df54eb6 100644
--- a/plugins/dojo/src/main/java/org/apache/struts2/views/velocity/components/TreeDirective.java
+++ b/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/velocity/components/TreeDirective.java
@@ -18,13 +18,14 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.struts2.views.velocity.components;
+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.components.Tree;
+import org.apache.struts2.dojo.components.Tree;
+import org.apache.struts2.views.velocity.components.AbstractDirective;
 
 import com.opensymphony.xwork2.util.ValueStack;
 
diff --git a/plugins/dojo/src/main/java/org/apache/struts2/views/velocity/components/TreeNodeDirective.java b/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/velocity/components/TreeNodeDirective.java
similarity index 88%
rename from plugins/dojo/src/main/java/org/apache/struts2/views/velocity/components/TreeNodeDirective.java
rename to plugins/dojo/src/main/java/org/apache/struts2/dojo/views/velocity/components/TreeNodeDirective.java
index 8f8876a21..487f2e29f 100644
--- a/plugins/dojo/src/main/java/org/apache/struts2/views/velocity/components/TreeNodeDirective.java
+++ b/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/velocity/components/TreeNodeDirective.java
@@ -18,13 +18,14 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.struts2.views.velocity.components;
+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.components.TreeNode;
+import org.apache.struts2.dojo.components.TreeNode;
+import org.apache.struts2.views.velocity.components.AbstractDirective;
 
 import com.opensymphony.xwork2.util.ValueStack;
 
diff --git a/plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/dojo.js b/plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/dojo.js
index fa573795e..1c72b3be5 100644
--- a/plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/dojo.js
+++ b/plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/dojo.js
@@ -1,11190 +1,17204 @@
-/*
-	Copyright (c) 2004-2006, The Dojo Foundation
-	All Rights Reserved.
+if(typeof dojo == "undefined"){
 
-	Licensed under the Academic Free License version 2.1 or above OR the
-	modified BSD license. For more information on Dojo licensing, see:
+/**
+* @file bootstrap1.js
+*
+* summary: First file that is loaded that 'bootstraps' the entire dojo library suite.
+* note:  Must run before hostenv_*.js file.
+*
+* @author  Copyright 2004 Mark D. Anderson (mda@discerning.com)
+* TODOC: should the copyright be changed to Dojo Foundation?
+* @license Licensed under the Academic Free License 2.1 http://www.opensource.org/licenses/afl-2.1.php
+*
+* $Id: bootstrap1.js 6258 2006-10-20 03:12:36Z jburke $
+*/
 
-		http://dojotoolkit.org/community/licensing.shtml
+// TODOC: HOW TO DOC THE BELOW?
+// @global: djConfig
+// summary:  
+//    Application code can set the global 'djConfig' prior to loading
+//    the library to override certain global settings for how dojo works.  
+// description:  The variables that can be set are as follows:
+//      - isDebug: false
+//      - allowQueryConfig: false
+//      - baseScriptUri: ""
+//      - baseRelativePath: ""
+//      - libraryScriptUri: ""
+//      - iePreventClobber: false
+//      - ieClobberMinimal: true
+//      - locale: undefined
+//      - extraLocale: undefined
+//      - preventBackButtonFix: true
+//      - searchIds: []
+//      - parseWidgets: true
+// TODOC: HOW TO DOC THESE VARIABLES?
+// TODOC: IS THIS A COMPLETE LIST?
+// note:
+//    'djConfig' does not exist under 'dojo.*' so that it can be set before the 
+//    'dojo' variable exists.  
+// note:
+//    Setting any of these variables *after* the library has loaded does nothing at all. 
+// TODOC: is this still true?  Release notes for 0.3 indicated they could be set after load.
+//
+
+
+//TODOC:  HOW TO DOC THIS?
+// @global: dj_global
+// summary: 
+//    an alias for the top-level global object in the host environment
+//    (e.g., the window object in a browser).
+// description:  
+//    Refer to 'dj_global' rather than referring to window to ensure your
+//    code runs correctly in contexts other than web browsers (eg: Rhino on a server).
+var dj_global = this;
+
+//TODOC:  HOW TO DOC THIS?
+// @global: dj_currentContext
+// summary: 
+//    Private global context object. Where 'dj_global' always refers to the boot-time
+//    global context, 'dj_currentContext' can be modified for temporary context shifting.
+//    dojo.global() returns dj_currentContext.
+// description:  
+//    Refer to dojo.global() rather than referring to dj_global to ensure your
+//    code runs correctly in managed contexts.
+var dj_currentContext = this;
+
+
+// ****************************************************************
+// global public utils
+// TODOC: DO WE WANT TO NOTE THAT THESE ARE GLOBAL PUBLIC UTILS?
+// ****************************************************************
+
+function dj_undef(/*String*/ name, /*Object?*/ object){
+  //summary: Returns true if 'name' is defined on 'object' (or globally if 'object' is null).
+  //description: Note that 'defined' and 'exists' are not the same concept.
+  return (typeof (object || dj_currentContext)[name] == "undefined"); // Boolean
+}
+
+// make sure djConfig is defined
+if(dj_undef("djConfig", this)){ 
+  var djConfig = {}; 
+}
+
+//TODOC:  HOW TO DOC THIS?
+// dojo is the root variable of (almost all) our public symbols -- make sure it is defined.
+if(dj_undef("dojo", this)){ 
+  var dojo = {}; 
+}
+
+dojo.global = function(){
+  // summary:
+  //    return the current global context object
+  //    (e.g., the window object in a browser).
+  // description: 
+  //    Refer to 'dojo.global()' rather than referring to window to ensure your
+  //    code runs correctly in contexts other than web browsers (eg: Rhino on a server).
+  return dj_currentContext;
+}
+
+// Override locale setting, if specified
+dojo.locale  = djConfig.locale;
+
+//TODOC:  HOW TO DOC THIS?
+dojo.version = {
+  // summary: version number of this instance of dojo.
+  major: 0, minor: 4, patch: 0, flag: "",
+  revision: Number("$Rev: 6258 $".match(/[0-9]+/)[0]),
+  toString: function(){
+    with(dojo.version){
+      return major + "." + minor + "." + patch + flag + " (" + revision + ")";  // String
+    }
+  }
+}
+
+dojo.evalProp = function(/*String*/ name, /*Object*/ object, /*Boolean?*/ create){
+  // summary: Returns 'object[name]'.  If not defined and 'create' is true, will return a new Object.
+  // description: 
+  //    Returns null if 'object[name]' is not defined and 'create' is not true.
+  //    Note: 'defined' and 'exists' are not the same concept.  
+  if((!object)||(!name)) return undefined; // undefined
+  if(!dj_undef(name, object)) return object[name]; // mixed
+  return (create ? (object[name]={}) : undefined);  // mixed
+}
+
+dojo.parseObjPath = function(/*String*/ path, /*Object?*/ context, /*Boolean?*/ create){
+  // summary: Parse string path to an object, and return corresponding object reference and property name.
+  // description: 
+  //    Returns an object with two properties, 'obj' and 'prop'.  
+  //    'obj[prop]' is the reference indicated by 'path'.
+  // path: Path to an object, in the form "A.B.C".
+  // context: Object to use as root of path.  Defaults to 'dojo.global()'.
+  // create: If true, Objects will be created at any point along the 'path' that is undefined.
+  var object = (context || dojo.global());
+  var names = path.split('.');
+  var prop = names.pop();
+  for (var i=0,l=names.length;i<l && object;i++){
+    object = dojo.evalProp(names[i], object, create);
+  }
+  return {obj: object, prop: prop}; // Object: {obj: Object, prop: String}
+}
+
+dojo.evalObjPath = function(/*String*/ path, /*Boolean?*/ create){
+  // summary: Return the value of object at 'path' in the global scope, without using 'eval()'.
+  // path: Path to an object, in the form "A.B.C".
+  // create: If true, Objects will be created at any point along the 'path' that is undefined.
+  if(typeof path != "string"){ 
+    return dojo.global(); 
+  }
+  // fast path for no periods
+  if(path.indexOf('.') == -1){
+    return dojo.evalProp(path, dojo.global(), create);    // mixed
+  }
+
+  //MOW: old 'with' syntax was confusing and would throw an error if parseObjPath returned null.
+  var ref = dojo.parseObjPath(path, dojo.global(), create);
+  if(ref){
+    return dojo.evalProp(ref.prop, ref.obj, create);  // mixed
+  }
+  return null;
+}
+
+dojo.errorToString = function(/*Error*/ exception){
+  // summary: Return an exception's 'message', 'description' or text.
+
+  // TODO: overriding Error.prototype.toString won't accomplish this?
+  //    ... since natively generated Error objects do not always reflect such things?
+  if(!dj_undef("message", exception)){
+    return exception.message;   // String
+  }else if(!dj_undef("description", exception)){
+    return exception.description; // String
+  }else{
+    return exception;       // Error
+  }
+}
+
+dojo.raise = function(/*String*/ message, /*Error?*/ exception){
+  // summary: Common point for raising exceptions in Dojo to enable logging.
+  //  Throws an error message with text of 'exception' if provided, or
+  //  rethrows exception object.
+
+  if(exception){
+    message = message + ": "+dojo.errorToString(exception);
+  }
+
+  // print the message to the user if hostenv.println is defined
+  try { if(djConfig.isDebug){ dojo.hostenv.println("FATAL exception raised: "+message); } } catch (e) {}
+
+  throw exception || Error(message);
+}
+
+//Stub functions so things don't break.
+//TODOC:  HOW TO DOC THESE?
+dojo.debug = function(){};
+dojo.debugShallow = function(obj){};
+dojo.profile = { start: function(){}, end: function(){}, stop: function(){}, dump: function(){} };
+
+function dj_eval(/*String*/ scriptFragment){ 
+  // summary: Perform an evaluation in the global scope.  Use this rather than calling 'eval()' directly.
+  // description: Placed in a separate function to minimize size of trapped evaluation context.
+  // note:
+  //   - JSC eval() takes an optional second argument which can be 'unsafe'.
+  //   - Mozilla/SpiderMonkey eval() takes an optional second argument which is the
+  //     scope object for new symbols.
+  return dj_global.eval ? dj_global.eval(scriptFragment) : eval(scriptFragment);  // mixed
+}
+
+dojo.unimplemented = function(/*String*/ funcname, /*String?*/ extra){
+  // summary: Throw an exception because some function is not implemented.
+  // extra: Text to append to the exception message.
+  var message = "'" + funcname + "' not implemented";
+  if (extra != null) { message += " " + extra; }
+  dojo.raise(message);
+}
+
+dojo.deprecated = function(/*String*/ behaviour, /*String?*/ extra, /*String?*/ removal){
+  // summary: Log a debug message to indicate that a behavior has been deprecated.
+  // extra: Text to append to the message.
+  // removal: Text to indicate when in the future the behavior will be removed.
+  var message = "DEPRECATED: " + behaviour;
+  if(extra){ message += " " + extra; }
+  if(removal){ message += " -- will be removed in version: " + removal; }
+  dojo.debug(message);
+}
+
+dojo.render = (function(){
+  //TODOC: HOW TO DOC THIS?
+  // summary: Details rendering support, OS and browser of the current environment.
+  // TODOC: is this something many folks will interact with?  If so, we should doc the structure created...
+  function vscaffold(prefs, names){
+    var tmp = {
+      capable: false,
+      support: {
+        builtin: false,
+        plugin: false
+      },
+      prefixes: prefs
+    };
+    for(var i=0; i<names.length; i++){
+      tmp[names[i]] = false;
+    }
+    return tmp;
+  }
+
+  return {
+    name: "",
+    ver: dojo.version,
+    os: { win: false, linux: false, osx: false },
+    html: vscaffold(["html"], ["ie", "opera", "khtml", "safari", "moz"]),
+    svg: vscaffold(["svg"], ["corel", "adobe", "batik"]),
+    vml: vscaffold(["vml"], ["ie"]),
+    swf: vscaffold(["Swf", "Flash", "Mm"], ["mm"]),
+    swt: vscaffold(["Swt"], ["ibm"])
+  };
+})();
+
+// ****************************************************************
+// dojo.hostenv methods that must be defined in hostenv_*.js
+// ****************************************************************
+
+/**
+ * The interface definining the interaction with the EcmaScript host environment.
 */
 
 /*
-	This is a compiled version of Dojo, built for deployment and not for
-	development. To get an editable version, please visit:
+ * None of these methods should ever be called directly by library users.
+ * Instead public methods such as loadModule should be called instead.
+ */
+dojo.hostenv = (function(){
+  // TODOC:  HOW TO DOC THIS?
+  // summary: Provides encapsulation of behavior that changes across different 'host environments' 
+  //      (different browsers, server via Rhino, etc).
+  // description: None of these methods should ever be called directly by library users.
+  //        Use public methods such as 'loadModule' instead.
+  
+  // default configuration options
+  var config = {
+    isDebug: false,
+    allowQueryConfig: false,
+    baseScriptUri: "",
+    baseRelativePath: "",
+    libraryScriptUri: "",
+    iePreventClobber: false,
+    ieClobberMinimal: true,
+    preventBackButtonFix: true,
+    delayMozLoadingFix: false,
+    searchIds: [],
+    parseWidgets: true
+  };
 
-		http://dojotoolkit.org
+  if (typeof djConfig == "undefined") { djConfig = config; }
+  else {
+    for (var option in config) {
+      if (typeof djConfig[option] == "undefined") {
+        djConfig[option] = config[option];
+      }
+    }
+  }
 
-	for documentation and information on getting the source.
-*/
+  return {
+    name_: '(unset)',
+    version_: '(unset)',
 
-if(typeof dojo=="undefined"){
-var dj_global=this;
-var dj_currentContext=this;
-function dj_undef(_1,_2){
-return (typeof (_2||dj_currentContext)[_1]=="undefined");
-}
-if(dj_undef("djConfig",this)){
-var djConfig={};
-}
-if(dj_undef("dojo",this)){
-var dojo={};
-}
-dojo.global=function(){
-return dj_currentContext;
-};
-dojo.locale=djConfig.locale;
-dojo.version={major:0,minor:4,patch:0,flag:"",revision:Number("$Rev: 6258 $".match(/[0-9]+/)[0]),toString:function(){
-with(dojo.version){
-return major+"."+minor+"."+patch+flag+" ("+revision+")";
-}
-}};
-dojo.evalProp=function(_3,_4,_5){
-if((!_4)||(!_3)){
-return undefined;
-}
-if(!dj_undef(_3,_4)){
-return _4[_3];
-}
-return (_5?(_4[_3]={}):undefined);
-};
-dojo.parseObjPath=function(_6,_7,_8){
-var _9=(_7||dojo.global());
-var _a=_6.split(".");
-var _b=_a.pop();
-for(var i=0,l=_a.length;i<l&&_9;i++){
-_9=dojo.evalProp(_a[i],_9,_8);
-}
-return {obj:_9,prop:_b};
-};
-dojo.evalObjPath=function(_e,_f){
-if(typeof _e!="string"){
-return dojo.global();
-}
-if(_e.indexOf(".")==-1){
-return dojo.evalProp(_e,dojo.global(),_f);
-}
-var ref=dojo.parseObjPath(_e,dojo.global(),_f);
-if(ref){
-return dojo.evalProp(ref.prop,ref.obj,_f);
-}
-return null;
-};
-dojo.errorToString=function(_11){
-if(!dj_undef("message",_11)){
-return _11.message;
-}else{
-if(!dj_undef("description",_11)){
-return _11.description;
-}else{
-return _11;
-}
-}
-};
-dojo.raise=function(_12,_13){
-if(_13){
-_12=_12+": "+dojo.errorToString(_13);
-}
-try{
-if(djConfig.isDebug){
-dojo.hostenv.println("FATAL exception raised: "+_12);
-}
-}
-catch(e){
-}
-throw _13||Error(_12);
-};
-dojo.debug=function(){
-};
-dojo.debugShallow=function(obj){
-};
-dojo.profile={start:function(){
-},end:function(){
-},stop:function(){
-},dump:function(){
-}};
-function dj_eval(_15){
-return dj_global.eval?dj_global.eval(_15):eval(_15);
-}
-dojo.unimplemented=function(_16,_17){
-var _18="'"+_16+"' not implemented";
-if(_17!=null){
-_18+=" "+_17;
-}
-dojo.raise(_18);
-};
-dojo.deprecated=function(_19,_1a,_1b){
-var _1c="DEPRECATED: "+_19;
-if(_1a){
-_1c+=" "+_1a;
-}
-if(_1b){
-_1c+=" -- will be removed in version: "+_1b;
-}
-dojo.debug(_1c);
-};
-dojo.render=(function(){
-function vscaffold(_1d,_1e){
-var tmp={capable:false,support:{builtin:false,plugin:false},prefixes:_1d};
-for(var i=0;i<_1e.length;i++){
-tmp[_1e[i]]=false;
-}
-return tmp;
-}
-return {name:"",ver:dojo.version,os:{win:false,linux:false,osx:false},html:vscaffold(["html"],["ie","opera","khtml","safari","moz"]),svg:vscaffold(["svg"],["corel","adobe","batik"]),vml:vscaffold(["vml"],["ie"]),swf:vscaffold(["Swf","Flash","Mm"],["mm"]),swt:vscaffold(["Swt"],["ibm"])};
+
+    getName: function(){ 
+      // sumary: Return the name of the host environment.
+      return this.name_;  // String
+    },
+
+
+    getVersion: function(){ 
+      // summary: Return the version of the hostenv.
+      return this.version_; // String
+    },
+
+    getText: function(/*String*/ uri){
+      // summary: Read the plain/text contents at the specified 'uri'.
+      // description: 
+      //      If 'getText()' is not implemented, then it is necessary to override 
+      //      'loadUri()' with an implementation that doesn't rely on it.
+
+      dojo.unimplemented('getText', "uri=" + uri);
+    }
+  };
 })();
-dojo.hostenv=(function(){
-var _21={isDebug:false,allowQueryConfig:false,baseScriptUri:"",baseRelativePath:"",libraryScriptUri:"",iePreventClobber:false,ieClobberMinimal:true,preventBackButtonFix:true,delayMozLoadingFix:false,searchIds:[],parseWidgets:true};
-if(typeof djConfig=="undefined"){
-djConfig=_21;
-}else{
-for(var _22 in _21){
-if(typeof djConfig[_22]=="undefined"){
-djConfig[_22]=_21[_22];
+
+
+dojo.hostenv.getBaseScriptUri = function(){
+  // summary: Return the base script uri that other scripts are found relative to.
+  // TODOC: HUH?  This comment means nothing to me.  What other scripts? Is this the path to other dojo libraries?
+  //    MAYBE:  Return the base uri to scripts in the dojo library.  ???
+  // return: Empty string or a path ending in '/'.
+  if(djConfig.baseScriptUri.length){ 
+    return djConfig.baseScriptUri;
+  }
+
+  // MOW: Why not:
+  //      uri = djConfig.libraryScriptUri || djConfig.baseRelativePath
+  //    ??? Why 'new String(...)'
+  var uri = new String(djConfig.libraryScriptUri||djConfig.baseRelativePath);
+  if (!uri) { dojo.raise("Nothing returned by getLibraryScriptUri(): " + uri); }
+
+  // MOW: uri seems to not be actually used.  Seems to be hard-coding to djConfig.baseRelativePath... ???
+  var lastslash = uri.lastIndexOf('/');   // MOW ???
+  djConfig.baseScriptUri = djConfig.baseRelativePath;
+  return djConfig.baseScriptUri;  // String
 }
-}
-}
-return {name_:"(unset)",version_:"(unset)",getName:function(){
-return this.name_;
-},getVersion:function(){
-return this.version_;
-},getText:function(uri){
-dojo.unimplemented("getText","uri="+uri);
-}};
+
+/*
+ * loader.js - A bootstrap module.  Runs before the hostenv_*.js file. Contains all of the package loading methods.
+ */
+
+//A semi-colon is at the start of the line because after doing a build, this function definition
+//get compressed onto the same line as the last line in bootstrap1.js. That list line is just a
+//curly bracket, and the browser complains about that syntax. The semicolon fixes it. Putting it
+//here instead of at the end of bootstrap1.js, since it is more of an issue for this file, (using
+//the closure), and bootstrap1.js could change in the future.
+;(function(){
+  //Additional properties for dojo.hostenv
+  var _addHostEnv = {
+    pkgFileName: "__package__",
+  
+    // for recursion protection
+    loading_modules_: {},
+    loaded_modules_: {},
+    addedToLoadingCount: [],
+    removedFromLoadingCount: [],
+  
+    inFlightCount: 0,
+  
+    // FIXME: it should be possible to pull module prefixes in from djConfig
+    modulePrefixes_: {
+      dojo: {name: "dojo", value: "src"}
+    },
+
+    setModulePrefix: function(/*String*/module, /*String*/prefix){
+      // summary: establishes module/prefix pair
+      this.modulePrefixes_[module] = {name: module, value: prefix};
+    },
+
+    moduleHasPrefix: function(/*String*/module){
+      // summary: checks to see if module has been established
+      var mp = this.modulePrefixes_;
+      return Boolean(mp[module] && mp[module].value); // Boolean
+    },
+
+    getModulePrefix: function(/*String*/module){
+      // summary: gets the prefix associated with module
+      if(this.moduleHasPrefix(module)){
+        return this.modulePrefixes_[module].value; // String
+      }
+      return module; // String
+    },
+
+    getTextStack: [],
+    loadUriStack: [],
+    loadedUris: [],
+  
+    //WARNING: This variable is referenced by packages outside of bootstrap: FloatingPane.js and undo/browser.js
+    post_load_: false,
+    
+    //Egad! Lots of test files push on this directly instead of using dojo.addOnLoad.
+    modulesLoadedListeners: [],
+    unloadListeners: [],
+    loadNotifying: false
+  };
+  
+  //Add all of these properties to dojo.hostenv
+  for(var param in _addHostEnv){
+    dojo.hostenv[param] = _addHostEnv[param];
+  }
 })();
-dojo.hostenv.getBaseScriptUri=function(){
-if(djConfig.baseScriptUri.length){
-return djConfig.baseScriptUri;
+
+dojo.hostenv.loadPath = function(/*String*/relpath, /*String?*/module, /*Function?*/cb){
+// summary:
+//  Load a Javascript module given a relative path
+//
+// description:
+//  Loads and interprets the script located at relpath, which is relative to the
+//  script root directory.  If the script is found but its interpretation causes
+//  a runtime exception, that exception is not caught by us, so the caller will
+//  see it.  We return a true value if and only if the script is found.
+//
+//  For now, we do not have an implementation of a true search path.  We
+//  consider only the single base script uri, as returned by getBaseScriptUri().
+//
+// relpath: A relative path to a script (no leading '/', and typically
+//  ending in '.js').
+// module: A module whose existance to check for after loading a path.
+//  Can be used to determine success or failure of the load.
+// cb: a callback function to pass the result of evaluating the script
+
+  var uri;
+  if(relpath.charAt(0) == '/' || relpath.match(/^\w+:/)){
+    // dojo.raise("relpath '" + relpath + "'; must be relative");
+    uri = relpath;
+  }else{
+    uri = this.getBaseScriptUri() + relpath;
+  }
+  if(djConfig.cacheBust && dojo.render.html.capable){
+    uri += "?" + String(djConfig.cacheBust).replace(/\W+/g,"");
+  }
+  try{
+    return !module ? this.loadUri(uri, cb) : this.loadUriAndCheck(uri, module, cb); // Boolean
+  }catch(e){
+    dojo.debug(e);
+    return false; // Boolean
+  }
 }
-var uri=new String(djConfig.libraryScriptUri||djConfig.baseRelativePath);
-if(!uri){
-dojo.raise("Nothing returned by getLibraryScriptUri(): "+uri);
+
+dojo.hostenv.loadUri = function(/*String (URL)*/uri, /*Function?*/cb){
+// summary:
+//  Loads JavaScript from a URI
+//
+// description:
+//  Reads the contents of the URI, and evaluates the contents.  This is used to load modules as well
+//  as resource bundles.  Returns true if it succeeded. Returns false if the URI reading failed.
+//  Throws if the evaluation throws.
+//
+// uri: a uri which points at the script to be loaded
+// cb: a callback function to process the result of evaluating the script as an expression, typically
+//  used by the resource bundle loader to load JSON-style resources
+
+  if(this.loadedUris[uri]){
+    return true; // Boolean
+  }
+  var contents = this.getText(uri, null, true);
+  if(!contents){ return false; } // Boolean
+  this.loadedUris[uri] = true;
+  if(cb){ contents = '('+contents+')'; }
+  var value = dj_eval(contents);
+  if(cb){ cb(value); }
+  return true; // Boolean
 }
-var _25=uri.lastIndexOf("/");
-djConfig.baseScriptUri=djConfig.baseRelativePath;
-return djConfig.baseScriptUri;
+
+// FIXME: probably need to add logging to this method
+dojo.hostenv.loadUriAndCheck = function(/*String (URL)*/uri, /*String*/moduleName, /*Function?*/cb){
+  // summary: calls loadUri then findModule and returns true if both succeed
+  var ok = true;
+  try{
+    ok = this.loadUri(uri, cb);
+  }catch(e){
+    dojo.debug("failed loading ", uri, " with error: ", e);
+  }
+  return Boolean(ok && this.findModule(moduleName, false)); // Boolean
+}
+
+dojo.loaded = function(){ }
+dojo.unloaded = function(){ }
+
+dojo.hostenv.loaded = function(){
+  this.loadNotifying = true;
+  this.post_load_ = true;
+  var mll = this.modulesLoadedListeners;
+  for(var x=0; x<mll.length; x++){
+    mll[x]();
+  }
+
+  //Clear listeners so new ones can be added
+  //For other xdomain package loads after the initial load.
+  this.modulesLoadedListeners = [];
+  this.loadNotifying = false;
+
+  dojo.loaded();
+}
+
+dojo.hostenv.unloaded = function(){
+  var mll = this.unloadListeners;
+  while(mll.length){
+    (mll.pop())();
+  }
+  dojo.unloaded();
+}
+
+dojo.addOnLoad = function(/*Object?*/obj, /*String|Function*/functionName) {
+// summary:
+//  Registers a function to be triggered after the DOM has finished loading 
+//  and widgets declared in markup have been instantiated.  Images and CSS files
+//  may or may not have finished downloading when the specified function is called.
+//  (Note that widgets' CSS and HTML code is guaranteed to be downloaded before said
+//  widgets are instantiated.)
+//
+// usage:
+//  dojo.addOnLoad(functionPointer)
+//  dojo.addOnLoad(object, "functionName")
+
+  var dh = dojo.hostenv;
+  if(arguments.length == 1) {
+    dh.modulesLoadedListeners.push(obj);
+  } else if(arguments.length > 1) {
+    dh.modulesLoadedListeners.push(function() {
+      obj[functionName]();
+    });
+  }
+
+  //Added for xdomain loading. dojo.addOnLoad is used to
+  //indicate callbacks after doing some dojo.require() statements.
+  //In the xdomain case, if all the requires are loaded (after initial
+  //page load), then immediately call any listeners.
+  if(dh.post_load_ && dh.inFlightCount == 0 && !dh.loadNotifying){
+    dh.callLoaded();
+  }
+}
+
+dojo.addOnUnload = function(/*Object?*/obj, /*String|Function?*/functionName){
+// summary: registers a function to be triggered when the page unloads
+//
+// usage:
+//  dojo.addOnLoad(functionPointer)
+//  dojo.addOnLoad(object, "functionName")
+  var dh = dojo.hostenv;
+  if(arguments.length == 1){
+    dh.unloadListeners.push(obj);
+  } else if(arguments.length > 1) {
+    dh.unloadListeners.push(function() {
+      obj[functionName]();
+    });
+  }
+}
+
+dojo.hostenv.modulesLoaded = function(){
+  if(this.post_load_){ return; }
+  if(this.loadUriStack.length==0 && this.getTextStack.length==0){
+    if(this.inFlightCount > 0){ 
+      dojo.debug("files still in flight!");
+      return;
+    }
+    dojo.hostenv.callLoaded();
+  }
+}
+
+dojo.hostenv.callLoaded = function(){
+  if(typeof setTimeout == "object"){
+    setTimeout("dojo.hostenv.loaded();", 0);
+  }else{
+    dojo.hostenv.loaded();
+  }
+}
+
+dojo.hostenv.getModuleSymbols = function(/*String*/modulename){
+// summary:
+//  Converts a module name in dotted JS notation to an array representing the path in the source tree
+
+  var syms = modulename.split(".");
+  for(var i = syms.length; i>0; i--){
+    var parentModule = syms.slice(0, i).join(".");
+    if ((i==1) && !this.moduleHasPrefix(parentModule)){   
+      //Support default module directory (sibling of dojo)
+      syms[0] = "../" + syms[0];
+    }else{
+      var parentModulePath = this.getModulePrefix(parentModule);
+      if(parentModulePath != parentModule){
+        syms.splice(0, i, parentModulePath);
+        break;
+      }
+    }
+  }
+  return syms; // Array
+}
+
+dojo.hostenv._global_omit_module_check = false;
+dojo.hostenv.loadModule = function(/*String*/moduleName, /*Boolean?*/exactOnly, /*Boolean?*/omitModuleCheck){
+// summary:
+//  loads a Javascript module from the appropriate URI
+//
+// description:
+//  loadModule("A.B") first checks to see if symbol A.B is defined. 
+//  If it is, it is simply returned (nothing to do).
+//  
+//  If it is not defined, it will look for "A/B.js" in the script root directory,
+//  followed by "A.js".
+//  
+//  It throws if it cannot find a file to load, or if the symbol A.B is not
+//  defined after loading.
+//  
+//  It returns the object A.B.
+//  
+//  This does nothing about importing symbols into the current package.
+//  It is presumed that the caller will take care of that. For example, to import
+//  all symbols:
+//  
+//     with (dojo.hostenv.loadModule("A.B")) {
+//        ...
+//     }
+//  
+//  And to import just the leaf symbol:
+//  
+//     var B = dojo.hostenv.loadModule("A.B");
+//     ...
+//  
+//  dj_load is an alias for dojo.hostenv.loadModule
+
+  if(!moduleName){ return; }
+  omitModuleCheck = this._global_omit_module_check || omitModuleCheck;
+  var module = this.findModule(moduleName, false);
+  if(module){
+    return module;
+  }
+
+  // protect against infinite recursion from mutual dependencies
+  if(dj_undef(moduleName, this.loading_modules_)){
+    this.addedToLoadingCount.push(moduleName);
+  }
+  this.loading_modules_[moduleName] = 1;
+
+  // convert periods to slashes
+  var relpath = moduleName.replace(/\./g, '/') + '.js';
+
+  var nsyms = moduleName.split(".");
+  
+  // this line allowed loading of a module manifest as if it were a namespace
+  // it's an interesting idea, but shouldn't be combined with 'namespaces' proper
+  // and leads to unwanted dependencies
+  // the effect can be achieved in other (albeit less-flexible) ways now, so I am
+  // removing this pending further design work
+  // perhaps we can explicitly define this idea of a 'module manifest', and subclass
+  // 'namespace manifest' from that
+  //dojo.getNamespace(nsyms[0]);
+
+  var syms = this.getModuleSymbols(moduleName);
+  var startedRelative = ((syms[0].charAt(0) != '/') && !syms[0].match(/^\w+:/));
+  var last = syms[syms.length - 1];
+  var ok;
+  // figure out if we're looking for a full package, if so, we want to do
+  // things slightly diffrently
+  if(last=="*"){
+    moduleName = nsyms.slice(0, -1).join('.');
+    while(syms.length){
+      syms.pop();
+      syms.push(this.pkgFileName);
+      relpath = syms.join("/") + '.js';
+      if(startedRelative && relpath.charAt(0)=="/"){
+        relpath = relpath.slice(1);
+      }
+      ok = this.loadPath(relpath, !omitModuleCheck ? moduleName : null);
+      if(ok){ break; }
+      syms.pop();
+    }
+  }else{
+    relpath = syms.join("/") + '.js';
+    moduleName = nsyms.join('.');
+    var modArg = !omitModuleCheck ? moduleName : null;
+    ok = this.loadPath(relpath, modArg);
+    if(!ok && !exactOnly){
+      syms.pop();
+      while(syms.length){
+        relpath = syms.join('/') + '.js';
+        ok = this.loadPath(relpath, modArg);
+        if(ok){ break; }
+        syms.pop();
+        relpath = syms.join('/') + '/'+this.pkgFileName+'.js';
+        if(startedRelative && relpath.charAt(0)=="/"){
+          relpath = relpath.slice(1);
+        }
+        ok = this.loadPath(relpath, modArg);
+        if(ok){ break; }
+      }
+    }
+
+    if(!ok && !omitModuleCheck){
+      dojo.raise("Could not load '" + moduleName + "'; last tried '" + relpath + "'");
+    }
+  }
+
+  // check that the symbol was defined
+  //Don't bother if we're doing xdomain (asynchronous) loading.
+  if(!omitModuleCheck && !this["isXDomain"]){
+    // pass in false so we can give better error
+    module = this.findModule(moduleName, false);
+    if(!module){
+      dojo.raise("symbol '" + moduleName + "' is not defined after loading '" + relpath + "'"); 
+    }
+  }
+
+  return module;
+}
+
+dojo.hostenv.startPackage = function(/*String*/packageName){
+// summary:
+//  Creates a JavaScript package
+//
+// description:
+//  startPackage("A.B") follows the path, and at each level creates a new empty
+//  object or uses what already exists. It returns the result.
+//
+// packageName: the package to be created as a String in dot notation
+
+  //Make sure we have a string.
+  var fullPkgName = String(packageName);
+  var strippedPkgName = fullPkgName;
+
+  var syms = packageName.split(/\./);
+  if(syms[syms.length-1]=="*"){
+    syms.pop();
+    strippedPkgName = syms.join(".");
+  }
+  var evaledPkg = dojo.evalObjPath(strippedPkgName, true);
+  this.loaded_modules_[fullPkgName] = evaledPkg;
+  this.loaded_modules_[strippedPkgName] = evaledPkg;
+  
+  return evaledPkg; // Object
+}
+
+dojo.hostenv.findModule = function(/*String*/moduleName, /*Boolean?*/mustExist){
+// summary:
+//  Returns the Object representing the module, if it exists, otherwise null.
+//
+// moduleName A fully qualified module including package name, like 'A.B'.
+// mustExist Optional, default false. throw instead of returning null
+//  if the module does not currently exist.
+
+  var lmn = String(moduleName);
+
+  if(this.loaded_modules_[lmn]){
+    return this.loaded_modules_[lmn]; // Object
+  }
+
+  if(mustExist){
+    dojo.raise("no loaded module named '" + moduleName + "'");
+  }
+  return null; // null
+}
+
+//Start of old bootstrap2:
+
+dojo.kwCompoundRequire = function(/*Object containing Arrays*/modMap){
+// description:
+//  This method taks a "map" of arrays which one can use to optionally load dojo
+//  modules. The map is indexed by the possible dojo.hostenv.name_ values, with
+//  two additional values: "default" and "common". The items in the "default"
+//  array will be loaded if none of the other items have been choosen based on
+//  the hostenv.name_ item. The items in the "common" array will _always_ be
+//  loaded, regardless of which list is chosen.  Here's how it's normally
+//  called:
+//  
+//  dojo.kwCompoundRequire({
+//    browser: [
+//      ["foo.bar.baz", true, true], // an example that passes multiple args to loadModule()
+//      "foo.sample.*",
+//      "foo.test,
+//    ],
+//    default: [ "foo.sample.*" ],
+//    common: [ "really.important.module.*" ]
+//  });
+
+  var common = modMap["common"]||[];
+  var result = modMap[dojo.hostenv.name_] ? common.concat(modMap[dojo.hostenv.name_]||[]) : common.concat(modMap["default"]||[]);
+
+  for(var x=0; x<result.length; x++){
+    var curr = result[x];
+    if(curr.constructor == Array){
+      dojo.hostenv.loadModule.apply(dojo.hostenv, curr);
+    }else{
+      dojo.hostenv.loadModule(curr);
+    }
+  }
+}
+
+dojo.require = function(/*String*/ resourceName){
+  // summary
+  //  Ensure that the given resource (ie, javascript
+  //  source file) has been loaded.
+  // description
+  //  dojo.require() is similar to C's #include command or java's "import" command.
+  //  You call dojo.require() to pull in the resources (ie, javascript source files)
+  //  that define the functions you are using. 
+  //
+  //  Note that in the case of a build, many resources have already been included
+  //  into dojo.js (ie, many of the javascript source files have been compressed and
+  //  concatened into dojo.js), so many dojo.require() calls will simply return
+  //  without downloading anything.
+  dojo.hostenv.loadModule.apply(dojo.hostenv, arguments);
+}
+
+dojo.requireIf = function(/*Boolean*/ condition, /*String*/ resourceName){
+  // summary
+  //  If the condition is true then call dojo.require() for the specified resource
+  var arg0 = arguments[0];
+  if((arg0 === true)||(arg0=="common")||(arg0 && dojo.render[arg0].capable)){
+    var args = [];
+    for (var i = 1; i < arguments.length; i++) { args.push(arguments[i]); }
+    dojo.require.apply(dojo, args);
+  }
+}
+
+dojo.requireAfterIf = dojo.requireIf;
+
+dojo.provide = function(/*String*/ resourceName){
+  // summary
+  //  Each javascript source file must have (exactly) one dojo.provide()
+  //  call at the top of the file, corresponding to the file name.
+  //  For example, dojo/src/foo.js must have dojo.provide("dojo.foo"); at the top of the file.
+  //
+  // description
+  //  Each javascript source file is called a resource.  When a resource
+  //  is loaded by the browser, dojo.provide() registers that it has
+  //  been loaded.
+  //  
+  //  For backwards compatibility reasons, in addition to registering the resource,
+  //  dojo.provide() also ensures that the javascript object for the module exists.  For
+  //  example, dojo.provide("dojo.html.common"), in addition to registering that common.js
+  //  is a resource for the dojo.html module, will ensure that the dojo.html javascript object
+  //  exists, so that calls like dojo.html.foo = function(){ ... } don't fail.
+  //
+  //  In the case of a build (or in the future, a rollup), where multiple javascript source
+  //  files are combined into one bigger file (similar to a .lib or .jar file), that file
+  //  will contain multiple dojo.provide() calls, to note that it includes
+  //  multiple resources.
+  return dojo.hostenv.startPackage.apply(dojo.hostenv, arguments);
+}
+
+dojo.registerModulePath = function(/*String*/module, /*String*/prefix){
+  // summary: maps a module name to a path
+  // description: An unregistered module is given the default path of ../<module>,
+  //  relative to Dojo root. For example, module acme is mapped to ../acme.
+  //  If you want to use a different module name, use dojo.registerModulePath. 
+  return dojo.hostenv.setModulePrefix(module, prefix);
+}
+
+dojo.setModulePrefix = function(/*String*/module, /*String*/prefix){
+  // summary: maps a module name to a path
+  dojo.deprecated('dojo.setModulePrefix("' + module + '", "' + prefix + '")', "replaced by dojo.registerModulePath", "0.5");
+  return dojo.registerModulePath(module, prefix);
+}
+
+dojo.exists = function(/*Object*/obj, /*String*/name){
+  // summary: determine if an object supports a given method
+  // description: useful for longer api chains where you have to test each object in the chain
+  var p = name.split(".");
+  for(var i = 0; i < p.length; i++){
+    if(!obj[p[i]]){ return false; } // Boolean
+    obj = obj[p[i]];
+  }
+  return true; // Boolean
+}
+
+// Localization routines
+
+dojo.hostenv.normalizeLocale = function(/*String?*/locale){
+//  summary:
+//    Returns canonical form of locale, as used by Dojo.  All variants are case-insensitive and are separated by '-'
+//    as specified in RFC 3066. If no locale is specified, the user agent's default is returned.
+
+  return locale ? locale.toLowerCase() : dojo.locale; // String
 };
+
+dojo.hostenv.searchLocalePath = function(/*String*/locale, /*Boolean*/down, /*Function*/searchFunc){
+//  summary:
+//    A helper method to assist in searching for locale-based resources.  Will iterate through
+//    the variants of a particular locale, either up or down, executing a callback function.
+//    For example, "en-us" and true will try "en-us" followed by "en" and finally "ROOT".
+
+  locale = dojo.hostenv.normalizeLocale(locale);
+
+  var elements = locale.split('-');
+  var searchlist = [];
+  for(var i = elements.length; i > 0; i--){
+    searchlist.push(elements.slice(0, i).join('-'));
+  }
+  searchlist.push(false);
+  if(down){searchlist.reverse();}
+
+  for(var j = searchlist.length - 1; j >= 0; j--){
+    var loc = searchlist[j] || "ROOT";
+    var stop = searchFunc(loc);
+    if(stop){ break; }
+  }
+}
+
+//These two functions are placed outside of preloadLocalizations
+//So that the xd loading can use/override them.
+dojo.hostenv.localesGenerated /***BUILD:localesGenerated***/; // value will be inserted here at build time, if necessary
+
+dojo.hostenv.registerNlsPrefix = function(){
+// summary:
+//  Register module "nls" to point where Dojo can find pre-built localization files
+  dojo.registerModulePath("nls","nls"); 
+}
+
+dojo.hostenv.preloadLocalizations = function(){
+// summary:
+//  Load built, flattened resource bundles, if available for all locales used in the page.
+//  Execute only once.  Note that this is a no-op unless there is a build.
+
+  if(dojo.hostenv.localesGenerated){
+    dojo.hostenv.registerNlsPrefix();
+
+    function preload(locale){
+      locale = dojo.hostenv.normalizeLocale(locale);
+      dojo.hostenv.searchLocalePath(locale, true, function(loc){
+        for(var i=0; i<dojo.hostenv.localesGenerated.length;i++){
+          if(dojo.hostenv.localesGenerated[i] == loc){
+            dojo["require"]("nls.dojo_"+loc);
+            return true; // Boolean
+          }
+        }
+        return false; // Boolean
+      });
+    }
+    preload();
+    var extra = djConfig.extraLocale||[];
+    for(var i=0; i<extra.length; i++){
+      preload(extra[i]);
+    }
+  }
+  dojo.hostenv.preloadLocalizations = function(){};
+}
+
+dojo.requireLocalization = function(/*String*/moduleName, /*String*/bundleName, /*String?*/locale){
+// summary:
+//  Declares translated resources and loads them if necessary, in the same style as dojo.require.
+//  Contents of the resource bundle are typically strings, but may be any name/value pair,
+//  represented in JSON format.  See also dojo.i18n.getLocalization.
+//
+// moduleName: name of the package containing the "nls" directory in which the bundle is found
+// bundleName: bundle name, i.e. the filename without the '.js' suffix
+// locale: the locale to load (optional)  By default, the browser's user locale as defined by dojo.locale
+//
+// description:
+//  Load translated resource bundles provided underneath the "nls" directory within a package.
+//  Translated resources may be located in different packages throughout the source tree.  For example,
+//  a particular widget may define one or more resource bundles, structured in a program as follows,
+//  where moduleName is mycode.mywidget and bundleNames available include bundleone and bundletwo:
+//  ...
+//  mycode/
+//   mywidget/
+//    nls/
+//     bundleone.js (the fallback translation, English in this example)
+//     bundletwo.js (also a fallback translation)
+//     de/
+//      bundleone.js
+//      bundletwo.js
+//     de-at/
+//      bundleone.js
+//     en/
+//      (empty; use the fallback translation)
+//     en-us/
+//      bundleone.js
+//     en-gb/
+//      bundleone.js
+//     es/
+//      bundleone.js
+//      bundletwo.js
+//    ...etc
+//  ...
+//  Each directory is named for a locale as specified by RFC 3066, (http://www.ietf.org/rfc/rfc3066.txt),
+//  normalized in lowercase.  Note that the two bundles in the example do not define all the same variants.
+//  For a given locale, bundles will be loaded for that locale and all more general locales above it, including
+//  a fallback at the root directory.  For example, a declaration for the "de-at" locale will first
+//  load nls/de-at/bundleone.js, then nls/de/bundleone.js and finally nls/bundleone.js.  The data will
+//  be flattened into a single Object so that lookups will follow this cascading pattern.  An optional build
+//  step can preload the bundles to avoid data redundancy and the multiple network hits normally required to
+//  load these resources.
+
+  dojo.hostenv.preloadLocalizations();
+  var bundlePackage = [moduleName, "nls", bundleName].join(".");
+//NOTE: When loading these resources, the packaging does not match what is on disk.  This is an
+// implementation detail, as this is just a private data structure to hold the loaded resources.
+// e.g. tests/hello/nls/en-us/salutations.js is loaded as the object tests.hello.nls.salutations.en_us={...}
+// The structure on disk is intended to be most convenient for developers and translators, but in memory
+// it is more logical and efficient to store in a different order.  Locales cannot use dashes, since the
+// resulting path will not evaluate as valid JS, so we translate them to underscores.
+
+  var bundle = dojo.hostenv.findModule(bundlePackage);
+  if(bundle){
+    if(djConfig.localizationComplete && bundle._built){return;}
+    var jsLoc = dojo.hostenv.normalizeLocale(locale).replace('-', '_');
+    var translationPackage = bundlePackage+"."+jsLoc;
+    if(dojo.hostenv.findModule(translationPackage)){return;}
+  }
+
+  bundle = dojo.hostenv.startPackage(bundlePackage);
+  var syms = dojo.hostenv.getModuleSymbols(moduleName);
+  var modpath = syms.concat("nls").join("/");
+  var parent;
+  dojo.hostenv.searchLocalePath(locale, false, function(loc){
+    var jsLoc = loc.replace('-', '_');
+    var translationPackage = bundlePackage + "." + jsLoc;
+    var loaded = false;
+    if(!dojo.hostenv.findModule(translationPackage)){
+      // Mark loaded whether it's found or not, so that further load attempts will not be made
+      dojo.hostenv.startPackage(translationPackage);
+      var module = [modpath];
+      if(loc != "ROOT"){module.push(loc);}
+      module.push(bundleName);
+      var filespec = module.join("/") + '.js';
+      loaded = dojo.hostenv.loadPath(filespec, null, function(hash){
+        // Use singleton with prototype to point to parent bundle, then mix-in result from loadPath
+        var clazz = function(){};
+        clazz.prototype = parent;
+        bundle[jsLoc] = new clazz();
+        for(var j in hash){ bundle[jsLoc][j] = hash[j]; }
+      });
+    }else{
+      loaded = true;
+    }
+    if(loaded && bundle[jsLoc]){
+      parent = bundle[jsLoc];
+    }else{
+      bundle[jsLoc] = parent;
+    }
+  });
+};
+
 (function(){
-var _26={pkgFileName:"__package__",loading_modules_:{},loaded_modules_:{},addedToLoadingCount:[],removedFromLoadingCount:[],inFlightCount:0,modulePrefixes_:{dojo:{name:"dojo",value:"src"}},setModulePrefix:function(_27,_28){
-this.modulePrefixes_[_27]={name:_27,value:_28};
-},moduleHasPrefix:function(_29){
-var mp=this.modulePrefixes_;
-return Boolean(mp[_29]&&mp[_29].value);
-},getModulePrefix:function(_2b){
-if(this.moduleHasPrefix(_2b)){
-return this.modulePrefixes_[_2b].value;
-}
-return _2b;
-},getTextStack:[],loadUriStack:[],loadedUris:[],post_load_:false,modulesLoadedListeners:[],unloadListeners:[],loadNotifying:false};
-for(var _2c in _26){
-dojo.hostenv[_2c]=_26[_2c];
-}
+  // If other locales are used, dojo.requireLocalization should load them as well, by default.
+  // Override dojo.requireLocalization to do load the default bundle, then iterate through the
+  // extraLocale list and load those translations as well, unless a particular locale was requested.
+
+  var extra = djConfig.extraLocale;
+  if(extra){
+    if(!extra instanceof Array){
+      extra = [extra];
+    }
+
+    var req = dojo.requireLocalization;
+    dojo.requireLocalization = function(m, b, locale){
+      req(m,b,locale);
+      if(locale){return;}
+      for(var i=0; i<extra.length; i++){
+        req(m,b,extra[i]);
+      }
+    };
+  }
 })();
-dojo.hostenv.loadPath=function(_2d,_2e,cb){
-var uri;
-if(_2d.charAt(0)=="/"||_2d.match(/^\w+:/)){
-uri=_2d;
-}else{
-uri=this.getBaseScriptUri()+_2d;
-}
-if(djConfig.cacheBust&&dojo.render.html.capable){
-uri+="?"+String(djConfig.cacheBust).replace(/\W+/g,"");
-}
-try{
-return !_2e?this.loadUri(uri,cb):this.loadUriAndCheck(uri,_2e,cb);
-}
-catch(e){
-dojo.debug(e);
-return false;
-}
+
 };
-dojo.hostenv.loadUri=function(uri,cb){
-if(this.loadedUris[uri]){
-return true;
-}
-var _33=this.getText(uri,null,true);
-if(!_33){
-return false;
-}
-this.loadedUris[uri]=true;
-if(cb){
-_33="("+_33+")";
-}
-var _34=dj_eval(_33);
-if(cb){
-cb(_34);
-}
-return true;
-};
-dojo.hostenv.loadUriAndCheck=function(uri,_36,cb){
-var ok=true;
-try{
-ok=this.loadUri(uri,cb);
-}
-catch(e){
-dojo.debug("failed loading ",uri," with error: ",e);
-}
-return Boolean(ok&&this.findModule(_36,false));
-};
-dojo.loaded=function(){
-};
-dojo.unloaded=function(){
-};
-dojo.hostenv.loaded=function(){
-this.loadNotifying=true;
-this.post_load_=true;
-var mll=this.modulesLoadedListeners;
-for(var x=0;x<mll.length;x++){
-mll[x]();
-}
-this.modulesLoadedListeners=[];
-this.loadNotifying=false;
-dojo.loaded();
-};
-dojo.hostenv.unloaded=function(){
-var mll=this.unloadListeners;
-while(mll.length){
-(mll.pop())();
-}
-dojo.unloaded();
-};
-dojo.addOnLoad=function(obj,_3d){
-var dh=dojo.hostenv;
-if(arguments.length==1){
-dh.modulesLoadedListeners.push(obj);
-}else{
-if(arguments.length>1){
-dh.modulesLoadedListeners.push(function(){
-obj[_3d]();
-});
-}
-}
-if(dh.post_load_&&dh.inFlightCount==0&&!dh.loadNotifying){
-dh.callLoaded();
-}
-};
-dojo.addOnUnload=function(obj,_40){
-var dh=dojo.hostenv;
-if(arguments.length==1){
-dh.unloadListeners.push(obj);
-}else{
-if(arguments.length>1){
-dh.unloadListeners.push(function(){
-obj[_40]();
-});
-}
-}
-};
-dojo.hostenv.modulesLoaded=function(){
-if(this.post_load_){
-return;
-}
-if(this.loadUriStack.length==0&&this.getTextStack.length==0){
-if(this.inFlightCount>0){
-dojo.debug("files still in flight!");
-return;
-}
-dojo.hostenv.callLoaded();
-}
-};
-dojo.hostenv.callLoaded=function(){
-if(typeof setTimeout=="object"){
-setTimeout("dojo.hostenv.loaded();",0);
-}else{
-dojo.hostenv.loaded();
-}
-};
-dojo.hostenv.getModuleSymbols=function(_42){
-var _43=_42.split(".");
-for(var i=_43.length;i>0;i--){
-var _45=_43.slice(0,i).join(".");
-if((i==1)&&!this.moduleHasPrefix(_45)){
-_43[0]="../"+_43[0];
-}else{
-var _46=this.getModulePrefix(_45);
-if(_46!=_45){
-_43.splice(0,i,_46);
-break;
-}
-}
-}
-return _43;
-};
-dojo.hostenv._global_omit_module_check=false;
-dojo.hostenv.loadModule=function(_47,_48,_49){
-if(!_47){
-return;
-}
-_49=this._global_omit_module_check||_49;
-var _4a=this.findModule(_47,false);
-if(_4a){
-return _4a;
-}
-if(dj_undef(_47,this.loading_modules_)){
-this.addedToLoadingCount.push(_47);
-}
-this.loading_modules_[_47]=1;
-var _4b=_47.replace(/\./g,"/")+".js";
-var _4c=_47.split(".");
-var _4d=this.getModuleSymbols(_47);
-var _4e=((_4d[0].charAt(0)!="/")&&!_4d[0].match(/^\w+:/));
-var _4f=_4d[_4d.length-1];
-var ok;
-if(_4f=="*"){
-_47=_4c.slice(0,-1).join(".");
-while(_4d.length){
-_4d.pop();
-_4d.push(this.pkgFileName);
-_4b=_4d.join("/")+".js";
-if(_4e&&_4b.charAt(0)=="/"){
-_4b=_4b.slice(1);
-}
-ok=this.loadPath(_4b,!_49?_47:null);
-if(ok){
-break;
-}
-_4d.pop();
-}
-}else{
-_4b=_4d.join("/")+".js";
-_47=_4c.join(".");
-var _51=!_49?_47:null;
-ok=this.loadPath(_4b,_51);
-if(!ok&&!_48){
-_4d.pop();
-while(_4d.length){
-_4b=_4d.join("/")+".js";
-ok=this.loadPath(_4b,_51);
-if(ok){
-break;
-}
-_4d.pop();
-_4b=_4d.join("/")+"/"+this.pkgFileName+".js";
-if(_4e&&_4b.charAt(0)=="/"){
-_4b=_4b.slice(1);
-}
-ok=this.loadPath(_4b,_51);
-if(ok){
-break;
-}
-}
-}
-if(!ok&&!_49){
-dojo.raise("Could not load '"+_47+"'; last tried '"+_4b+"'");
-}
-}
-if(!_49&&!this["isXDomain"]){
-_4a=this.findModule(_47,false);
-if(!_4a){
-dojo.raise("symbol '"+_47+"' is not defined after loading '"+_4b+"'");
-}
-}
-return _4a;
-};
-dojo.hostenv.startPackage=function(_52){
-var _53=String(_52);
-var _54=_53;
-var _55=_52.split(/\./);
-if(_55[_55.length-1]=="*"){
-_55.pop();
-_54=_55.join(".");
-}
-var _56=dojo.evalObjPath(_54,true);
-this.loaded_modules_[_53]=_56;
-this.loaded_modules_[_54]=_56;
-return _56;
-};
-dojo.hostenv.findModule=function(_57,_58){
-var lmn=String(_57);
-if(this.loaded_modules_[lmn]){
-return this.loaded_modules_[lmn];
-}
-if(_58){
-dojo.raise("no loaded module named '"+_57+"'");
-}
-return null;
-};
-dojo.kwCompoundRequire=function(_5a){
-var _5b=_5a["common"]||[];
-var _5c=_5a[dojo.hostenv.name_]?_5b.concat(_5a[dojo.hostenv.name_]||[]):_5b.concat(_5a["default"]||[]);
-for(var x=0;x<_5c.length;x++){
-var _5e=_5c[x];
-if(_5e.constructor==Array){
-dojo.hostenv.loadModule.apply(dojo.hostenv,_5e);
-}else{
-dojo.hostenv.loadModule(_5e);
-}
-}
-};
-dojo.require=function(_5f){
-dojo.hostenv.loadModule.apply(dojo.hostenv,arguments);
-};
-dojo.requireIf=function(_60,_61){
-var _62=arguments[0];
-if((_62===true)||(_62=="common")||(_62&&dojo.render[_62].capable)){
-var _63=[];
-for(var i=1;i<arguments.length;i++){
-_63.push(arguments[i]);
-}
-dojo.require.apply(dojo,_63);
-}
-};
-dojo.requireAfterIf=dojo.requireIf;
-dojo.provide=function(_65){
-return dojo.hostenv.startPackage.apply(dojo.hostenv,arguments);
-};
-dojo.registerModulePath=function(_66,_67){
-return dojo.hostenv.setModulePrefix(_66,_67);
-};
-dojo.setModulePrefix=function(_68,_69){
-dojo.deprecated("dojo.setModulePrefix(\""+_68+"\", \""+_69+"\")","replaced by dojo.registerModulePath","0.5");
-return dojo.registerModulePath(_68,_69);
-};
-dojo.exists=function(obj,_6b){
-var p=_6b.split(".");
-for(var i=0;i<p.length;i++){
-if(!obj[p[i]]){
-return false;
-}
-obj=obj[p[i]];
-}
-return true;
-};
-dojo.hostenv.normalizeLocale=function(_6e){
-return _6e?_6e.toLowerCase():dojo.locale;
-};
-dojo.hostenv.searchLocalePath=function(_6f,_70,_71){
-_6f=dojo.hostenv.normalizeLocale(_6f);
-var _72=_6f.split("-");
-var _73=[];
-for(var i=_72.length;i>0;i--){
-_73.push(_72.slice(0,i).join("-"));
-}
-_73.push(false);
-if(_70){
-_73.reverse();
-}
-for(var j=_73.length-1;j>=0;j--){
-var loc=_73[j]||"ROOT";
-var _77=_71(loc);
-if(_77){
-break;
-}
-}
-};
-dojo.hostenv.localesGenerated;
-dojo.hostenv.registerNlsPrefix=function(){
-dojo.registerModulePath("nls","nls");
-};
-dojo.hostenv.preloadLocalizations=function(){
-if(dojo.hostenv.localesGenerated){
-dojo.hostenv.registerNlsPrefix();
-function preload(_78){
-_78=dojo.hostenv.normalizeLocale(_78);
-dojo.hostenv.searchLocalePath(_78,true,function(loc){
-for(var i=0;i<dojo.hostenv.localesGenerated.length;i++){
-if(dojo.hostenv.localesGenerated[i]==loc){
-dojo["require"]("nls.dojo_"+loc);
-return true;
-}
-}
-return false;
-});
-}
-preload();
-var _7b=djConfig.extraLocale||[];
-for(var i=0;i<_7b.length;i++){
-preload(_7b[i]);
-}
-}
-dojo.hostenv.preloadLocalizations=function(){
-};
-};
-dojo.requireLocalization=function(_7d,_7e,_7f){
-dojo.hostenv.preloadLocalizations();
-var _80=[_7d,"nls",_7e].join(".");
-var _81=dojo.hostenv.findModule(_80);
-if(_81){
-if(djConfig.localizationComplete&&_81._built){
-return;
-}
-var _82=dojo.hostenv.normalizeLocale(_7f).replace("-","_");
-var _83=_80+"."+_82;
-if(dojo.hostenv.findModule(_83)){
-return;
-}
-}
-_81=dojo.hostenv.startPackage(_80);
-var _84=dojo.hostenv.getModuleSymbols(_7d);
-var _85=_84.concat("nls").join("/");
-var _86;
-dojo.hostenv.searchLocalePath(_7f,false,function(loc){
-var _88=loc.replace("-","_");
-var _89=_80+"."+_88;
-var _8a=false;
-if(!dojo.hostenv.findModule(_89)){
-dojo.hostenv.startPackage(_89);
-var _8b=[_85];
-if(loc!="ROOT"){
-_8b.push(loc);
-}
-_8b.push(_7e);
-var _8c=_8b.join("/")+".js";
-_8a=dojo.hostenv.loadPath(_8c,null,function(_8d){
-var _8e=function(){
-};
-_8e.prototype=_86;
-_81[_88]=new _8e();
-for(var j in _8d){
-_81[_88][j]=_8d[j];
-}
-});
-}else{
-_8a=true;
-}
-if(_8a&&_81[_88]){
-_86=_81[_88];
-}else{
-_81[_88]=_86;
-}
-});
-};
-(function(){
-var _90=djConfig.extraLocale;
-if(_90){
-if(!_90 instanceof Array){
-_90=[_90];
-}
-var req=dojo.requireLocalization;
-dojo.requireLocalization=function(m,b,_94){
-req(m,b,_94);
-if(_94){
-return;
-}
-for(var i=0;i<_90.length;i++){
-req(m,b,_90[i]);
-}
-};
-}
-})();
-}
-if(typeof window!="undefined"){
-(function(){
-if(djConfig.allowQueryConfig){
-var _96=document.location.toString();
-var _97=_96.split("?",2);
-if(_97.length>1){
-var _98=_97[1];
-var _99=_98.split("&");
-for(var x in _99){
-var sp=_99[x].split("=");
-if((sp[0].length>9)&&(sp[0].substr(0,9)=="djConfig.")){
-var opt=sp[0].substr(9);
-try{
-djConfig[opt]=eval(sp[1]);
-}
-catch(e){
-djConfig[opt]=sp[1];
-}
-}
-}
-}
-}
-if(((djConfig["baseScriptUri"]=="")||(djConfig["baseRelativePath"]==""))&&(document&&document.getElementsByTagName)){
-var _9d=document.getElementsByTagName("script");
-var _9e=/(__package__|dojo|bootstrap1)\.js([\?\.]|$)/i;
-for(var i=0;i<_9d.length;i++){
-var src=_9d[i].getAttribute("src");
-if(!src){
-continue;
-}
-var m=src.match(_9e);
-if(m){
-var _a2=src.substring(0,m.index);
-if(src.indexOf("bootstrap1")>-1){
-_a2+="../";
-}
-if(!this["djConfig"]){
-djConfig={};
-}
-if(djConfig["baseScriptUri"]==""){
-djConfig["baseScriptUri"]=_a2;
-}
-if(djConfig["baseRelativePath"]==""){
-djConfig["baseRelativePath"]=_a2;
-}
-break;
-}
-}
-}
-var dr=dojo.render;
-var drh=dojo.render.html;
-var drs=dojo.render.svg;
-var dua=(drh.UA=navigator.userAgent);
-var dav=(drh.AV=navigator.appVersion);
-var t=true;
-var f=false;
-drh.capable=t;
-drh.support.builtin=t;
-dr.ver=parseFloat(drh.AV);
-dr.os.mac=dav.indexOf("Macintosh")>=0;
-dr.os.win=dav.indexOf("Windows")>=0;
-dr.os.linux=dav.indexOf("X11")>=0;
-drh.opera=dua.indexOf("Opera")>=0;
-drh.khtml=(dav.indexOf("Konqueror")>=0)||(dav.indexOf("Safari")>=0);
-drh.safari=dav.indexOf("Safari")>=0;
-var _aa=dua.indexOf("Gecko");
-drh.mozilla=drh.moz=(_aa>=0)&&(!drh.khtml);
-if(drh.mozilla){
-drh.geckoVersion=dua.substring(_aa+6,_aa+14);
-}
-drh.ie=(document.all)&&(!drh.opera);
-drh.ie50=drh.ie&&dav.indexOf("MSIE 5.0")>=0;
-drh.ie55=drh.ie&&dav.indexOf("MSIE 5.5")>=0;
-drh.ie60=drh.ie&&dav.indexOf("MSIE 6.0")>=0;
-drh.ie70=drh.ie&&dav.indexOf("MSIE 7.0")>=0;
-var cm=document["compatMode"];
-drh.quirks=(cm=="BackCompat")||(cm=="QuirksMode")||drh.ie55||drh.ie50;
-dojo.locale=dojo.locale||(drh.ie?navigator.userLanguage:navigator.language).toLowerCase();
-dr.vml.capable=drh.ie;
-drs.capable=f;
-drs.support.plugin=f;
-drs.support.builtin=f;
-var _ac=window["document"];
-var tdi=_ac["implementation"];
-if((tdi)&&(tdi["hasFeature"])&&(tdi.hasFeature("org.w3c.dom.svg","1.0"))){
-drs.capable=t;
-drs.support.builtin=t;
-drs.support.plugin=f;
-}
-if(drh.safari){
-var tmp=dua.split("AppleWebKit/")[1];
-var ver=parseFloat(tmp.split(" ")[0]);
-if(ver>=420){
-drs.capable=t;
-drs.support.builtin=t;
-drs.support.plugin=f;
-}
-}
+
+if (typeof window != 'undefined') {
+
+// attempt to figure out the path to dojo if it isn't set in the config
+(function() {
+  // before we get any further with the config options, try to pick them out
+  // of the URL. Most of this code is from NW
+  if(djConfig.allowQueryConfig){
+    var baseUrl = document.location.toString(); // FIXME: use location.query instead?
+    var params = baseUrl.split("?", 2);
+    if(params.length > 1){
+      var paramStr = params[1];
+      var pairs = paramStr.split("&");
+      for(var x in pairs){
+        var sp = pairs[x].split("=");
+        // FIXME: is this eval dangerous?
+        if((sp[0].length > 9)&&(sp[0].substr(0, 9) == "djConfig.")){
+          var opt = sp[0].substr(9);
+          try{
+            djConfig[opt]=eval(sp[1]);
+          }catch(e){
+            djConfig[opt]=sp[1];
+          }
+        }
+      }
+    }
+  }
+
+  if(((djConfig["baseScriptUri"] == "")||(djConfig["baseRelativePath"] == "")) &&(document && document.getElementsByTagName)){
+    var scripts = document.getElementsByTagName("script");
+    var rePkg = /(__package__|dojo|bootstrap1)\.js([\?\.]|$)/i;
+    for(var i = 0; i < scripts.length; i++) {
+      var src = scripts[i].getAttribute("src");
+      if(!src) { continue; }
+      var m = src.match(rePkg);
+      if(m) {
+        var root = src.substring(0, m.index);
+        if(src.indexOf("bootstrap1") > -1) { root += "../"; }
+        if(!this["djConfig"]) { djConfig = {}; }
+        if(djConfig["baseScriptUri"] == "") { djConfig["baseScriptUri"] = root; }
+        if(djConfig["baseRelativePath"] == "") { djConfig["baseRelativePath"] = root; }
+        break;
+      }
+    }
+  }
+
+  // fill in the rendering support information in dojo.render.*
+  var dr = dojo.render;
+  var drh = dojo.render.html;
+  var drs = dojo.render.svg;
+  var dua = (drh.UA = navigator.userAgent);
+  var dav = (drh.AV = navigator.appVersion);
+  var t = true;
+  var f = false;
+  drh.capable = t;
+  drh.support.builtin = t;
+
+  dr.ver = parseFloat(drh.AV);
+  dr.os.mac = dav.indexOf("Macintosh") >= 0;
+  dr.os.win = dav.indexOf("Windows") >= 0;
+  // could also be Solaris or something, but it's the same browser
+  dr.os.linux = dav.indexOf("X11") >= 0;
+
+  drh.opera = dua.indexOf("Opera") >= 0;
+  drh.khtml = (dav.indexOf("Konqueror") >= 0)||(dav.indexOf("Safari") >= 0);
+  drh.safari = dav.indexOf("Safari") >= 0;
+  var geckoPos = dua.indexOf("Gecko");
+  drh.mozilla = drh.moz = (geckoPos >= 0)&&(!drh.khtml);
+  if (drh.mozilla) {
+    // gecko version is YYYYMMDD
+    drh.geckoVersion = dua.substring(geckoPos + 6, geckoPos + 14);
+  }
+  drh.ie = (document.all)&&(!drh.opera);
+  drh.ie50 = drh.ie && dav.indexOf("MSIE 5.0")>=0;
+  drh.ie55 = drh.ie && dav.indexOf("MSIE 5.5")>=0;
+  drh.ie60 = drh.ie && dav.indexOf("MSIE 6.0")>=0;
+  drh.ie70 = drh.ie && dav.indexOf("MSIE 7.0")>=0;
+
+  var cm = document["compatMode"];
+  drh.quirks = (cm == "BackCompat")||(cm == "QuirksMode")||drh.ie55||drh.ie50;
+
+  // TODO: is the HTML LANG attribute relevant?
+  dojo.locale = dojo.locale || (drh.ie ? navigator.userLanguage : navigator.language).toLowerCase();
+
+  dr.vml.capable=drh.ie;
+  drs.capable = f;
+  drs.support.plugin = f;
+  drs.support.builtin = f;
+  var tdoc = window["document"];
+  var tdi = tdoc["implementation"];
+
+  if((tdi)&&(tdi["hasFeature"])&&(tdi.hasFeature("org.w3c.dom.svg", "1.0"))){
+    drs.capable = t;
+    drs.support.builtin = t;
+    drs.support.plugin = f;
+  }
+  // webkits after 420 support SVG natively. The test string is "AppleWebKit/420+"
+  if(drh.safari){
+    var tmp = dua.split("AppleWebKit/")[1];
+    var ver = parseFloat(tmp.split(" ")[0]);
+    if(ver >= 420){
+      drs.capable = t;
+      drs.support.builtin = t;
+      drs.support.plugin = f;
+    }
+  }
 })();
+
 dojo.hostenv.startPackage("dojo.hostenv");
-dojo.render.name=dojo.hostenv.name_="browser";
-dojo.hostenv.searchIds=[];
-dojo.hostenv._XMLHTTP_PROGIDS=["Msxml2.XMLHTTP","Microsoft.XMLHTTP","Msxml2.XMLHTTP.4.0"];
-dojo.hostenv.getXmlhttpObject=function(){
-var _b0=null;
-var _b1=null;
-try{
-_b0=new XMLHttpRequest();
+
+dojo.render.name = dojo.hostenv.name_ = 'browser';
+dojo.hostenv.searchIds = [];
+
+// These are in order of decreasing likelihood; this will change in time.
+dojo.hostenv._XMLHTTP_PROGIDS = ['Msxml2.XMLHTTP', 'Microsoft.XMLHTTP', 'Msxml2.XMLHTTP.4.0'];
+
+dojo.hostenv.getXmlhttpObject = function(){
+    var http = null;
+  var last_e = null;
+  try{ http = new XMLHttpRequest(); }catch(e){}
+    if(!http){
+    for(var i=0; i<3; ++i){
+      var progid = dojo.hostenv._XMLHTTP_PROGIDS[i];
+      try{
+        http = new ActiveXObject(progid);
+      }catch(e){
+        last_e = e;
+      }
+
+      if(http){
+        dojo.hostenv._XMLHTTP_PROGIDS = [progid];  // so faster next time
+        break;
+      }
+    }
+
+    /*if(http && !http.toString) {
+      http.toString = function() { "[object XMLHttpRequest]"; }
+    }*/
+  }
+
+  if(!http){
+    return dojo.raise("XMLHTTP not available", last_e);
+  }
+
+  return http;
 }
-catch(e){
+
+/**
+ * Read the contents of the specified uri and return those contents.
+ *
+ * @param uri A relative or absolute uri. If absolute, it still must be in the
+ * same "domain" as we are.
+ *
+ * @param async_cb If not specified, load synchronously. If specified, load
+ * asynchronously, and use async_cb as the progress handler which takes the
+ * xmlhttp object as its argument. If async_cb, this function returns null.
+ *
+ * @param fail_ok Default false. If fail_ok and !async_cb and loading fails,
+ * return null instead of throwing.
+ */
+dojo.hostenv._blockAsync = false;
+dojo.hostenv.getText = function(uri, async_cb, fail_ok){
+  // need to block async callbacks from snatching this thread as the result
+  // of an async callback might call another sync XHR, this hangs khtml forever
+  // hostenv._blockAsync must also be checked in BrowserIO's watchInFlight()
+  // NOTE: must be declared before scope switches ie. this.getXmlhttpObject()
+  if(!async_cb){ this._blockAsync = true; }
+
+  var http = this.getXmlhttpObject();
+
+  function isDocumentOk(http){
+    var stat = http["status"];
+    // allow a 304 use cache, needed in konq (is this compliant with the http spec?)
+    return Boolean((!stat)||((200 <= stat)&&(300 > stat))||(stat==304));
+  }
+
+  if(async_cb){
+    var _this = this, timer = null, gbl = dojo.global();
+    var xhr = dojo.evalObjPath("dojo.io.XMLHTTPTransport");
+    http.onreadystatechange = function(){
+      if(timer){ gbl.clearTimeout(timer); timer = null; }
+      if(_this._blockAsync || (xhr && xhr._blockAsync)){
+        timer = gbl.setTimeout(function () { http.onreadystatechange.apply(this); }, 10);
+      }else{
+        if(4==http.readyState){
+          if(isDocumentOk(http)){
+            // dojo.debug("LOADED URI: "+uri);
+            async_cb(http.responseText);
+          }
+        }
+      }
+    }
+  }
+
+  http.open('GET', uri, async_cb ? true : false);
+  try{
+    http.send(null);
+    if(async_cb){
+      return null;
+    }
+    if(!isDocumentOk(http)){
+      var err = Error("Unable to load "+uri+" status:"+ http.status);
+      err.status = http.status;
+      err.responseText = http.responseText;
+      throw err;
+    }
+  }catch(e){
+    this._blockAsync = false;
+    if((fail_ok)&&(!async_cb)){
+      return null;
+    }else{
+      throw e;
+    }
+  }
+
+  this._blockAsync = false;
+  return http.responseText;
 }
-if(!_b0){
-for(var i=0;i<3;++i){
-var _b3=dojo.hostenv._XMLHTTP_PROGIDS[i];
-try{
-_b0=new ActiveXObject(_b3);
+
+/*
+ * It turns out that if we check *right now*, as this script file is being loaded,
+ * then the last script element in the window DOM is ourselves.
+ * That is because any subsequent script elements haven't shown up in the document
+ * object yet.
+ */
+ /*
+function dj_last_script_src() {
+    var scripts = window.document.getElementsByTagName('script');
+    if(scripts.length < 1){
+    dojo.raise("No script elements in window.document, so can't figure out my script src");
+  }
+    var script = scripts[scripts.length - 1];
+    var src = script.src;
+    if(!src){
+    dojo.raise("Last script element (out of " + scripts.length + ") has no src");
+  }
+    return src;
 }
-catch(e){
-_b1=e;
+
+if(!dojo.hostenv["library_script_uri_"]){
+  dojo.hostenv.library_script_uri_ = dj_last_script_src();
 }
-if(_b0){
-dojo.hostenv._XMLHTTP_PROGIDS=[_b3];
-break;
+*/
+
+dojo.hostenv.defaultDebugContainerId = 'dojoDebug';
+dojo.hostenv._println_buffer = [];
+dojo.hostenv._println_safe = false;
+dojo.hostenv.println = function (line){
+  if(!dojo.hostenv._println_safe){
+    dojo.hostenv._println_buffer.push(line);
+  }else{
+    try {
+      var console = document.getElementById(djConfig.debugContainerId ?
+        djConfig.debugContainerId : dojo.hostenv.defaultDebugContainerId);
+      if(!console) { console = dojo.body(); }
+
+      var div = document.createElement("div");
+      div.appendChild(document.createTextNode(line));
+      console.appendChild(div);
+    } catch (e) {
+      try{
+        // safari needs the output wrapped in an element for some reason
+        document.write("<div>" + line + "</div>");
+      }catch(e2){
+        window.status = line;
+      }
+    }
+  }
 }
-}
-}
-if(!_b0){
-return dojo.raise("XMLHTTP not available",_b1);
-}
-return _b0;
-};
-dojo.hostenv._blockAsync=false;
-dojo.hostenv.getText=function(uri,_b5,_b6){
-if(!_b5){
-this._blockAsync=true;
-}
-var _b7=this.getXmlhttpObject();
-function isDocumentOk(_b8){
-var _b9=_b8["status"];
-return Boolean((!_b9)||((200<=_b9)&&(300>_b9))||(_b9==304));
-}
-if(_b5){
-var _ba=this,_bb=null,gbl=dojo.global();
-var xhr=dojo.evalObjPath("dojo.io.XMLHTTPTransport");
-_b7.onreadystatechange=function(){
-if(_bb){
-gbl.clearTimeout(_bb);
-_bb=null;
-}
-if(_ba._blockAsync||(xhr&&xhr._blockAsync)){
-_bb=gbl.setTimeout(function(){
-_b7.onreadystatechange.apply(this);
-},10);
-}else{
-if(4==_b7.readyState){
-if(isDocumentOk(_b7)){
-_b5(_b7.responseText);
-}
-}
-}
-};
-}
-_b7.open("GET",uri,_b5?true:false);
-try{
-_b7.send(null);
-if(_b5){
-return null;
-}
-if(!isDocumentOk(_b7)){
-var err=Error("Unable to load "+uri+" status:"+_b7.status);
-err.status=_b7.status;
-err.responseText=_b7.responseText;
-throw err;
-}
-}
-catch(e){
-this._blockAsync=false;
-if((_b6)&&(!_b5)){
-return null;
-}else{
-throw e;
-}
-}
-this._blockAsync=false;
-return _b7.responseText;
-};
-dojo.hostenv.defaultDebugContainerId="dojoDebug";
-dojo.hostenv._println_buffer=[];
-dojo.hostenv._println_safe=false;
-dojo.hostenv.println=function(_bf){
-if(!dojo.hostenv._println_safe){
-dojo.hostenv._println_buffer.push(_bf);
-}else{
-try{
-var _c0=document.getElementById(djConfig.debugContainerId?djConfig.debugContainerId:dojo.hostenv.defaultDebugContainerId);
-if(!_c0){
-_c0=dojo.body();
-}
-var div=document.createElement("div");
-div.appendChild(document.createTextNode(_bf));
-_c0.appendChild(div);
-}
-catch(e){
-try{
-document.write("<div>"+_bf+"</div>");
-}
-catch(e2){
-window.status=_bf;
-}
-}
-}
-};
+
 dojo.addOnLoad(function(){
-dojo.hostenv._println_safe=true;
-while(dojo.hostenv._println_buffer.length>0){
-dojo.hostenv.println(dojo.hostenv._println_buffer.shift());
-}
+  dojo.hostenv._println_safe = true;
+  while(dojo.hostenv._println_buffer.length > 0){
+    dojo.hostenv.println(dojo.hostenv._println_buffer.shift());
+  }
 });
-function dj_addNodeEvtHdlr(_c2,_c3,fp,_c5){
-var _c6=_c2["on"+_c3]||function(){
-};
-_c2["on"+_c3]=function(){
-fp.apply(_c2,arguments);
-_c6.apply(_c2,arguments);
-};
-return true;
+
+function dj_addNodeEvtHdlr(node, evtName, fp, capture){
+  var oldHandler = node["on"+evtName] || function(){};
+  node["on"+evtName] = function(){
+    fp.apply(node, arguments);
+    oldHandler.apply(node, arguments);
+  }
+  return true;
 }
+
+//  BEGIN DOMContentLoaded, from Dean Edwards (http://dean.edwards.name/weblog/2006/06/again/)
 function dj_load_init(e){
-var _c8=(e&&e.type)?e.type.toLowerCase():"load";
-if(arguments.callee.initialized||(_c8!="domcontentloaded"&&_c8!="load")){
-return;
-}
-arguments.callee.initialized=true;
-if(typeof (_timer)!="undefined"){
-clearInterval(_timer);
-delete _timer;
-}
-var _c9=function(){
-if(dojo.render.html.ie){
-dojo.hostenv.makeWidgets();
-}
-};
-if(dojo.hostenv.inFlightCount==0){
-_c9();
-dojo.hostenv.modulesLoaded();
-}else{
-dojo.addOnLoad(_c9);
-}
+  // allow multiple calls, only first one will take effect
+  // A bug in khtml calls events callbacks for document for event which isnt supported
+  // for example a created contextmenu event calls DOMContentLoaded, workaround
+  var type = (e && e.type) ? e.type.toLowerCase() : "load";
+  if(arguments.callee.initialized || (type!="domcontentloaded" && type!="load")){ return; }
+  arguments.callee.initialized = true;
+  if(typeof(_timer) != 'undefined'){
+    clearInterval(_timer);
+    delete _timer;
+  }
+
+  var initFunc = function(){
+    //perform initialization
+    if(dojo.render.html.ie){
+      dojo.hostenv.makeWidgets();
+    }
+  };
+
+  if(dojo.hostenv.inFlightCount == 0){
+    initFunc();
+    dojo.hostenv.modulesLoaded();
+  }else{
+    dojo.addOnLoad(initFunc);
+  }
 }
+
+//  START DOMContentLoaded
+// Mozilla and Opera 9 expose the event we could use
 if(document.addEventListener){
-if(dojo.render.html.opera||(dojo.render.html.moz&&!djConfig.delayMozLoadingFix)){
-document.addEventListener("DOMContentLoaded",dj_load_init,null);
+  if(dojo.render.html.opera || (dojo.render.html.moz && !djConfig.delayMozLoadingFix)){
+    document.addEventListener("DOMContentLoaded", dj_load_init, null);
+  }
+
+  //  mainly for Opera 8.5, won't be fired if DOMContentLoaded fired already.
+  //  also used for Mozilla because of trac #1640
+  window.addEventListener("load", dj_load_init, null);
 }
-window.addEventListener("load",dj_load_init,null);
+
+//  for Internet Explorer. readyState will not be achieved on init call, but dojo doesn't need it
+//  however, we'll include it because we don't know if there are other functions added that might.
+//  Note that this has changed because the build process strips all comments--including conditional
+//    ones.
+if(dojo.render.html.ie && dojo.render.os.win){
+  document.attachEvent("onreadystatechange", function(e){
+    if(document.readyState == "complete"){
+      dj_load_init();
+    }
+  });
 }
-if(dojo.render.html.ie&&dojo.render.os.win){
-document.attachEvent("onreadystatechange",function(e){
-if(document.readyState=="complete"){
-dj_load_init();
-}
-});
-}
-if(/(WebKit|khtml)/i.test(navigator.userAgent)){
-var _timer=setInterval(function(){
-if(/loaded|complete/.test(document.readyState)){
-dj_load_init();
-}
-},10);
+
+if (/(WebKit|khtml)/i.test(navigator.userAgent)) { // sniff
+    var _timer = setInterval(function() {
+        if (/loaded|complete/.test(document.readyState)) {
+            dj_load_init(); // call the onload handler
+        }
+    }, 10);
 }
+//  END DOMContentLoaded
+
+// IE WebControl hosted in an application can fire "beforeunload" and "unload"
+// events when control visibility changes, causing Dojo to unload too soon. The
+// following code fixes the problem
+// Reference: http://support.microsoft.com/default.aspx?scid=kb;en-us;199155
 if(dojo.render.html.ie){
-dj_addNodeEvtHdlr(window,"beforeunload",function(){
-dojo.hostenv._unloading=true;
-window.setTimeout(function(){
-dojo.hostenv._unloading=false;
-},0);
+  dj_addNodeEvtHdlr(window, "beforeunload", function(){
+    dojo.hostenv._unloading = true;
+    window.setTimeout(function() {
+      dojo.hostenv._unloading = false;
+    }, 0);
+  });
+}
+
+dj_addNodeEvtHdlr(window, "unload", function(){
+  dojo.hostenv.unloaded();
+  if((!dojo.render.html.ie)||(dojo.render.html.ie && dojo.hostenv._unloading)){
+    dojo.hostenv.unloaded();
+  }
 });
+
+dojo.hostenv.makeWidgets = function(){
+  // you can put searchIds in djConfig and dojo.hostenv at the moment
+  // we should probably eventually move to one or the other
+  var sids = [];
+  if(djConfig.searchIds && djConfig.searchIds.length > 0) {
+    sids = sids.concat(djConfig.searchIds);
+  }
+  if(dojo.hostenv.searchIds && dojo.hostenv.searchIds.length > 0) {
+    sids = sids.concat(dojo.hostenv.searchIds);
+  }
+
+  if((djConfig.parseWidgets)||(sids.length > 0)){
+    if(dojo.evalObjPath("dojo.widget.Parse")){
+      // we must do this on a delay to avoid:
+      //  http://www.shaftek.org/blog/archives/000212.html
+      // (IE bug)
+        var parser = new dojo.xml.Parse();
+        if(sids.length > 0){
+          for(var x=0; x<sids.length; x++){
+            var tmpNode = document.getElementById(sids[x]);
+            if(!tmpNode){ continue; }
+            var frag = parser.parseElement(tmpNode, null, true);
+            dojo.widget.getParser().createComponents(frag);
+          }
+        }else if(djConfig.parseWidgets){
+          var frag  = parser.parseElement(dojo.body(), null, true);
+          dojo.widget.getParser().createComponents(frag);
+        }
+    }
+  }
 }
-dj_addNodeEvtHdlr(window,"unload",function(){
-dojo.hostenv.unloaded();
-if((!dojo.render.html.ie)||(dojo.render.html.ie&&dojo.hostenv._unloading)){
-dojo.hostenv.unloaded();
-}
-});
-dojo.hostenv.makeWidgets=function(){
-var _cb=[];
-if(djConfig.searchIds&&djConfig.searchIds.length>0){
-_cb=_cb.concat(djConfig.searchIds);
-}
-if(dojo.hostenv.searchIds&&dojo.hostenv.searchIds.length>0){
-_cb=_cb.concat(dojo.hostenv.searchIds);
-}
-if((djConfig.parseWidgets)||(_cb.length>0)){
-if(dojo.evalObjPath("dojo.widget.Parse")){
-var _cc=new dojo.xml.Parse();
-if(_cb.length>0){
-for(var x=0;x<_cb.length;x++){
-var _ce=document.getElementById(_cb[x]);
-if(!_ce){
-continue;
-}
-var _cf=_cc.parseElement(_ce,null,true);
-dojo.widget.getParser().createComponents(_cf);
-}
-}else{
-if(djConfig.parseWidgets){
-var _cf=_cc.parseElement(dojo.body(),null,true);
-dojo.widget.getParser().createComponents(_cf);
-}
-}
-}
-}
-};
+
 dojo.addOnLoad(function(){
-if(!dojo.render.html.ie){
-dojo.hostenv.makeWidgets();
-}
+  if(!dojo.render.html.ie) {
+    dojo.hostenv.makeWidgets();
+  }
 });
-try{
-if(dojo.render.html.ie){
-document.namespaces.add("v","urn:schemas-microsoft-com:vml");
-document.createStyleSheet().addRule("v\\:*","behavior:url(#default#VML)");
+
+try {
+  if (dojo.render.html.ie) {
+    document.namespaces.add("v","urn:schemas-microsoft-com:vml");
+    document.createStyleSheet().addRule("v\\:*", "behavior:url(#default#VML)");
+  }
+} catch (e) { }
+
+// stub, over-ridden by debugging code. This will at least keep us from
+// breaking when it's not included
+dojo.hostenv.writeIncludes = function(){}
+
+//TODOC:  HOW TO DOC THIS?
+// @global: dj_currentDocument
+// summary:
+//    Current document object. 'dj_currentDocument' can be modified for temporary context shifting.
+// description:
+//    dojo.doc() returns dojo.currentDocument.
+//    Refer to dojo.doc() rather than referring to 'window.document' to ensure your
+//    code runs correctly in managed contexts.
+if(!dj_undef("document", this)){
+  dj_currentDocument = this.document;
 }
+
+dojo.doc = function(){
+  // summary:
+  //    return the document object associated with the dojo.global()
+  return dj_currentDocument;
 }
-catch(e){
+
+dojo.body = function(){
+  // summary:
+  //    return the body object associated with dojo.doc()
+  // Note: document.body is not defined for a strict xhtml document
+  return dojo.doc().body || dojo.doc().getElementsByTagName("body")[0];
 }
-dojo.hostenv.writeIncludes=function(){
+
+dojo.byId = function(id, doc){
+  if((id)&&((typeof id == "string")||(id instanceof String))){
+    if (!doc) { doc = dj_currentDocument; }
+    var ele = doc.getElementById(id);
+    // workaround bug in IE and Opera 8.2 where getElementById returns wrong element
+    if (ele && (ele.id != id) && doc.all) {
+      ele = null;
+      // get all matching elements with this id
+      eles = doc.all[id];
+      if (eles) {
+        // if more than 1, choose first with the correct id
+        if (eles.length) {
+          for (var i=0; i < eles.length; i++) {
+            if (eles[i].id == id) {
+              ele = eles[i];
+              break;
+            }
+          }
+        // return 1 and only element
+        } else { ele = eles; }
+      }
+    }
+    return ele;
+  }
+  return id; // assume it's a node
+}
+
+dojo.setContext = function(/*Object*/globalObject, /*Object*/ globalDocument){
+  dj_currentContext = globalObject;
+  dj_currentDocument = globalDocument;
 };
-if(!dj_undef("document",this)){
-dj_currentDocument=this.document;
-}
-dojo.doc=function(){
-return dj_currentDocument;
-};
-dojo.body=function(){
-return dojo.doc().body||dojo.doc().getElementsByTagName("body")[0];
-};
-dojo.byId=function(id,doc){
-if((id)&&((typeof id=="string")||(id instanceof String))){
-if(!doc){
-doc=dj_currentDocument;
-}
-var ele=doc.getElementById(id);
-if(ele&&(ele.id!=id)&&doc.all){
-ele=null;
-eles=doc.all[id];
-if(eles){
-if(eles.length){
-for(var i=0;i<eles.length;i++){
-if(eles[i].id==id){
-ele=eles[i];
-break;
-}
-}
-}else{
-ele=eles;
-}
-}
-}
-return ele;
-}
-return id;
-};
-dojo.setContext=function(_d4,_d5){
-dj_currentContext=_d4;
-dj_currentDocument=_d5;
-};
-dojo._fireCallback=function(_d6,_d7,_d8){
-if((_d7)&&((typeof _d6=="string")||(_d6 instanceof String))){
-_d6=_d7[_d6];
-}
-return (_d7?_d6.apply(_d7,_d8||[]):_d6());
-};
-dojo.withGlobal=function(_d9,_da,_db,_dc){
-var _dd;
-var _de=dj_currentContext;
-var _df=dj_currentDocument;
-try{
-dojo.setContext(_d9,_d9.document);
-_dd=dojo._fireCallback(_da,_db,_dc);
-}
-finally{
-dojo.setContext(_de,_df);
-}
-return _dd;
-};
-dojo.withDoc=function(_e0,_e1,_e2,_e3){
-var _e4;
-var _e5=dj_currentDocument;
-try{
-dj_currentDocument=_e0;
-_e4=dojo._fireCallback(_e1,_e2,_e3);
-}
-finally{
-dj_currentDocument=_e5;
-}
-return _e4;
-};
-}
-(function(){
-if(typeof dj_usingBootstrap!="undefined"){
-return;
-}
-var _e6=false;
-var _e7=false;
-var _e8=false;
-if((typeof this["load"]=="function")&&((typeof this["Packages"]=="function")||(typeof this["Packages"]=="object"))){
-_e6=true;
-}else{
-if(typeof this["load"]=="function"){
-_e7=true;
-}else{
-if(window.widget){
-_e8=true;
-}
-}
-}
-var _e9=[];
-if((this["djConfig"])&&((djConfig["isDebug"])||(djConfig["debugAtAllCosts"]))){
-_e9.push("debug.js");
-}
-if((this["djConfig"])&&(djConfig["debugAtAllCosts"])&&(!_e6)&&(!_e8)){
-_e9.push("browser_debug.js");
-}
-var _ea=djConfig["baseScriptUri"];
-if((this["djConfig"])&&(djConfig["baseLoaderUri"])){
-_ea=djConfig["baseLoaderUri"];
-}
-for(var x=0;x<_e9.length;x++){
-var _ec=_ea+"src/"+_e9[x];
-if(_e6||_e7){
-load(_ec);
-}else{
-try{
-document.write("<scr"+"ipt type='text/javascript' src='"+_ec+"'></scr"+"ipt>");
-}
-catch(e){
-var _ed=document.createElement("script");
-_ed.src=_ec;
-document.getElementsByTagName("head")[0].appendChild(_ed);
+
+dojo._fireCallback = function(callback, context, cbArguments) {
+  if((context)&&((typeof callback == "string")||(callback instanceof String))){
+    callback=context[callback];
+  }
+  return (context ? callback.apply(context, cbArguments || [ ]) : callback());
 }
+
+dojo.withGlobal = function(/*Object*/globalObject, /*Function*/callback, /*Object?*/thisObject, /*Array?*/cbArguments){
+  // summary:
+  //    Call callback with globalObject as dojo.global() and globalObject.document
+  //    as dojo.doc(). If provided, globalObject will be executed in the context of
+  //    object thisObject
+  // description:
+  //    When callback() returns or throws an error, the dojo.global() and dojo.doc() will
+  //    be restored to its previous state.
+  var rval;
+  var oldGlob = dj_currentContext;
+  var oldDoc = dj_currentDocument;
+  try{
+    dojo.setContext(globalObject, globalObject.document);
+    rval = dojo._fireCallback(callback, thisObject, cbArguments);
+  }finally{
+    dojo.setContext(oldGlob, oldDoc);
+  }
+  return rval;
 }
+
+dojo.withDoc = function (/*Object*/documentObject, /*Function*/callback, /*Object?*/thisObject, /*Array?*/cbArguments) {
+  // summary:
+  //    Call callback with documentObject as dojo.doc(). If provided, callback will be executed
+  //    in the context of object thisObject
+  // description:
+  //    When callback() returns or throws an error, the dojo.doc() will
+  //    be restored to its previous state.
+  var rval;
+  var oldDoc = dj_currentDocument;
+  try{
+    dj_currentDocument = documentObject;
+    rval = dojo._fireCallback(callback, thisObject, cbArguments);
+  }finally{
+    dj_currentDocument = oldDoc;
+  }
+  return rval;
 }
+
+} //if (typeof window != 'undefined')
+
+//Semicolon is for when this file is integrated with a custom build on one line
+//with some other file's contents. Sometimes that makes things not get defined
+//properly, particularly with the using the closure below to do all the work.
+;(function(){
+  //Don't do this work if dojo.js has already done it.
+  if(typeof dj_usingBootstrap != "undefined"){
+    return;
+  }
+
+  var isRhino = false;
+  var isSpidermonkey = false;
+  var isDashboard = false;
+  if((typeof this["load"] == "function")&&((typeof this["Packages"] == "function")||(typeof this["Packages"] == "object"))){
+    isRhino = true;
+  }else if(typeof this["load"] == "function"){
+    isSpidermonkey  = true;
+  }else if(window.widget){
+    isDashboard = true;
+  }
+
+  var tmps = [];
+  if((this["djConfig"])&&((djConfig["isDebug"])||(djConfig["debugAtAllCosts"]))){
+    tmps.push("debug.js");
+  }
+
+  if((this["djConfig"])&&(djConfig["debugAtAllCosts"])&&(!isRhino)&&(!isDashboard)){
+    tmps.push("browser_debug.js");
+  }
+
+  var loaderRoot = djConfig["baseScriptUri"];
+  if((this["djConfig"])&&(djConfig["baseLoaderUri"])){
+    loaderRoot = djConfig["baseLoaderUri"];
+  }
+
+  for(var x=0; x < tmps.length; x++){
+    var spath = loaderRoot+"src/"+tmps[x];
+    if(isRhino||isSpidermonkey){
+      load(spath);
+    } else {
+      try {
+        document.write("<scr"+"ipt type='text/javascript' src='"+spath+"'></scr"+"ipt>");
+      } catch (e) {
+        var script = document.createElement("script");
+        script.src = spath;
+        document.getElementsByTagName("head")[0].appendChild(script);
+      }
+    }
+  }
 })();
+
 dojo.provide("dojo.lang.common");
-dojo.lang.inherits=function(_ee,_ef){
-if(typeof _ef!="function"){
-dojo.raise("dojo.inherits: superclass argument ["+_ef+"] must be a function (subclass: ["+_ee+"']");
+
+dojo.lang.inherits = function(/*Function*/ subclass, /*Function*/ superclass){
+  // summary: Set up inheritance between two classes.
+  if(typeof superclass != 'function'){ 
+    dojo.raise("dojo.inherits: superclass argument ["+superclass+"] must be a function (subclass: ["+subclass+"']");
+  }
+  subclass.prototype = new superclass();
+  subclass.prototype.constructor = subclass;
+  subclass.superclass = superclass.prototype;
+  // DEPRECATED: super is a reserved word, use 'superclass'
+  subclass['super'] = superclass.prototype;
 }
-_ee.prototype=new _ef();
-_ee.prototype.constructor=_ee;
-_ee.superclass=_ef.prototype;
-_ee["super"]=_ef.prototype;
-};
-dojo.lang._mixin=function(obj,_f1){
-var _f2={};
-for(var x in _f1){
-if((typeof _f2[x]=="undefined")||(_f2[x]!=_f1[x])){
-obj[x]=_f1[x];
+
+dojo.lang._mixin = function(/*Object*/ obj, /*Object*/ props){
+  // summary: Adds all properties and methods of props to obj.
+  var tobj = {};
+  for(var x in props){
+    // the "tobj" condition avoid copying properties in "props"
+    // inherited from Object.prototype.  For example, if obj has a custom
+    // toString() method, don't overwrite it with the toString() method
+    // that props inherited from Object.protoype
+    if((typeof tobj[x] == "undefined") || (tobj[x] != props[x])){
+      obj[x] = props[x];
+    }
+  }
+  // IE doesn't recognize custom toStrings in for..in
+  if(dojo.render.html.ie 
+    && (typeof(props["toString"]) == "function")
+    && (props["toString"] != obj["toString"])
+    && (props["toString"] != tobj["toString"]))
+  {
+    obj.toString = props.toString;
+  }
+  return obj; // Object
 }
+
+dojo.lang.mixin = function(/*Object*/ obj, /*Object...*/props){
+  // summary: Adds all properties and methods of props to obj.
+  for(var i=1, l=arguments.length; i<l; i++){
+    dojo.lang._mixin(obj, arguments[i]);
+  }
+  return obj; // Object
 }
-if(dojo.render.html.ie&&(typeof (_f1["toString"])=="function")&&(_f1["toString"]!=obj["toString"])&&(_f1["toString"]!=_f2["toString"])){
-obj.toString=_f1.toString;
+
+dojo.lang.extend = function(/*Object*/ constructor, /*Object...*/ props){
+  // summary: Adds all properties and methods of props to constructor's prototype,
+  //      making them available to all instances created with constructor.
+  for(var i=1, l=arguments.length; i<l; i++){
+    dojo.lang._mixin(constructor.prototype, arguments[i]);
+  }
+  return constructor; // Object
 }
-return obj;
-};
-dojo.lang.mixin=function(obj,_f5){
-for(var i=1,l=arguments.length;i<l;i++){
-dojo.lang._mixin(obj,arguments[i]);
+
+// Promote to dojo module
+dojo.inherits = dojo.lang.inherits;
+//dojo.lang._mixin = dojo.lang._mixin;
+dojo.mixin = dojo.lang.mixin;
+dojo.extend = dojo.lang.extend;
+
+dojo.lang.find = function(  /*Array*/   array, 
+              /*Object*/    value,
+              /*Boolean?*/  identity,
+              /*Boolean?*/  findLast){
+  // summary: Return the index of value in array, returning -1 if not found.
+  // identity: If true, matches with identity comparison (===).  
+  //           If false, uses normal comparison (==).
+  // findLast: If true, returns index of last instance of value.
+  
+  // examples:
+  //  find(array, value[, identity [findLast]]) // recommended
+  //  find(value, array[, identity [findLast]]) // deprecated
+              
+  // support both (array, value) and (value, array)
+  if(!dojo.lang.isArrayLike(array) && dojo.lang.isArrayLike(value)) {
+    dojo.deprecated('dojo.lang.find(value, array)', 'use dojo.lang.find(array, value) instead', "0.5");
+    var temp = array;
+    array = value;
+    value = temp;
+  }
+  var isString = dojo.lang.isString(array);
+  if(isString) { array = array.split(""); }
+
+  if(findLast) {
+    var step = -1;
+    var i = array.length - 1;
+    var end = -1;
+  } else {
+    var step = 1;
+    var i = 0;
+    var end = array.length;
+  }
+  if(identity){
+    while(i != end) {
+      if(array[i] === value){ return i; }
+      i += step;
+    }
+  }else{
+    while(i != end) {
+      if(array[i] == value){ return i; }
+      i += step;
+    }
+  }
+  return -1;  // number
 }
-return obj;
-};
-dojo.lang.extend=function(_f8,_f9){
-for(var i=1,l=arguments.length;i<l;i++){
-dojo.lang._mixin(_f8.prototype,arguments[i]);
+
+dojo.lang.indexOf = dojo.lang.find;
+
+dojo.lang.findLast = function(/*Array*/ array, /*Object*/ value, /*boolean?*/ identity){
+  // summary: Return index of last occurance of value in array, returning -1 if not found.
+  // identity: If true, matches with identity comparison (===). If false, uses normal comparison (==).
+  return dojo.lang.find(array, value, identity, true); // number
 }
-return _f8;
-};
-dojo.inherits=dojo.lang.inherits;
-dojo.mixin=dojo.lang.mixin;
-dojo.extend=dojo.lang.extend;
-dojo.lang.find=function(_fc,_fd,_fe,_ff){
-if(!dojo.lang.isArrayLike(_fc)&&dojo.lang.isArrayLike(_fd)){
-dojo.deprecated("dojo.lang.find(value, array)","use dojo.lang.find(array, value) instead","0.5");
-var temp=_fc;
-_fc=_fd;
-_fd=temp;
+
+dojo.lang.lastIndexOf = dojo.lang.findLast;
+
+dojo.lang.inArray = function(array /*Array*/, value /*Object*/){
+  // summary: Return true if value is present in array.
+  return dojo.lang.find(array, value) > -1; // boolean
 }
-var _101=dojo.lang.isString(_fc);
-if(_101){
-_fc=_fc.split("");
+
+/**
+ * Partial implmentation of is* functions from
+ * http://www.crockford.com/javascript/recommend.html
+ * NOTE: some of these may not be the best thing to use in all situations
+ * as they aren't part of core JS and therefore can't work in every case.
+ * See WARNING messages inline for tips.
+ *
+ * The following is* functions are fairly "safe"
+ */
+
+dojo.lang.isObject = function(/*anything*/ it){
+  // summary: Return true if it is an Object, Array or Function.
+  if(typeof it == "undefined"){ return false; }
+  return (typeof it == "object" || it === null || dojo.lang.isArray(it) || dojo.lang.isFunction(it)); // Boolean
 }
-if(_ff){
-var step=-1;
-var i=_fc.length-1;
-var end=-1;
-}else{
-var step=1;
-var i=0;
-var end=_fc.length;
+
+dojo.lang.isArray = function(/*anything*/ it){
+  // summary: Return true if it is an Array.
+  return (it && it instanceof Array || typeof it == "array"); // Boolean
 }
-if(_fe){
-while(i!=end){
-if(_fc[i]===_fd){
-return i;
+
+dojo.lang.isArrayLike = function(/*anything*/ it){
+  // summary: Return true if it can be used as an array (i.e. is an object with an integer length property).
+  if((!it)||(dojo.lang.isUndefined(it))){ return false; }
+  if(dojo.lang.isString(it)){ return false; }
+  if(dojo.lang.isFunction(it)){ return false; } // keeps out built-in constructors (Number, String, ...) which have length properties
+  if(dojo.lang.isArray(it)){ return true; }
+  // form node itself is ArrayLike, but not always iterable. Use form.elements instead.
+  if((it.tagName)&&(it.tagName.toLowerCase()=='form')){ return false; }
+  if(dojo.lang.isNumber(it.length) && isFinite(it.length)){ return true; }
+  return false; // Boolean
 }
-i+=step;
+
+dojo.lang.isFunction = function(/*anything*/ it){
+  // summary: Return true if it is a Function.
+  if(!it){ return false; }
+  // webkit treats NodeList as a function, which is bad
+  if((typeof(it) == "function") && (it == "[object NodeList]")) { return false; }
+  return (it instanceof Function || typeof it == "function"); // Boolean
 }
-}else{
-while(i!=end){
-if(_fc[i]==_fd){
-return i;
+
+dojo.lang.isString = function(/*anything*/ it){
+  // summary: Return true if it is a String.
+  return (typeof it == "string" || it instanceof String);
 }
-i+=step;
+
+dojo.lang.isAlien = function(/*anything*/ it){
+  // summary: Return true if it is not a built-in function.
+  if(!it){ return false; }
+  return !dojo.lang.isFunction() && /\{\s*\[native code\]\s*\}/.test(String(it)); // Boolean
 }
+
+dojo.lang.isBoolean = function(/*anything*/ it){
+  // summary: Return true if it is a Boolean.
+  return (it instanceof Boolean || typeof it == "boolean"); // Boolean
 }
-return -1;
-};
-dojo.lang.indexOf=dojo.lang.find;
-dojo.lang.findLast=function(_105,_106,_107){
-return dojo.lang.find(_105,_106,_107,true);
-};
-dojo.lang.lastIndexOf=dojo.lang.findLast;
-dojo.lang.inArray=function(_108,_109){
-return dojo.lang.find(_108,_109)>-1;
-};
-dojo.lang.isObject=function(it){
-if(typeof it=="undefined"){
-return false;
+
+/**
+ * The following is***() functions are somewhat "unsafe". Fortunately,
+ * there are workarounds the the language provides and are mentioned
+ * in the WARNING messages.
+ *
+ */
+dojo.lang.isNumber = function(/*anything*/ it){
+  // summary: Return true if it is a number.
+  // description: 
+  //    WARNING - In most cases, isNaN(it) is sufficient to determine whether or not
+  //    something is a number or can be used as such. For example, a number or string
+  //    can be used interchangably when accessing array items (array["1"] is the same as
+  //    array[1]) and isNaN will return false for both values ("1" and 1). However,
+  //    isNumber("1")  will return false, which is generally not too useful.
+  //    Also, isNumber(NaN) returns true, again, this isn't generally useful, but there
+  //    are corner cases (like when you want to make sure that two things are really
+  //    the same type of thing). That is really where isNumber "shines".
+  //
+  // Recommendation - Use isNaN(it) when possible
+  
+  return (it instanceof Number || typeof it == "number"); // Boolean
 }
-return (typeof it=="object"||it===null||dojo.lang.isArray(it)||dojo.lang.isFunction(it));
-};
-dojo.lang.isArray=function(it){
-return (it&&it instanceof Array||typeof it=="array");
-};
-dojo.lang.isArrayLike=function(it){
-if((!it)||(dojo.lang.isUndefined(it))){
-return false;
+
+/*
+ * FIXME: Should isUndefined go away since it is error prone?
+ */
+dojo.lang.isUndefined = function(/*anything*/ it){
+  // summary: Return true if it is not defined.
+  // description: 
+  //    WARNING - In some cases, isUndefined will not behave as you
+  //    might expect. If you do isUndefined(foo) and there is no earlier
+  //    reference to foo, an error will be thrown before isUndefined is
+  //    called. It behaves correctly if you scope yor object first, i.e.
+  //    isUndefined(foo.bar) where foo is an object and bar isn't a
+  //    property of the object.
+  //
+  // Recommendation - Use typeof foo == "undefined" when possible
+
+  return ((typeof(it) == "undefined")&&(it == undefined)); // Boolean
 }
-if(dojo.lang.isString(it)){
-return false;
-}
-if(dojo.lang.isFunction(it)){
-return false;
-}
-if(dojo.lang.isArray(it)){
-return true;
-}
-if((it.tagName)&&(it.tagName.toLowerCase()=="form")){
-return false;
-}
-if(dojo.lang.isNumber(it.length)&&isFinite(it.length)){
-return true;
-}
-return false;
-};
-dojo.lang.isFunction=function(it){
-if(!it){
-return false;
-}
-if((typeof (it)=="function")&&(it=="[object NodeList]")){
-return false;
-}
-return (it instanceof Function||typeof it=="function");
-};
-dojo.lang.isString=function(it){
-return (typeof it=="string"||it instanceof String);
-};
-dojo.lang.isAlien=function(it){
-if(!it){
-return false;
-}
-return !dojo.lang.isFunction()&&/\{\s*\[native code\]\s*\}/.test(String(it));
-};
-dojo.lang.isBoolean=function(it){
-return (it instanceof Boolean||typeof it=="boolean");
-};
-dojo.lang.isNumber=function(it){
-return (it instanceof Number||typeof it=="number");
-};
-dojo.lang.isUndefined=function(it){
-return ((typeof (it)=="undefined")&&(it==undefined));
-};
+
+// end Crockford functions
+
 dojo.provide("dojo.lang");
-dojo.deprecated("dojo.lang","replaced by dojo.lang.common","0.5");
+
+dojo.deprecated("dojo.lang", "replaced by dojo.lang.common", "0.5");
+
 dojo.provide("dojo.dom");
-dojo.dom.ELEMENT_NODE=1;
-dojo.dom.ATTRIBUTE_NODE=2;
-dojo.dom.TEXT_NODE=3;
-dojo.dom.CDATA_SECTION_NODE=4;
-dojo.dom.ENTITY_REFERENCE_NODE=5;
-dojo.dom.ENTITY_NODE=6;
-dojo.dom.PROCESSING_INSTRUCTION_NODE=7;
-dojo.dom.COMMENT_NODE=8;
-dojo.dom.DOCUMENT_NODE=9;
-dojo.dom.DOCUMENT_TYPE_NODE=10;
-dojo.dom.DOCUMENT_FRAGMENT_NODE=11;
-dojo.dom.NOTATION_NODE=12;
-dojo.dom.dojoml="http://www.dojotoolkit.org/2004/dojoml";
-dojo.dom.xmlns={svg:"http://www.w3.org/2000/svg",smil:"http://www.w3.org/2001/SMIL20/",mml:"http://www.w3.org/1998/Math/MathML",cml:"http://www.xml-cml.org",xlink:"http://www.w3.org/1999/xlink",xhtml:"http://www.w3.org/1999/xhtml",xul:"http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul",xbl:"http://www.mozilla.org/xbl",fo:"http://www.w3.org/1999/XSL/Format",xsl:"http://www.w3.org/1999/XSL/Transform",xslt:"http://www.w3.org/1999/XSL/Transform",xi:"http://www.w3.org/2001/XInclude",xforms:"http://www.w3.org/2002/01/xforms",saxon:"http://icl.com/saxon",xalan:"http://xml.apache.org/xslt",xsd:"http://www.w3.org/2001/XMLSchema",dt:"http://www.w3.org/2001/XMLSchema-datatypes",xsi:"http://www.w3.org/2001/XMLSchema-instance",rdf:"http://www.w3.org/1999/02/22-rdf-syntax-ns#",rdfs:"http://www.w3.org/2000/01/rdf-schema#",dc:"http://purl.org/dc/elements/1.1/",dcq:"http://purl.org/dc/qualifiers/1.0","soap-env":"http://schemas.xmlsoap.org/soap/envelope/",wsdl:"http://schemas.xmlsoap.org/wsdl/",AdobeExtensions:"http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"};
-dojo.dom.isNode=function(wh){
-if(typeof Element=="function"){
-try{
-return wh instanceof Element;
-}
-catch(E){
-}
-}else{
-return wh&&!isNaN(wh.nodeType);
-}
+
+dojo.dom.ELEMENT_NODE                  = 1;
+dojo.dom.ATTRIBUTE_NODE                = 2;
+dojo.dom.TEXT_NODE                     = 3;
+dojo.dom.CDATA_SECTION_NODE            = 4;
+dojo.dom.ENTITY_REFERENCE_NODE         = 5;
+dojo.dom.ENTITY_NODE                   = 6;
+dojo.dom.PROCESSING_INSTRUCTION_NODE   = 7;
+dojo.dom.COMMENT_NODE                  = 8;
+dojo.dom.DOCUMENT_NODE                 = 9;
+dojo.dom.DOCUMENT_TYPE_NODE            = 10;
+dojo.dom.DOCUMENT_FRAGMENT_NODE        = 11;
+dojo.dom.NOTATION_NODE                 = 12;
+  
+dojo.dom.dojoml = "http://www.dojotoolkit.org/2004/dojoml";
+
+/**
+ *  comprehensive list of XML namespaces
+**/
+dojo.dom.xmlns = {
+  //  summary
+  //  aliases for various common XML namespaces
+  svg : "http://www.w3.org/2000/svg",
+  smil : "http://www.w3.org/2001/SMIL20/",
+  mml : "http://www.w3.org/1998/Math/MathML",
+  cml : "http://www.xml-cml.org",
+  xlink : "http://www.w3.org/1999/xlink",
+  xhtml : "http://www.w3.org/1999/xhtml",
+  xul : "http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul",
+  xbl : "http://www.mozilla.org/xbl",
+  fo : "http://www.w3.org/1999/XSL/Format",
+  xsl : "http://www.w3.org/1999/XSL/Transform",
+  xslt : "http://www.w3.org/1999/XSL/Transform",
+  xi : "http://www.w3.org/2001/XInclude",
+  xforms : "http://www.w3.org/2002/01/xforms",
+  saxon : "http://icl.com/saxon",
+  xalan : "http://xml.apache.org/xslt",
+  xsd : "http://www.w3.org/2001/XMLSchema",
+  dt: "http://www.w3.org/2001/XMLSchema-datatypes",
+  xsi : "http://www.w3.org/2001/XMLSchema-instance",
+  rdf : "http://www.w3.org/1999/02/22-rdf-syntax-ns#",
+  rdfs : "http://www.w3.org/2000/01/rdf-schema#",
+  dc : "http://purl.org/dc/elements/1.1/",
+  dcq: "http://purl.org/dc/qualifiers/1.0",
+  "soap-env" : "http://schemas.xmlsoap.org/soap/envelope/",
+  wsdl : "http://schemas.xmlsoap.org/wsdl/",
+  AdobeExtensions : "http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
 };
-dojo.dom.getUniqueId=function(){
-var _114=dojo.doc();
-do{
-var id="dj_unique_"+(++arguments.callee._idIncrement);
-}while(_114.getElementById(id));
-return id;
-};
-dojo.dom.getUniqueId._idIncrement=0;
-dojo.dom.firstElement=dojo.dom.getFirstChildElement=function(_116,_117){
-var node=_116.firstChild;
-while(node&&node.nodeType!=dojo.dom.ELEMENT_NODE){
-node=node.nextSibling;
+
+dojo.dom.isNode = function(/* object */wh){
+  //  summary
+  //  checks to see if wh is actually a node.
+  if(typeof Element == "function") {
+    try {
+      return wh instanceof Element; //  boolean
+    } catch(E) {}
+  } else {
+    // best-guess
+    return wh && !isNaN(wh.nodeType); //  boolean
+  }
 }
-if(_117&&node&&node.tagName&&node.tagName.toLowerCase()!=_117.toLowerCase()){
-node=dojo.dom.nextElement(node,_117);
+
+dojo.dom.getUniqueId = function(){
+  //  summary
+  //  returns a unique string for use with any DOM element
+  var _document = dojo.doc();
+  do {
+    var id = "dj_unique_" + (++arguments.callee._idIncrement);
+  }while(_document.getElementById(id));
+  return id;  //  string
 }
-return node;
-};
-dojo.dom.lastElement=dojo.dom.getLastChildElement=function(_119,_11a){
-var node=_119.lastChild;
-while(node&&node.nodeType!=dojo.dom.ELEMENT_NODE){
-node=node.previousSibling;
+dojo.dom.getUniqueId._idIncrement = 0;
+
+dojo.dom.firstElement = dojo.dom.getFirstChildElement = function(/* Element */parentNode, /* string? */tagName){
+  //  summary
+  //  returns the first child element matching tagName
+  var node = parentNode.firstChild;
+  while(node && node.nodeType != dojo.dom.ELEMENT_NODE){
+    node = node.nextSibling;
+  }
+  if(tagName && node && node.tagName && node.tagName.toLowerCase() != tagName.toLowerCase()) {
+    node = dojo.dom.nextElement(node, tagName);
+  }
+  return node;  //  Element
 }
-if(_11a&&node&&node.tagName&&node.tagName.toLowerCase()!=_11a.toLowerCase()){
-node=dojo.dom.prevElement(node,_11a);
+
+dojo.dom.lastElement = dojo.dom.getLastChildElement = function(/* Element */parentNode, /* string? */tagName){
+  //  summary
+  //  returns the last child element matching tagName
+  var node = parentNode.lastChild;
+  while(node && node.nodeType != dojo.dom.ELEMENT_NODE) {
+    node = node.previousSibling;
+  }
+  if(tagName && node && node.tagName && node.tagName.toLowerCase() != tagName.toLowerCase()) {
+    node = dojo.dom.prevElement(node, tagName);
+  }
+  return node;  //  Element
 }
-return node;
-};
-dojo.dom.nextElement=dojo.dom.getNextSiblingElement=function(node,_11d){
-if(!node){
-return null;
+
+dojo.dom.nextElement = dojo.dom.getNextSiblingElement = function(/* Node */node, /* string? */tagName){
+  //  summary
+  //  returns the next sibling element matching tagName
+  if(!node) { return null; }
+  do {
+    node = node.nextSibling;
+  } while(node && node.nodeType != dojo.dom.ELEMENT_NODE);
+
+  if(node && tagName && tagName.toLowerCase() != node.tagName.toLowerCase()) {
+    return dojo.dom.nextElement(node, tagName);
+  }
+  return node;  //  Element
 }
-do{
-node=node.nextSibling;
-}while(node&&node.nodeType!=dojo.dom.ELEMENT_NODE);
-if(node&&_11d&&_11d.toLowerCase()!=node.tagName.toLowerCase()){
-return dojo.dom.nextElement(node,_11d);
+
+dojo.dom.prevElement = dojo.dom.getPreviousSiblingElement = function(/* Node */node, /* string? */tagName){
+  //  summary
+  //  returns the previous sibling element matching tagName
+  if(!node) { return null; }
+  if(tagName) { tagName = tagName.toLowerCase(); }
+  do {
+    node = node.previousSibling;
+  } while(node && node.nodeType != dojo.dom.ELEMENT_NODE);
+
+  if(node && tagName && tagName.toLowerCase() != node.tagName.toLowerCase()) {
+    return dojo.dom.prevElement(node, tagName);
+  }
+  return node;  //  Element
 }
-return node;
-};
-dojo.dom.prevElement=dojo.dom.getPreviousSiblingElement=function(node,_11f){
-if(!node){
-return null;
+
+// TODO: hmph
+/*this.forEachChildTag = function(node, unaryFunc) {
+  var child = this.getFirstChildTag(node);
+  while(child) {
+    if(unaryFunc(child) == "break") { break; }
+    child = this.getNextSiblingTag(child);
+  }
+}*/
+
+dojo.dom.moveChildren = function(/* Element */srcNode, /* Element */destNode, /* boolean? */trim){
+  //  summary
+  //  Moves children from srcNode to destNode and returns the count of children moved; 
+  //    will trim off text nodes if trim == true
+  var count = 0;
+  if(trim) {
+    while(srcNode.hasChildNodes() &&
+      srcNode.firstChild.nodeType == dojo.dom.TEXT_NODE) {
+      srcNode.removeChild(srcNode.firstChild);
+    }
+    while(srcNode.hasChildNodes() &&
+      srcNode.lastChild.nodeType == dojo.dom.TEXT_NODE) {
+      srcNode.removeChild(srcNode.lastChild);
+    }
+  }
+  while(srcNode.hasChildNodes()){
+    destNode.appendChild(srcNode.firstChild);
+    count++;
+  }
+  return count; //  number
 }
-if(_11f){
-_11f=_11f.toLowerCase();
+
+dojo.dom.copyChildren = function(/* Element */srcNode, /* Element */destNode, /* boolean? */trim){
+  //  summary
+  //  Copies children from srcNde to destNode and returns the count of children copied;
+  //    will trim off text nodes if trim == true
+  var clonedNode = srcNode.cloneNode(true);
+  return this.moveChildren(clonedNode, destNode, trim); //  number
 }
-do{
-node=node.previousSibling;
-}while(node&&node.nodeType!=dojo.dom.ELEMENT_NODE);
-if(node&&_11f&&_11f.toLowerCase()!=node.tagName.toLowerCase()){
-return dojo.dom.prevElement(node,_11f);
+
+dojo.dom.removeChildren = function(/* Element */node){
+  //  summary
+  //  removes all children from node and returns the count of children removed.
+  var count = node.childNodes.length;
+  while(node.hasChildNodes()){ node.removeChild(node.firstChild); }
+  return count; //  number
 }
-return node;
-};
-dojo.dom.moveChildren=function(_120,_121,trim){
-var _123=0;
-if(trim){
-while(_120.hasChildNodes()&&_120.firstChild.nodeType==dojo.dom.TEXT_NODE){
-_120.removeChild(_120.firstChild);
+
+dojo.dom.replaceChildren = function(/* Element */node, /* Node */newChild){
+  //  summary
+  //  Removes all children of node and appends newChild
+  // FIXME: what if newChild is an array-like object?
+  dojo.dom.removeChildren(node);
+  node.appendChild(newChild);
 }
-while(_120.hasChildNodes()&&_120.lastChild.nodeType==dojo.dom.TEXT_NODE){
-_120.removeChild(_120.lastChild);
+
+dojo.dom.removeNode = function(/* Node */node){
+  //  summary
+  //  if node has a parent, removes node from parent and returns a reference to the removed child.
+  if(node && node.parentNode){
+    // return a ref to the removed child
+    return node.parentNode.removeChild(node); //  Node
+  }
 }
+
+dojo.dom.getAncestors = function(/* Node */node, /* function? */filterFunction, /* boolean? */returnFirstHit) {
+  //  summary
+  //  returns all ancestors matching optional filterFunction; will return only the first if returnFirstHit
+  var ancestors = [];
+  var isFunction = (filterFunction && (filterFunction instanceof Function || typeof filterFunction == "function"));
+  while(node) {
+    if (!isFunction || filterFunction(node)) {
+      ancestors.push(node);
+    }
+    if (returnFirstHit && ancestors.length > 0) { 
+      return ancestors[0];  //  Node
+    }
+    
+    node = node.parentNode;
+  }
+  if (returnFirstHit) { return null; }
+  return ancestors; //  array
 }
-while(_120.hasChildNodes()){
-_121.appendChild(_120.firstChild);
-_123++;
+
+dojo.dom.getAncestorsByTag = function(/* Node */node, /* string */tag, /* boolean? */returnFirstHit) {
+  //  summary
+  //  returns all ancestors matching tag (as tagName), will only return first one if returnFirstHit
+  tag = tag.toLowerCase();
+  return dojo.dom.getAncestors(node, function(el){
+    return ((el.tagName)&&(el.tagName.toLowerCase() == tag));
+  }, returnFirstHit); //  Node || array
 }
-return _123;
-};
-dojo.dom.copyChildren=function(_124,_125,trim){
-var _127=_124.cloneNode(true);
-return this.moveChildren(_127,_125,trim);
-};
-dojo.dom.removeChildren=function(node){
-var _129=node.childNodes.length;
-while(node.hasChildNodes()){
-node.removeChild(node.firstChild);
+
+dojo.dom.getFirstAncestorByTag = function(/* Node */node, /* string */tag) {
+  //  summary
+  //  Returns first ancestor of node with tag tagName
+  return dojo.dom.getAncestorsByTag(node, tag, true); //  Node
 }
-return _129;
-};
-dojo.dom.replaceChildren=function(node,_12b){
-dojo.dom.removeChildren(node);
-node.appendChild(_12b);
-};
-dojo.dom.removeNode=function(node){
-if(node&&node.parentNode){
-return node.parentNode.removeChild(node);
+
+dojo.dom.isDescendantOf = function(/* Node */node, /* Node */ancestor, /* boolean? */guaranteeDescendant){
+  //  summary
+  //  Returns boolean if node is a descendant of ancestor
+  // guaranteeDescendant allows us to be a "true" isDescendantOf function
+  if(guaranteeDescendant && node) { node = node.parentNode; }
+  while(node) {
+    if(node == ancestor){ 
+      return true;  //  boolean
+    }
+    node = node.parentNode;
+  }
+  return false; //  boolean
 }
-};
-dojo.dom.getAncestors=function(node,_12e,_12f){
-var _130=[];
-var _131=(_12e&&(_12e instanceof Function||typeof _12e=="function"));
-while(node){
-if(!_131||_12e(node)){
-_130.push(node);
+
+dojo.dom.innerXML = function(/* Node */node){
+  //  summary
+  //  Implementation of MS's innerXML function.
+  if(node.innerXML){
+    return node.innerXML; //  string
+  }else if (node.xml){
+    return node.xml;    //  string
+  }else if(typeof XMLSerializer != "undefined"){
+    return (new XMLSerializer()).serializeToString(node); //  string
+  }
 }
-if(_12f&&_130.length>0){
-return _130[0];
+
+dojo.dom.createDocument = function(){
+  //  summary
+  //  cross-browser implementation of creating an XML document object.
+  var doc = null;
+  var _document = dojo.doc();
+
+  if(!dj_undef("ActiveXObject")){
+    var prefixes = [ "MSXML2", "Microsoft", "MSXML", "MSXML3" ];
+    for(var i = 0; i<prefixes.length; i++){
+      try{
+        doc = new ActiveXObject(prefixes[i]+".XMLDOM");
+      }catch(e){ /* squelch */ };
+
+      if(doc){ break; }
+    }
+  }else if((_document.implementation)&&
+    (_document.implementation.createDocument)){
+    doc = _document.implementation.createDocument("", "", null);
+  }
+  
+  return doc; //  DOMDocument
 }
-node=node.parentNode;
+
+dojo.dom.createDocumentFromText = function(/* string */str, /* string? */mimetype){
+  //  summary
+  //  attempts to create a Document object based on optional mime-type, using str as the contents of the document
+  if(!mimetype){ mimetype = "text/xml"; }
+  if(!dj_undef("DOMParser")){
+    var parser = new DOMParser();
+    return parser.parseFromString(str, mimetype); //  DOMDocument
+  }else if(!dj_undef("ActiveXObject")){
+    var domDoc = dojo.dom.createDocument();
+    if(domDoc){
+      domDoc.async = false;
+      domDoc.loadXML(str);
+      return domDoc;  //  DOMDocument
+    }else{
+      dojo.debug("toXml didn't work?");
+    }
+  /*
+  }else if((dojo.render.html.capable)&&(dojo.render.html.safari)){
+    // FIXME: this doesn't appear to work!
+    // from: http://web-graphics.com/mtarchive/001606.php
+    // var xml = '<?xml version="1.0"?>'+str;
+    var mtype = "text/xml";
+    var xml = '<?xml version="1.0"?>'+str;
+    var url = "data:"+mtype+";charset=utf-8,"+encodeURIComponent(xml);
+    var req = new XMLHttpRequest();
+    req.open("GET", url, false);
+    req.overrideMimeType(mtype);
+    req.send(null);
+    return req.responseXML;
+  */
+  }else{
+    var _document = dojo.doc();
+    if(_document.createElement){
+      // FIXME: this may change all tags to uppercase!
+      var tmp = _document.createElement("xml");
+      tmp.innerHTML = str;
+      if(_document.implementation && _document.implementation.createDocument) {
+        var xmlDoc = _document.implementation.createDocument("foo", "", null);
+        for(var i = 0; i < tmp.childNodes.length; i++) {
+          xmlDoc.importNode(tmp.childNodes.item(i), true);
+        }
+        return xmlDoc;  //  DOMDocument
+      }
+      // FIXME: probably not a good idea to have to return an HTML fragment
+      // FIXME: the tmp.doc.firstChild is as tested from IE, so it may not
+      // work that way across the board
+      return ((tmp.document)&&
+        (tmp.document.firstChild ?  tmp.document.firstChild : tmp));  //  DOMDocument
+    }
+  }
+  return null;
 }
-if(_12f){
-return null;
+
+dojo.dom.prependChild = function(/* Element */node, /* Element */parent) {
+  // summary
+  //  prepends node to parent's children nodes
+  if(parent.firstChild) {
+    parent.insertBefore(node, parent.firstChild);
+  } else {
+    parent.appendChild(node);
+  }
+  return true;  //  boolean
 }
-return _130;
-};
-dojo.dom.getAncestorsByTag=function(node,tag,_134){
-tag=tag.toLowerCase();
-return dojo.dom.getAncestors(node,function(el){
-return ((el.tagName)&&(el.tagName.toLowerCase()==tag));
-},_134);
-};
-dojo.dom.getFirstAncestorByTag=function(node,tag){
-return dojo.dom.getAncestorsByTag(node,tag,true);
-};
-dojo.dom.isDescendantOf=function(node,_139,_13a){
-if(_13a&&node){
-node=node.parentNode;
+
+dojo.dom.insertBefore = function(/* Node */node, /* Node */ref, /* boolean? */force){
+  //  summary
+  //  Try to insert node before ref
+  if (force != true &&
+    (node === ref || node.nextSibling === ref)){ return false; }
+  var parent = ref.parentNode;
+  parent.insertBefore(node, ref);
+  return true;  //  boolean
 }
-while(node){
-if(node==_139){
-return true;
+
+dojo.dom.insertAfter = function(/* Node */node, /* Node */ref, /* boolean? */force){
+  //  summary
+  //  Try to insert node after ref
+  var pn = ref.parentNode;
+  if(ref == pn.lastChild){
+    if((force != true)&&(node === ref)){
+      return false; //  boolean
+    }
+    pn.appendChild(node);
+  }else{
+    return this.insertBefore(node, ref.nextSibling, force); //  boolean
+  }
+  return true;  //  boolean
 }
-node=node.parentNode;
+
+dojo.dom.insertAtPosition = function(/* Node */node, /* Node */ref, /* string */position){
+  //  summary
+  //  attempt to insert node in relation to ref based on position
+  if((!node)||(!ref)||(!position)){ 
+    return false; //  boolean 
+  }
+  switch(position.toLowerCase()){
+    case "before":
+      return dojo.dom.insertBefore(node, ref);  //  boolean
+    case "after":
+      return dojo.dom.insertAfter(node, ref);   //  boolean
+    case "first":
+      if(ref.firstChild){
+        return dojo.dom.insertBefore(node, ref.firstChild); //  boolean
+      }else{
+        ref.appendChild(node);
+        return true;  //  boolean
+      }
+      break;
+    default: // aka: last
+      ref.appendChild(node);
+      return true;  //  boolean
+  }
 }
-return false;
-};
-dojo.dom.innerXML=function(node){
-if(node.innerXML){
-return node.innerXML;
-}else{
-if(node.xml){
-return node.xml;
-}else{
-if(typeof XMLSerializer!="undefined"){
-return (new XMLSerializer()).serializeToString(node);
+
+dojo.dom.insertAtIndex = function(/* Node */node, /* Element */containingNode, /* number */insertionIndex){
+  //  summary
+  //  insert node into child nodes nodelist of containingNode at insertionIndex.
+  var siblingNodes = containingNode.childNodes;
+
+  // if there aren't any kids yet, just add it to the beginning
+
+  if (!siblingNodes.length){
+    containingNode.appendChild(node);
+    return true;  //  boolean
+  }
+
+  // otherwise we need to walk the childNodes
+  // and find our spot
+
+  var after = null;
+
+  for(var i=0; i<siblingNodes.length; i++){
+
+    var sibling_index = siblingNodes.item(i)["getAttribute"] ? parseInt(siblingNodes.item(i).getAttribute("dojoinsertionindex")) : -1;
+
+    if (sibling_index < insertionIndex){
+      after = siblingNodes.item(i);
+    }
+  }
+
+  if (after){
+    // add it after the node in {after}
+
+    return dojo.dom.insertAfter(node, after); //  boolean
+  }else{
+    // add it to the start
+
+    return dojo.dom.insertBefore(node, siblingNodes.item(0)); //  boolean
+  }
 }
+  
+dojo.dom.textContent = function(/* Node */node, /* string */text){
+  //  summary
+  //  implementation of the DOM Level 3 attribute; scan node for text
+  if (arguments.length>1) {
+    var _document = dojo.doc();
+    dojo.dom.replaceChildren(node, _document.createTextNode(text));
+    return text;  //  string
+  } else {
+    if(node.textContent != undefined){ //FF 1.5
+      return node.textContent;  //  string
+    }
+    var _result = "";
+    if (node == null) { return _result; }
+    for (var i = 0; i < node.childNodes.length; i++) {
+      switch (node.childNodes[i].nodeType) {
+        case 1: // ELEMENT_NODE
+        case 5: // ENTITY_REFERENCE_NODE
+          _result += dojo.dom.textContent(node.childNodes[i]);
+          break;
+        case 3: // TEXT_NODE
+        case 2: // ATTRIBUTE_NODE
+        case 4: // CDATA_SECTION_NODE
+          _result += node.childNodes[i].nodeValue;
+          break;
+        default:
+          break;
+      }
+    }
+    return _result; //  string
+  }
 }
+
+dojo.dom.hasParent = function (/* Node */node) {
+  //  summary
+  //  returns whether or not node is a child of another node.
+  return node && node.parentNode && dojo.dom.isNode(node.parentNode); //  boolean
 }
-};
-dojo.dom.createDocument=function(){
-var doc=null;
-var _13d=dojo.doc();
-if(!dj_undef("ActiveXObject")){
-var _13e=["MSXML2","Microsoft","MSXML","MSXML3"];
-for(var i=0;i<_13e.length;i++){
-try{
-doc=new ActiveXObject(_13e[i]+".XMLDOM");
+
+/**
+ * Examples:
+ *
+ * myFooNode = <foo />
+ * isTag(myFooNode, "foo"); // returns "foo"
+ * isTag(myFooNode, "bar"); // returns ""
+ * isTag(myFooNode, "FOO"); // returns ""
+ * isTag(myFooNode, "hey", "foo", "bar"); // returns "foo"
+**/
+dojo.dom.isTag = function(/* Node */node /* ... */) {
+  //  summary
+  //  determines if node has any of the provided tag names and returns the tag name that matches, empty string otherwise.
+  if(node && node.tagName) {
+    for(var i=1; i<arguments.length; i++){
+      if(node.tagName==String(arguments[i])){
+        return String(arguments[i]);  //  string
+      }
+    }
+  }
+  return "";  //  string
 }
-catch(e){
+
+dojo.dom.setAttributeNS = function(/* Element */elem, /* string */namespaceURI, /* string */attrName, /* string */attrValue){
+  //  summary
+  //  implementation of DOM2 setAttributeNS that works cross browser.
+  if(elem == null || ((elem == undefined)&&(typeof elem == "undefined"))){
+    dojo.raise("No element given to dojo.dom.setAttributeNS");
+  }
+  
+  if(!((elem.setAttributeNS == undefined)&&(typeof elem.setAttributeNS == "undefined"))){ // w3c
+    elem.setAttributeNS(namespaceURI, attrName, attrValue);
+  }else{ // IE
+    // get a root XML document
+    var ownerDoc = elem.ownerDocument;
+    var attribute = ownerDoc.createNode(
+      2, // node type
+      attrName,
+      namespaceURI
+    );
+    
+    // set value
+    attribute.nodeValue = attrValue;
+    
+    // attach to element
+    elem.setAttributeNode(attribute);
+  }
 }
-if(doc){
-break;
-}
-}
-}else{
-if((_13d.implementation)&&(_13d.implementation.createDocument)){
-doc=_13d.implementation.createDocument("","",null);
-}
-}
-return doc;
-};
-dojo.dom.createDocumentFromText=function(str,_141){
-if(!_141){
-_141="text/xml";
-}
-if(!dj_undef("DOMParser")){
-var _142=new DOMParser();
-return _142.parseFromString(str,_141);
-}else{
-if(!dj_undef("ActiveXObject")){
-var _143=dojo.dom.createDocument();
-if(_143){
-_143.async=false;
-_143.loadXML(str);
-return _143;
-}else{
-dojo.debug("toXml didn't work?");
-}
-}else{
-var _144=dojo.doc();
-if(_144.createElement){
-var tmp=_144.createElement("xml");
-tmp.innerHTML=str;
-if(_144.implementation&&_144.implementation.createDocument){
-var _146=_144.implementation.createDocument("foo","",null);
-for(var i=0;i<tmp.childNodes.length;i++){
-_146.importNode(tmp.childNodes.item(i),true);
-}
-return _146;
-}
-return ((tmp.document)&&(tmp.document.firstChild?tmp.document.firstChild:tmp));
-}
-}
-}
-return null;
-};
-dojo.dom.prependChild=function(node,_149){
-if(_149.firstChild){
-_149.insertBefore(node,_149.firstChild);
-}else{
-_149.appendChild(node);
-}
-return true;
-};
-dojo.dom.insertBefore=function(node,ref,_14c){
-if(_14c!=true&&(node===ref||node.nextSibling===ref)){
-return false;
-}
-var _14d=ref.parentNode;
-_14d.insertBefore(node,ref);
-return true;
-};
-dojo.dom.insertAfter=function(node,ref,_150){
-var pn=ref.parentNode;
-if(ref==pn.lastChild){
-if((_150!=true)&&(node===ref)){
-return false;
-}
-pn.appendChild(node);
-}else{
-return this.insertBefore(node,ref.nextSibling,_150);
-}
-return true;
-};
-dojo.dom.insertAtPosition=function(node,ref,_154){
-if((!node)||(!ref)||(!_154)){
-return false;
-}
-switch(_154.toLowerCase()){
-case "before":
-return dojo.dom.insertBefore(node,ref);
-case "after":
-return dojo.dom.insertAfter(node,ref);
-case "first":
-if(ref.firstChild){
-return dojo.dom.insertBefore(node,ref.firstChild);
-}else{
-ref.appendChild(node);
-return true;
-}
-break;
-default:
-ref.appendChild(node);
-return true;
-}
-};
-dojo.dom.insertAtIndex=function(node,_156,_157){
-var _158=_156.childNodes;
-if(!_158.length){
-_156.appendChild(node);
-return true;
-}
-var _159=null;
-for(var i=0;i<_158.length;i++){
-var _15b=_158.item(i)["getAttribute"]?parseInt(_158.item(i).getAttribute("dojoinsertionindex")):-1;
-if(_15b<_157){
-_159=_158.item(i);
-}
-}
-if(_159){
-return dojo.dom.insertAfter(node,_159);
-}else{
-return dojo.dom.insertBefore(node,_158.item(0));
-}
-};
-dojo.dom.textContent=function(node,text){
-if(arguments.length>1){
-var _15e=dojo.doc();
-dojo.dom.replaceChildren(node,_15e.createTextNode(text));
-return text;
-}else{
-if(node.textContent!=undefined){
-return node.textContent;
-}
-var _15f="";
-if(node==null){
-return _15f;
-}
-for(var i=0;i<node.childNodes.length;i++){
-switch(node.childNodes[i].nodeType){
-case 1:
-case 5:
-_15f+=dojo.dom.textContent(node.childNodes[i]);
-break;
-case 3:
-case 2:
-case 4:
-_15f+=node.childNodes[i].nodeValue;
-break;
-default:
-break;
-}
-}
-return _15f;
-}
-};
-dojo.dom.hasParent=function(node){
-return node&&node.parentNode&&dojo.dom.isNode(node.parentNode);
-};
-dojo.dom.isTag=function(node){
-if(node&&node.tagName){
-for(var i=1;i<arguments.length;i++){
-if(node.tagName==String(arguments[i])){
-return String(arguments[i]);
-}
-}
-}
-return "";
-};
-dojo.dom.setAttributeNS=function(elem,_165,_166,_167){
-if(elem==null||((elem==undefined)&&(typeof elem=="undefined"))){
-dojo.raise("No element given to dojo.dom.setAttributeNS");
-}
-if(!((elem.setAttributeNS==undefined)&&(typeof elem.setAttributeNS=="undefined"))){
-elem.setAttributeNS(_165,_166,_167);
-}else{
-var _168=elem.ownerDocument;
-var _169=_168.createNode(2,_166,_165);
-_169.nodeValue=_167;
-elem.setAttributeNode(_169);
-}
-};
+
 dojo.provide("dojo.html.common");
-dojo.lang.mixin(dojo.html,dojo.dom);
-dojo.html.body=function(){
-dojo.deprecated("dojo.html.body() moved to dojo.body()","0.5");
-return dojo.body();
-};
-dojo.html.getEventTarget=function(evt){
-if(!evt){
-evt=dojo.global().event||{};
+
+dojo.lang.mixin(dojo.html, dojo.dom);
+
+dojo.html.body = function(){
+  dojo.deprecated("dojo.html.body() moved to dojo.body()", "0.5");
+  return dojo.body();
 }
-var t=(evt.srcElement?evt.srcElement:(evt.target?evt.target:null));
-while((t)&&(t.nodeType!=1)){
-t=t.parentNode;
+
+// FIXME: we are going to assume that we can throw any and every rendering
+// engine into the IE 5.x box model. In Mozilla, we do this w/ CSS.
+// Need to investigate for KHTML and Opera
+
+dojo.html.getEventTarget = function(/* DOMEvent */evt){
+  //  summary
+  //  Returns the target of an event
+  if(!evt) { evt = dojo.global().event || {} };
+  var t = (evt.srcElement ? evt.srcElement : (evt.target ? evt.target : null));
+  while((t)&&(t.nodeType!=1)){ t = t.parentNode; }
+  return t; //  HTMLElement
 }
-return t;
-};
-dojo.html.getViewport=function(){
-var _16c=dojo.global();
-var _16d=dojo.doc();
-var w=0;
-var h=0;
-if(dojo.render.html.mozilla){
-w=_16d.documentElement.clientWidth;
-h=_16c.innerHeight;
+
+dojo.html.getViewport = function(){
+  //  summary
+  //  Returns the dimensions of the viewable area of a browser window
+  var _window = dojo.global();
+  var _document = dojo.doc();
+  var w = 0;
+  var h = 0;
+
+  if(dojo.render.html.mozilla){
+    // mozilla
+    w = _document.documentElement.clientWidth;
+    h = _window.innerHeight;
+  }else if(!dojo.render.html.opera && _window.innerWidth){
+    //in opera9, dojo.body().clientWidth should be used, instead
+    //of window.innerWidth/document.documentElement.clientWidth
+    //so we have to check whether it is opera
+    w = _window.innerWidth;
+    h = _window.innerHeight;
+  } else if (!dojo.render.html.opera && dojo.exists(_document, "documentElement.clientWidth")){
+    // IE6 Strict
+    var w2 = _document.documentElement.clientWidth;
+    // this lets us account for scrollbars
+    if(!w || w2 && w2 < w) {
+      w = w2;
+    }
+    h = _document.documentElement.clientHeight;
+  } else if (dojo.body().clientWidth){
+    // IE, Opera
+    w = dojo.body().clientWidth;
+    h = dojo.body().clientHeight;
+  }
+  return { width: w, height: h }; //  object
+}
+
+dojo.html.getScroll = function(){
+  //  summary
+  //  Returns the scroll position of the document
+  var _window = dojo.global();
+  var _document = dojo.doc();
+  var top = _window.pageYOffset || _document.documentElement.scrollTop || dojo.body().scrollTop || 0;
+  var left = _window.pageXOffset || _document.documentElement.scrollLeft || dojo.body().scrollLeft || 0;
+  return { 
+    top: top, 
+    left: left, 
+    offset:{ x: left, y: top }  //  note the change, NOT an Array with added properties. 
+  };  //  object
+}
+
+dojo.html.getParentByType = function(/* HTMLElement */node, /* string */type) {
+  //  summary
+  //  Returns the first ancestor of node with tagName type.
+  var _document = dojo.doc();
+  var parent = dojo.byId(node);
+  type = type.toLowerCase();
+  while((parent)&&(parent.nodeName.toLowerCase()!=type)){
+    if(parent==(_document["body"]||_document["documentElement"])){
+      return null;
+    }
+    parent = parent.parentNode;
+  }
+  return parent;  //  HTMLElement
+}
+
+dojo.html.getAttribute = function(/* HTMLElement */node, /* string */attr){
+  //  summary
+  //  Returns the value of attribute attr from node.
+  node = dojo.byId(node);
+  // FIXME: need to add support for attr-specific accessors
+  if((!node)||(!node.getAttribute)){
+    // if(attr !== 'nwType'){
+    //  alert("getAttr of '" + attr + "' with bad node"); 
+    // }
+    return null;
+  }
+  var ta = typeof attr == 'string' ? attr : new String(attr);
+
+  // first try the approach most likely to succeed
+  var v = node.getAttribute(ta.toUpperCase());
+  if((v)&&(typeof v == 'string')&&(v!="")){ 
+    return v; //  string 
+  }
+
+  // try returning the attributes value, if we couldn't get it as a string
+  if(v && v.value){ 
+    return v.value; //  string 
+  }
+
+  // this should work on Opera 7, but it's a little on the crashy side
+  if((node.getAttributeNode)&&(node.getAttributeNode(ta))){
+    return (node.getAttributeNode(ta)).value; //  string
+  }else if(node.getAttribute(ta)){
+    return node.getAttribute(ta); //  string
+  }else if(node.getAttribute(ta.toLowerCase())){
+    return node.getAttribute(ta.toLowerCase()); //  string
+  }
+  return null;  //  string
+}
+  
+dojo.html.hasAttribute = function(/* HTMLElement */node, /* string */attr){
+  //  summary
+  //  Determines whether or not the specified node carries a value for the attribute in question.
+  return dojo.html.getAttribute(dojo.byId(node), attr) ? true : false;  //  boolean
+}
+  
+dojo.html.getCursorPosition = function(/* DOMEvent */e){
+  //  summary
+  //  Returns the mouse position relative to the document (not the viewport).
+  //  For example, if you have a document that is 10000px tall,
+  //  but your browser window is only 100px tall,
+  //  if you scroll to the bottom of the document and call this function it
+  //  will return {x: 0, y: 10000}
+  //  NOTE: for events delivered via dojo.event.connect() and/or dojoAttachEvent (for widgets),
+  //  you can just access evt.pageX and evt.pageY, rather than calling this function.
+  e = e || dojo.global().event;
+  var cursor = {x:0, y:0};
+  if(e.pageX || e.pageY){
+    cursor.x = e.pageX;
+    cursor.y = e.pageY;
+  }else{
+    var de = dojo.doc().documentElement;
+    var db = dojo.body();
+    cursor.x = e.clientX + ((de||db)["scrollLeft"]) - ((de||db)["clientLeft"]);
+    cursor.y = e.clientY + ((de||db)["scrollTop"]) - ((de||db)["clientTop"]);
+  }
+  return cursor;  //  object
+}
+
+dojo.html.isTag = function(/* HTMLElement */node) {
+  //  summary
+  //  Like dojo.dom.isTag, except case-insensitive
+  node = dojo.byId(node);
+  if(node && node.tagName) {
+    for (var i=1; i<arguments.length; i++){
+      if (node.tagName.toLowerCase()==String(arguments[i]).toLowerCase()){
+        return String(arguments[i]).toLowerCase();  //  string
+      }
+    }
+  }
+  return "";  //  string
+}
+
+//define dojo.html.createExternalElement for IE to workaround the annoying activation "feature" in new IE
+//details: http://msdn.microsoft.com/library/default.asp?url=/workshop/author/dhtml/overview/activating_activex.asp
+if(dojo.render.html.ie && !dojo.render.html.ie70){
+  //only define createExternalElement for IE in none https to avoid "mixed content" warning dialog
+  if(window.location.href.substr(0,6).toLowerCase() != "https:"){
+    (function(){
+      // FIXME: this seems not to work correctly on IE 7!!
+
+      //The trick is to define a function in a script.src property:
+      // <script src="javascript:'function createExternalElement(){...}'"></script>,
+      //which will be treated as an external javascript file in IE
+      var xscript = dojo.doc().createElement('script');
+      xscript.src = "javascript:'dojo.html.createExternalElement=function(doc, tag){ return doc.createElement(tag); }'";
+      dojo.doc().getElementsByTagName("head")[0].appendChild(xscript);
+    })();
+  }
 }else{
-if(!dojo.render.html.opera&&_16c.innerWidth){
-w=_16c.innerWidth;
-h=_16c.innerHeight;
-}else{
-if(!dojo.render.html.opera&&dojo.exists(_16d,"documentElement.clientWidth")){
-var w2=_16d.documentElement.clientWidth;
-if(!w||w2&&w2<w){
-w=w2;
+  //for other browsers, simply use document.createElement
+  //is enough
+  dojo.html.createExternalElement = function(/* HTMLDocument */doc, /* string */tag){
+    //  summary
+    //  Creates an element in the HTML document, here for ActiveX activation workaround.
+    return doc.createElement(tag);  //  HTMLElement
+  }
 }
-h=_16d.documentElement.clientHeight;
-}else{
-if(dojo.body().clientWidth){
-w=dojo.body().clientWidth;
-h=dojo.body().clientHeight;
+
+dojo.html._callDeprecated = function(inFunc, replFunc, args, argName, retValue){
+  dojo.deprecated("dojo.html." + inFunc,
+          "replaced by dojo.html." + replFunc + "(" + (argName ? "node, {"+ argName + ": " + argName + "}" : "" ) + ")" + (retValue ? "." + retValue : ""), "0.5");
+  var newArgs = [];
+  if(argName){ var argsIn = {}; argsIn[argName] = args[1]; newArgs.push(args[0]); newArgs.push(argsIn); }
+  else { newArgs = args }
+  var ret = dojo.html[replFunc].apply(dojo.html, args);
+  if(retValue){ return ret[retValue]; }
+  else { return ret; }
 }
+
+dojo.html.getViewportWidth = function(){
+  return dojo.html._callDeprecated("getViewportWidth", "getViewport", arguments, null, "width");
 }
+dojo.html.getViewportHeight = function(){
+  return dojo.html._callDeprecated("getViewportHeight", "getViewport", arguments, null, "height");
 }
+dojo.html.getViewportSize = function(){
+  return dojo.html._callDeprecated("getViewportSize", "getViewport", arguments);
 }
-return {width:w,height:h};
-};
-dojo.html.getScroll=function(){
-var _171=dojo.global();
-var _172=dojo.doc();
-var top=_171.pageYOffset||_172.documentElement.scrollTop||dojo.body().scrollTop||0;
-var left=_171.pageXOffset||_172.documentElement.scrollLeft||dojo.body().scrollLeft||0;
-return {top:top,left:left,offset:{x:left,y:top}};
-};
-dojo.html.getParentByType=function(node,type){
-var _177=dojo.doc();
-var _178=dojo.byId(node);
-type=type.toLowerCase();
-while((_178)&&(_178.nodeName.toLowerCase()!=type)){
-if(_178==(_177["body"]||_177["documentElement"])){
-return null;
+dojo.html.getScrollTop = function(){
+  return dojo.html._callDeprecated("getScrollTop", "getScroll", arguments, null, "top");
 }
-_178=_178.parentNode;
+dojo.html.getScrollLeft = function(){
+  return dojo.html._callDeprecated("getScrollLeft", "getScroll", arguments, null, "left");
 }
-return _178;
-};
-dojo.html.getAttribute=function(node,attr){
-node=dojo.byId(node);
-if((!node)||(!node.getAttribute)){
-return null;
+dojo.html.getScrollOffset = function(){
+  return dojo.html._callDeprecated("getScrollOffset", "getScroll", arguments, null, "offset");
 }
-var ta=typeof attr=="string"?attr:new String(attr);
-var v=node.getAttribute(ta.toUpperCase());
-if((v)&&(typeof v=="string")&&(v!="")){
-return v;
-}
-if(v&&v.value){
-return v.value;
-}
-if((node.getAttributeNode)&&(node.getAttributeNode(ta))){
-return (node.getAttributeNode(ta)).value;
-}else{
-if(node.getAttribute(ta)){
-return node.getAttribute(ta);
-}else{
-if(node.getAttribute(ta.toLowerCase())){
-return node.getAttribute(ta.toLowerCase());
-}
-}
-}
-return null;
-};
-dojo.html.hasAttribute=function(node,attr){
-return dojo.html.getAttribute(dojo.byId(node),attr)?true:false;
-};
-dojo.html.getCursorPosition=function(e){
-e=e||dojo.global().event;
-var _180={x:0,y:0};
-if(e.pageX||e.pageY){
-_180.x=e.pageX;
-_180.y=e.pageY;
-}else{
-var de=dojo.doc().documentElement;
-var db=dojo.body();
-_180.x=e.clientX+((de||db)["scrollLeft"])-((de||db)["clientLeft"]);
-_180.y=e.clientY+((de||db)["scrollTop"])-((de||db)["clientTop"]);
-}
-return _180;
-};
-dojo.html.isTag=function(node){
-node=dojo.byId(node);
-if(node&&node.tagName){
-for(var i=1;i<arguments.length;i++){
-if(node.tagName.toLowerCase()==String(arguments[i]).toLowerCase()){
-return String(arguments[i]).toLowerCase();
-}
-}
-}
-return "";
-};
-if(dojo.render.html.ie&&!dojo.render.html.ie70){
-if(window.location.href.substr(0,6).toLowerCase()!="https:"){
-(function(){
-var _185=dojo.doc().createElement("script");
-_185.src="javascript:'dojo.html.createExternalElement=function(doc, tag){ return doc.createElement(tag); }'";
-dojo.doc().getElementsByTagName("head")[0].appendChild(_185);
-})();
-}
-}else{
-dojo.html.createExternalElement=function(doc,tag){
-return doc.createElement(tag);
-};
-}
-dojo.html._callDeprecated=function(_188,_189,args,_18b,_18c){
-dojo.deprecated("dojo.html."+_188,"replaced by dojo.html."+_189+"("+(_18b?"node, {"+_18b+": "+_18b+"}":"")+")"+(_18c?"."+_18c:""),"0.5");
-var _18d=[];
-if(_18b){
-var _18e={};
-_18e[_18b]=args[1];
-_18d.push(args[0]);
-_18d.push(_18e);
-}else{
-_18d=args;
-}
-var ret=dojo.html[_189].apply(dojo.html,args);
-if(_18c){
-return ret[_18c];
-}else{
-return ret;
-}
-};
-dojo.html.getViewportWidth=function(){
-return dojo.html._callDeprecated("getViewportWidth","getViewport",arguments,null,"width");
-};
-dojo.html.getViewportHeight=function(){
-return dojo.html._callDeprecated("getViewportHeight","getViewport",arguments,null,"height");
-};
-dojo.html.getViewportSize=function(){
-return dojo.html._callDeprecated("getViewportSize","getViewport",arguments);
-};
-dojo.html.getScrollTop=function(){
-return dojo.html._callDeprecated("getScrollTop","getScroll",arguments,null,"top");
-};
-dojo.html.getScrollLeft=function(){
-return dojo.html._callDeprecated("getScrollLeft","getScroll",arguments,null,"left");
-};
-dojo.html.getScrollOffset=function(){
-return dojo.html._callDeprecated("getScrollOffset","getScroll",arguments,null,"offset");
-};
+
 dojo.provide("dojo.uri.Uri");
-dojo.uri=new function(){
-this.dojoUri=function(uri){
-return new dojo.uri.Uri(dojo.hostenv.getBaseScriptUri(),uri);
-};
-this.moduleUri=function(_191,uri){
-var loc=dojo.hostenv.getModulePrefix(_191);
-if(!loc){
-return null;
-}
-if(loc.lastIndexOf("/")!=loc.length-1){
-loc+="/";
-}
-return new dojo.uri.Uri(dojo.hostenv.getBaseScriptUri()+loc,uri);
-};
-this.Uri=function(){
-var uri=arguments[0];
-for(var i=1;i<arguments.length;i++){
-if(!arguments[i]){
-continue;
-}
-var _196=new dojo.uri.Uri(arguments[i].toString());
-var _197=new dojo.uri.Uri(uri.toString());
-if((_196.path=="")&&(_196.scheme==null)&&(_196.authority==null)&&(_196.query==null)){
-if(_196.fragment!=null){
-_197.fragment=_196.fragment;
-}
-_196=_197;
-}else{
-if(_196.scheme==null){
-_196.scheme=_197.scheme;
-if(_196.authority==null){
-_196.authority=_197.authority;
-if(_196.path.charAt(0)!="/"){
-var path=_197.path.substring(0,_197.path.lastIndexOf("/")+1)+_196.path;
-var segs=path.split("/");
-for(var j=0;j<segs.length;j++){
-if(segs[j]=="."){
-if(j==segs.length-1){
-segs[j]="";
-}else{
-segs.splice(j,1);
-j--;
-}
-}else{
-if(j>0&&!(j==1&&segs[0]=="")&&segs[j]==".."&&segs[j-1]!=".."){
-if(j==segs.length-1){
-segs.splice(j,1);
-segs[j-1]="";
-}else{
-segs.splice(j-1,2);
-j-=2;
-}
-}
-}
-}
-_196.path=segs.join("/");
-}
-}
-}
-}
-uri="";
-if(_196.scheme!=null){
-uri+=_196.scheme+":";
-}
-if(_196.authority!=null){
-uri+="//"+_196.authority;
-}
-uri+=_196.path;
-if(_196.query!=null){
-uri+="?"+_196.query;
-}
-if(_196.fragment!=null){
-uri+="#"+_196.fragment;
-}
-}
-this.uri=uri.toString();
-var _19b="^(([^:/?#]+):)?(//([^/?#]*))?([^?#]*)(\\?([^#]*))?(#(.*))?$";
-var r=this.uri.match(new RegExp(_19b));
-this.scheme=r[2]||(r[1]?"":null);
-this.authority=r[4]||(r[3]?"":null);
-this.path=r[5];
-this.query=r[7]||(r[6]?"":null);
-this.fragment=r[9]||(r[8]?"":null);
-if(this.authority!=null){
-_19b="^((([^:]+:)?([^@]+))@)?([^:]*)(:([0-9]+))?$";
-r=this.authority.match(new RegExp(_19b));
-this.user=r[3]||null;
-this.password=r[4]||null;
-this.host=r[5];
-this.port=r[7]||null;
-}
-this.toString=function(){
-return this.uri;
-};
-};
+
+dojo.uri = new function() {
+  this.dojoUri = function (/*dojo.uri.Uri||String*/uri) {
+    // summary: returns a Uri object resolved relative to the dojo root
+    return new dojo.uri.Uri(dojo.hostenv.getBaseScriptUri(), uri);
+  }
+  
+  this.moduleUri = function(/*String*/module, /*dojo.uri.Uri||String*/uri){
+    // summary: returns a Uri object relative to a (top-level) module
+    // description: Examples: dojo.uri.moduleUri("dojo","Editor"), or dojo.uri.moduleUri("acme","someWidget")
+    var loc = dojo.hostenv.getModulePrefix(module);
+    if(!loc){return null;}
+    if(loc.lastIndexOf("/") != loc.length-1){loc += "/";}
+    return new dojo.uri.Uri(dojo.hostenv.getBaseScriptUri()+loc,uri);
+  }
+
+  this.Uri = function (/*dojo.uri.Uri||String...*/) {
+    // summary: Constructor to create an object representing a URI.
+    // description: 
+    //  Each argument is evaluated in order relative to the next until
+    //  a canonical uri is produced. To get an absolute Uri relative
+    //  to the current document use
+    //      new dojo.uri.Uri(document.baseURI, uri)
+
+    // TODO: support for IPv6, see RFC 2732
+
+    // resolve uri components relative to each other
+    var uri = arguments[0];
+    for (var i = 1; i < arguments.length; i++) {
+      if(!arguments[i]) { continue; }
+
+      // Safari doesn't support this.constructor so we have to be explicit
+      var relobj = new dojo.uri.Uri(arguments[i].toString());
+      var uriobj = new dojo.uri.Uri(uri.toString());
+
+      if ((relobj.path=="")&&(relobj.scheme==null)&&(relobj.authority==null)&&(relobj.query==null)) {
+        if (relobj.fragment != null) { uriobj.fragment = relobj.fragment; }
+        relobj = uriobj;
+      } else if (relobj.scheme == null) {
+        relobj.scheme = uriobj.scheme;
+      
+        if (relobj.authority == null) {
+          relobj.authority = uriobj.authority;
+          
+          if (relobj.path.charAt(0) != "/") {
+            var path = uriobj.path.substring(0,
+              uriobj.path.lastIndexOf("/") + 1) + relobj.path;
+
+            var segs = path.split("/");
+            for (var j = 0; j < segs.length; j++) {
+              if (segs[j] == ".") {
+                if (j == segs.length - 1) { segs[j] = ""; }
+                else { segs.splice(j, 1); j--; }
+              } else if (j > 0 && !(j == 1 && segs[0] == "") &&
+                segs[j] == ".." && segs[j-1] != "..") {
+
+                if (j == segs.length - 1) { segs.splice(j, 1); segs[j - 1] = ""; }
+                else { segs.splice(j - 1, 2); j -= 2; }
+              }
+            }
+            relobj.path = segs.join("/");
+          }
+        }
+      }
+
+      uri = "";
+      if (relobj.scheme != null) { uri += relobj.scheme + ":"; }
+      if (relobj.authority != null) { uri += "//" + relobj.authority; }
+      uri += relobj.path;
+      if (relobj.query != null) { uri += "?" + relobj.query; }
+      if (relobj.fragment != null) { uri += "#" + relobj.fragment; }
+    }
+
+    this.uri = uri.toString();
+
+    // break the uri into its main components
+    var regexp = "^(([^:/?#]+):)?(//([^/?#]*))?([^?#]*)(\\?([^#]*))?(#(.*))?$";
+    var r = this.uri.match(new RegExp(regexp));
+
+    this.scheme = r[2] || (r[1] ? "" : null);
+    this.authority = r[4] || (r[3] ? "" : null);
+    this.path = r[5]; // can never be undefined
+    this.query = r[7] || (r[6] ? "" : null);
+    this.fragment  = r[9] || (r[8] ? "" : null);
+    
+    if (this.authority != null) {
+      // server based naming authority
+      regexp = "^((([^:]+:)?([^@]+))@)?([^:]*)(:([0-9]+))?$";
+      r = this.authority.match(new RegExp(regexp));
+      
+      this.user = r[3] || null;
+      this.password = r[4] || null;
+      this.host = r[5];
+      this.port = r[7] || null;
+    }
+  
+    this.toString = function(){ return this.uri; }
+  }
 };
+
 dojo.provide("dojo.html.style");
-dojo.html.getClass=function(node){
-node=dojo.byId(node);
-if(!node){
-return "";
+
+dojo.html.getClass = function(/* HTMLElement */node){
+  //  summary
+  //  Returns the string value of the list of CSS classes currently assigned directly 
+  //  to the node in question. Returns an empty string if no class attribute is found;
+  node = dojo.byId(node);
+  if(!node){ return ""; }
+  var cs = "";
+  if(node.className){
+    cs = node.className;
+  }else if(dojo.html.hasAttribute(node, "class")){
+    cs = dojo.html.getAttribute(node, "class");
+  }
+  return cs.replace(/^\s+|\s+$/g, "");  //  string
 }
-var cs="";
-if(node.className){
-cs=node.className;
-}else{
-if(dojo.html.hasAttribute(node,"class")){
-cs=dojo.html.getAttribute(node,"class");
-}
-}
-return cs.replace(/^\s+|\s+$/g,"");
-};
-dojo.html.getClasses=function(node){
-var c=dojo.html.getClass(node);
-return (c=="")?[]:c.split(/\s+/g);
-};
-dojo.html.hasClass=function(node,_1a2){
-return (new RegExp("(^|\\s+)"+_1a2+"(\\s+|$)")).test(dojo.html.getClass(node));
-};
-dojo.html.prependClass=function(node,_1a4){
-_1a4+=" "+dojo.html.getClass(node);
-return dojo.html.setClass(node,_1a4);
-};
-dojo.html.addClass=function(node,_1a6){
-if(dojo.html.hasClass(node,_1a6)){
-return false;
-}
-_1a6=(dojo.html.getClass(node)+" "+_1a6).replace(/^\s+|\s+$/g,"");
-return dojo.html.setClass(node,_1a6);
-};
-dojo.html.setClass=function(node,_1a8){
-node=dojo.byId(node);
-var cs=new String(_1a8);
-try{
-if(typeof node.className=="string"){
-node.className=cs;
-}else{
-if(node.setAttribute){
-node.setAttribute("class",_1a8);
-node.className=cs;
-}else{
-return false;
-}
-}
-}
-catch(e){
-dojo.debug("dojo.html.setClass() failed",e);
-}
-return true;
-};
-dojo.html.removeClass=function(node,_1ab,_1ac){
-try{
-if(!_1ac){
-var _1ad=dojo.html.getClass(node).replace(new RegExp("(^|\\s+)"+_1ab+"(\\s+|$)"),"$1$2");
-}else{
-var _1ad=dojo.html.getClass(node).replace(_1ab,"");
-}
-dojo.html.setClass(node,_1ad);
-}
-catch(e){
-dojo.debug("dojo.html.removeClass() failed",e);
-}
-return true;
-};
-dojo.html.replaceClass=function(node,_1af,_1b0){
-dojo.html.removeClass(node,_1b0);
-dojo.html.addClass(node,_1af);
-};
-dojo.html.classMatchType={ContainsAll:0,ContainsAny:1,IsOnly:2};
-dojo.html.getElementsByClass=function(_1b1,_1b2,_1b3,_1b4,_1b5){
-_1b5=false;
-var _1b6=dojo.doc();
-_1b2=dojo.byId(_1b2)||_1b6;
-var _1b7=_1b1.split(/\s+/g);
-var _1b8=[];
-if(_1b4!=1&&_1b4!=2){
-_1b4=0;
-}
-var _1b9=new RegExp("(\\s|^)(("+_1b7.join(")|(")+"))(\\s|$)");
-var _1ba=_1b7.join(" ").length;
-var _1bb=[];
-if(!_1b5&&_1b6.evaluate){
-var _1bc=".//"+(_1b3||"*")+"[contains(";
-if(_1b4!=dojo.html.classMatchType.ContainsAny){
-_1bc+="concat(' ',@class,' '), ' "+_1b7.join(" ') and contains(concat(' ',@class,' '), ' ")+" ')";
-if(_1b4==2){
-_1bc+=" and string-length(@class)="+_1ba+"]";
-}else{
-_1bc+="]";
-}
-}else{
-_1bc+="concat(' ',@class,' '), ' "+_1b7.join(" ') or contains(concat(' ',@class,' '), ' ")+" ')]";
-}
-var _1bd=_1b6.evaluate(_1bc,_1b2,null,XPathResult.ANY_TYPE,null);
-var _1be=_1bd.iterateNext();
-while(_1be){
-try{
-_1bb.push(_1be);
-_1be=_1bd.iterateNext();
-}
-catch(e){
-break;
-}
-}
-return _1bb;
-}else{
-if(!_1b3){
-_1b3="*";
-}
-_1bb=_1b2.getElementsByTagName(_1b3);
-var node,i=0;
-outer:
-while(node=_1bb[i++]){
-var _1c1=dojo.html.getClasses(node);
-if(_1c1.length==0){
-continue outer;
-}
-var _1c2=0;
-for(var j=0;j<_1c1.length;j++){
-if(_1b9.test(_1c1[j])){
-if(_1b4==dojo.html.classMatchType.ContainsAny){
-_1b8.push(node);
-continue outer;
-}else{
-_1c2++;
-}
-}else{
-if(_1b4==dojo.html.classMatchType.IsOnly){
-continue outer;
-}
-}
-}
-if(_1c2==_1b7.length){
-if((_1b4==dojo.html.classMatchType.IsOnly)&&(_1c2==_1c1.length)){
-_1b8.push(node);
-}else{
-if(_1b4==dojo.html.classMatchType.ContainsAll){
-_1b8.push(node);
-}
-}
-}
-}
-return _1b8;
-}
-};
-dojo.html.getElementsByClassName=dojo.html.getElementsByClass;
-dojo.html.toCamelCase=function(_1c4){
-var arr=_1c4.split("-"),cc=arr[0];
-for(var i=1;i<arr.length;i++){
-cc+=arr[i].charAt(0).toUpperCase()+arr[i].substring(1);
-}
-return cc;
-};
-dojo.html.toSelectorCase=function(_1c8){
-return _1c8.replace(/([A-Z])/g,"-$1").toLowerCase();
-};
-dojo.html.getComputedStyle=function(node,_1ca,_1cb){
-node=dojo.byId(node);
-var _1ca=dojo.html.toSelectorCase(_1ca);
-var _1cc=dojo.html.toCamelCase(_1ca);
-if(!node||!node.style){
-return _1cb;
-}else{
-if(document.defaultView&&dojo.html.isDescendantOf(node,node.ownerDocument)){
-try{
-var cs=document.defaultView.getComputedStyle(node,"");
-if(cs){
-return cs.getPropertyValue(_1ca);
-}
-}
-catch(e){
-if(node.style.getPropertyValue){
-return node.style.getPropertyValue(_1ca);
-}else{
-return _1cb;
-}
-}
-}else{
-if(node.currentStyle){
-return node.currentStyle[_1cc];
-}
-}
-}
-if(node.style.getPropertyValue){
-return node.style.getPropertyValue(_1ca);
-}else{
-return _1cb;
-}
-};
-dojo.html.getStyleProperty=function(node,_1cf){
-node=dojo.byId(node);
-return (node&&node.style?node.style[dojo.html.toCamelCase(_1cf)]:undefined);
-};
-dojo.html.getStyle=function(node,_1d1){
-var _1d2=dojo.html.getStyleProperty(node,_1d1);
-return (_1d2?_1d2:dojo.html.getComputedStyle(node,_1d1));
-};
-dojo.html.setStyle=function(node,_1d4,_1d5){
-node=dojo.byId(node);
-if(node&&node.style){
-var _1d6=dojo.html.toCamelCase(_1d4);
-node.style[_1d6]=_1d5;
-}
-};
-dojo.html.setStyleText=function(_1d7,text){
-try{
-_1d7.style.cssText=text;
-}
-catch(e){
-_1d7.setAttribute("style",text);
-}
-};
-dojo.html.copyStyle=function(_1d9,_1da){
-if(!_1da.style.cssText){
-_1d9.setAttribute("style",_1da.getAttribute("style"));
-}else{
-_1d9.style.cssText=_1da.style.cssText;
-}
-dojo.html.addClass(_1d9,dojo.html.getClass(_1da));
-};
-dojo.html.getUnitValue=function(node,_1dc,_1dd){
-var s=dojo.html.getComputedStyle(node,_1dc);
-if((!s)||((s=="auto")&&(_1dd))){
-return {value:0,units:"px"};
-}
-var _1df=s.match(/(\-?[\d.]+)([a-z%]*)/i);
-if(!_1df){
-return dojo.html.getUnitValue.bad;
-}
-return {value:Number(_1df[1]),units:_1df[2].toLowerCase()};
-};
-dojo.html.getUnitValue.bad={value:NaN,units:""};
-dojo.html.getPixelValue=function(node,_1e1,_1e2){
-var _1e3=dojo.html.getUnitValue(node,_1e1,_1e2);
-if(isNaN(_1e3.value)){
-return 0;
-}
-if((_1e3.value)&&(_1e3.units!="px")){
-return NaN;
-}
-return _1e3.value;
-};
-dojo.html.setPositivePixelValue=function(node,_1e5,_1e6){
-if(isNaN(_1e6)){
-return false;
-}
-node.style[_1e5]=Math.max(0,_1e6)+"px";
-return true;
-};
-dojo.html.styleSheet=null;
-dojo.html.insertCssRule=function(_1e7,_1e8,_1e9){
-if(!dojo.html.styleSheet){
-if(document.createStyleSheet){
-dojo.html.styleSheet=document.createStyleSheet();
-}else{
-if(document.styleSheets[0]){
-dojo.html.styleSheet=document.styleSheets[0];
-}else{
-return null;
-}
-}
-}
-if(arguments.length<3){
-if(dojo.html.styleSheet.cssRules){
-_1e9=dojo.html.styleSheet.cssRules.length;
-}else{
-if(dojo.html.styleSheet.rules){
-_1e9=dojo.html.styleSheet.rules.length;
-}else{
-return null;
-}
-}
-}
-if(dojo.html.styleSheet.insertRule){
-var rule=_1e7+" { "+_1e8+" }";
-return dojo.html.styleSheet.insertRule(rule,_1e9);
-}else{
-if(dojo.html.styleSheet.addRule){
-return dojo.html.styleSheet.addRule(_1e7,_1e8,_1e9);
-}else{
-return null;
-}
-}
-};
-dojo.html.removeCssRule=function(_1eb){
-if(!dojo.html.styleSheet){
-dojo.debug("no stylesheet defined for removing rules");
-return false;
-}
-if(dojo.render.html.ie){
-if(!_1eb){
-_1eb=dojo.html.styleSheet.rules.length;
-dojo.html.styleSheet.removeRule(_1eb);
-}
-}else{
-if(document.styleSheets[0]){
-if(!_1eb){
-_1eb=dojo.html.styleSheet.cssRules.length;
-}
-dojo.html.styleSheet.deleteRule(_1eb);
-}
-}
-return true;
-};
-dojo.html._insertedCssFiles=[];
-dojo.html.insertCssFile=function(URI,doc,_1ee,_1ef){
-if(!URI){
-return;
-}
-if(!doc){
-doc=document;
-}
-var _1f0=dojo.hostenv.getText(URI,false,_1ef);
-if(_1f0===null){
-return;
-}
-_1f0=dojo.html.fixPathsInCssText(_1f0,URI);
-if(_1ee){
-var idx=-1,node,ent=dojo.html._insertedCssFiles;
-for(var i=0;i<ent.length;i++){
-if((ent[i].doc==doc)&&(ent[i].cssText==_1f0)){
-idx=i;
-node=ent[i].nodeRef;
-break;
-}
-}
-if(node){
-var _1f5=doc.getElementsByTagName("style");
-for(var i=0;i<_1f5.length;i++){
-if(_1f5[i]==node){
-return;
-}
-}
-dojo.html._insertedCssFiles.shift(idx,1);
-}
-}
-var _1f6=dojo.html.insertCssText(_1f0);
-dojo.html._insertedCssFiles.push({"doc":doc,"cssText":_1f0,"nodeRef":_1f6});
-if(_1f6&&djConfig.isDebug){
-_1f6.setAttribute("dbgHref",URI);
-}
-return _1f6;
-};
-dojo.html.insertCssText=function(_1f7,doc,URI){
-if(!_1f7){
-return;
-}
-if(!doc){
-doc=document;
-}
-if(URI){
-_1f7=dojo.html.fixPathsInCssText(_1f7,URI);
-}
-var _1fa=doc.createElement("style");
-_1fa.setAttribute("type","text/css");
-var head=doc.getElementsByTagName("head")[0];
-if(!head){
-dojo.debug("No head tag in document, aborting styles");
-return;
-}else{
-head.appendChild(_1fa);
-}
-if(_1fa.styleSheet){
-_1fa.styleSheet.cssText=_1f7;
-}else{
-var _1fc=doc.createTextNode(_1f7);
-_1fa.appendChild(_1fc);
-}
-return _1fa;
-};
-dojo.html.fixPathsInCssText=function(_1fd,URI){
-function iefixPathsInCssText(){
-var _1ff=/AlphaImageLoader\(src\=['"]([\t\s\w()\/.\\'"-:#=&?~]*)['"]/;
-while(_200=_1ff.exec(_1fd)){
-url=_200[1].replace(_202,"$2");
-if(!_203.exec(url)){
-url=(new dojo.uri.Uri(URI,url).toString());
-}
-str+=_1fd.substring(0,_200.index)+"AlphaImageLoader(src='"+url+"'";
-_1fd=_1fd.substr(_200.index+_200[0].length);
-}
-return str+_1fd;
-}
-if(!_1fd||!URI){
-return;
-}
-var _200,str="",url="";
-var _205=/url\(\s*([\t\s\w()\/.\\'"-:#=&?]+)\s*\)/;
-var _203=/(file|https?|ftps?):\/\//;
-var _202=/^[\s]*(['"]?)([\w()\/.\\'"-:#=&?]*)\1[\s]*?$/;
-if(dojo.render.html.ie55||dojo.render.html.ie60){
-_1fd=iefixPathsInCssText();
-}
-while(_200=_205.exec(_1fd)){
-url=_200[1].replace(_202,"$2");
-if(!_203.exec(url)){
-url=(new dojo.uri.Uri(URI,url).toString());
-}
-str+=_1fd.substring(0,_200.index)+"url("+url+")";
-_1fd=_1fd.substr(_200.index+_200[0].length);
-}
-return str+_1fd;
-};
-dojo.html.setActiveStyleSheet=function(_206){
-var i=0,a,els=dojo.doc().getElementsByTagName("link");
-while(a=els[i++]){
-if(a.getAttribute("rel").indexOf("style")!=-1&&a.getAttribute("title")){
-a.disabled=true;
-if(a.getAttribute("title")==_206){
-a.disabled=false;
-}
-}
-}
-};
-dojo.html.getActiveStyleSheet=function(){
-var i=0,a,els=dojo.doc().getElementsByTagName("link");
-while(a=els[i++]){
-if(a.getAttribute("rel").indexOf("style")!=-1&&a.getAttribute("title")&&!a.disabled){
-return a.getAttribute("title");
-}
-}
-return null;
-};
-dojo.html.getPreferredStyleSheet=function(){
-var i=0,a,els=dojo.doc().getElementsByTagName("link");
-while(a=els[i++]){
-if(a.getAttribute("rel").indexOf("style")!=-1&&a.getAttribute("rel").indexOf("alt")==-1&&a.getAttribute("title")){
-return a.getAttribute("title");
-}
-}
-return null;
-};
-dojo.html.applyBrowserClass=function(node){
-var drh=dojo.render.html;
-var _212={dj_ie:drh.ie,dj_ie55:drh.ie55,dj_ie6:drh.ie60,dj_ie7:drh.ie70,dj_iequirks:drh.ie&&drh.quirks,dj_opera:drh.opera,dj_opera8:drh.opera&&(Math.floor(dojo.render.version)==8),dj_opera9:drh.opera&&(Math.floor(dojo.render.version)==9),dj_khtml:drh.khtml,dj_safari:drh.safari,dj_gecko:drh.mozilla};
-for(var p in _212){
-if(_212[p]){
-dojo.html.addClass(node,p);
+
+dojo.html.getClasses = function(/* HTMLElement */node) {
+  //  summary
+  //  Returns an array of CSS classes currently assigned directly to the node in question. 
+  //  Returns an empty array if no classes are found;
+  var c = dojo.html.getClass(node);
+  return (c == "") ? [] : c.split(/\s+/g);  //  array
 }
+
+dojo.html.hasClass = function(/* HTMLElement */node, /* string */classname){
+  //  summary
+  //  Returns whether or not the specified classname is a portion of the
+  //  class list currently applied to the node. Does not cover cascaded
+  //  styles, only classes directly applied to the node.
+  return (new RegExp('(^|\\s+)'+classname+'(\\s+|$)')).test(dojo.html.getClass(node)) //  boolean
 }
+
+dojo.html.prependClass = function(/* HTMLElement */node, /* string */classStr){
+  //  summary
+  //  Adds the specified class to the beginning of the class list on the
+  //  passed node. This gives the specified class the highest precidence
+  //  when style cascading is calculated for the node. Returns true or
+  //  false; indicating success or failure of the operation, respectively.
+  classStr += " " + dojo.html.getClass(node);
+  return dojo.html.setClass(node, classStr);  //  boolean
+}
+
+dojo.html.addClass = function(/* HTMLElement */node, /* string */classStr){
+  //  summary
+  //  Adds the specified class to the end of the class list on the
+  //  passed &node;. Returns &true; or &false; indicating success or failure.
+  if (dojo.html.hasClass(node, classStr)) {
+    return false;
+  }
+  classStr = (dojo.html.getClass(node) + " " + classStr).replace(/^\s+|\s+$/g,"");
+  return dojo.html.setClass(node, classStr);  //  boolean
+}
+
+dojo.html.setClass = function(/* HTMLElement */node, /* string */classStr){
+  //  summary
+  //  Clobbers the existing list of classes for the node, replacing it with
+  //  the list given in the 2nd argument. Returns true or false
+  //  indicating success or failure.
+  node = dojo.byId(node);
+  var cs = new String(classStr);
+  try{
+    if(typeof node.className == "string"){
+      node.className = cs;
+    }else if(node.setAttribute){
+      node.setAttribute("class", classStr);
+      node.className = cs;
+    }else{
+      return false;
+    }
+  }catch(e){
+    dojo.debug("dojo.html.setClass() failed", e);
+  }
+  return true;
+}
+
+dojo.html.removeClass = function(/* HTMLElement */node, /* string */classStr, /* boolean? */allowPartialMatches){
+  //  summary
+  //  Removes the className from the node;. Returns true or false indicating success or failure.
+  try{
+    if (!allowPartialMatches) {
+      var newcs = dojo.html.getClass(node).replace(new RegExp('(^|\\s+)'+classStr+'(\\s+|$)'), "$1$2");
+    } else {
+      var newcs = dojo.html.getClass(node).replace(classStr,'');
+    }
+    dojo.html.setClass(node, newcs);
+  }catch(e){
+    dojo.debug("dojo.html.removeClass() failed", e);
+  }
+  return true;  //  boolean
+}
+
+dojo.html.replaceClass = function(/* HTMLElement */node, /* string */newClass, /* string */oldClass) {
+  //  summary
+  //  Replaces 'oldClass' and adds 'newClass' to node
+  dojo.html.removeClass(node, oldClass);
+  dojo.html.addClass(node, newClass);
+}
+
+// Enum type for getElementsByClass classMatchType arg:
+dojo.html.classMatchType = {
+  ContainsAll : 0, // all of the classes are part of the node's class (default)
+  ContainsAny : 1, // any of the classes are part of the node's class
+  IsOnly : 2 // only all of the classes are part of the node's class
+}
+
+
+dojo.html.getElementsByClass = function(
+  /* string */classStr, 
+  /* HTMLElement? */parent, 
+  /* string? */nodeType, 
+  /* integer? */classMatchType, 
+  /* boolean? */useNonXpath
+){
+  //  summary
+  //  Returns an array of nodes for the given classStr, children of a
+  //  parent, and optionally of a certain nodeType
+  // FIXME: temporarily set to false because of several dojo tickets related
+  // to the xpath version not working consistently in firefox.
+  useNonXpath = false;
+  var _document = dojo.doc();
+  parent = dojo.byId(parent) || _document;
+  var classes = classStr.split(/\s+/g);
+  var nodes = [];
+  if( classMatchType != 1 && classMatchType != 2 ) classMatchType = 0; // make it enum
+  var reClass = new RegExp("(\\s|^)((" + classes.join(")|(") + "))(\\s|$)");
+  var srtLength = classes.join(" ").length;
+  var candidateNodes = [];
+  
+  if(!useNonXpath && _document.evaluate) { // supports dom 3 xpath
+    var xpath = ".//" + (nodeType || "*") + "[contains(";
+    if(classMatchType != dojo.html.classMatchType.ContainsAny){
+      xpath += "concat(' ',@class,' '), ' " +
+      classes.join(" ') and contains(concat(' ',@class,' '), ' ") +
+      " ')";
+      if (classMatchType == 2) {
+        xpath += " and string-length(@class)="+srtLength+"]";
+      }else{
+        xpath += "]";
+      }
+    }else{
+      xpath += "concat(' ',@class,' '), ' " +
+      classes.join(" ') or contains(concat(' ',@class,' '), ' ") +
+      " ')]";
+    }
+    var xpathResult = _document.evaluate(xpath, parent, null, XPathResult.ANY_TYPE, null);
+    var result = xpathResult.iterateNext();
+    while(result){
+      try{
+        candidateNodes.push(result);
+        result = xpathResult.iterateNext();
+      }catch(e){ break; }
+    }
+    return candidateNodes;  //  NodeList
+  }else{
+    if(!nodeType){
+      nodeType = "*";
+    }
+    candidateNodes = parent.getElementsByTagName(nodeType);
+
+    var node, i = 0;
+    outer:
+    while(node = candidateNodes[i++]){
+      var nodeClasses = dojo.html.getClasses(node);
+      if(nodeClasses.length == 0){ continue outer; }
+      var matches = 0;
+  
+      for(var j = 0; j < nodeClasses.length; j++){
+        if(reClass.test(nodeClasses[j])){
+          if(classMatchType == dojo.html.classMatchType.ContainsAny){
+            nodes.push(node);
+            continue outer;
+          }else{
+            matches++;
+          }
+        }else{
+          if(classMatchType == dojo.html.classMatchType.IsOnly){
+            continue outer;
+          }
+        }
+      }
+  
+      if(matches == classes.length){
+        if( (classMatchType == dojo.html.classMatchType.IsOnly)&&
+          (matches == nodeClasses.length)){
+          nodes.push(node);
+        }else if(classMatchType == dojo.html.classMatchType.ContainsAll){
+          nodes.push(node);
+        }
+      }
+    }
+    return nodes; //  NodeList
+  }
+}
+dojo.html.getElementsByClassName = dojo.html.getElementsByClass;
+
+dojo.html.toCamelCase = function(/* string */selector){
+  //  summary
+  //  Translates a CSS selector string to a camel-cased one.
+  var arr = selector.split('-'), cc = arr[0];
+  for(var i = 1; i < arr.length; i++) {
+    cc += arr[i].charAt(0).toUpperCase() + arr[i].substring(1);
+  }
+  return cc;  //  string
+}
+
+dojo.html.toSelectorCase = function(/* string */selector){
+  //  summary
+  //  Translates a camel cased string to a selector cased one.
+  return selector.replace(/([A-Z])/g, "-$1" ).toLowerCase();  //  string
+}
+
+dojo.html.getComputedStyle = function(/* HTMLElement */node, /* string */cssSelector, /* integer? */inValue){
+  //  summary
+  //  Returns the computed style of cssSelector on node.
+  node = dojo.byId(node);
+  // cssSelector may actually be in camel case, so force selector version
+  var cssSelector = dojo.html.toSelectorCase(cssSelector);
+  var property = dojo.html.toCamelCase(cssSelector);
+  if(!node || !node.style){
+    return inValue;     
+  } else if (document.defaultView && dojo.html.isDescendantOf(node, node.ownerDocument)){ // W3, gecko, KHTML
+    try{
+      // mozilla segfaults when margin-* and node is removed from doc
+      // FIXME: need to figure out a if there is quicker workaround
+      var cs = document.defaultView.getComputedStyle(node, "");
+      if(cs){
+        return cs.getPropertyValue(cssSelector);  //  integer
+      } 
+    }catch(e){ // reports are that Safari can throw an exception above
+      if(node.style.getPropertyValue){ // W3
+        return node.style.getPropertyValue(cssSelector);  //  integer
+      } else {
+        return inValue; //  integer
+      }
+    }
+  } else if(node.currentStyle){ // IE
+    return node.currentStyle[property]; //  integer
+  }
+  
+  if(node.style.getPropertyValue){ // W3
+    return node.style.getPropertyValue(cssSelector);  //  integer
+  }else{
+    return inValue; //  integer
+  }
+}
+
+dojo.html.getStyleProperty = function(/* HTMLElement */node, /* string */cssSelector){
+  //  summary
+  //  Returns the value of the passed style
+  node = dojo.byId(node);
+  return (node && node.style ? node.style[dojo.html.toCamelCase(cssSelector)] : undefined); //  string
+}
+
+dojo.html.getStyle = function(/* HTMLElement */node, /* string */cssSelector){
+  //  summary
+  //  Returns the computed value of the passed style
+  var value = dojo.html.getStyleProperty(node, cssSelector);
+  return (value ? value : dojo.html.getComputedStyle(node, cssSelector)); //  string || integer
+}
+
+dojo.html.setStyle = function(/* HTMLElement */node, /* string */cssSelector, /* string */value){
+  //  summary
+  //  Set the value of passed style on node
+  node = dojo.byId(node);
+  if(node && node.style){
+    var camelCased = dojo.html.toCamelCase(cssSelector);
+    node.style[camelCased] = value;
+  }
+}
+
+dojo.html.setStyleText = function (/* HTMLElement */target, /* string */text) {
+  //  summary
+  //  Try to set the entire cssText property of the passed target; equiv of setting style attribute.
+  try {
+    target.style.cssText = text;
+  } catch (e) {
+    target.setAttribute("style", text);
+  }
+}
+
+dojo.html.copyStyle = function(/* HTMLElement */target, /* HTMLElement */source){
+  //  summary
+  // work around for opera which doesn't have cssText, and for IE which fails on setAttribute 
+  if(!source.style.cssText){ 
+    target.setAttribute("style", source.getAttribute("style")); 
+  }else{
+    target.style.cssText = source.style.cssText; 
+  }
+  dojo.html.addClass(target, dojo.html.getClass(source));
+}
+
+dojo.html.getUnitValue = function(/* HTMLElement */node, /* string */cssSelector, /* boolean? */autoIsZero){
+  //  summary
+  //  Get the value of passed selector, with the specific units used
+  var s = dojo.html.getComputedStyle(node, cssSelector);
+  if((!s)||((s == 'auto')&&(autoIsZero))){ 
+    return { value: 0, units: 'px' }; //  object 
+  }
+  // FIXME: is regex inefficient vs. parseInt or some manual test? 
+  var match = s.match(/(\-?[\d.]+)([a-z%]*)/i);
+  if (!match){return dojo.html.getUnitValue.bad;}
+  return { value: Number(match[1]), units: match[2].toLowerCase() };  //  object
+}
+dojo.html.getUnitValue.bad = { value: NaN, units: '' };
+
+dojo.html.getPixelValue = function(/* HTMLElement */node, /* string */cssSelector, /* boolean? */autoIsZero){
+  //  summary
+  //  Get the value of passed selector in pixels.
+  var result = dojo.html.getUnitValue(node, cssSelector, autoIsZero);
+  // FIXME: there is serious debate as to whether or not this is the right solution
+  if(isNaN(result.value)){ 
+    return 0; //  integer 
+  } 
+  // FIXME: code exists for converting other units to px (see Dean Edward's IE7) 
+  // but there are cross-browser complexities
+  if((result.value)&&(result.units != 'px')){ 
+    return NaN; //  integer 
+  }
+  return result.value;  //  integer
+}
+
+dojo.html.setPositivePixelValue = function(/* HTMLElement */node, /* string */selector, /* integer */value){
+  //  summary
+  //  Attempt to set the value of selector on node as a positive pixel value.
+  if(isNaN(value)){return false;}
+  node.style[selector] = Math.max(0, value) + 'px'; 
+  return true;  //  boolean
+}
+
+dojo.html.styleSheet = null;
+
+// FIXME: this is a really basic stub for adding and removing cssRules, but
+// it assumes that you know the index of the cssRule that you want to add 
+// or remove, making it less than useful.  So we need something that can 
+// search for the selector that you you want to remove.
+dojo.html.insertCssRule = function(/* string */selector, /* string */declaration, /* integer? */index) {
+  //  summary
+  //  Attempt to insert declaration as selector on the internal stylesheet; if index try to set it there.
+  if (!dojo.html.styleSheet) {
+    if (document.createStyleSheet) { // IE
+      dojo.html.styleSheet = document.createStyleSheet();
+    } else if (document.styleSheets[0]) { // rest
+      // FIXME: should create a new style sheet here
+      // fall back on an exsiting style sheet
+      dojo.html.styleSheet = document.styleSheets[0];
+    } else { 
+      return null;  //  integer 
+    } // fail
+  }
+
+  if (arguments.length < 3) { // index may == 0
+    if (dojo.html.styleSheet.cssRules) { // W3
+      index = dojo.html.styleSheet.cssRules.length;
+    } else if (dojo.html.styleSheet.rules) { // IE
+      index = dojo.html.styleSheet.rules.length;
+    } else { 
+      return null;  //  integer 
+    } // fail
+  }
+
+  if (dojo.html.styleSheet.insertRule) { // W3
+    var rule = selector + " { " + declaration + " }";
+    return dojo.html.styleSheet.insertRule(rule, index);  //  integer
+  } else if (dojo.html.styleSheet.addRule) { // IE
+    return dojo.html.styleSheet.addRule(selector, declaration, index);  //  integer
+  } else { 
+    return null; // integer
+  } // fail
+}
+
+dojo.html.removeCssRule = function(/* integer? */index){
+  //  summary
+  //  Attempt to remove the rule at index.
+  if(!dojo.html.styleSheet){
+    dojo.debug("no stylesheet defined for removing rules");
+    return false;
+  }
+  if(dojo.render.html.ie){
+    if(!index){
+      index = dojo.html.styleSheet.rules.length;
+      dojo.html.styleSheet.removeRule(index);
+    }
+  }else if(document.styleSheets[0]){
+    if(!index){
+      index = dojo.html.styleSheet.cssRules.length;
+    }
+    dojo.html.styleSheet.deleteRule(index);
+  }
+  return true;  //  boolean
+}
+
+dojo.html._insertedCssFiles = []; // cache container needed because IE reformats cssText when added to DOM
+dojo.html.insertCssFile = function(/* string */URI, /* HTMLDocument? */doc, /* boolean? */checkDuplicates, /* boolean */fail_ok){
+  //  summary
+  // calls css by XmlHTTP and inserts it into DOM as <style [widgetType="widgetType"]> *downloaded cssText*</style>
+  if(!URI){ return; }
+  if(!doc){ doc = document; }
+  var cssStr = dojo.hostenv.getText(URI, false, fail_ok);
+  if(cssStr===null){ return; } 
+  cssStr = dojo.html.fixPathsInCssText(cssStr, URI);
+
+  if(checkDuplicates){
+    var idx = -1, node, ent = dojo.html._insertedCssFiles;
+    for(var i = 0; i < ent.length; i++){
+      if((ent[i].doc == doc) && (ent[i].cssText == cssStr)){
+        idx = i; node = ent[i].nodeRef;
+        break;
+      }
+    }
+    // make sure we havent deleted our node
+    if(node){
+      var styles = doc.getElementsByTagName("style");
+      for(var i = 0; i < styles.length; i++){
+        if(styles[i] == node){
+          return;
+        }
+      }
+      // delete this entry
+      dojo.html._insertedCssFiles.shift(idx, 1);
+    }
+  }
+
+  var style = dojo.html.insertCssText(cssStr);
+  dojo.html._insertedCssFiles.push({'doc': doc, 'cssText': cssStr, 'nodeRef': style});
+
+  // insert custom attribute ex dbgHref="../foo.css" usefull when debugging in DOM inspectors, no?
+  if(style && djConfig.isDebug){
+    style.setAttribute("dbgHref", URI);
+  }
+  return style; //  HTMLStyleElement
+}
+
+dojo.html.insertCssText = function(/* string */cssStr, /* HTMLDocument? */doc, /* string? */URI){
+  //  summary
+  //  Attempt to insert CSS rules into the document through inserting a style element
+  // DomNode Style  = insertCssText(String ".dojoMenu {color: green;}"[, DomDoc document, dojo.uri.Uri Url ])
+  if(!cssStr){ 
+    return; //  HTMLStyleElement
+  }
+  if(!doc){ doc = document; }
+  if(URI){// fix paths in cssStr
+    cssStr = dojo.html.fixPathsInCssText(cssStr, URI);
+  }
+  var style = doc.createElement("style");
+  style.setAttribute("type", "text/css");
+  // IE is b0rken enough to require that we add the element to the doc
+  // before changing it's properties
+  var head = doc.getElementsByTagName("head")[0];
+  if(!head){ // must have a head tag 
+    dojo.debug("No head tag in document, aborting styles");
+    return; //  HTMLStyleElement
+  }else{
+    head.appendChild(style);
+  }
+  if(style.styleSheet){// IE
+    style.styleSheet.cssText = cssStr;
+  }else{ // w3c
+    var cssText = doc.createTextNode(cssStr);
+    style.appendChild(cssText);
+  }
+  return style; //  HTMLStyleElement
+}
+
+dojo.html.fixPathsInCssText = function(/* string */cssStr, /* string */URI){
+  //  summary
+  // usage: cssText comes from dojoroot/src/widget/templates/Foobar.css
+  //  it has .dojoFoo { background-image: url(images/bar.png);} then uri should point to dojoroot/src/widget/templates/
+  function iefixPathsInCssText() {
+    var regexIe = /AlphaImageLoader\(src\=['"]([\t\s\w()\/.\\'"-:#=&?~]*)['"]/;
+    while(match = regexIe.exec(cssStr)){
+      url = match[1].replace(regexTrim, "$2");
+      if(!regexProtocol.exec(url)){
+        url = (new dojo.uri.Uri(URI, url).toString());
+      }
+      str += cssStr.substring(0, match.index) + "AlphaImageLoader(src='" + url + "'";
+      cssStr = cssStr.substr(match.index + match[0].length);
+    }
+    return str + cssStr;
+  }
+
+  if(!cssStr || !URI){ return; }
+  var match, str = "", url = "";
+  var regex = /url\(\s*([\t\s\w()\/.\\'"-:#=&?]+)\s*\)/;
+  var regexProtocol = /(file|https?|ftps?):\/\//;
+  var regexTrim = /^[\s]*(['"]?)([\w()\/.\\'"-:#=&?]*)\1[\s]*?$/;
+  if (dojo.render.html.ie55 || dojo.render.html.ie60) {
+    cssStr = iefixPathsInCssText();
+  }
+  while(match = regex.exec(cssStr)){
+    url = match[1].replace(regexTrim, "$2");
+    if(!regexProtocol.exec(url)){
+      url = (new dojo.uri.Uri(URI, url).toString());
+    }
+    str += cssStr.substring(0, match.index) + "url(" + url + ")";
+    cssStr = cssStr.substr(match.index + match[0].length);
+  }
+  return str + cssStr;  //  string
+}
+
+dojo.html.setActiveStyleSheet = function(/* string */title){
+  //  summary
+  //  Activate style sheet with specified title.
+  var i = 0, a, els = dojo.doc().getElementsByTagName("link");
+  while (a = els[i++]) {
+    if(a.getAttribute("rel").indexOf("style") != -1 && a.getAttribute("title")){
+      a.disabled = true;
+      if (a.getAttribute("title") == title) { a.disabled = false; }
+    }
+  }
+}
+
+dojo.html.getActiveStyleSheet = function(){
+  //  summary
+  //  return the title of the currently active stylesheet
+  var i = 0, a, els = dojo.doc().getElementsByTagName("link");
+  while (a = els[i++]) {
+    if (a.getAttribute("rel").indexOf("style") != -1 
+      && a.getAttribute("title") 
+      && !a.disabled
+    ){
+      return a.getAttribute("title"); //  string 
+    }
+  }
+  return null;  //  string
+}
+
+dojo.html.getPreferredStyleSheet = function(){
+  //  summary
+  //  Return the preferred stylesheet title (i.e. link without alt attribute)
+  var i = 0, a, els = dojo.doc().getElementsByTagName("link");
+  while (a = els[i++]) {
+    if(a.getAttribute("rel").indexOf("style") != -1
+      && a.getAttribute("rel").indexOf("alt") == -1
+      && a.getAttribute("title")
+    ){ 
+      return a.getAttribute("title");   //  string
+    }
+  }
+  return null;  //  string
+}
+
+dojo.html.applyBrowserClass = function(/* HTMLElement */node){
+  //  summary
+  //  Applies pre-set class names based on browser & version to the passed node.
+  //  Modified version of Morris' CSS hack.
+  var drh=dojo.render.html;
+  var classes = {
+    dj_ie: drh.ie,
+    dj_ie55: drh.ie55,
+    dj_ie6: drh.ie60,
+    dj_ie7: drh.ie70,
+    dj_iequirks: drh.ie && drh.quirks,
+    dj_opera: drh.opera,
+    dj_opera8: drh.opera && (Math.floor(dojo.render.version)==8),
+    dj_opera9: drh.opera && (Math.floor(dojo.render.version)==9),
+    dj_khtml: drh.khtml,
+    dj_safari: drh.safari,
+    dj_gecko: drh.mozilla
+  }; // no dojo unsupported browsers
+  for(var p in classes){
+    if(classes[p]){
+      dojo.html.addClass(node, p);
+    }
+  }
 };
+
 dojo.provide("dojo.html.*");
+
 dojo.provide("dojo.html.display");
-dojo.html._toggle=function(node,_215,_216){
-node=dojo.byId(node);
-_216(node,!_215(node));
-return _215(node);
-};
-dojo.html.show=function(node){
-node=dojo.byId(node);
-if(dojo.html.getStyleProperty(node,"display")=="none"){
-dojo.html.setStyle(node,"display",(node.dojoDisplayCache||""));
-node.dojoDisplayCache=undefined;
+
+dojo.html._toggle = function(node, tester, setter){
+  node = dojo.byId(node);
+  setter(node, !tester(node));
+  return tester(node);
 }
-};
-dojo.html.hide=function(node){
-node=dojo.byId(node);
-if(typeof node["dojoDisplayCache"]=="undefined"){
-var d=dojo.html.getStyleProperty(node,"display");
-if(d!="none"){
-node.dojoDisplayCache=d;
+
+dojo.html.show = function(/* HTMLElement */node){
+  //  summary
+  //  Show the passed element by reverting display property set by dojo.html.hide
+  node = dojo.byId(node);
+  if(dojo.html.getStyleProperty(node, 'display')=='none'){
+    dojo.html.setStyle(node, 'display', (node.dojoDisplayCache||''));
+    node.dojoDisplayCache = undefined;  // cannot use delete on a node in IE6
+  }
 }
+
+dojo.html.hide = function(/* HTMLElement */node){
+  //  summary
+  //  Hide the passed element by setting display:none
+  node = dojo.byId(node);
+  if(typeof node["dojoDisplayCache"] == "undefined"){ // it could == '', so we cannot say !node.dojoDisplayCount
+    var d = dojo.html.getStyleProperty(node, 'display')
+    if(d!='none'){
+      node.dojoDisplayCache = d;
+    }
+  }
+  dojo.html.setStyle(node, 'display', 'none');
 }
-dojo.html.setStyle(node,"display","none");
-};
-dojo.html.setShowing=function(node,_21b){
-dojo.html[(_21b?"show":"hide")](node);
-};
-dojo.html.isShowing=function(node){
-return (dojo.html.getStyleProperty(node,"display")!="none");
-};
-dojo.html.toggleShowing=function(node){
-return dojo.html._toggle(node,dojo.html.isShowing,dojo.html.setShowing);
-};
-dojo.html.displayMap={tr:"",td:"",th:"",img:"inline",span:"inline",input:"inline",button:"inline"};
-dojo.html.suggestDisplayByTagName=function(node){
-node=dojo.byId(node);
-if(node&&node.tagName){
-var tag=node.tagName.toLowerCase();
-return (tag in dojo.html.displayMap?dojo.html.displayMap[tag]:"block");
+
+dojo.html.setShowing = function(/* HTMLElement */node, /* boolean? */showing){
+  //  summary
+  // Calls show() if showing is true, hide() otherwise
+  dojo.html[(showing ? 'show' : 'hide')](node);
 }
-};
-dojo.html.setDisplay=function(node,_221){
-dojo.html.setStyle(node,"display",((_221 instanceof String||typeof _221=="string")?_221:(_221?dojo.html.suggestDisplayByTagName(node):"none")));
-};
-dojo.html.isDisplayed=function(node){
-return (dojo.html.getComputedStyle(node,"display")!="none");
-};
-dojo.html.toggleDisplay=function(node){
-return dojo.html._toggle(node,dojo.html.isDisplayed,dojo.html.setDisplay);
-};
-dojo.html.setVisibility=function(node,_225){
-dojo.html.setStyle(node,"visibility",((_225 instanceof String||typeof _225=="string")?_225:(_225?"visible":"hidden")));
-};
-dojo.html.isVisible=function(node){
-return (dojo.html.getComputedStyle(node,"visibility")!="hidden");
-};
-dojo.html.toggleVisibility=function(node){
-return dojo.html._toggle(node,dojo.html.isVisible,dojo.html.setVisibility);
-};
-dojo.html.setOpacity=function(node,_229,_22a){
-node=dojo.byId(node);
-var h=dojo.render.html;
-if(!_22a){
-if(_229>=1){
-if(h.ie){
-dojo.html.clearOpacity(node);
-return;
-}else{
-_229=0.999999;
+
+dojo.html.isShowing = function(/* HTMLElement */node){
+  //  summary
+  //  Returns whether the element is displayed or not.
+  // FIXME: returns true if node is bad, isHidden would be easier to make correct
+  return (dojo.html.getStyleProperty(node, 'display') != 'none'); //  boolean
 }
-}else{
-if(_229<0){
-_229=0;
+
+dojo.html.toggleShowing = function(/* HTMLElement */node){
+  //  summary
+  // Call setShowing() on node with the complement of isShowing(), then return the new value of isShowing()
+  return dojo.html._toggle(node, dojo.html.isShowing, dojo.html.setShowing);  //  boolean
 }
+
+// Simple mapping of tag names to display values
+// FIXME: simplistic 
+dojo.html.displayMap = { tr: '', td: '', th: '', img: 'inline', span: 'inline', input: 'inline', button: 'inline' };
+
+dojo.html.suggestDisplayByTagName = function(/* HTMLElement */node){
+  //  summary
+  // Suggest a value for the display property that will show 'node' based on it's tag
+  node = dojo.byId(node);
+  if(node && node.tagName){
+    var tag = node.tagName.toLowerCase();
+    return (tag in dojo.html.displayMap ? dojo.html.displayMap[tag] : 'block'); //  string
+  }
 }
+
+dojo.html.setDisplay = function(/* HTMLElement */node, /* string */display){
+  //  summary
+  //  Sets the value of style.display to value of 'display' parameter if it is a string.
+  //  Otherwise, if 'display' is false, set style.display to 'none'.
+  //  Finally, set 'display' to a suggested display value based on the node's tag
+  dojo.html.setStyle(node, 'display', ((display instanceof String || typeof display == "string") ? display : (display ? dojo.html.suggestDisplayByTagName(node) : 'none')));
 }
-if(h.ie){
-if(node.nodeName.toLowerCase()=="tr"){
-var tds=node.getElementsByTagName("td");
-for(var x=0;x<tds.length;x++){
-tds[x].style.filter="Alpha(Opacity="+_229*100+")";
+
+dojo.html.isDisplayed = function(/* HTMLElement */node){
+  //  summary
+  //  Is true if the the computed display style for node is not 'none'
+  //  FIXME: returns true if node is bad, isNotDisplayed would be easier to make correct
+  return (dojo.html.getComputedStyle(node, 'display') != 'none'); //  boolean
 }
+
+dojo.html.toggleDisplay = function(/* HTMLElement */node){
+  //  summary
+  //  Call setDisplay() on node with the complement of isDisplayed(), then
+  //  return the new value of isDisplayed()
+  return dojo.html._toggle(node, dojo.html.isDisplayed, dojo.html.setDisplay);  //  boolean
 }
-node.style.filter="Alpha(Opacity="+_229*100+")";
-}else{
-if(h.moz){
-node.style.opacity=_229;
-node.style.MozOpacity=_229;
-}else{
-if(h.safari){
-node.style.opacity=_229;
-node.style.KhtmlOpacity=_229;
-}else{
-node.style.opacity=_229;
+
+dojo.html.setVisibility = function(/* HTMLElement */node, /* string */visibility){
+  //  summary
+  //  Sets the value of style.visibility to value of 'visibility' parameter if it is a string.
+  //  Otherwise, if 'visibility' is false, set style.visibility to 'hidden'. Finally, set style.visibility to 'visible'.
+  dojo.html.setStyle(node, 'visibility', ((visibility instanceof String || typeof visibility == "string") ? visibility : (visibility ? 'visible' : 'hidden')));
 }
+
+dojo.html.isVisible = function(/* HTMLElement */node){
+  //  summary
+  //  Returns true if the the computed visibility style for node is not 'hidden'
+  //  FIXME: returns true if node is bad, isInvisible would be easier to make correct
+  return (dojo.html.getComputedStyle(node, 'visibility') != 'hidden');  //  boolean
 }
+
+dojo.html.toggleVisibility = function(node){
+  //  summary
+  // Call setVisibility() on node with the complement of isVisible(), then return the new value of isVisible()
+  return dojo.html._toggle(node, dojo.html.isVisible, dojo.html.setVisibility); //  boolean
 }
-};
-dojo.html.clearOpacity=function(node){
-node=dojo.byId(node);
-var ns=node.style;
-var h=dojo.render.html;
-if(h.ie){
-try{
-if(node.filters&&node.filters.alpha){
-ns.filter="";
+
+dojo.html.setOpacity = function(/* HTMLElement */node, /* float */opacity, /* boolean? */dontFixOpacity){
+  //  summary
+  //  Sets the opacity of node in a cross-browser way.
+  //  float between 0.0 (transparent) and 1.0 (opaque)
+  node = dojo.byId(node);
+  var h = dojo.render.html;
+  if(!dontFixOpacity){
+    if( opacity >= 1.0){
+      if(h.ie){
+        dojo.html.clearOpacity(node);
+        return;
+      }else{
+        opacity = 0.999999;
+      }
+    }else if( opacity < 0.0){ opacity = 0; }
+  }
+  if(h.ie){
+    if(node.nodeName.toLowerCase() == "tr"){
+      // FIXME: is this too naive? will we get more than we want?
+      var tds = node.getElementsByTagName("td");
+      for(var x=0; x<tds.length; x++){
+        tds[x].style.filter = "Alpha(Opacity="+opacity*100+")";
+      }
+    }
+    node.style.filter = "Alpha(Opacity="+opacity*100+")";
+  }else if(h.moz){
+    node.style.opacity = opacity; // ffox 1.0 directly supports "opacity"
+    node.style.MozOpacity = opacity;
+  }else if(h.safari){
+    node.style.opacity = opacity; // 1.3 directly supports "opacity"
+    node.style.KhtmlOpacity = opacity;
+  }else{
+    node.style.opacity = opacity;
+  }
 }
+
+dojo.html.clearOpacity = function(/* HTMLElement */node){
+  //  summary
+  //  Clears any opacity setting on the passed element.
+  node = dojo.byId(node);
+  var ns = node.style;
+  var h = dojo.render.html;
+  if(h.ie){
+    try {
+      if( node.filters && node.filters.alpha ){
+        ns.filter = ""; // FIXME: may get rid of other filter effects
+      }
+    } catch(e) {
+      /*
+       * IE7 gives error if node.filters not set;
+       * don't know why or how to workaround (other than this)
+       */
+    }
+  }else if(h.moz){
+    ns.opacity = 1;
+    ns.MozOpacity = 1;
+  }else if(h.safari){
+    ns.opacity = 1;
+    ns.KhtmlOpacity = 1;
+  }else{
+    ns.opacity = 1;
+  }
 }
-catch(e){
+
+dojo.html.getOpacity = function(/* HTMLElement */node){
+  //  summary
+  //  Returns the opacity of the passed element
+  node = dojo.byId(node);
+  var h = dojo.render.html;
+  if(h.ie){
+    var opac = (node.filters && node.filters.alpha &&
+      typeof node.filters.alpha.opacity == "number"
+      ? node.filters.alpha.opacity : 100) / 100;
+  }else{
+    var opac = node.style.opacity || node.style.MozOpacity ||
+      node.style.KhtmlOpacity || 1;
+  }
+  return opac >= 0.999999 ? 1.0 : Number(opac); //  float
 }
-}else{
-if(h.moz){
-ns.opacity=1;
-ns.MozOpacity=1;
-}else{
-if(h.safari){
-ns.opacity=1;
-ns.KhtmlOpacity=1;
-}else{
-ns.opacity=1;
-}
-}
-}
-};
-dojo.html.getOpacity=function(node){
-node=dojo.byId(node);
-var h=dojo.render.html;
-if(h.ie){
-var opac=(node.filters&&node.filters.alpha&&typeof node.filters.alpha.opacity=="number"?node.filters.alpha.opacity:100)/100;
-}else{
-var opac=node.style.opacity||node.style.MozOpacity||node.style.KhtmlOpacity||1;
-}
-return opac>=0.999999?1:Number(opac);
-};
+
 dojo.provide("dojo.html.layout");
-dojo.html.sumAncestorProperties=function(node,prop){
-node=dojo.byId(node);
-if(!node){
-return 0;
+
+
+dojo.html.sumAncestorProperties = function(/* HTMLElement */node, /* string */prop){
+  //  summary
+  //  Returns the sum of the passed property on all ancestors of node.
+  node = dojo.byId(node);
+  if(!node){ return 0; } // FIXME: throw an error?
+  
+  var retVal = 0;
+  while(node){
+    if(dojo.html.getComputedStyle(node, 'position') == 'fixed'){
+      return 0;
+    }
+    var val = node[prop];
+    if(val){
+      retVal += val - 0;
+      if(node==dojo.body()){ break; }// opera and khtml #body & #html has the same values, we only need one value
+    }
+    node = node.parentNode;
+  }
+  return retVal;  //  integer
 }
-var _236=0;
-while(node){
-if(dojo.html.getComputedStyle(node,"position")=="fixed"){
-return 0;
+
+dojo.html.setStyleAttributes = function(/* HTMLElement */node, /* string */attributes) { 
+  //  summary
+  //  allows a dev to pass a string similar to what you'd pass in style="", and apply it to a node.
+  node = dojo.byId(node);
+  var splittedAttribs=attributes.replace(/(;)?\s*$/, "").split(";"); 
+  for(var i=0; i<splittedAttribs.length; i++){ 
+    var nameValue=splittedAttribs[i].split(":"); 
+    var name=nameValue[0].replace(/\s*$/, "").replace(/^\s*/, "").toLowerCase();
+    var value=nameValue[1].replace(/\s*$/, "").replace(/^\s*/, "");
+    switch(name){
+      case "opacity":
+        dojo.html.setOpacity(node, value); 
+        break; 
+      case "content-height":
+        dojo.html.setContentBox(node, {height: value}); 
+        break; 
+      case "content-width":
+        dojo.html.setContentBox(node, {width: value}); 
+        break; 
+      case "outer-height":
+        dojo.html.setMarginBox(node, {height: value}); 
+        break; 
+      case "outer-width":
+        dojo.html.setMarginBox(node, {width: value}); 
+        break; 
+      default:
+        node.style[dojo.html.toCamelCase(name)]=value; 
+    }
+  } 
 }
-var val=node[prop];
-if(val){
-_236+=val-0;
-if(node==dojo.body()){
-break;
+
+dojo.html.boxSizing = {
+  MARGIN_BOX: "margin-box",
+  BORDER_BOX: "border-box",
+  PADDING_BOX: "padding-box",
+  CONTENT_BOX: "content-box"
+};
+
+dojo.html.getAbsolutePosition = dojo.html.abs = function(/* HTMLElement */node, /* boolean? */includeScroll, /* string? */boxType){
+  //  summary
+  //  Gets the absolute position of the passed element based on the document itself.
+  node = dojo.byId(node, node.ownerDocument);
+  var ret = {
+    x: 0,
+    y: 0
+  };
+
+  var bs = dojo.html.boxSizing;
+  if(!boxType) { boxType = bs.CONTENT_BOX; }
+  var nativeBoxType = 2; //BORDER box
+  var targetBoxType;
+  switch(boxType){
+    case bs.MARGIN_BOX:
+      targetBoxType = 3;
+      break;
+    case bs.BORDER_BOX:
+      targetBoxType = 2;
+      break;
+    case bs.PADDING_BOX:
+    default:
+      targetBoxType = 1;
+      break;
+    case bs.CONTENT_BOX:
+      targetBoxType = 0;
+      break;
+  }
+
+  var h = dojo.render.html;
+  var db = document["body"]||document["documentElement"];
+
+  if(h.ie){
+    with(node.getBoundingClientRect()){
+      ret.x = left-2;
+      ret.y = top-2;
+    }
+  }else if(document.getBoxObjectFor){
+    // mozilla
+    nativeBoxType = 1; //getBoxObjectFor return padding box coordinate
+    try{
+      var bo = document.getBoxObjectFor(node);
+      ret.x = bo.x - dojo.html.sumAncestorProperties(node, "scrollLeft");
+      ret.y = bo.y - dojo.html.sumAncestorProperties(node, "scrollTop");
+    }catch(e){
+      // squelch
+    }
+  }else{
+    if(node["offsetParent"]){
+      var endNode;
+      // in Safari, if the node is an absolutely positioned child of
+      // the body and the body has a margin the offset of the child
+      // and the body contain the body's margins, so we need to end
+      // at the body
+      if( (h.safari)&&
+        (node.style.getPropertyValue("position") == "absolute")&&
+        (node.parentNode == db)){
+        endNode = db;
+      }else{
+        endNode = db.parentNode;
+      }
+
+      //TODO: set correct nativeBoxType for safari/konqueror
+
+      if(node.parentNode != db){
+        var nd = node;
+        if(dojo.render.html.opera){ nd = db; }
+        ret.x -= dojo.html.sumAncestorProperties(nd, "scrollLeft");
+        ret.y -= dojo.html.sumAncestorProperties(nd, "scrollTop");
+      }
+      var curnode = node;
+      do{
+        var n = curnode["offsetLeft"];
+        //FIXME: ugly hack to workaround the submenu in 
+        //popupmenu2 does not shown up correctly in opera. 
+        //Someone have a better workaround?
+        if(!h.opera || n>0){
+          ret.x += isNaN(n) ? 0 : n;
+        }
+        var m = curnode["offsetTop"];
+        ret.y += isNaN(m) ? 0 : m;
+        curnode = curnode.offsetParent;
+      }while((curnode != endNode)&&(curnode != null));
+    }else if(node["x"]&&node["y"]){
+      ret.x += isNaN(node.x) ? 0 : node.x;
+      ret.y += isNaN(node.y) ? 0 : node.y;
+    }
+  }
+
+  // account for document scrolling!
+  if(includeScroll){
+    var scroll = dojo.html.getScroll();
+    ret.y += scroll.top;
+    ret.x += scroll.left;
+  }
+
+  var extentFuncArray=[dojo.html.getPaddingExtent, dojo.html.getBorderExtent, dojo.html.getMarginExtent];
+  if(nativeBoxType > targetBoxType){
+    for(var i=targetBoxType;i<nativeBoxType;++i){
+      ret.y += extentFuncArray[i](node, 'top');
+      ret.x += extentFuncArray[i](node, 'left');
+    }
+  }else if(nativeBoxType < targetBoxType){
+    for(var i=targetBoxType;i>nativeBoxType;--i){
+      ret.y -= extentFuncArray[i-1](node, 'top');
+      ret.x -= extentFuncArray[i-1](node, 'left');
+    }
+  }
+  ret.top = ret.y;
+  ret.left = ret.x;
+  return ret; //  object
 }
+
+dojo.html.isPositionAbsolute = function(/* HTMLElement */node){
+  //  summary
+  //  Returns true if the element is absolutely positioned.
+  return (dojo.html.getComputedStyle(node, 'position') == 'absolute');  //  boolean
 }
-node=node.parentNode;
+
+dojo.html._sumPixelValues = function(/* HTMLElement */node, selectors, autoIsZero){
+  var total = 0;
+  for(var x=0; x<selectors.length; x++){
+    total += dojo.html.getPixelValue(node, selectors[x], autoIsZero);
+  }
+  return total;
 }
-return _236;
-};
-dojo.html.setStyleAttributes=function(node,_239){
-node=dojo.byId(node);
-var _23a=_239.replace(/(;)?\s*$/,"").split(";");
-for(var i=0;i<_23a.length;i++){
-var _23c=_23a[i].split(":");
-var name=_23c[0].replace(/\s*$/,"").replace(/^\s*/,"").toLowerCase();
-var _23e=_23c[1].replace(/\s*$/,"").replace(/^\s*/,"");
-switch(name){
-case "opacity":
-dojo.html.setOpacity(node,_23e);
-break;
-case "content-height":
-dojo.html.setContentBox(node,{height:_23e});
-break;
-case "content-width":
-dojo.html.setContentBox(node,{width:_23e});
-break;
-case "outer-height":
-dojo.html.setMarginBox(node,{height:_23e});
-break;
-case "outer-width":
-dojo.html.setMarginBox(node,{width:_23e});
-break;
-default:
-node.style[dojo.html.toCamelCase(name)]=_23e;
+
+dojo.html.getMargin = function(/* HTMLElement */node){
+  //  summary
+  //  Returns the width and height of the passed node's margin
+  return {
+    width: dojo.html._sumPixelValues(node, ["margin-left", "margin-right"], (dojo.html.getComputedStyle(node, 'position') == 'absolute')),
+    height: dojo.html._sumPixelValues(node, ["margin-top", "margin-bottom"], (dojo.html.getComputedStyle(node, 'position') == 'absolute'))
+  };  //  object
 }
+
+dojo.html.getBorder = function(/* HTMLElement */node){
+  //  summary
+  //  Returns the width and height of the passed node's border
+  return {
+    width: dojo.html.getBorderExtent(node, 'left') + dojo.html.getBorderExtent(node, 'right'),
+    height: dojo.html.getBorderExtent(node, 'top') + dojo.html.getBorderExtent(node, 'bottom')
+  };  //  object
 }
-};
-dojo.html.boxSizing={MARGIN_BOX:"margin-box",BORDER_BOX:"border-box",PADDING_BOX:"padding-box",CONTENT_BOX:"content-box"};
-dojo.html.getAbsolutePosition=dojo.html.abs=function(node,_240,_241){
-node=dojo.byId(node,node.ownerDocument);
-var ret={x:0,y:0};
-var bs=dojo.html.boxSizing;
-if(!_241){
-_241=bs.CONTENT_BOX;
+
+dojo.html.getBorderExtent = function(/* HTMLElement */node, /* string */side){
+  //  summary
+  //  returns the width of the requested border
+  return (dojo.html.getStyle(node, 'border-' + side + '-style') == 'none' ? 0 : dojo.html.getPixelValue(node, 'border-' + side + '-width'));  // integer
 }
-var _244=2;
-var _245;
-switch(_241){
-case bs.MARGIN_BOX:
-_245=3;
-break;
-case bs.BORDER_BOX:
-_245=2;
-break;
-case bs.PADDING_BOX:
-default:
-_245=1;
-break;
-case bs.CONTENT_BOX:
-_245=0;
-break;
+
+dojo.html.getMarginExtent = function(/* HTMLElement */node, /* string */side){
+  //  summary
+  //  returns the width of the requested margin
+  return dojo.html._sumPixelValues(node, ["margin-" + side], dojo.html.isPositionAbsolute(node)); //  integer
 }
-var h=dojo.render.html;
-var db=document["body"]||document["documentElement"];
-if(h.ie){
-with(node.getBoundingClientRect()){
-ret.x=left-2;
-ret.y=top-2;
+
+dojo.html.getPaddingExtent = function(/* HTMLElement */node, /* string */side){
+  //  summary
+  //  Returns the width of the requested padding 
+  return dojo.html._sumPixelValues(node, ["padding-" + side], true);  //  integer
 }
-}else{
-if(document.getBoxObjectFor){
-_244=1;
-try{
-var bo=document.getBoxObjectFor(node);
-ret.x=bo.x-dojo.html.sumAncestorProperties(node,"scrollLeft");
-ret.y=bo.y-dojo.html.sumAncestorProperties(node,"scrollTop");
+
+dojo.html.getPadding = function(/* HTMLElement */node){
+  //  summary
+  //  Returns the width and height of the passed node's padding
+  return {
+    width: dojo.html._sumPixelValues(node, ["padding-left", "padding-right"], true),
+    height: dojo.html._sumPixelValues(node, ["padding-top", "padding-bottom"], true)
+  };  //  object
 }
-catch(e){
+
+dojo.html.getPadBorder = function(/* HTMLElement */node){
+  //  summary
+  //  Returns the width and height of the passed node's padding and border
+  var pad = dojo.html.getPadding(node);
+  var border = dojo.html.getBorder(node);
+  return { width: pad.width + border.width, height: pad.height + border.height }; //  object
 }
-}else{
-if(node["offsetParent"]){
-var _249;
-if((h.safari)&&(node.style.getPropertyValue("position")=="absolute")&&(node.parentNode==db)){
-_249=db;
-}else{
-_249=db.parentNode;
+
+dojo.html.getBoxSizing = function(/* HTMLElement */node){
+  //  summary
+  //  Returns which box model the passed element is working with
+  var h = dojo.render.html;
+  var bs = dojo.html.boxSizing;
+  if((h.ie)||(h.opera)){ 
+    var cm = document["compatMode"];
+    if((cm == "BackCompat")||(cm == "QuirksMode")){ 
+      return bs.BORDER_BOX;   //  string
+    }else{
+      return bs.CONTENT_BOX;  //  string
+    }
+  }else{
+    if(arguments.length == 0){ node = document.documentElement; }
+    var sizing = dojo.html.getStyle(node, "-moz-box-sizing");
+    if(!sizing){ sizing = dojo.html.getStyle(node, "box-sizing"); }
+    return (sizing ? sizing : bs.CONTENT_BOX);  //  string
+  }
 }
-if(node.parentNode!=db){
-var nd=node;
-if(dojo.render.html.opera){
-nd=db;
+
+dojo.html.isBorderBox = function(/* HTMLElement */node){
+  //  summary
+  //  returns whether the passed element is using border box sizing or not.
+  return (dojo.html.getBoxSizing(node) == dojo.html.boxSizing.BORDER_BOX);  //  boolean
 }
-ret.x-=dojo.html.sumAncestorProperties(nd,"scrollLeft");
-ret.y-=dojo.html.sumAncestorProperties(nd,"scrollTop");
+
+dojo.html.getBorderBox = function(/* HTMLElement */node){
+  //  summary
+  //  Returns the dimensions of the passed element based on border-box sizing.
+  node = dojo.byId(node);
+  return { width: node.offsetWidth, height: node.offsetHeight };  //  object
 }
-var _24b=node;
-do{
-var n=_24b["offsetLeft"];
-if(!h.opera||n>0){
-ret.x+=isNaN(n)?0:n;
+
+dojo.html.getPaddingBox = function(/* HTMLElement */node){
+  //  summary
+  //  Returns the dimensions of the padding box (see http://www.w3.org/TR/CSS21/box.html)
+  var box = dojo.html.getBorderBox(node);
+  var border = dojo.html.getBorder(node);
+  return {
+    width: box.width - border.width,
+    height:box.height - border.height
+  };  //  object
 }
-var m=_24b["offsetTop"];
-ret.y+=isNaN(m)?0:m;
-_24b=_24b.offsetParent;
-}while((_24b!=_249)&&(_24b!=null));
-}else{
-if(node["x"]&&node["y"]){
-ret.x+=isNaN(node.x)?0:node.x;
-ret.y+=isNaN(node.y)?0:node.y;
+
+dojo.html.getContentBox = function(/* HTMLElement */node){
+  //  summary
+  //  Returns the dimensions of the content box (see http://www.w3.org/TR/CSS21/box.html)
+  node = dojo.byId(node);
+  var padborder = dojo.html.getPadBorder(node);
+  return {
+    width: node.offsetWidth - padborder.width,
+    height: node.offsetHeight - padborder.height
+  };  //  object
 }
+
+dojo.html.setContentBox = function(/* HTMLElement */node, /* object */args){
+  //  summary
+  //  Sets the dimensions of the passed node according to content sizing.
+  node = dojo.byId(node);
+  var width = 0; var height = 0;
+  var isbb = dojo.html.isBorderBox(node);
+  var padborder = (isbb ? dojo.html.getPadBorder(node) : { width: 0, height: 0});
+  var ret = {};
+  if(typeof args.width != "undefined"){
+    width = args.width + padborder.width;
+    ret.width = dojo.html.setPositivePixelValue(node, "width", width);
+  }
+  if(typeof args.height != "undefined"){
+    height = args.height + padborder.height;
+    ret.height = dojo.html.setPositivePixelValue(node, "height", height);
+  }
+  return ret; //  object
 }
+
+dojo.html.getMarginBox = function(/* HTMLElement */node){
+  //  summary
+  //  returns the dimensions of the passed node including any margins.
+  var borderbox = dojo.html.getBorderBox(node);
+  var margin = dojo.html.getMargin(node);
+  return { width: borderbox.width + margin.width, height: borderbox.height + margin.height }; //  object
 }
+
+dojo.html.setMarginBox = function(/* HTMLElement */node, /* object */args){
+  //  summary
+  //  Sets the dimensions of the passed node using margin box calcs.
+  node = dojo.byId(node);
+  var width = 0; var height = 0;
+  var isbb = dojo.html.isBorderBox(node);
+  var padborder = (!isbb ? dojo.html.getPadBorder(node) : { width: 0, height: 0 });
+  var margin = dojo.html.getMargin(node);
+  var ret = {};
+  if(typeof args.width != "undefined"){
+    width = args.width - padborder.width;
+    width -= margin.width;
+    ret.width = dojo.html.setPositivePixelValue(node, "width", width);
+  }
+  if(typeof args.height != "undefined"){
+    height = args.height - padborder.height;
+    height -= margin.height;
+    ret.height = dojo.html.setPositivePixelValue(node, "height", height);
+  }
+  return ret; //  object
 }
-if(_240){
-var _24e=dojo.html.getScroll();
-ret.y+=_24e.top;
-ret.x+=_24e.left;
+
+dojo.html.getElementBox = function(/* HTMLElement */node, /* string */type){
+  //  summary
+  //  return dimesions of a node based on the passed box model type.
+  var bs = dojo.html.boxSizing;
+  switch(type){
+    case bs.MARGIN_BOX:
+      return dojo.html.getMarginBox(node);  //  object
+    case bs.BORDER_BOX:
+      return dojo.html.getBorderBox(node);  //  object
+    case bs.PADDING_BOX:
+      return dojo.html.getPaddingBox(node); //  object
+    case bs.CONTENT_BOX:
+    default:
+      return dojo.html.getContentBox(node); //  object
+  }
 }
-var _24f=[dojo.html.getPaddingExtent,dojo.html.getBorderExtent,dojo.html.getMarginExtent];
-if(_244>_245){
-for(var i=_245;i<_244;++i){
-ret.y+=_24f[i](node,"top");
-ret.x+=_24f[i](node,"left");
+// in: coordinate array [x,y,w,h] or dom node
+// return: coordinate object
+dojo.html.toCoordinateObject = dojo.html.toCoordinateArray = function(/* array */coords, /* boolean? */includeScroll, /* string? */boxtype) {
+  //  summary
+  //  Converts an array of coordinates into an object of named arguments.
+  if(coords instanceof Array || typeof coords == "array"){
+    dojo.deprecated("dojo.html.toCoordinateArray", "use dojo.html.toCoordinateObject({left: , top: , width: , height: }) instead", "0.5");
+    // coords is already an array (of format [x,y,w,h]), just return it
+    while ( coords.length < 4 ) { coords.push(0); }
+    while ( coords.length > 4 ) { coords.pop(); }
+    var ret = {
+      left: coords[0],
+      top: coords[1],
+      width: coords[2],
+      height: coords[3]
+    };
+  }else if(!coords.nodeType && !(coords instanceof String || typeof coords == "string") &&
+       ('width' in coords || 'height' in coords || 'left' in coords ||
+        'x' in coords || 'top' in coords || 'y' in coords)){
+    // coords is a coordinate object or at least part of one
+    var ret = {
+      left: coords.left||coords.x||0,
+      top: coords.top||coords.y||0,
+      width: coords.width||0,
+      height: coords.height||0
+    };
+  }else{
+    // coords is an dom object (or dom object id); return it's coordinates
+    var node = dojo.byId(coords);
+    var pos = dojo.html.abs(node, includeScroll, boxtype);
+    var marginbox = dojo.html.getMarginBox(node);
+    var ret = {
+      left: pos.left,
+      top: pos.top,
+      width: marginbox.width,
+      height: marginbox.height
+    };
+  }
+  ret.x = ret.left;
+  ret.y = ret.top;
+  return ret; //  object
 }
-}else{
-if(_244<_245){
-for(var i=_245;i>_244;--i){
-ret.y-=_24f[i-1](node,"top");
-ret.x-=_24f[i-1](node,"left");
+
+dojo.html.setMarginBoxWidth = dojo.html.setOuterWidth = function(node, width){
+  return dojo.html._callDeprecated("setMarginBoxWidth", "setMarginBox", arguments, "width");
 }
+dojo.html.setMarginBoxHeight = dojo.html.setOuterHeight = function(){
+  return dojo.html._callDeprecated("setMarginBoxHeight", "setMarginBox", arguments, "height");
 }
+dojo.html.getMarginBoxWidth = dojo.html.getOuterWidth = function(){
+  return dojo.html._callDeprecated("getMarginBoxWidth", "getMarginBox", arguments, null, "width");
 }
-ret.top=ret.y;
-ret.left=ret.x;
-return ret;
-};
-dojo.html.isPositionAbsolute=function(node){
-return (dojo.html.getComputedStyle(node,"position")=="absolute");
-};
-dojo.html._sumPixelValues=function(node,_253,_254){
-var _255=0;
-for(var x=0;x<_253.length;x++){
-_255+=dojo.html.getPixelValue(node,_253[x],_254);
+dojo.html.getMarginBoxHeight = dojo.html.getOuterHeight = function(){
+  return dojo.html._callDeprecated("getMarginBoxHeight", "getMarginBox", arguments, null, "height");
 }
-return _255;
-};
-dojo.html.getMargin=function(node){
-return {width:dojo.html._sumPixelValues(node,["margin-left","margin-right"],(dojo.html.getComputedStyle(node,"position")=="absolute")),height:dojo.html._sumPixelValues(node,["margin-top","margin-bottom"],(dojo.html.getComputedStyle(node,"position")=="absolute"))};
-};
-dojo.html.getBorder=function(node){
-return {width:dojo.html.getBorderExtent(node,"left")+dojo.html.getBorderExtent(node,"right"),height:dojo.html.getBorderExtent(node,"top")+dojo.html.getBorderExtent(node,"bottom")};
-};
-dojo.html.getBorderExtent=function(node,side){
-return (dojo.html.getStyle(node,"border-"+side+"-style")=="none"?0:dojo.html.getPixelValue(node,"border-"+side+"-width"));
-};
-dojo.html.getMarginExtent=function(node,side){
-return dojo.html._sumPixelValues(node,["margin-"+side],dojo.html.isPositionAbsolute(node));
-};
-dojo.html.getPaddingExtent=function(node,side){
-return dojo.html._sumPixelValues(node,["padding-"+side],true);
-};
-dojo.html.getPadding=function(node){
-return {width:dojo.html._sumPixelValues(node,["padding-left","padding-right"],true),height:dojo.html._sumPixelValues(node,["padding-top","padding-bottom"],true)};
-};
-dojo.html.getPadBorder=function(node){
-var pad=dojo.html.getPadding(node);
-var _262=dojo.html.getBorder(node);
-return {width:pad.width+_262.width,height:pad.height+_262.height};
-};
-dojo.html.getBoxSizing=function(node){
-var h=dojo.render.html;
-var bs=dojo.html.boxSizing;
-if((h.ie)||(h.opera)){
-var cm=document["compatMode"];
-if((cm=="BackCompat")||(cm=="QuirksMode")){
-return bs.BORDER_BOX;
-}else{
-return bs.CONTENT_BOX;
+dojo.html.getTotalOffset = function(node, type, includeScroll){
+  return dojo.html._callDeprecated("getTotalOffset", "getAbsolutePosition", arguments, null, type);
 }
-}else{
-if(arguments.length==0){
-node=document.documentElement;
+dojo.html.getAbsoluteX = function(node, includeScroll){
+  return dojo.html._callDeprecated("getAbsoluteX", "getAbsolutePosition", arguments, null, "x");
 }
-var _267=dojo.html.getStyle(node,"-moz-box-sizing");
-if(!_267){
-_267=dojo.html.getStyle(node,"box-sizing");
+dojo.html.getAbsoluteY = function(node, includeScroll){
+  return dojo.html._callDeprecated("getAbsoluteY", "getAbsolutePosition", arguments, null, "y");
 }
-return (_267?_267:bs.CONTENT_BOX);
+dojo.html.totalOffsetLeft = function(node, includeScroll){
+  return dojo.html._callDeprecated("totalOffsetLeft", "getAbsolutePosition", arguments, null, "left");
 }
-};
-dojo.html.isBorderBox=function(node){
-return (dojo.html.getBoxSizing(node)==dojo.html.boxSizing.BORDER_BOX);
-};
-dojo.html.getBorderBox=function(node){
-node=dojo.byId(node);
-return {width:node.offsetWidth,height:node.offsetHeight};
-};
-dojo.html.getPaddingBox=function(node){
-var box=dojo.html.getBorderBox(node);
-var _26c=dojo.html.getBorder(node);
-return {width:box.width-_26c.width,height:box.height-_26c.height};
-};
-dojo.html.getContentBox=function(node){
-node=dojo.byId(node);
-var _26e=dojo.html.getPadBorder(node);
-return {width:node.offsetWidth-_26e.width,height:node.offsetHeight-_26e.height};
-};
-dojo.html.setContentBox=function(node,args){
-node=dojo.byId(node);
-var _271=0;
-var _272=0;
-var isbb=dojo.html.isBorderBox(node);
-var _274=(isbb?dojo.html.getPadBorder(node):{width:0,height:0});
-var ret={};
-if(typeof args.width!="undefined"){
-_271=args.width+_274.width;
-ret.width=dojo.html.setPositivePixelValue(node,"width",_271);
+dojo.html.totalOffsetTop = function(node, includeScroll){
+  return dojo.html._callDeprecated("totalOffsetTop", "getAbsolutePosition", arguments, null, "top");
 }
-if(typeof args.height!="undefined"){
-_272=args.height+_274.height;
-ret.height=dojo.html.setPositivePixelValue(node,"height",_272);
+dojo.html.getMarginWidth = function(node){
+  return dojo.html._callDeprecated("getMarginWidth", "getMargin", arguments, null, "width");
 }
-return ret;
-};
-dojo.html.getMarginBox=function(node){
-var _277=dojo.html.getBorderBox(node);
-var _278=dojo.html.getMargin(node);
-return {width:_277.width+_278.width,height:_277.height+_278.height};
-};
-dojo.html.setMarginBox=function(node,args){
-node=dojo.byId(node);
-var _27b=0;
-var _27c=0;
-var isbb=dojo.html.isBorderBox(node);
-var _27e=(!isbb?dojo.html.getPadBorder(node):{width:0,height:0});
-var _27f=dojo.html.getMargin(node);
-var ret={};
-if(typeof args.width!="undefined"){
-_27b=args.width-_27e.width;
-_27b-=_27f.width;
-ret.width=dojo.html.setPositivePixelValue(node,"width",_27b);
+dojo.html.getMarginHeight = function(node){
+  return dojo.html._callDeprecated("getMarginHeight", "getMargin", arguments, null, "height");
 }
-if(typeof args.height!="undefined"){
-_27c=args.height-_27e.height;
-_27c-=_27f.height;
-ret.height=dojo.html.setPositivePixelValue(node,"height",_27c);
+dojo.html.getBorderWidth = function(node){
+  return dojo.html._callDeprecated("getBorderWidth", "getBorder", arguments, null, "width");
 }
-return ret;
-};
-dojo.html.getElementBox=function(node,type){
-var bs=dojo.html.boxSizing;
-switch(type){
-case bs.MARGIN_BOX:
-return dojo.html.getMarginBox(node);
-case bs.BORDER_BOX:
-return dojo.html.getBorderBox(node);
-case bs.PADDING_BOX:
-return dojo.html.getPaddingBox(node);
-case bs.CONTENT_BOX:
-default:
-return dojo.html.getContentBox(node);
+dojo.html.getBorderHeight = function(node){
+  return dojo.html._callDeprecated("getBorderHeight", "getBorder", arguments, null, "height");
 }
-};
-dojo.html.toCoordinateObject=dojo.html.toCoordinateArray=function(_284,_285,_286){
-if(_284 instanceof Array||typeof _284=="array"){
-dojo.deprecated("dojo.html.toCoordinateArray","use dojo.html.toCoordinateObject({left: , top: , width: , height: }) instead","0.5");
-while(_284.length<4){
-_284.push(0);
+dojo.html.getPaddingWidth = function(node){
+  return dojo.html._callDeprecated("getPaddingWidth", "getPadding", arguments, null, "width");
 }
-while(_284.length>4){
-_284.pop();
+dojo.html.getPaddingHeight = function(node){
+  return dojo.html._callDeprecated("getPaddingHeight", "getPadding", arguments, null, "height");
 }
-var ret={left:_284[0],top:_284[1],width:_284[2],height:_284[3]};
-}else{
-if(!_284.nodeType&&!(_284 instanceof String||typeof _284=="string")&&("width" in _284||"height" in _284||"left" in _284||"x" in _284||"top" in _284||"y" in _284)){
-var ret={left:_284.left||_284.x||0,top:_284.top||_284.y||0,width:_284.width||0,height:_284.height||0};
-}else{
-var node=dojo.byId(_284);
-var pos=dojo.html.abs(node,_285,_286);
-var _28a=dojo.html.getMarginBox(node);
-var ret={left:pos.left,top:pos.top,width:_28a.width,height:_28a.height};
+dojo.html.getPadBorderWidth = function(node){
+  return dojo.html._callDeprecated("getPadBorderWidth", "getPadBorder", arguments, null, "width");
 }
+dojo.html.getPadBorderHeight = function(node){
+  return dojo.html._callDeprecated("getPadBorderHeight", "getPadBorder", arguments, null, "height");
 }
-ret.x=ret.left;
-ret.y=ret.top;
-return ret;
-};
-dojo.html.setMarginBoxWidth=dojo.html.setOuterWidth=function(node,_28c){
-return dojo.html._callDeprecated("setMarginBoxWidth","setMarginBox",arguments,"width");
-};
-dojo.html.setMarginBoxHeight=dojo.html.setOuterHeight=function(){
-return dojo.html._callDeprecated("setMarginBoxHeight","setMarginBox",arguments,"height");
-};
-dojo.html.getMarginBoxWidth=dojo.html.getOuterWidth=function(){
-return dojo.html._callDeprecated("getMarginBoxWidth","getMarginBox",arguments,null,"width");
-};
-dojo.html.getMarginBoxHeight=dojo.html.getOuterHeight=function(){
-return dojo.html._callDeprecated("getMarginBoxHeight","getMarginBox",arguments,null,"height");
-};
-dojo.html.getTotalOffset=function(node,type,_28f){
-return dojo.html._callDeprecated("getTotalOffset","getAbsolutePosition",arguments,null,type);
-};
-dojo.html.getAbsoluteX=function(node,_291){
-return dojo.html._callDeprecated("getAbsoluteX","getAbsolutePosition",arguments,null,"x");
-};
-dojo.html.getAbsoluteY=function(node,_293){
-return dojo.html._callDeprecated("getAbsoluteY","getAbsolutePosition",arguments,null,"y");
-};
-dojo.html.totalOffsetLeft=function(node,_295){
-return dojo.html._callDeprecated("totalOffsetLeft","getAbsolutePosition",arguments,null,"left");
-};
-dojo.html.totalOffsetTop=function(node,_297){
-return dojo.html._callDeprecated("totalOffsetTop","getAbsolutePosition",arguments,null,"top");
-};
-dojo.html.getMarginWidth=function(node){
-return dojo.html._callDeprecated("getMarginWidth","getMargin",arguments,null,"width");
-};
-dojo.html.getMarginHeight=function(node){
-return dojo.html._callDeprecated("getMarginHeight","getMargin",arguments,null,"height");
-};
-dojo.html.getBorderWidth=function(node){
-return dojo.html._callDeprecated("getBorderWidth","getBorder",arguments,null,"width");
-};
-dojo.html.getBorderHeight=function(node){
-return dojo.html._callDeprecated("getBorderHeight","getBorder",arguments,null,"height");
-};
-dojo.html.getPaddingWidth=function(node){
-return dojo.html._callDeprecated("getPaddingWidth","getPadding",arguments,null,"width");
-};
-dojo.html.getPaddingHeight=function(node){
-return dojo.html._callDeprecated("getPaddingHeight","getPadding",arguments,null,"height");
-};
-dojo.html.getPadBorderWidth=function(node){
-return dojo.html._callDeprecated("getPadBorderWidth","getPadBorder",arguments,null,"width");
-};
-dojo.html.getPadBorderHeight=function(node){
-return dojo.html._callDeprecated("getPadBorderHeight","getPadBorder",arguments,null,"height");
-};
-dojo.html.getBorderBoxWidth=dojo.html.getInnerWidth=function(){
-return dojo.html._callDeprecated("getBorderBoxWidth","getBorderBox",arguments,null,"width");
-};
-dojo.html.getBorderBoxHeight=dojo.html.getInnerHeight=function(){
-return dojo.html._callDeprecated("getBorderBoxHeight","getBorderBox",arguments,null,"height");
-};
-dojo.html.getContentBoxWidth=dojo.html.getContentWidth=function(){
-return dojo.html._callDeprecated("getContentBoxWidth","getContentBox",arguments,null,"width");
-};
-dojo.html.getContentBoxHeight=dojo.html.getContentHeight=function(){
-return dojo.html._callDeprecated("getContentBoxHeight","getContentBox",arguments,null,"height");
-};
-dojo.html.setContentBoxWidth=dojo.html.setContentWidth=function(node,_2a1){
-return dojo.html._callDeprecated("setContentBoxWidth","setContentBox",arguments,"width");
-};
-dojo.html.setContentBoxHeight=dojo.html.setContentHeight=function(node,_2a3){
-return dojo.html._callDeprecated("setContentBoxHeight","setContentBox",arguments,"height");
-};
+dojo.html.getBorderBoxWidth = dojo.html.getInnerWidth = function(){
+  return dojo.html._callDeprecated("getBorderBoxWidth", "getBorderBox", arguments, null, "width");
+}
+dojo.html.getBorderBoxHeight = dojo.html.getInnerHeight = function(){
+  return dojo.html._callDeprecated("getBorderBoxHeight", "getBorderBox", arguments, null, "height");
+}
+dojo.html.getContentBoxWidth = dojo.html.getContentWidth = function(){
+  return dojo.html._callDeprecated("getContentBoxWidth", "getContentBox", arguments, null, "width");
+}
+dojo.html.getContentBoxHeight = dojo.html.getContentHeight = function(){
+  return dojo.html._callDeprecated("getContentBoxHeight", "getContentBox", arguments, null, "height");
+}
+dojo.html.setContentBoxWidth = dojo.html.setContentWidth = function(node, width){
+  return dojo.html._callDeprecated("setContentBoxWidth", "setContentBox", arguments, "width");
+}
+dojo.html.setContentBoxHeight = dojo.html.setContentHeight = function(node, height){
+  return dojo.html._callDeprecated("setContentBoxHeight", "setContentBox", arguments, "height");
+}
+
 dojo.provide("dojo.html.util");
-dojo.html.getElementWindow=function(_2a4){
-return dojo.html.getDocumentWindow(_2a4.ownerDocument);
-};
-dojo.html.getDocumentWindow=function(doc){
-if(dojo.render.html.safari&&!doc._parentWindow){
-var fix=function(win){
-win.document._parentWindow=win;
-for(var i=0;i<win.frames.length;i++){
-fix(win.frames[i]);
+
+dojo.html.getElementWindow = function(/* HTMLElement */element){
+  //  summary
+  //  Get the window object where the element is placed in.
+  return dojo.html.getDocumentWindow( element.ownerDocument );  //  Window
 }
-};
-fix(window.top);
+
+dojo.html.getDocumentWindow = function(doc){
+  //  summary
+  //  Get window object associated with document doc
+
+  // With Safari, there is not wa to retrieve the window from the document, so we must fix it.
+  if(dojo.render.html.safari && !doc._parentWindow){
+    /*
+      This is a Safari specific function that fix the reference to the parent
+      window from the document object.
+    */
+
+    var fix=function(win){
+      win.document._parentWindow=win;
+      for(var i=0; i<win.frames.length; i++){
+        fix(win.frames[i]);
+      }
+    }
+    fix(window.top);
+  }
+
+  //In some IE versions (at least 6.0), document.parentWindow does not return a
+  //reference to the real window object (maybe a copy), so we must fix it as well
+  //We use IE specific execScript to attach the real window reference to
+  //document._parentWindow for later use
+  if(dojo.render.html.ie && window !== document.parentWindow && !doc._parentWindow){
+    /*
+    In IE 6, only the variable "window" can be used to connect events (others
+    may be only copies).
+    */
+    doc.parentWindow.execScript("document._parentWindow = window;", "Javascript");
+    //to prevent memory leak, unset it after use
+    //another possibility is to add an onUnload handler which seems overkill to me (liucougar)
+    var win = doc._parentWindow;
+    doc._parentWindow = null;
+    return win; //  Window
+  }
+
+  return doc._parentWindow || doc.parentWindow || doc.defaultView;  //  Window
 }
-if(dojo.render.html.ie&&window!==document.parentWindow&&!doc._parentWindow){
-doc.parentWindow.execScript("document._parentWindow = window;","Javascript");
-var win=doc._parentWindow;
-doc._parentWindow=null;
-return win;
+
+dojo.html.gravity = function(/* HTMLElement */node, /* DOMEvent */e){
+  //  summary
+  //  Calculates the mouse's direction of gravity relative to the centre
+  //  of the given node.
+  //  <p>
+  //  If you wanted to insert a node into a DOM tree based on the mouse
+  //  position you might use the following code:
+  //  <pre>
+  //  if (gravity(node, e) & gravity.NORTH) { [insert before]; }
+  //  else { [insert after]; }
+  //  </pre>
+  //
+  //  @param node The node
+  //  @param e    The event containing the mouse coordinates
+  //  @return    The directions, NORTH or SOUTH and EAST or WEST. These
+  //             are properties of the function.
+  node = dojo.byId(node);
+  var mouse = dojo.html.getCursorPosition(e);
+
+  with (dojo.html) {
+    var absolute = getAbsolutePosition(node, true);
+    var bb = getBorderBox(node);
+    var nodecenterx = absolute.x + (bb.width / 2);
+    var nodecentery = absolute.y + (bb.height / 2);
+  }
+
+  with (dojo.html.gravity) {
+    return ((mouse.x < nodecenterx ? WEST : EAST) | (mouse.y < nodecentery ? NORTH : SOUTH)); //  integer
+  }
 }
-return doc._parentWindow||doc.parentWindow||doc.defaultView;
-};
-dojo.html.gravity=function(node,e){
-node=dojo.byId(node);
-var _2ac=dojo.html.getCursorPosition(e);
-with(dojo.html){
-var _2ad=getAbsolutePosition(node,true);
-var bb=getBorderBox(node);
-var _2af=_2ad.x+(bb.width/2);
-var _2b0=_2ad.y+(bb.height/2);
+
+dojo.html.gravity.NORTH = 1;
+dojo.html.gravity.SOUTH = 1 << 1;
+dojo.html.gravity.EAST = 1 << 2;
+dojo.html.gravity.WEST = 1 << 3;
+
+dojo.html.overElement = function(/* HTMLElement */element, /* DOMEvent */e){
+  //  summary
+  //  Returns whether the mouse is over the passed element.
+  element = dojo.byId(element);
+  var mouse = dojo.html.getCursorPosition(e);
+  var bb = dojo.html.getBorderBox(element);
+  var absolute = dojo.html.getAbsolutePosition(element, true, dojo.html.boxSizing.BORDER_BOX);
+  var top = absolute.y;
+  var bottom = top + bb.height;
+  var left = absolute.x;
+  var right = left + bb.width;
+
+  return (mouse.x >= left
+    && mouse.x <= right
+    && mouse.y >= top
+    && mouse.y <= bottom
+  );  //  boolean
 }
-with(dojo.html.gravity){
-return ((_2ac.x<_2af?WEST:EAST)|(_2ac.y<_2b0?NORTH:SOUTH));
+
+dojo.html.renderedTextContent = function(/* HTMLElement */node){
+  //  summary
+  //  Attempts to return the text as it would be rendered, with the line breaks
+  //  sorted out nicely. Unfinished.
+  node = dojo.byId(node);
+  var result = "";
+  if (node == null) { return result; }
+  for (var i = 0; i < node.childNodes.length; i++) {
+    switch (node.childNodes[i].nodeType) {
+      case 1: // ELEMENT_NODE
+      case 5: // ENTITY_REFERENCE_NODE
+        var display = "unknown";
+        try {
+          display = dojo.html.getStyle(node.childNodes[i], "display");
+        } catch(E) {}
+        switch (display) {
+          case "block": case "list-item": case "run-in":
+          case "table": case "table-row-group": case "table-header-group":
+          case "table-footer-group": case "table-row": case "table-column-group":
+          case "table-column": case "table-cell": case "table-caption":
+            // TODO: this shouldn't insert double spaces on aligning blocks
+            result += "\n";
+            result += dojo.html.renderedTextContent(node.childNodes[i]);
+            result += "\n";
+            break;
+
+          case "none": break;
+
+          default:
+            if(node.childNodes[i].tagName && node.childNodes[i].tagName.toLowerCase() == "br") {
+              result += "\n";
+            } else {
+              result += dojo.html.renderedTextContent(node.childNodes[i]);
+            }
+            break;
+        }
+        break;
+      case 3: // TEXT_NODE
+      case 2: // ATTRIBUTE_NODE
+      case 4: // CDATA_SECTION_NODE
+        var text = node.childNodes[i].nodeValue;
+        var textTransform = "unknown";
+        try {
+          textTransform = dojo.html.getStyle(node, "text-transform");
+        } catch(E) {}
+        switch (textTransform){
+          case "capitalize":
+            var words = text.split(' ');
+            for(var i=0; i<words.length; i++){
+              words[i] = words[i].charAt(0).toUpperCase() + words[i].substring(1);
+            }
+            text = words.join(" ");
+            break;
+          case "uppercase": text = text.toUpperCase(); break;
+          case "lowercase": text = text.toLowerCase(); break;
+          default: break; // leave as is
+        }
+        // TODO: implement
+        switch (textTransform){
+          case "nowrap": break;
+          case "pre-wrap": break;
+          case "pre-line": break;
+          case "pre": break; // leave as is
+          default:
+            // remove whitespace and collapse first space
+            text = text.replace(/\s+/, " ");
+            if (/\s$/.test(result)) { text.replace(/^\s/, ""); }
+            break;
+        }
+        result += text;
+        break;
+      default:
+        break;
+    }
+  }
+  return result;  //  string
 }
-};
-dojo.html.gravity.NORTH=1;
-dojo.html.gravity.SOUTH=1<<1;
-dojo.html.gravity.EAST=1<<2;
-dojo.html.gravity.WEST=1<<3;
-dojo.html.overElement=function(_2b1,e){
-_2b1=dojo.byId(_2b1);
-var _2b3=dojo.html.getCursorPosition(e);
-var bb=dojo.html.getBorderBox(_2b1);
-var _2b5=dojo.html.getAbsolutePosition(_2b1,true,dojo.html.boxSizing.BORDER_BOX);
-var top=_2b5.y;
-var _2b7=top+bb.height;
-var left=_2b5.x;
-var _2b9=left+bb.width;
-return (_2b3.x>=left&&_2b3.x<=_2b9&&_2b3.y>=top&&_2b3.y<=_2b7);
-};
-dojo.html.renderedTextContent=function(node){
-node=dojo.byId(node);
-var _2bb="";
-if(node==null){
-return _2bb;
+
+dojo.html.createNodesFromText = function(/* string */txt, /* boolean? */trim){
+  //  summary
+  //  Attempts to create a set of nodes based on the structure of the passed text.
+  if(trim) { txt = txt.replace(/^\s+|\s+$/g, ""); }
+
+  var tn = dojo.doc().createElement("div");
+  // tn.style.display = "none";
+  tn.style.visibility= "hidden";
+  dojo.body().appendChild(tn);
+  var tableType = "none";
+  if((/^<t[dh][\s\r\n>]/i).test(txt.replace(/^\s+/))) {
+    txt = "<table><tbody><tr>" + txt + "</tr></tbody></table>";
+    tableType = "cell";
+  } else if((/^<tr[\s\r\n>]/i).test(txt.replace(/^\s+/))) {
+    txt = "<table><tbody>" + txt + "</tbody></table>";
+    tableType = "row";
+  } else if((/^<(thead|tbody|tfoot)[\s\r\n>]/i).test(txt.replace(/^\s+/))) {
+    txt = "<table>" + txt + "</table>";
+    tableType = "section";
+  }
+  tn.innerHTML = txt;
+  if(tn["normalize"]){
+    tn.normalize();
+  }
+
+  var parent = null;
+  switch(tableType) {
+    case "cell":
+      parent = tn.getElementsByTagName("tr")[0];
+      break;
+    case "row":
+      parent = tn.getElementsByTagName("tbody")[0];
+      break;
+    case "section":
+      parent = tn.getElementsByTagName("table")[0];
+      break;
+    default:
+      parent = tn;
+      break;
+  }
+
+  /* this doesn't make much sense, I'm assuming it just meant trim() so wrap was replaced with trim
+  if(wrap){
+    var ret = [];
+    // start hack
+    var fc = tn.firstChild;
+    ret[0] = ((fc.nodeValue == " ")||(fc.nodeValue == "\t")) ? fc.nextSibling : fc;
+    // end hack
+    // tn.style.display = "none";
+    dojo.body().removeChild(tn);
+    return ret;
+  }
+  */
+  var nodes = [];
+  for(var x=0; x<parent.childNodes.length; x++){
+    nodes.push(parent.childNodes[x].cloneNode(true));
+  }
+  tn.style.display = "none"; // FIXME: why do we do this?
+  dojo.body().removeChild(tn);
+  return nodes; //  array
 }
-for(var i=0;i<node.childNodes.length;i++){
-switch(node.childNodes[i].nodeType){
-case 1:
-case 5:
-var _2bd="unknown";
-try{
-_2bd=dojo.html.getStyle(node.childNodes[i],"display");
+
+dojo.html.placeOnScreen = function(
+  /* HTMLElement */node,
+  /* integer */desiredX,
+  /* integer */desiredY,
+  /* integer */padding,
+  /* boolean? */hasScroll,
+  /* string? */corners,
+  /* boolean? */tryOnly
+){
+  //  summary
+  //  Keeps 'node' in the visible area of the screen while trying to
+  //  place closest to desiredX, desiredY. The input coordinates are
+  //  expected to be the desired screen position, not accounting for
+  //  scrolling. If you already accounted for scrolling, set 'hasScroll'
+  //  to true. Set padding to either a number or array for [paddingX, paddingY]
+  //  to put some buffer around the element you want to position.
+  //  Set which corner(s) you want to bind to, such as
+  //
+  //  placeOnScreen(node, desiredX, desiredY, padding, hasScroll, "TR")
+  //  placeOnScreen(node, [desiredX, desiredY], padding, hasScroll, ["TR", "BL"])
+  //
+  //  The desiredX/desiredY will be treated as the topleft(TL)/topright(TR) or
+  //  BottomLeft(BL)/BottomRight(BR) corner of the node. Each corner is tested
+  //  and if a perfect match is found, it will be used. Otherwise, it goes through
+  //  all of the specified corners, and choose the most appropriate one.
+  //  By default, corner = ['TL'].
+  //  If tryOnly is set to true, the node will not be moved to the place.
+  //
+  //  NOTE: node is assumed to be absolutely or relatively positioned.
+  //
+  //  Alternate call sig:
+  //   placeOnScreen(node, [x, y], padding, hasScroll)
+  //
+  //  Examples:
+  //   placeOnScreen(node, 100, 200)
+  //   placeOnScreen("myId", [800, 623], 5)
+  //   placeOnScreen(node, 234, 3284, [2, 5], true)
+
+  // TODO: make this function have variable call sigs
+  //  kes(node, ptArray, cornerArray, padding, hasScroll)
+  //  kes(node, ptX, ptY, cornerA, cornerB, cornerC, paddingArray, hasScroll)
+  if(desiredX instanceof Array || typeof desiredX == "array") {
+    tryOnly = corners;
+    corners = hasScroll;
+    hasScroll = padding;
+    padding = desiredY;
+    desiredY = desiredX[1];
+    desiredX = desiredX[0];
+  }
+
+  if(corners instanceof String || typeof corners == "string"){
+    corners = corners.split(",");
+  }
+
+  if(!isNaN(padding)) {
+    padding = [Number(padding), Number(padding)];
+  } else if(!(padding instanceof Array || typeof padding == "array")) {
+    padding = [0, 0];
+  }
+
+  var scroll = dojo.html.getScroll().offset;
+  var view = dojo.html.getViewport();
+
+  node = dojo.byId(node);
+  var oldDisplay = node.style.display;
+  node.style.display="";
+  var bb = dojo.html.getBorderBox(node);
+  var w = bb.width;
+  var h = bb.height;
+  node.style.display=oldDisplay;
+
+  if(!(corners instanceof Array || typeof corners == "array")){
+    corners = ['TL'];
+  }
+
+  var bestx, besty, bestDistance = Infinity, bestCorner;
+
+  for(var cidex=0; cidex<corners.length; ++cidex){
+    var corner = corners[cidex];
+    var match = true;
+    var tryX = desiredX - (corner.charAt(1)=='L' ? 0 : w) + padding[0]*(corner.charAt(1)=='L' ? 1 : -1);
+    var tryY = desiredY - (corner.charAt(0)=='T' ? 0 : h) + padding[1]*(corner.charAt(0)=='T' ? 1 : -1);
+    if(hasScroll) {
+      tryX -= scroll.x;
+      tryY -= scroll.y;
+    }
+
+    if(tryX < 0){
+      tryX = 0;
+      match = false;
+    }
+
+    if(tryY < 0){
+      tryY = 0;
+      match = false;
+    }
+
+    var x = tryX + w;
+    if(x > view.width) {
+      x = view.width - w;
+      match = false;
+    } else {
+      x = tryX;
+    }
+    x = Math.max(padding[0], x) + scroll.x;
+
+    var y = tryY + h;
+    if(y > view.height) {
+      y = view.height - h;
+      match = false;
+    } else {
+      y = tryY;
+    }
+    y = Math.max(padding[1], y) + scroll.y;
+
+    if(match){ //perfect match, return now
+      bestx = x;
+      besty = y;
+      bestDistance = 0;
+      bestCorner = corner;
+      break;
+    }else{
+      //not perfect, find out whether it is better than the saved one
+      var dist = Math.pow(x-tryX-scroll.x,2)+Math.pow(y-tryY-scroll.y,2);
+      if(bestDistance > dist){
+        bestDistance = dist;
+        bestx = x;
+        besty = y;
+        bestCorner = corner;
+      }
+    }
+  }
+
+  if(!tryOnly){
+    node.style.left = bestx + "px";
+    node.style.top = besty + "px";
+  }
+
+  return { left: bestx, top: besty, x: bestx, y: besty, dist: bestDistance, corner:  bestCorner}; //  object
 }
-catch(E){
+
+dojo.html.placeOnScreenPoint = function(node, desiredX, desiredY, padding, hasScroll) {
+  dojo.deprecated("dojo.html.placeOnScreenPoint", "use dojo.html.placeOnScreen() instead", "0.5");
+  return dojo.html.placeOnScreen(node, desiredX, desiredY, padding, hasScroll, ['TL', 'TR', 'BL', 'BR']);
 }
-switch(_2bd){
-case "block":
-case "list-item":
-case "run-in":
-case "table":
-case "table-row-group":
-case "table-header-group":
-case "table-footer-group":
-case "table-row":
-case "table-column-group":
-case "table-column":
-case "table-cell":
-case "table-caption":
-_2bb+="\n";
-_2bb+=dojo.html.renderedTextContent(node.childNodes[i]);
-_2bb+="\n";
-break;
-case "none":
-break;
-default:
-if(node.childNodes[i].tagName&&node.childNodes[i].tagName.toLowerCase()=="br"){
-_2bb+="\n";
-}else{
-_2bb+=dojo.html.renderedTextContent(node.childNodes[i]);
+
+dojo.html.placeOnScreenAroundElement = function(
+  /* HTMLElement */node,
+  /* HTMLElement */aroundNode,
+  /* integer */padding,
+  /* string? */aroundType,
+  /* string? */aroundCorners,
+  /* boolean? */tryOnly
+){
+  //  summary
+  //  Like placeOnScreen, except it accepts aroundNode instead of x,y
+  //  and attempts to place node around it. aroundType (see
+  //  dojo.html.boxSizing in html/layout.js) determines which box of the
+  //  aroundNode should be used to calculate the outer box.
+  //  aroundCorners specify Which corner of aroundNode should be
+  //  used to place the node => which corner(s) of node to use (see the
+  //  corners parameter in dojo.html.placeOnScreen)
+  //  aroundCorners: {'TL': 'BL', 'BL': 'TL'}
+
+  var best, bestDistance=Infinity;
+  aroundNode = dojo.byId(aroundNode);
+  var oldDisplay = aroundNode.style.display;
+  aroundNode.style.display="";
+  var mb = dojo.html.getElementBox(aroundNode, aroundType);
+  var aroundNodeW = mb.width;
+  var aroundNodeH = mb.height;
+  var aroundNodePos = dojo.html.getAbsolutePosition(aroundNode, true, aroundType);
+  aroundNode.style.display=oldDisplay;
+
+  for(var nodeCorner in aroundCorners){
+    var pos, desiredX, desiredY;
+    var corners = aroundCorners[nodeCorner];
+
+    desiredX = aroundNodePos.x + (nodeCorner.charAt(1)=='L' ? 0 : aroundNodeW);
+    desiredY = aroundNodePos.y + (nodeCorner.charAt(0)=='T' ? 0 : aroundNodeH);
+
+    pos = dojo.html.placeOnScreen(node, desiredX, desiredY, padding, true, corners, true);
+    if(pos.dist == 0){
+      best = pos;
+      break;
+    }else{
+      //not perfect, find out whether it is better than the saved one
+      if(bestDistance > pos.dist){
+        bestDistance = pos.dist;
+        best = pos;
+      }
+    }
+  }
+
+  if(!tryOnly){
+    node.style.left = best.left + "px";
+    node.style.top = best.top + "px";
+  }
+  return best;  //  object
 }
-break;
+
+dojo.html.scrollIntoView = function(/* HTMLElement */node){
+  //  summary
+  //  Scroll the passed node into view, if it is not.
+  if(!node){ return; }
+
+  // don't rely on that node.scrollIntoView works just because the function is there
+  // it doesnt work in Konqueror or Opera even though the function is there and probably
+  // not safari either
+  // dont like browser sniffs implementations but sometimes you have to use it
+  if(dojo.render.html.ie){
+    //only call scrollIntoView if there is a scrollbar for this menu,
+    //otherwise, scrollIntoView will scroll the window scrollbar
+    if(dojo.html.getBorderBox(node.parentNode).height < node.parentNode.scrollHeight){
+      node.scrollIntoView(false);
+    }
+  }else if(dojo.render.html.mozilla){
+    // IE, mozilla
+    node.scrollIntoView(false);
+  }else{
+    var parent = node.parentNode;
+    var parentBottom = parent.scrollTop + dojo.html.getBorderBox(parent).height;
+    var nodeBottom = node.offsetTop + dojo.html.getMarginBox(node).height;
+    if(parentBottom < nodeBottom){
+      parent.scrollTop += (nodeBottom - parentBottom);
+    }else if(parent.scrollTop > node.offsetTop){
+      parent.scrollTop -= (parent.scrollTop - node.offsetTop);
+    }
+  }
 }
-break;
-case 3:
-case 2:
-case 4:
-var text=node.childNodes[i].nodeValue;
-var _2bf="unknown";
-try{
-_2bf=dojo.html.getStyle(node,"text-transform");
-}
-catch(E){
-}
-switch(_2bf){
-case "capitalize":
-var _2c0=text.split(" ");
-for(var i=0;i<_2c0.length;i++){
-_2c0[i]=_2c0[i].charAt(0).toUpperCase()+_2c0[i].substring(1);
-}
-text=_2c0.join(" ");
-break;
-case "uppercase":
-text=text.toUpperCase();
-break;
-case "lowercase":
-text=text.toLowerCase();
-break;
-default:
-break;
-}
-switch(_2bf){
-case "nowrap":
-break;
-case "pre-wrap":
-break;
-case "pre-line":
-break;
-case "pre":
-break;
-default:
-text=text.replace(/\s+/," ");
-if(/\s$/.test(_2bb)){
-text.replace(/^\s/,"");
-}
-break;
-}
-_2bb+=text;
-break;
-default:
-break;
-}
-}
-return _2bb;
-};
-dojo.html.createNodesFromText=function(txt,trim){
-if(trim){
-txt=txt.replace(/^\s+|\s+$/g,"");
-}
-var tn=dojo.doc().createElement("div");
-tn.style.visibility="hidden";
-dojo.body().appendChild(tn);
-var _2c4="none";
-if((/^<t[dh][\s\r\n>]/i).test(txt.replace(/^\s+/))){
-txt="<table><tbody><tr>"+txt+"</tr></tbody></table>";
-_2c4="cell";
-}else{
-if((/^<tr[\s\r\n>]/i).test(txt.replace(/^\s+/))){
-txt="<table><tbody>"+txt+"</tbody></table>";
-_2c4="row";
-}else{
-if((/^<(thead|tbody|tfoot)[\s\r\n>]/i).test(txt.replace(/^\s+/))){
-txt="<table>"+txt+"</table>";
-_2c4="section";
-}
-}
-}
-tn.innerHTML=txt;
-if(tn["normalize"]){
-tn.normalize();
-}
-var _2c5=null;
-switch(_2c4){
-case "cell":
-_2c5=tn.getElementsByTagName("tr")[0];
-break;
-case "row":
-_2c5=tn.getElementsByTagName("tbody")[0];
-break;
-case "section":
-_2c5=tn.getElementsByTagName("table")[0];
-break;
-default:
-_2c5=tn;
-break;
-}
-var _2c6=[];
-for(var x=0;x<_2c5.childNodes.length;x++){
-_2c6.push(_2c5.childNodes[x].cloneNode(true));
-}
-tn.style.display="none";
-dojo.body().removeChild(tn);
-return _2c6;
-};
-dojo.html.placeOnScreen=function(node,_2c9,_2ca,_2cb,_2cc,_2cd,_2ce){
-if(_2c9 instanceof Array||typeof _2c9=="array"){
-_2ce=_2cd;
-_2cd=_2cc;
-_2cc=_2cb;
-_2cb=_2ca;
-_2ca=_2c9[1];
-_2c9=_2c9[0];
-}
-if(_2cd instanceof String||typeof _2cd=="string"){
-_2cd=_2cd.split(",");
-}
-if(!isNaN(_2cb)){
-_2cb=[Number(_2cb),Number(_2cb)];
-}else{
-if(!(_2cb instanceof Array||typeof _2cb=="array")){
-_2cb=[0,0];
-}
-}
-var _2cf=dojo.html.getScroll().offset;
-var view=dojo.html.getViewport();
-node=dojo.byId(node);
-var _2d1=node.style.display;
-node.style.display="";
-var bb=dojo.html.getBorderBox(node);
-var w=bb.width;
-var h=bb.height;
-node.style.display=_2d1;
-if(!(_2cd instanceof Array||typeof _2cd=="array")){
-_2cd=["TL"];
-}
-var _2d5,_2d6,_2d7=Infinity,_2d8;
-for(var _2d9=0;_2d9<_2cd.length;++_2d9){
-var _2da=_2cd[_2d9];
-var _2db=true;
-var tryX=_2c9-(_2da.charAt(1)=="L"?0:w)+_2cb[0]*(_2da.charAt(1)=="L"?1:-1);
-var tryY=_2ca-(_2da.charAt(0)=="T"?0:h)+_2cb[1]*(_2da.charAt(0)=="T"?1:-1);
-if(_2cc){
-tryX-=_2cf.x;
-tryY-=_2cf.y;
-}
-if(tryX<0){
-tryX=0;
-_2db=false;
-}
-if(tryY<0){
-tryY=0;
-_2db=false;
-}
-var x=tryX+w;
-if(x>view.width){
-x=view.width-w;
-_2db=false;
-}else{
-x=tryX;
-}
-x=Math.max(_2cb[0],x)+_2cf.x;
-var y=tryY+h;
-if(y>view.height){
-y=view.height-h;
-_2db=false;
-}else{
-y=tryY;
-}
-y=Math.max(_2cb[1],y)+_2cf.y;
-if(_2db){
-_2d5=x;
-_2d6=y;
-_2d7=0;
-_2d8=_2da;
-break;
-}else{
-var dist=Math.pow(x-tryX-_2cf.x,2)+Math.pow(y-tryY-_2cf.y,2);
-if(_2d7>dist){
-_2d7=dist;
-_2d5=x;
-_2d6=y;
-_2d8=_2da;
-}
-}
-}
-if(!_2ce){
-node.style.left=_2d5+"px";
-node.style.top=_2d6+"px";
-}
-return {left:_2d5,top:_2d6,x:_2d5,y:_2d6,dist:_2d7,corner:_2d8};
-};
-dojo.html.placeOnScreenPoint=function(node,_2e2,_2e3,_2e4,_2e5){
-dojo.deprecated("dojo.html.placeOnScreenPoint","use dojo.html.placeOnScreen() instead","0.5");
-return dojo.html.placeOnScreen(node,_2e2,_2e3,_2e4,_2e5,["TL","TR","BL","BR"]);
-};
-dojo.html.placeOnScreenAroundElement=function(node,_2e7,_2e8,_2e9,_2ea,_2eb){
-var best,_2ed=Infinity;
-_2e7=dojo.byId(_2e7);
-var _2ee=_2e7.style.display;
-_2e7.style.display="";
-var mb=dojo.html.getElementBox(_2e7,_2e9);
-var _2f0=mb.width;
-var _2f1=mb.height;
-var _2f2=dojo.html.getAbsolutePosition(_2e7,true,_2e9);
-_2e7.style.display=_2ee;
-for(var _2f3 in _2ea){
-var pos,_2f5,_2f6;
-var _2f7=_2ea[_2f3];
-_2f5=_2f2.x+(_2f3.charAt(1)=="L"?0:_2f0);
-_2f6=_2f2.y+(_2f3.charAt(0)=="T"?0:_2f1);
-pos=dojo.html.placeOnScreen(node,_2f5,_2f6,_2e8,true,_2f7,true);
-if(pos.dist==0){
-best=pos;
-break;
-}else{
-if(_2ed>pos.dist){
-_2ed=pos.dist;
-best=pos;
-}
-}
-}
-if(!_2eb){
-node.style.left=best.left+"px";
-node.style.top=best.top+"px";
-}
-return best;
-};
-dojo.html.scrollIntoView=function(node){
-if(!node){
-return;
-}
-if(dojo.render.html.ie){
-if(dojo.html.getBorderBox(node.parentNode).height<node.parentNode.scrollHeight){
-node.scrollIntoView(false);
-}
-}else{
-if(dojo.render.html.mozilla){
-node.scrollIntoView(false);
-}else{
-var _2f9=node.parentNode;
-var _2fa=_2f9.scrollTop+dojo.html.getBorderBox(_2f9).height;
-var _2fb=node.offsetTop+dojo.html.getMarginBox(node).height;
-if(_2fa<_2fb){
-_2f9.scrollTop+=(_2fb-_2fa);
-}else{
-if(_2f9.scrollTop>node.offsetTop){
-_2f9.scrollTop-=(_2f9.scrollTop-node.offsetTop);
-}
-}
-}
-}
-};
+
 dojo.provide("dojo.lang.array");
-dojo.lang.has=function(obj,name){
-try{
-return typeof obj[name]!="undefined";
+
+
+// FIXME: Is this worthless since you can do: if(name in obj)
+// is this the right place for this?
+dojo.lang.has = function(/*Object*/obj, /*String*/name){
+  try{
+    return typeof obj[name] != "undefined";
+  }catch(e){ return false; }
 }
-catch(e){
-return false;
+
+dojo.lang.isEmpty = function(/*Object*/obj){
+  if(dojo.lang.isObject(obj)){
+    var tmp = {};
+    var count = 0;
+    for(var x in obj){
+      if(obj[x] && (!tmp[x])){
+        count++;
+        break;
+      } 
+    }
+    return count == 0;
+  }else if(dojo.lang.isArrayLike(obj) || dojo.lang.isString(obj)){
+    return obj.length == 0;
+  }
 }
-};
-dojo.lang.isEmpty=function(obj){
-if(dojo.lang.isObject(obj)){
-var tmp={};
-var _300=0;
-for(var x in obj){
-if(obj[x]&&(!tmp[x])){
-_300++;
-break;
+
+dojo.lang.map = function(/*Array*/arr, /*Object|Function*/obj, /*Function?*/unary_func){
+  var isString = dojo.lang.isString(arr);
+  if(isString){
+    // arr: String
+    arr = arr.split("");
+  }
+  if(dojo.lang.isFunction(obj)&&(!unary_func)){
+    unary_func = obj;
+    obj = dj_global;
+  }else if(dojo.lang.isFunction(obj) && unary_func){
+    // ff 1.5 compat
+    var tmpObj = obj;
+    obj = unary_func;
+    unary_func = tmpObj;
+  }
+  if(Array.map){
+    var outArr = Array.map(arr, unary_func, obj);
+  }else{
+    var outArr = [];
+    for(var i=0;i<arr.length;++i){
+      outArr.push(unary_func.call(obj, arr[i]));
+    }
+  }
+  if(isString) {
+    return outArr.join(""); // String
+  } else {
+    return outArr; // Array
+  }
 }
+
+dojo.lang.reduce = function(/*Array*/arr, initialValue, /*Object|null*/obj, /*Function*/binary_func){
+  var reducedValue = initialValue;
+  var ob = obj ? obj : dj_global;
+  dojo.lang.map(arr, 
+    function(val){
+      reducedValue = binary_func.call(ob, reducedValue, val);
+    }
+  );
+  return reducedValue;
 }
-return _300==0;
-}else{
-if(dojo.lang.isArrayLike(obj)||dojo.lang.isString(obj)){
-return obj.length==0;
+
+// http://developer.mozilla.org/en/docs/Core_JavaScript_1.5_Reference:Global_Objects:Array:forEach
+dojo.lang.forEach = function(/*Array*/anArray, /*Function*/callback, /*Object?*/thisObject){
+  if(dojo.lang.isString(anArray)){
+    // anArray: String
+    anArray = anArray.split(""); 
+  }
+  if(Array.forEach){
+    Array.forEach(anArray, callback, thisObject);
+  }else{
+    // FIXME: there are several ways of handilng thisObject. Is dj_global always the default context?
+    if(!thisObject){
+      thisObject=dj_global;
+    }
+    for(var i=0,l=anArray.length; i<l; i++){ 
+      callback.call(thisObject, anArray[i], i, anArray);
+    }
+  }
 }
+
+dojo.lang._everyOrSome = function(/*Boolean*/every, /*Array*/arr, /*Function*/callback, /*Object?*/thisObject){
+  if(dojo.lang.isString(arr)){ 
+    //arr: String
+    arr = arr.split(""); 
+  }
+  if(Array.every){
+    return Array[ every ? "every" : "some" ](arr, callback, thisObject);
+  }else{
+    if(!thisObject){
+      thisObject = dj_global;
+    }
+    for(var i=0,l=arr.length; i<l; i++){
+      var result = callback.call(thisObject, arr[i], i, arr);
+      if(every && !result){
+        return false; // Boolean
+      }else if((!every)&&(result)){
+        return true; // Boolean
+      }
+    }
+    return Boolean(every); // Boolean
+  }
 }
-};
-dojo.lang.map=function(arr,obj,_304){
-var _305=dojo.lang.isString(arr);
-if(_305){
-arr=arr.split("");
+
+dojo.lang.every = function(/*Array*/arr, /*Function*/callback, /*Object?*/thisObject){
+  return this._everyOrSome(true, arr, callback, thisObject); // Boolean
 }
-if(dojo.lang.isFunction(obj)&&(!_304)){
-_304=obj;
-obj=dj_global;
-}else{
-if(dojo.lang.isFunction(obj)&&_304){
-var _306=obj;
-obj=_304;
-_304=_306;
+
+dojo.lang.some = function(/*Array*/arr, /*Function*/callback, /*Object?*/thisObject){
+  return this._everyOrSome(false, arr, callback, thisObject); // Boolean
 }
+
+dojo.lang.filter = function(/*Array*/arr, /*Function*/callback, /*Object?*/thisObject){
+  var isString = dojo.lang.isString(arr);
+  if(isString){ /*arr: String*/arr = arr.split(""); }
+  var outArr;
+  if(Array.filter){
+    outArr = Array.filter(arr, callback, thisObject);
+  } else {
+    if(!thisObject){
+      if(arguments.length >= 3){ dojo.raise("thisObject doesn't exist!"); }
+      thisObject = dj_global;
+    }
+
+    outArr = [];
+    for(var i = 0; i < arr.length; i++){
+      if(callback.call(thisObject, arr[i], i, arr)){
+        outArr.push(arr[i]);
+      }
+    }
+  }
+  if(isString){
+    return outArr.join(""); // String
+  } else {
+    return outArr; // Array
+  }
 }
-if(Array.map){
-var _307=Array.map(arr,_304,obj);
-}else{
-var _307=[];
-for(var i=0;i<arr.length;++i){
-_307.push(_304.call(obj,arr[i]));
+
+dojo.lang.unnest = function(/* ... */){
+  // summary:
+  //  Creates a 1-D array out of all the arguments passed,
+  //  unravelling any array-like objects in the process
+  //
+  // usage:
+  //  unnest(1, 2, 3) ==> [1, 2, 3]
+  //  unnest(1, [2, [3], [[[4]]]]) ==> [1, 2, 3, 4]
+
+  var out = [];
+  for(var i = 0; i < arguments.length; i++){
+    if(dojo.lang.isArrayLike(arguments[i])){
+      var add = dojo.lang.unnest.apply(this, arguments[i]);
+      out = out.concat(add);
+    }else{
+      out.push(arguments[i]);
+    }
+  }
+  return out; // Array
 }
+
+dojo.lang.toArray = function(/*Object*/arrayLike, /*Number*/startOffset){
+  // summary:
+  //  Converts an array-like object (i.e. arguments, DOMCollection)
+  //  to an array
+  var array = [];
+  for(var i = startOffset||0; i < arrayLike.length; i++){
+    array.push(arrayLike[i]);
+  }
+  return array; // Array
 }
-if(_305){
-return _307.join("");
-}else{
-return _307;
-}
-};
-dojo.lang.reduce=function(arr,_30a,obj,_30c){
-var _30d=_30a;
-var ob=obj?obj:dj_global;
-dojo.lang.map(arr,function(val){
-_30d=_30c.call(ob,_30d,val);
-});
-return _30d;
-};
-dojo.lang.forEach=function(_310,_311,_312){
-if(dojo.lang.isString(_310)){
-_310=_310.split("");
-}
-if(Array.forEach){
-Array.forEach(_310,_311,_312);
-}else{
-if(!_312){
-_312=dj_global;
-}
-for(var i=0,l=_310.length;i<l;i++){
-_311.call(_312,_310[i],i,_310);
-}
-}
-};
-dojo.lang._everyOrSome=function(_315,arr,_317,_318){
-if(dojo.lang.isString(arr)){
-arr=arr.split("");
-}
-if(Array.every){
-return Array[_315?"every":"some"](arr,_317,_318);
-}else{
-if(!_318){
-_318=dj_global;
-}
-for(var i=0,l=arr.length;i<l;i++){
-var _31b=_317.call(_318,arr[i],i,arr);
-if(_315&&!_31b){
-return false;
-}else{
-if((!_315)&&(_31b)){
-return true;
-}
-}
-}
-return Boolean(_315);
-}
-};
-dojo.lang.every=function(arr,_31d,_31e){
-return this._everyOrSome(true,arr,_31d,_31e);
-};
-dojo.lang.some=function(arr,_320,_321){
-return this._everyOrSome(false,arr,_320,_321);
-};
-dojo.lang.filter=function(arr,_323,_324){
-var _325=dojo.lang.isString(arr);
-if(_325){
-arr=arr.split("");
-}
-var _326;
-if(Array.filter){
-_326=Array.filter(arr,_323,_324);
-}else{
-if(!_324){
-if(arguments.length>=3){
-dojo.raise("thisObject doesn't exist!");
-}
-_324=dj_global;
-}
-_326=[];
-for(var i=0;i<arr.length;i++){
-if(_323.call(_324,arr[i],i,arr)){
-_326.push(arr[i]);
-}
-}
-}
-if(_325){
-return _326.join("");
-}else{
-return _326;
-}
-};
-dojo.lang.unnest=function(){
-var out=[];
-for(var i=0;i<arguments.length;i++){
-if(dojo.lang.isArrayLike(arguments[i])){
-var add=dojo.lang.unnest.apply(this,arguments[i]);
-out=out.concat(add);
-}else{
-out.push(arguments[i]);
-}
-}
-return out;
-};
-dojo.lang.toArray=function(_32b,_32c){
-var _32d=[];
-for(var i=_32c||0;i<_32b.length;i++){
-_32d.push(_32b[i]);
-}
-return _32d;
-};
+
 dojo.provide("dojo.gfx.color");
-dojo.gfx.color.Color=function(r,g,b,a){
-if(dojo.lang.isArray(r)){
-this.r=r[0];
-this.g=r[1];
-this.b=r[2];
-this.a=r[3]||1;
-}else{
-if(dojo.lang.isString(r)){
-var rgb=dojo.gfx.color.extractRGB(r);
-this.r=rgb[0];
-this.g=rgb[1];
-this.b=rgb[2];
-this.a=g||1;
-}else{
-if(r instanceof dojo.gfx.color.Color){
-this.r=r.r;
-this.b=r.b;
-this.g=r.g;
-this.a=r.a;
-}else{
-this.r=r;
-this.g=g;
-this.b=b;
-this.a=a;
+
+// TODO: rewrite the "x2y" methods to take advantage of the parsing
+//       abilities of the Color object. Also, beef up the Color
+//       object (as possible) to parse most common formats
+
+// takes an r, g, b, a(lpha) value, [r, g, b, a] array, "rgb(...)" string, hex string (#aaa, #aaaaaa, aaaaaaa)
+dojo.gfx.color.Color = function(r, g, b, a) {
+  // dojo.debug("r:", r[0], "g:", r[1], "b:", r[2]);
+  if(dojo.lang.isArray(r)){
+    this.r = r[0];
+    this.g = r[1];
+    this.b = r[2];
+    this.a = r[3]||1.0;
+  }else if(dojo.lang.isString(r)){
+    var rgb = dojo.gfx.color.extractRGB(r);
+    this.r = rgb[0];
+    this.g = rgb[1];
+    this.b = rgb[2];
+    this.a = g||1.0;
+  }else if(r instanceof dojo.gfx.color.Color){
+    // why does this create a new instance if we were passed one?
+    this.r = r.r;
+    this.b = r.b;
+    this.g = r.g;
+    this.a = r.a;
+  }else{
+    this.r = r;
+    this.g = g;
+    this.b = b;
+    this.a = a;
+  }
 }
+
+dojo.gfx.color.Color.fromArray = function(arr) {
+  return new dojo.gfx.color.Color(arr[0], arr[1], arr[2], arr[3]);
 }
-}
-};
-dojo.gfx.color.Color.fromArray=function(arr){
-return new dojo.gfx.color.Color(arr[0],arr[1],arr[2],arr[3]);
-};
-dojo.extend(dojo.gfx.color.Color,{toRgb:function(_335){
-if(_335){
-return this.toRgba();
-}else{
-return [this.r,this.g,this.b];
-}
-},toRgba:function(){
-return [this.r,this.g,this.b,this.a];
-},toHex:function(){
-return dojo.gfx.color.rgb2hex(this.toRgb());
-},toCss:function(){
-return "rgb("+this.toRgb().join()+")";
-},toString:function(){
-return this.toHex();
-},blend:function(_336,_337){
-var rgb=null;
-if(dojo.lang.isArray(_336)){
-rgb=_336;
-}else{
-if(_336 instanceof dojo.gfx.color.Color){
-rgb=_336.toRgb();
-}else{
-rgb=new dojo.gfx.color.Color(_336).toRgb();
-}
-}
-return dojo.gfx.color.blend(this.toRgb(),rgb,_337);
-}});
-dojo.gfx.color.named={white:[255,255,255],black:[0,0,0],red:[255,0,0],green:[0,255,0],lime:[0,255,0],blue:[0,0,255],navy:[0,0,128],gray:[128,128,128],silver:[192,192,192]};
-dojo.gfx.color.blend=function(a,b,_33b){
-if(typeof a=="string"){
-return dojo.gfx.color.blendHex(a,b,_33b);
-}
-if(!_33b){
-_33b=0;
-}
-_33b=Math.min(Math.max(-1,_33b),1);
-_33b=((_33b+1)/2);
-var c=[];
-for(var x=0;x<3;x++){
-c[x]=parseInt(b[x]+((a[x]-b[x])*_33b));
-}
-return c;
-};
-dojo.gfx.color.blendHex=function(a,b,_340){
-return dojo.gfx.color.rgb2hex(dojo.gfx.color.blend(dojo.gfx.color.hex2rgb(a),dojo.gfx.color.hex2rgb(b),_340));
-};
-dojo.gfx.color.extractRGB=function(_341){
-var hex="0123456789abcdef";
-_341=_341.toLowerCase();
-if(_341.indexOf("rgb")==0){
-var _343=_341.match(/rgba*\((\d+), *(\d+), *(\d+)/i);
-var ret=_343.splice(1,3);
-return ret;
-}else{
-var _345=dojo.gfx.color.hex2rgb(_341);
-if(_345){
-return _345;
-}else{
-return dojo.gfx.color.named[_341]||[255,255,255];
-}
-}
-};
-dojo.gfx.color.hex2rgb=function(hex){
-var _347="0123456789ABCDEF";
-var rgb=new Array(3);
-if(hex.indexOf("#")==0){
-hex=hex.substring(1);
-}
-hex=hex.toUpperCase();
-if(hex.replace(new RegExp("["+_347+"]","g"),"")!=""){
-return null;
-}
-if(hex.length==3){
-rgb[0]=hex.charAt(0)+hex.charAt(0);
-rgb[1]=hex.charAt(1)+hex.charAt(1);
-rgb[2]=hex.charAt(2)+hex.charAt(2);
-}else{
-rgb[0]=hex.substring(0,2);
-rgb[1]=hex.substring(2,4);
-rgb[2]=hex.substring(4);
-}
-for(var i=0;i<rgb.length;i++){
-rgb[i]=_347.indexOf(rgb[i].charAt(0))*16+_347.indexOf(rgb[i].charAt(1));
-}
-return rgb;
-};
-dojo.gfx.color.rgb2hex=function(r,g,b){
-if(dojo.lang.isArray(r)){
-g=r[1]||0;
-b=r[2]||0;
-r=r[0]||0;
-}
-var ret=dojo.lang.map([r,g,b],function(x){
-x=new Number(x);
-var s=x.toString(16);
-while(s.length<2){
-s="0"+s;
-}
-return s;
+
+dojo.extend(dojo.gfx.color.Color, {
+  toRgb: function(includeAlpha) {
+    if(includeAlpha) {
+      return this.toRgba();
+    } else {
+      return [this.r, this.g, this.b];
+    }
+  },
+  toRgba: function() {
+    return [this.r, this.g, this.b, this.a];
+  },
+  toHex: function() {
+    return dojo.gfx.color.rgb2hex(this.toRgb());
+  },
+  toCss: function() {
+    return "rgb(" + this.toRgb().join() + ")";
+  },
+  toString: function() {
+    return this.toHex(); // decent default?
+  },
+  blend: function(color, weight){
+    var rgb = null;
+    if(dojo.lang.isArray(color)){
+      rgb = color;
+    }else if(color instanceof dojo.gfx.color.Color){
+      rgb = color.toRgb();
+    }else{
+      rgb = new dojo.gfx.color.Color(color).toRgb();
+    }
+    return dojo.gfx.color.blend(this.toRgb(), rgb, weight);
+  }
 });
-ret.unshift("#");
-return ret.join("");
+
+dojo.gfx.color.named = {
+  white:      [255,255,255],
+  black:      [0,0,0],
+  red:        [255,0,0],
+  green:      [0,255,0],
+  lime:     [0,255,0],
+  blue:       [0,0,255],
+  navy:       [0,0,128],
+  gray:       [128,128,128],
+  silver:     [192,192,192]
 };
+
+dojo.gfx.color.blend = function(a, b, weight){
+  // summary: 
+  //    blend colors a and b (both as RGB array or hex strings) with weight
+  //    from -1 to +1, 0 being a 50/50 blend
+  if(typeof a == "string"){
+    return dojo.gfx.color.blendHex(a, b, weight);
+  }
+  if(!weight){
+    weight = 0;
+  }
+  weight = Math.min(Math.max(-1, weight), 1);
+
+  // alex: this interface blows.
+  // map -1 to 1 to the range 0 to 1
+  weight = ((weight + 1)/2);
+  
+  var c = [];
+
+  // var stop = (1000*weight);
+  for(var x = 0; x < 3; x++){
+    c[x] = parseInt( b[x] + ( (a[x] - b[x]) * weight) );
+  }
+  return c;
+}
+
+// very convenient blend that takes and returns hex values
+// (will get called automatically by blend when blend gets strings)
+dojo.gfx.color.blendHex = function(a, b, weight) {
+  return dojo.gfx.color.rgb2hex(dojo.gfx.color.blend(dojo.gfx.color.hex2rgb(a), dojo.gfx.color.hex2rgb(b), weight));
+}
+
+// get RGB array from css-style color declarations
+dojo.gfx.color.extractRGB = function(color) {
+  var hex = "0123456789abcdef";
+  color = color.toLowerCase();
+  if( color.indexOf("rgb") == 0 ) {
+    var matches = color.match(/rgba*\((\d+), *(\d+), *(\d+)/i);
+    var ret = matches.splice(1, 3);
+    return ret;
+  } else {
+    var colors = dojo.gfx.color.hex2rgb(color);
+    if(colors) {
+      return colors;
+    } else {
+      // named color (how many do we support?)
+      return dojo.gfx.color.named[color] || [255, 255, 255];
+    }
+  }
+}
+
+dojo.gfx.color.hex2rgb = function(hex) {
+  var hexNum = "0123456789ABCDEF";
+  var rgb = new Array(3);
+  if( hex.indexOf("#") == 0 ) { hex = hex.substring(1); }
+  hex = hex.toUpperCase();
+  if(hex.replace(new RegExp("["+hexNum+"]", "g"), "") != "") {
+    return null;
+  }
+  if( hex.length == 3 ) {
+    rgb[0] = hex.charAt(0) + hex.charAt(0)
+    rgb[1] = hex.charAt(1) + hex.charAt(1)
+    rgb[2] = hex.charAt(2) + hex.charAt(2);
+  } else {
+    rgb[0] = hex.substring(0, 2);
+    rgb[1] = hex.substring(2, 4);
+    rgb[2] = hex.substring(4);
+  }
+  for(var i = 0; i < rgb.length; i++) {
+    rgb[i] = hexNum.indexOf(rgb[i].charAt(0)) * 16 + hexNum.indexOf(rgb[i].charAt(1));
+  }
+  return rgb;
+}
+
+dojo.gfx.color.rgb2hex = function(r, g, b) {
+  if(dojo.lang.isArray(r)) {
+    g = r[1] || 0;
+    b = r[2] || 0;
+    r = r[0] || 0;
+  }
+  var ret = dojo.lang.map([r, g, b], function(x) {
+    x = new Number(x);
+    var s = x.toString(16);
+    while(s.length < 2) { s = "0" + s; }
+    return s;
+  });
+  ret.unshift("#");
+  return ret.join("");
+}
+
 dojo.provide("dojo.lang.func");
-dojo.lang.hitch=function(_350,_351){
-var fcn=(dojo.lang.isString(_351)?_350[_351]:_351)||function(){
-};
-return function(){
-return fcn.apply(_350,arguments);
-};
-};
-dojo.lang.anonCtr=0;
-dojo.lang.anon={};
-dojo.lang.nameAnonFunc=function(_353,_354,_355){
-var nso=(_354||dojo.lang.anon);
-if((_355)||((dj_global["djConfig"])&&(djConfig["slowAnonFuncLookups"]==true))){
-for(var x in nso){
-try{
-if(nso[x]===_353){
-return x;
+
+
+/**
+ * Runs a function in a given scope (thisObject), can
+ * also be used to preserve scope.
+ *
+ * hitch(foo, "bar"); // runs foo.bar() in the scope of foo
+ * hitch(foo, myFunction); // runs myFunction in the scope of foo
+ */
+dojo.lang.hitch = function(thisObject, method){
+  var fcn = (dojo.lang.isString(method) ? thisObject[method] : method) || function(){};
+
+  return function() {
+    return fcn.apply(thisObject, arguments);
+  };
 }
+
+dojo.lang.anonCtr = 0;
+dojo.lang.anon = {};
+dojo.lang.nameAnonFunc = function(anonFuncPtr, namespaceObj, searchForNames){
+  var nso = (namespaceObj || dojo.lang.anon);
+  if( (searchForNames) ||
+    ((dj_global["djConfig"])&&(djConfig["slowAnonFuncLookups"] == true)) ){
+    for(var x in nso){
+      try{
+        if(nso[x] === anonFuncPtr){
+          return x;
+        }
+      }catch(e){} // window.external fails in IE embedded in Eclipse (Eclipse bug #151165)
+    }
+  }
+  var ret = "__"+dojo.lang.anonCtr++;
+  while(typeof nso[ret] != "undefined"){
+    ret = "__"+dojo.lang.anonCtr++;
+  }
+  nso[ret] = anonFuncPtr;
+  return ret;
 }
-catch(e){
+
+dojo.lang.forward = function(funcName){
+  // Returns a function that forwards a method call to this.func(...)
+  return function(){
+    return this[funcName].apply(this, arguments);
+  };
 }
+
+dojo.lang.curry = function(ns, func /* args ... */){
+  var outerArgs = [];
+  ns = ns||dj_global;
+  if(dojo.lang.isString(func)){
+    func = ns[func];
+  }
+  for(var x=2; x<arguments.length; x++){
+    outerArgs.push(arguments[x]);
+  }
+  // since the event system replaces the original function with a new
+  // join-point runner with an arity of 0, we check to see if it's left us
+  // any clues about the original arity in lieu of the function's actual
+  // length property
+  var ecount = (func["__preJoinArity"]||func.length) - outerArgs.length;
+  // borrowed from svend tofte
+  function gather(nextArgs, innerArgs, expected){
+    var texpected = expected;
+    var totalArgs = innerArgs.slice(0); // copy
+    for(var x=0; x<nextArgs.length; x++){
+      totalArgs.push(nextArgs[x]);
+    }
+    // check the list of provided nextArgs to see if it, plus the
+    // number of innerArgs already supplied, meets the total
+    // expected.
+    expected = expected-nextArgs.length;
+    if(expected<=0){
+      var res = func.apply(ns, totalArgs);
+      expected = texpected;
+      return res;
+    }else{
+      return function(){
+        return gather(arguments,// check to see if we've been run
+                    // with enough args
+              totalArgs,  // a copy
+              expected);  // how many more do we need to run?;
+      };
+    }
+  }
+  return gather([], outerArgs, ecount);
 }
+
+dojo.lang.curryArguments = function(ns, func, args, offset){
+  var targs = [];
+  var x = offset||0;
+  for(x=offset; x<args.length; x++){
+    targs.push(args[x]); // ensure that it's an arr
+  }
+  return dojo.lang.curry.apply(dojo.lang, [ns, func].concat(targs));
 }
-var ret="__"+dojo.lang.anonCtr++;
-while(typeof nso[ret]!="undefined"){
-ret="__"+dojo.lang.anonCtr++;
+
+dojo.lang.tryThese = function(){
+  for(var x=0; x<arguments.length; x++){
+    try{
+      if(typeof arguments[x] == "function"){
+        var ret = (arguments[x]());
+        if(ret){
+          return ret;
+        }
+      }
+    }catch(e){
+      dojo.debug(e);
+    }
+  }
 }
-nso[ret]=_353;
-return ret;
-};
-dojo.lang.forward=function(_359){
-return function(){
-return this[_359].apply(this,arguments);
-};
-};
-dojo.lang.curry=function(ns,func){
-var _35c=[];
-ns=ns||dj_global;
-if(dojo.lang.isString(func)){
-func=ns[func];
+
+dojo.lang.delayThese = function(farr, cb, delay, onend){
+  /**
+   * alternate: (array funcArray, function callback, function onend)
+   * alternate: (array funcArray, function callback)
+   * alternate: (array funcArray)
+   */
+  if(!farr.length){ 
+    if(typeof onend == "function"){
+      onend();
+    }
+    return;
+  }
+  if((typeof delay == "undefined")&&(typeof cb == "number")){
+    delay = cb;
+    cb = function(){};
+  }else if(!cb){
+    cb = function(){};
+    if(!delay){ delay = 0; }
+  }
+  setTimeout(function(){
+    (farr.shift())();
+    cb();
+    dojo.lang.delayThese(farr, cb, delay, onend);
+  }, delay);
 }
-for(var x=2;x<arguments.length;x++){
-_35c.push(arguments[x]);
-}
-var _35e=(func["__preJoinArity"]||func.length)-_35c.length;
-function gather(_35f,_360,_361){
-var _362=_361;
-var _363=_360.slice(0);
-for(var x=0;x<_35f.length;x++){
-_363.push(_35f[x]);
-}
-_361=_361-_35f.length;
-if(_361<=0){
-var res=func.apply(ns,_363);
-_361=_362;
-return res;
-}else{
-return function(){
-return gather(arguments,_363,_361);
-};
-}
-}
-return gather([],_35c,_35e);
-};
-dojo.lang.curryArguments=function(ns,func,args,_369){
-var _36a=[];
-var x=_369||0;
-for(x=_369;x<args.length;x++){
-_36a.push(args[x]);
-}
-return dojo.lang.curry.apply(dojo.lang,[ns,func].concat(_36a));
-};
-dojo.lang.tryThese=function(){
-for(var x=0;x<arguments.length;x++){
-try{
-if(typeof arguments[x]=="function"){
-var ret=(arguments[x]());
-if(ret){
-return ret;
-}
-}
-}
-catch(e){
-dojo.debug(e);
-}
-}
-};
-dojo.lang.delayThese=function(farr,cb,_370,_371){
-if(!farr.length){
-if(typeof _371=="function"){
-_371();
-}
-return;
-}
-if((typeof _370=="undefined")&&(typeof cb=="number")){
-_370=cb;
-cb=function(){
-};
-}else{
-if(!cb){
-cb=function(){
-};
-if(!_370){
-_370=0;
-}
-}
-}
-setTimeout(function(){
-(farr.shift())();
-cb();
-dojo.lang.delayThese(farr,cb,_370,_371);
-},_370);
-};
+
 dojo.provide("dojo.lfx.Animation");
-dojo.lfx.Line=function(_372,end){
-this.start=_372;
-this.end=end;
-if(dojo.lang.isArray(_372)){
-var diff=[];
-dojo.lang.forEach(this.start,function(s,i){
-diff[i]=this.end[i]-s;
-},this);
-this.getValue=function(n){
-var res=[];
-dojo.lang.forEach(this.start,function(s,i){
-res[i]=(diff[i]*n)+s;
-},this);
-return res;
-};
-}else{
-var diff=end-_372;
-this.getValue=function(n){
-return (diff*n)+this.start;
-};
+
+
+/*
+  Animation package based on Dan Pupius' work: http://pupius.co.uk/js/Toolkit.Drawing.js
+*/
+dojo.lfx.Line = function(/*int*/ start, /*int*/ end){
+  // summary: dojo.lfx.Line is the object used to generate values
+  //      from a start value to an end value
+  this.start = start;
+  this.end = end;
+  if(dojo.lang.isArray(start)){
+    /* start: Array
+       end: Array
+       pId: a */
+    var diff = [];
+    dojo.lang.forEach(this.start, function(s,i){
+      diff[i] = this.end[i] - s;
+    }, this);
+    
+    this.getValue = function(/*float*/ n){
+      var res = [];
+      dojo.lang.forEach(this.start, function(s, i){
+        res[i] = (diff[i] * n) + s;
+      }, this);
+      return res; // Array
+    }
+  }else{
+    var diff = end - start;
+      
+    this.getValue = function(/*float*/ n){
+      //  summary: returns the point on the line
+      //  n: a floating point number greater than 0 and less than 1
+      return (diff * n) + this.start; // Decimal
+    }
+  }
 }
-};
-dojo.lfx.easeDefault=function(n){
-if(dojo.render.html.khtml){
-return (parseFloat("0.5")+((Math.sin((n+parseFloat("1.5"))*Math.PI))/2));
-}else{
-return (0.5+((Math.sin((n+1.5)*Math.PI))/2));
+
+dojo.lfx.easeDefault = function(/*Decimal?*/ n){
+  //  summary: Returns the point for point n on a sin wave.
+  if(dojo.render.html.khtml){
+    // the cool kids are obviously not using konqueror...
+    // found a very wierd bug in floats constants, 1.5 evals as 1
+    // seems somebody mixed up ints and floats in 3.5.4 ??
+    // FIXME: investigate more and post a KDE bug (Fredrik)
+    return (parseFloat("0.5")+((Math.sin( (n+parseFloat("1.5")) * Math.PI))/2));
+  }else{
+    return (0.5+((Math.sin( (n+1.5) * Math.PI))/2));
+  }
 }
-};
-dojo.lfx.easeIn=function(n){
-return Math.pow(n,3);
-};
-dojo.lfx.easeOut=function(n){
-return (1-Math.pow(1-n,3));
-};
-dojo.lfx.easeInOut=function(n){
-return ((3*Math.pow(n,2))-(2*Math.pow(n,3)));
-};
-dojo.lfx.IAnimation=function(){
-};
-dojo.lang.extend(dojo.lfx.IAnimation,{curve:null,duration:1000,easing:null,repeatCount:0,rate:25,handler:null,beforeBegin:null,onBegin:null,onAnimate:null,onEnd:null,onPlay:null,onPause:null,onStop:null,play:null,pause:null,stop:null,connect:function(evt,_381,_382){
-if(!_382){
-_382=_381;
-_381=this;
+
+dojo.lfx.easeIn = function(/*Decimal?*/ n){
+  //  summary: returns the point on an easing curve
+  //  n: a floating point number greater than 0 and less than 1
+  return Math.pow(n, 3);
 }
-_382=dojo.lang.hitch(_381,_382);
-var _383=this[evt]||function(){
-};
-this[evt]=function(){
-var ret=_383.apply(this,arguments);
-_382.apply(this,arguments);
-return ret;
-};
-return this;
-},fire:function(evt,args){
-if(this[evt]){
-this[evt].apply(this,(args||[]));
+
+dojo.lfx.easeOut = function(/*Decimal?*/ n){
+  //  summary: returns the point on the line
+  //  n: a floating point number greater than 0 and less than 1
+  return ( 1 - Math.pow(1 - n, 3) );
 }
-return this;
-},repeat:function(_387){
-this.repeatCount=_387;
-return this;
-},_active:false,_paused:false});
-dojo.lfx.Animation=function(_388,_389,_38a,_38b,_38c,rate){
-dojo.lfx.IAnimation.call(this);
-if(dojo.lang.isNumber(_388)||(!_388&&_389.getValue)){
-rate=_38c;
-_38c=_38b;
-_38b=_38a;
-_38a=_389;
-_389=_388;
-_388=null;
-}else{
-if(_388.getValue||dojo.lang.isArray(_388)){
-rate=_38b;
-_38c=_38a;
-_38b=_389;
-_38a=_388;
-_389=null;
-_388=null;
+
+dojo.lfx.easeInOut = function(/*Decimal?*/ n){
+  //  summary: returns the point on the line
+  //  n: a floating point number greater than 0 and less than 1
+  return ( (3 * Math.pow(n, 2)) - (2 * Math.pow(n, 3)) );
 }
+
+dojo.lfx.IAnimation = function(){
+  // summary: dojo.lfx.IAnimation is an interface that implements
+  //      commonly used functions of animation objects
 }
-if(dojo.lang.isArray(_38a)){
-this.curve=new dojo.lfx.Line(_38a[0],_38a[1]);
-}else{
-this.curve=_38a;
+dojo.lang.extend(dojo.lfx.IAnimation, {
+  // public properties
+  curve: null,
+  duration: 1000,
+  easing: null,
+  repeatCount: 0,
+  rate: 25,
+  
+  // events
+  handler: null,
+  beforeBegin: null,
+  onBegin: null,
+  onAnimate: null,
+  onEnd: null,
+  onPlay: null,
+  onPause: null,
+  onStop: null,
+  
+  // public methods
+  play: null,
+  pause: null,
+  stop: null,
+  
+  connect: function(/*Event*/ evt, /*Object*/ scope, /*Function*/ newFunc){
+    // summary: Convenience function.  Quickly connect to an event
+    //      of this object and save the old functions connected to it.
+    // evt: The name of the event to connect to.
+    // scope: the scope in which to run newFunc.
+    // newFunc: the function to run when evt is fired.
+    if(!newFunc){
+      /* scope: Function
+         newFunc: null
+         pId: f */
+      newFunc = scope;
+      scope = this;
+    }
+    newFunc = dojo.lang.hitch(scope, newFunc);
+    var oldFunc = this[evt]||function(){};
+    this[evt] = function(){
+      var ret = oldFunc.apply(this, arguments);
+      newFunc.apply(this, arguments);
+      return ret;
+    }
+    return this; // dojo.lfx.IAnimation
+  },
+
+  fire: function(/*Event*/ evt, /*Array*/ args){
+    // summary: Convenience function.  Fire event "evt" and pass it
+    //      the arguments specified in "args".
+    // evt: The event to fire.
+    // args: The arguments to pass to the event.
+    if(this[evt]){
+      this[evt].apply(this, (args||[]));
+    }
+    return this; // dojo.lfx.IAnimation
+  },
+  
+  repeat: function(/*int*/ count){
+    // summary: Set the repeat count of this object.
+    // count: How many times to repeat the animation.
+    this.repeatCount = count;
+    return this; // dojo.lfx.IAnimation
+  },
+
+  // private properties
+  _active: false,
+  _paused: false
+});
+
+dojo.lfx.Animation = function(  /*Object*/ handlers, 
+                /*int*/ duration, 
+                /*dojo.lfx.Line*/ curve, 
+                /*function*/ easing, 
+                /*int*/ repeatCount, 
+                /*int*/ rate){
+  //  summary
+  //    a generic animation object that fires callbacks into it's handlers
+  //    object at various states
+  //  handlers: { handler: Function?, onstart: Function?, onstop: Function?, onanimate: Function? }
+  dojo.lfx.IAnimation.call(this);
+  if(dojo.lang.isNumber(handlers)||(!handlers && duration.getValue)){
+    // no handlers argument:
+    rate = repeatCount;
+    repeatCount = easing;
+    easing = curve;
+    curve = duration;
+    duration = handlers;
+    handlers = null;
+  }else if(handlers.getValue||dojo.lang.isArray(handlers)){
+    // no handlers or duration:
+    rate = easing;
+    repeatCount = curve;
+    easing = duration;
+    curve = handlers;
+    duration = null;
+    handlers = null;
+  }
+  if(dojo.lang.isArray(curve)){
+    /* curve: Array
+       pId: a */
+    this.curve = new dojo.lfx.Line(curve[0], curve[1]);
+  }else{
+    this.curve = curve;
+  }
+  if(duration != null && duration > 0){ this.duration = duration; }
+  if(repeatCount){ this.repeatCount = repeatCount; }
+  if(rate){ this.rate = rate; }
+  if(handlers){
+    dojo.lang.forEach([
+        "handler", "beforeBegin", "onBegin", 
+        "onEnd", "onPlay", "onStop", "onAnimate"
+      ], function(item){
+        if(handlers[item]){
+          this.connect(item, handlers[item]);
+        }
+      }, this);
+  }
+  if(easing && dojo.lang.isFunction(easing)){
+    this.easing=easing;
+  }
 }
-if(_389!=null&&_389>0){
-this.duration=_389;
+dojo.inherits(dojo.lfx.Animation, dojo.lfx.IAnimation);
+dojo.lang.extend(dojo.lfx.Animation, {
+  // "private" properties
+  _startTime: null,
+  _endTime: null,
+  _timer: null,
+  _percent: 0,
+  _startRepeatCount: 0,
+
+  // public methods
+  play: function(/*int?*/ delay, /*bool?*/ gotoStart){
+    // summary: Start the animation.
+    // delay: How many milliseconds to delay before starting.
+    // gotoStart: If true, starts the animation from the beginning; otherwise,
+    //            starts it from its current position.
+    if(gotoStart){
+      clearTimeout(this._timer);
+      this._active = false;
+      this._paused = false;
+      this._percent = 0;
+    }else if(this._active && !this._paused){
+      return this; // dojo.lfx.Animation
+    }
+    
+    this.fire("handler", ["beforeBegin"]);
+    this.fire("beforeBegin");
+
+    if(delay > 0){
+      setTimeout(dojo.lang.hitch(this, function(){ this.play(null, gotoStart); }), delay);
+      return this; // dojo.lfx.Animation
+    }
+    
+    this._startTime = new Date().valueOf();
+    if(this._paused){
+      this._startTime -= (this.duration * this._percent / 100);
+    }
+    this._endTime = this._startTime + this.duration;
+
+    this._active = true;
+    this._paused = false;
+    
+    var step = this._percent / 100;
+    var value = this.curve.getValue(step);
+    if(this._percent == 0 ){
+      if(!this._startRepeatCount){
+        this._startRepeatCount = this.repeatCount;
+      }
+      this.fire("handler", ["begin", value]);
+      this.fire("onBegin", [value]);
+    }
+
+    this.fire("handler", ["play", value]);
+    this.fire("onPlay", [value]);
+
+    this._cycle();
+    return this; // dojo.lfx.Animation
+  },
+
+  pause: function(){
+    // summary: Pauses a running animation.
+    clearTimeout(this._timer);
+    if(!this._active){ return this; /*dojo.lfx.Animation*/}
+    this._paused = true;
+    var value = this.curve.getValue(this._percent / 100);
+    this.fire("handler", ["pause", value]);
+    this.fire("onPause", [value]);
+    return this; // dojo.lfx.Animation
+  },
+
+  gotoPercent: function(/*Decimal*/ pct, /*bool?*/ andPlay){
+    // summary: Sets the progress of the animation.
+    // pct: A percentage in decimal notation (between and including 0.0 and 1.0).
+    // andPlay: If true, play the animation after setting the progress.
+    clearTimeout(this._timer);
+    this._active = true;
+    this._paused = true;
+    this._percent = pct;
+    if(andPlay){ this.play(); }
+    return this; // dojo.lfx.Animation
+  },
+
+  stop: function(/*bool?*/ gotoEnd){
+    // summary: Stops a running animation.
+    // gotoEnd: If true, the animation will end.
+    clearTimeout(this._timer);
+    var step = this._percent / 100;
+    if(gotoEnd){
+      step = 1;
+    }
+    var value = this.curve.getValue(step);
+    this.fire("handler", ["stop", value]);
+    this.fire("onStop", [value]);
+    this._active = false;
+    this._paused = false;
+    return this; // dojo.lfx.Animation
+  },
+
+  status: function(){
+    // summary: Returns a string representation of the status of
+    //      the animation.
+    if(this._active){
+      return this._paused ? "paused" : "playing"; // String
+    }else{
+      return "stopped"; // String
+    }
+    return this;
+  },
+
+  // "private" methods
+  _cycle: function(){
+    clearTimeout(this._timer);
+    if(this._active){
+      var curr = new Date().valueOf();
+      var step = (curr - this._startTime) / (this._endTime - this._startTime);
+
+      if(step >= 1){
+        step = 1;
+        this._percent = 100;
+      }else{
+        this._percent = step * 100;
+      }
+      
+      // Perform easing
+      if((this.easing)&&(dojo.lang.isFunction(this.easing))){
+        step = this.easing(step);
+      }
+
+      var value = this.curve.getValue(step);
+      this.fire("handler", ["animate", value]);
+      this.fire("onAnimate", [value]);
+
+      if( step < 1 ){
+        this._timer = setTimeout(dojo.lang.hitch(this, "_cycle"), this.rate);
+      }else{
+        this._active = false;
+        this.fire("handler", ["end"]);
+        this.fire("onEnd");
+
+        if(this.repeatCount > 0){
+          this.repeatCount--;
+          this.play(null, true);
+        }else if(this.repeatCount == -1){
+          this.play(null, true);
+        }else{
+          if(this._startRepeatCount){
+            this.repeatCount = this._startRepeatCount;
+            this._startRepeatCount = 0;
+          }
+        }
+      }
+    }
+    return this; // dojo.lfx.Animation
+  }
+});
+
+dojo.lfx.Combine = function(/*dojo.lfx.IAnimation...*/ animations){
+  // summary: An animation object to play animations passed to it at the same time.
+  dojo.lfx.IAnimation.call(this);
+  this._anims = [];
+  this._animsEnded = 0;
+  
+  var anims = arguments;
+  if(anims.length == 1 && (dojo.lang.isArray(anims[0]) || dojo.lang.isArrayLike(anims[0]))){
+    /* animations: dojo.lfx.IAnimation[]
+       pId: a */
+    anims = anims[0];
+  }
+  
+  dojo.lang.forEach(anims, function(anim){
+    this._anims.push(anim);
+    anim.connect("onEnd", dojo.lang.hitch(this, "_onAnimsEnded"));
+  }, this);
 }
-if(_38c){
-this.repeatCount=_38c;
+dojo.inherits(dojo.lfx.Combine, dojo.lfx.IAnimation);
+dojo.lang.extend(dojo.lfx.Combine, {
+  // private members
+  _animsEnded: 0,
+  
+  // public methods
+  play: function(/*int?*/ delay, /*bool?*/ gotoStart){
+    // summary: Start the animations.
+    // delay: How many milliseconds to delay before starting.
+    // gotoStart: If true, starts the animations from the beginning; otherwise,
+    //            starts them from their current position.
+    if( !this._anims.length ){ return this; /*dojo.lfx.Combine*/}
+
+    this.fire("beforeBegin");
+
+    if(delay > 0){
+      setTimeout(dojo.lang.hitch(this, function(){ this.play(null, gotoStart); }), delay);
+      return this; // dojo.lfx.Combine
+    }
+    
+    if(gotoStart || this._anims[0].percent == 0){
+      this.fire("onBegin");
+    }
+    this.fire("onPlay");
+    this._animsCall("play", null, gotoStart);
+    return this; // dojo.lfx.Combine
+  },
+  
+  pause: function(){
+    // summary: Pauses the running animations.
+    this.fire("onPause");
+    this._animsCall("pause"); 
+    return this; // dojo.lfx.Combine
+  },
+  
+  stop: function(/*bool?*/ gotoEnd){
+    // summary: Stops the running animations.
+    // gotoEnd: If true, the animations will end.
+    this.fire("onStop");
+    this._animsCall("stop", gotoEnd);
+    return this; // dojo.lfx.Combine
+  },
+  
+  // private methods
+  _onAnimsEnded: function(){
+    this._animsEnded++;
+    if(this._animsEnded >= this._anims.length){
+      this.fire("onEnd");
+    }
+    return this; // dojo.lfx.Combine
+  },
+  
+  _animsCall: function(/*String*/ funcName){
+    var args = [];
+    if(arguments.length > 1){
+      for(var i = 1 ; i < arguments.length ; i++){
+        args.push(arguments[i]);
+      }
+    }
+    var _this = this;
+    dojo.lang.forEach(this._anims, function(anim){
+      anim[funcName](args);
+    }, _this);
+    return this; // dojo.lfx.Combine
+  }
+});
+
+dojo.lfx.Chain = function(/*dojo.lfx.IAnimation...*/ animations) {
+  // summary: An animation object to play animations passed to it
+  //      one after another.
+  dojo.lfx.IAnimation.call(this);
+  this._anims = [];
+  this._currAnim = -1;
+  
+  var anims = arguments;
+  if(anims.length == 1 && (dojo.lang.isArray(anims[0]) || dojo.lang.isArrayLike(anims[0]))){
+    /* animations: dojo.lfx.IAnimation[]
+       pId: a */
+    anims = anims[0];
+  }
+  
+  var _this = this;
+  dojo.lang.forEach(anims, function(anim, i, anims_arr){
+    this._anims.push(anim);
+    if(i < anims_arr.length - 1){
+      anim.connect("onEnd", dojo.lang.hitch(this, "_playNext") );
+    }else{
+      anim.connect("onEnd", dojo.lang.hitch(this, function(){ this.fire("onEnd"); }) );
+    }
+  }, this);
 }
-if(rate){
-this.rate=rate;
+dojo.inherits(dojo.lfx.Chain, dojo.lfx.IAnimation);
+dojo.lang.extend(dojo.lfx.Chain, {
+  // private members
+  _currAnim: -1,
+  
+  // public methods
+  play: function(/*int?*/ delay, /*bool?*/ gotoStart){
+    // summary: Start the animation sequence.
+    // delay: How many milliseconds to delay before starting.
+    // gotoStart: If true, starts the sequence from the beginning; otherwise,
+    //            starts it from its current position.
+    if( !this._anims.length ) { return this; /*dojo.lfx.Chain*/}
+    if( gotoStart || !this._anims[this._currAnim] ) {
+      this._currAnim = 0;
+    }
+
+    var currentAnimation = this._anims[this._currAnim];
+
+    this.fire("beforeBegin");
+    if(delay > 0){
+      setTimeout(dojo.lang.hitch(this, function(){ this.play(null, gotoStart); }), delay);
+      return this; // dojo.lfx.Chain
+    }
+    
+    if(currentAnimation){
+      if(this._currAnim == 0){
+        this.fire("handler", ["begin", this._currAnim]);
+        this.fire("onBegin", [this._currAnim]);
+      }
+      this.fire("onPlay", [this._currAnim]);
+      currentAnimation.play(null, gotoStart);
+    }
+    return this; // dojo.lfx.Chain
+  },
+  
+  pause: function(){
+    // summary: Pauses the running animation sequence.
+    if( this._anims[this._currAnim] ) {
+      this._anims[this._currAnim].pause();
+      this.fire("onPause", [this._currAnim]);
+    }
+    return this; // dojo.lfx.Chain
+  },
+  
+  playPause: function(){
+    // summary: If the animation sequence is playing, pause it; otherwise,
+    //      play it.
+    if(this._anims.length == 0){ return this; }
+    if(this._currAnim == -1){ this._currAnim = 0; }
+    var currAnim = this._anims[this._currAnim];
+    if( currAnim ) {
+      if( !currAnim._active || currAnim._paused ) {
+        this.play();
+      } else {
+        this.pause();
+      }
+    }
+    return this; // dojo.lfx.Chain
+  },
+  
+  stop: function(){
+    // summary: Stops the running animations.
+    var currAnim = this._anims[this._currAnim];
+    if(currAnim){
+      currAnim.stop();
+      this.fire("onStop", [this._currAnim]);
+    }
+    return currAnim; // dojo.lfx.IAnimation
+  },
+  
+  // private methods
+  _playNext: function(){
+    if( this._currAnim == -1 || this._anims.length == 0 ) { return this; }
+    this._currAnim++;
+    if( this._anims[this._currAnim] ){
+      this._anims[this._currAnim].play(null, true);
+    }
+    return this; // dojo.lfx.Chain
+  }
+});
+
+dojo.lfx.combine = function(/*dojo.lfx.IAnimation...*/ animations){
+  // summary: Convenience function.  Returns a dojo.lfx.Combine created
+  //      using the animations passed in.
+  var anims = arguments;
+  if(dojo.lang.isArray(arguments[0])){
+    /* animations: dojo.lfx.IAnimation[]
+       pId: a */
+    anims = arguments[0];
+  }
+  if(anims.length == 1){ return anims[0]; }
+  return new dojo.lfx.Combine(anims); // dojo.lfx.Combine
 }
-if(_388){
-dojo.lang.forEach(["handler","beforeBegin","onBegin","onEnd","onPlay","onStop","onAnimate"],function(item){
-if(_388[item]){
-this.connect(item,_388[item]);
+
+dojo.lfx.chain = function(/*dojo.lfx.IAnimation...*/ animations){
+  // summary: Convenience function.  Returns a dojo.lfx.Chain created
+  //      using the animations passed in.
+  var anims = arguments;
+  if(dojo.lang.isArray(arguments[0])){
+    /* animations: dojo.lfx.IAnimation[]
+       pId: a */
+    anims = arguments[0];
+  }
+  if(anims.length == 1){ return anims[0]; }
+  return new dojo.lfx.Chain(anims); // dojo.lfx.Combine
 }
-},this);
-}
-if(_38b&&dojo.lang.isFunction(_38b)){
-this.easing=_38b;
-}
-};
-dojo.inherits(dojo.lfx.Animation,dojo.lfx.IAnimation);
-dojo.lang.extend(dojo.lfx.Animation,{_startTime:null,_endTime:null,_timer:null,_percent:0,_startRepeatCount:0,play:function(_38f,_390){
-if(_390){
-clearTimeout(this._timer);
-this._active=false;
-this._paused=false;
-this._percent=0;
-}else{
-if(this._active&&!this._paused){
-return this;
-}
-}
-this.fire("handler",["beforeBegin"]);
-this.fire("beforeBegin");
-if(_38f>0){
-setTimeout(dojo.lang.hitch(this,function(){
-this.play(null,_390);
-}),_38f);
-return this;
-}
-this._startTime=new Date().valueOf();
-if(this._paused){
-this._startTime-=(this.duration*this._percent/100);
-}
-this._endTime=this._startTime+this.duration;
-this._active=true;
-this._paused=false;
-var step=this._percent/100;
-var _392=this.curve.getValue(step);
-if(this._percent==0){
-if(!this._startRepeatCount){
-this._startRepeatCount=this.repeatCount;
-}
-this.fire("handler",["begin",_392]);
-this.fire("onBegin",[_392]);
-}
-this.fire("handler",["play",_392]);
-this.fire("onPlay",[_392]);
-this._cycle();
-return this;
-},pause:function(){
-clearTimeout(this._timer);
-if(!this._active){
-return this;
-}
-this._paused=true;
-var _393=this.curve.getValue(this._percent/100);
-this.fire("handler",["pause",_393]);
-this.fire("onPause",[_393]);
-return this;
-},gotoPercent:function(pct,_395){
-clearTimeout(this._timer);
-this._active=true;
-this._paused=true;
-this._percent=pct;
-if(_395){
-this.play();
-}
-return this;
-},stop:function(_396){
-clearTimeout(this._timer);
-var step=this._percent/100;
-if(_396){
-step=1;
-}
-var _398=this.curve.getValue(step);
-this.fire("handler",["stop",_398]);
-this.fire("onStop",[_398]);
-this._active=false;
-this._paused=false;
-return this;
-},status:function(){
-if(this._active){
-return this._paused?"paused":"playing";
-}else{
-return "stopped";
-}
-return this;
-},_cycle:function(){
-clearTimeout(this._timer);
-if(this._active){
-var curr=new Date().valueOf();
-var step=(curr-this._startTime)/(this._endTime-this._startTime);
-if(step>=1){
-step=1;
-this._percent=100;
-}else{
-this._percent=step*100;
-}
-if((this.easing)&&(dojo.lang.isFunction(this.easing))){
-step=this.easing(step);
-}
-var _39b=this.curve.getValue(step);
-this.fire("handler",["animate",_39b]);
-this.fire("onAnimate",[_39b]);
-if(step<1){
-this._timer=setTimeout(dojo.lang.hitch(this,"_cycle"),this.rate);
-}else{
-this._active=false;
-this.fire("handler",["end"]);
-this.fire("onEnd");
-if(this.repeatCount>0){
-this.repeatCount--;
-this.play(null,true);
-}else{
-if(this.repeatCount==-1){
-this.play(null,true);
-}else{
-if(this._startRepeatCount){
-this.repeatCount=this._startRepeatCount;
-this._startRepeatCount=0;
-}
-}
-}
-}
-}
-return this;
-}});
-dojo.lfx.Combine=function(_39c){
-dojo.lfx.IAnimation.call(this);
-this._anims=[];
-this._animsEnded=0;
-var _39d=arguments;
-if(_39d.length==1&&(dojo.lang.isArray(_39d[0])||dojo.lang.isArrayLike(_39d[0]))){
-_39d=_39d[0];
-}
-dojo.lang.forEach(_39d,function(anim){
-this._anims.push(anim);
-anim.connect("onEnd",dojo.lang.hitch(this,"_onAnimsEnded"));
-},this);
-};
-dojo.inherits(dojo.lfx.Combine,dojo.lfx.IAnimation);
-dojo.lang.extend(dojo.lfx.Combine,{_animsEnded:0,play:function(_39f,_3a0){
-if(!this._anims.length){
-return this;
-}
-this.fire("beforeBegin");
-if(_39f>0){
-setTimeout(dojo.lang.hitch(this,function(){
-this.play(null,_3a0);
-}),_39f);
-return this;
-}
-if(_3a0||this._anims[0].percent==0){
-this.fire("onBegin");
-}
-this.fire("onPlay");
-this._animsCall("play",null,_3a0);
-return this;
-},pause:function(){
-this.fire("onPause");
-this._animsCall("pause");
-return this;
-},stop:function(_3a1){
-this.fire("onStop");
-this._animsCall("stop",_3a1);
-return this;
-},_onAnimsEnded:function(){
-this._animsEnded++;
-if(this._animsEnded>=this._anims.length){
-this.fire("onEnd");
-}
-return this;
-},_animsCall:function(_3a2){
-var args=[];
-if(arguments.length>1){
-for(var i=1;i<arguments.length;i++){
-args.push(arguments[i]);
-}
-}
-var _3a5=this;
-dojo.lang.forEach(this._anims,function(anim){
-anim[_3a2](args);
-},_3a5);
-return this;
-}});
-dojo.lfx.Chain=function(_3a7){
-dojo.lfx.IAnimation.call(this);
-this._anims=[];
-this._currAnim=-1;
-var _3a8=arguments;
-if(_3a8.length==1&&(dojo.lang.isArray(_3a8[0])||dojo.lang.isArrayLike(_3a8[0]))){
-_3a8=_3a8[0];
-}
-var _3a9=this;
-dojo.lang.forEach(_3a8,function(anim,i,_3ac){
-this._anims.push(anim);
-if(i<_3ac.length-1){
-anim.connect("onEnd",dojo.lang.hitch(this,"_playNext"));
-}else{
-anim.connect("onEnd",dojo.lang.hitch(this,function(){
-this.fire("onEnd");
-}));
-}
-},this);
-};
-dojo.inherits(dojo.lfx.Chain,dojo.lfx.IAnimation);
-dojo.lang.extend(dojo.lfx.Chain,{_currAnim:-1,play:function(_3ad,_3ae){
-if(!this._anims.length){
-return this;
-}
-if(_3ae||!this._anims[this._currAnim]){
-this._currAnim=0;
-}
-var _3af=this._anims[this._currAnim];
-this.fire("beforeBegin");
-if(_3ad>0){
-setTimeout(dojo.lang.hitch(this,function(){
-this.play(null,_3ae);
-}),_3ad);
-return this;
-}
-if(_3af){
-if(this._currAnim==0){
-this.fire("handler",["begin",this._currAnim]);
-this.fire("onBegin",[this._currAnim]);
-}
-this.fire("onPlay",[this._currAnim]);
-_3af.play(null,_3ae);
-}
-return this;
-},pause:function(){
-if(this._anims[this._currAnim]){
-this._anims[this._currAnim].pause();
-this.fire("onPause",[this._currAnim]);
-}
-return this;
-},playPause:function(){
-if(this._anims.length==0){
-return this;
-}
-if(this._currAnim==-1){
-this._currAnim=0;
-}
-var _3b0=this._anims[this._currAnim];
-if(_3b0){
-if(!_3b0._active||_3b0._paused){
-this.play();
-}else{
-this.pause();
-}
-}
-return this;
-},stop:function(){
-var _3b1=this._anims[this._currAnim];
-if(_3b1){
-_3b1.stop();
-this.fire("onStop",[this._currAnim]);
-}
-return _3b1;
-},_playNext:function(){
-if(this._currAnim==-1||this._anims.length==0){
-return this;
-}
-this._currAnim++;
-if(this._anims[this._currAnim]){
-this._anims[this._currAnim].play(null,true);
-}
-return this;
-}});
-dojo.lfx.combine=function(_3b2){
-var _3b3=arguments;
-if(dojo.lang.isArray(arguments[0])){
-_3b3=arguments[0];
-}
-if(_3b3.length==1){
-return _3b3[0];
-}
-return new dojo.lfx.Combine(_3b3);
-};
-dojo.lfx.chain=function(_3b4){
-var _3b5=arguments;
-if(dojo.lang.isArray(arguments[0])){
-_3b5=arguments[0];
-}
-if(_3b5.length==1){
-return _3b5[0];
-}
-return new dojo.lfx.Chain(_3b5);
-};
+
 dojo.provide("dojo.html.color");
-dojo.html.getBackgroundColor=function(node){
-node=dojo.byId(node);
-var _3b7;
-do{
-_3b7=dojo.html.getStyle(node,"background-color");
-if(_3b7.toLowerCase()=="rgba(0, 0, 0, 0)"){
-_3b7="transparent";
+
+
+dojo.html.getBackgroundColor = function(/* HTMLElement */node){
+  //  summary
+  //  returns the background color of the passed node as a 32-bit color (RGBA)
+  node = dojo.byId(node);
+  var color;
+  do{
+    color = dojo.html.getStyle(node, "background-color");
+    // Safari doesn't say "transparent"
+    if(color.toLowerCase() == "rgba(0, 0, 0, 0)") { color = "transparent"; }
+    if(node == document.getElementsByTagName("body")[0]) { node = null; break; }
+    node = node.parentNode;
+  }while(node && dojo.lang.inArray(["transparent", ""], color));
+  if(color == "transparent"){
+    color = [255, 255, 255, 0];
+  }else{
+    color = dojo.gfx.color.extractRGB(color);
+  }
+  return color; //  array
 }
-if(node==document.getElementsByTagName("body")[0]){
-node=null;
-break;
-}
-node=node.parentNode;
-}while(node&&dojo.lang.inArray(["transparent",""],_3b7));
-if(_3b7=="transparent"){
-_3b7=[255,255,255,0];
-}else{
-_3b7=dojo.gfx.color.extractRGB(_3b7);
-}
-return _3b7;
-};
+
 dojo.provide("dojo.lfx.html");
-dojo.lfx.html._byId=function(_3b8){
-if(!_3b8){
-return [];
+
+
+dojo.lfx.html._byId = function(nodes){
+  if(!nodes){ return []; }
+  if(dojo.lang.isArrayLike(nodes)){
+    if(!nodes.alreadyChecked){
+      var n = [];
+      dojo.lang.forEach(nodes, function(node){
+        n.push(dojo.byId(node));
+      });
+      n.alreadyChecked = true;
+      return n;
+    }else{
+      return nodes;
+    }
+  }else{
+    var n = [];
+    n.push(dojo.byId(nodes));
+    n.alreadyChecked = true;
+    return n;
+  }
 }
-if(dojo.lang.isArrayLike(_3b8)){
-if(!_3b8.alreadyChecked){
-var n=[];
-dojo.lang.forEach(_3b8,function(node){
-n.push(dojo.byId(node));
-});
-n.alreadyChecked=true;
-return n;
-}else{
-return _3b8;
+
+dojo.lfx.html.propertyAnimation = function( /*DOMNode[]*/ nodes, 
+                      /*Object[]*/ propertyMap, 
+                      /*int*/ duration,
+                      /*function*/ easing,
+                      /*Object*/ handlers){
+  // summary: Returns an animation that will transition the properties of "nodes"
+  //      depending how they are defined in "propertyMap".
+  // nodes: An array of DOMNodes or one DOMNode.
+  // propertyMap: { property: String, start: Decimal?, end: Decimal?, units: String? }
+  //        An array of objects defining properties to change.
+  // duration: Duration of the animation in milliseconds.
+  // easing: An easing function.
+  // handlers: { handler: Function?, onstart: Function?, onstop: Function?, onanimate: Function? }
+  nodes = dojo.lfx.html._byId(nodes);
+
+  var targs = {
+    "propertyMap": propertyMap,
+    "nodes": nodes,
+    "duration": duration,
+    "easing": easing||dojo.lfx.easeDefault
+  };
+  
+  var setEmUp = function(args){
+    if(args.nodes.length==1){
+      // FIXME: we're only supporting start-value filling when one node is
+      // passed
+      
+      var pm = args.propertyMap;
+      if(!dojo.lang.isArray(args.propertyMap)){
+        // it's stupid to have to pack an array with a set of objects
+        // when you can just pass in an object list
+        var parr = [];
+        for(var pname in pm){
+          pm[pname].property = pname;
+          parr.push(pm[pname]);
+        }
+        pm = args.propertyMap = parr;
+      }
+      dojo.lang.forEach(pm, function(prop){
+        if(dj_undef("start", prop)){
+          if(prop.property != "opacity"){
+            prop.start = parseInt(dojo.html.getComputedStyle(args.nodes[0], prop.property));
+          }else{
+            prop.start = dojo.html.getOpacity(args.nodes[0]);
+          }
+        }
+      });
+    }
+  }
+
+  var coordsAsInts = function(coords){
+    var cints = [];
+    dojo.lang.forEach(coords, function(c){ 
+      cints.push(Math.round(c));
+    });
+    return cints;
+  }
+
+  var setStyle = function(n, style){
+    n = dojo.byId(n);
+    if(!n || !n.style){ return; }
+    for(var s in style){
+      if(s == "opacity"){
+        dojo.html.setOpacity(n, style[s]);
+      }else{
+        n.style[s] = style[s];
+      }
+    }
+  }
+
+  var propLine = function(properties){
+    this._properties = properties;
+    this.diffs = new Array(properties.length);
+    dojo.lang.forEach(properties, function(prop, i){
+      // calculate the end - start to optimize a bit
+      if(dojo.lang.isFunction(prop.start)){
+        prop.start = prop.start(prop, i);
+      }
+      if(dojo.lang.isFunction(prop.end)){
+        prop.end = prop.end(prop, i);
+      }
+      if(dojo.lang.isArray(prop.start)){
+        // don't loop through the arrays
+        this.diffs[i] = null;
+      }else if(prop.start instanceof dojo.gfx.color.Color){
+        // save these so we don't have to call toRgb() every getValue() call
+        prop.startRgb = prop.start.toRgb();
+        prop.endRgb = prop.end.toRgb();
+      }else{
+        this.diffs[i] = prop.end - prop.start;
+      }
+    }, this);
+
+    this.getValue = function(n){
+      var ret = {};
+      dojo.lang.forEach(this._properties, function(prop, i){
+        var value = null;
+        if(dojo.lang.isArray(prop.start)){
+          // FIXME: what to do here?
+        }else if(prop.start instanceof dojo.gfx.color.Color){
+          value = (prop.units||"rgb") + "(";
+          for(var j = 0 ; j < prop.startRgb.length ; j++){
+            value += Math.round(((prop.endRgb[j] - prop.startRgb[j]) * n) + prop.startRgb[j]) + (j < prop.startRgb.length - 1 ? "," : "");
+          }
+          value += ")";
+        }else{
+          value = ((this.diffs[i]) * n) + prop.start + (prop.property != "opacity" ? prop.units||"px" : "");
+        }
+        ret[dojo.html.toCamelCase(prop.property)] = value;
+      }, this);
+      return ret;
+    }
+  }
+  
+  var anim = new dojo.lfx.Animation({
+      beforeBegin: function(){ 
+        setEmUp(targs); 
+        anim.curve = new propLine(targs.propertyMap);
+      },
+      onAnimate: function(propValues){
+        dojo.lang.forEach(targs.nodes, function(node){
+          setStyle(node, propValues);
+        });
+      }
+    },
+    targs.duration, 
+    null,
+    targs.easing
+  );
+  if(handlers){
+    for(var x in handlers){
+      if(dojo.lang.isFunction(handlers[x])){
+        anim.connect(x, anim, handlers[x]);
+      }
+    }
+  }
+  
+  return anim; // dojo.lfx.Animation
 }
-}else{
-var n=[];
-n.push(dojo.byId(_3b8));
-n.alreadyChecked=true;
-return n;
+
+dojo.lfx.html._makeFadeable = function(nodes){
+  var makeFade = function(node){
+    if(dojo.render.html.ie){
+      // only set the zoom if the "tickle" value would be the same as the
+      // default
+      if( (node.style.zoom.length == 0) &&
+        (dojo.html.getStyle(node, "zoom") == "normal") ){
+        // make sure the node "hasLayout"
+        // NOTE: this has been tested with larger and smaller user-set text
+        // sizes and works fine
+        node.style.zoom = "1";
+        // node.style.zoom = "normal";
+      }
+      // don't set the width to auto if it didn't already cascade that way.
+      // We don't want to f anyones designs
+      if( (node.style.width.length == 0) &&
+        (dojo.html.getStyle(node, "width") == "auto") ){
+        node.style.width = "auto";
+      }
+    }
+  }
+  if(dojo.lang.isArrayLike(nodes)){
+    dojo.lang.forEach(nodes, makeFade);
+  }else{
+    makeFade(nodes);
+  }
 }
-};
-dojo.lfx.html.propertyAnimation=function(_3bb,_3bc,_3bd,_3be,_3bf){
-_3bb=dojo.lfx.html._byId(_3bb);
-var _3c0={"propertyMap":_3bc,"nodes":_3bb,"duration":_3bd,"easing":_3be||dojo.lfx.easeDefault};
-var _3c1=function(args){
-if(args.nodes.length==1){
-var pm=args.propertyMap;
-if(!dojo.lang.isArray(args.propertyMap)){
-var parr=[];
-for(var _3c5 in pm){
-pm[_3c5].property=_3c5;
-parr.push(pm[_3c5]);
+
+dojo.lfx.html.fade = function(/*DOMNode[]*/ nodes,
+                /*Object*/values,
+                /*int?*/ duration,
+                /*Function?*/ easing,
+                /*Function?*/ callback){
+  // summary:Returns an animation that will fade the "nodes" from the start to end values passed.
+  // nodes: An array of DOMNodes or one DOMNode.
+  // values: { start: Decimal?, end: Decimal? }
+  // duration: Duration of the animation in milliseconds.
+  // easing: An easing function.
+  // callback: Function to run at the end of the animation.
+  nodes = dojo.lfx.html._byId(nodes);
+  var props = { property: "opacity" };
+  if(!dj_undef("start", values)){
+    props.start = values.start;
+  }else{
+    props.start = function(){ return dojo.html.getOpacity(nodes[0]); };
+  }
+
+  if(!dj_undef("end", values)){
+    props.end = values.end;
+  }else{
+    dojo.raise("dojo.lfx.html.fade needs an end value");
+  }
+
+  var anim = dojo.lfx.propertyAnimation(nodes, [ props ], duration, easing);
+  anim.connect("beforeBegin", function(){
+    dojo.lfx.html._makeFadeable(nodes);
+  });
+  if(callback){
+    anim.connect("onEnd", function(){ callback(nodes, anim); });
+  }
+
+  return anim; // dojo.lfx.Animation
 }
-pm=args.propertyMap=parr;
+
+dojo.lfx.html.fadeIn = function(/*DOMNode[]*/ nodes, /*int?*/ duration, /*Function?*/ easing, /*Function?*/ callback){
+  // summary: Returns an animation that will fade "nodes" from its current opacity to fully opaque.
+  // nodes: An array of DOMNodes or one DOMNode.
+  // duration: Duration of the animation in milliseconds.
+  // easing: An easing function.
+  // callback: Function to run at the end of the animation.
+  return dojo.lfx.html.fade(nodes, { end: 1 }, duration, easing, callback); // dojo.lfx.Animation
 }
-dojo.lang.forEach(pm,function(prop){
-if(dj_undef("start",prop)){
-if(prop.property!="opacity"){
-prop.start=parseInt(dojo.html.getComputedStyle(args.nodes[0],prop.property));
-}else{
-prop.start=dojo.html.getOpacity(args.nodes[0]);
+
+dojo.lfx.html.fadeOut = function(/*DOMNode[]*/ nodes, /*int?*/ duration, /*Function?*/ easing, /*Function?*/ callback){
+  // summary: Returns an animation that will fade "nodes" from its current opacity to fully transparent.
+  // nodes: An array of DOMNodes or one DOMNode.
+  // duration: Duration of the animation in milliseconds.
+  // easing: An easing function.
+  // callback: Function to run at the end of the animation. 
+  return dojo.lfx.html.fade(nodes, { end: 0 }, duration, easing, callback); // dojo.lfx.Animation
 }
+
+dojo.lfx.html.fadeShow = function(/*DOMNode[]*/ nodes, /*int?*/ duration, /*Function?*/ easing, /*Function?*/ callback){
+  // summary: Returns an animation that will fade "nodes" from transparent to opaque and shows
+  //      "nodes" at the end if it is hidden.
+  // nodes: An array of DOMNodes or one DOMNode.
+  // duration: Duration of the animation in milliseconds.
+  // easing: An easing function.
+  // callback: Function to run at the end of the animation. 
+  nodes=dojo.lfx.html._byId(nodes);
+  dojo.lang.forEach(nodes, function(node){
+    dojo.html.setOpacity(node, 0.0);
+  });
+
+  var anim = dojo.lfx.html.fadeIn(nodes, duration, easing, callback);
+  anim.connect("beforeBegin", function(){ 
+    if(dojo.lang.isArrayLike(nodes)){
+      dojo.lang.forEach(nodes, dojo.html.show);
+    }else{
+      dojo.html.show(nodes);
+    }
+  });
+
+  return anim; // dojo.lfx.Animation
 }
-});
+
+dojo.lfx.html.fadeHide = function(/*DOMNode[]*/ nodes, /*int?*/ duration, /*Function?*/ easing, /*Function?*/ callback){
+  // summary: Returns an animation that will fade "nodes" from its current opacity to opaque and hides
+  //      "nodes" at the end.
+  // nodes: An array of DOMNodes or one DOMNode.
+  // duration: Duration of the animation in milliseconds.
+  // easing: An easing function.
+  // callback: Function to run at the end of the animation.
+  var anim = dojo.lfx.html.fadeOut(nodes, duration, easing, function(){
+    if(dojo.lang.isArrayLike(nodes)){
+      dojo.lang.forEach(nodes, dojo.html.hide);
+    }else{
+      dojo.html.hide(nodes);
+    }
+    if(callback){ callback(nodes, anim); }
+  });
+  
+  return anim; // dojo.lfx.Animation
 }
-};
-var _3c7=function(_3c8){
-var _3c9=[];
-dojo.lang.forEach(_3c8,function(c){
-_3c9.push(Math.round(c));
-});
-return _3c9;
-};
-var _3cb=function(n,_3cd){
-n=dojo.byId(n);
-if(!n||!n.style){
-return;
+
+dojo.lfx.html.wipeIn = function(/*DOMNode[]*/ nodes, /*int?*/ duration, /*Function?*/ easing, /*Function?*/ callback){
+  // summary: Returns an animation that will show and wipe in "nodes".
+  // nodes: An array of DOMNodes or one DOMNode.
+  // duration: Duration of the animation in milliseconds.
+  // easing: An easing function.
+  // callback: Function to run at the end of the animation.
+  nodes = dojo.lfx.html._byId(nodes);
+  var anims = [];
+
+  dojo.lang.forEach(nodes, function(node){
+    var oprop = {  }; // old properties of node (before we mucked w/them)
+    
+    // get node height, either it's natural height or it's height specified via style or class attributes
+    // (for FF, the node has to be (temporarily) rendered to measure height)
+    dojo.html.show(node);
+    var height = dojo.html.getBorderBox(node).height;
+    dojo.html.hide(node);
+
+    var anim = dojo.lfx.propertyAnimation(node,
+      { "height": {
+          start: 1, // 0 causes IE to display the whole panel
+          end: function(){ return height; } 
+        }
+      }, 
+      duration, 
+      easing);
+  
+    anim.connect("beforeBegin", function(){
+      oprop.overflow = node.style.overflow;
+      oprop.height = node.style.height;
+      with(node.style){
+        overflow = "hidden";
+        height = "1px"; // 0 causes IE to display the whole panel
+      }
+      dojo.html.show(node);
+    });
+    
+    anim.connect("onEnd", function(){ 
+      with(node.style){
+        overflow = oprop.overflow;
+        height = oprop.height;
+      }
+      if(callback){ callback(node, anim); }
+    });
+    anims.push(anim);
+  });
+  
+  return dojo.lfx.combine(anims); // dojo.lfx.Combine
 }
-for(var s in _3cd){
-if(s=="opacity"){
-dojo.html.setOpacity(n,_3cd[s]);
-}else{
-n.style[s]=_3cd[s];
+
+dojo.lfx.html.wipeOut = function(/*DOMNode[]*/ nodes, /*int?*/ duration, /*Function?*/ easing, /*Function?*/ callback){
+  // summary: Returns an animation that will wipe out and hide "nodes".
+  // nodes: An array of DOMNodes or one DOMNode.
+  // duration: Duration of the animation in milliseconds.
+  // easing: An easing function.
+  // callback: Function to run at the end of the animation.
+  nodes = dojo.lfx.html._byId(nodes);
+  var anims = [];
+  
+  dojo.lang.forEach(nodes, function(node){
+    var oprop = {  }; // old properties of node (before we mucked w/them)
+    var anim = dojo.lfx.propertyAnimation(node,
+      { "height": {
+          start: function(){ return dojo.html.getContentBox(node).height; },
+          end: 1 // 0 causes IE to display the whole panel
+        } 
+      },
+      duration,
+      easing,
+      {
+        "beforeBegin": function(){
+          oprop.overflow = node.style.overflow;
+          oprop.height = node.style.height;
+          with(node.style){
+            overflow = "hidden";
+          }
+          dojo.html.show(node);
+        },
+        
+        "onEnd": function(){ 
+          dojo.html.hide(node);
+          with(node.style){
+            overflow = oprop.overflow;
+            height = oprop.height;
+          }
+          if(callback){ callback(node, anim); }
+        }
+      }
+    );
+    anims.push(anim);
+  });
+
+  return dojo.lfx.combine(anims); // dojo.lfx.Combine
 }
+
+dojo.lfx.html.slideTo = function(/*DOMNode*/ nodes,
+                 /*Object*/ coords,
+                 /*int?*/ duration,
+                 /*Function?*/ easing,
+                 /*Function?*/ callback){
+  // summary: Returns an animation that will slide "nodes" from its current position to
+  //      the position defined in "coords".
+  // nodes: An array of DOMNodes or one DOMNode.
+  // coords: { top: Decimal?, left: Decimal? }
+  // duration: Duration of the animation in milliseconds.
+  // easing: An easing function.
+  // callback: Function to run at the end of the animation.
+  nodes = dojo.lfx.html._byId(nodes);
+  var anims = [];
+  var compute = dojo.html.getComputedStyle;
+  
+  if(dojo.lang.isArray(coords)){
+    /* coords: Array
+       pId: a */
+    dojo.deprecated('dojo.lfx.html.slideTo(node, array)', 'use dojo.lfx.html.slideTo(node, {top: value, left: value});', '0.5');
+    coords = { top: coords[0], left: coords[1] };
+  }
+  dojo.lang.forEach(nodes, function(node){
+    var top = null;
+    var left = null;
+    
+    var init = (function(){
+      var innerNode = node;
+      return function(){
+        var pos = compute(innerNode, 'position');
+        top = (pos == 'absolute' ? node.offsetTop : parseInt(compute(node, 'top')) || 0);
+        left = (pos == 'absolute' ? node.offsetLeft : parseInt(compute(node, 'left')) || 0);
+
+        if (!dojo.lang.inArray(['absolute', 'relative'], pos)) {
+          var ret = dojo.html.abs(innerNode, true);
+          dojo.html.setStyleAttributes(innerNode, "position:absolute;top:"+ret.y+"px;left:"+ret.x+"px;");
+          top = ret.y;
+          left = ret.x;
+        }
+      }
+    })();
+    init();
+    
+    var anim = dojo.lfx.propertyAnimation(node,
+      { "top": { start: top, end: (coords.top||0) },
+        "left": { start: left, end: (coords.left||0)  }
+      },
+      duration,
+      easing,
+      { "beforeBegin": init }
+    );
+
+    if(callback){
+      anim.connect("onEnd", function(){ callback(nodes, anim); });
+    }
+
+    anims.push(anim);
+  });
+  
+  return dojo.lfx.combine(anims); // dojo.lfx.Combine
 }
-};
-var _3cf=function(_3d0){
-this._properties=_3d0;
-this.diffs=new Array(_3d0.length);
-dojo.lang.forEach(_3d0,function(prop,i){
-if(dojo.lang.isFunction(prop.start)){
-prop.start=prop.start(prop,i);
+
+dojo.lfx.html.slideBy = function(/*DOMNode*/ nodes, /*Object*/ coords, /*int?*/ duration, /*Function?*/ easing, /*Function?*/ callback){
+  // summary: Returns an animation that will slide "nodes" from its current position
+  //      to its current position plus the numbers defined in "coords".
+  // nodes: An array of DOMNodes or one DOMNode.
+  // coords: { top: Decimal?, left: Decimal? }
+  // duration: Duration of the animation in milliseconds.
+  // easing: An easing function.
+  // callback: Function to run at the end of the animation.
+  nodes = dojo.lfx.html._byId(nodes);
+  var anims = [];
+  var compute = dojo.html.getComputedStyle;
+
+  if(dojo.lang.isArray(coords)){
+    /* coords: Array
+       pId: a */
+    dojo.deprecated('dojo.lfx.html.slideBy(node, array)', 'use dojo.lfx.html.slideBy(node, {top: value, left: value});', '0.5');
+    coords = { top: coords[0], left: coords[1] };
+  }
+
+  dojo.lang.forEach(nodes, function(node){
+    var top = null;
+    var left = null;
+    
+    var init = (function(){
+      var innerNode = node;
+      return function(){
+        var pos = compute(innerNode, 'position');
+        top = (pos == 'absolute' ? node.offsetTop : parseInt(compute(node, 'top')) || 0);
+        left = (pos == 'absolute' ? node.offsetLeft : parseInt(compute(node, 'left')) || 0);
+
+        if (!dojo.lang.inArray(['absolute', 'relative'], pos)) {
+          var ret = dojo.html.abs(innerNode, true);
+          dojo.html.setStyleAttributes(innerNode, "position:absolute;top:"+ret.y+"px;left:"+ret.x+"px;");
+          top = ret.y;
+          left = ret.x;
+        }
+      }
+    })();
+    init();
+    
+    var anim = dojo.lfx.propertyAnimation(node,
+      {
+        "top": { start: top, end: top+(coords.top||0) },
+        "left": { start: left, end: left+(coords.left||0) }
+      },
+      duration,
+      easing).connect("beforeBegin", init);
+
+    if(callback){
+      anim.connect("onEnd", function(){ callback(nodes, anim); });
+    }
+
+    anims.push(anim);
+  });
+
+  return dojo.lfx.combine(anims); // dojo.lfx.Combine
 }
-if(dojo.lang.isFunction(prop.end)){
-prop.end=prop.end(prop,i);
+
+dojo.lfx.html.explode = function(/*DOMNode*/ start,
+                 /*DOMNode*/ endNode,
+                 /*int?*/ duration,
+                 /*Function?*/ easing,
+                 /*Function?*/ callback){
+  // summary: Returns an animation that will 
+  // start:
+  // endNode:
+  // duration: Duration of the animation in milliseconds.
+  // easing: An easing function.
+  // callback: Function to run at the end of the animation.
+  var h = dojo.html;
+  start = dojo.byId(start);
+  endNode = dojo.byId(endNode);
+  var startCoords = h.toCoordinateObject(start, true);
+  var outline = document.createElement("div");
+  h.copyStyle(outline, endNode);
+  if (endNode.explodeClassName) { outline.className = endNode.explodeClassName; }
+  with(outline.style){
+    position = "absolute";
+    display = "none";
+    // border = "1px solid black";
+  }
+  dojo.body().appendChild(outline);
+
+  with(endNode.style){
+    visibility = "hidden";
+    display = "block";
+  }
+  var endCoords = h.toCoordinateObject(endNode, true);
+  with(endNode.style){
+    display = "none";
+    visibility = "visible";
+  }
+
+  var props = { opacity: { start: 0.5, end: 1.0 } };
+  dojo.lang.forEach(["height", "width", "top", "left"], function(type){
+    props[type] = { start: startCoords[type], end: endCoords[type] }
+  });
+  
+  var anim = new dojo.lfx.propertyAnimation(outline, 
+    props,
+    duration,
+    easing,
+    {
+      "beforeBegin": function(){
+        h.setDisplay(outline, "block");
+      },
+      "onEnd": function(){
+        h.setDisplay(endNode, "block");
+        outline.parentNode.removeChild(outline);
+      }
+    }
+  );
+
+  if(callback){
+    anim.connect("onEnd", function(){ callback(endNode, anim); });
+  }
+  return anim; // dojo.lfx.Animation
 }
-if(dojo.lang.isArray(prop.start)){
-this.diffs[i]=null;
-}else{
-if(prop.start instanceof dojo.gfx.color.Color){
-prop.startRgb=prop.start.toRgb();
-prop.endRgb=prop.end.toRgb();
-}else{
-this.diffs[i]=prop.end-prop.start;
+
+dojo.lfx.html.implode = function(/*DOMNode*/ startNode,
+                 /*DOMNode*/ end,
+                 /*int?*/ duration,
+                 /*Function?*/ easing,
+                 /*Function?*/ callback){
+  // summary: Returns an animation that will 
+  // startNode:
+  // end:
+  // duration: Duration of the animation in milliseconds.
+  // easing: An easing function.
+  // callback: Function to run at the end of the animation.
+  var h = dojo.html;
+  startNode = dojo.byId(startNode);
+  end = dojo.byId(end);
+  var startCoords = dojo.html.toCoordinateObject(startNode, true);
+  var endCoords = dojo.html.toCoordinateObject(end, true);
+
+  var outline = document.createElement("div");
+  dojo.html.copyStyle(outline, startNode);
+  if (startNode.explodeClassName) { outline.className = startNode.explodeClassName; }
+  dojo.html.setOpacity(outline, 0.3);
+  with(outline.style){
+    position = "absolute";
+    display = "none";
+    backgroundColor = h.getStyle(startNode, "background-color").toLowerCase();
+  }
+  dojo.body().appendChild(outline);
+
+  var props = { opacity: { start: 1.0, end: 0.5 } };
+  dojo.lang.forEach(["height", "width", "top", "left"], function(type){
+    props[type] = { start: startCoords[type], end: endCoords[type] }
+  });
+  
+  var anim = new dojo.lfx.propertyAnimation(outline,
+    props,
+    duration,
+    easing,
+    {
+      "beforeBegin": function(){
+        dojo.html.hide(startNode);
+        dojo.html.show(outline);
+      },
+      "onEnd": function(){
+        outline.parentNode.removeChild(outline);
+      }
+    }
+  );
+
+  if(callback){
+    anim.connect("onEnd", function(){ callback(startNode, anim); });
+  }
+  return anim; // dojo.lfx.Animation
 }
+
+dojo.lfx.html.highlight = function(/*DOMNode[]*/ nodes,
+                   /*dojo.gfx.color.Color*/ startColor,
+                   /*int?*/ duration,
+                   /*Function?*/ easing,
+                   /*Function?*/ callback){
+  // summary: Returns an animation that will set the background color
+  //      of "nodes" to startColor and transition it to "nodes"
+  //      original color.
+  // startColor: Color to transition from.
+  // duration: Duration of the animation in milliseconds.
+  // easing: An easing function.
+  // callback: Function to run at the end of the animation.
+  nodes = dojo.lfx.html._byId(nodes);
+  var anims = [];
+
+  dojo.lang.forEach(nodes, function(node){
+    var color = dojo.html.getBackgroundColor(node);
+    var bg = dojo.html.getStyle(node, "background-color").toLowerCase();
+    var bgImage = dojo.html.getStyle(node, "background-image");
+    var wasTransparent = (bg == "transparent" || bg == "rgba(0, 0, 0, 0)");
+    while(color.length > 3) { color.pop(); }
+
+    var rgb = new dojo.gfx.color.Color(startColor);
+    var endRgb = new dojo.gfx.color.Color(color);
+
+    var anim = dojo.lfx.propertyAnimation(node, 
+      { "background-color": { start: rgb, end: endRgb } }, 
+      duration, 
+      easing,
+      {
+        "beforeBegin": function(){ 
+          if(bgImage){
+            node.style.backgroundImage = "none";
+          }
+          node.style.backgroundColor = "rgb(" + rgb.toRgb().join(",") + ")";
+        },
+        "onEnd": function(){ 
+          if(bgImage){
+            node.style.backgroundImage = bgImage;
+          }
+          if(wasTransparent){
+            node.style.backgroundColor = "transparent";
+          }
+          if(callback){
+            callback(node, anim);
+          }
+        }
+      }
+    );
+
+    anims.push(anim);
+  });
+  return dojo.lfx.combine(anims); // dojo.lfx.Combine
 }
-},this);
-this.getValue=function(n){
-var ret={};
-dojo.lang.forEach(this._properties,function(prop,i){
-var _3d7=null;
-if(dojo.lang.isArray(prop.start)){
-}else{
-if(prop.start instanceof dojo.gfx.color.Color){
-_3d7=(prop.units||"rgb")+"(";
-for(var j=0;j<prop.startRgb.length;j++){
-_3d7+=Math.round(((prop.endRgb[j]-prop.startRgb[j])*n)+prop.startRgb[j])+(j<prop.startRgb.length-1?",":"");
+
+dojo.lfx.html.unhighlight = function(/*DOMNode[]*/ nodes,
+                   /*dojo.gfx.color.Color*/ endColor,
+                   /*int?*/ duration,
+                   /*Function?*/ easing,
+                   /*Function?*/ callback){
+  // summary: Returns an animation that will transition "nodes" background color
+  //      from its current color to "endColor".
+  // endColor: Color to transition to.
+  // duration: Duration of the animation in milliseconds.
+  // easing: An easing function.
+  // callback: Function to run at the end of the animation.
+  nodes = dojo.lfx.html._byId(nodes);
+  var anims = [];
+
+  dojo.lang.forEach(nodes, function(node){
+    var color = new dojo.gfx.color.Color(dojo.html.getBackgroundColor(node));
+    var rgb = new dojo.gfx.color.Color(endColor);
+
+    var bgImage = dojo.html.getStyle(node, "background-image");
+    
+    var anim = dojo.lfx.propertyAnimation(node, 
+      { "background-color": { start: color, end: rgb } },
+      duration, 
+      easing,
+      {
+        "beforeBegin": function(){ 
+          if(bgImage){
+            node.style.backgroundImage = "none";
+          }
+          node.style.backgroundColor = "rgb(" + color.toRgb().join(",") + ")";
+        },
+        "onEnd": function(){ 
+          if(callback){
+            callback(node, anim);
+          }
+        }
+      }
+    );
+    anims.push(anim);
+  });
+  return dojo.lfx.combine(anims); // dojo.lfx.Combine
 }
-_3d7+=")";
-}else{
-_3d7=((this.diffs[i])*n)+prop.start+(prop.property!="opacity"?prop.units||"px":"");
-}
-}
-ret[dojo.html.toCamelCase(prop.property)]=_3d7;
-},this);
-return ret;
-};
-};
-var anim=new dojo.lfx.Animation({beforeBegin:function(){
-_3c1(_3c0);
-anim.curve=new _3cf(_3c0.propertyMap);
-},onAnimate:function(_3da){
-dojo.lang.forEach(_3c0.nodes,function(node){
-_3cb(node,_3da);
-});
-}},_3c0.duration,null,_3c0.easing);
-if(_3bf){
-for(var x in _3bf){
-if(dojo.lang.isFunction(_3bf[x])){
-anim.connect(x,anim,_3bf[x]);
-}
-}
-}
-return anim;
-};
-dojo.lfx.html._makeFadeable=function(_3dd){
-var _3de=function(node){
-if(dojo.render.html.ie){
-if((node.style.zoom.length==0)&&(dojo.html.getStyle(node,"zoom")=="normal")){
-node.style.zoom="1";
-}
-if((node.style.width.length==0)&&(dojo.html.getStyle(node,"width")=="auto")){
-node.style.width="auto";
-}
-}
-};
-if(dojo.lang.isArrayLike(_3dd)){
-dojo.lang.forEach(_3dd,_3de);
-}else{
-_3de(_3dd);
-}
-};
-dojo.lfx.html.fade=function(_3e0,_3e1,_3e2,_3e3,_3e4){
-_3e0=dojo.lfx.html._byId(_3e0);
-var _3e5={property:"opacity"};
-if(!dj_undef("start",_3e1)){
-_3e5.start=_3e1.start;
-}else{
-_3e5.start=function(){
-return dojo.html.getOpacity(_3e0[0]);
-};
-}
-if(!dj_undef("end",_3e1)){
-_3e5.end=_3e1.end;
-}else{
-dojo.raise("dojo.lfx.html.fade needs an end value");
-}
-var anim=dojo.lfx.propertyAnimation(_3e0,[_3e5],_3e2,_3e3);
-anim.connect("beforeBegin",function(){
-dojo.lfx.html._makeFadeable(_3e0);
-});
-if(_3e4){
-anim.connect("onEnd",function(){
-_3e4(_3e0,anim);
-});
-}
-return anim;
-};
-dojo.lfx.html.fadeIn=function(_3e7,_3e8,_3e9,_3ea){
-return dojo.lfx.html.fade(_3e7,{end:1},_3e8,_3e9,_3ea);
-};
-dojo.lfx.html.fadeOut=function(_3eb,_3ec,_3ed,_3ee){
-return dojo.lfx.html.fade(_3eb,{end:0},_3ec,_3ed,_3ee);
-};
-dojo.lfx.html.fadeShow=function(_3ef,_3f0,_3f1,_3f2){
-_3ef=dojo.lfx.html._byId(_3ef);
-dojo.lang.forEach(_3ef,function(node){
-dojo.html.setOpacity(node,0);
-});
-var anim=dojo.lfx.html.fadeIn(_3ef,_3f0,_3f1,_3f2);
-anim.connect("beforeBegin",function(){
-if(dojo.lang.isArrayLike(_3ef)){
-dojo.lang.forEach(_3ef,dojo.html.show);
-}else{
-dojo.html.show(_3ef);
-}
-});
-return anim;
-};
-dojo.lfx.html.fadeHide=function(_3f5,_3f6,_3f7,_3f8){
-var anim=dojo.lfx.html.fadeOut(_3f5,_3f6,_3f7,function(){
-if(dojo.lang.isArrayLike(_3f5)){
-dojo.lang.forEach(_3f5,dojo.html.hide);
-}else{
-dojo.html.hide(_3f5);
-}
-if(_3f8){
-_3f8(_3f5,anim);
-}
-});
-return anim;
-};
-dojo.lfx.html.wipeIn=function(_3fa,_3fb,_3fc,_3fd){
-_3fa=dojo.lfx.html._byId(_3fa);
-var _3fe=[];
-dojo.lang.forEach(_3fa,function(node){
-var _400={};
-dojo.html.show(node);
-var _401=dojo.html.getBorderBox(node).height;
-dojo.html.hide(node);
-var anim=dojo.lfx.propertyAnimation(node,{"height":{start:1,end:function(){
-return _401;
-}}},_3fb,_3fc);
-anim.connect("beforeBegin",function(){
-_400.overflow=node.style.overflow;
-_400.height=node.style.height;
-with(node.style){
-overflow="hidden";
-_401="1px";
-}
-dojo.html.show(node);
-});
-anim.connect("onEnd",function(){
-with(node.style){
-overflow=_400.overflow;
-_401=_400.height;
-}
-if(_3fd){
-_3fd(node,anim);
-}
-});
-_3fe.push(anim);
-});
-return dojo.lfx.combine(_3fe);
-};
-dojo.lfx.html.wipeOut=function(_403,_404,_405,_406){
-_403=dojo.lfx.html._byId(_403);
-var _407=[];
-dojo.lang.forEach(_403,function(node){
-var _409={};
-var anim=dojo.lfx.propertyAnimation(node,{"height":{start:function(){
-return dojo.html.getContentBox(node).height;
-},end:1}},_404,_405,{"beforeBegin":function(){
-_409.overflow=node.style.overflow;
-_409.height=node.style.height;
-with(node.style){
-overflow="hidden";
-}
-dojo.html.show(node);
-},"onEnd":function(){
-dojo.html.hide(node);
-with(node.style){
-overflow=_409.overflow;
-height=_409.height;
-}
-if(_406){
-_406(node,anim);
-}
-}});
-_407.push(anim);
-});
-return dojo.lfx.combine(_407);
-};
-dojo.lfx.html.slideTo=function(_40b,_40c,_40d,_40e,_40f){
-_40b=dojo.lfx.html._byId(_40b);
-var _410=[];
-var _411=dojo.html.getComputedStyle;
-if(dojo.lang.isArray(_40c)){
-dojo.deprecated("dojo.lfx.html.slideTo(node, array)","use dojo.lfx.html.slideTo(node, {top: value, left: value});","0.5");
-_40c={top:_40c[0],left:_40c[1]};
-}
-dojo.lang.forEach(_40b,function(node){
-var top=null;
-var left=null;
-var init=(function(){
-var _416=node;
-return function(){
-var pos=_411(_416,"position");
-top=(pos=="absolute"?node.offsetTop:parseInt(_411(node,"top"))||0);
-left=(pos=="absolute"?node.offsetLeft:parseInt(_411(node,"left"))||0);
-if(!dojo.lang.inArray(["absolute","relative"],pos)){
-var ret=dojo.html.abs(_416,true);
-dojo.html.setStyleAttributes(_416,"position:absolute;top:"+ret.y+"px;left:"+ret.x+"px;");
-top=ret.y;
-left=ret.x;
-}
-};
-})();
-init();
-var anim=dojo.lfx.propertyAnimation(node,{"top":{start:top,end:(_40c.top||0)},"left":{start:left,end:(_40c.left||0)}},_40d,_40e,{"beforeBegin":init});
-if(_40f){
-anim.connect("onEnd",function(){
-_40f(_40b,anim);
-});
-}
-_410.push(anim);
-});
-return dojo.lfx.combine(_410);
-};
-dojo.lfx.html.slideBy=function(_41a,_41b,_41c,_41d,_41e){
-_41a=dojo.lfx.html._byId(_41a);
-var _41f=[];
-var _420=dojo.html.getComputedStyle;
-if(dojo.lang.isArray(_41b)){
-dojo.deprecated("dojo.lfx.html.slideBy(node, array)","use dojo.lfx.html.slideBy(node, {top: value, left: value});","0.5");
-_41b={top:_41b[0],left:_41b[1]};
-}
-dojo.lang.forEach(_41a,function(node){
-var top=null;
-var left=null;
-var init=(function(){
-var _425=node;
-return function(){
-var pos=_420(_425,"position");
-top=(pos=="absolute"?node.offsetTop:parseInt(_420(node,"top"))||0);
-left=(pos=="absolute"?node.offsetLeft:parseInt(_420(node,"left"))||0);
-if(!dojo.lang.inArray(["absolute","relative"],pos)){
-var ret=dojo.html.abs(_425,true);
-dojo.html.setStyleAttributes(_425,"position:absolute;top:"+ret.y+"px;left:"+ret.x+"px;");
-top=ret.y;
-left=ret.x;
-}
-};
-})();
-init();
-var anim=dojo.lfx.propertyAnimation(node,{"top":{start:top,end:top+(_41b.top||0)},"left":{start:left,end:left+(_41b.left||0)}},_41c,_41d).connect("beforeBegin",init);
-if(_41e){
-anim.connect("onEnd",function(){
-_41e(_41a,anim);
-});
-}
-_41f.push(anim);
-});
-return dojo.lfx.combine(_41f);
-};
-dojo.lfx.html.explode=function(_429,_42a,_42b,_42c,_42d){
-var h=dojo.html;
-_429=dojo.byId(_429);
-_42a=dojo.byId(_42a);
-var _42f=h.toCoordinateObject(_429,true);
-var _430=document.createElement("div");
-h.copyStyle(_430,_42a);
-if(_42a.explodeClassName){
-_430.className=_42a.explodeClassName;
-}
-with(_430.style){
-position="absolute";
-display="none";
-}
-dojo.body().appendChild(_430);
-with(_42a.style){
-visibility="hidden";
-display="block";
-}
-var _431=h.toCoordinateObject(_42a,true);
-with(_42a.style){
-display="none";
-visibility="visible";
-}
-var _432={opacity:{start:0.5,end:1}};
-dojo.lang.forEach(["height","width","top","left"],function(type){
-_432[type]={start:_42f[type],end:_431[type]};
-});
-var anim=new dojo.lfx.propertyAnimation(_430,_432,_42b,_42c,{"beforeBegin":function(){
-h.setDisplay(_430,"block");
-},"onEnd":function(){
-h.setDisplay(_42a,"block");
-_430.parentNode.removeChild(_430);
-}});
-if(_42d){
-anim.connect("onEnd",function(){
-_42d(_42a,anim);
-});
-}
-return anim;
-};
-dojo.lfx.html.implode=function(_435,end,_437,_438,_439){
-var h=dojo.html;
-_435=dojo.byId(_435);
-end=dojo.byId(end);
-var _43b=dojo.html.toCoordinateObject(_435,true);
-var _43c=dojo.html.toCoordinateObject(end,true);
-var _43d=document.createElement("div");
-dojo.html.copyStyle(_43d,_435);
-if(_435.explodeClassName){
-_43d.className=_435.explodeClassName;
-}
-dojo.html.setOpacity(_43d,0.3);
-with(_43d.style){
-position="absolute";
-display="none";
-backgroundColor=h.getStyle(_435,"background-color").toLowerCase();
-}
-dojo.body().appendChild(_43d);
-var _43e={opacity:{start:1,end:0.5}};
-dojo.lang.forEach(["height","width","top","left"],function(type){
-_43e[type]={start:_43b[type],end:_43c[type]};
-});
-var anim=new dojo.lfx.propertyAnimation(_43d,_43e,_437,_438,{"beforeBegin":function(){
-dojo.html.hide(_435);
-dojo.html.show(_43d);
-},"onEnd":function(){
-_43d.parentNode.removeChild(_43d);
-}});
-if(_439){
-anim.connect("onEnd",function(){
-_439(_435,anim);
-});
-}
-return anim;
-};
-dojo.lfx.html.highlight=function(_441,_442,_443,_444,_445){
-_441=dojo.lfx.html._byId(_441);
-var _446=[];
-dojo.lang.forEach(_441,function(node){
-var _448=dojo.html.getBackgroundColor(node);
-var bg=dojo.html.getStyle(node,"background-color").toLowerCase();
-var _44a=dojo.html.getStyle(node,"background-image");
-var _44b=(bg=="transparent"||bg=="rgba(0, 0, 0, 0)");
-while(_448.length>3){
-_448.pop();
-}
-var rgb=new dojo.gfx.color.Color(_442);
-var _44d=new dojo.gfx.color.Color(_448);
-var anim=dojo.lfx.propertyAnimation(node,{"background-color":{start:rgb,end:_44d}},_443,_444,{"beforeBegin":function(){
-if(_44a){
-node.style.backgroundImage="none";
-}
-node.style.backgroundColor="rgb("+rgb.toRgb().join(",")+")";
-},"onEnd":function(){
-if(_44a){
-node.style.backgroundImage=_44a;
-}
-if(_44b){
-node.style.backgroundColor="transparent";
-}
-if(_445){
-_445(node,anim);
-}
-}});
-_446.push(anim);
-});
-return dojo.lfx.combine(_446);
-};
-dojo.lfx.html.unhighlight=function(_44f,_450,_451,_452,_453){
-_44f=dojo.lfx.html._byId(_44f);
-var _454=[];
-dojo.lang.forEach(_44f,function(node){
-var _456=new dojo.gfx.color.Color(dojo.html.getBackgroundColor(node));
-var rgb=new dojo.gfx.color.Color(_450);
-var _458=dojo.html.getStyle(node,"background-image");
-var anim=dojo.lfx.propertyAnimation(node,{"background-color":{start:_456,end:rgb}},_451,_452,{"beforeBegin":function(){
-if(_458){
-node.style.backgroundImage="none";
-}
-node.style.backgroundColor="rgb("+_456.toRgb().join(",")+")";
-},"onEnd":function(){
-if(_453){
-_453(node,anim);
-}
-}});
-_454.push(anim);
-});
-return dojo.lfx.combine(_454);
-};
-dojo.lang.mixin(dojo.lfx,dojo.lfx.html);
+
+dojo.lang.mixin(dojo.lfx, dojo.lfx.html);
+
 dojo.provide("dojo.lfx.*");
 dojo.provide("dojo.lang.extras");
-dojo.lang.setTimeout=function(func,_45b){
-var _45c=window,_45d=2;
-if(!dojo.lang.isFunction(func)){
-_45c=func;
-func=_45b;
-_45b=arguments[2];
-_45d++;
+
+
+dojo.lang.setTimeout = function(/*Function*/func, /*int*/delay /*, ...*/){
+  // summary:
+  //  Sets a timeout in milliseconds to execute a function in a given context
+  //  with optional arguments.
+  //
+  // usage:
+  //  setTimeout (Object context, function func, number delay[, arg1[, ...]]);
+  //  setTimeout (function func, number delay[, arg1[, ...]]);
+
+  var context = window, argsStart = 2;
+  if(!dojo.lang.isFunction(func)){
+    context = func;
+    func = delay;
+    delay = arguments[2];
+    argsStart++;
+  }
+
+  if(dojo.lang.isString(func)){
+    func = context[func];
+  }
+  
+  var args = [];
+  for (var i = argsStart; i < arguments.length; i++){
+    args.push(arguments[i]);
+  }
+  return dojo.global().setTimeout(function () { func.apply(context, args); }, delay); // int
 }
-if(dojo.lang.isString(func)){
-func=_45c[func];
+
+dojo.lang.clearTimeout = function(/*int*/timer){
+  // summary: clears timer by number from the execution queue
+  dojo.global().clearTimeout(timer);
 }
-var args=[];
-for(var i=_45d;i<arguments.length;i++){
-args.push(arguments[i]);
+
+dojo.lang.getNameInObj = function(/*Object*/ns, /*unknown*/item){
+  // summary: looks for a value in the object ns with a value matching item and returns the property name
+  // ns: if null, dj_global is used
+  // item: value to match
+  if(!ns){ ns = dj_global; }
+
+  for(var x in ns){
+    if(ns[x] === item){
+      return new String(x); // String
+    }
+  }
+  return null; // null
 }
-return dojo.global().setTimeout(function(){
-func.apply(_45c,args);
-},_45b);
-};
-dojo.lang.clearTimeout=function(_460){
-dojo.global().clearTimeout(_460);
-};
-dojo.lang.getNameInObj=function(ns,item){
-if(!ns){
-ns=dj_global;
+
+dojo.lang.shallowCopy = function(/*Object*/obj, /*Boolean?*/deep){
+  // summary: copies object obj one level deep, or full depth if deep is true
+  var i, ret; 
+
+  if(obj === null){ /*obj: null*/ return null; } // null
+  
+  if(dojo.lang.isObject(obj)){
+    // obj: Object  
+    ret = new obj.constructor();
+    for(i in obj){
+      if(dojo.lang.isUndefined(ret[i])){
+        ret[i] = deep ? dojo.lang.shallowCopy(obj[i], deep) : obj[i];
+      }
+    }
+  } else if(dojo.lang.isArray(obj)){
+    // obj: Array
+    ret = [];
+    for(i=0; i<obj.length; i++){
+      ret[i] = deep ? dojo.lang.shallowCopy(obj[i], deep) : obj[i];
+    }
+  } else {
+    // obj: unknown
+    ret = obj;
+  }
+
+  return ret; // unknown
 }
-for(var x in ns){
-if(ns[x]===item){
-return new String(x);
+
+dojo.lang.firstValued = function(/* ... */){
+  // summary: Return the first argument that isn't undefined
+
+  for(var i = 0; i < arguments.length; i++){
+    if(typeof arguments[i] != "undefined"){
+      return arguments[i]; // unknown
+    }
+  }
+  return undefined; // undefined
 }
+
+dojo.lang.getObjPathValue = function(/*String*/objpath, /*Object?*/context, /*Boolean?*/create){
+  // summary:
+  //  Gets a value from a reference specified as a string descriptor,
+  //  (e.g. "A.B") in the given context.
+  //
+  // context: if not specified, dj_global is used
+  // create: if true, undefined objects in the path are created.
+
+  with(dojo.parseObjPath(objpath, context, create)){
+    return dojo.evalProp(prop, obj, create); // unknown
+  }
 }
-return null;
-};
-dojo.lang.shallowCopy=function(obj,deep){
-var i,ret;
-if(obj===null){
-return null;
+
+dojo.lang.setObjPathValue = function(/*String*/objpath, /*unknown*/value, /*Object?*/context, /*Boolean?*/create){
+  // summary:
+  //  Sets a value on a reference specified as a string descriptor. 
+  //  (e.g. "A.B") in the given context.
+  //
+  //  context: if not specified, dj_global is used
+  //  create: if true, undefined objects in the path are created.
+
+  if(arguments.length < 4){
+    create = true;
+  }
+  with(dojo.parseObjPath(objpath, context, create)){
+    if(obj && (create || (prop in obj))){
+      obj[prop] = value;
+    }
+  }
 }
-if(dojo.lang.isObject(obj)){
-ret=new obj.constructor();
-for(i in obj){
-if(dojo.lang.isUndefined(ret[i])){
-ret[i]=deep?dojo.lang.shallowCopy(obj[i],deep):obj[i];
-}
-}
-}else{
-if(dojo.lang.isArray(obj)){
-ret=[];
-for(i=0;i<obj.length;i++){
-ret[i]=deep?dojo.lang.shallowCopy(obj[i],deep):obj[i];
-}
-}else{
-ret=obj;
-}
-}
-return ret;
-};
-dojo.lang.firstValued=function(){
-for(var i=0;i<arguments.length;i++){
-if(typeof arguments[i]!="undefined"){
-return arguments[i];
-}
-}
-return undefined;
-};
-dojo.lang.getObjPathValue=function(_469,_46a,_46b){
-with(dojo.parseObjPath(_469,_46a,_46b)){
-return dojo.evalProp(prop,obj,_46b);
-}
-};
-dojo.lang.setObjPathValue=function(_46c,_46d,_46e,_46f){
-if(arguments.length<4){
-_46f=true;
-}
-with(dojo.parseObjPath(_46c,_46e,_46f)){
-if(obj&&(_46f||(prop in obj))){
-obj[prop]=_46d;
-}
-}
-};
+
 dojo.provide("dojo.event.common");
-dojo.event=new function(){
-this._canTimeout=dojo.lang.isFunction(dj_global["setTimeout"])||dojo.lang.isAlien(dj_global["setTimeout"]);
-function interpolateArgs(args,_471){
-var dl=dojo.lang;
-var ao={srcObj:dj_global,srcFunc:null,adviceObj:dj_global,adviceFunc:null,aroundObj:null,aroundFunc:null,adviceType:(args.length>2)?args[0]:"after",precedence:"last",once:false,delay:null,rate:0,adviceMsg:false};
-switch(args.length){
-case 0:
-return;
-case 1:
-return;
-case 2:
-ao.srcFunc=args[0];
-ao.adviceFunc=args[1];
-break;
-case 3:
-if((dl.isObject(args[0]))&&(dl.isString(args[1]))&&(dl.isString(args[2]))){
-ao.adviceType="after";
-ao.srcObj=args[0];
-ao.srcFunc=args[1];
-ao.adviceFunc=args[2];
-}else{
-if((dl.isString(args[1]))&&(dl.isString(args[2]))){
-ao.srcFunc=args[1];
-ao.adviceFunc=args[2];
-}else{
-if((dl.isObject(args[0]))&&(dl.isString(args[1]))&&(dl.isFunction(args[2]))){
-ao.adviceType="after";
-ao.srcObj=args[0];
-ao.srcFunc=args[1];
-var _474=dl.nameAnonFunc(args[2],ao.adviceObj,_471);
-ao.adviceFunc=_474;
-}else{
-if((dl.isFunction(args[0]))&&(dl.isObject(args[1]))&&(dl.isString(args[2]))){
-ao.adviceType="after";
-ao.srcObj=dj_global;
-var _474=dl.nameAnonFunc(args[0],ao.srcObj,_471);
-ao.srcFunc=_474;
-ao.adviceObj=args[1];
-ao.adviceFunc=args[2];
+
+
+// TODO: connection filter functions
+//      these are functions that accept a method invocation (like around
+//      advice) and return a boolean based on it. That value determines
+//      whether or not the connection proceeds. It could "feel" like around
+//      advice for those who know what it is (calling proceed() or not),
+//      but I think presenting it as a "filter" and/or calling it with the
+//      function args and not the MethodInvocation might make it more
+//      palletable to "normal" users than around-advice currently is
+// TODO: execution scope mangling
+//      YUI's event facility by default executes listeners in the context
+//      of the source object. This is very odd, but should probably be
+//      supported as an option (both for the source and for the dest). It
+//      can be thought of as a connection-specific hitch().
+// TODO: more resiliency for 4+ arguments to connect()
+
+dojo.event = new function(){
+  this._canTimeout = dojo.lang.isFunction(dj_global["setTimeout"])||dojo.lang.isAlien(dj_global["setTimeout"]);
+
+  // FIXME: where should we put this method (not here!)?
+  function interpolateArgs(args, searchForNames){
+    var dl = dojo.lang;
+    var ao = {
+      srcObj: dj_global,
+      srcFunc: null,
+      adviceObj: dj_global,
+      adviceFunc: null,
+      aroundObj: null,
+      aroundFunc: null,
+      adviceType: (args.length>2) ? args[0] : "after",
+      precedence: "last",
+      once: false,
+      delay: null,
+      rate: 0,
+      adviceMsg: false
+    };
+
+    switch(args.length){
+      case 0: return;
+      case 1: return;
+      case 2:
+        ao.srcFunc = args[0];
+        ao.adviceFunc = args[1];
+        break;
+      case 3:
+        if((dl.isObject(args[0]))&&(dl.isString(args[1]))&&(dl.isString(args[2]))){
+          ao.adviceType = "after";
+          ao.srcObj = args[0];
+          ao.srcFunc = args[1];
+          ao.adviceFunc = args[2];
+        }else if((dl.isString(args[1]))&&(dl.isString(args[2]))){
+          ao.srcFunc = args[1];
+          ao.adviceFunc = args[2];
+        }else if((dl.isObject(args[0]))&&(dl.isString(args[1]))&&(dl.isFunction(args[2]))){
+          ao.adviceType = "after";
+          ao.srcObj = args[0];
+          ao.srcFunc = args[1];
+          var tmpName  = dl.nameAnonFunc(args[2], ao.adviceObj, searchForNames);
+          ao.adviceFunc = tmpName;
+        }else if((dl.isFunction(args[0]))&&(dl.isObject(args[1]))&&(dl.isString(args[2]))){
+          ao.adviceType = "after";
+          ao.srcObj = dj_global;
+          var tmpName  = dl.nameAnonFunc(args[0], ao.srcObj, searchForNames);
+          ao.srcFunc = tmpName;
+          ao.adviceObj = args[1];
+          ao.adviceFunc = args[2];
+        }
+        break;
+      case 4:
+        if((dl.isObject(args[0]))&&(dl.isObject(args[2]))){
+          // we can assume that we've got an old-style "connect" from
+          // the sigslot school of event attachment. We therefore
+          // assume after-advice.
+          ao.adviceType = "after";
+          ao.srcObj = args[0];
+          ao.srcFunc = args[1];
+          ao.adviceObj = args[2];
+          ao.adviceFunc = args[3];
+        }else if((dl.isString(args[0]))&&(dl.isString(args[1]))&&(dl.isObject(args[2]))){
+          ao.adviceType = args[0];
+          ao.srcObj = dj_global;
+          ao.srcFunc = args[1];
+          ao.adviceObj = args[2];
+          ao.adviceFunc = args[3];
+        }else if((dl.isString(args[0]))&&(dl.isFunction(args[1]))&&(dl.isObject(args[2]))){
+          ao.adviceType = args[0];
+          ao.srcObj = dj_global;
+          var tmpName  = dl.nameAnonFunc(args[1], dj_global, searchForNames);
+          ao.srcFunc = tmpName;
+          ao.adviceObj = args[2];
+          ao.adviceFunc = args[3];
+        }else if((dl.isString(args[0]))&&(dl.isObject(args[1]))&&(dl.isString(args[2]))&&(dl.isFunction(args[3]))){
+          ao.srcObj = args[1];
+          ao.srcFunc = args[2];
+          var tmpName  = dl.nameAnonFunc(args[3], dj_global, searchForNames);
+          ao.adviceObj = dj_global;
+          ao.adviceFunc = tmpName;
+        }else if(dl.isObject(args[1])){
+          ao.srcObj = args[1];
+          ao.srcFunc = args[2];
+          ao.adviceObj = dj_global;
+          ao.adviceFunc = args[3];
+        }else if(dl.isObject(args[2])){
+          ao.srcObj = dj_global;
+          ao.srcFunc = args[1];
+          ao.adviceObj = args[2];
+          ao.adviceFunc = args[3];
+        }else{
+          ao.srcObj = ao.adviceObj = ao.aroundObj = dj_global;
+          ao.srcFunc = args[1];
+          ao.adviceFunc = args[2];
+          ao.aroundFunc = args[3];
+        }
+        break;
+      case 6:
+        ao.srcObj = args[1];
+        ao.srcFunc = args[2];
+        ao.adviceObj = args[3]
+        ao.adviceFunc = args[4];
+        ao.aroundFunc = args[5];
+        ao.aroundObj = dj_global;
+        break;
+      default:
+        ao.srcObj = args[1];
+        ao.srcFunc = args[2];
+        ao.adviceObj = args[3]
+        ao.adviceFunc = args[4];
+        ao.aroundObj = args[5];
+        ao.aroundFunc = args[6];
+        ao.once = args[7];
+        ao.delay = args[8];
+        ao.rate = args[9];
+        ao.adviceMsg = args[10];
+        break;
+    }
+
+    if(dl.isFunction(ao.aroundFunc)){
+      var tmpName  = dl.nameAnonFunc(ao.aroundFunc, ao.aroundObj, searchForNames);
+      ao.aroundFunc = tmpName;
+    }
+
+    if(dl.isFunction(ao.srcFunc)){
+      ao.srcFunc = dl.getNameInObj(ao.srcObj, ao.srcFunc);
+    }
+
+    if(dl.isFunction(ao.adviceFunc)){
+      ao.adviceFunc = dl.getNameInObj(ao.adviceObj, ao.adviceFunc);
+    }
+
+    if((ao.aroundObj)&&(dl.isFunction(ao.aroundFunc))){
+      ao.aroundFunc = dl.getNameInObj(ao.aroundObj, ao.aroundFunc);
+    }
+
+    if(!ao.srcObj){
+      dojo.raise("bad srcObj for srcFunc: "+ao.srcFunc);
+    }
+    if(!ao.adviceObj){
+      dojo.raise("bad adviceObj for adviceFunc: "+ao.adviceFunc);
+    }
+    
+    if(!ao.adviceFunc){
+      dojo.debug("bad adviceFunc for srcFunc: "+ao.srcFunc);
+      dojo.debugShallow(ao);
+    } 
+    
+    return ao;
+  }
+
+  this.connect = function(/*...*/){
+    // summary:
+    //    dojo.event.connect is the glue that holds most Dojo-based
+    //    applications together. Most combinations of arguments are
+    //    supported, with the connect() method attempting to disambiguate
+    //    the implied types of positional parameters. The following will
+    //    all work:
+    //      dojo.event.connect("globalFunctionName1", "globalFunctionName2");
+    //      dojo.event.connect(functionReference1, functionReference2);
+    //      dojo.event.connect("globalFunctionName1", functionReference2);
+    //      dojo.event.connect(functionReference1, "globalFunctionName2");
+    //      dojo.event.connect(scope1, "functionName1", "globalFunctionName2");
+    //      dojo.event.connect("globalFunctionName1", scope2, "functionName2");
+    //      dojo.event.connect(scope1, "functionName1", scope2, "functionName2");
+    //      dojo.event.connect("after", scope1, "functionName1", scope2, "functionName2");
+    //      dojo.event.connect("before", scope1, "functionName1", scope2, "functionName2");
+    //      dojo.event.connect("around",  scope1, "functionName1", 
+    //                      scope2, "functionName2",
+    //                      aroundFunctionReference);
+    //      dojo.event.connect("around",  scope1, "functionName1", 
+    //                      scope2, "functionName2",
+    //                      scope3, "aroundFunctionName");
+    //      dojo.event.connect("before-around",   scope1, "functionName1", 
+    //                          scope2, "functionName2",
+    //                          aroundFunctionReference);
+    //      dojo.event.connect("after-around",    scope1, "functionName1", 
+    //                          scope2, "functionName2",
+    //                          aroundFunctionReference);
+    //      dojo.event.connect("after-around",    scope1, "functionName1", 
+    //                          scope2, "functionName2",
+    //                          scope3, "aroundFunctionName");
+    //      dojo.event.connect("around",  scope1, "functionName1", 
+    //                      scope2, "functionName2",
+    //                      scope3, "aroundFunctionName", true, 30);
+    //      dojo.event.connect("around",  scope1, "functionName1", 
+    //                      scope2, "functionName2",
+    //                      scope3, "aroundFunctionName", null, null, 10);
+    // adviceType: 
+    //    Optional. String. One of "before", "after", "around",
+    //    "before-around", or "after-around". FIXME
+    // srcObj:
+    //    the scope in which to locate/execute the named srcFunc. Along
+    //    with srcFunc, this creates a way to dereference the function to
+    //    call. So if the function in question is "foo.bar", the
+    //    srcObj/srcFunc pair would be foo and "bar", where "bar" is a
+    //    string and foo is an object reference.
+    // srcFunc:
+    //    the name of the function to connect to. When it is executed,
+    //    the listener being registered with this call will be called.
+    //    The adviceType defines the call order between the source and
+    //    the target functions.
+    // adviceObj:
+    //    the scope in which to locate/execute the named adviceFunc.
+    // adviceFunc:
+    //    the name of the function being conected to srcObj.srcFunc
+    // aroundObj:
+    //    the scope in which to locate/execute the named aroundFunc.
+    // aroundFunc:
+    //    the name of, or a reference to, the function that will be used
+    //    to mediate the advice call. Around advice requires a special
+    //    unary function that will be passed a "MethodInvocation" object.
+    //    These objects have several important properties, namely:
+    //      - args
+    //        a mutable array of arguments to be passed into the
+    //        wrapped function
+    //      - proceed
+    //        a function that "continues" the invocation. The result
+    //        of this function is the return of the wrapped function.
+    //        You can then manipulate this return before passing it
+    //        back out (or take further action based on it).
+    // once:
+    //    boolean that determines whether or not this connect() will
+    //    create a new connection if an identical connect() has already
+    //    been made. Defaults to "false".
+    // delay:
+    //    an optional delay (in ms), as an integer, for dispatch of a
+    //    listener after the source has been fired.
+    // rate:
+    //    an optional rate throttling parameter (integer, in ms). When
+    //    specified, this particular connection will not fire more than
+    //    once in the interval specified by the rate
+    // adviceMsg:
+    //    boolean. Should the listener have all the parameters passed in
+    //    as a single argument?
+
+    /*
+        ao.adviceType = args[0];
+        ao.srcObj = args[1];
+        ao.srcFunc = args[2];
+        ao.adviceObj = args[3]
+        ao.adviceFunc = args[4];
+        ao.aroundObj = args[5];
+        ao.aroundFunc = args[6];
+        ao.once = args[7];
+        ao.delay = args[8];
+        ao.rate = args[9];
+        ao.adviceMsg = args[10];
+    */
+    if(arguments.length == 1){
+      var ao = arguments[0];
+    }else{
+      var ao = interpolateArgs(arguments, true);
+    }
+    if(dojo.lang.isString(ao.srcFunc) && (ao.srcFunc.toLowerCase() == "onkey") ){
+      if(dojo.render.html.ie){
+        ao.srcFunc = "onkeydown";
+        this.connect(ao);
+      }
+      ao.srcFunc = "onkeypress";
+    }
+
+
+    if(dojo.lang.isArray(ao.srcObj) && ao.srcObj!=""){
+      var tmpAO = {};
+      for(var x in ao){
+        tmpAO[x] = ao[x];
+      }
+      var mjps = [];
+      dojo.lang.forEach(ao.srcObj, function(src){
+        if((dojo.render.html.capable)&&(dojo.lang.isString(src))){
+          src = dojo.byId(src);
+          // dojo.debug(src);
+        }
+        tmpAO.srcObj = src;
+        // dojo.debug(tmpAO.srcObj, tmpAO.srcFunc);
+        // dojo.debug(tmpAO.adviceObj, tmpAO.adviceFunc);
+        mjps.push(dojo.event.connect.call(dojo.event, tmpAO));
+      });
+      return mjps;
+    }
+
+    // FIXME: just doing a "getForMethod()" seems to be enough to put this into infinite recursion!!
+    var mjp = dojo.event.MethodJoinPoint.getForMethod(ao.srcObj, ao.srcFunc);
+    if(ao.adviceFunc){
+      var mjp2 = dojo.event.MethodJoinPoint.getForMethod(ao.adviceObj, ao.adviceFunc);
+    }
+
+    mjp.kwAddAdvice(ao);
+
+    // advanced users might want to fsck w/ the join point manually
+    return mjp; // a MethodJoinPoint object
+  }
+
+  this.log = function(/*object or funcName*/ a1, /*funcName*/ a2){
+    // summary:
+    //    a function that will wrap and log all calls to the specified
+    //    a1.a2() function. If only a1 is passed, it'll be used as a
+    //    function or function name on the global context. Logging will
+    //    be sent to dojo.debug
+    // a1:
+    //    if a2 is passed, this should be an object. If not, it can be a
+    //    function or function name.
+    // a2:
+    //    a function name
+    var kwArgs;
+    if((arguments.length == 1)&&(typeof a1 == "object")){
+      kwArgs = a1;
+    }else{
+      kwArgs = {
+        srcObj: a1,
+        srcFunc: a2
+      };
+    }
+    kwArgs.adviceFunc = function(){
+      var argsStr = [];
+      for(var x=0; x<arguments.length; x++){
+        argsStr.push(arguments[x]);
+      }
+      dojo.debug("("+kwArgs.srcObj+")."+kwArgs.srcFunc, ":", argsStr.join(", "));
+    }
+    this.kwConnect(kwArgs);
+  }
+
+  this.connectBefore = function(){
+    // summary:
+    //    takes the same parameters as dojo.event.connect(), except that
+    //    the advice type will always be "before"
+    var args = ["before"];
+    for(var i = 0; i < arguments.length; i++){ args.push(arguments[i]); }
+    return this.connect.apply(this, args); // a MethodJoinPoint object
+  }
+
+  this.connectAround = function(){
+    // summary:
+    //    takes the same parameters as dojo.event.connect(), except that
+    //    the advice type will always be "around"
+    var args = ["around"];
+    for(var i = 0; i < arguments.length; i++){ args.push(arguments[i]); }
+    return this.connect.apply(this, args); // a MethodJoinPoint object
+  }
+
+  this.connectOnce = function(){
+    // summary:
+    //    takes the same parameters as dojo.event.connect(), except that
+    //    the "once" flag will always be set to "true"
+    var ao = interpolateArgs(arguments, true);
+    ao.once = true;
+    return this.connect(ao); // a MethodJoinPoint object
+  }
+
+  this._kwConnectImpl = function(kwArgs, disconnect){
+    var fn = (disconnect) ? "disconnect" : "connect";
+    if(typeof kwArgs["srcFunc"] == "function"){
+      kwArgs.srcObj = kwArgs["srcObj"]||dj_global;
+      var tmpName  = dojo.lang.nameAnonFunc(kwArgs.srcFunc, kwArgs.srcObj, true);
+      kwArgs.srcFunc = tmpName;
+    }
+    if(typeof kwArgs["adviceFunc"] == "function"){
+      kwArgs.adviceObj = kwArgs["adviceObj"]||dj_global;
+      var tmpName  = dojo.lang.nameAnonFunc(kwArgs.adviceFunc, kwArgs.adviceObj, true);
+      kwArgs.adviceFunc = tmpName;
+    }
+    kwArgs.srcObj = kwArgs["srcObj"]||dj_global;
+    kwArgs.adviceObj = kwArgs["adviceObj"]||kwArgs["targetObj"]||dj_global;
+    kwArgs.adviceFunc = kwArgs["adviceFunc"]||kwArgs["targetFunc"];
+    // pass kwargs to avoid unrolling/repacking
+    return dojo.event[fn](kwArgs);
+  }
+
+  this.kwConnect = function(/*Object*/ kwArgs){
+    // summary:
+    //    A version of dojo.event.connect() that takes a map of named
+    //    parameters instead of the positional parameters that
+    //    dojo.event.connect() uses. For many advanced connection types,
+    //    this can be a much more readable (and potentially faster)
+    //    alternative.
+    // kwArgs:
+    //    An object that can have the following properties:
+    //      - adviceType
+    //      - srcObj
+    //      - srcFunc
+    //      - adviceObj
+    //      - adviceFunc 
+    //      - aroundObj
+    //      - aroundFunc
+    //      - once
+    //      - delay
+    //      - rate
+    //      - adviceMsg
+    //    As with connect, only srcFunc and adviceFunc are generally
+    //    required
+
+    return this._kwConnectImpl(kwArgs, false); // a MethodJoinPoint object
+
+  }
+
+  this.disconnect = function(){
+    // summary:
+    //    Takes the same parameters as dojo.event.connect() but destroys
+    //    an existing connection instead of building a new one. For
+    //    multiple identical connections, multiple disconnect() calls
+    //    will unroll one each time it's called.
+    if(arguments.length == 1){
+      var ao = arguments[0];
+    }else{
+      var ao = interpolateArgs(arguments, true);
+    }
+    if(!ao.adviceFunc){ return; } // nothing to disconnect
+    if(dojo.lang.isString(ao.srcFunc) && (ao.srcFunc.toLowerCase() == "onkey") ){
+      if(dojo.render.html.ie){
+        ao.srcFunc = "onkeydown";
+        this.disconnect(ao);
+      }
+      ao.srcFunc = "onkeypress";
+    }
+    var mjp = dojo.event.MethodJoinPoint.getForMethod(ao.srcObj, ao.srcFunc);
+    return mjp.removeAdvice(ao.adviceObj, ao.adviceFunc, ao.adviceType, ao.once); // a MethodJoinPoint object
+  }
+
+  this.kwDisconnect = function(kwArgs){
+    // summary:
+    //    Takes the same parameters as dojo.event.kwConnect() but
+    //    destroys an existing connection instead of building a new one.
+    return this._kwConnectImpl(kwArgs, true);
+  }
 }
+
+// exactly one of these is created whenever a method with a joint point is run,
+// if there is at least one 'around' advice.
+dojo.event.MethodInvocation = function(/*dojo.event.MethodJoinPoint*/join_point, /*Object*/obj, /*Array*/args){
+  // summary:
+  //    a class the models the call into a function. This is used under the
+  //    covers for all method invocations on both ends of a
+  //    connect()-wrapped function dispatch. This allows us to "pickle"
+  //    calls, such as in the case of around advice.
+  // join_point:
+  //    a dojo.event.MethodJoinPoint object that represents a connection
+  // obj:
+  //    the scope the call will execute in
+  // args:
+  //    an array of parameters that will get passed to the callee
+  this.jp_ = join_point;
+  this.object = obj;
+  this.args = [];
+  // make sure we don't lock into a mutable object which can change under us.
+  // It's ok if the individual items change, though.
+  for(var x=0; x<args.length; x++){
+    this.args[x] = args[x];
+  }
+  // the index of the 'around' that is currently being executed.
+  this.around_index = -1;
 }
+
+dojo.event.MethodInvocation.prototype.proceed = function(){
+  // summary:
+  //    proceed with the method call that's represented by this invocation
+  //    object
+  this.around_index++;
+  if(this.around_index >= this.jp_.around.length){
+    return this.jp_.object[this.jp_.methodname].apply(this.jp_.object, this.args);
+    // return this.jp_.run_before_after(this.object, this.args);
+  }else{
+    var ti = this.jp_.around[this.around_index];
+    var mobj = ti[0]||dj_global;
+    var meth = ti[1];
+    return mobj[meth].call(mobj, this);
+  }
+} 
+
+
+dojo.event.MethodJoinPoint = function(/*Object*/obj, /*String*/funcName){
+  this.object = obj||dj_global;
+  this.methodname = funcName;
+  this.methodfunc = this.object[funcName];
+  this.squelch = false;
+  // this.before = [];
+  // this.after = [];
+  // this.around = [];
 }
+
+dojo.event.MethodJoinPoint.getForMethod = function(/*Object*/obj, /*String*/funcName){
+  // summary:
+  //    "static" class function for returning a MethodJoinPoint from a
+  //    scoped function. If one doesn't exist, one is created.
+  // obj:
+  //    the scope to search for the function in
+  // funcName:
+  //    the name of the function to return a MethodJoinPoint for
+  if(!obj){ obj = dj_global; }
+  if(!obj[funcName]){
+    // supply a do-nothing method implementation
+    obj[funcName] = function(){};
+    if(!obj[funcName]){
+      // e.g. cannot add to inbuilt objects in IE6
+      dojo.raise("Cannot set do-nothing method on that object "+funcName);
+    }
+  }else if((!dojo.lang.isFunction(obj[funcName]))&&(!dojo.lang.isAlien(obj[funcName]))){
+    // FIXME: should we throw an exception here instead?
+    return null; 
+  }
+  // we hide our joinpoint instance in obj[funcName + '$joinpoint']
+  var jpname = funcName + "$joinpoint";
+  var jpfuncname = funcName + "$joinpoint$method";
+  var joinpoint = obj[jpname];
+  if(!joinpoint){
+    var isNode = false;
+    if(dojo.event["browser"]){
+      if( (obj["attachEvent"])||
+        (obj["nodeType"])||
+        (obj["addEventListener"]) ){
+        isNode = true;
+        dojo.event.browser.addClobberNodeAttrs(obj, [jpname, jpfuncname, funcName]);
+      }
+    }
+    var origArity = obj[funcName].length;
+    obj[jpfuncname] = obj[funcName];
+    // joinpoint = obj[jpname] = new dojo.event.MethodJoinPoint(obj, funcName);
+    joinpoint = obj[jpname] = new dojo.event.MethodJoinPoint(obj, jpfuncname);
+    obj[funcName] = function(){ 
+      var args = [];
+
+      if((isNode)&&(!arguments.length)){
+        var evt = null;
+        try{
+          if(obj.ownerDocument){
+            evt = obj.ownerDocument.parentWindow.event;
+          }else if(obj.documentElement){
+            evt = obj.documentElement.ownerDocument.parentWindow.event;
+          }else if(obj.event){ //obj is a window
+            evt = obj.event;
+          }else{
+            evt = window.event;
+          }
+        }catch(e){
+          evt = window.event;
+        }
+
+        if(evt){
+          args.push(dojo.event.browser.fixEvent(evt, this));
+        }
+      }else{
+        for(var x=0; x<arguments.length; x++){
+          if((x==0)&&(isNode)&&(dojo.event.browser.isEvent(arguments[x]))){
+            args.push(dojo.event.browser.fixEvent(arguments[x], this));
+          }else{
+            args.push(arguments[x]);
+          }
+        }
+      }
+      // return joinpoint.run.apply(joinpoint, arguments); 
+      return joinpoint.run.apply(joinpoint, args); 
+    }
+    obj[funcName].__preJoinArity = origArity;
+  }
+  return joinpoint; // dojo.event.MethodJoinPoint
 }
-break;
-case 4:
-if((dl.isObject(args[0]))&&(dl.isObject(args[2]))){
-ao.adviceType="after";
-ao.srcObj=args[0];
-ao.srcFunc=args[1];
-ao.adviceObj=args[2];
-ao.adviceFunc=args[3];
-}else{
-if((dl.isString(args[0]))&&(dl.isString(args[1]))&&(dl.isObject(args[2]))){
-ao.adviceType=args[0];
-ao.srcObj=dj_global;
-ao.srcFunc=args[1];
-ao.adviceObj=args[2];
-ao.adviceFunc=args[3];
-}else{
-if((dl.isString(args[0]))&&(dl.isFunction(args[1]))&&(dl.isObject(args[2]))){
-ao.adviceType=args[0];
-ao.srcObj=dj_global;
-var _474=dl.nameAnonFunc(args[1],dj_global,_471);
-ao.srcFunc=_474;
-ao.adviceObj=args[2];
-ao.adviceFunc=args[3];
-}else{
-if((dl.isString(args[0]))&&(dl.isObject(args[1]))&&(dl.isString(args[2]))&&(dl.isFunction(args[3]))){
-ao.srcObj=args[1];
-ao.srcFunc=args[2];
-var _474=dl.nameAnonFunc(args[3],dj_global,_471);
-ao.adviceObj=dj_global;
-ao.adviceFunc=_474;
-}else{
-if(dl.isObject(args[1])){
-ao.srcObj=args[1];
-ao.srcFunc=args[2];
-ao.adviceObj=dj_global;
-ao.adviceFunc=args[3];
-}else{
-if(dl.isObject(args[2])){
-ao.srcObj=dj_global;
-ao.srcFunc=args[1];
-ao.adviceObj=args[2];
-ao.adviceFunc=args[3];
-}else{
-ao.srcObj=ao.adviceObj=ao.aroundObj=dj_global;
-ao.srcFunc=args[1];
-ao.adviceFunc=args[2];
-ao.aroundFunc=args[3];
-}
-}
-}
-}
-}
-}
-break;
-case 6:
-ao.srcObj=args[1];
-ao.srcFunc=args[2];
-ao.adviceObj=args[3];
-ao.adviceFunc=args[4];
-ao.aroundFunc=args[5];
-ao.aroundObj=dj_global;
-break;
-default:
-ao.srcObj=args[1];
-ao.srcFunc=args[2];
-ao.adviceObj=args[3];
-ao.adviceFunc=args[4];
-ao.aroundObj=args[5];
-ao.aroundFunc=args[6];
-ao.once=args[7];
-ao.delay=args[8];
-ao.rate=args[9];
-ao.adviceMsg=args[10];
-break;
-}
-if(dl.isFunction(ao.aroundFunc)){
-var _474=dl.nameAnonFunc(ao.aroundFunc,ao.aroundObj,_471);
-ao.aroundFunc=_474;
-}
-if(dl.isFunction(ao.srcFunc)){
-ao.srcFunc=dl.getNameInObj(ao.srcObj,ao.srcFunc);
-}
-if(dl.isFunction(ao.adviceFunc)){
-ao.adviceFunc=dl.getNameInObj(ao.adviceObj,ao.adviceFunc);
-}
-if((ao.aroundObj)&&(dl.isFunction(ao.aroundFunc))){
-ao.aroundFunc=dl.getNameInObj(ao.aroundObj,ao.aroundFunc);
-}
-if(!ao.srcObj){
-dojo.raise("bad srcObj for srcFunc: "+ao.srcFunc);
-}
-if(!ao.adviceObj){
-dojo.raise("bad adviceObj for adviceFunc: "+ao.adviceFunc);
-}
-if(!ao.adviceFunc){
-dojo.debug("bad adviceFunc for srcFunc: "+ao.srcFunc);
-dojo.debugShallow(ao);
-}
-return ao;
-}
-this.connect=function(){
-if(arguments.length==1){
-var ao=arguments[0];
-}else{
-var ao=interpolateArgs(arguments,true);
-}
-if(dojo.lang.isString(ao.srcFunc)&&(ao.srcFunc.toLowerCase()=="onkey")){
-if(dojo.render.html.ie){
-ao.srcFunc="onkeydown";
-this.connect(ao);
-}
-ao.srcFunc="onkeypress";
-}
-if(dojo.lang.isArray(ao.srcObj)&&ao.srcObj!=""){
-var _476={};
-for(var x in ao){
-_476[x]=ao[x];
-}
-var mjps=[];
-dojo.lang.forEach(ao.srcObj,function(src){
-if((dojo.render.html.capable)&&(dojo.lang.isString(src))){
-src=dojo.byId(src);
-}
-_476.srcObj=src;
-mjps.push(dojo.event.connect.call(dojo.event,_476));
+
+dojo.lang.extend(dojo.event.MethodJoinPoint, {
+  unintercept: function(){
+    // summary: 
+    //    destroy the connection to all listeners that may have been
+    //    registered on this joinpoint
+    this.object[this.methodname] = this.methodfunc;
+    this.before = [];
+    this.after = [];
+    this.around = [];
+  },
+
+  disconnect: dojo.lang.forward("unintercept"),
+
+  run: function(){
+    // summary:
+    //    execute the connection represented by this join point. The
+    //    arguments passed to run() will be passed to the function and
+    //    its listeners.
+    var obj = this.object||dj_global;
+    var args = arguments;
+
+    // optimization. We only compute once the array version of the arguments
+    // pseudo-arr in order to prevent building it each time advice is unrolled.
+    var aargs = [];
+    for(var x=0; x<args.length; x++){
+      aargs[x] = args[x];
+    }
+
+    var unrollAdvice  = function(marr){ 
+      if(!marr){
+        dojo.debug("Null argument to unrollAdvice()");
+        return;
+      }
+      
+      var callObj = marr[0]||dj_global;
+      var callFunc = marr[1];
+      
+      if(!callObj[callFunc]){
+        dojo.raise("function \"" + callFunc + "\" does not exist on \"" + callObj + "\"");
+      }
+      
+      var aroundObj = marr[2]||dj_global;
+      var aroundFunc = marr[3];
+      var msg = marr[6];
+      var undef;
+
+      var to = {
+        args: [],
+        jp_: this,
+        object: obj,
+        proceed: function(){
+          return callObj[callFunc].apply(callObj, to.args);
+        }
+      };
+      to.args = aargs;
+
+      var delay = parseInt(marr[4]);
+      var hasDelay = ((!isNaN(delay))&&(marr[4]!==null)&&(typeof marr[4] != "undefined"));
+      if(marr[5]){
+        var rate = parseInt(marr[5]);
+        var cur = new Date();
+        var timerSet = false;
+        if((marr["last"])&&((cur-marr.last)<=rate)){
+          if(dojo.event._canTimeout){
+            if(marr["delayTimer"]){
+              clearTimeout(marr.delayTimer);
+            }
+            var tod = parseInt(rate*2); // is rate*2 naive?
+            var mcpy = dojo.lang.shallowCopy(marr);
+            marr.delayTimer = setTimeout(function(){
+              // FIXME: on IE at least, event objects from the
+              // browser can go out of scope. How (or should?) we
+              // deal with it?
+              mcpy[5] = 0;
+              unrollAdvice(mcpy);
+            }, tod);
+          }
+          return;
+        }else{
+          marr.last = cur;
+        }
+      }
+
+      // FIXME: need to enforce rates for a connection here!
+
+      if(aroundFunc){
+        // NOTE: around advice can't delay since we might otherwise depend
+        // on execution order!
+        aroundObj[aroundFunc].call(aroundObj, to);
+      }else{
+        // var tmjp = dojo.event.MethodJoinPoint.getForMethod(obj, methname);
+        if((hasDelay)&&((dojo.render.html)||(dojo.render.svg))){  // FIXME: the render checks are grotty!
+          dj_global["setTimeout"](function(){
+            if(msg){
+              callObj[callFunc].call(callObj, to); 
+            }else{
+              callObj[callFunc].apply(callObj, args); 
+            }
+          }, delay);
+        }else{ // many environments can't support delay!
+          if(msg){
+            callObj[callFunc].call(callObj, to); 
+          }else{
+            callObj[callFunc].apply(callObj, args); 
+          }
+        }
+      }
+    }
+
+    var unRollSquelch = function(){
+      if(this.squelch){
+        try{
+          return unrollAdvice.apply(this, arguments);
+        }catch(e){ 
+          dojo.debug(e);
+        }
+      }else{
+        return unrollAdvice.apply(this, arguments);
+      }
+    }
+
+    if((this["before"])&&(this.before.length>0)){
+      // pass a cloned array, if this event disconnects this event forEach on this.before wont work
+      dojo.lang.forEach(this.before.concat(new Array()), unRollSquelch);
+    }
+
+    var result;
+    try{
+      if((this["around"])&&(this.around.length>0)){
+        var mi = new dojo.event.MethodInvocation(this, obj, args);
+        result = mi.proceed();
+      }else if(this.methodfunc){
+        result = this.object[this.methodname].apply(this.object, args);
+      }
+    }catch(e){ if(!this.squelch){ dojo.raise(e); } }
+
+    if((this["after"])&&(this.after.length>0)){
+      // see comment on this.before above
+      dojo.lang.forEach(this.after.concat(new Array()), unRollSquelch);
+    }
+
+    return (this.methodfunc) ? result : null;
+  },
+
+  getArr: function(/*String*/kind){
+    // summary: return a list of listeners of the past "kind"
+    // kind:
+    //    can be one of: "before", "after", "around", "before-around", or
+    //    "after-around"
+    var type = "after";
+    // FIXME: we should be able to do this through props or Array.in()
+    if((typeof kind == "string")&&(kind.indexOf("before")!=-1)){
+      type = "before";
+    }else if(kind=="around"){
+      type = "around";
+    }
+    if(!this[type]){ this[type] = []; }
+    return this[type]; // Array
+  },
+
+  kwAddAdvice: function(/*Object*/args){
+    // summary:
+    //    adds advice to the joinpoint with arguments in a map
+    // args:
+    //    An object that can have the following properties:
+    //      - adviceType
+    //      - adviceObj
+    //      - adviceFunc 
+    //      - aroundObj
+    //      - aroundFunc
+    //      - once
+    //      - delay
+    //      - rate
+    //      - adviceMsg
+    this.addAdvice( args["adviceObj"], args["adviceFunc"], 
+            args["aroundObj"], args["aroundFunc"], 
+            args["adviceType"], args["precedence"], 
+            args["once"], args["delay"], args["rate"], 
+            args["adviceMsg"]);
+  },
+
+  addAdvice: function(  thisAdviceObj, thisAdvice, 
+              thisAroundObj, thisAround, 
+              adviceType, precedence, 
+              once, delay, rate, asMessage){
+    // summary:
+    //    add advice to this joinpoint using positional parameters
+    // thisAdviceObj:
+    //    the scope in which to locate/execute the named adviceFunc.
+    // thisAdviceFunc:
+    //    the name of the function being conected
+    // thisAroundObj:
+    //    the scope in which to locate/execute the named aroundFunc.
+    // thisAroundFunc:
+    //    the name of the function that will be used to mediate the
+    //    advice call.
+    // adviceType: 
+    //    Optional. String. One of "before", "after", "around",
+    //    "before-around", or "after-around". FIXME
+    // once:
+    //    boolean that determines whether or not this advice will create
+    //    a new connection if an identical advice set has already been
+    //    provided. Defaults to "false".
+    // delay:
+    //    an optional delay (in ms), as an integer, for dispatch of a
+    //    listener after the source has been fired.
+    // rate:
+    //    an optional rate throttling parameter (integer, in ms). When
+    //    specified, this particular connection will not fire more than
+    //    once in the interval specified by the rate
+    // adviceMsg:
+    //    boolean. Should the listener have all the parameters passed in
+    //    as a single argument?
+    var arr = this.getArr(adviceType);
+    if(!arr){
+      dojo.raise("bad this: " + this);
+    }
+
+    var ao = [thisAdviceObj, thisAdvice, thisAroundObj, thisAround, delay, rate, asMessage];
+    
+    if(once){
+      if(this.hasAdvice(thisAdviceObj, thisAdvice, adviceType, arr) >= 0){
+        return;
+      }
+    }
+
+    if(precedence == "first"){
+      arr.unshift(ao);
+    }else{
+      arr.push(ao);
+    }
+  },
+
+  hasAdvice: function(thisAdviceObj, thisAdvice, adviceType, arr){
+    // summary:
+    //    returns the array index of the first existing connection
+    //    betweened the passed advice and this joinpoint. Will be -1 if
+    //    none exists.
+    // thisAdviceObj:
+    //    the scope in which to locate/execute the named adviceFunc.
+    // thisAdviceFunc:
+    //    the name of the function being conected
+    // adviceType: 
+    //    Optional. String. One of "before", "after", "around",
+    //    "before-around", or "after-around". FIXME
+    // arr:
+    //    Optional. The list of advices to search. Will be found via
+    //    adviceType if not passed
+    if(!arr){ arr = this.getArr(adviceType); }
+    var ind = -1;
+    for(var x=0; x<arr.length; x++){
+      var aao = (typeof thisAdvice == "object") ? (new String(thisAdvice)).toString() : thisAdvice;
+      var a1o = (typeof arr[x][1] == "object") ? (new String(arr[x][1])).toString() : arr[x][1];
+      if((arr[x][0] == thisAdviceObj)&&(a1o == aao)){
+        ind = x;
+      }
+    }
+    return ind; // Integer
+  },
+
+  removeAdvice: function(thisAdviceObj, thisAdvice, adviceType, once){
+    // summary:
+    //    returns the array index of the first existing connection
+    //    betweened the passed advice and this joinpoint. Will be -1 if
+    //    none exists.
+    // thisAdviceObj:
+    //    the scope in which to locate/execute the named adviceFunc.
+    // thisAdviceFunc:
+    //    the name of the function being conected
+    // adviceType: 
+    //    Optional. String. One of "before", "after", "around",
+    //    "before-around", or "after-around". FIXME
+    // once:
+    //    Optional. Should this only remove the first occurance of the
+    //    connection?
+    var arr = this.getArr(adviceType);
+    var ind = this.hasAdvice(thisAdviceObj, thisAdvice, adviceType, arr);
+    if(ind == -1){
+      return false;
+    }
+    while(ind != -1){
+      arr.splice(ind, 1);
+      if(once){ break; }
+      ind = this.hasAdvice(thisAdviceObj, thisAdvice, adviceType, arr);
+    }
+    return true;
+  }
 });
-return mjps;
-}
-var mjp=dojo.event.MethodJoinPoint.getForMethod(ao.srcObj,ao.srcFunc);
-if(ao.adviceFunc){
-var mjp2=dojo.event.MethodJoinPoint.getForMethod(ao.adviceObj,ao.adviceFunc);
-}
-mjp.kwAddAdvice(ao);
-return mjp;
-};
-this.log=function(a1,a2){
-var _47e;
-if((arguments.length==1)&&(typeof a1=="object")){
-_47e=a1;
-}else{
-_47e={srcObj:a1,srcFunc:a2};
-}
-_47e.adviceFunc=function(){
-var _47f=[];
-for(var x=0;x<arguments.length;x++){
-_47f.push(arguments[x]);
-}
-dojo.debug("("+_47e.srcObj+")."+_47e.srcFunc,":",_47f.join(", "));
-};
-this.kwConnect(_47e);
-};
-this.connectBefore=function(){
-var args=["before"];
-for(var i=0;i<arguments.length;i++){
-args.push(arguments[i]);
-}
-return this.connect.apply(this,args);
-};
-this.connectAround=function(){
-var args=["around"];
-for(var i=0;i<arguments.length;i++){
-args.push(arguments[i]);
-}
-return this.connect.apply(this,args);
-};
-this.connectOnce=function(){
-var ao=interpolateArgs(arguments,true);
-ao.once=true;
-return this.connect(ao);
-};
-this._kwConnectImpl=function(_486,_487){
-var fn=(_487)?"disconnect":"connect";
-if(typeof _486["srcFunc"]=="function"){
-_486.srcObj=_486["srcObj"]||dj_global;
-var _489=dojo.lang.nameAnonFunc(_486.srcFunc,_486.srcObj,true);
-_486.srcFunc=_489;
-}
-if(typeof _486["adviceFunc"]=="function"){
-_486.adviceObj=_486["adviceObj"]||dj_global;
-var _489=dojo.lang.nameAnonFunc(_486.adviceFunc,_486.adviceObj,true);
-_486.adviceFunc=_489;
-}
-_486.srcObj=_486["srcObj"]||dj_global;
-_486.adviceObj=_486["adviceObj"]||_486["targetObj"]||dj_global;
-_486.adviceFunc=_486["adviceFunc"]||_486["targetFunc"];
-return dojo.event[fn](_486);
-};
-this.kwConnect=function(_48a){
-return this._kwConnectImpl(_48a,false);
-};
-this.disconnect=function(){
-if(arguments.length==1){
-var ao=arguments[0];
-}else{
-var ao=interpolateArgs(arguments,true);
-}
-if(!ao.adviceFunc){
-return;
-}
-if(dojo.lang.isString(ao.srcFunc)&&(ao.srcFunc.toLowerCase()=="onkey")){
-if(dojo.render.html.ie){
-ao.srcFunc="onkeydown";
-this.disconnect(ao);
-}
-ao.srcFunc="onkeypress";
-}
-var mjp=dojo.event.MethodJoinPoint.getForMethod(ao.srcObj,ao.srcFunc);
-return mjp.removeAdvice(ao.adviceObj,ao.adviceFunc,ao.adviceType,ao.once);
-};
-this.kwDisconnect=function(_48d){
-return this._kwConnectImpl(_48d,true);
-};
-};
-dojo.event.MethodInvocation=function(_48e,obj,args){
-this.jp_=_48e;
-this.object=obj;
-this.args=[];
-for(var x=0;x<args.length;x++){
-this.args[x]=args[x];
-}
-this.around_index=-1;
-};
-dojo.event.MethodInvocation.prototype.proceed=function(){
-this.around_index++;
-if(this.around_index>=this.jp_.around.length){
-return this.jp_.object[this.jp_.methodname].apply(this.jp_.object,this.args);
-}else{
-var ti=this.jp_.around[this.around_index];
-var mobj=ti[0]||dj_global;
-var meth=ti[1];
-return mobj[meth].call(mobj,this);
-}
-};
-dojo.event.MethodJoinPoint=function(obj,_496){
-this.object=obj||dj_global;
-this.methodname=_496;
-this.methodfunc=this.object[_496];
-this.squelch=false;
-};
-dojo.event.MethodJoinPoint.getForMethod=function(obj,_498){
-if(!obj){
-obj=dj_global;
-}
-if(!obj[_498]){
-obj[_498]=function(){
-};
-if(!obj[_498]){
-dojo.raise("Cannot set do-nothing method on that object "+_498);
-}
-}else{
-if((!dojo.lang.isFunction(obj[_498]))&&(!dojo.lang.isAlien(obj[_498]))){
-return null;
-}
-}
-var _499=_498+"$joinpoint";
-var _49a=_498+"$joinpoint$method";
-var _49b=obj[_499];
-if(!_49b){
-var _49c=false;
-if(dojo.event["browser"]){
-if((obj["attachEvent"])||(obj["nodeType"])||(obj["addEventListener"])){
-_49c=true;
-dojo.event.browser.addClobberNodeAttrs(obj,[_499,_49a,_498]);
-}
-}
-var _49d=obj[_498].length;
-obj[_49a]=obj[_498];
-_49b=obj[_499]=new dojo.event.MethodJoinPoint(obj,_49a);
-obj[_498]=function(){
-var args=[];
-if((_49c)&&(!arguments.length)){
-var evt=null;
-try{
-if(obj.ownerDocument){
-evt=obj.ownerDocument.parentWindow.event;
-}else{
-if(obj.documentElement){
-evt=obj.documentElement.ownerDocument.parentWindow.event;
-}else{
-if(obj.event){
-evt=obj.event;
-}else{
-evt=window.event;
-}
-}
-}
-}
-catch(e){
-evt=window.event;
-}
-if(evt){
-args.push(dojo.event.browser.fixEvent(evt,this));
-}
-}else{
-for(var x=0;x<arguments.length;x++){
-if((x==0)&&(_49c)&&(dojo.event.browser.isEvent(arguments[x]))){
-args.push(dojo.event.browser.fixEvent(arguments[x],this));
-}else{
-args.push(arguments[x]);
-}
-}
-}
-return _49b.run.apply(_49b,args);
-};
-obj[_498].__preJoinArity=_49d;
-}
-return _49b;
-};
-dojo.lang.extend(dojo.event.MethodJoinPoint,{unintercept:function(){
-this.object[this.methodname]=this.methodfunc;
-this.before=[];
-this.after=[];
-this.around=[];
-},disconnect:dojo.lang.forward("unintercept"),run:function(){
-var obj=this.object||dj_global;
-var args=arguments;
-var _4a3=[];
-for(var x=0;x<args.length;x++){
-_4a3[x]=args[x];
-}
-var _4a5=function(marr){
-if(!marr){
-dojo.debug("Null argument to unrollAdvice()");
-return;
-}
-var _4a7=marr[0]||dj_global;
-var _4a8=marr[1];
-if(!_4a7[_4a8]){
-dojo.raise("function \""+_4a8+"\" does not exist on \""+_4a7+"\"");
-}
-var _4a9=marr[2]||dj_global;
-var _4aa=marr[3];
-var msg=marr[6];
-var _4ac;
-var to={args:[],jp_:this,object:obj,proceed:function(){
-return _4a7[_4a8].apply(_4a7,to.args);
-}};
-to.args=_4a3;
-var _4ae=parseInt(marr[4]);
-var _4af=((!isNaN(_4ae))&&(marr[4]!==null)&&(typeof marr[4]!="undefined"));
-if(marr[5]){
-var rate=parseInt(marr[5]);
-var cur=new Date();
-var _4b2=false;
-if((marr["last"])&&((cur-marr.last)<=rate)){
-if(dojo.event._canTimeout){
-if(marr["delayTimer"]){
-clearTimeout(marr.delayTimer);
-}
-var tod=parseInt(rate*2);
-var mcpy=dojo.lang.shallowCopy(marr);
-marr.delayTimer=setTimeout(function(){
-mcpy[5]=0;
-_4a5(mcpy);
-},tod);
-}
-return;
-}else{
-marr.last=cur;
-}
-}
-if(_4aa){
-_4a9[_4aa].call(_4a9,to);
-}else{
-if((_4af)&&((dojo.render.html)||(dojo.render.svg))){
-dj_global["setTimeout"](function(){
-if(msg){
-_4a7[_4a8].call(_4a7,to);
-}else{
-_4a7[_4a8].apply(_4a7,args);
-}
-},_4ae);
-}else{
-if(msg){
-_4a7[_4a8].call(_4a7,to);
-}else{
-_4a7[_4a8].apply(_4a7,args);
-}
-}
-}
-};
-var _4b5=function(){
-if(this.squelch){
-try{
-return _4a5.apply(this,arguments);
-}
-catch(e){
-dojo.debug(e);
-}
-}else{
-return _4a5.apply(this,arguments);
-}
-};
-if((this["before"])&&(this.before.length>0)){
-dojo.lang.forEach(this.before.concat(new Array()),_4b5);
-}
-var _4b6;
-try{
-if((this["around"])&&(this.around.length>0)){
-var mi=new dojo.event.MethodInvocation(this,obj,args);
-_4b6=mi.proceed();
-}else{
-if(this.methodfunc){
-_4b6=this.object[this.methodname].apply(this.object,args);
-}
-}
-}
-catch(e){
-if(!this.squelch){
-dojo.raise(e);
-}
-}
-if((this["after"])&&(this.after.length>0)){
-dojo.lang.forEach(this.after.concat(new Array()),_4b5);
-}
-return (this.methodfunc)?_4b6:null;
-},getArr:function(kind){
-var type="after";
-if((typeof kind=="string")&&(kind.indexOf("before")!=-1)){
-type="before";
-}else{
-if(kind=="around"){
-type="around";
-}
-}
-if(!this[type]){
-this[type]=[];
-}
-return this[type];
-},kwAddAdvice:function(args){
-this.addAdvice(args["adviceObj"],args["adviceFunc"],args["aroundObj"],args["aroundFunc"],args["adviceType"],args["precedence"],args["once"],args["delay"],args["rate"],args["adviceMsg"]);
-},addAdvice:function(_4bb,_4bc,_4bd,_4be,_4bf,_4c0,once,_4c2,rate,_4c4){
-var arr=this.getArr(_4bf);
-if(!arr){
-dojo.raise("bad this: "+this);
-}
-var ao=[_4bb,_4bc,_4bd,_4be,_4c2,rate,_4c4];
-if(once){
-if(this.hasAdvice(_4bb,_4bc,_4bf,arr)>=0){
-return;
-}
-}
-if(_4c0=="first"){
-arr.unshift(ao);
-}else{
-arr.push(ao);
-}
-},hasAdvice:function(_4c7,_4c8,_4c9,arr){
-if(!arr){
-arr=this.getArr(_4c9);
-}
-var ind=-1;
-for(var x=0;x<arr.length;x++){
-var aao=(typeof _4c8=="object")?(new String(_4c8)).toString():_4c8;
-var a1o=(typeof arr[x][1]=="object")?(new String(arr[x][1])).toString():arr[x][1];
-if((arr[x][0]==_4c7)&&(a1o==aao)){
-ind=x;
-}
-}
-return ind;
-},removeAdvice:function(_4cf,_4d0,_4d1,once){
-var arr=this.getArr(_4d1);
-var ind=this.hasAdvice(_4cf,_4d0,_4d1,arr);
-if(ind==-1){
-return false;
-}
-while(ind!=-1){
-arr.splice(ind,1);
-if(once){
-break;
-}
-ind=this.hasAdvice(_4cf,_4d0,_4d1,arr);
-}
-return true;
-}});
+
 dojo.provide("dojo.event.topic");
-dojo.event.topic=new function(){
-this.topics={};
-this.getTopic=function(_4d5){
-if(!this.topics[_4d5]){
-this.topics[_4d5]=new this.TopicImpl(_4d5);
+
+dojo.event.topic = new function(){
+  this.topics = {};
+
+  this.getTopic = function(/*String*/topic){
+    // summary:
+    //    returns a topic implementation object of type
+    //    dojo.event.topic.TopicImpl
+    // topic:
+    //    a unique, opaque string that names the topic
+    if(!this.topics[topic]){
+      this.topics[topic] = new this.TopicImpl(topic);
+    }
+    return this.topics[topic]; // a dojo.event.topic.TopicImpl object
+  }
+
+  this.registerPublisher = function(/*String*/topic, /*Object*/obj, /*String*/funcName){
+    // summary:
+    //    registers a function as a publisher on a topic. Subsequent
+    //    calls to the function will cause a publish event on the topic
+    //    with the arguments passed to the function passed to registered
+    //    listeners.
+    // topic: 
+    //    a unique, opaque string that names the topic
+    // obj:
+    //    the scope to locate the function in
+    // funcName:
+    //    the name of the function to register
+    var topic = this.getTopic(topic);
+    topic.registerPublisher(obj, funcName);
+  }
+
+  this.subscribe = function(/*String*/topic, /*Object*/obj, /*String*/funcName){
+    // summary:
+    //    susbscribes the function to the topic. Subsequent events
+    //    dispached to the topic will create a function call for the
+    //    obj.funcName() function.
+    // topic: 
+    //    a unique, opaque string that names the topic
+    // obj:
+    //    the scope to locate the function in
+    // funcName:
+    //    the name of the function to being registered as a listener
+    var topic = this.getTopic(topic);
+    topic.subscribe(obj, funcName);
+  }
+
+  this.unsubscribe = function(/*String*/topic, /*Object*/obj, /*String*/funcName){
+    // summary:
+    //    unsubscribes the obj.funcName() from the topic
+    // topic: 
+    //    a unique, opaque string that names the topic
+    // obj:
+    //    the scope to locate the function in
+    // funcName:
+    //    the name of the function to being unregistered as a listener
+    var topic = this.getTopic(topic);
+    topic.unsubscribe(obj, funcName);
+  }
+
+  this.destroy = function(/*String*/topic){
+    // summary: 
+    //    destroys the topic and unregisters all listeners
+    // topic:
+    //    a unique, opaque string that names the topic
+    this.getTopic(topic).destroy();
+    delete this.topics[topic];
+  }
+
+  this.publishApply = function(/*String*/topic, /*Array*/args){
+    // summary: 
+    //    dispatches an event to the topic using the args array as the
+    //    source for the call arguments to each listener. This is similar
+    //    to JavaScript's built-in Function.apply()
+    // topic:
+    //    a unique, opaque string that names the topic
+    // args:
+    //    the arguments to be passed into listeners of the topic
+    var topic = this.getTopic(topic);
+    topic.sendMessage.apply(topic, args);
+  }
+
+  this.publish = function(/*String*/topic, /*Object*/message){
+    // summary: 
+    //    manually "publish" to the passed topic
+    // topic:
+    //    a unique, opaque string that names the topic
+    // message:
+    //    can be an array of parameters (similar to publishApply), or
+    //    will be treated as one of many arguments to be passed along in
+    //    a "flat" unrolling
+    var topic = this.getTopic(topic);
+    // if message is an array, we treat it as a set of arguments,
+    // otherwise, we just pass on the arguments passed in as-is
+    var args = [];
+    // could we use concat instead here?
+    for(var x=1; x<arguments.length; x++){
+      args.push(arguments[x]);
+    }
+    topic.sendMessage.apply(topic, args);
+  }
 }
-return this.topics[_4d5];
-};
-this.registerPublisher=function(_4d6,obj,_4d8){
-var _4d6=this.getTopic(_4d6);
-_4d6.registerPublisher(obj,_4d8);
-};
-this.subscribe=function(_4d9,obj,_4db){
-var _4d9=this.getTopic(_4d9);
-_4d9.subscribe(obj,_4db);
-};
-this.unsubscribe=function(_4dc,obj,_4de){
-var _4dc=this.getTopic(_4dc);
-_4dc.unsubscribe(obj,_4de);
-};
-this.destroy=function(_4df){
-this.getTopic(_4df).destroy();
-delete this.topics[_4df];
-};
-this.publishApply=function(_4e0,args){
-var _4e0=this.getTopic(_4e0);
-_4e0.sendMessage.apply(_4e0,args);
-};
-this.publish=function(_4e2,_4e3){
-var _4e2=this.getTopic(_4e2);
-var args=[];
-for(var x=1;x<arguments.length;x++){
-args.push(arguments[x]);
+
+dojo.event.topic.TopicImpl = function(topicName){
+  // summary: a class to represent topics
+
+  this.topicName = topicName;
+
+  this.subscribe = function(/*Object*/listenerObject, /*Function or String*/listenerMethod){
+    // summary:
+    //    use dojo.event.connect() to attach the passed listener to the
+    //    topic represented by this object
+    // listenerObject:
+    //    if a string and listenerMethod is ommitted, this is treated as
+    //    the name of a function in the global namespace. If
+    //    listenerMethod is provided, this is the scope to find/execute
+    //    the function in.
+    // listenerMethod:
+    //    Optional. The function to register.
+    var tf = listenerMethod||listenerObject;
+    var to = (!listenerMethod) ? dj_global : listenerObject;
+    return dojo.event.kwConnect({ // dojo.event.MethodJoinPoint
+      srcObj:   this, 
+      srcFunc:  "sendMessage", 
+      adviceObj:  to,
+      adviceFunc: tf
+    });
+  }
+
+  this.unsubscribe = function(/*Object*/listenerObject, /*Function or String*/listenerMethod){
+    // summary:
+    //    use dojo.event.disconnect() to attach the passed listener to the
+    //    topic represented by this object
+    // listenerObject:
+    //    if a string and listenerMethod is ommitted, this is treated as
+    //    the name of a function in the global namespace. If
+    //    listenerMethod is provided, this is the scope to find the
+    //    function in.
+    // listenerMethod:
+    //    Optional. The function to unregister.
+    var tf = (!listenerMethod) ? listenerObject : listenerMethod;
+    var to = (!listenerMethod) ? null : listenerObject;
+    return dojo.event.kwDisconnect({ // dojo.event.MethodJoinPoint
+      srcObj:   this, 
+      srcFunc:  "sendMessage", 
+      adviceObj:  to,
+      adviceFunc: tf
+    });
+  }
+
+  this._getJoinPoint = function(){
+    return dojo.event.MethodJoinPoint.getForMethod(this, "sendMessage");
+  }
+
+  this.setSquelch = function(/*Boolean*/shouldSquelch){
+    // summary: 
+    //    determine whether or not exceptions in the calling of a
+    //    listener in the chain should stop execution of the chain.
+    this._getJoinPoint().squelch = shouldSquelch;
+  }
+
+  this.destroy = function(){
+    // summary: disconnects all listeners from this topic
+    this._getJoinPoint().disconnect();
+  }
+
+  this.registerPublisher = function(  /*Object*/publisherObject, 
+                    /*Function or String*/publisherMethod){
+    // summary:
+    //    registers the passed function as a publisher on this topic.
+    //    Each time the function is called, an event will be published on
+    //    this topic.
+    // publisherObject:
+    //    if a string and listenerMethod is ommitted, this is treated as
+    //    the name of a function in the global namespace. If
+    //    listenerMethod is provided, this is the scope to find the
+    //    function in.
+    // publisherMethod:
+    //    Optional. The function to register.
+    dojo.event.connect(publisherObject, publisherMethod, this, "sendMessage");
+  }
+
+  this.sendMessage = function(message){
+    // summary: a stub to be called when a message is sent to the topic.
+
+    // The message has been propagated
+  }
 }
-_4e2.sendMessage.apply(_4e2,args);
-};
-};
-dojo.event.topic.TopicImpl=function(_4e6){
-this.topicName=_4e6;
-this.subscribe=function(_4e7,_4e8){
-var tf=_4e8||_4e7;
-var to=(!_4e8)?dj_global:_4e7;
-return dojo.event.kwConnect({srcObj:this,srcFunc:"sendMessage",adviceObj:to,adviceFunc:tf});
-};
-this.unsubscribe=function(_4eb,_4ec){
-var tf=(!_4ec)?_4eb:_4ec;
-var to=(!_4ec)?null:_4eb;
-return dojo.event.kwDisconnect({srcObj:this,srcFunc:"sendMessage",adviceObj:to,adviceFunc:tf});
-};
-this._getJoinPoint=function(){
-return dojo.event.MethodJoinPoint.getForMethod(this,"sendMessage");
-};
-this.setSquelch=function(_4ef){
-this._getJoinPoint().squelch=_4ef;
-};
-this.destroy=function(){
-this._getJoinPoint().disconnect();
-};
-this.registerPublisher=function(_4f0,_4f1){
-dojo.event.connect(_4f0,_4f1,this,"sendMessage");
-};
-this.sendMessage=function(_4f2){
-};
-};
+
+
 dojo.provide("dojo.event.browser");
-dojo._ie_clobber=new function(){
-this.clobberNodes=[];
-function nukeProp(node,prop){
-try{
-node[prop]=null;
+
+// FIXME: any particular reason this is in the global scope?
+dojo._ie_clobber = new function(){
+  this.clobberNodes = [];
+
+  function nukeProp(node, prop){
+    // try{ node.removeAttribute(prop);   }catch(e){ /* squelch */ }
+    try{ node[prop] = null;       }catch(e){ /* squelch */ }
+    try{ delete node[prop];       }catch(e){ /* squelch */ }
+    // FIXME: JotLive needs this, but I'm not sure if it's too slow or not
+    try{ node.removeAttribute(prop);  }catch(e){ /* squelch */ }
+  }
+
+  this.clobber = function(nodeRef){
+    var na;
+    var tna;
+    if(nodeRef){
+      tna = nodeRef.all || nodeRef.getElementsByTagName("*");
+      na = [nodeRef];
+      for(var x=0; x<tna.length; x++){
+        // if we're gonna be clobbering the thing, at least make sure
+        // we aren't trying to do it twice
+        if(tna[x]["__doClobber__"]){
+          na.push(tna[x]);
+        }
+      }
+    }else{
+      try{ window.onload = null; }catch(e){}
+      na = (this.clobberNodes.length) ? this.clobberNodes : document.all;
+    }
+    tna = null;
+    var basis = {};
+    for(var i = na.length-1; i>=0; i=i-1){
+      var el = na[i];
+      try{
+        if(el && el["__clobberAttrs__"]){
+          for(var j=0; j<el.__clobberAttrs__.length; j++){
+            nukeProp(el, el.__clobberAttrs__[j]);
+          }
+          nukeProp(el, "__clobberAttrs__");
+          nukeProp(el, "__doClobber__");
+        }
+      }catch(e){ /* squelch! */};
+    }
+    na = null;
+  }
 }
-catch(e){
-}
-try{
-delete node[prop];
-}
-catch(e){
-}
-try{
-node.removeAttribute(prop);
-}
-catch(e){
-}
-}
-this.clobber=function(_4f5){
-var na;
-var tna;
-if(_4f5){
-tna=_4f5.all||_4f5.getElementsByTagName("*");
-na=[_4f5];
-for(var x=0;x<tna.length;x++){
-if(tna[x]["__doClobber__"]){
-na.push(tna[x]);
-}
-}
-}else{
-try{
-window.onload=null;
-}
-catch(e){
-}
-na=(this.clobberNodes.length)?this.clobberNodes:document.all;
-}
-tna=null;
-var _4f9={};
-for(var i=na.length-1;i>=0;i=i-1){
-var el=na[i];
-try{
-if(el&&el["__clobberAttrs__"]){
-for(var j=0;j<el.__clobberAttrs__.length;j++){
-nukeProp(el,el.__clobberAttrs__[j]);
-}
-nukeProp(el,"__clobberAttrs__");
-nukeProp(el,"__doClobber__");
-}
-}
-catch(e){
-}
-}
-na=null;
-};
-};
+
 if(dojo.render.html.ie){
-dojo.addOnUnload(function(){
-dojo._ie_clobber.clobber();
-try{
-if((dojo["widget"])&&(dojo.widget["manager"])){
-dojo.widget.manager.destroyAll();
+  dojo.addOnUnload(function(){
+    dojo._ie_clobber.clobber();
+    try{
+      if((dojo["widget"])&&(dojo.widget["manager"])){
+        dojo.widget.manager.destroyAll();
+      }
+    }catch(e){}
+    try{ window.onload = null; }catch(e){}
+    try{ window.onunload = null; }catch(e){}
+    dojo._ie_clobber.clobberNodes = [];
+    // CollectGarbage();
+  });
 }
+
+dojo.event.browser = new function(){
+
+  var clobberIdx = 0;
+
+  this.normalizedEventName = function(/*String*/eventName){
+    switch(eventName){
+      case "CheckboxStateChange":
+      case "DOMAttrModified":
+      case "DOMMenuItemActive":
+      case "DOMMenuItemInactive":
+      case "DOMMouseScroll":
+      case "DOMNodeInserted":
+      case "DOMNodeRemoved":
+      case "RadioStateChange":
+        return eventName;
+        break;
+      default:
+        return eventName.toLowerCase();
+        break;
+    }
+  }
+  
+  this.clean = function(/*DOMNode*/node){
+    // summary:
+    //    removes native event handlers so that destruction of the node
+    //    will not leak memory. On most browsers this is a no-op, but
+    //    it's critical for manual node removal on IE.
+    // node:
+    //    A DOM node. All of it's children will also be cleaned.
+    if(dojo.render.html.ie){ 
+      dojo._ie_clobber.clobber(node);
+    }
+  }
+
+  this.addClobberNode = function(/*DOMNode*/node){
+    // summary:
+    //    register the passed node to support event stripping
+    // node:
+    //    A DOM node
+    if(!dojo.render.html.ie){ return; }
+    if(!node["__doClobber__"]){
+      node.__doClobber__ = true;
+      dojo._ie_clobber.clobberNodes.push(node);
+      // this might not be the most efficient thing to do, but it's
+      // much less error prone than other approaches which were
+      // previously tried and failed
+      node.__clobberAttrs__ = [];
+    }
+  }
+
+  this.addClobberNodeAttrs = function(/*DOMNode*/node, /*Array*/props){
+    // summary:
+    //    register the passed node to support event stripping
+    // node:
+    //    A DOM node to stip properties from later
+    // props:
+    //    A list of propeties to strip from the node
+    if(!dojo.render.html.ie){ return; }
+    this.addClobberNode(node);
+    for(var x=0; x<props.length; x++){
+      node.__clobberAttrs__.push(props[x]);
+    }
+  }
+
+  this.removeListener = function( /*DOMNode*/ node, 
+                  /*String*/  evtName, 
+                  /*Function*/fp, 
+                  /*Boolean*/ capture){
+    // summary:
+    //    clobbers the listener from the node
+    // evtName:
+    //    the name of the handler to remove the function from
+    // node:
+    //    DOM node to attach the event to
+    // fp:
+    //    the function to register
+    // capture:
+    //    Optional. should this listener prevent propigation?
+    if(!capture){ var capture = false; }
+    evtName = dojo.event.browser.normalizedEventName(evtName);
+    if( (evtName == "onkey") || (evtName == "key") ){
+      if(dojo.render.html.ie){
+        this.removeListener(node, "onkeydown", fp, capture);
+      }
+      evtName = "onkeypress";
+    }
+    if(evtName.substr(0,2)=="on"){ evtName = evtName.substr(2); }
+    // FIXME: this is mostly a punt, we aren't actually doing anything on IE
+    if(node.removeEventListener){
+      node.removeEventListener(evtName, fp, capture);
+    }
+  }
+
+  this.addListener = function(/*DOMNode*/node, /*String*/evtName, /*Function*/fp, /*Boolean*/capture, /*Boolean*/dontFix){
+    // summary:
+    //    adds a listener to the node
+    // evtName:
+    //    the name of the handler to add the listener to can be either of
+    //    the form "onclick" or "click"
+    // node:
+    //    DOM node to attach the event to
+    // fp:
+    //    the function to register
+    // capture:
+    //    Optional. Should this listener prevent propigation?
+    // dontFix:
+    //    Optional. Should we avoid registering a new closure around the
+    //    listener to enable fixEvent for dispatch of the registered
+    //    function?
+    if(!node){ return; } // FIXME: log and/or bail?
+    if(!capture){ var capture = false; }
+    evtName = dojo.event.browser.normalizedEventName(evtName);
+    if( (evtName == "onkey") || (evtName == "key") ){
+      if(dojo.render.html.ie){
+        this.addListener(node, "onkeydown", fp, capture, dontFix);
+      }
+      evtName = "onkeypress";
+    }
+    if(evtName.substr(0,2)!="on"){ evtName = "on"+evtName; }
+
+    if(!dontFix){
+      // build yet another closure around fp in order to inject fixEvent
+      // around the resulting event
+      var newfp = function(evt){
+        if(!evt){ evt = window.event; }
+        var ret = fp(dojo.event.browser.fixEvent(evt, this));
+        if(capture){
+          dojo.event.browser.stopEvent(evt);
+        }
+        return ret;
+      }
+    }else{
+      newfp = fp;
+    }
+
+    if(node.addEventListener){ 
+      node.addEventListener(evtName.substr(2), newfp, capture);
+      return newfp;
+    }else{
+      if(typeof node[evtName] == "function" ){
+        var oldEvt = node[evtName];
+        node[evtName] = function(e){
+          oldEvt(e);
+          return newfp(e);
+        }
+      }else{
+        node[evtName]=newfp;
+      }
+      if(dojo.render.html.ie){
+        this.addClobberNodeAttrs(node, [evtName]);
+      }
+      return newfp;
+    }
+  }
+
+  this.isEvent = function(/*Object*/obj){
+    // summary: 
+    //    Tries to determine whether or not the object is a DOM event.
+
+    // FIXME: event detection hack ... could test for additional attributes
+    // if necessary
+    return (typeof obj != "undefined")&&(typeof Event != "undefined")&&(obj.eventPhase); // Boolean
+    // Event does not support instanceof in Opera, otherwise:
+    //return (typeof Event != "undefined")&&(obj instanceof Event);
+  }
+
+  this.currentEvent = null;
+  
+  this.callListener = function(/*Function*/listener, /*DOMNode*/curTarget){
+    // summary:
+    //    calls the specified listener in the context of the passed node
+    //    with the current DOM event object as the only parameter
+    // listener:
+    //    the function to call
+    // curTarget:
+    //    the Node to call the function in the scope of
+    if(typeof listener != 'function'){
+      dojo.raise("listener not a function: " + listener);
+    }
+    dojo.event.browser.currentEvent.currentTarget = curTarget;
+    return listener.call(curTarget, dojo.event.browser.currentEvent);
+  }
+
+  this._stopPropagation = function(){
+    dojo.event.browser.currentEvent.cancelBubble = true; 
+  }
+
+  this._preventDefault = function(){
+    dojo.event.browser.currentEvent.returnValue = false;
+  }
+
+  this.keys = {
+    KEY_BACKSPACE: 8,
+    KEY_TAB: 9,
+    KEY_CLEAR: 12,
+    KEY_ENTER: 13,
+    KEY_SHIFT: 16,
+    KEY_CTRL: 17,
+    KEY_ALT: 18,
+    KEY_PAUSE: 19,
+    KEY_CAPS_LOCK: 20,
+    KEY_ESCAPE: 27,
+    KEY_SPACE: 32,
+    KEY_PAGE_UP: 33,
+    KEY_PAGE_DOWN: 34,
+    KEY_END: 35,
+    KEY_HOME: 36,
+    KEY_LEFT_ARROW: 37,
+    KEY_UP_ARROW: 38,
+    KEY_RIGHT_ARROW: 39,
+    KEY_DOWN_ARROW: 40,
+    KEY_INSERT: 45,
+    KEY_DELETE: 46,
+    KEY_HELP: 47,
+    KEY_LEFT_WINDOW: 91,
+    KEY_RIGHT_WINDOW: 92,
+    KEY_SELECT: 93,
+    KEY_NUMPAD_0: 96,
+    KEY_NUMPAD_1: 97,
+    KEY_NUMPAD_2: 98,
+    KEY_NUMPAD_3: 99,
+    KEY_NUMPAD_4: 100,
+    KEY_NUMPAD_5: 101,
+    KEY_NUMPAD_6: 102,
+    KEY_NUMPAD_7: 103,
+    KEY_NUMPAD_8: 104,
+    KEY_NUMPAD_9: 105,
+    KEY_NUMPAD_MULTIPLY: 106,
+    KEY_NUMPAD_PLUS: 107,
+    KEY_NUMPAD_ENTER: 108,
+    KEY_NUMPAD_MINUS: 109,
+    KEY_NUMPAD_PERIOD: 110,
+    KEY_NUMPAD_DIVIDE: 111,
+    KEY_F1: 112,
+    KEY_F2: 113,
+    KEY_F3: 114,
+    KEY_F4: 115,
+    KEY_F5: 116,
+    KEY_F6: 117,
+    KEY_F7: 118,
+    KEY_F8: 119,
+    KEY_F9: 120,
+    KEY_F10: 121,
+    KEY_F11: 122,
+    KEY_F12: 123,
+    KEY_F13: 124,
+    KEY_F14: 125,
+    KEY_F15: 126,
+    KEY_NUM_LOCK: 144,
+    KEY_SCROLL_LOCK: 145
+  };
+
+  // reverse lookup
+  this.revKeys = [];
+  for(var key in this.keys){
+    this.revKeys[this.keys[key]] = key;
+  }
+
+  this.fixEvent = function(/*Event*/evt, /*DOMNode*/sender){
+    // summary:
+    //    normalizes properties on the event object including event
+    //    bubbling methods, keystroke normalization, and x/y positions
+    // evt: the native event object
+    // sender: the node to treat as "currentTarget"
+    if(!evt){
+      if(window["event"]){
+        evt = window.event;
+      }
+    }
+    
+    if((evt["type"])&&(evt["type"].indexOf("key") == 0)){ // key events
+      evt.keys = this.revKeys;
+      // FIXME: how can we eliminate this iteration?
+      for(var key in this.keys){
+        evt[key] = this.keys[key];
+      }
+      if(evt["type"] == "keydown" && dojo.render.html.ie){
+        switch(evt.keyCode){
+          case evt.KEY_SHIFT:
+          case evt.KEY_CTRL:
+          case evt.KEY_ALT:
+          case evt.KEY_CAPS_LOCK:
+          case evt.KEY_LEFT_WINDOW:
+          case evt.KEY_RIGHT_WINDOW:
+          case evt.KEY_SELECT:
+          case evt.KEY_NUM_LOCK:
+          case evt.KEY_SCROLL_LOCK:
+          // I'll get these in keypress after the OS munges them based on numlock
+          case evt.KEY_NUMPAD_0:
+          case evt.KEY_NUMPAD_1:
+          case evt.KEY_NUMPAD_2:
+          case evt.KEY_NUMPAD_3:
+          case evt.KEY_NUMPAD_4:
+          case evt.KEY_NUMPAD_5:
+          case evt.KEY_NUMPAD_6:
+          case evt.KEY_NUMPAD_7:
+          case evt.KEY_NUMPAD_8:
+          case evt.KEY_NUMPAD_9:
+          case evt.KEY_NUMPAD_PERIOD:
+            break; // just ignore the keys that can morph
+          case evt.KEY_NUMPAD_MULTIPLY:
+          case evt.KEY_NUMPAD_PLUS:
+          case evt.KEY_NUMPAD_ENTER:
+          case evt.KEY_NUMPAD_MINUS:
+          case evt.KEY_NUMPAD_DIVIDE:
+            break; // I could handle these but just pick them up in keypress
+          case evt.KEY_PAUSE:
+          case evt.KEY_TAB:
+          case evt.KEY_BACKSPACE:
+          case evt.KEY_ENTER:
+          case evt.KEY_ESCAPE:
+          case evt.KEY_PAGE_UP:
+          case evt.KEY_PAGE_DOWN:
+          case evt.KEY_END:
+          case evt.KEY_HOME:
+          case evt.KEY_LEFT_ARROW:
+          case evt.KEY_UP_ARROW:
+          case evt.KEY_RIGHT_ARROW:
+          case evt.KEY_DOWN_ARROW:
+          case evt.KEY_INSERT:
+          case evt.KEY_DELETE:
+          case evt.KEY_F1:
+          case evt.KEY_F2:
+          case evt.KEY_F3:
+          case evt.KEY_F4:
+          case evt.KEY_F5:
+          case evt.KEY_F6:
+          case evt.KEY_F7:
+          case evt.KEY_F8:
+          case evt.KEY_F9:
+          case evt.KEY_F10:
+          case evt.KEY_F11:
+          case evt.KEY_F12:
+          case evt.KEY_F12:
+          case evt.KEY_F13:
+          case evt.KEY_F14:
+          case evt.KEY_F15:
+          case evt.KEY_CLEAR:
+          case evt.KEY_HELP:
+            evt.key = evt.keyCode;
+            break;
+          default:
+            if(evt.ctrlKey || evt.altKey){
+              var unifiedCharCode = evt.keyCode;
+              // if lower case but keycode is uppercase, convert it
+              if(unifiedCharCode >= 65 && unifiedCharCode <= 90 && evt.shiftKey == false){
+                unifiedCharCode += 32;
+              }
+              if(unifiedCharCode >= 1 && unifiedCharCode <= 26 && evt.ctrlKey){
+                unifiedCharCode += 96; // 001-032 = ctrl+[a-z]
+              }
+              evt.key = String.fromCharCode(unifiedCharCode);
+            }
+        }
+      } else if(evt["type"] == "keypress"){
+        if(dojo.render.html.opera){
+          if(evt.which == 0){
+            evt.key = evt.keyCode;
+          }else if(evt.which > 0){
+            switch(evt.which){
+              case evt.KEY_SHIFT:
+              case evt.KEY_CTRL:
+              case evt.KEY_ALT:
+              case evt.KEY_CAPS_LOCK:
+              case evt.KEY_NUM_LOCK:
+              case evt.KEY_SCROLL_LOCK:
+                break;
+              case evt.KEY_PAUSE:
+              case evt.KEY_TAB:
+              case evt.KEY_BACKSPACE:
+              case evt.KEY_ENTER:
+              case evt.KEY_ESCAPE:
+                evt.key = evt.which;
+                break;
+              default:
+                var unifiedCharCode = evt.which;
+                if((evt.ctrlKey || evt.altKey || evt.metaKey) && (evt.which >= 65 && evt.which <= 90 && evt.shiftKey == false)){
+                  unifiedCharCode += 32;
+                }
+                evt.key = String.fromCharCode(unifiedCharCode);
+            }
+          }
+        }else if(dojo.render.html.ie){ // catch some IE keys that are hard to get in keyDown
+          // key combinations were handled in onKeyDown
+          if(!evt.ctrlKey && !evt.altKey && evt.keyCode >= evt.KEY_SPACE){
+            evt.key = String.fromCharCode(evt.keyCode);
+          }
+        }else if(dojo.render.html.safari){
+          switch(evt.keyCode){
+            case 63232: evt.key = evt.KEY_UP_ARROW; break;
+            case 63233: evt.key = evt.KEY_DOWN_ARROW; break;
+            case 63234: evt.key = evt.KEY_LEFT_ARROW; break;
+            case 63235: evt.key = evt.KEY_RIGHT_ARROW; break;
+            default: 
+              evt.key = evt.charCode > 0 ? String.fromCharCode(evt.charCode) : evt.keyCode;
+          }
+        }else{
+          evt.key = evt.charCode > 0 ? String.fromCharCode(evt.charCode) : evt.keyCode;
+        }
+      }
+    }
+    if(dojo.render.html.ie){
+      if(!evt.target){ evt.target = evt.srcElement; }
+      if(!evt.currentTarget){ evt.currentTarget = (sender ? sender : evt.srcElement); }
+      if(!evt.layerX){ evt.layerX = evt.offsetX; }
+      if(!evt.layerY){ evt.layerY = evt.offsetY; }
+      // FIXME: scroll position query is duped from dojo.html to avoid dependency on that entire module
+      // DONOT replace the following to use dojo.body(), in IE, document.documentElement should be used
+      // here rather than document.body
+      var doc = (evt.srcElement && evt.srcElement.ownerDocument) ? evt.srcElement.ownerDocument : document;
+      var docBody = ((dojo.render.html.ie55)||(doc["compatMode"] == "BackCompat")) ? doc.body : doc.documentElement;
+      if(!evt.pageX){ evt.pageX = evt.clientX + (docBody.scrollLeft || 0) }
+      if(!evt.pageY){ evt.pageY = evt.clientY + (docBody.scrollTop || 0) }
+      // mouseover
+      if(evt.type == "mouseover"){ evt.relatedTarget = evt.fromElement; }
+      // mouseout
+      if(evt.type == "mouseout"){ evt.relatedTarget = evt.toElement; }
+      this.currentEvent = evt;
+      evt.callListener = this.callListener;
+      evt.stopPropagation = this._stopPropagation;
+      evt.preventDefault = this._preventDefault;
+    }
+    return evt; // Event
+  }
+
+  this.stopEvent = function(/*Event*/evt){
+    // summary:
+    //    prevents propigation and clobbers the default action of the
+    //    passed event
+    // evt: Optional for IE. The native event object.
+    if(window.event){
+      evt.returnValue = false;
+      evt.cancelBubble = true;
+    }else{
+      evt.preventDefault();
+      evt.stopPropagation();
+    }
+  }
 }
-catch(e){
-}
-try{
-window.onload=null;
-}
-catch(e){
-}
-try{
-window.onunload=null;
-}
-catch(e){
-}
-dojo._ie_clobber.clobberNodes=[];
-});
-}
-dojo.event.browser=new function(){
-var _4fd=0;
-this.normalizedEventName=function(_4fe){
-switch(_4fe){
-case "CheckboxStateChange":
-case "DOMAttrModified":
-case "DOMMenuItemActive":
-case "DOMMenuItemInactive":
-case "DOMMouseScroll":
-case "DOMNodeInserted":
-case "DOMNodeRemoved":
-case "RadioStateChange":
-return _4fe;
-break;
-default:
-return _4fe.toLowerCase();
-break;
-}
-};
-this.clean=function(node){
-if(dojo.render.html.ie){
-dojo._ie_clobber.clobber(node);
-}
-};
-this.addClobberNode=function(node){
-if(!dojo.render.html.ie){
-return;
-}
-if(!node["__doClobber__"]){
-node.__doClobber__=true;
-dojo._ie_clobber.clobberNodes.push(node);
-node.__clobberAttrs__=[];
-}
-};
-this.addClobberNodeAttrs=function(node,_502){
-if(!dojo.render.html.ie){
-return;
-}
-this.addClobberNode(node);
-for(var x=0;x<_502.length;x++){
-node.__clobberAttrs__.push(_502[x]);
-}
-};
-this.removeListener=function(node,_505,fp,_507){
-if(!_507){
-var _507=false;
-}
-_505=dojo.event.browser.normalizedEventName(_505);
-if((_505=="onkey")||(_505=="key")){
-if(dojo.render.html.ie){
-this.removeListener(node,"onkeydown",fp,_507);
-}
-_505="onkeypress";
-}
-if(_505.substr(0,2)=="on"){
-_505=_505.substr(2);
-}
-if(node.removeEventListener){
-node.removeEventListener(_505,fp,_507);
-}
-};
-this.addListener=function(node,_509,fp,_50b,_50c){
-if(!node){
-return;
-}
-if(!_50b){
-var _50b=false;
-}
-_509=dojo.event.browser.normalizedEventName(_509);
-if((_509=="onkey")||(_509=="key")){
-if(dojo.render.html.ie){
-this.addListener(node,"onkeydown",fp,_50b,_50c);
-}
-_509="onkeypress";
-}
-if(_509.substr(0,2)!="on"){
-_509="on"+_509;
-}
-if(!_50c){
-var _50d=function(evt){
-if(!evt){
-evt=window.event;
-}
-var ret=fp(dojo.event.browser.fixEvent(evt,this));
-if(_50b){
-dojo.event.browser.stopEvent(evt);
-}
-return ret;
-};
-}else{
-_50d=fp;
-}
-if(node.addEventListener){
-node.addEventListener(_509.substr(2),_50d,_50b);
-return _50d;
-}else{
-if(typeof node[_509]=="function"){
-var _510=node[_509];
-node[_509]=function(e){
-_510(e);
-return _50d(e);
-};
-}else{
-node[_509]=_50d;
-}
-if(dojo.render.html.ie){
-this.addClobberNodeAttrs(node,[_509]);
-}
-return _50d;
-}
-};
-this.isEvent=function(obj){
-return (typeof obj!="undefined")&&(typeof Event!="undefined")&&(obj.eventPhase);
-};
-this.currentEvent=null;
-this.callListener=function(_513,_514){
-if(typeof _513!="function"){
-dojo.raise("listener not a function: "+_513);
-}
-dojo.event.browser.currentEvent.currentTarget=_514;
-return _513.call(_514,dojo.event.browser.currentEvent);
-};
-this._stopPropagation=function(){
-dojo.event.browser.currentEvent.cancelBubble=true;
-};
-this._preventDefault=function(){
-dojo.event.browser.currentEvent.returnValue=false;
-};
-this.keys={KEY_BACKSPACE:8,KEY_TAB:9,KEY_CLEAR:12,KEY_ENTER:13,KEY_SHIFT:16,KEY_CTRL:17,KEY_ALT:18,KEY_PAUSE:19,KEY_CAPS_LOCK:20,KEY_ESCAPE:27,KEY_SPACE:32,KEY_PAGE_UP:33,KEY_PAGE_DOWN:34,KEY_END:35,KEY_HOME:36,KEY_LEFT_ARROW:37,KEY_UP_ARROW:38,KEY_RIGHT_ARROW:39,KEY_DOWN_ARROW:40,KEY_INSERT:45,KEY_DELETE:46,KEY_HELP:47,KEY_LEFT_WINDOW:91,KEY_RIGHT_WINDOW:92,KEY_SELECT:93,KEY_NUMPAD_0:96,KEY_NUMPAD_1:97,KEY_NUMPAD_2:98,KEY_NUMPAD_3:99,KEY_NUMPAD_4:100,KEY_NUMPAD_5:101,KEY_NUMPAD_6:102,KEY_NUMPAD_7:103,KEY_NUMPAD_8:104,KEY_NUMPAD_9:105,KEY_NUMPAD_MULTIPLY:106,KEY_NUMPAD_PLUS:107,KEY_NUMPAD_ENTER:108,KEY_NUMPAD_MINUS:109,KEY_NUMPAD_PERIOD:110,KEY_NUMPAD_DIVIDE:111,KEY_F1:112,KEY_F2:113,KEY_F3:114,KEY_F4:115,KEY_F5:116,KEY_F6:117,KEY_F7:118,KEY_F8:119,KEY_F9:120,KEY_F10:121,KEY_F11:122,KEY_F12:123,KEY_F13:124,KEY_F14:125,KEY_F15:126,KEY_NUM_LOCK:144,KEY_SCROLL_LOCK:145};
-this.revKeys=[];
-for(var key in this.keys){
-this.revKeys[this.keys[key]]=key;
-}
-this.fixEvent=function(evt,_517){
-if(!evt){
-if(window["event"]){
-evt=window.event;
-}
-}
-if((evt["type"])&&(evt["type"].indexOf("key")==0)){
-evt.keys=this.revKeys;
-for(var key in this.keys){
-evt[key]=this.keys[key];
-}
-if(evt["type"]=="keydown"&&dojo.render.html.ie){
-switch(evt.keyCode){
-case evt.KEY_SHIFT:
-case evt.KEY_CTRL:
-case evt.KEY_ALT:
-case evt.KEY_CAPS_LOCK:
-case evt.KEY_LEFT_WINDOW:
-case evt.KEY_RIGHT_WINDOW:
-case evt.KEY_SELECT:
-case evt.KEY_NUM_LOCK:
-case evt.KEY_SCROLL_LOCK:
-case evt.KEY_NUMPAD_0:
-case evt.KEY_NUMPAD_1:
-case evt.KEY_NUMPAD_2:
-case evt.KEY_NUMPAD_3:
-case evt.KEY_NUMPAD_4:
-case evt.KEY_NUMPAD_5:
-case evt.KEY_NUMPAD_6:
-case evt.KEY_NUMPAD_7:
-case evt.KEY_NUMPAD_8:
-case evt.KEY_NUMPAD_9:
-case evt.KEY_NUMPAD_PERIOD:
-break;
-case evt.KEY_NUMPAD_MULTIPLY:
-case evt.KEY_NUMPAD_PLUS:
-case evt.KEY_NUMPAD_ENTER:
-case evt.KEY_NUMPAD_MINUS:
-case evt.KEY_NUMPAD_DIVIDE:
-break;
-case evt.KEY_PAUSE:
-case evt.KEY_TAB:
-case evt.KEY_BACKSPACE:
-case evt.KEY_ENTER:
-case evt.KEY_ESCAPE:
-case evt.KEY_PAGE_UP:
-case evt.KEY_PAGE_DOWN:
-case evt.KEY_END:
-case evt.KEY_HOME:
-case evt.KEY_LEFT_ARROW:
-case evt.KEY_UP_ARROW:
-case evt.KEY_RIGHT_ARROW:
-case evt.KEY_DOWN_ARROW:
-case evt.KEY_INSERT:
-case evt.KEY_DELETE:
-case evt.KEY_F1:
-case evt.KEY_F2:
-case evt.KEY_F3:
-case evt.KEY_F4:
-case evt.KEY_F5:
-case evt.KEY_F6:
-case evt.KEY_F7:
-case evt.KEY_F8:
-case evt.KEY_F9:
-case evt.KEY_F10:
-case evt.KEY_F11:
-case evt.KEY_F12:
-case evt.KEY_F12:
-case evt.KEY_F13:
-case evt.KEY_F14:
-case evt.KEY_F15:
-case evt.KEY_CLEAR:
-case evt.KEY_HELP:
-evt.key=evt.keyCode;
-break;
-default:
-if(evt.ctrlKey||evt.altKey){
-var _519=evt.keyCode;
-if(_519>=65&&_519<=90&&evt.shiftKey==false){
-_519+=32;
-}
-if(_519>=1&&_519<=26&&evt.ctrlKey){
-_519+=96;
-}
-evt.key=String.fromCharCode(_519);
-}
-}
-}else{
-if(evt["type"]=="keypress"){
-if(dojo.render.html.opera){
-if(evt.which==0){
-evt.key=evt.keyCode;
-}else{
-if(evt.which>0){
-switch(evt.which){
-case evt.KEY_SHIFT:
-case evt.KEY_CTRL:
-case evt.KEY_ALT:
-case evt.KEY_CAPS_LOCK:
-case evt.KEY_NUM_LOCK:
-case evt.KEY_SCROLL_LOCK:
-break;
-case evt.KEY_PAUSE:
-case evt.KEY_TAB:
-case evt.KEY_BACKSPACE:
-case evt.KEY_ENTER:
-case evt.KEY_ESCAPE:
-evt.key=evt.which;
-break;
-default:
-var _519=evt.which;
-if((evt.ctrlKey||evt.altKey||evt.metaKey)&&(evt.which>=65&&evt.which<=90&&evt.shiftKey==false)){
-_519+=32;
-}
-evt.key=String.fromCharCode(_519);
-}
-}
-}
-}else{
-if(dojo.render.html.ie){
-if(!evt.ctrlKey&&!evt.altKey&&evt.keyCode>=evt.KEY_SPACE){
-evt.key=String.fromCharCode(evt.keyCode);
-}
-}else{
-if(dojo.render.html.safari){
-switch(evt.keyCode){
-case 63232:
-evt.key=evt.KEY_UP_ARROW;
-break;
-case 63233:
-evt.key=evt.KEY_DOWN_ARROW;
-break;
-case 63234:
-evt.key=evt.KEY_LEFT_ARROW;
-break;
-case 63235:
-evt.key=evt.KEY_RIGHT_ARROW;
-break;
-default:
-evt.key=evt.charCode>0?String.fromCharCode(evt.charCode):evt.keyCode;
-}
-}else{
-evt.key=evt.charCode>0?String.fromCharCode(evt.charCode):evt.keyCode;
-}
-}
-}
-}
-}
-}
-if(dojo.render.html.ie){
-if(!evt.target){
-evt.target=evt.srcElement;
-}
-if(!evt.currentTarget){
-evt.currentTarget=(_517?_517:evt.srcElement);
-}
-if(!evt.layerX){
-evt.layerX=evt.offsetX;
-}
-if(!evt.layerY){
-evt.layerY=evt.offsetY;
-}
-var doc=(evt.srcElement&&evt.srcElement.ownerDocument)?evt.srcElement.ownerDocument:document;
-var _51b=((dojo.render.html.ie55)||(doc["compatMode"]=="BackCompat"))?doc.body:doc.documentElement;
-if(!evt.pageX){
-evt.pageX=evt.clientX+(_51b.scrollLeft||0);
-}
-if(!evt.pageY){
-evt.pageY=evt.clientY+(_51b.scrollTop||0);
-}
-if(evt.type=="mouseover"){
-evt.relatedTarget=evt.fromElement;
-}
-if(evt.type=="mouseout"){
-evt.relatedTarget=evt.toElement;
-}
-this.currentEvent=evt;
-evt.callListener=this.callListener;
-evt.stopPropagation=this._stopPropagation;
-evt.preventDefault=this._preventDefault;
-}
-return evt;
-};
-this.stopEvent=function(evt){
-if(window.event){
-evt.returnValue=false;
-evt.cancelBubble=true;
-}else{
-evt.preventDefault();
-evt.stopPropagation();
-}
-};
-};
+
 dojo.provide("dojo.event.*");
+
+/*    This is the dojo logging facility, which is imported from nWidgets
+    (written by Alex Russell, CLA on file), which is patterned on the
+    Python logging module, which in turn has been heavily influenced by
+    log4j (execpt with some more pythonic choices, which we adopt as well).
+
+    While the dojo logging facilities do provide a set of familiar
+    interfaces, many of the details are changed to reflect the constraints
+    of the browser environment. Mainly, file and syslog-style logging
+    facilites are not provided, with HTTP POST and GET requests being the
+    only ways of getting data from the browser back to a server. Minimal
+    support for this (and XML serialization of logs) is provided, but may
+    not be of practical use in a deployment environment.
+
+    The Dojo logging classes are agnostic of any environment, and while
+    default loggers are provided for browser-based interpreter
+    environments, this file and the classes it define are explicitly
+    designed to be portable to command-line interpreters and other
+    ECMA-262v3 envrionments.
+
+  the logger needs to accomidate:
+    log "levels"
+    type identifiers
+    file?
+    message
+    tic/toc?
+
+  The logger should ALWAYS record:
+    time/date logged
+    message
+    type
+    level
+*/
+// TODO: conver documentation to javadoc style once we confirm that is our choice
+// TODO: define DTD for XML-formatted log messages
+// TODO: write XML Formatter class
+// TODO: write HTTP Handler which uses POST to send log lines/sections
+
+// Filename:  LogCore.js
+// Purpose:   a common logging infrastructure for dojo
+// Classes:   dojo.logging, dojo.logging.Logger, dojo.logging.Record, dojo.logging.LogFilter
+// Global Objects:  dojo.logging
+// Dependencies:  none
+
 dojo.provide("dojo.logging.Logger");
-dojo.logging.Record=function(lvl,msg){
-this.level=lvl;
-this.message="";
-this.msgArgs=[];
-this.time=new Date();
-if(dojo.lang.isArray(msg)){
-if(msg.length>0&&dojo.lang.isString(msg[0])){
-this.message=msg.shift();
+
+/*
+  A simple data structure class that stores information for and about
+  a logged event. Objects of this type are created automatically when
+  an event is logged and are the internal format in which information
+  about log events is kept.
+*/
+
+dojo.logging.Record = function(lvl, msg){
+  this.level = lvl;
+  this.message = "";
+  this.msgArgs = [];
+  this.time = new Date();
+  
+  if(dojo.lang.isArray(msg)){
+    if(msg.length > 0 && dojo.lang.isString(msg[0])){
+      this.message=msg.shift();
+    }
+    this.msgArgs=msg;
+  }else{
+    this.message=msg;
+  }
+  // FIXME: what other information can we receive/discover here?
 }
-this.msgArgs=msg;
-}else{
-this.message=msg;
+
+// an empty parent (abstract) class which concrete filters should inherit from.
+dojo.logging.LogFilter = function(loggerChain){
+  this.passChain = loggerChain || "";
+  this.filter = function(record){
+    // FIXME: need to figure out a way to enforce the loggerChain
+    // restriction
+    return true; // pass all records
+  }
 }
-};
-dojo.logging.LogFilter=function(_51f){
-this.passChain=_51f||"";
-this.filter=function(_520){
-return true;
-};
-};
-dojo.logging.Logger=function(){
-this.cutOffLevel=0;
-this.propagate=true;
-this.parent=null;
-this.data=[];
-this.filters=[];
-this.handlers=[];
-};
-dojo.extend(dojo.logging.Logger,{argsToArr:function(args){
-var ret=[];
-for(var x=0;x<args.length;x++){
-ret.push(args[x]);
+
+dojo.logging.Logger = function(){
+  this.cutOffLevel = 0;
+  this.propagate = true;
+  this.parent = null;
+  // storage for dojo.logging.Record objects seen and accepted by this logger
+  this.data = [];
+  this.filters = [];
+  this.handlers = [];
 }
-return ret;
-},setLevel:function(lvl){
-this.cutOffLevel=parseInt(lvl);
-},isEnabledFor:function(lvl){
-return parseInt(lvl)>=this.cutOffLevel;
-},getEffectiveLevel:function(){
-if((this.cutOffLevel==0)&&(this.parent)){
-return this.parent.getEffectiveLevel();
+
+dojo.extend(dojo.logging.Logger,{
+  argsToArr: function(args){
+    // utility function, reproduced from __util__ here to remove dependency
+    var ret = [];
+    for(var x=0; x<args.length; x++){
+      ret.push(args[x]);
+    }
+    return ret;
+  },
+
+  setLevel: function(lvl){
+    this.cutOffLevel = parseInt(lvl);
+  },
+
+  isEnabledFor: function(lvl){
+    return parseInt(lvl) >= this.cutOffLevel;
+  },
+
+  getEffectiveLevel: function(){
+    if((this.cutOffLevel==0)&&(this.parent)){
+      return this.parent.getEffectiveLevel();
+    }
+    return this.cutOffLevel;
+  },
+
+  addFilter: function(flt){
+    this.filters.push(flt);
+    return this.filters.length-1;
+  },
+
+  removeFilterByIndex: function(fltIndex){
+    if(this.filters[fltIndex]){
+      delete this.filters[fltIndex];
+      return true;
+    }
+    return false;
+  },
+
+  removeFilter: function(fltRef){
+    for(var x=0; x<this.filters.length; x++){
+      if(this.filters[x]===fltRef){
+        delete this.filters[x];
+        return true;
+      }
+    }
+    return false;
+  },
+
+  removeAllFilters: function(){
+    this.filters = []; // clobber all of them
+  },
+
+  filter: function(rec){
+    for(var x=0; x<this.filters.length; x++){
+      if((this.filters[x]["filter"])&&
+         (!this.filters[x].filter(rec))||
+         (rec.level<this.cutOffLevel)){
+        return false;
+      }
+    }
+    return true;
+  },
+
+  addHandler: function(hdlr){
+    this.handlers.push(hdlr);
+    return this.handlers.length-1;
+  },
+
+  handle: function(rec){
+    if((!this.filter(rec))||(rec.level<this.cutOffLevel)){ return false; }
+    for(var x=0; x<this.handlers.length; x++){
+      if(this.handlers[x]["handle"]){
+         this.handlers[x].handle(rec);
+      }
+    }
+    // FIXME: not sure what to do about records to be propagated that may have
+    // been modified by the handlers or the filters at this logger. Should
+    // parents always have pristine copies? or is passing the modified record
+    // OK?
+    // if((this.propagate)&&(this.parent)){ this.parent.handle(rec); }
+    return true;
+  },
+
+  // the heart and soul of the logging system
+  log: function(lvl, msg){
+    if( (this.propagate)&&(this.parent)&&
+      (this.parent.rec.level>=this.cutOffLevel)){
+      this.parent.log(lvl, msg);
+      return false;
+    }
+    // FIXME: need to call logging providers here!
+    this.handle(new dojo.logging.Record(lvl, msg));
+    return true;
+  },
+
+  // logger helpers
+  debug:function(msg){
+    return this.logType("DEBUG", this.argsToArr(arguments));
+  },
+
+  info: function(msg){
+    return this.logType("INFO", this.argsToArr(arguments));
+  },
+
+  warning: function(msg){
+    return this.logType("WARNING", this.argsToArr(arguments));
+  },
+
+  error: function(msg){
+    return this.logType("ERROR", this.argsToArr(arguments));
+  },
+
+  critical: function(msg){
+    return this.logType("CRITICAL", this.argsToArr(arguments));
+  },
+
+  exception: function(msg, e, squelch){
+    // FIXME: this needs to be modified to put the exception in the msg
+    // if we're on Moz, we can get the following from the exception object:
+    //    lineNumber
+    //    message
+    //    fileName
+    //    stack
+    //    name
+    // on IE, we get:
+    //    name
+    //    message (from MDA?)
+    //    number
+    //    description (same as message!)
+    if(e){
+      var eparts = [e.name, (e.description||e.message)];
+      if(e.fileName){
+        eparts.push(e.fileName);
+        eparts.push("line "+e.lineNumber);
+        // eparts.push(e.stack);
+      }
+      msg += " "+eparts.join(" : ");
+    }
+
+    this.logType("ERROR", msg);
+    if(!squelch){
+      throw e;
+    }
+  },
+
+  logType: function(type, args){
+    return this.log.apply(this, [dojo.logging.log.getLevel(type), 
+      args]);
+  },
+  
+  warn:function(){
+    this.warning.apply(this,arguments);
+  },
+  err:function(){
+    this.error.apply(this,arguments);
+  },
+  crit:function(){
+    this.critical.apply(this,arguments);
+  }
+});
+
+// the Handler class
+dojo.logging.LogHandler = function(level){
+  this.cutOffLevel = (level) ? level : 0;
+  this.formatter = null; // FIXME: default formatter?
+  this.data = [];
+  this.filters = [];
 }
-return this.cutOffLevel;
-},addFilter:function(flt){
-this.filters.push(flt);
-return this.filters.length-1;
-},removeFilterByIndex:function(_527){
-if(this.filters[_527]){
-delete this.filters[_527];
-return true;
+dojo.lang.extend(dojo.logging.LogHandler,{
+  
+  setFormatter:function(formatter){
+    dojo.unimplemented("setFormatter");
+  },
+  
+  flush:function(){},
+  close:function(){},
+  handleError:function(){},
+  
+  handle:function(record){
+    if((this.filter(record))&&(record.level>=this.cutOffLevel)){
+      this.emit(record);
+    }
+  },
+  
+  emit:function(record){
+    dojo.unimplemented("emit");
+  }
+});
+
+// set aliases since we don't want to inherit from dojo.logging.Logger
+void(function(){ // begin globals protection closure
+  var names = [
+    "setLevel", "addFilter", "removeFilterByIndex", "removeFilter",
+    "removeAllFilters", "filter"
+  ];
+  var tgt = dojo.logging.LogHandler.prototype;
+  var src = dojo.logging.Logger.prototype;
+  for(var x=0; x<names.length; x++){
+    tgt[names[x]] = src[names[x]];
+  }
+})(); // end globals protection closure
+
+dojo.logging.log = new dojo.logging.Logger();
+
+// an associative array of logger objects. This object inherits from
+// a list of level names with their associated numeric levels
+dojo.logging.log.levels = [ {"name": "DEBUG", "level": 1},
+               {"name": "INFO", "level": 2},
+               {"name": "WARNING", "level": 3},
+               {"name": "ERROR", "level": 4},
+               {"name": "CRITICAL", "level": 5} ];
+
+dojo.logging.log.loggers = {};
+
+dojo.logging.log.getLogger = function(name){
+  if(!this.loggers[name]){
+    this.loggers[name] = new dojo.logging.Logger();
+    this.loggers[name].parent = this;
+  }
+  return this.loggers[name];
 }
-return false;
-},removeFilter:function(_528){
-for(var x=0;x<this.filters.length;x++){
-if(this.filters[x]===_528){
-delete this.filters[x];
-return true;
+
+dojo.logging.log.getLevelName = function(lvl){
+  for(var x=0; x<this.levels.length; x++){
+    if(this.levels[x].level == lvl){
+      return this.levels[x].name;
+    }
+  }
+  return null;
 }
+
+dojo.logging.log.addLevelName = function(name, lvl){
+  if(this.getLevelName(name)){
+    this.err("could not add log level "+name+" because a level with that name already exists");
+    return false;
+  }
+  this.levels.append({"name": name, "level": parseInt(lvl)});
+  return true;
 }
-return false;
-},removeAllFilters:function(){
-this.filters=[];
-},filter:function(rec){
-for(var x=0;x<this.filters.length;x++){
-if((this.filters[x]["filter"])&&(!this.filters[x].filter(rec))||(rec.level<this.cutOffLevel)){
-return false;
+
+dojo.logging.log.getLevel = function(name){
+  for(var x=0; x<this.levels.length; x++){
+    if(this.levels[x].name.toUpperCase() == name.toUpperCase()){
+      return this.levels[x].level;
+    }
+  }
+  return null;
 }
+
+// a default handler class, it simply saves all of the handle()'d records in
+// memory. Useful for attaching to with dojo.event.connect()
+dojo.logging.MemoryLogHandler = function(level, recordsToKeep, postType, postInterval){
+  // mixin style inheritance
+  dojo.logging.LogHandler.call(this, level);
+  // default is unlimited
+  this.numRecords = (typeof djConfig['loggingNumRecords'] != 'undefined') ? djConfig['loggingNumRecords'] : ((recordsToKeep) ? recordsToKeep : -1);
+  // 0=count, 1=time, -1=don't post TODO: move this to a better location for prefs
+  this.postType = (typeof djConfig['loggingPostType'] != 'undefined') ? djConfig['loggingPostType'] : ( postType || -1);
+  // milliseconds for time, interger for number of records, -1 for non-posting,
+  this.postInterval = (typeof djConfig['loggingPostInterval'] != 'undefined') ? djConfig['loggingPostInterval'] : ( postType || -1);
 }
-return true;
-},addHandler:function(hdlr){
-this.handlers.push(hdlr);
-return this.handlers.length-1;
-},handle:function(rec){
-if((!this.filter(rec))||(rec.level<this.cutOffLevel)){
-return false;
-}
-for(var x=0;x<this.handlers.length;x++){
-if(this.handlers[x]["handle"]){
-this.handlers[x].handle(rec);
-}
-}
-return true;
-},log:function(lvl,msg){
-if((this.propagate)&&(this.parent)&&(this.parent.rec.level>=this.cutOffLevel)){
-this.parent.log(lvl,msg);
-return false;
-}
-this.handle(new dojo.logging.Record(lvl,msg));
-return true;
-},debug:function(msg){
-return this.logType("DEBUG",this.argsToArr(arguments));
-},info:function(msg){
-return this.logType("INFO",this.argsToArr(arguments));
-},warning:function(msg){
-return this.logType("WARNING",this.argsToArr(arguments));
-},error:function(msg){
-return this.logType("ERROR",this.argsToArr(arguments));
-},critical:function(msg){
-return this.logType("CRITICAL",this.argsToArr(arguments));
-},exception:function(msg,e,_538){
-if(e){
-var _539=[e.name,(e.description||e.message)];
-if(e.fileName){
-_539.push(e.fileName);
-_539.push("line "+e.lineNumber);
-}
-msg+=" "+_539.join(" : ");
-}
-this.logType("ERROR",msg);
-if(!_538){
-throw e;
-}
-},logType:function(type,args){
-return this.log.apply(this,[dojo.logging.log.getLevel(type),args]);
-},warn:function(){
-this.warning.apply(this,arguments);
-},err:function(){
-this.error.apply(this,arguments);
-},crit:function(){
-this.critical.apply(this,arguments);
-}});
-dojo.logging.LogHandler=function(_53c){
-this.cutOffLevel=(_53c)?_53c:0;
-this.formatter=null;
-this.data=[];
-this.filters=[];
-};
-dojo.lang.extend(dojo.logging.LogHandler,{setFormatter:function(_53d){
-dojo.unimplemented("setFormatter");
-},flush:function(){
-},close:function(){
-},handleError:function(){
-},handle:function(_53e){
-if((this.filter(_53e))&&(_53e.level>=this.cutOffLevel)){
-this.emit(_53e);
-}
-},emit:function(_53f){
-dojo.unimplemented("emit");
-}});
-void (function(){
-var _540=["setLevel","addFilter","removeFilterByIndex","removeFilter","removeAllFilters","filter"];
-var tgt=dojo.logging.LogHandler.prototype;
-var src=dojo.logging.Logger.prototype;
-for(var x=0;x<_540.length;x++){
-tgt[_540[x]]=src[_540[x]];
-}
-})();
-dojo.logging.log=new dojo.logging.Logger();
-dojo.logging.log.levels=[{"name":"DEBUG","level":1},{"name":"INFO","level":2},{"name":"WARNING","level":3},{"name":"ERROR","level":4},{"name":"CRITICAL","level":5}];
-dojo.logging.log.loggers={};
-dojo.logging.log.getLogger=function(name){
-if(!this.loggers[name]){
-this.loggers[name]=new dojo.logging.Logger();
-this.loggers[name].parent=this;
-}
-return this.loggers[name];
-};
-dojo.logging.log.getLevelName=function(lvl){
-for(var x=0;x<this.levels.length;x++){
-if(this.levels[x].level==lvl){
-return this.levels[x].name;
-}
-}
-return null;
-};
-dojo.logging.log.addLevelName=function(name,lvl){
-if(this.getLevelName(name)){
-this.err("could not add log level "+name+" because a level with that name already exists");
-return false;
-}
-this.levels.append({"name":name,"level":parseInt(lvl)});
-return true;
-};
-dojo.logging.log.getLevel=function(name){
-for(var x=0;x<this.levels.length;x++){
-if(this.levels[x].name.toUpperCase()==name.toUpperCase()){
-return this.levels[x].level;
-}
-}
-return null;
-};
-dojo.logging.MemoryLogHandler=function(_54b,_54c,_54d,_54e){
-dojo.logging.LogHandler.call(this,_54b);
-this.numRecords=(typeof djConfig["loggingNumRecords"]!="undefined")?djConfig["loggingNumRecords"]:((_54c)?_54c:-1);
-this.postType=(typeof djConfig["loggingPostType"]!="undefined")?djConfig["loggingPostType"]:(_54d||-1);
-this.postInterval=(typeof djConfig["loggingPostInterval"]!="undefined")?djConfig["loggingPostInterval"]:(_54d||-1);
-};
-dojo.lang.inherits(dojo.logging.MemoryLogHandler,dojo.logging.LogHandler);
-dojo.lang.extend(dojo.logging.MemoryLogHandler,{emit:function(_54f){
-if(!djConfig.isDebug){
-return;
-}
-var _550=String(dojo.log.getLevelName(_54f.level)+": "+_54f.time.toLocaleTimeString())+": "+_54f.message;
-if(!dj_undef("println",dojo.hostenv)){
-dojo.hostenv.println(_550);
-}
-this.data.push(_54f);
-if(this.numRecords!=-1){
-while(this.data.length>this.numRecords){
-this.data.shift();
-}
-}
-}});
-dojo.logging.logQueueHandler=new dojo.logging.MemoryLogHandler(0,50,0,10000);
+
+dojo.lang.inherits(dojo.logging.MemoryLogHandler, dojo.logging.LogHandler);
+dojo.lang.extend(dojo.logging.MemoryLogHandler,{
+  
+  emit:function(record){
+    if (!djConfig.isDebug) { return; }
+    
+    var logStr = String(dojo.log.getLevelName(record.level)+": "
+          +record.time.toLocaleTimeString())+": "+record.message;
+    if(!dj_undef("println", dojo.hostenv)){
+      dojo.hostenv.println(logStr);
+    }
+    
+    this.data.push(record);
+    if(this.numRecords != -1){
+      while(this.data.length>this.numRecords){
+        this.data.shift();
+      }
+    }
+  }
+});
+
+dojo.logging.logQueueHandler = new dojo.logging.MemoryLogHandler(0,50,0,10000);
+
 dojo.logging.log.addHandler(dojo.logging.logQueueHandler);
-dojo.log=dojo.logging.log;
+dojo.log = dojo.logging.log;
+
 dojo.provide("dojo.logging.*");
+
 dojo.provide("dojo.string.common");
-dojo.string.trim=function(str,wh){
-if(!str.replace){
-return str;
+
+dojo.string.trim = function(/* string */str, /* integer? */wh){
+  //  summary
+  //  Trim whitespace from str.  If wh > 0, trim from start, if wh < 0, trim from end, else both
+  if(!str.replace){ return str; }
+  if(!str.length){ return str; }
+  var re = (wh > 0) ? (/^\s+/) : (wh < 0) ? (/\s+$/) : (/^\s+|\s+$/g);
+  return str.replace(re, ""); //  string
 }
-if(!str.length){
-return str;
+
+dojo.string.trimStart = function(/* string */str) {
+  //  summary
+  //  Trim whitespace at the beginning of 'str'
+  return dojo.string.trim(str, 1);  //  string
 }
-var re=(wh>0)?(/^\s+/):(wh<0)?(/\s+$/):(/^\s+|\s+$/g);
-return str.replace(re,"");
-};
-dojo.string.trimStart=function(str){
-return dojo.string.trim(str,1);
-};
-dojo.string.trimEnd=function(str){
-return dojo.string.trim(str,-1);
-};
-dojo.string.repeat=function(str,_557,_558){
-var out="";
-for(var i=0;i<_557;i++){
-out+=str;
-if(_558&&i<_557-1){
-out+=_558;
+
+dojo.string.trimEnd = function(/* string */str) {
+  //  summary
+  //  Trim whitespace at the end of 'str'
+  return dojo.string.trim(str, -1);
 }
+
+dojo.string.repeat = function(/* string */str, /* integer */count, /* string? */separator) {
+  //  summary
+  //  Return 'str' repeated 'count' times, optionally placing 'separator' between each rep
+  var out = "";
+  for(var i = 0; i < count; i++) {
+    out += str;
+    if(separator && i < count - 1) {
+      out += separator;
+    }
+  }
+  return out; //  string
 }
-return out;
-};
-dojo.string.pad=function(str,len,c,dir){
-var out=String(str);
-if(!c){
-c="0";
+
+dojo.string.pad = function(/* string */str, /* integer */len/*=2*/, /* string */ c/*='0'*/, /* integer */dir/*=1*/) {
+  //  summary
+  //  Pad 'str' to guarantee that it is at least 'len' length with the character 'c' at either the 
+  //  start (dir=1) or end (dir=-1) of the string
+  var out = String(str);
+  if(!c) {
+    c = '0';
+  }
+  if(!dir) {
+    dir = 1;
+  }
+  while(out.length < len) {
+    if(dir > 0) {
+      out = c + out;
+    } else {
+      out += c;
+    }
+  }
+  return out; //  string
 }
-if(!dir){
-dir=1;
+
+dojo.string.padLeft = function(/* string */str, /* integer */len, /* string */c) {
+  //  summary
+  //  same as dojo.string.pad(str, len, c, 1)
+  return dojo.string.pad(str, len, c, 1); //  string
 }
-while(out.length<len){
-if(dir>0){
-out=c+out;
-}else{
-out+=c;
+
+dojo.string.padRight = function(/* string */str, /* integer */len, /* string */c) {
+  //  summary
+  //  same as dojo.string.pad(str, len, c, -1)
+  return dojo.string.pad(str, len, c, -1);  //  string
 }
-}
-return out;
-};
-dojo.string.padLeft=function(str,len,c){
-return dojo.string.pad(str,len,c,1);
-};
-dojo.string.padRight=function(str,len,c){
-return dojo.string.pad(str,len,c,-1);
-};
+
 dojo.provide("dojo.string");
+
 dojo.provide("dojo.io.common");
-dojo.io.transports=[];
-dojo.io.hdlrFuncNames=["load","error","timeout"];
-dojo.io.Request=function(url,_567,_568,_569){
-if((arguments.length==1)&&(arguments[0].constructor==Object)){
-this.fromKwArgs(arguments[0]);
-}else{
-this.url=url;
-if(_567){
-this.mimetype=_567;
+
+/******************************************************************************
+ *  Notes about dojo.io design:
+ *  
+ *  The dojo.io.* package has the unenviable task of making a lot of different
+ *  types of I/O feel natural, despite a universal lack of good (or even
+ *  reasonable!) I/O capability in the host environment. So lets pin this down
+ *  a little bit further.
+ *
+ *  Rhino:
+ *    perhaps the best situation anywhere. Access to Java classes allows you
+ *    to do anything one might want in terms of I/O, both synchronously and
+ *    async. Can open TCP sockets and perform low-latency client/server
+ *    interactions. HTTP transport is available through Java HTTP client and
+ *    server classes. Wish it were always this easy.
+ *
+ *  xpcshell:
+ *    XPCOM for I/O.
+ *
+ *  spidermonkey:
+ *    S.O.L.
+ *
+ *  Browsers:
+ *    Browsers generally do not provide any useable filesystem access. We are
+ *    therefore limited to HTTP for moving information to and from Dojo
+ *    instances living in a browser.
+ *
+ *    XMLHTTP:
+ *      Sync or async, allows reading of arbitrary text files (including
+ *      JS, which can then be eval()'d), writing requires server
+ *      cooperation and is limited to HTTP mechanisms (POST and GET).
+ *
+ *    <iframe> hacks:
+ *      iframe document hacks allow browsers to communicate asynchronously
+ *      with a server via HTTP POST and GET operations. With significant
+ *      effort and server cooperation, low-latency data transit between
+ *      client and server can be acheived via iframe mechanisms (repubsub).
+ *
+ *    SVG:
+ *      Adobe's SVG viewer implements helpful primitives for XML-based
+ *      requests, but receipt of arbitrary text data seems unlikely w/o
+ *      <![CDATA[]]> sections.
+ *
+ *
+ *  A discussion between Dylan, Mark, Tom, and Alex helped to lay down a lot
+ *  the IO API interface. A transcript of it can be found at:
+ *    http://dojotoolkit.org/viewcvs/viewcvs.py/documents/irc/irc_io_api_log.txt?rev=307&view=auto
+ *  
+ *  Also referenced in the design of the API was the DOM 3 L&S spec:
+ *    http://www.w3.org/TR/2004/REC-DOM-Level-3-LS-20040407/load-save.html
+ ******************************************************************************/
+
+// a map of the available transport options. Transports should add themselves
+// by calling add(name)
+dojo.io.transports = [];
+dojo.io.hdlrFuncNames = [ "load", "error", "timeout" ]; // we're omitting a progress() event for now
+
+dojo.io.Request = function(/*String*/ url, /*String*/ mimetype, /*String*/ transport, /*String or Boolean*/ changeUrl){
+// summary:
+//    Constructs a Request object that is used by dojo.io.bind(). dojo.io.bind() will create one of these for you if
+//    you call dojo.io.bind() with an plain object containing the bind parameters.
+//    This method can either take the arguments specified, or an Object containing all of the parameters that you
+//    want to use to create the dojo.io.Request (similar to how dojo.io.bind() is called.
+//    The named parameters to this constructor represent the minimum set of parameters need
+  if((arguments.length == 1)&&(arguments[0].constructor == Object)){
+    this.fromKwArgs(arguments[0]);
+  }else{
+    this.url = url;
+    if(mimetype){ this.mimetype = mimetype; }
+    if(transport){ this.transport = transport; }
+    if(arguments.length >= 4){ this.changeUrl = changeUrl; }
+  }
 }
-if(_568){
-this.transport=_568;
+
+dojo.lang.extend(dojo.io.Request, {
+
+  /** The URL to hit */
+  url: "",
+  
+  /** The mime type used to interrpret the response body */
+  mimetype: "text/plain",
+  
+  /** The HTTP method to use */
+  method: "GET",
+  
+  /** An Object containing key-value pairs to be included with the request */
+  content: undefined, // Object
+  
+  /** The transport medium to use */
+  transport: undefined, // String
+  
+  /** If defined the URL of the page is physically changed */
+  changeUrl: undefined, // String
+  
+  /** A form node to use in the request */
+  formNode: undefined, // HTMLFormElement
+  
+  /** Whether the request should be made synchronously */
+  sync: false,
+  
+  bindSuccess: false,
+
+  /** Cache/look for the request in the cache before attempting to request?
+   *  NOTE: this isn't a browser cache, this is internal and would only cache in-page
+   */
+  useCache: false,
+
+  /** Prevent the browser from caching this by adding a query string argument to the URL */
+  preventCache: false,
+  
+  // events stuff
+  load: function(/*String*/ type, /*Object*/ data, /*Object*/ transportImplementation, /*Object*/ kwArgs){
+    // summary:
+    //    Called on successful completion of a bind.
+    //    type:
+    //        A string with value "load"
+    //    data:
+    //        The object representing the result of the bind. The actual structure
+    //        of the data object will depend on the mimetype that was given to bind
+    //        in the bind arguments.
+    //    transportImplementation:
+    //        The object that implements a particular transport. Structure is depedent
+    //        on the transport. For XMLHTTPTransport (dojo.io.BrowserIO), it will be the
+    //        XMLHttpRequest object from the browser.
+    //    kwArgs:
+    //        Object that contains the request parameters that were given to the
+    //        bind call. Useful for storing and retrieving state from when bind
+    //        was called.
+  },
+  error: function(/*String*/ type, /*Object*/ error, /*Object*/ transportImplementation, /*Object*/ kwArgs){
+    // summary:
+    //    Called when there is an error with a bind.
+    //    type:
+    //        A string with value "error"
+    //    error:
+    //        The error object. Should be a dojo.io.Error object, but not guaranteed.
+    //    transportImplementation:
+    //        The object that implements a particular transport. Structure is depedent
+    //        on the transport. For XMLHTTPTransport (dojo.io.BrowserIO), it will be the
+    //        XMLHttpRequest object from the browser.
+    //    kwArgs:
+    //        Object that contains the request parameters that were given to the
+    //        bind call. Useful for storing and retrieving state from when bind
+    //        was called.
+  },
+  timeout: function(/*String*/ type, /*Object*/ empty, /*Object*/ transportImplementation, /*Object*/ kwArgs){
+    // summary:
+    //    Called when there is an error with a bind. Only implemented in certain transports at this time.
+    //    type:
+    //        A string with value "timeout"
+    //    empty:
+    //        Should be null. Just a spacer argument so that load, error, timeout and handle have the
+    //        same signatures.
+    //    transportImplementation:
+    //        The object that implements a particular transport. Structure is depedent
+    //        on the transport. For XMLHTTPTransport (dojo.io.BrowserIO), it will be the
+    //        XMLHttpRequest object from the browser. May be null for the timeout case for
+    //        some transports.
+    //    kwArgs:
+    //        Object that contains the request parameters that were given to the
+    //        bind call. Useful for storing and retrieving state from when bind
+    //        was called.
+  },
+  handle: function(/*String*/ type, /*Object*/ data, /*Object*/ transportImplementation, /*Object*/ kwArgs){
+    // summary:
+    //    The handle method can be defined instead of defining separate load, error and timeout
+    //    callbacks.
+    //    type:
+    //        A string with the type of callback: "load", "error", or "timeout".
+    //    data:
+    //        See the above callbacks for what this parameter could be.
+    //    transportImplementation:
+    //        The object that implements a particular transport. Structure is depedent
+    //        on the transport. For XMLHTTPTransport (dojo.io.BrowserIO), it will be the
+    //        XMLHttpRequest object from the browser.
+    //    kwArgs:
+    //        Object that contains the request parameters that were given to the
+    //        bind call. Useful for storing and retrieving state from when bind
+    //        was called. 
+  },
+
+  //FIXME: change IframeIO.js to use timeouts?
+  // The number of seconds to wait until firing a timeout callback.
+  // If it is zero, that means, don't do a timeout check.
+  timeoutSeconds: 0,
+  
+  // the abort method needs to be filled in by the transport that accepts the
+  // bind() request
+  abort: function(){ },
+  
+  // backButton: function(){ },
+  // forwardButton: function(){ },
+
+  fromKwArgs: function(/*Object*/ kwArgs){
+    // summary:
+    //    Creates a dojo.io.Request from a simple object (kwArgs object).
+
+    // normalize args
+    if(kwArgs["url"]){ kwArgs.url = kwArgs.url.toString(); }
+    if(kwArgs["formNode"]) { kwArgs.formNode = dojo.byId(kwArgs.formNode); }
+    if(!kwArgs["method"] && kwArgs["formNode"] && kwArgs["formNode"].method) {
+      kwArgs.method = kwArgs["formNode"].method;
+    }
+    
+    // backwards compatibility
+    if(!kwArgs["handle"] && kwArgs["handler"]){ kwArgs.handle = kwArgs.handler; }
+    if(!kwArgs["load"] && kwArgs["loaded"]){ kwArgs.load = kwArgs.loaded; }
+    if(!kwArgs["changeUrl"] && kwArgs["changeURL"]) { kwArgs.changeUrl = kwArgs.changeURL; }
+
+    // encoding fun!
+    kwArgs.encoding = dojo.lang.firstValued(kwArgs["encoding"], djConfig["bindEncoding"], "");
+
+    kwArgs.sendTransport = dojo.lang.firstValued(kwArgs["sendTransport"], djConfig["ioSendTransport"], false);
+
+    var isFunction = dojo.lang.isFunction;
+    for(var x=0; x<dojo.io.hdlrFuncNames.length; x++){
+      var fn = dojo.io.hdlrFuncNames[x];
+      if(kwArgs[fn] && isFunction(kwArgs[fn])){ continue; }
+      if(kwArgs["handle"] && isFunction(kwArgs["handle"])){
+        kwArgs[fn] = kwArgs.handle;
+      }
+      // handler is aliased above, shouldn't need this check
+      /* else if(dojo.lang.isObject(kwArgs.handler)){
+        if(isFunction(kwArgs.handler[fn])){
+          kwArgs[fn] = kwArgs.handler[fn]||kwArgs.handler["handle"]||function(){};
+        }
+      }*/
+    }
+    dojo.lang.mixin(this, kwArgs);
+  }
+
+});
+
+dojo.io.Error = function(/*String*/ msg, /*String*/ type, /*Number*/num){
+  // summary:
+  //    Constructs an object representing a bind error.
+  this.message = msg;
+  this.type =  type || "unknown"; // must be one of "io", "parse", "unknown"
+  this.number = num || 0; // per-substrate error number, not normalized
 }
-if(arguments.length>=4){
-this.changeUrl=_569;
+
+dojo.io.transports.addTransport = function(name){
+  // summary:
+  //    Used to register transports that can support bind calls.
+  this.push(name);
+  // FIXME: do we need to handle things that aren't direct children of the
+  // dojo.io module? (say, dojo.io.foo.fooTransport?)
+  this[name] = dojo.io[name];
 }
+
+// binding interface, the various implementations register their capabilities
+// and the bind() method dispatches
+dojo.io.bind = function(/*Object*/ request){
+  // summary:
+  //    Binding interface for IO. Loading different IO transports, like
+  //    dojo.io.BrowserIO or dojo.io.IframeIO will register with bind
+  //    to handle particular types of bind calls.
+  //    request:
+  //        Object containing bind arguments. This object is converted to
+  //        a dojo.io.Request object, and that request object is the return
+  //        value for this method.
+  if(!(request instanceof dojo.io.Request)){
+    try{
+      request = new dojo.io.Request(request);
+    }catch(e){ dojo.debug(e); }
+  }
+
+  // if the request asks for a particular implementation, use it
+  var tsName = "";
+  if(request["transport"]){
+    tsName = request["transport"];
+    if(!this[tsName]){
+      dojo.io.sendBindError(request, "No dojo.io.bind() transport with name '"
+        + request["transport"] + "'.");
+      return request; //dojo.io.Request
+    }
+    if(!this[tsName].canHandle(request)){
+      dojo.io.sendBindError(request, "dojo.io.bind() transport with name '"
+        + request["transport"] + "' cannot handle this type of request.");
+      return request; //dojo.io.Request
+    }
+  }else{
+    // otherwise we do our best to auto-detect what available transports
+    // will handle 
+    for(var x=0; x<dojo.io.transports.length; x++){
+      var tmp = dojo.io.transports[x];
+      if((this[tmp])&&(this[tmp].canHandle(request))){
+        tsName = tmp;
+        break;
+      }
+    }
+    if(tsName == ""){
+      dojo.io.sendBindError(request, "None of the loaded transports for dojo.io.bind()"
+        + " can handle the request.");
+      return request; //dojo.io.Request
+    }
+  }
+  this[tsName].bind(request);
+  request.bindSuccess = true;
+  return request; //dojo.io.Request
 }
-};
-dojo.lang.extend(dojo.io.Request,{url:"",mimetype:"text/plain",method:"GET",content:undefined,transport:undefined,changeUrl:undefined,formNode:undefined,sync:false,bindSuccess:false,useCache:false,preventCache:false,load:function(type,data,_56c,_56d){
-},error:function(type,_56f,_570,_571){
-},timeout:function(type,_573,_574,_575){
-},handle:function(type,data,_578,_579){
-},timeoutSeconds:0,abort:function(){
-},fromKwArgs:function(_57a){
-if(_57a["url"]){
-_57a.url=_57a.url.toString();
+
+dojo.io.sendBindError = function(request /* Object */, message /* String */){
+  // summary:
+  //    Used internally by dojo.io.bind() to return/raise a bind error.
+
+  //Need to be careful since not all hostenvs support setTimeout.
+  if((typeof request.error == "function" || typeof request.handle == "function")
+    && (typeof setTimeout == "function" || typeof setTimeout == "object")){
+    var errorObject = new dojo.io.Error(message);
+    setTimeout(function(){
+      request[(typeof request.error == "function") ? "error" : "handle"]("error", errorObject, null, request);
+    }, 50);
+  }else{
+    dojo.raise(message);
+  }
 }
-if(_57a["formNode"]){
-_57a.formNode=dojo.byId(_57a.formNode);
+
+dojo.io.queueBind = function(/* Object */ request){
+  // summary:
+  //    queueBind will use dojo.io.bind() but guarantee that only one bind
+  //    call is handled at a time. If queueBind is called while a bind call
+  //    is in process, it will queue up the other calls to bind and call them
+  //    in order as bind calls complete.
+  //    request:
+  //      Same sort of request object as used for dojo.io.bind().
+  if(!(request instanceof dojo.io.Request)){
+    try{
+      request = new dojo.io.Request(request);
+    }catch(e){ dojo.debug(e); }
+  }
+
+  // make sure we get called if/when we get a response
+  var oldLoad = request.load;
+  request.load = function(){
+    dojo.io._queueBindInFlight = false;
+    var ret = oldLoad.apply(this, arguments);
+    dojo.io._dispatchNextQueueBind();
+    return ret;
+  }
+
+  var oldErr = request.error;
+  request.error = function(){
+    dojo.io._queueBindInFlight = false;
+    var ret = oldErr.apply(this, arguments);
+    dojo.io._dispatchNextQueueBind();
+    return ret;
+  }
+
+  dojo.io._bindQueue.push(request);
+  dojo.io._dispatchNextQueueBind();
+  return request; //dojo.io.Request
 }
-if(!_57a["method"]&&_57a["formNode"]&&_57a["formNode"].method){
-_57a.method=_57a["formNode"].method;
+
+dojo.io._dispatchNextQueueBind = function(){
+  // summary:
+  //  Private method used by dojo.io.queueBind().
+  if(!dojo.io._queueBindInFlight){
+    dojo.io._queueBindInFlight = true;
+    if(dojo.io._bindQueue.length > 0){
+      dojo.io.bind(dojo.io._bindQueue.shift());
+    }else{
+      dojo.io._queueBindInFlight = false;
+    }
+  }
 }
-if(!_57a["handle"]&&_57a["handler"]){
-_57a.handle=_57a.handler;
+dojo.io._bindQueue = [];
+dojo.io._queueBindInFlight = false;
+
+dojo.io.argsFromMap = function(/*Object*/ map, /*String*/ encoding, /*String*/ last){
+  // summary:
+  //    Converts name/values pairs in the map object to an URL-encoded string
+  //    with format of name1=value1&name2=value2...
+  //    map:
+  //      Object that has the contains the names and values.
+  //    encoding:
+  //      String to specify how to encode the name and value. If the encoding string
+  //      contains "utf" (case-insensitive), then encodeURIComponent is used. Otherwise
+  //      dojo.string.encodeAscii is used.
+  //    last:
+  //      The last parameter in the list. Helps with final string formatting?
+  var enc = /utf/i.test(encoding||"") ? encodeURIComponent : dojo.string.encodeAscii;
+  var mapped = [];
+  var control = new Object();
+  for(var name in map){
+    var domap = function(elt){
+      var val = enc(name)+"="+enc(elt);
+      mapped[(last == name) ? "push" : "unshift"](val);
+    }
+    if(!control[name]){
+      var value = map[name];
+      // FIXME: should be isArrayLike?
+      if (dojo.lang.isArray(value)){
+        dojo.lang.forEach(value, domap);
+      }else{
+        domap(value);
+      }
+    }
+  }
+  return mapped.join("&"); //String
 }
-if(!_57a["load"]&&_57a["loaded"]){
-_57a.load=_57a.loaded;
+
+dojo.io.setIFrameSrc = function(/*DOMNode*/ iframe, /*String*/ src, /*Boolean*/ replace){
+  //summary:
+  //    Sets the URL that is loaded in an IFrame. The replace parameter indicates whether
+  //    location.replace() should be used when changing the location of the iframe.
+  try{
+    var r = dojo.render.html;
+    // dojo.debug(iframe);
+    if(!replace){
+      if(r.safari){
+        iframe.location = src;
+      }else{
+        frames[iframe.name].location = src;
+      }
+    }else{
+      // Fun with DOM 0 incompatibilities!
+      var idoc;
+      if(r.ie){
+        idoc = iframe.contentWindow.document;
+      }else if(r.safari){
+        idoc = iframe.document;
+      }else{ //  if(r.moz){
+        idoc = iframe.contentWindow;
+      }
+
+      //For Safari (at least 2.0.3) and Opera, if the iframe
+      //has just been created but it doesn't have content
+      //yet, then iframe.document may be null. In that case,
+      //use iframe.location and return.
+      if(!idoc){
+        iframe.location = src;
+        return;
+      }else{
+        idoc.location.replace(src);
+      }
+    }
+  }catch(e){ 
+    dojo.debug(e); 
+    dojo.debug("setIFrameSrc: "+e); 
+  }
 }
-if(!_57a["changeUrl"]&&_57a["changeURL"]){
-_57a.changeUrl=_57a.changeURL;
+
+/*
+dojo.io.sampleTranport = new function(){
+  this.canHandle = function(kwArgs){
+    // canHandle just tells dojo.io.bind() if this is a good transport to
+    // use for the particular type of request.
+    if( 
+      (
+        (kwArgs["mimetype"] == "text/plain") ||
+        (kwArgs["mimetype"] == "text/html") ||
+        (kwArgs["mimetype"] == "text/javascript")
+      )&&(
+        (kwArgs["method"] == "get") ||
+        ( (kwArgs["method"] == "post") && (!kwArgs["formNode"]) )
+      )
+    ){
+      return true;
+    }
+
+    return false;
+  }
+
+  this.bind = function(kwArgs){
+    var hdlrObj = {};
+
+    // set up a handler object
+    for(var x=0; x<dojo.io.hdlrFuncNames.length; x++){
+      var fn = dojo.io.hdlrFuncNames[x];
+      if(typeof kwArgs.handler == "object"){
+        if(typeof kwArgs.handler[fn] == "function"){
+          hdlrObj[fn] = kwArgs.handler[fn]||kwArgs.handler["handle"];
+        }
+      }else if(typeof kwArgs[fn] == "function"){
+        hdlrObj[fn] = kwArgs[fn];
+      }else{
+        hdlrObj[fn] = kwArgs["handle"]||function(){};
+      }
+    }
+
+    // build a handler function that calls back to the handler obj
+    var hdlrFunc = function(evt){
+      if(evt.type == "onload"){
+        hdlrObj.load("load", evt.data, evt);
+      }else if(evt.type == "onerr"){
+        var errObj = new dojo.io.Error("sampleTransport Error: "+evt.msg);
+        hdlrObj.error("error", errObj);
+      }
+    }
+
+    // the sample transport would attach the hdlrFunc() when sending the
+    // request down the pipe at this point
+    var tgtURL = kwArgs.url+"?"+dojo.io.argsFromMap(kwArgs.content);
+    // sampleTransport.sendRequest(tgtURL, hdlrFunc);
+  }
+
+  dojo.io.transports.addTransport("sampleTranport");
 }
-_57a.encoding=dojo.lang.firstValued(_57a["encoding"],djConfig["bindEncoding"],"");
-_57a.sendTransport=dojo.lang.firstValued(_57a["sendTransport"],djConfig["ioSendTransport"],false);
-var _57b=dojo.lang.isFunction;
-for(var x=0;x<dojo.io.hdlrFuncNames.length;x++){
-var fn=dojo.io.hdlrFuncNames[x];
-if(_57a[fn]&&_57b(_57a[fn])){
-continue;
-}
-if(_57a["handle"]&&_57b(_57a["handle"])){
-_57a[fn]=_57a.handle;
-}
-}
-dojo.lang.mixin(this,_57a);
-}});
-dojo.io.Error=function(msg,type,num){
-this.message=msg;
-this.type=type||"unknown";
-this.number=num||0;
-};
-dojo.io.transports.addTransport=function(name){
-this.push(name);
-this[name]=dojo.io[name];
-};
-dojo.io.bind=function(_582){
-if(!(_582 instanceof dojo.io.Request)){
-try{
-_582=new dojo.io.Request(_582);
-}
-catch(e){
-dojo.debug(e);
-}
-}
-var _583="";
-if(_582["transport"]){
-_583=_582["transport"];
-if(!this[_583]){
-dojo.io.sendBindError(_582,"No dojo.io.bind() transport with name '"+_582["transport"]+"'.");
-return _582;
-}
-if(!this[_583].canHandle(_582)){
-dojo.io.sendBindError(_582,"dojo.io.bind() transport with name '"+_582["transport"]+"' cannot handle this type of request.");
-return _582;
-}
-}else{
-for(var x=0;x<dojo.io.transports.length;x++){
-var tmp=dojo.io.transports[x];
-if((this[tmp])&&(this[tmp].canHandle(_582))){
-_583=tmp;
-break;
-}
-}
-if(_583==""){
-dojo.io.sendBindError(_582,"None of the loaded transports for dojo.io.bind()"+" can handle the request.");
-return _582;
-}
-}
-this[_583].bind(_582);
-_582.bindSuccess=true;
-return _582;
-};
-dojo.io.sendBindError=function(_586,_587){
-if((typeof _586.error=="function"||typeof _586.handle=="function")&&(typeof setTimeout=="function"||typeof setTimeout=="object")){
-var _588=new dojo.io.Error(_587);
-setTimeout(function(){
-_586[(typeof _586.error=="function")?"error":"handle"]("error",_588,null,_586);
-},50);
-}else{
-dojo.raise(_587);
-}
-};
-dojo.io.queueBind=function(_589){
-if(!(_589 instanceof dojo.io.Request)){
-try{
-_589=new dojo.io.Request(_589);
-}
-catch(e){
-dojo.debug(e);
-}
-}
-var _58a=_589.load;
-_589.load=function(){
-dojo.io._queueBindInFlight=false;
-var ret=_58a.apply(this,arguments);
-dojo.io._dispatchNextQueueBind();
-return ret;
-};
-var _58c=_589.error;
-_589.error=function(){
-dojo.io._queueBindInFlight=false;
-var ret=_58c.apply(this,arguments);
-dojo.io._dispatchNextQueueBind();
-return ret;
-};
-dojo.io._bindQueue.push(_589);
-dojo.io._dispatchNextQueueBind();
-return _589;
-};
-dojo.io._dispatchNextQueueBind=function(){
-if(!dojo.io._queueBindInFlight){
-dojo.io._queueBindInFlight=true;
-if(dojo.io._bindQueue.length>0){
-dojo.io.bind(dojo.io._bindQueue.shift());
-}else{
-dojo.io._queueBindInFlight=false;
-}
-}
-};
-dojo.io._bindQueue=[];
-dojo.io._queueBindInFlight=false;
-dojo.io.argsFromMap=function(map,_58f,last){
-var enc=/utf/i.test(_58f||"")?encodeURIComponent:dojo.string.encodeAscii;
-var _592=[];
-var _593=new Object();
-for(var name in map){
-var _595=function(elt){
-var val=enc(name)+"="+enc(elt);
-_592[(last==name)?"push":"unshift"](val);
-};
-if(!_593[name]){
-var _598=map[name];
-if(dojo.lang.isArray(_598)){
-dojo.lang.forEach(_598,_595);
-}else{
-_595(_598);
-}
-}
-}
-return _592.join("&");
-};
-dojo.io.setIFrameSrc=function(_599,src,_59b){
-try{
-var r=dojo.render.html;
-if(!_59b){
-if(r.safari){
-_599.location=src;
-}else{
-frames[_599.name].location=src;
-}
-}else{
-var idoc;
-if(r.ie){
-idoc=_599.contentWindow.document;
-}else{
-if(r.safari){
-idoc=_599.document;
-}else{
-idoc=_599.contentWindow;
-}
-}
-if(!idoc){
-_599.location=src;
-return;
-}else{
-idoc.location.replace(src);
-}
-}
-}
-catch(e){
-dojo.debug(e);
-dojo.debug("setIFrameSrc: "+e);
-}
-};
+*/
+
 dojo.provide("dojo.string.extras");
-dojo.string.substituteParams=function(_59e,hash){
-var map=(typeof hash=="object")?hash:dojo.lang.toArray(arguments,1);
-return _59e.replace(/\%\{(\w+)\}/g,function(_5a1,key){
-if(typeof (map[key])!="undefined"&&map[key]!=null){
-return map[key];
-}
-dojo.raise("Substitution not found: "+key);
-});
+
+
+//TODO: should we use ${} substitution syntax instead, like widgets do?
+dojo.string.substituteParams = function(/*string*/template, /* object - optional or ... */hash){
+// summary:
+//  Performs parameterized substitutions on a string. Throws an exception if any parameter is unmatched.
+//
+// description:
+//  For example,
+//    dojo.string.substituteParams("File '%{0}' is not found in directory '%{1}'.","foo.html","/temp");
+//  returns
+//    "File 'foo.html' is not found in directory '/temp'."
+//
+// template: the original string template with %{values} to be replaced
+// hash: name/value pairs (type object) to provide substitutions.  Alternatively, substitutions may be
+//  included as arguments 1..n to this function, corresponding to template parameters 0..n-1
+
+  var map = (typeof hash == 'object') ? hash : dojo.lang.toArray(arguments, 1);
+
+  return template.replace(/\%\{(\w+)\}/g, function(match, key){
+    if(typeof(map[key]) != "undefined" && map[key] != null){
+      return map[key];
+    }
+    dojo.raise("Substitution not found: " + key);
+  }); // string
 };
-dojo.string.capitalize=function(str){
-if(!dojo.lang.isString(str)){
-return "";
+
+dojo.string.capitalize = function(/*string*/str){
+// summary:
+//  Uppercases the first letter of each word
+
+  if(!dojo.lang.isString(str)){ return ""; }
+  if(arguments.length == 0){ str = this; }
+
+  var words = str.split(' ');
+  for(var i=0; i<words.length; i++){
+    words[i] = words[i].charAt(0).toUpperCase() + words[i].substring(1);
+  }
+  return words.join(" "); // string
 }
-if(arguments.length==0){
-str=this;
+
+dojo.string.isBlank = function(/*string*/str){
+// summary:
+//  Return true if the entire string is whitespace characters
+
+  if(!dojo.lang.isString(str)){ return true; }
+  return (dojo.string.trim(str).length == 0); // boolean
 }
-var _5a4=str.split(" ");
-for(var i=0;i<_5a4.length;i++){
-_5a4[i]=_5a4[i].charAt(0).toUpperCase()+_5a4[i].substring(1);
+
+//FIXME: not sure exactly what encodeAscii is trying to do, or if it's working right
+dojo.string.encodeAscii = function(/*string*/str){
+  if(!dojo.lang.isString(str)){ return str; } // unknown
+  var ret = "";
+  var value = escape(str);
+  var match, re = /%u([0-9A-F]{4})/i;
+  while((match = value.match(re))){
+    var num = Number("0x"+match[1]);
+    var newVal = escape("&#" + num + ";");
+    ret += value.substring(0, match.index) + newVal;
+    value = value.substring(match.index+match[0].length);
+  }
+  ret += value.replace(/\+/g, "%2B");
+  return ret; // string
 }
-return _5a4.join(" ");
-};
-dojo.string.isBlank=function(str){
-if(!dojo.lang.isString(str)){
-return true;
+
+dojo.string.escape = function(/*string*/type, /*string*/str){
+// summary:
+//  Adds escape sequences for special characters according to the convention of 'type'
+//
+// type: one of xml|html|xhtml|sql|regexp|regex|javascript|jscript|js|ascii
+// str: the string to be escaped
+
+  var args = dojo.lang.toArray(arguments, 1);
+  switch(type.toLowerCase()){
+    case "xml":
+    case "html":
+    case "xhtml":
+      return dojo.string.escapeXml.apply(this, args); // string
+    case "sql":
+      return dojo.string.escapeSql.apply(this, args); // string
+    case "regexp":
+    case "regex":
+      return dojo.string.escapeRegExp.apply(this, args); // string
+    case "javascript":
+    case "jscript":
+    case "js":
+      return dojo.string.escapeJavaScript.apply(this, args); // string
+    case "ascii":
+      // so it's encode, but it seems useful
+      return dojo.string.encodeAscii.apply(this, args); // string
+    default:
+      return str; // string
+  }
 }
-return (dojo.string.trim(str).length==0);
-};
-dojo.string.encodeAscii=function(str){
-if(!dojo.lang.isString(str)){
-return str;
+
+dojo.string.escapeXml = function(/*string*/str, /*boolean*/noSingleQuotes){
+//summary:
+//  Adds escape sequences for special characters in XML: &<>"'
+//  Optionally skips escapes for single quotes
+
+  str = str.replace(/&/gm, "&amp;").replace(/</gm, "&lt;")
+    .replace(/>/gm, "&gt;").replace(/"/gm, "&quot;");
+  if(!noSingleQuotes){ str = str.replace(/'/gm, "&#39;"); }
+  return str; // string
 }
-var ret="";
-var _5a9=escape(str);
-var _5aa,re=/%u([0-9A-F]{4})/i;
-while((_5aa=_5a9.match(re))){
-var num=Number("0x"+_5aa[1]);
-var _5ad=escape("&#"+num+";");
-ret+=_5a9.substring(0,_5aa.index)+_5ad;
-_5a9=_5a9.substring(_5aa.index+_5aa[0].length);
+
+dojo.string.escapeSql = function(/*string*/str){
+//summary:
+//  Adds escape sequences for single quotes in SQL expressions
+
+  return str.replace(/'/gm, "''"); //string
 }
-ret+=_5a9.replace(/\+/g,"%2B");
-return ret;
-};
-dojo.string.escape=function(type,str){
-var args=dojo.lang.toArray(arguments,1);
-switch(type.toLowerCase()){
-case "xml":
-case "html":
-case "xhtml":
-return dojo.string.escapeXml.apply(this,args);
-case "sql":
-return dojo.string.escapeSql.apply(this,args);
-case "regexp":
-case "regex":
-return dojo.string.escapeRegExp.apply(this,args);
-case "javascript":
-case "jscript":
-case "js":
-return dojo.string.escapeJavaScript.apply(this,args);
-case "ascii":
-return dojo.string.encodeAscii.apply(this,args);
-default:
-return str;
+
+dojo.string.escapeRegExp = function(/*string*/str){
+//summary:
+//  Adds escape sequences for special characters in regular expressions
+
+  return str.replace(/\\/gm, "\\\\").replace(/([\f\b\n\t\r[\^$|?*+(){}])/gm, "\\$1"); // string
 }
-};
-dojo.string.escapeXml=function(str,_5b2){
-str=str.replace(/&/gm,"&amp;").replace(/</gm,"&lt;").replace(/>/gm,"&gt;").replace(/"/gm,"&quot;");
-if(!_5b2){
-str=str.replace(/'/gm,"&#39;");
+
+//FIXME: should this one also escape backslash?
+dojo.string.escapeJavaScript = function(/*string*/str){
+//summary:
+//  Adds escape sequences for single and double quotes as well
+//  as non-visible characters in JavaScript string literal expressions
+
+  return str.replace(/(["'\f\b\n\t\r])/gm, "\\$1"); // string
 }
-return str;
-};
-dojo.string.escapeSql=function(str){
-return str.replace(/'/gm,"''");
-};
-dojo.string.escapeRegExp=function(str){
-return str.replace(/\\/gm,"\\\\").replace(/([\f\b\n\t\r[\^$|?*+(){}])/gm,"\\$1");
-};
-dojo.string.escapeJavaScript=function(str){
-return str.replace(/(["'\f\b\n\t\r])/gm,"\\$1");
-};
-dojo.string.escapeString=function(str){
-return ("\""+str.replace(/(["\\])/g,"\\$1")+"\"").replace(/[\f]/g,"\\f").replace(/[\b]/g,"\\b").replace(/[\n]/g,"\\n").replace(/[\t]/g,"\\t").replace(/[\r]/g,"\\r");
-};
-dojo.string.summary=function(str,len){
-if(!len||str.length<=len){
-return str;
+
+//FIXME: looks a lot like escapeJavaScript, just adds quotes? deprecate one?
+dojo.string.escapeString = function(/*string*/str){
+//summary:
+//  Adds escape sequences for non-visual characters, double quote and backslash
+//  and surrounds with double quotes to form a valid string literal.
+  return ('"' + str.replace(/(["\\])/g, '\\$1') + '"'
+    ).replace(/[\f]/g, "\\f"
+    ).replace(/[\b]/g, "\\b"
+    ).replace(/[\n]/g, "\\n"
+    ).replace(/[\t]/g, "\\t"
+    ).replace(/[\r]/g, "\\r"); // string
 }
-return str.substring(0,len).replace(/\.+$/,"")+"...";
-};
-dojo.string.endsWith=function(str,end,_5bb){
-if(_5bb){
-str=str.toLowerCase();
-end=end.toLowerCase();
+
+// TODO: make an HTML version
+dojo.string.summary = function(/*string*/str, /*number*/len){
+// summary:
+//  Truncates 'str' after 'len' characters and appends periods as necessary so that it ends with "..."
+
+  if(!len || str.length <= len){
+    return str; // string
+  }
+
+  return str.substring(0, len).replace(/\.+$/, "") + "..."; // string
 }
-if((str.length-end.length)<0){
-return false;
+
+dojo.string.endsWith = function(/*string*/str, /*string*/end, /*boolean*/ignoreCase){
+// summary:
+//  Returns true if 'str' ends with 'end'
+
+  if(ignoreCase){
+    str = str.toLowerCase();
+    end = end.toLowerCase();
+  }
+  if((str.length - end.length) < 0){
+    return false; // boolean
+  }
+  return str.lastIndexOf(end) == str.length - end.length; // boolean
 }
-return str.lastIndexOf(end)==str.length-end.length;
-};
-dojo.string.endsWithAny=function(str){
-for(var i=1;i<arguments.length;i++){
-if(dojo.string.endsWith(str,arguments[i])){
-return true;
+
+dojo.string.endsWithAny = function(/*string*/str /* , ... */){
+// summary:
+//  Returns true if 'str' ends with any of the arguments[2 -> n]
+
+  for(var i = 1; i < arguments.length; i++) {
+    if(dojo.string.endsWith(str, arguments[i])) {
+      return true; // boolean
+    }
+  }
+  return false; // boolean
 }
+
+dojo.string.startsWith = function(/*string*/str, /*string*/start, /*boolean*/ignoreCase){
+// summary:
+//  Returns true if 'str' starts with 'start'
+
+  if(ignoreCase) {
+    str = str.toLowerCase();
+    start = start.toLowerCase();
+  }
+  return str.indexOf(start) == 0; // boolean
 }
-return false;
-};
-dojo.string.startsWith=function(str,_5bf,_5c0){
-if(_5c0){
-str=str.toLowerCase();
-_5bf=_5bf.toLowerCase();
+
+dojo.string.startsWithAny = function(/*string*/str /* , ... */){
+// summary:
+//  Returns true if 'str' starts with any of the arguments[2 -> n]
+
+  for(var i = 1; i < arguments.length; i++) {
+    if(dojo.string.startsWith(str, arguments[i])) {
+      return true; // boolean
+    }
+  }
+  return false; // boolean
 }
-return str.indexOf(_5bf)==0;
-};
-dojo.string.startsWithAny=function(str){
-for(var i=1;i<arguments.length;i++){
-if(dojo.string.startsWith(str,arguments[i])){
-return true;
+
+dojo.string.has = function(/*string*/str /* , ... */) {
+// summary:
+//  Returns true if 'str' contains any of the arguments 2 -> n
+
+  for(var i = 1; i < arguments.length; i++) {
+    if(str.indexOf(arguments[i]) > -1){
+      return true; // boolean
+    }
+  }
+  return false; // boolean
 }
+
+dojo.string.normalizeNewlines = function(/*string*/text, /*string? (\n or \r)*/newlineChar){
+// summary:
+//  Changes occurences of CR and LF in text to CRLF, or if newlineChar is provided as '\n' or '\r',
+//  substitutes newlineChar for occurrences of CR/LF and CRLF
+
+  if (newlineChar == "\n"){
+    text = text.replace(/\r\n/g, "\n");
+    text = text.replace(/\r/g, "\n");
+  } else if (newlineChar == "\r"){
+    text = text.replace(/\r\n/g, "\r");
+    text = text.replace(/\n/g, "\r");
+  }else{
+    text = text.replace(/([^\r])\n/g, "$1\r\n").replace(/\r([^\n])/g, "\r\n$1");
+  }
+  return text; // string
 }
-return false;
-};
-dojo.string.has=function(str){
-for(var i=1;i<arguments.length;i++){
-if(str.indexOf(arguments[i])>-1){
-return true;
+
+dojo.string.splitEscaped = function(/*string*/str, /*string of length=1*/charac){
+// summary:
+//  Splits 'str' into an array separated by 'charac', but skips characters escaped with a backslash
+
+  var components = [];
+  for (var i = 0, prevcomma = 0; i < str.length; i++){
+    if (str.charAt(i) == '\\'){ i++; continue; }
+    if (str.charAt(i) == charac){
+      components.push(str.substring(prevcomma, i));
+      prevcomma = i + 1;
+    }
+  }
+  components.push(str.substr(prevcomma));
+  return components; // array
 }
-}
-return false;
-};
-dojo.string.normalizeNewlines=function(text,_5c6){
-if(_5c6=="\n"){
-text=text.replace(/\r\n/g,"\n");
-text=text.replace(/\r/g,"\n");
-}else{
-if(_5c6=="\r"){
-text=text.replace(/\r\n/g,"\r");
-text=text.replace(/\n/g,"\r");
-}else{
-text=text.replace(/([^\r])\n/g,"$1\r\n").replace(/\r([^\n])/g,"\r\n$1");
-}
-}
-return text;
-};
-dojo.string.splitEscaped=function(str,_5c8){
-var _5c9=[];
-for(var i=0,_5cb=0;i<str.length;i++){
-if(str.charAt(i)=="\\"){
-i++;
-continue;
-}
-if(str.charAt(i)==_5c8){
-_5c9.push(str.substring(_5cb,i));
-_5cb=i+1;
-}
-}
-_5c9.push(str.substr(_5cb));
-return _5c9;
-};
+
 dojo.provide("dojo.undo.browser");
+
 try{
-if((!djConfig["preventBackButtonFix"])&&(!dojo.hostenv.post_load_)){
-document.write("<iframe style='border: 0px; width: 1px; height: 1px; position: absolute; bottom: 0px; right: 0px; visibility: visible;' name='djhistory' id='djhistory' src='"+(dojo.hostenv.getBaseScriptUri()+"iframe_history.html")+"'></iframe>");
-}
-}
-catch(e){
-}
+  if((!djConfig["preventBackButtonFix"])&&(!dojo.hostenv.post_load_)){
+    document.write("<iframe style='border: 0px; width: 1px; height: 1px; position: absolute; bottom: 0px; right: 0px; visibility: visible;' name='djhistory' id='djhistory' src='"+(dojo.hostenv.getBaseScriptUri()+'iframe_history.html')+"'></iframe>");
+  }
+}catch(e){/* squelch */}
+
 if(dojo.render.html.opera){
-dojo.debug("Opera is not supported with dojo.undo.browser, so back/forward detection will not work.");
+  dojo.debug("Opera is not supported with dojo.undo.browser, so back/forward detection will not work.");
 }
-dojo.undo.browser={initialHref:window.location.href,initialHash:window.location.hash,moveForward:false,historyStack:[],forwardStack:[],historyIframe:null,bookmarkAnchor:null,locationTimer:null,setInitialState:function(args){
-this.initialState=this._createState(this.initialHref,args,this.initialHash);
-},addToHistory:function(args){
-this.forwardStack=[];
-var hash=null;
-var url=null;
-if(!this.historyIframe){
-this.historyIframe=window.frames["djhistory"];
+
+/* NOTES:
+ *  Safari 1.2: 
+ *  back button "works" fine, however it's not possible to actually
+ *  DETECT that you've moved backwards by inspecting window.location.
+ *  Unless there is some other means of locating.
+ *  FIXME: perhaps we can poll on history.length?
+ *  Safari 2.0.3+ (and probably 1.3.2+):
+ *  works fine, except when changeUrl is used. When changeUrl is used,
+ *  Safari jumps all the way back to whatever page was shown before
+ *  the page that uses dojo.undo.browser support.
+ *  IE 5.5 SP2:
+ *  back button behavior is macro. It does not move back to the
+ *  previous hash value, but to the last full page load. This suggests
+ *  that the iframe is the correct way to capture the back button in
+ *  these cases.
+ *  Don't test this page using local disk for MSIE. MSIE will not create 
+ *  a history list for iframe_history.html if served from a file: URL. 
+ *  The XML served back from the XHR tests will also not be properly 
+ *  created if served from local disk. Serve the test pages from a web 
+ *  server to test in that browser.
+ *  IE 6.0:
+ *  same behavior as IE 5.5 SP2
+ * Firefox 1.0+:
+ *  the back button will return us to the previous hash on the same
+ *  page, thereby not requiring an iframe hack, although we do then
+ *  need to run a timer to detect inter-page movement.
+ */
+
+dojo.undo.browser = {
+  initialHref: window.location.href,
+  initialHash: window.location.hash,
+
+  moveForward: false,
+  historyStack: [],
+  forwardStack: [],
+  historyIframe: null,
+  bookmarkAnchor: null,
+  locationTimer: null,
+
+  /**
+   * setInitialState sets the state object and back callback for the very first page that is loaded.
+   * It is recommended that you call this method as part of an event listener that is registered via
+   * dojo.addOnLoad().
+   */
+  setInitialState: function(args){
+    this.initialState = this._createState(this.initialHref, args, this.initialHash);
+  },
+
+  //FIXME: Would like to support arbitrary back/forward jumps. Have to rework iframeLoaded among other things.
+  //FIXME: is there a slight race condition in moz using change URL with the timer check and when
+  //       the hash gets set? I think I have seen a back/forward call in quick succession, but not consistent.
+  /**
+   * addToHistory takes one argument, and it is an object that defines the following functions:
+   * - To support getting back button notifications, the object argument should implement a
+   *   function called either "back", "backButton", or "handle". The string "back" will be
+   *   passed as the first and only argument to this callback.
+   * - To support getting forward button notifications, the object argument should implement a
+   *   function called either "forward", "forwardButton", or "handle". The string "forward" will be
+   *   passed as the first and only argument to this callback.
+   * - If you want the browser location string to change, define "changeUrl" on the object. If the
+   *   value of "changeUrl" is true, then a unique number will be appended to the URL as a fragment
+   *   identifier (http://some.domain.com/path#uniquenumber). If it is any other value that does
+   *   not evaluate to false, that value will be used as the fragment identifier. For example,
+   *   if changeUrl: 'page1', then the URL will look like: http://some.domain.com/path#page1
+   *   
+   * Full example:
+   * 
+   * dojo.undo.browser.addToHistory({
+   *   back: function() { alert('back pressed'); },
+   *   forward: function() { alert('forward pressed'); },
+   *   changeUrl: true
+   * });
+   */
+  addToHistory: function(args){
+    //If addToHistory is called, then that means we prune the
+    //forward stack -- the user went back, then wanted to
+    //start a new forward path.
+    this.forwardStack = []; 
+
+    var hash = null;
+    var url = null;
+    if(!this.historyIframe){
+      this.historyIframe = window.frames["djhistory"];
+    }
+    if(!this.bookmarkAnchor){
+      this.bookmarkAnchor = document.createElement("a");
+      dojo.body().appendChild(this.bookmarkAnchor);
+      this.bookmarkAnchor.style.display = "none";
+    }
+    if(args["changeUrl"]){
+      hash = "#"+ ((args["changeUrl"]!==true) ? args["changeUrl"] : (new Date()).getTime());
+      
+      //If the current hash matches the new one, just replace the history object with
+      //this new one. It doesn't make sense to track different state objects for the same
+      //logical URL. This matches the browser behavior of only putting in one history
+      //item no matter how many times you click on the same #hash link, at least in Firefox
+      //and Safari, and there is no reliable way in those browsers to know if a #hash link
+      //has been clicked on multiple times. So making this the standard behavior in all browsers
+      //so that dojo.undo.browser's behavior is the same in all browsers.
+      if(this.historyStack.length == 0 && this.initialState.urlHash == hash){
+        this.initialState = this._createState(url, args, hash);
+        return;
+      }else if(this.historyStack.length > 0 && this.historyStack[this.historyStack.length - 1].urlHash == hash){
+        this.historyStack[this.historyStack.length - 1] = this._createState(url, args, hash);
+        return;
+      }
+
+      this.changingUrl = true;
+      setTimeout("window.location.href = '"+hash+"'; dojo.undo.browser.changingUrl = false;", 1);
+      this.bookmarkAnchor.href = hash;
+      
+      if(dojo.render.html.ie){
+        url = this._loadIframeHistory();
+
+        var oldCB = args["back"]||args["backButton"]||args["handle"];
+
+        //The function takes handleName as a parameter, in case the
+        //callback we are overriding was "handle". In that case,
+        //we will need to pass the handle name to handle.
+        var tcb = function(handleName){
+          if(window.location.hash != ""){
+            setTimeout("window.location.href = '"+hash+"';", 1);
+          }
+          //Use apply to set "this" to args, and to try to avoid memory leaks.
+          oldCB.apply(this, [handleName]);
+        }
+    
+        //Set interceptor function in the right place.
+        if(args["back"]){
+          args.back = tcb;
+        }else if(args["backButton"]){
+          args.backButton = tcb;
+        }else if(args["handle"]){
+          args.handle = tcb;
+        }
+    
+        var oldFW = args["forward"]||args["forwardButton"]||args["handle"];
+    
+        //The function takes handleName as a parameter, in case the
+        //callback we are overriding was "handle". In that case,
+        //we will need to pass the handle name to handle.
+        var tfw = function(handleName){
+          if(window.location.hash != ""){
+            window.location.href = hash;
+          }
+          if(oldFW){ // we might not actually have one
+            //Use apply to set "this" to args, and to try to avoid memory leaks.
+            oldFW.apply(this, [handleName]);
+          }
+        }
+
+        //Set interceptor function in the right place.
+        if(args["forward"]){
+          args.forward = tfw;
+        }else if(args["forwardButton"]){
+          args.forwardButton = tfw;
+        }else if(args["handle"]){
+          args.handle = tfw;
+        }
+
+      }else if(dojo.render.html.moz){
+        // start the timer
+        if(!this.locationTimer){
+          this.locationTimer = setInterval("dojo.undo.browser.checkLocation();", 200);
+        }
+      }
+    }else{
+      url = this._loadIframeHistory();
+    }
+
+    this.historyStack.push(this._createState(url, args, hash));
+  },
+
+  checkLocation: function(){
+    if (!this.changingUrl){
+      var hsl = this.historyStack.length;
+
+      if((window.location.hash == this.initialHash||window.location.href == this.initialHref)&&(hsl == 1)){
+        // FIXME: could this ever be a forward button?
+        // we can't clear it because we still need to check for forwards. Ugg.
+        // clearInterval(this.locationTimer);
+        this.handleBackButton();
+        return;
+      }
+      
+      // first check to see if we could have gone forward. We always halt on
+      // a no-hash item.
+      if(this.forwardStack.length > 0){
+        if(this.forwardStack[this.forwardStack.length-1].urlHash == window.location.hash){
+          this.handleForwardButton();
+          return;
+        }
+      }
+  
+      // ok, that didn't work, try someplace back in the history stack
+      if((hsl >= 2)&&(this.historyStack[hsl-2])){
+        if(this.historyStack[hsl-2].urlHash==window.location.hash){
+          this.handleBackButton();
+          return;
+        }
+      }
+    }
+  },
+
+  iframeLoaded: function(evt, ifrLoc){
+    if(!dojo.render.html.opera){
+      var query = this._getUrlQuery(ifrLoc.href);
+      if(query == null){ 
+        // alert("iframeLoaded");
+        // we hit the end of the history, so we should go back
+        if(this.historyStack.length == 1){
+          this.handleBackButton();
+        }
+        return;
+      }
+      if(this.moveForward){
+        // we were expecting it, so it's not either a forward or backward movement
+        this.moveForward = false;
+        return;
+      }
+  
+      //Check the back stack first, since it is more likely.
+      //Note that only one step back or forward is supported.
+      if(this.historyStack.length >= 2 && query == this._getUrlQuery(this.historyStack[this.historyStack.length-2].url)){
+        this.handleBackButton();
+      }
+      else if(this.forwardStack.length > 0 && query == this._getUrlQuery(this.forwardStack[this.forwardStack.length-1].url)){
+        this.handleForwardButton();
+      }
+    }
+  },
+
+  handleBackButton: function(){
+    //The "current" page is always at the top of the history stack.
+    var current = this.historyStack.pop();
+    if(!current){ return; }
+    var last = this.historyStack[this.historyStack.length-1];
+    if(!last && this.historyStack.length == 0){
+      last = this.initialState;
+    }
+    if (last){
+      if(last.kwArgs["back"]){
+        last.kwArgs["back"]();
+      }else if(last.kwArgs["backButton"]){
+        last.kwArgs["backButton"]();
+      }else if(last.kwArgs["handle"]){
+        last.kwArgs.handle("back");
+      }
+    }
+    this.forwardStack.push(current);
+  },
+
+  handleForwardButton: function(){
+    var last = this.forwardStack.pop();
+    if(!last){ return; }
+    if(last.kwArgs["forward"]){
+      last.kwArgs.forward();
+    }else if(last.kwArgs["forwardButton"]){
+      last.kwArgs.forwardButton();
+    }else if(last.kwArgs["handle"]){
+      last.kwArgs.handle("forward");
+    }
+    this.historyStack.push(last);
+  },
+
+  _createState: function(url, args, hash){
+    return {"url": url, "kwArgs": args, "urlHash": hash}; 
+  },
+
+  _getUrlQuery: function(url){
+    var segments = url.split("?");
+    if (segments.length < 2){
+      return null;
+    }
+    else{
+      return segments[1];
+    }
+  },
+  
+  _loadIframeHistory: function(){
+    var url = dojo.hostenv.getBaseScriptUri()+"iframe_history.html?"+(new Date()).getTime();
+    this.moveForward = true;
+    dojo.io.setIFrameSrc(this.historyIframe, url, false); 
+    return url;
+  }
 }
-if(!this.bookmarkAnchor){
-this.bookmarkAnchor=document.createElement("a");
-dojo.body().appendChild(this.bookmarkAnchor);
-this.bookmarkAnchor.style.display="none";
-}
-if(args["changeUrl"]){
-hash="#"+((args["changeUrl"]!==true)?args["changeUrl"]:(new Date()).getTime());
-if(this.historyStack.length==0&&this.initialState.urlHash==hash){
-this.initialState=this._createState(url,args,hash);
-return;
-}else{
-if(this.historyStack.length>0&&this.historyStack[this.historyStack.length-1].urlHash==hash){
-this.historyStack[this.historyStack.length-1]=this._createState(url,args,hash);
-return;
-}
-}
-this.changingUrl=true;
-setTimeout("window.location.href = '"+hash+"'; dojo.undo.browser.changingUrl = false;",1);
-this.bookmarkAnchor.href=hash;
-if(dojo.render.html.ie){
-url=this._loadIframeHistory();
-var _5d0=args["back"]||args["backButton"]||args["handle"];
-var tcb=function(_5d2){
-if(window.location.hash!=""){
-setTimeout("window.location.href = '"+hash+"';",1);
-}
-_5d0.apply(this,[_5d2]);
-};
-if(args["back"]){
-args.back=tcb;
-}else{
-if(args["backButton"]){
-args.backButton=tcb;
-}else{
-if(args["handle"]){
-args.handle=tcb;
-}
-}
-}
-var _5d3=args["forward"]||args["forwardButton"]||args["handle"];
-var tfw=function(_5d5){
-if(window.location.hash!=""){
-window.location.href=hash;
-}
-if(_5d3){
-_5d3.apply(this,[_5d5]);
-}
-};
-if(args["forward"]){
-args.forward=tfw;
-}else{
-if(args["forwardButton"]){
-args.forwardButton=tfw;
-}else{
-if(args["handle"]){
-args.handle=tfw;
-}
-}
-}
-}else{
-if(dojo.render.html.moz){
-if(!this.locationTimer){
-this.locationTimer=setInterval("dojo.undo.browser.checkLocation();",200);
-}
-}
-}
-}else{
-url=this._loadIframeHistory();
-}
-this.historyStack.push(this._createState(url,args,hash));
-},checkLocation:function(){
-if(!this.changingUrl){
-var hsl=this.historyStack.length;
-if((window.location.hash==this.initialHash||window.location.href==this.initialHref)&&(hsl==1)){
-this.handleBackButton();
-return;
-}
-if(this.forwardStack.length>0){
-if(this.forwardStack[this.forwardStack.length-1].urlHash==window.location.hash){
-this.handleForwardButton();
-return;
-}
-}
-if((hsl>=2)&&(this.historyStack[hsl-2])){
-if(this.historyStack[hsl-2].urlHash==window.location.hash){
-this.handleBackButton();
-return;
-}
-}
-}
-},iframeLoaded:function(evt,_5d8){
-if(!dojo.render.html.opera){
-var _5d9=this._getUrlQuery(_5d8.href);
-if(_5d9==null){
-if(this.historyStack.length==1){
-this.handleBackButton();
-}
-return;
-}
-if(this.moveForward){
-this.moveForward=false;
-return;
-}
-if(this.historyStack.length>=2&&_5d9==this._getUrlQuery(this.historyStack[this.historyStack.length-2].url)){
-this.handleBackButton();
-}else{
-if(this.forwardStack.length>0&&_5d9==this._getUrlQuery(this.forwardStack[this.forwardStack.length-1].url)){
-this.handleForwardButton();
-}
-}
-}
-},handleBackButton:function(){
-var _5da=this.historyStack.pop();
-if(!_5da){
-return;
-}
-var last=this.historyStack[this.historyStack.length-1];
-if(!last&&this.historyStack.length==0){
-last=this.initialState;
-}
-if(last){
-if(last.kwArgs["back"]){
-last.kwArgs["back"]();
-}else{
-if(last.kwArgs["backButton"]){
-last.kwArgs["backButton"]();
-}else{
-if(last.kwArgs["handle"]){
-last.kwArgs.handle("back");
-}
-}
-}
-}
-this.forwardStack.push(_5da);
-},handleForwardButton:function(){
-var last=this.forwardStack.pop();
-if(!last){
-return;
-}
-if(last.kwArgs["forward"]){
-last.kwArgs.forward();
-}else{
-if(last.kwArgs["forwardButton"]){
-last.kwArgs.forwardButton();
-}else{
-if(last.kwArgs["handle"]){
-last.kwArgs.handle("forward");
-}
-}
-}
-this.historyStack.push(last);
-},_createState:function(url,args,hash){
-return {"url":url,"kwArgs":args,"urlHash":hash};
-},_getUrlQuery:function(url){
-var _5e1=url.split("?");
-if(_5e1.length<2){
-return null;
-}else{
-return _5e1[1];
-}
-},_loadIframeHistory:function(){
-var url=dojo.hostenv.getBaseScriptUri()+"iframe_history.html?"+(new Date()).getTime();
-this.moveForward=true;
-dojo.io.setIFrameSrc(this.historyIframe,url,false);
-return url;
-}};
+
 dojo.provide("dojo.io.BrowserIO");
-dojo.io.checkChildrenForFile=function(node){
-var _5e4=false;
-var _5e5=node.getElementsByTagName("input");
-dojo.lang.forEach(_5e5,function(_5e6){
-if(_5e4){
-return;
+
+
+dojo.io.checkChildrenForFile = function(node){
+  var hasFile = false;
+  var inputs = node.getElementsByTagName("input");
+  dojo.lang.forEach(inputs, function(input){
+    if(hasFile){ return; }
+    if(input.getAttribute("type")=="file"){
+      hasFile = true;
+    }
+  });
+  return hasFile;
 }
-if(_5e6.getAttribute("type")=="file"){
-_5e4=true;
+
+dojo.io.formHasFile = function(formNode){
+  return dojo.io.checkChildrenForFile(formNode);
 }
+
+dojo.io.updateNode = function(node, urlOrArgs){
+  node = dojo.byId(node);
+  var args = urlOrArgs;
+  if(dojo.lang.isString(urlOrArgs)){
+    args = { url: urlOrArgs };
+  }
+  args.mimetype = "text/html";
+  args.load = function(t, d, e){
+    while(node.firstChild){
+      if(dojo["event"]){
+        try{
+          dojo.event.browser.clean(node.firstChild);
+        }catch(e){}
+      }
+      node.removeChild(node.firstChild);
+    }
+    node.innerHTML = d;
+  };
+  dojo.io.bind(args);
+}
+
+dojo.io.formFilter = function(node) {
+  var type = (node.type||"").toLowerCase();
+  return !node.disabled && node.name
+    && !dojo.lang.inArray(["file", "submit", "image", "reset", "button"], type);
+}
+
+// TODO: Move to htmlUtils
+dojo.io.encodeForm = function(formNode, encoding, formFilter){
+  if((!formNode)||(!formNode.tagName)||(!formNode.tagName.toLowerCase() == "form")){
+    dojo.raise("Attempted to encode a non-form element.");
+  }
+  if(!formFilter) { formFilter = dojo.io.formFilter; }
+  var enc = /utf/i.test(encoding||"") ? encodeURIComponent : dojo.string.encodeAscii;
+  var values = [];
+
+  for(var i = 0; i < formNode.elements.length; i++){
+    var elm = formNode.elements[i];
+    if(!elm || elm.tagName.toLowerCase() == "fieldset" || !formFilter(elm)) { continue; }
+    var name = enc(elm.name);
+    var type = elm.type.toLowerCase();
+
+    if(type == "select-multiple"){
+      for(var j = 0; j < elm.options.length; j++){
+        if(elm.options[j].selected) {
+          values.push(name + "=" + enc(elm.options[j].value));
+        }
+      }
+    }else if(dojo.lang.inArray(["radio", "checkbox"], type)){
+      if(elm.checked){
+        values.push(name + "=" + enc(elm.value));
+      }
+    }else{
+      values.push(name + "=" + enc(elm.value));
+    }
+  }
+
+  // now collect input type="image", which doesn't show up in the elements array
+  var inputs = formNode.getElementsByTagName("input");
+  for(var i = 0; i < inputs.length; i++) {
+    var input = inputs[i];
+    if(input.type.toLowerCase() == "image" && input.form == formNode
+      && formFilter(input)) {
+      var name = enc(input.name);
+      values.push(name + "=" + enc(input.value));
+      values.push(name + ".x=0");
+      values.push(name + ".y=0");
+    }
+  }
+  return values.join("&") + "&";
+}
+
+dojo.io.FormBind = function(args) {
+  this.bindArgs = {};
+
+  if(args && args.formNode) {
+    this.init(args);
+  } else if(args) {
+    this.init({formNode: args});
+  }
+}
+dojo.lang.extend(dojo.io.FormBind, {
+  form: null,
+
+  bindArgs: null,
+
+  clickedButton: null,
+
+  init: function(args) {
+    var form = dojo.byId(args.formNode);
+
+    if(!form || !form.tagName || form.tagName.toLowerCase() != "form") {
+      throw new Error("FormBind: Couldn't apply, invalid form");
+    } else if(this.form == form) {
+      return;
+    } else if(this.form) {
+      throw new Error("FormBind: Already applied to a form");
+    }
+
+    dojo.lang.mixin(this.bindArgs, args);
+    this.form = form;
+
+    this.connect(form, "onsubmit", "submit");
+
+    for(var i = 0; i < form.elements.length; i++) {
+      var node = form.elements[i];
+      if(node && node.type && dojo.lang.inArray(["submit", "button"], node.type.toLowerCase())) {
+        this.connect(node, "onclick", "click");
+      }
+    }
+
+    var inputs = form.getElementsByTagName("input");
+    for(var i = 0; i < inputs.length; i++) {
+      var input = inputs[i];
+      if(input.type.toLowerCase() == "image" && input.form == form) {
+        this.connect(input, "onclick", "click");
+      }
+    }
+  },
+
+  onSubmit: function(form) {
+    return true;
+  },
+
+  submit: function(e) {
+    e.preventDefault();
+    if(this.onSubmit(this.form)) {
+      dojo.io.bind(dojo.lang.mixin(this.bindArgs, {
+        formFilter: dojo.lang.hitch(this, "formFilter")
+      }));
+    }
+  },
+
+  click: function(e) {
+    var node = e.currentTarget;
+    if(node.disabled) { return; }
+    this.clickedButton = node;
+  },
+
+  formFilter: function(node) {
+    var type = (node.type||"").toLowerCase();
+    var accept = false;
+    if(node.disabled || !node.name) {
+      accept = false;
+    } else if(dojo.lang.inArray(["submit", "button", "image"], type)) {
+      if(!this.clickedButton) { this.clickedButton = node; }
+      accept = node == this.clickedButton;
+    } else {
+      accept = !dojo.lang.inArray(["file", "submit", "reset", "button"], type);
+    }
+    return accept;
+  },
+
+  // in case you don't have dojo.event.* pulled in
+  connect: function(srcObj, srcFcn, targetFcn) {
+    if(dojo.evalObjPath("dojo.event.connect")) {
+      dojo.event.connect(srcObj, srcFcn, this, targetFcn);
+    } else {
+      var fcn = dojo.lang.hitch(this, targetFcn);
+      srcObj[srcFcn] = function(e) {
+        if(!e) { e = window.event; }
+        if(!e.currentTarget) { e.currentTarget = e.srcElement; }
+        if(!e.preventDefault) { e.preventDefault = function() { window.event.returnValue = false; } }
+        fcn(e);
+      }
+    }
+  }
 });
-return _5e4;
-};
-dojo.io.formHasFile=function(_5e7){
-return dojo.io.checkChildrenForFile(_5e7);
-};
-dojo.io.updateNode=function(node,_5e9){
-node=dojo.byId(node);
-var args=_5e9;
-if(dojo.lang.isString(_5e9)){
-args={url:_5e9};
-}
-args.mimetype="text/html";
-args.load=function(t,d,e){
-while(node.firstChild){
-if(dojo["event"]){
-try{
-dojo.event.browser.clean(node.firstChild);
-}
-catch(e){
-}
-}
-node.removeChild(node.firstChild);
-}
-node.innerHTML=d;
-};
-dojo.io.bind(args);
-};
-dojo.io.formFilter=function(node){
-var type=(node.type||"").toLowerCase();
-return !node.disabled&&node.name&&!dojo.lang.inArray(["file","submit","image","reset","button"],type);
-};
-dojo.io.encodeForm=function(_5f0,_5f1,_5f2){
-if((!_5f0)||(!_5f0.tagName)||(!_5f0.tagName.toLowerCase()=="form")){
-dojo.raise("Attempted to encode a non-form element.");
-}
-if(!_5f2){
-_5f2=dojo.io.formFilter;
-}
-var enc=/utf/i.test(_5f1||"")?encodeURIComponent:dojo.string.encodeAscii;
-var _5f4=[];
-for(var i=0;i<_5f0.elements.length;i++){
-var elm=_5f0.elements[i];
-if(!elm||elm.tagName.toLowerCase()=="fieldset"||!_5f2(elm)){
-continue;
-}
-var name=enc(elm.name);
-var type=elm.type.toLowerCase();
-if(type=="select-multiple"){
-for(var j=0;j<elm.options.length;j++){
-if(elm.options[j].selected){
-_5f4.push(name+"="+enc(elm.options[j].value));
-}
-}
-}else{
-if(dojo.lang.inArray(["radio","checkbox"],type)){
-if(elm.checked){
-_5f4.push(name+"="+enc(elm.value));
-}
-}else{
-_5f4.push(name+"="+enc(elm.value));
-}
-}
-}
-var _5fa=_5f0.getElementsByTagName("input");
-for(var i=0;i<_5fa.length;i++){
-var _5fb=_5fa[i];
-if(_5fb.type.toLowerCase()=="image"&&_5fb.form==_5f0&&_5f2(_5fb)){
-var name=enc(_5fb.name);
-_5f4.push(name+"="+enc(_5fb.value));
-_5f4.push(name+".x=0");
-_5f4.push(name+".y=0");
-}
-}
-return _5f4.join("&")+"&";
-};
-dojo.io.FormBind=function(args){
-this.bindArgs={};
-if(args&&args.formNode){
-this.init(args);
-}else{
-if(args){
-this.init({formNode:args});
-}
-}
-};
-dojo.lang.extend(dojo.io.FormBind,{form:null,bindArgs:null,clickedButton:null,init:function(args){
-var form=dojo.byId(args.formNode);
-if(!form||!form.tagName||form.tagName.toLowerCase()!="form"){
-throw new Error("FormBind: Couldn't apply, invalid form");
-}else{
-if(this.form==form){
-return;
-}else{
-if(this.form){
-throw new Error("FormBind: Already applied to a form");
-}
-}
-}
-dojo.lang.mixin(this.bindArgs,args);
-this.form=form;
-this.connect(form,"onsubmit","submit");
-for(var i=0;i<form.elements.length;i++){
-var node=form.elements[i];
-if(node&&node.type&&dojo.lang.inArray(["submit","button"],node.type.toLowerCase())){
-this.connect(node,"onclick","click");
-}
-}
-var _601=form.getElementsByTagName("input");
-for(var i=0;i<_601.length;i++){
-var _602=_601[i];
-if(_602.type.toLowerCase()=="image"&&_602.form==form){
-this.connect(_602,"onclick","click");
-}
-}
-},onSubmit:function(form){
-return true;
-},submit:function(e){
-e.preventDefault();
-if(this.onSubmit(this.form)){
-dojo.io.bind(dojo.lang.mixin(this.bindArgs,{formFilter:dojo.lang.hitch(this,"formFilter")}));
-}
-},click:function(e){
-var node=e.currentTarget;
-if(node.disabled){
-return;
-}
-this.clickedButton=node;
-},formFilter:function(node){
-var type=(node.type||"").toLowerCase();
-var _609=false;
-if(node.disabled||!node.name){
-_609=false;
-}else{
-if(dojo.lang.inArray(["submit","button","image"],type)){
-if(!this.clickedButton){
-this.clickedButton=node;
-}
-_609=node==this.clickedButton;
-}else{
-_609=!dojo.lang.inArray(["file","submit","reset","button"],type);
-}
-}
-return _609;
-},connect:function(_60a,_60b,_60c){
-if(dojo.evalObjPath("dojo.event.connect")){
-dojo.event.connect(_60a,_60b,this,_60c);
-}else{
-var fcn=dojo.lang.hitch(this,_60c);
-_60a[_60b]=function(e){
-if(!e){
-e=window.event;
-}
-if(!e.currentTarget){
-e.currentTarget=e.srcElement;
-}
-if(!e.preventDefault){
-e.preventDefault=function(){
-window.event.returnValue=false;
-};
-}
-fcn(e);
-};
-}
-}});
-dojo.io.XMLHTTPTransport=new function(){
-var _60f=this;
-var _610={};
-this.useCache=false;
-this.preventCache=false;
-function getCacheKey(url,_612,_613){
-return url+"|"+_612+"|"+_613.toLowerCase();
-}
-function addToCache(url,_615,_616,http){
-_610[getCacheKey(url,_615,_616)]=http;
-}
-function getFromCache(url,_619,_61a){
-return _610[getCacheKey(url,_619,_61a)];
-}
-this.clearCache=function(){
-_610={};
-};
-function doLoad(_61b,http,url,_61e,_61f){
-if(((http.status>=200)&&(http.status<300))||(http.status==304)||(location.protocol=="file:"&&(http.status==0||http.status==undefined))||(location.protocol=="chrome:"&&(http.status==0||http.status==undefined))){
-var ret;
-if(_61b.method.toLowerCase()=="head"){
-var _621=http.getAllResponseHeaders();
-ret={};
-ret.toString=function(){
-return _621;
-};
-var _622=_621.split(/[\r\n]+/g);
-for(var i=0;i<_622.length;i++){
-var pair=_622[i].match(/^([^:]+)\s*:\s*(.+)$/i);
-if(pair){
-ret[pair[1]]=pair[2];
-}
-}
-}else{
-if(_61b.mimetype=="text/javascript"){
-try{
-ret=dj_eval(http.responseText);
-}
-catch(e){
-dojo.debug(e);
-dojo.debug(http.responseText);
-ret=null;
-}
-}else{
-if(_61b.mimetype=="text/json"||_61b.mimetype=="application/json"){
-try{
-ret=dj_eval("("+http.responseText+")");
-}
-catch(e){
-dojo.debug(e);
-dojo.debug(http.responseText);
-ret=false;
-}
-}else{
-if((_61b.mimetype=="application/xml")||(_61b.mimetype=="text/xml")){
-ret=http.responseXML;
-if(!ret||typeof ret=="string"||!http.getResponseHeader("Content-Type")){
-ret=dojo.dom.createDocumentFromText(http.responseText);
-}
-}else{
-ret=http.responseText;
-}
-}
-}
-}
-if(_61f){
-addToCache(url,_61e,_61b.method,http);
-}
-_61b[(typeof _61b.load=="function")?"load":"handle"]("load",ret,http,_61b);
-}else{
-var _625=new dojo.io.Error("XMLHttpTransport Error: "+http.status+" "+http.statusText);
-_61b[(typeof _61b.error=="function")?"error":"handle"]("error",_625,http,_61b);
-}
-}
-function setHeaders(http,_627){
-if(_627["headers"]){
-for(var _628 in _627["headers"]){
-if(_628.toLowerCase()=="content-type"&&!_627["contentType"]){
-_627["contentType"]=_627["headers"][_628];
-}else{
-http.setRequestHeader(_628,_627["headers"][_628]);
-}
-}
-}
-}
-this.inFlight=[];
-this.inFlightTimer=null;
-this.startWatchingInFlight=function(){
-if(!this.inFlightTimer){
-this.inFlightTimer=setTimeout("dojo.io.XMLHTTPTransport.watchInFlight();",10);
-}
-};
-this.watchInFlight=function(){
-var now=null;
-if(!dojo.hostenv._blockAsync&&!_60f._blockAsync){
-for(var x=this.inFlight.length-1;x>=0;x--){
-try{
-var tif=this.inFlight[x];
-if(!tif||tif.http._aborted||!tif.http.readyState){
-this.inFlight.splice(x,1);
-continue;
-}
-if(4==tif.http.readyState){
-this.inFlight.splice(x,1);
-doLoad(tif.req,tif.http,tif.url,tif.query,tif.useCache);
-}else{
-if(tif.startTime){
-if(!now){
-now=(new Date()).getTime();
-}
-if(tif.startTime+(tif.req.timeoutSeconds*1000)<now){
-if(typeof tif.http.abort=="function"){
-tif.http.abort();
-}
-this.inFlight.splice(x,1);
-tif.req[(typeof tif.req.timeout=="function")?"timeout":"handle"]("timeout",null,tif.http,tif.req);
-}
-}
-}
-}
-catch(e){
-try{
-var _62c=new dojo.io.Error("XMLHttpTransport.watchInFlight Error: "+e);
-tif.req[(typeof tif.req.error=="function")?"error":"handle"]("error",_62c,tif.http,tif.req);
-}
-catch(e2){
-dojo.debug("XMLHttpTransport error callback failed: "+e2);
-}
-}
-}
-}
-clearTimeout(this.inFlightTimer);
-if(this.inFlight.length==0){
-this.inFlightTimer=null;
-return;
-}
-this.inFlightTimer=setTimeout("dojo.io.XMLHTTPTransport.watchInFlight();",10);
-};
-var _62d=dojo.hostenv.getXmlhttpObject()?true:false;
-this.canHandle=function(_62e){
-return _62d&&dojo.lang.inArray(["text/plain","text/html","application/xml","text/xml","text/javascript","text/json","application/json"],(_62e["mimetype"].toLowerCase()||""))&&!(_62e["formNode"]&&dojo.io.formHasFile(_62e["formNode"]));
-};
-this.multipartBoundary="45309FFF-BD65-4d50-99C9-36986896A96F";
-this.bind=function(_62f){
-if(!_62f["url"]){
-if(!_62f["formNode"]&&(_62f["backButton"]||_62f["back"]||_62f["changeUrl"]||_62f["watchForURL"])&&(!djConfig.preventBackButtonFix)){
-dojo.deprecated("Using dojo.io.XMLHTTPTransport.bind() to add to browser history without doing an IO request","Use dojo.undo.browser.addToHistory() instead.","0.4");
-dojo.undo.browser.addToHistory(_62f);
-return true;
-}
-}
-var url=_62f.url;
-var _631="";
-if(_62f["formNode"]){
-var ta=_62f.formNode.getAttribute("action");
-if((ta)&&(!_62f["url"])){
-url=ta;
-}
-var tp=_62f.formNode.getAttribute("method");
-if((tp)&&(!_62f["method"])){
-_62f.method=tp;
-}
-_631+=dojo.io.encodeForm(_62f.formNode,_62f.encoding,_62f["formFilter"]);
-}
-if(url.indexOf("#")>-1){
-dojo.debug("Warning: dojo.io.bind: stripping hash values from url:",url);
-url=url.split("#")[0];
-}
-if(_62f["file"]){
-_62f.method="post";
-}
-if(!_62f["method"]){
-_62f.method="get";
-}
-if(_62f.method.toLowerCase()=="get"){
-_62f.multipart=false;
-}else{
-if(_62f["file"]){
-_62f.multipart=true;
-}else{
-if(!_62f["multipart"]){
-_62f.multipart=false;
-}
-}
-}
-if(_62f["backButton"]||_62f["back"]||_62f["changeUrl"]){
-dojo.undo.browser.addToHistory(_62f);
-}
-var _634=_62f["content"]||{};
-if(_62f.sendTransport){
-_634["dojo.transport"]="xmlhttp";
-}
-do{
-if(_62f.postContent){
-_631=_62f.postContent;
-break;
-}
-if(_634){
-_631+=dojo.io.argsFromMap(_634,_62f.encoding);
-}
-if(_62f.method.toLowerCase()=="get"||!_62f.multipart){
-break;
-}
-var t=[];
-if(_631.length){
-var q=_631.split("&");
-for(var i=0;i<q.length;++i){
-if(q[i].length){
-var p=q[i].split("=");
-t.push("--"+this.multipartBoundary,"Content-Disposition: form-data; name=\""+p[0]+"\"","",p[1]);
-}
-}
-}
-if(_62f.file){
-if(dojo.lang.isArray(_62f.file)){
-for(var i=0;i<_62f.file.length;++i){
-var o=_62f.file[i];
-t.push("--"+this.multipartBoundary,"Content-Disposition: form-data; name=\""+o.name+"\"; filename=\""+("fileName" in o?o.fileName:o.name)+"\"","Content-Type: "+("contentType" in o?o.contentType:"application/octet-stream"),"",o.content);
-}
-}else{
-var o=_62f.file;
-t.push("--"+this.multipartBoundary,"Content-Disposition: form-data; name=\""+o.name+"\"; filename=\""+("fileName" in o?o.fileName:o.name)+"\"","Content-Type: "+("contentType" in o?o.contentType:"application/octet-stream"),"",o.content);
-}
-}
-if(t.length){
-t.push("--"+this.multipartBoundary+"--","");
-_631=t.join("\r\n");
-}
-}while(false);
-var _63a=_62f["sync"]?false:true;
-var _63b=_62f["preventCache"]||(this.preventCache==true&&_62f["preventCache"]!=false);
-var _63c=_62f["useCache"]==true||(this.useCache==true&&_62f["useCache"]!=false);
-if(!_63b&&_63c){
-var _63d=getFromCache(url,_631,_62f.method);
-if(_63d){
-doLoad(_62f,_63d,url,_631,false);
-return;
-}
-}
-var http=dojo.hostenv.getXmlhttpObject(_62f);
-var _63f=false;
-if(_63a){
-var _640=this.inFlight.push({"req":_62f,"http":http,"url":url,"query":_631,"useCache":_63c,"startTime":_62f.timeoutSeconds?(new Date()).getTime():0});
-this.startWatchingInFlight();
-}else{
-_60f._blockAsync=true;
-}
-if(_62f.method.toLowerCase()=="post"){
-if(!_62f.user){
-http.open("POST",url,_63a);
-}else{
-http.open("POST",url,_63a,_62f.user,_62f.password);
-}
-setHeaders(http,_62f);
-http.setRequestHeader("Content-Type",_62f.multipart?("multipart/form-data; boundary="+this.multipartBoundary):(_62f.contentType||"application/x-www-form-urlencoded"));
-try{
-http.send(_631);
-}
-catch(e){
-if(typeof http.abort=="function"){
-http.abort();
-}
-doLoad(_62f,{status:404},url,_631,_63c);
-}
-}else{
-var _641=url;
-if(_631!=""){
-_641+=(_641.indexOf("?")>-1?"&":"?")+_631;
-}
-if(_63b){
-_641+=(dojo.string.endsWithAny(_641,"?","&")?"":(_641.indexOf("?")>-1?"&":"?"))+"dojo.preventCache="+new Date().valueOf();
-}
-if(!_62f.user){
-http.open(_62f.method.toUpperCase(),_641,_63a);
-}else{
-http.open(_62f.method.toUpperCase(),_641,_63a,_62f.user,_62f.password);
-}
-setHeaders(http,_62f);
-try{
-http.send(null);
-}
-catch(e){
-if(typeof http.abort=="function"){
-http.abort();
-}
-doLoad(_62f,{status:404},url,_631,_63c);
-}
-}
-if(!_63a){
-doLoad(_62f,http,url,_631,_63c);
-_60f._blockAsync=false;
-}
-_62f.abort=function(){
-try{
-http._aborted=true;
-}
-catch(e){
-}
-return http.abort();
-};
-return;
-};
-dojo.io.transports.addTransport("XMLHTTPTransport");
-};
+
+dojo.io.XMLHTTPTransport = new function(){
+  var _this = this;
+
+  var _cache = {}; // FIXME: make this public? do we even need to?
+  this.useCache = false; // if this is true, we'll cache unless kwArgs.useCache = false
+  this.preventCache = false; // if this is true, we'll always force GET requests to cache
+
+  // FIXME: Should this even be a function? or do we just hard code it in the next 2 functions?
+  function getCacheKey(url, query, method) {
+    return url + "|" + query + "|" + method.toLowerCase();
+  }
+
+  function addToCache(url, query, method, http) {
+    _cache[getCacheKey(url, query, method)] = http;
+  }
+
+  function getFromCache(url, query, method) {
+    return _cache[getCacheKey(url, query, method)];
+  }
+
+  this.clearCache = function() {
+    _cache = {};
+  }
+
+  // moved successful load stuff here
+  function doLoad(kwArgs, http, url, query, useCache) {
+    if( ((http.status>=200)&&(http.status<300))||   // allow any 2XX response code
+      (http.status==304)||            // get it out of the cache
+      (location.protocol=="file:" && (http.status==0 || http.status==undefined))||
+      (location.protocol=="chrome:" && (http.status==0 || http.status==undefined))
+    ){
+      var ret;
+      if(kwArgs.method.toLowerCase() == "head"){
+        var headers = http.getAllResponseHeaders();
+        ret = {};
+        ret.toString = function(){ return headers; }
+        var values = headers.split(/[\r\n]+/g);
+        for(var i = 0; i < values.length; i++) {
+          var pair = values[i].match(/^([^:]+)\s*:\s*(.+)$/i);
+          if(pair) {
+            ret[pair[1]] = pair[2];
+          }
+        }
+      }else if(kwArgs.mimetype == "text/javascript"){
+        try{
+          ret = dj_eval(http.responseText);
+        }catch(e){
+          dojo.debug(e);
+          dojo.debug(http.responseText);
+          ret = null;
+        }
+      }else if(kwArgs.mimetype == "text/json" || kwArgs.mimetype == "application/json"){
+        try{
+          ret = dj_eval("("+http.responseText+")");
+        }catch(e){
+          dojo.debug(e);
+          dojo.debug(http.responseText);
+          ret = false;
+        }
+      }else if((kwArgs.mimetype == "application/xml")||
+            (kwArgs.mimetype == "text/xml")){
+        ret = http.responseXML;
+        if(!ret || typeof ret == "string" || !http.getResponseHeader("Content-Type")) {
+          ret = dojo.dom.createDocumentFromText(http.responseText);
+        }
+      }else{
+        ret = http.responseText;
+      }
+
+      if(useCache){ // only cache successful responses
+        addToCache(url, query, kwArgs.method, http);
+      }
+      kwArgs[(typeof kwArgs.load == "function") ? "load" : "handle"]("load", ret, http, kwArgs);
+    }else{
+      var errObj = new dojo.io.Error("XMLHttpTransport Error: "+http.status+" "+http.statusText);
+      kwArgs[(typeof kwArgs.error == "function") ? "error" : "handle"]("error", errObj, http, kwArgs);
+    }
+  }
+
+  // set headers (note: Content-Type will get overriden if kwArgs.contentType is set)
+  function setHeaders(http, kwArgs){
+    if(kwArgs["headers"]) {
+      for(var header in kwArgs["headers"]) {
+        if(header.toLowerCase() == "content-type" && !kwArgs["contentType"]) {
+          kwArgs["contentType"] = kwArgs["headers"][header];
+        } else {
+          http.setRequestHeader(header, kwArgs["headers"][header]);
+        }
+      }
+    }
+  }
+
+  this.inFlight = [];
+  this.inFlightTimer = null;
+
+  this.startWatchingInFlight = function(){
+    if(!this.inFlightTimer){
+      // setInterval broken in mozilla x86_64 in some circumstances, see
+      // https://bugzilla.mozilla.org/show_bug.cgi?id=344439
+      // using setTimeout instead
+      this.inFlightTimer = setTimeout("dojo.io.XMLHTTPTransport.watchInFlight();", 10);
+    }
+  }
+
+  this.watchInFlight = function(){
+    var now = null;
+    // make sure sync calls stay thread safe, if this callback is called during a sync call
+    // and this results in another sync call before the first sync call ends the browser hangs
+    if(!dojo.hostenv._blockAsync && !_this._blockAsync){
+      for(var x=this.inFlight.length-1; x>=0; x--){
+        try{
+          var tif = this.inFlight[x];
+          if(!tif || tif.http._aborted || !tif.http.readyState){
+            this.inFlight.splice(x, 1); continue; 
+          }
+          if(4==tif.http.readyState){
+            // remove it so we can clean refs
+            this.inFlight.splice(x, 1);
+            doLoad(tif.req, tif.http, tif.url, tif.query, tif.useCache);
+          }else if (tif.startTime){
+            //See if this is a timeout case.
+            if(!now){
+              now = (new Date()).getTime();
+            }
+            if(tif.startTime + (tif.req.timeoutSeconds * 1000) < now){
+              //Stop the request.
+              if(typeof tif.http.abort == "function"){
+                tif.http.abort();
+              }
+    
+              // remove it so we can clean refs
+              this.inFlight.splice(x, 1);
+              tif.req[(typeof tif.req.timeout == "function") ? "timeout" : "handle"]("timeout", null, tif.http, tif.req);
+            }
+          }
+        }catch(e){
+          try{
+            var errObj = new dojo.io.Error("XMLHttpTransport.watchInFlight Error: " + e);
+            tif.req[(typeof tif.req.error == "function") ? "error" : "handle"]("error", errObj, tif.http, tif.req);
+          }catch(e2){
+            dojo.debug("XMLHttpTransport error callback failed: " + e2);
+          }
+        }
+      }
+    }
+
+    clearTimeout(this.inFlightTimer);
+    if(this.inFlight.length == 0){
+      this.inFlightTimer = null;
+      return;
+    }
+    this.inFlightTimer = setTimeout("dojo.io.XMLHTTPTransport.watchInFlight();", 10);
+  }
+
+  var hasXmlHttp = dojo.hostenv.getXmlhttpObject() ? true : false;
+  this.canHandle = function(kwArgs){
+    // canHandle just tells dojo.io.bind() if this is a good transport to
+    // use for the particular type of request.
+
+    // FIXME: we need to determine when form values need to be
+    // multi-part mime encoded and avoid using this transport for those
+    // requests.
+    return hasXmlHttp
+      && dojo.lang.inArray(["text/plain", "text/html", "application/xml", "text/xml", "text/javascript", "text/json", "application/json"], (kwArgs["mimetype"].toLowerCase()||""))
+      && !( kwArgs["formNode"] && dojo.io.formHasFile(kwArgs["formNode"]) );
+  }
+
+  this.multipartBoundary = "45309FFF-BD65-4d50-99C9-36986896A96F";  // unique guid as a boundary value for multipart posts
+
+  this.bind = function(kwArgs){
+    if(!kwArgs["url"]){
+      // are we performing a history action?
+      if( !kwArgs["formNode"]
+        && (kwArgs["backButton"] || kwArgs["back"] || kwArgs["changeUrl"] || kwArgs["watchForURL"])
+        && (!djConfig.preventBackButtonFix)) {
+        dojo.deprecated("Using dojo.io.XMLHTTPTransport.bind() to add to browser history without doing an IO request",
+                "Use dojo.undo.browser.addToHistory() instead.", "0.4");
+        dojo.undo.browser.addToHistory(kwArgs);
+        return true;
+      }
+    }
+
+    // build this first for cache purposes
+    var url = kwArgs.url;
+    var query = "";
+    if(kwArgs["formNode"]){
+      var ta = kwArgs.formNode.getAttribute("action");
+      if((ta)&&(!kwArgs["url"])){ url = ta; }
+      var tp = kwArgs.formNode.getAttribute("method");
+      if((tp)&&(!kwArgs["method"])){ kwArgs.method = tp; }
+      query += dojo.io.encodeForm(kwArgs.formNode, kwArgs.encoding, kwArgs["formFilter"]);
+    }
+
+    if(url.indexOf("#") > -1) {
+      dojo.debug("Warning: dojo.io.bind: stripping hash values from url:", url);
+      url = url.split("#")[0];
+    }
+
+    if(kwArgs["file"]){
+      // force post for file transfer
+      kwArgs.method = "post";
+    }
+
+    if(!kwArgs["method"]){
+      kwArgs.method = "get";
+    }
+
+    // guess the multipart value
+    if(kwArgs.method.toLowerCase() == "get"){
+      // GET cannot use multipart
+      kwArgs.multipart = false;
+    }else{
+      if(kwArgs["file"]){
+        // enforce multipart when sending files
+        kwArgs.multipart = true;
+      }else if(!kwArgs["multipart"]){
+        // default 
+        kwArgs.multipart = false;
+      }
+    }
+
+    if(kwArgs["backButton"] || kwArgs["back"] || kwArgs["changeUrl"]){
+      dojo.undo.browser.addToHistory(kwArgs);
+    }
+
+    var content = kwArgs["content"] || {};
+
+    if(kwArgs.sendTransport) {
+      content["dojo.transport"] = "xmlhttp";
+    }
+
+    do { // break-block
+      if(kwArgs.postContent){
+        query = kwArgs.postContent;
+        break;
+      }
+
+      if(content) {
+        query += dojo.io.argsFromMap(content, kwArgs.encoding);
+      }
+      
+      if(kwArgs.method.toLowerCase() == "get" || !kwArgs.multipart){
+        break;
+      }
+
+      var t = [];
+      if(query.length){
+        var q = query.split("&");
+        for(var i = 0; i < q.length; ++i){
+          if(q[i].length){
+            var p = q[i].split("=");
+            t.push( "--" + this.multipartBoundary,
+                "Content-Disposition: form-data; name=\"" + p[0] + "\"", 
+                "",
+                p[1]);
+          }
+        }
+      }
+
+      if(kwArgs.file){
+        if(dojo.lang.isArray(kwArgs.file)){
+          for(var i = 0; i < kwArgs.file.length; ++i){
+            var o = kwArgs.file[i];
+            t.push( "--" + this.multipartBoundary,
+                "Content-Disposition: form-data; name=\"" + o.name + "\"; filename=\"" + ("fileName" in o ? o.fileName : o.name) + "\"",
+                "Content-Type: " + ("contentType" in o ? o.contentType : "application/octet-stream"),
+                "",
+                o.content);
+          }
+        }else{
+          var o = kwArgs.file;
+          t.push( "--" + this.multipartBoundary,
+              "Content-Disposition: form-data; name=\"" + o.name + "\"; filename=\"" + ("fileName" in o ? o.fileName : o.name) + "\"",
+              "Content-Type: " + ("contentType" in o ? o.contentType : "application/octet-stream"),
+              "",
+              o.content);
+        }
+      }
+
+      if(t.length){
+        t.push("--"+this.multipartBoundary+"--", "");
+        query = t.join("\r\n");
+      }
+    }while(false);
+
+    // kwArgs.Connection = "close";
+
+    var async = kwArgs["sync"] ? false : true;
+
+    var preventCache = kwArgs["preventCache"] ||
+      (this.preventCache == true && kwArgs["preventCache"] != false);
+    var useCache = kwArgs["useCache"] == true ||
+      (this.useCache == true && kwArgs["useCache"] != false );
+
+    // preventCache is browser-level (add query string junk), useCache
+    // is for the local cache. If we say preventCache, then don't attempt
+    // to look in the cache, but if useCache is true, we still want to cache
+    // the response
+    if(!preventCache && useCache){
+      var cachedHttp = getFromCache(url, query, kwArgs.method);
+      if(cachedHttp){
+        doLoad(kwArgs, cachedHttp, url, query, false);
+        return;
+      }
+    }
+
+    // much of this is from getText, but reproduced here because we need
+    // more flexibility
+    var http = dojo.hostenv.getXmlhttpObject(kwArgs); 
+    var received = false;
+
+    // build a handler function that calls back to the handler obj
+    if(async){
+      var startTime = 
+      // FIXME: setting up this callback handler leaks on IE!!!
+      this.inFlight.push({
+        "req":    kwArgs,
+        "http":   http,
+        "url":    url,
+        "query":  query,
+        "useCache": useCache,
+        "startTime": kwArgs.timeoutSeconds ? (new Date()).getTime() : 0
+      });
+      this.startWatchingInFlight();
+    }else{
+      // block async callbacks until sync is in, needed in khtml, others?
+      _this._blockAsync = true;
+    }
+
+    if(kwArgs.method.toLowerCase() == "post"){
+      // FIXME: need to hack in more flexible Content-Type setting here!
+      if (!kwArgs.user) {
+        http.open("POST", url, async);
+      }else{
+        http.open("POST", url, async, kwArgs.user, kwArgs.password);
+      }
+      setHeaders(http, kwArgs);
+      http.setRequestHeader("Content-Type", kwArgs.multipart ? ("multipart/form-data; boundary=" + this.multipartBoundary) : 
+        (kwArgs.contentType || "application/x-www-form-urlencoded"));
+      try{
+        http.send(query);
+      }catch(e){
+        if(typeof http.abort == "function"){
+          http.abort();
+        }
+        doLoad(kwArgs, {status: 404}, url, query, useCache);
+      }
+    }else{
+      var tmpUrl = url;
+      if(query != "") {
+        tmpUrl += (tmpUrl.indexOf("?") > -1 ? "&" : "?") + query;
+      }
+      if(preventCache) {
+        tmpUrl += (dojo.string.endsWithAny(tmpUrl, "?", "&")
+          ? "" : (tmpUrl.indexOf("?") > -1 ? "&" : "?")) + "dojo.preventCache=" + new Date().valueOf();
+      }
+      if (!kwArgs.user) {
+        http.open(kwArgs.method.toUpperCase(), tmpUrl, async);
+      }else{
+        http.open(kwArgs.method.toUpperCase(), tmpUrl, async, kwArgs.user, kwArgs.password);
+      }
+      setHeaders(http, kwArgs);
+      try {
+        http.send(null);
+      }catch(e) {
+        if(typeof http.abort == "function"){
+          http.abort();
+        }
+        doLoad(kwArgs, {status: 404}, url, query, useCache);
+      }
+    }
+
+    if( !async ) {
+      doLoad(kwArgs, http, url, query, useCache);
+      _this._blockAsync = false;
+    }
+
+    kwArgs.abort = function(){
+      try{// khtml doesent reset readyState on abort, need this workaround
+        http._aborted = true; 
+      }catch(e){/*squelsh*/}
+      return http.abort();
+    }
+
+    return;
+  }
+  dojo.io.transports.addTransport("XMLHTTPTransport");
+}
+
 dojo.provide("dojo.io.cookie");
-dojo.io.cookie.setCookie=function(name,_643,days,path,_646,_647){
-var _648=-1;
-if(typeof days=="number"&&days>=0){
-var d=new Date();
-d.setTime(d.getTime()+(days*24*60*60*1000));
-_648=d.toGMTString();
+
+dojo.io.cookie.setCookie = function(name, value, days, path, domain, secure) {
+  var expires = -1;
+  if(typeof days == "number" && days >= 0) {
+    var d = new Date();
+    d.setTime(d.getTime()+(days*24*60*60*1000));
+    expires = d.toGMTString();
+  }
+  value = escape(value);
+  document.cookie = name + "=" + value + ";"
+    + (expires != -1 ? " expires=" + expires + ";" : "")
+    + (path ? "path=" + path : "")
+    + (domain ? "; domain=" + domain : "")
+    + (secure ? "; secure" : "");
 }
-_643=escape(_643);
-document.cookie=name+"="+_643+";"+(_648!=-1?" expires="+_648+";":"")+(path?"path="+path:"")+(_646?"; domain="+_646:"")+(_647?"; secure":"");
-};
-dojo.io.cookie.set=dojo.io.cookie.setCookie;
-dojo.io.cookie.getCookie=function(name){
-var idx=document.cookie.lastIndexOf(name+"=");
-if(idx==-1){
-return null;
+
+dojo.io.cookie.set = dojo.io.cookie.setCookie;
+
+dojo.io.cookie.getCookie = function(name) {
+  // FIXME: Which cookie should we return?
+  //        If there are cookies set for different sub domains in the current
+  //        scope there could be more than one cookie with the same name.
+  //        I think taking the last one in the list takes the one from the
+  //        deepest subdomain, which is what we're doing here.
+  var idx = document.cookie.lastIndexOf(name+'=');
+  if(idx == -1) { return null; }
+  var value = document.cookie.substring(idx+name.length+1);
+  var end = value.indexOf(';');
+  if(end == -1) { end = value.length; }
+  value = value.substring(0, end);
+  value = unescape(value);
+  return value;
 }
-var _64c=document.cookie.substring(idx+name.length+1);
-var end=_64c.indexOf(";");
-if(end==-1){
-end=_64c.length;
+
+dojo.io.cookie.get = dojo.io.cookie.getCookie;
+
+dojo.io.cookie.deleteCookie = function(name) {
+  dojo.io.cookie.setCookie(name, "-", 0);
 }
-_64c=_64c.substring(0,end);
-_64c=unescape(_64c);
-return _64c;
-};
-dojo.io.cookie.get=dojo.io.cookie.getCookie;
-dojo.io.cookie.deleteCookie=function(name){
-dojo.io.cookie.setCookie(name,"-",0);
-};
-dojo.io.cookie.setObjectCookie=function(name,obj,days,path,_653,_654,_655){
-if(arguments.length==5){
-_655=_653;
-_653=null;
-_654=null;
+
+dojo.io.cookie.setObjectCookie = function(name, obj, days, path, domain, secure, clearCurrent) {
+  if(arguments.length == 5) { // for backwards compat
+    clearCurrent = domain;
+    domain = null;
+    secure = null;
+  }
+  var pairs = [], cookie, value = "";
+  if(!clearCurrent) { cookie = dojo.io.cookie.getObjectCookie(name); }
+  if(days >= 0) {
+    if(!cookie) { cookie = {}; }
+    for(var prop in obj) {
+      if(prop == null) {
+        delete cookie[prop];
+      } else if(typeof obj[prop] == "string" || typeof obj[prop] == "number") {
+        cookie[prop] = obj[prop];
+      }
+    }
+    prop = null;
+    for(var prop in cookie) {
+      pairs.push(escape(prop) + "=" + escape(cookie[prop]));
+    }
+    value = pairs.join("&");
+  }
+  dojo.io.cookie.setCookie(name, value, days, path, domain, secure);
 }
-var _656=[],_657,_658="";
-if(!_655){
-_657=dojo.io.cookie.getObjectCookie(name);
+
+dojo.io.cookie.getObjectCookie = function(name) {
+  var values = null, cookie = dojo.io.cookie.getCookie(name);
+  if(cookie) {
+    values = {};
+    var pairs = cookie.split("&");
+    for(var i = 0; i < pairs.length; i++) {
+      var pair = pairs[i].split("=");
+      var value = pair[1];
+      if( isNaN(value) ) { value = unescape(pair[1]); }
+      values[ unescape(pair[0]) ] = value;
+    }
+  }
+  return values;
 }
-if(days>=0){
-if(!_657){
-_657={};
-}
-for(var prop in obj){
-if(prop==null){
-delete _657[prop];
-}else{
-if(typeof obj[prop]=="string"||typeof obj[prop]=="number"){
-_657[prop]=obj[prop];
-}
-}
-}
-prop=null;
-for(var prop in _657){
-_656.push(escape(prop)+"="+escape(_657[prop]));
-}
-_658=_656.join("&");
-}
-dojo.io.cookie.setCookie(name,_658,days,path,_653,_654);
-};
-dojo.io.cookie.getObjectCookie=function(name){
-var _65b=null,_65c=dojo.io.cookie.getCookie(name);
-if(_65c){
-_65b={};
-var _65d=_65c.split("&");
-for(var i=0;i<_65d.length;i++){
-var pair=_65d[i].split("=");
-var _660=pair[1];
-if(isNaN(_660)){
-_660=unescape(pair[1]);
-}
-_65b[unescape(pair[0])]=_660;
-}
-}
-return _65b;
-};
-dojo.io.cookie.isSupported=function(){
-if(typeof navigator.cookieEnabled!="boolean"){
-dojo.io.cookie.setCookie("__TestingYourBrowserForCookieSupport__","CookiesAllowed",90,null);
-var _661=dojo.io.cookie.getCookie("__TestingYourBrowserForCookieSupport__");
-navigator.cookieEnabled=(_661=="CookiesAllowed");
-if(navigator.cookieEnabled){
-this.deleteCookie("__TestingYourBrowserForCookieSupport__");
-}
-}
-return navigator.cookieEnabled;
-};
-if(!dojo.io.cookies){
-dojo.io.cookies=dojo.io.cookie;
+
+dojo.io.cookie.isSupported = function() {
+  if(typeof navigator.cookieEnabled != "boolean") {
+    dojo.io.cookie.setCookie("__TestingYourBrowserForCookieSupport__",
+      "CookiesAllowed", 90, null);
+    var cookieVal = dojo.io.cookie.getCookie("__TestingYourBrowserForCookieSupport__");
+    navigator.cookieEnabled = (cookieVal == "CookiesAllowed");
+    if(navigator.cookieEnabled) {
+      // FIXME: should we leave this around?
+      this.deleteCookie("__TestingYourBrowserForCookieSupport__");
+    }
+  }
+  return navigator.cookieEnabled;
 }
+
+// need to leave this in for backwards-compat from 0.1 for when it gets pulled in by dojo.io.*
+if(!dojo.io.cookies) { dojo.io.cookies = dojo.io.cookie; }
+
 dojo.provide("dojo.io.*");
+
 dojo.provide("dojo.uri.*");
+
 dojo.provide("dojo.io.IframeIO");
-dojo.io.createIFrame=function(_662,_663,uri){
-if(window[_662]){
-return window[_662];
+
+// FIXME: is it possible to use the Google htmlfile hack to prevent the
+// background click with this transport?
+
+dojo.io.createIFrame = function(fname, onloadstr, uri){
+  if(window[fname]){ return window[fname]; }
+  if(window.frames[fname]){ return window.frames[fname]; }
+  var r = dojo.render.html;
+  var cframe = null;
+  var turi = uri||dojo.uri.dojoUri("iframe_history.html?noInit=true");
+  var ifrstr = ((r.ie)&&(dojo.render.os.win)) ? '<iframe name="'+fname+'" src="'+turi+'" onload="'+onloadstr+'">' : 'iframe';
+  cframe = document.createElement(ifrstr);
+  with(cframe){
+    name = fname;
+    setAttribute("name", fname);
+    id = fname;
+  }
+  dojo.body().appendChild(cframe);
+  window[fname] = cframe;
+
+  with(cframe.style){
+    if(!r.safari){
+      //We can't change the src in Safari 2.0.3 if absolute position. Bizarro.
+      position = "absolute";
+    }
+    left = top = "0px";
+    height = width = "1px";
+    visibility = "hidden";
+    /*
+    if(djConfig.isDebug){
+      position = "relative";
+      height = "300px";
+      width = "600px";
+      visibility = "visible";
+    }
+    */
+  }
+
+  if(!r.ie){
+    dojo.io.setIFrameSrc(cframe, turi, true);
+    cframe.onload = new Function(onloadstr);
+  }
+  
+  return cframe;
 }
-if(window.frames[_662]){
-return window.frames[_662];
+
+dojo.io.IframeTransport = new function(){
+  var _this = this;
+  this.currentRequest = null;
+  this.requestQueue = [];
+  this.iframeName = "dojoIoIframe";
+
+  this.fireNextRequest = function(){
+    try{
+      if((this.currentRequest)||(this.requestQueue.length == 0)){ return; }
+      // dojo.debug("fireNextRequest");
+      var cr = this.currentRequest = this.requestQueue.shift();
+      cr._contentToClean = [];
+      var fn = cr["formNode"];
+      var content = cr["content"] || {};
+      if(cr.sendTransport) {
+        content["dojo.transport"] = "iframe";
+      }
+      if(fn){
+        if(content){
+          // if we have things in content, we need to add them to the form
+          // before submission
+          for(var x in content){
+            if(!fn[x]){
+              var tn;
+              if(dojo.render.html.ie){
+                tn = document.createElement("<input type='hidden' name='"+x+"' value='"+content[x]+"'>");
+                fn.appendChild(tn);
+              }else{
+                tn = document.createElement("input");
+                fn.appendChild(tn);
+                tn.type = "hidden";
+                tn.name = x;
+                tn.value = content[x];
+              }
+              cr._contentToClean.push(x);
+            }else{
+              fn[x].value = content[x];
+            }
+          }
+        }
+        if(cr["url"]){
+          cr._originalAction = fn.getAttribute("action");
+          fn.setAttribute("action", cr.url);
+        }
+        if(!fn.getAttribute("method")){
+          fn.setAttribute("method", (cr["method"]) ? cr["method"] : "post");
+        }
+        cr._originalTarget = fn.getAttribute("target");
+        fn.setAttribute("target", this.iframeName);
+        fn.target = this.iframeName;
+        fn.submit();
+      }else{
+        // otherwise we post a GET string by changing URL location for the
+        // iframe
+        var query = dojo.io.argsFromMap(this.currentRequest.content);
+        var tmpUrl = cr.url + (cr.url.indexOf("?") > -1 ? "&" : "?") + query;
+        dojo.io.setIFrameSrc(this.iframe, tmpUrl, true);
+      }
+    }catch(e){
+      this.iframeOnload(e);
+    }
+  }
+
+  this.canHandle = function(kwArgs){
+    return (
+      (
+        dojo.lang.inArray([ "text/plain", "text/html", "text/javascript", "text/json", "application/json"], kwArgs["mimetype"])
+      )&&(
+        dojo.lang.inArray(["post", "get"], kwArgs["method"].toLowerCase())
+      )&&(
+        // never handle a sync request
+        !  ((kwArgs["sync"])&&(kwArgs["sync"] == true))
+      )
+    );
+  }
+
+  this.bind = function(kwArgs){
+    if(!this["iframe"]){ this.setUpIframe(); }
+    this.requestQueue.push(kwArgs);
+    this.fireNextRequest();
+    return;
+  }
+
+  this.setUpIframe = function(){
+
+    // NOTE: IE 5.0 and earlier Mozilla's don't support an onload event for
+    //       iframes. OTOH, we don't care.
+    this.iframe = dojo.io.createIFrame(this.iframeName, "dojo.io.IframeTransport.iframeOnload();");
+  }
+
+  this.iframeOnload = function(errorObject /* Object */){
+    if(!_this.currentRequest){
+      _this.fireNextRequest();
+      return;
+    }
+
+    var req = _this.currentRequest;
+
+    if(req.formNode){
+      // remove all the hidden content inputs
+      var toClean = req._contentToClean;
+      for(var i = 0; i < toClean.length; i++) {
+        var key = toClean[i];
+        if(dojo.render.html.safari){
+          //In Safari (at least 2.0.3), can't use formNode[key] syntax to find the node,
+          //for nodes that were dynamically added.
+          var fNode = req.formNode;
+          for(var j = 0; j < fNode.childNodes.length; j++){
+            var chNode = fNode.childNodes[j];
+            if(chNode.name == key){
+              var pNode = chNode.parentNode;
+              pNode.removeChild(chNode);
+              break;
+            }
+          }
+        }else{
+          var input = req.formNode[key];
+          req.formNode.removeChild(input);
+          req.formNode[key] = null;
+        }
+      }
+  
+      // restore original action + target
+      if(req["_originalAction"]){
+        req.formNode.setAttribute("action", req._originalAction);
+      }
+      if(req["_originalTarget"]){
+        req.formNode.setAttribute("target", req._originalTarget);
+        req.formNode.target = req._originalTarget;
+      }
+    }
+
+    var contentDoc = function(iframe_el){
+      var doc = iframe_el.contentDocument || // W3
+        (
+          (iframe_el.contentWindow)&&(iframe_el.contentWindow.document)
+        ) ||  // IE
+        (
+          (iframe_el.name)&&(document.frames[iframe_el.name])&&
+          (document.frames[iframe_el.name].document)
+        ) || null;
+      return doc;
+    };
+
+    var value;
+    var success = false;
+
+    if (errorObject){
+        this._callError(req, "IframeTransport Request Error: " + errorObject);
+    }else{
+      var ifd = contentDoc(_this.iframe);
+      // handle successful returns
+      // FIXME: how do we determine success for iframes? Is there an equiv of
+      // the "status" property?
+  
+      try{
+        var cmt = req.mimetype;
+        if((cmt == "text/javascript")||(cmt == "text/json")||(cmt == "application/json")){
+          // FIXME: not sure what to do here? try to pull some evalulable
+          // text from a textarea or cdata section? 
+          // how should we set up the contract for that?
+          var js = ifd.getElementsByTagName("textarea")[0].value;
+          if(cmt == "text/json" || cmt == "application/json") { js = "(" + js + ")"; }
+          value = dj_eval(js);
+        }else if(cmt == "text/html"){
+          value = ifd;
+        }else{ // text/plain
+          value = ifd.getElementsByTagName("textarea")[0].value;
+        }
+        success = true;
+      }catch(e){ 
+        // looks like we didn't get what we wanted!
+        this._callError(req, "IframeTransport Error: " + e);
+      }
+    }
+
+    // don't want to mix load function errors with processing errors, thus
+    // a separate try..catch
+    try {
+      if(success && dojo.lang.isFunction(req["load"])){
+        req.load("load", value, req);
+      }
+    } catch(e) {
+      throw e;
+    } finally {
+      _this.currentRequest = null;
+      _this.fireNextRequest();
+    }
+  }
+  
+  this._callError = function(req /* Object */, message /* String */){
+    var errObj = new dojo.io.Error(message);
+    if(dojo.lang.isFunction(req["error"])){
+      req.error("error", errObj, req);
+    }
+  }
+
+  dojo.io.transports.addTransport("IframeTransport");
 }
-var r=dojo.render.html;
-var _666=null;
-var turi=uri||dojo.uri.dojoUri("iframe_history.html?noInit=true");
-var _668=((r.ie)&&(dojo.render.os.win))?"<iframe name=\""+_662+"\" src=\""+turi+"\" onload=\""+_663+"\">":"iframe";
-_666=document.createElement(_668);
-with(_666){
-name=_662;
-setAttribute("name",_662);
-id=_662;
-}
-dojo.body().appendChild(_666);
-window[_662]=_666;
-with(_666.style){
-if(!r.safari){
-position="absolute";
-}
-left=top="0px";
-height=width="1px";
-visibility="hidden";
-}
-if(!r.ie){
-dojo.io.setIFrameSrc(_666,turi,true);
-_666.onload=new Function(_663);
-}
-return _666;
-};
-dojo.io.IframeTransport=new function(){
-var _669=this;
-this.currentRequest=null;
-this.requestQueue=[];
-this.iframeName="dojoIoIframe";
-this.fireNextRequest=function(){
-try{
-if((this.currentRequest)||(this.requestQueue.length==0)){
-return;
-}
-var cr=this.currentRequest=this.requestQueue.shift();
-cr._contentToClean=[];
-var fn=cr["formNode"];
-var _66c=cr["content"]||{};
-if(cr.sendTransport){
-_66c["dojo.transport"]="iframe";
-}
-if(fn){
-if(_66c){
-for(var x in _66c){
-if(!fn[x]){
-var tn;
-if(dojo.render.html.ie){
-tn=document.createElement("<input type='hidden' name='"+x+"' value='"+_66c[x]+"'>");
-fn.appendChild(tn);
-}else{
-tn=document.createElement("input");
-fn.appendChild(tn);
-tn.type="hidden";
-tn.name=x;
-tn.value=_66c[x];
-}
-cr._contentToClean.push(x);
-}else{
-fn[x].value=_66c[x];
-}
-}
-}
-if(cr["url"]){
-cr._originalAction=fn.getAttribute("action");
-fn.setAttribute("action",cr.url);
-}
-if(!fn.getAttribute("method")){
-fn.setAttribute("method",(cr["method"])?cr["method"]:"post");
-}
-cr._originalTarget=fn.getAttribute("target");
-fn.setAttribute("target",this.iframeName);
-fn.target=this.iframeName;
-fn.submit();
-}else{
-var _66f=dojo.io.argsFromMap(this.currentRequest.content);
-var _670=cr.url+(cr.url.indexOf("?")>-1?"&":"?")+_66f;
-dojo.io.setIFrameSrc(this.iframe,_670,true);
-}
-}
-catch(e){
-this.iframeOnload(e);
-}
-};
-this.canHandle=function(_671){
-return ((dojo.lang.inArray(["text/plain","text/html","text/javascript","text/json","application/json"],_671["mimetype"]))&&(dojo.lang.inArray(["post","get"],_671["method"].toLowerCase()))&&(!((_671["sync"])&&(_671["sync"]==true))));
-};
-this.bind=function(_672){
-if(!this["iframe"]){
-this.setUpIframe();
-}
-this.requestQueue.push(_672);
-this.fireNextRequest();
-return;
-};
-this.setUpIframe=function(){
-this.iframe=dojo.io.createIFrame(this.iframeName,"dojo.io.IframeTransport.iframeOnload();");
-};
-this.iframeOnload=function(_673){
-if(!_669.currentRequest){
-_669.fireNextRequest();
-return;
-}
-var req=_669.currentRequest;
-if(req.formNode){
-var _675=req._contentToClean;
-for(var i=0;i<_675.length;i++){
-var key=_675[i];
-if(dojo.render.html.safari){
-var _678=req.formNode;
-for(var j=0;j<_678.childNodes.length;j++){
-var _67a=_678.childNodes[j];
-if(_67a.name==key){
-var _67b=_67a.parentNode;
-_67b.removeChild(_67a);
-break;
-}
-}
-}else{
-var _67c=req.formNode[key];
-req.formNode.removeChild(_67c);
-req.formNode[key]=null;
-}
-}
-if(req["_originalAction"]){
-req.formNode.setAttribute("action",req._originalAction);
-}
-if(req["_originalTarget"]){
-req.formNode.setAttribute("target",req._originalTarget);
-req.formNode.target=req._originalTarget;
-}
-}
-var _67d=function(_67e){
-var doc=_67e.contentDocument||((_67e.contentWindow)&&(_67e.contentWindow.document))||((_67e.name)&&(document.frames[_67e.name])&&(document.frames[_67e.name].document))||null;
-return doc;
-};
-var _680;
-var _681=false;
-if(_673){
-this._callError(req,"IframeTransport Request Error: "+_673);
-}else{
-var ifd=_67d(_669.iframe);
-try{
-var cmt=req.mimetype;
-if((cmt=="text/javascript")||(cmt=="text/json")||(cmt=="application/json")){
-var js=ifd.getElementsByTagName("textarea")[0].value;
-if(cmt=="text/json"||cmt=="application/json"){
-js="("+js+")";
-}
-_680=dj_eval(js);
-}else{
-if(cmt=="text/html"){
-_680=ifd;
-}else{
-_680=ifd.getElementsByTagName("textarea")[0].value;
-}
-}
-_681=true;
-}
-catch(e){
-this._callError(req,"IframeTransport Error: "+e);
-}
-}
-try{
-if(_681&&dojo.lang.isFunction(req["load"])){
-req.load("load",_680,req);
-}
-}
-catch(e){
-throw e;
-}
-finally{
-_669.currentRequest=null;
-_669.fireNextRequest();
-}
-};
-this._callError=function(req,_686){
-var _687=new dojo.io.Error(_686);
-if(dojo.lang.isFunction(req["error"])){
-req.error("error",_687,req);
-}
-};
-dojo.io.transports.addTransport("IframeTransport");
-};
+
 dojo.provide("dojo.date");
-dojo.deprecated("dojo.date","use one of the modules in dojo.date.* instead","0.5");
+
+dojo.deprecated("dojo.date", "use one of the modules in dojo.date.* instead", "0.5");
+
 dojo.provide("dojo.string.Builder");
-dojo.string.Builder=function(str){
-this.arrConcat=(dojo.render.html.capable&&dojo.render.html["ie"]);
-var a=[];
-var b="";
-var _68b=this.length=b.length;
-if(this.arrConcat){
-if(b.length>0){
-a.push(b);
-}
-b="";
-}
-this.toString=this.valueOf=function(){
-return (this.arrConcat)?a.join(""):b;
-};
-this.append=function(){
-for(var x=0;x<arguments.length;x++){
-var s=arguments[x];
-if(dojo.lang.isArrayLike(s)){
-this.append.apply(this,s);
-}else{
-if(this.arrConcat){
-a.push(s);
-}else{
-b+=s;
-}
-_68b+=s.length;
-this.length=_68b;
-}
-}
-return this;
-};
-this.clear=function(){
-a=[];
-b="";
-_68b=this.length=0;
-return this;
-};
-this.remove=function(f,l){
-var s="";
-if(this.arrConcat){
-b=a.join("");
-}
-a=[];
-if(f>0){
-s=b.substring(0,(f-1));
-}
-b=s+b.substring(f+l);
-_68b=this.length=b.length;
-if(this.arrConcat){
-a.push(b);
-b="";
-}
-return this;
-};
-this.replace=function(o,n){
-if(this.arrConcat){
-b=a.join("");
-}
-a=[];
-b=b.replace(o,n);
-_68b=this.length=b.length;
-if(this.arrConcat){
-a.push(b);
-b="";
-}
-return this;
-};
-this.insert=function(idx,s){
-if(this.arrConcat){
-b=a.join("");
-}
-a=[];
-if(idx==0){
-b=s+b;
-}else{
-var t=b.split("");
-t.splice(idx,0,s);
-b=t.join("");
-}
-_68b=this.length=b.length;
-if(this.arrConcat){
-a.push(b);
-b="";
-}
-return this;
-};
-this.append.apply(this,arguments);
+
+// NOTE: testing shows that direct "+=" concatenation is *much* faster on
+// Spidermoneky and Rhino, while arr.push()/arr.join() style concatenation is
+// significantly quicker on IE (Jscript/wsh/etc.).
+
+dojo.string.Builder = function(/* string? */str){
+  //  summary
+  this.arrConcat = (dojo.render.html.capable && dojo.render.html["ie"]);
+
+  var a = [];
+  var b = "";
+  var length = this.length = b.length;
+
+  if(this.arrConcat){
+    if(b.length > 0){
+      a.push(b);
+    }
+    b = "";
+  }
+
+  this.toString = this.valueOf = function(){ 
+    //  summary
+    //  Concatenate internal buffer and return as a string
+    return (this.arrConcat) ? a.join("") : b; //  string
+  };
+
+  this.append = function(){
+    //  summary
+    //  Append all arguments to the end of the internal buffer
+    for(var x=0; x<arguments.length; x++){
+      var s = arguments[x];
+      if(dojo.lang.isArrayLike(s)){
+        this.append.apply(this, s);
+      } else {
+        if(this.arrConcat){
+          a.push(s);
+        }else{
+          b+=s;
+        }
+        length += s.length;
+        this.length = length;
+      }
+    }
+    return this;  //  dojo.string.Builder
+  };
+
+  this.clear = function(){
+    //  summary
+    //  Clear the internal buffer.
+    a = [];
+    b = "";
+    length = this.length = 0;
+    return this;  //  dojo.string.Builder
+  };
+
+  this.remove = function(/* integer */f, /* integer */l){
+    //  summary
+    //  Remove a section of string from the internal buffer.
+    var s = ""; 
+    if(this.arrConcat){
+      b = a.join(""); 
+    }
+    a=[];
+    if(f>0){
+      s = b.substring(0, (f-1));
+    }
+    b = s + b.substring(f + l); 
+    length = this.length = b.length; 
+    if(this.arrConcat){
+      a.push(b);
+      b="";
+    }
+    return this;  //  dojo.string.Builder
+  };
+
+  this.replace = function(/* string */o, /* string */n){
+    //  summary
+    //  replace phrase *o* with phrase *n*.
+    if(this.arrConcat){
+      b = a.join(""); 
+    }
+    a = []; 
+    b = b.replace(o,n); 
+    length = this.length = b.length; 
+    if(this.arrConcat){
+      a.push(b);
+      b="";
+    }
+    return this;  //  dojo.string.Builder
+  };
+
+  this.insert = function(/* integer */idx, /* string */s){
+    //  summary
+    //  Insert string s at index idx.
+    if(this.arrConcat){
+      b = a.join(""); 
+    }
+    a=[];
+    if(idx == 0){
+      b = s + b;
+    }else{
+      var t = b.split("");
+      t.splice(idx,0,s);
+      b = t.join("")
+    }
+    length = this.length = b.length; 
+    if(this.arrConcat){
+      a.push(b); 
+      b="";
+    }
+    return this;  //  dojo.string.Builder
+  };
+
+  this.append.apply(this, arguments);
 };
+
 dojo.provide("dojo.string.*");
+
 if(!this["dojo"]){
-alert("\"dojo/__package__.js\" is now located at \"dojo/dojo.js\". Please update your includes accordingly");
+  alert("\"dojo/__package__.js\" is now located at \"dojo/dojo.js\". Please update your includes accordingly");
 }
+
 dojo.provide("dojo.AdapterRegistry");
-dojo.AdapterRegistry=function(_696){
-this.pairs=[];
-this.returnWrappers=_696||false;
-};
-dojo.lang.extend(dojo.AdapterRegistry,{register:function(name,_698,wrap,_69a,_69b){
-var type=(_69b)?"unshift":"push";
-this.pairs[type]([name,_698,wrap,_69a]);
-},match:function(){
-for(var i=0;i<this.pairs.length;i++){
-var pair=this.pairs[i];
-if(pair[1].apply(this,arguments)){
-if((pair[3])||(this.returnWrappers)){
-return pair[2];
-}else{
-return pair[2].apply(this,arguments);
+
+dojo.AdapterRegistry = function(/*boolean, optional*/returnWrappers){
+  // summary:
+  //    A registry to make contextual calling/searching easier.
+  // description:
+  //    Objects of this class keep list of arrays in the form [name, check,
+  //    wrap, directReturn] that are used to determine what the contextual
+  //    result of a set of checked arguments is. All check/wrap functions
+  //    in this registry should be of the same arity.
+  this.pairs = [];
+  this.returnWrappers = returnWrappers || false;
 }
-}
-}
-throw new Error("No match found");
-},unregister:function(name){
-for(var i=0;i<this.pairs.length;i++){
-var pair=this.pairs[i];
-if(pair[0]==name){
-this.pairs.splice(i,1);
-return true;
-}
-}
-return false;
-}});
+
+dojo.lang.extend(dojo.AdapterRegistry, {
+  register: function( /*string*/ name, /*function*/ check, /*function*/ wrap, 
+            /*boolean, optional*/ directReturn, 
+            /*boolean, optional*/ override){
+    // summary: 
+    //    register a check function to determine if the wrap function or
+    //    object gets selected
+    // name: a way to identify this matcher.
+    // check:
+    //    a function that arguments are passed to from the adapter's
+    //    match() function.  The check function should return true if the
+    //    given arguments are appropriate for the wrap function.
+    // directReturn:
+    //    If directReturn is true, the value passed in for wrap will be
+    //    returned instead of being called. Alternately, the
+    //    AdapterRegistry can be set globally to "return not call" using
+    //    the returnWrappers property. Either way, this behavior allows
+    //    the registry to act as a "search" function instead of a
+    //    function interception library.
+    // override:
+    //    If override is given and true, the check function will be given
+    //    highest priority. Otherwise, it will be the lowest priority
+    //    adapter.
+
+    var type = (override) ? "unshift" : "push";
+    this.pairs[type]([name, check, wrap, directReturn]);
+  },
+
+  match: function(/* ... */){
+        // summary:
+    //    Find an adapter for the given arguments. If no suitable adapter
+    //    is found, throws an exception. match() accepts any number of
+    //    arguments, all of which are passed to all matching functions
+    //    from the registered pairs.
+    for(var i = 0; i < this.pairs.length; i++){
+      var pair = this.pairs[i];
+      if(pair[1].apply(this, arguments)){
+        if((pair[3])||(this.returnWrappers)){
+          return pair[2];
+        }else{
+          return pair[2].apply(this, arguments);
+        }
+      }
+    }
+    throw new Error("No match found");
+    // dojo.raise("No match found");
+  },
+
+  unregister: function(name){
+    // summary: Remove a named adapter from the registry
+
+    // FIXME: this is kind of a dumb way to handle this. On a large
+    // registry this will be slow-ish and we can use the name as a lookup
+    // should we choose to trade memory for speed.
+    for(var i = 0; i < this.pairs.length; i++){
+      var pair = this.pairs[i];
+      if(pair[0] == name){
+        this.pairs.splice(i, 1);
+        return true;
+      }
+    }
+    return false;
+  }
+});
+
 dojo.provide("dojo.json");
-dojo.json={jsonRegistry:new dojo.AdapterRegistry(),register:function(name,_6a3,wrap,_6a5){
-dojo.json.jsonRegistry.register(name,_6a3,wrap,_6a5);
-},evalJson:function(json){
-try{
-return eval("("+json+")");
-}
-catch(e){
-dojo.debug(e);
-return json;
-}
-},serialize:function(o){
-var _6a8=typeof (o);
-if(_6a8=="undefined"){
-return "undefined";
-}else{
-if((_6a8=="number")||(_6a8=="boolean")){
-return o+"";
-}else{
-if(o===null){
-return "null";
-}
-}
-}
-if(_6a8=="string"){
-return dojo.string.escapeString(o);
-}
-var me=arguments.callee;
-var _6aa;
-if(typeof (o.__json__)=="function"){
-_6aa=o.__json__();
-if(o!==_6aa){
-return me(_6aa);
-}
-}
-if(typeof (o.json)=="function"){
-_6aa=o.json();
-if(o!==_6aa){
-return me(_6aa);
-}
-}
-if(_6a8!="function"&&typeof (o.length)=="number"){
-var res=[];
-for(var i=0;i<o.length;i++){
-var val=me(o[i]);
-if(typeof (val)!="string"){
-val="undefined";
-}
-res.push(val);
-}
-return "["+res.join(",")+"]";
-}
-try{
-window.o=o;
-_6aa=dojo.json.jsonRegistry.match(o);
-return me(_6aa);
-}
-catch(e){
-}
-if(_6a8=="function"){
-return null;
-}
-res=[];
-for(var k in o){
-var _6af;
-if(typeof (k)=="number"){
-_6af="\""+k+"\"";
-}else{
-if(typeof (k)=="string"){
-_6af=dojo.string.escapeString(k);
-}else{
-continue;
-}
-}
-val=me(o[k]);
-if(typeof (val)!="string"){
-continue;
-}
-res.push(_6af+":"+val);
-}
-return "{"+res.join(",")+"}";
-}};
+
+dojo.json = {
+  // jsonRegistry: AdapterRegistry a registry of type-based serializers
+  jsonRegistry: new dojo.AdapterRegistry(),
+
+  register: function( /*String*/    name, 
+            /*function*/  check, 
+            /*function*/  wrap, 
+            /*optional, boolean*/ override){
+    // summary:
+    //    Register a JSON serialization function. JSON serialization
+    //    functions should take one argument and return an object
+    //    suitable for JSON serialization:
+    //      - string
+    //      - number
+    //      - boolean
+    //      - undefined
+    //      - object
+    //        - null
+    //        - Array-like (length property that is a number)
+    //        - Objects with a "json" method will have this method called
+    //        - Any other object will be used as {key:value, ...} pairs
+    //      
+    //    If override is given, it is used as the highest priority JSON
+    //    serialization, otherwise it will be used as the lowest.
+    // name:
+    //    a descriptive type for this serializer
+    // check:
+    //    a unary function that will be passed an object to determine
+    //    whether or not wrap will be used to serialize the object
+    // wrap:
+    //    the serialization function
+    // override:
+    //    optional, determines if the this serialization function will be
+    //    given priority in the test order
+
+    dojo.json.jsonRegistry.register(name, check, wrap, override);
+  },
+
+  evalJson: function(/*String*/ json){
+    // summary:
+    //    evaluates the passed string-form of a JSON object
+    // json: 
+    //    a string literal of a JSON item, for instance:
+    //      '{ "foo": [ "bar", 1, { "baz": "thud" } ] }'
+    // return:
+    //    the result of the evaluation
+
+    // FIXME: should this accept mozilla's optional second arg?
+    try {
+      return eval("(" + json + ")");
+    }catch(e){
+      dojo.debug(e);
+      return json;
+    }
+  },
+
+  serialize: function(/*Object*/ o){
+    // summary:
+    //    Create a JSON serialization of an object, note that this
+    //    doesn't check for infinite recursion, so don't do that!
+    // o:
+    //    an object to be serialized. Objects may define their own
+    //    serialization via a special "__json__" or "json" function
+    //    property. If a specialized serializer has been defined, it will
+    //    be used as a fallback.
+    // return:
+    //    a String representing the serialized version of the passed
+    //    object
+
+    var objtype = typeof(o);
+    if(objtype == "undefined"){
+      return "undefined";
+    }else if((objtype == "number")||(objtype == "boolean")){
+      return o + "";
+    }else if(o === null){
+      return "null";
+    }
+    if (objtype == "string") { return dojo.string.escapeString(o); }
+    // recurse
+    var me = arguments.callee;
+    // short-circuit for objects that support "json" serialization
+    // if they return "self" then just pass-through...
+    var newObj;
+    if(typeof(o.__json__) == "function"){
+      newObj = o.__json__();
+      if(o !== newObj){
+        return me(newObj);
+      }
+    }
+    if(typeof(o.json) == "function"){
+      newObj = o.json();
+      if (o !== newObj) {
+        return me(newObj);
+      }
+    }
+    // array
+    if(objtype != "function" && typeof(o.length) == "number"){
+      var res = [];
+      for(var i = 0; i < o.length; i++){
+        var val = me(o[i]);
+        if(typeof(val) != "string"){
+          val = "undefined";
+        }
+        res.push(val);
+      }
+      return "[" + res.join(",") + "]";
+    }
+    // look in the registry
+    try {
+      window.o = o;
+      newObj = dojo.json.jsonRegistry.match(o);
+      return me(newObj);
+    }catch(e){
+      // dojo.debug(e);
+    }
+    // it's a function with no adapter, bad
+    if(objtype == "function"){
+      return null;
+    }
+    // generic object code path
+    res = [];
+    for (var k in o){
+      var useKey;
+      if (typeof(k) == "number"){
+        useKey = '"' + k + '"';
+      }else if (typeof(k) == "string"){
+        useKey = dojo.string.escapeString(k);
+      }else{
+        // skip non-string or number keys
+        continue;
+      }
+      val = me(o[k]);
+      if(typeof(val) != "string"){
+        // skip non-serializable values
+        continue;
+      }
+      res.push(useKey + ":" + val);
+    }
+    return "{" + res.join(",") + "}";
+  }
+};
+
 dojo.provide("dojo.Deferred");
-dojo.Deferred=function(_6b0){
-this.chain=[];
-this.id=this._nextId();
-this.fired=-1;
-this.paused=0;
-this.results=[null,null];
-this.canceller=_6b0;
-this.silentlyCancelled=false;
+
+dojo.Deferred = function(/* optional */ canceller){
+  /*
+  NOTE: this namespace and documentation are imported wholesale 
+    from MochiKit
+
+  Encapsulates a sequence of callbacks in response to a value that
+  may not yet be available.  This is modeled after the Deferred class
+  from Twisted <http://twistedmatrix.com>.
+
+  Why do we want this?  JavaScript has no threads, and even if it did,
+  threads are hard.  Deferreds are a way of abstracting non-blocking
+  events, such as the final response to an XMLHttpRequest.
+
+  The sequence of callbacks is internally represented as a list
+  of 2-tuples containing the callback/errback pair.  For example,
+  the following call sequence::
+
+    var d = new Deferred();
+    d.addCallback(myCallback);
+    d.addErrback(myErrback);
+    d.addBoth(myBoth);
+    d.addCallbacks(myCallback, myErrback);
+
+  is translated into a Deferred with the following internal
+  representation::
+
+    [
+      [myCallback, null],
+      [null, myErrback],
+      [myBoth, myBoth],
+      [myCallback, myErrback]
+    ]
+
+  The Deferred also keeps track of its current status (fired).
+  Its status may be one of three things:
+
+    -1: no value yet (initial condition)
+    0: success
+    1: error
+
+  A Deferred will be in the error state if one of the following
+  three conditions are met:
+
+    1. The result given to callback or errback is "instanceof" Error
+    2. The previous callback or errback raised an exception while
+       executing
+    3. The previous callback or errback returned a value "instanceof"
+      Error
+
+  Otherwise, the Deferred will be in the success state.  The state of
+  the Deferred determines the next element in the callback sequence to
+  run.
+
+  When a callback or errback occurs with the example deferred chain,
+  something equivalent to the following will happen (imagine that
+  exceptions are caught and returned)::
+
+    // d.callback(result) or d.errback(result)
+    if(!(result instanceof Error)){
+      result = myCallback(result);
+    }
+    if(result instanceof Error){
+      result = myErrback(result);
+    }
+    result = myBoth(result);
+    if(result instanceof Error){
+      result = myErrback(result);
+    }else{
+      result = myCallback(result);
+    }
+
+  The result is then stored away in case another step is added to the
+  callback sequence.  Since the Deferred already has a value available,
+  any new callbacks added will be called immediately.
+
+  There are two other "advanced" details about this implementation that
+  are useful:
+
+  Callbacks are allowed to return Deferred instances themselves, so you
+  can build complicated sequences of events with ease.
+
+  The creator of the Deferred may specify a canceller.  The canceller
+  is a function that will be called if Deferred.cancel is called before
+  the Deferred fires.  You can use this to implement clean aborting of
+  an XMLHttpRequest, etc.  Note that cancel will fire the deferred with
+  a CancelledError (unless your canceller returns another kind of
+  error), so the errbacks should be prepared to handle that error for
+  cancellable Deferreds.
+
+  */
+  
+  this.chain = [];
+  this.id = this._nextId();
+  this.fired = -1;
+  this.paused = 0;
+  this.results = [null, null];
+  this.canceller = canceller;
+  this.silentlyCancelled = false;
 };
-dojo.lang.extend(dojo.Deferred,{getFunctionFromArgs:function(){
-var a=arguments;
-if((a[0])&&(!a[1])){
-if(dojo.lang.isFunction(a[0])){
-return a[0];
-}else{
-if(dojo.lang.isString(a[0])){
-return dj_global[a[0]];
-}
-}
-}else{
-if((a[0])&&(a[1])){
-return dojo.lang.hitch(a[0],a[1]);
-}
-}
-return null;
-},makeCalled:function(){
-var _6b2=new dojo.Deferred();
-_6b2.callback();
-return _6b2;
-},repr:function(){
-var _6b3;
-if(this.fired==-1){
-_6b3="unfired";
-}else{
-if(this.fired==0){
-_6b3="success";
-}else{
-_6b3="error";
-}
-}
-return "Deferred("+this.id+", "+_6b3+")";
-},toString:dojo.lang.forward("repr"),_nextId:(function(){
-var n=1;
-return function(){
-return n++;
-};
-})(),cancel:function(){
-if(this.fired==-1){
-if(this.canceller){
-this.canceller(this);
-}else{
-this.silentlyCancelled=true;
-}
-if(this.fired==-1){
-this.errback(new Error(this.repr()));
-}
-}else{
-if((this.fired==0)&&(this.results[0] instanceof dojo.Deferred)){
-this.results[0].cancel();
-}
-}
-},_pause:function(){
-this.paused++;
-},_unpause:function(){
-this.paused--;
-if((this.paused==0)&&(this.fired>=0)){
-this._fire();
-}
-},_continue:function(res){
-this._resback(res);
-this._unpause();
-},_resback:function(res){
-this.fired=((res instanceof Error)?1:0);
-this.results[this.fired]=res;
-this._fire();
-},_check:function(){
-if(this.fired!=-1){
-if(!this.silentlyCancelled){
-dojo.raise("already called!");
-}
-this.silentlyCancelled=false;
-return;
-}
-},callback:function(res){
-this._check();
-this._resback(res);
-},errback:function(res){
-this._check();
-if(!(res instanceof Error)){
-res=new Error(res);
-}
-this._resback(res);
-},addBoth:function(cb,cbfn){
-var _6bb=this.getFunctionFromArgs(cb,cbfn);
-if(arguments.length>2){
-_6bb=dojo.lang.curryArguments(null,_6bb,arguments,2);
-}
-return this.addCallbacks(_6bb,_6bb);
-},addCallback:function(cb,cbfn){
-var _6be=this.getFunctionFromArgs(cb,cbfn);
-if(arguments.length>2){
-_6be=dojo.lang.curryArguments(null,_6be,arguments,2);
-}
-return this.addCallbacks(_6be,null);
-},addErrback:function(cb,cbfn){
-var _6c1=this.getFunctionFromArgs(cb,cbfn);
-if(arguments.length>2){
-_6c1=dojo.lang.curryArguments(null,_6c1,arguments,2);
-}
-return this.addCallbacks(null,_6c1);
-return this.addCallbacks(null,cbfn);
-},addCallbacks:function(cb,eb){
-this.chain.push([cb,eb]);
-if(this.fired>=0){
-this._fire();
-}
-return this;
-},_fire:function(){
-var _6c4=this.chain;
-var _6c5=this.fired;
-var res=this.results[_6c5];
-var self=this;
-var cb=null;
-while(_6c4.length>0&&this.paused==0){
-var pair=_6c4.shift();
-var f=pair[_6c5];
-if(f==null){
-continue;
-}
-try{
-res=f(res);
-_6c5=((res instanceof Error)?1:0);
-if(res instanceof dojo.Deferred){
-cb=function(res){
-self._continue(res);
-};
-this._pause();
-}
-}
-catch(err){
-_6c5=1;
-res=err;
-}
-}
-this.fired=_6c5;
-this.results[_6c5]=res;
-if((cb)&&(this.paused)){
-res.addBoth(cb);
-}
-}});
+
+dojo.lang.extend(dojo.Deferred, {
+  getFunctionFromArgs: function(){
+    var a = arguments;
+    if((a[0])&&(!a[1])){
+      if(dojo.lang.isFunction(a[0])){
+        return a[0];
+      }else if(dojo.lang.isString(a[0])){
+        return dj_global[a[0]];
+      }
+    }else if((a[0])&&(a[1])){
+      return dojo.lang.hitch(a[0], a[1]);
+    }
+    return null;
+  },
+
+  makeCalled: function() {
+    var deferred = new dojo.Deferred();
+    deferred.callback();
+    return deferred;
+  },
+
+  repr: function(){
+    var state;
+    if(this.fired == -1){
+      state = 'unfired';
+    }else if(this.fired == 0){
+      state = 'success';
+    } else {
+      state = 'error';
+    }
+    return 'Deferred(' + this.id + ', ' + state + ')';
+  },
+
+  toString: dojo.lang.forward("repr"),
+
+  _nextId: (function(){
+    var n = 1;
+    return function(){ return n++; };
+  })(),
+
+  cancel: function(){
+    /***
+    Cancels a Deferred that has not yet received a value, or is
+    waiting on another Deferred as its value.
+
+    If a canceller is defined, the canceller is called. If the
+    canceller did not return an error, or there was no canceller,
+    then the errback chain is started with CancelledError.
+    ***/
+    if(this.fired == -1){
+      if (this.canceller){
+        this.canceller(this);
+      }else{
+        this.silentlyCancelled = true;
+      }
+      if(this.fired == -1){
+        this.errback(new Error(this.repr()));
+      }
+    }else if( (this.fired == 0)&&
+          (this.results[0] instanceof dojo.Deferred)){
+      this.results[0].cancel();
+    }
+  },
+      
+
+  _pause: function(){
+    // Used internally to signal that it's waiting on another Deferred
+    this.paused++;
+  },
+
+  _unpause: function(){
+    // Used internally to signal that it's no longer waiting on
+    // another Deferred.
+    this.paused--;
+    if ((this.paused == 0) && (this.fired >= 0)) {
+      this._fire();
+    }
+  },
+
+  _continue: function(res){
+    // Used internally when a dependent deferred fires.
+    this._resback(res);
+    this._unpause();
+  },
+
+  _resback: function(res){
+    // The primitive that means either callback or errback
+    this.fired = ((res instanceof Error) ? 1 : 0);
+    this.results[this.fired] = res;
+    this._fire();
+  },
+
+  _check: function(){
+    if(this.fired != -1){
+      if(!this.silentlyCancelled){
+        dojo.raise("already called!");
+      }
+      this.silentlyCancelled = false;
+      return;
+    }
+  },
+
+  callback: function(res){
+    /*
+    Begin the callback sequence with a non-error value.
+    
+    callback or errback should only be called once on a given
+    Deferred.
+    */
+    this._check();
+    this._resback(res);
+  },
+
+  errback: function(res){
+    // Begin the callback sequence with an error result.
+    this._check();
+    if(!(res instanceof Error)){
+      res = new Error(res);
+    }
+    this._resback(res);
+  },
+
+  addBoth: function(cb, cbfn){
+    /*
+    Add the same function as both a callback and an errback as the
+    next element on the callback sequence.  This is useful for code
+    that you want to guarantee to run, e.g. a finalizer.
+    */
+    var enclosed = this.getFunctionFromArgs(cb, cbfn);
+    if(arguments.length > 2){
+      enclosed = dojo.lang.curryArguments(null, enclosed, arguments, 2);
+    }
+    return this.addCallbacks(enclosed, enclosed);
+  },
+
+  addCallback: function(cb, cbfn){
+    // Add a single callback to the end of the callback sequence.
+    var enclosed = this.getFunctionFromArgs(cb, cbfn);
+    if(arguments.length > 2){
+      enclosed = dojo.lang.curryArguments(null, enclosed, arguments, 2);
+    }
+    return this.addCallbacks(enclosed, null);
+  },
+
+  addErrback: function(cb, cbfn){
+    // Add a single callback to the end of the callback sequence.
+    var enclosed = this.getFunctionFromArgs(cb, cbfn);
+    if(arguments.length > 2){
+      enclosed = dojo.lang.curryArguments(null, enclosed, arguments, 2);
+    }
+    return this.addCallbacks(null, enclosed);
+    return this.addCallbacks(null, cbfn);
+  },
+
+  addCallbacks: function (cb, eb) {
+    // Add separate callback and errback to the end of the callback
+    // sequence.
+    this.chain.push([cb, eb])
+    if (this.fired >= 0) {
+      this._fire();
+    }
+    return this;
+  },
+
+  _fire: function(){
+    // Used internally to exhaust the callback sequence when a result
+    // is available.
+    var chain = this.chain;
+    var fired = this.fired;
+    var res = this.results[fired];
+    var self = this;
+    var cb = null;
+    while (chain.length > 0 && this.paused == 0) {
+      // Array
+      var pair = chain.shift();
+      var f = pair[fired];
+      if (f == null) {
+        continue;
+      }
+      try {
+        res = f(res);
+        fired = ((res instanceof Error) ? 1 : 0);
+        if(res instanceof dojo.Deferred) {
+          cb = function(res){
+            self._continue(res);
+          }
+          this._pause();
+        }
+      }catch(err){
+        fired = 1;
+        res = err;
+      }
+    }
+    this.fired = fired;
+    this.results[fired] = res;
+    if((cb)&&(this.paused)){
+      // this is for "tail recursion" in case the dependent
+      // deferred is already fired
+      res.addBoth(cb);
+    }
+  }
+});
+
 dojo.provide("dojo.rpc.RpcService");
-dojo.rpc.RpcService=function(url){
-if(url){
-this.connect(url);
-}
-};
-dojo.lang.extend(dojo.rpc.RpcService,{strictArgChecks:true,serviceUrl:"",parseResults:function(obj){
-return obj;
-},errorCallback:function(_6ce){
-return function(type,e){
-_6ce.errback(new Error(e.message));
-};
-},resultCallback:function(_6d1){
-var tf=dojo.lang.hitch(this,function(type,obj,e){
-if(obj["error"]!=null){
-var err=new Error(obj.error);
-err.id=obj.id;
-_6d1.errback(err);
-}else{
-var _6d7=this.parseResults(obj);
-_6d1.callback(_6d7);
+
+dojo.rpc.RpcService = function(url){
+  // summary
+  // constructor for rpc base class
+  if(url){
+    this.connect(url);
+  }
 }
+
+dojo.lang.extend(dojo.rpc.RpcService, {
+
+  strictArgChecks: true,
+  serviceUrl: "",
+
+  parseResults: function(obj){
+    // summary
+    // parse the results coming back from an rpc request.  
+      // this base implementation, just returns the full object
+    // subclasses should parse and only return the actual results
+    return obj;
+  },
+
+  errorCallback: function(/* dojo.Deferred */ deferredRequestHandler){
+    // summary
+    // create callback that calls the Deferres errback method
+    return function(type, e){
+      deferredRequestHandler.errback(new Error(e.message));
+    }
+  },
+
+  resultCallback: function(/* dojo.Deferred */ deferredRequestHandler){
+    // summary
+    // create callback that calls the Deferred's callback method
+    var tf = dojo.lang.hitch(this, 
+      function(type, obj, e){
+        if (obj["error"]!=null) {
+          var err = new Error(obj.error);
+          err.id = obj.id;
+          deferredRequestHandler.errback(err);
+        } else {
+          var results = this.parseResults(obj);
+          deferredRequestHandler.callback(results); 
+        }
+      }
+    );
+    return tf;
+  },
+
+
+  generateMethod: function(/*string*/ method, /*array*/ parameters, /*string*/ url){
+    // summary
+    // generate the local bind methods for the remote object
+    return dojo.lang.hitch(this, function(){
+      var deferredRequestHandler = new dojo.Deferred();
+
+      // if params weren't specified, then we can assume it's varargs
+      if( (this.strictArgChecks) &&
+        (parameters != null) &&
+        (arguments.length != parameters.length)
+      ){
+        // put error stuff here, no enough params
+        dojo.raise("Invalid number of parameters for remote method.");
+      } else {
+        this.bind(method, arguments, deferredRequestHandler, url);
+      }
+
+      return deferredRequestHandler;
+    });
+  },
+
+  processSmd: function(/*json*/ object){
+    // summary
+    // callback method for reciept of a smd object.  Parse the smd and
+    // generate functions based on the description
+    dojo.debug("RpcService: Processing returned SMD.");
+    if(object.methods){
+      dojo.lang.forEach(object.methods, function(m){
+        if(m && m["name"]){
+          dojo.debug("RpcService: Creating Method: this.", m.name, "()");
+          this[m.name] = this.generateMethod( m.name,
+                            m.parameters, 
+                            m["url"]||m["serviceUrl"]||m["serviceURL"]);
+          if(dojo.lang.isFunction(this[m.name])){
+            dojo.debug("RpcService: Successfully created", m.name, "()");
+          }else{
+            dojo.debug("RpcService: Failed to create", m.name, "()");
+          }
+        }
+      }, this);
+    }
+
+    this.serviceUrl = object.serviceUrl||object.serviceURL;
+    dojo.debug("RpcService: Dojo RpcService is ready for use.");
+  },
+
+  connect: function(/*String*/ smdUrl){
+    // summary
+    // connect to a remote url and retrieve a smd object
+    dojo.debug("RpcService: Attempting to load SMD document from:", smdUrl);
+    dojo.io.bind({
+      url: smdUrl,
+      mimetype: "text/json",
+      load: dojo.lang.hitch(this, function(type, object, e){ return this.processSmd(object); }),
+      sync: true
+    });   
+  }
 });
-return tf;
-},generateMethod:function(_6d8,_6d9,url){
-return dojo.lang.hitch(this,function(){
-var _6db=new dojo.Deferred();
-if((this.strictArgChecks)&&(_6d9!=null)&&(arguments.length!=_6d9.length)){
-dojo.raise("Invalid number of parameters for remote method.");
-}else{
-this.bind(_6d8,arguments,_6db,url);
-}
-return _6db;
-});
-},processSmd:function(_6dc){
-dojo.debug("RpcService: Processing returned SMD.");
-if(_6dc.methods){
-dojo.lang.forEach(_6dc.methods,function(m){
-if(m&&m["name"]){
-dojo.debug("RpcService: Creating Method: this.",m.name,"()");
-this[m.name]=this.generateMethod(m.name,m.parameters,m["url"]||m["serviceUrl"]||m["serviceURL"]);
-if(dojo.lang.isFunction(this[m.name])){
-dojo.debug("RpcService: Successfully created",m.name,"()");
-}else{
-dojo.debug("RpcService: Failed to create",m.name,"()");
-}
-}
-},this);
-}
-this.serviceUrl=_6dc.serviceUrl||_6dc.serviceURL;
-dojo.debug("RpcService: Dojo RpcService is ready for use.");
-},connect:function(_6de){
-dojo.debug("RpcService: Attempting to load SMD document from:",_6de);
-dojo.io.bind({url:_6de,mimetype:"text/json",load:dojo.lang.hitch(this,function(type,_6e0,e){
-return this.processSmd(_6e0);
-}),sync:true});
-}});
+
 dojo.provide("dojo.rpc.JsonService");
-dojo.rpc.JsonService=function(args){
-if(args){
-if(dojo.lang.isString(args)){
-this.connect(args);
-}else{
-if(args["smdUrl"]){
-this.connect(args.smdUrl);
+
+dojo.rpc.JsonService = function(args){
+  // passing just the URL isn't terribly useful. It's expected that at
+  // various times folks will want to specify:
+  //  - just the serviceUrl (for use w/ remoteCall())
+  //  - the text of the SMD to evaluate
+  //  - a raw SMD object
+  //  - the SMD URL
+  if(args){
+    if(dojo.lang.isString(args)){
+      // we assume it's an SMD file to be processed, since this was the
+      // earlier function signature
+
+      // FIXME: also accept dojo.uri.Uri objects?
+      this.connect(args);
+    }else{
+      // otherwise we assume it's an arguments object with the following
+      // (optional) properties:
+      //  - serviceUrl
+      //  - strictArgChecks
+      //  - smdUrl
+      //  - smdStr
+      //  - smdObj
+      if(args["smdUrl"]){
+        this.connect(args.smdUrl);
+      }
+      if(args["smdStr"]){
+        this.processSmd(dj_eval("("+args.smdStr+")"));
+      }
+      if(args["smdObj"]){
+        this.processSmd(args.smdObj);
+      }
+      if(args["serviceUrl"]){
+        this.serviceUrl = args.serviceUrl;
+      }
+      if(typeof args["strictArgChecks"] != "undefined"){
+        this.strictArgChecks = args.strictArgChecks;
+      }
+    }
+  }
 }
-if(args["smdStr"]){
-this.processSmd(dj_eval("("+args.smdStr+")"));
-}
-if(args["smdObj"]){
-this.processSmd(args.smdObj);
-}
-if(args["serviceUrl"]){
-this.serviceUrl=args.serviceUrl;
-}
-if(typeof args["strictArgChecks"]!="undefined"){
-this.strictArgChecks=args.strictArgChecks;
-}
-}
-}
-};
-dojo.inherits(dojo.rpc.JsonService,dojo.rpc.RpcService);
-dojo.extend(dojo.rpc.JsonService,{bustCache:false,contentType:"application/json-rpc",lastSubmissionId:0,callRemote:function(_6e3,_6e4){
-var _6e5=new dojo.Deferred();
-this.bind(_6e3,_6e4,_6e5);
-return _6e5;
-},bind:function(_6e6,_6e7,_6e8,url){
-dojo.io.bind({url:url||this.serviceUrl,postContent:this.createRequest(_6e6,_6e7),method:"POST",contentType:this.contentType,mimetype:"text/json",load:this.resultCallback(_6e8),error:this.errorCallback(_6e8),preventCache:this.bustCache});
-},createRequest:function(_6ea,_6eb){
-var req={"params":_6eb,"method":_6ea,"id":++this.lastSubmissionId};
-var data=dojo.json.serialize(req);
-dojo.debug("JsonService: JSON-RPC Request: "+data);
-return data;
-},parseResults:function(obj){
-if(!obj){
-return;
-}
-if(obj["Result"]!=null){
-return obj["Result"];
-}else{
-if(obj["result"]!=null){
-return obj["result"];
-}else{
-if(obj["ResultSet"]){
-return obj["ResultSet"];
-}else{
-return obj;
-}
-}
-}
-}});
+
+dojo.inherits(dojo.rpc.JsonService, dojo.rpc.RpcService);
+
+dojo.extend(dojo.rpc.JsonService, {
+
+  bustCache: false,
+  
+  contentType: "application/json-rpc",
+
+  lastSubmissionId: 0,
+
+  callRemote: function(method, params){
+    //summary
+    // call an arbitrary remote method without requiring it
+    // to be predefined with SMD
+    var deferred = new dojo.Deferred();
+    this.bind(method, params, deferred);
+    return deferred;
+  },
+
+  bind: function(method, parameters, deferredRequestHandler, url){
+    //summary
+    //JSON-RPC bind method. Takes remote method, parameters, deferred,
+    //and a url, calls createRequest to make a JSON-RPC envelope and
+    //passes that off with bind.
+
+    dojo.io.bind({
+      url: url||this.serviceUrl,
+      postContent: this.createRequest(method, parameters),
+      method: "POST",
+      contentType: this.contentType,
+      mimetype: "text/json",
+      load: this.resultCallback(deferredRequestHandler),
+      error: this.errorCallback(deferredRequestHandler),
+      preventCache:this.bustCache 
+    });
+  },
+
+  createRequest: function(method, params){
+    //summary
+    //create a JSON-RPC envelope for the request
+    var req = { "params": params, "method": method, "id": ++this.lastSubmissionId };
+    var data = dojo.json.serialize(req);
+    dojo.debug("JsonService: JSON-RPC Request: " + data);
+    return data;
+  },
+
+  parseResults: function(obj){
+    //summary
+    //parse the result envelope and pass the results back to 
+    // to the callback function
+    if(!obj){ return; }
+    if (obj["Result"]!=null){ 
+      return obj["Result"]; 
+    }else if(obj["result"]!=null){ 
+      return obj["result"]; 
+    }else if(obj["ResultSet"]){
+      return obj["ResultSet"];
+    }else{
+      return obj;
+    }
+  }
+});
+
 dojo.provide("dojo.rpc.*");
+
 dojo.provide("dojo.xml.Parse");
-dojo.xml.Parse=function(){
-function getTagName(node){
-return ((node)&&(node.tagName)?node.tagName.toLowerCase():"");
-}
-function getDojoTagName(node){
-var _6f1=getTagName(node);
-if(!_6f1){
-return "";
-}
-if((dojo.widget)&&(dojo.widget.tags[_6f1])){
-return _6f1;
-}
-var p=_6f1.indexOf(":");
-if(p>=0){
-return _6f1;
-}
-if(_6f1.substr(0,5)=="dojo:"){
-return _6f1;
-}
-if(dojo.render.html.capable&&dojo.render.html.ie&&node.scopeName!="HTML"){
-return node.scopeName.toLowerCase()+":"+_6f1;
-}
-if(_6f1.substr(0,4)=="dojo"){
-return "dojo:"+_6f1.substring(4);
-}
-var djt=node.getAttribute("dojoType")||node.getAttribute("dojotype");
-if(djt){
-if(djt.indexOf(":")<0){
-djt="dojo:"+djt;
-}
-return djt.toLowerCase();
-}
-djt=node.getAttributeNS&&node.getAttributeNS(dojo.dom.dojoml,"type");
-if(djt){
-return "dojo:"+djt.toLowerCase();
-}
-try{
-djt=node.getAttribute("dojo:type");
-}
-catch(e){
-}
-if(djt){
-return "dojo:"+djt.toLowerCase();
-}
-if((!dj_global["djConfig"])||(djConfig["ignoreClassNames"])){
-var _6f4=node.className||node.getAttribute("class");
-if((_6f4)&&(_6f4.indexOf)&&(_6f4.indexOf("dojo-")!=-1)){
-var _6f5=_6f4.split(" ");
-for(var x=0,c=_6f5.length;x<c;x++){
-if(_6f5[x].slice(0,5)=="dojo-"){
-return "dojo:"+_6f5[x].substr(5).toLowerCase();
-}
-}
-}
-}
-return "";
-}
-this.parseElement=function(node,_6f9,_6fa,_6fb){
-var _6fc={};
-var _6fd=getTagName(node);
-if((_6fd)&&(_6fd.indexOf("/")==0)){
-return null;
-}
-var _6fe=true;
-if(_6fa){
-var _6ff=getDojoTagName(node);
-_6fd=_6ff||_6fd;
-_6fe=Boolean(_6ff);
-}
-if(node&&node.getAttribute&&node.getAttribute("parseWidgets")&&node.getAttribute("parseWidgets")=="false"){
-return {};
-}
-_6fc[_6fd]=[];
-var pos=_6fd.indexOf(":");
-if(pos>0){
-var ns=_6fd.substring(0,pos);
-_6fc["ns"]=ns;
-if((dojo.ns)&&(!dojo.ns.allow(ns))){
-_6fe=false;
-}
-}
-if(_6fe){
-var _702=this.parseAttributes(node);
-for(var attr in _702){
-if((!_6fc[_6fd][attr])||(typeof _6fc[_6fd][attr]!="array")){
-_6fc[_6fd][attr]=[];
-}
-_6fc[_6fd][attr].push(_702[attr]);
-}
-_6fc[_6fd].nodeRef=node;
-_6fc.tagName=_6fd;
-_6fc.index=_6fb||0;
-}
-var _704=0;
-for(var i=0;i<node.childNodes.length;i++){
-var tcn=node.childNodes.item(i);
-switch(tcn.nodeType){
-case dojo.dom.ELEMENT_NODE:
-_704++;
-var ctn=getDojoTagName(tcn)||getTagName(tcn);
-if(!_6fc[ctn]){
-_6fc[ctn]=[];
-}
-_6fc[ctn].push(this.parseElement(tcn,true,_6fa,_704));
-if((tcn.childNodes.length==1)&&(tcn.childNodes.item(0).nodeType==dojo.dom.TEXT_NODE)){
-_6fc[ctn][_6fc[ctn].length-1].value=tcn.childNodes.item(0).nodeValue;
-}
-break;
-case dojo.dom.TEXT_NODE:
-if(node.childNodes.length==1){
-_6fc[_6fd].push({value:node.childNodes.item(0).nodeValue});
-}
-break;
-default:
-break;
-}
-}
-return _6fc;
-};
-this.parseAttributes=function(node){
-var _709={};
-var atts=node.attributes;
-var _70b,i=0;
-while((_70b=atts[i++])){
-if((dojo.render.html.capable)&&(dojo.render.html.ie)){
-if(!_70b){
-continue;
-}
-if((typeof _70b=="object")&&(typeof _70b.nodeValue=="undefined")||(_70b.nodeValue==null)||(_70b.nodeValue=="")){
-continue;
-}
-}
-var nn=_70b.nodeName.split(":");
-nn=(nn.length==2)?nn[1]:_70b.nodeName;
-_709[nn]={value:_70b.nodeValue};
-}
-return _709;
-};
+
+//TODO: determine dependencies
+// currently has dependency on dojo.xml.DomUtil nodeTypes constants...
+
+/* 
+  generic class for taking a node and parsing it into an object
+*/
+
+// using documentFragment nomenclature to generalize in case we don't want to require passing a collection of nodes with a single parent
+
+dojo.xml.Parse = function(){
+
+  // supported dojoTagName's:
+  // 
+  // <prefix:tag> => prefix:tag
+  // <dojo:tag> => dojo:tag
+  // <dojoTag> => dojo:tag
+  // <tag dojoType="type"> => dojo:type
+  // <tag dojoType="prefix:type"> => prefix:type
+  // <tag dojo:type="type"> => dojo:type
+  // <tag class="classa dojo-type classb"> => dojo:type 
+
+  // get normalized (lowercase) tagName
+  // some browsers report tagNames in lowercase no matter what
+  function getTagName(node){
+    return ((node)&&(node.tagName) ? node.tagName.toLowerCase() : '');
+  }
+
+  // locate dojo qualified tag name
+  function getDojoTagName(node){
+    var tagName = getTagName(node);
+    if (!tagName){
+        return '';
+    }
+    // any registered tag
+    if((dojo.widget)&&(dojo.widget.tags[tagName])){
+      return tagName;
+    }
+    // <prefix:tag> => prefix:tag
+    var p = tagName.indexOf(":");
+    if(p>=0){
+      return tagName;
+    }
+    // <dojo:tag> => dojo:tag
+    if(tagName.substr(0,5) == "dojo:"){
+      return tagName;
+    }
+    if(dojo.render.html.capable && dojo.render.html.ie && node.scopeName != 'HTML'){
+      return node.scopeName.toLowerCase() + ':' + tagName;
+    }
+    // <dojoTag> => dojo:tag
+    if(tagName.substr(0,4) == "dojo"){
+      // FIXME: this assumes tag names are always lower case
+      return "dojo:" + tagName.substring(4);
+    }
+    // <tag dojoType="prefix:type"> => prefix:type
+    // <tag dojoType="type"> => dojo:type
+    var djt = node.getAttribute("dojoType") || node.getAttribute("dojotype");
+    if(djt){
+      if (djt.indexOf(":")<0){
+        djt = "dojo:"+djt;
+      }
+      return djt.toLowerCase();
+    }
+    // <tag dojo:type="type"> => dojo:type
+    djt = node.getAttributeNS && node.getAttributeNS(dojo.dom.dojoml,"type");
+    if(djt){
+      return "dojo:" + djt.toLowerCase();
+    }
+    // <tag dojo:type="type"> => dojo:type
+    try{
+      // FIXME: IE really really doesn't like this, so we squelch errors for it
+      djt = node.getAttribute("dojo:type");
+    }catch(e){ 
+      // FIXME: log?  
+    }
+    if(djt){ return "dojo:"+djt.toLowerCase(); }
+    // <tag class="classa dojo-type classb"> => dojo:type 
+    if((!dj_global["djConfig"])|| (djConfig["ignoreClassNames"])){ 
+      // FIXME: should we make this optionally enabled via djConfig?
+      var classes = node.className||node.getAttribute("class");
+      // FIXME: following line, without check for existence of classes.indexOf
+      // breaks firefox 1.5's svg widgets
+      if((classes )&&(classes.indexOf)&&(classes.indexOf("dojo-")!=-1)){
+        var aclasses = classes.split(" ");
+        for(var x=0, c=aclasses.length; x<c; x++){
+          if(aclasses[x].slice(0, 5) == "dojo-"){
+            return "dojo:"+aclasses[x].substr(5).toLowerCase(); 
+          }
+        }
+      }
+    }
+    // no dojo-qualified name
+    return '';
+  }
+
+  this.parseElement = function(node, hasParentNodeSet, optimizeForDojoML, thisIdx){
+
+    var parsedNodeSet = {};
+    
+    var tagName = getTagName(node);
+    //There's a weird bug in IE where it counts end tags, e.g. </dojo:button> as nodes that should be parsed.  Ignore these
+    if((tagName)&&(tagName.indexOf("/")==0)){
+      return null;
+    }
+    
+    // look for a dojoml qualified name
+    // process dojoml only when optimizeForDojoML is true
+    var process = true;
+    if(optimizeForDojoML){
+      var dojoTagName = getDojoTagName(node);
+      tagName = dojoTagName || tagName;
+      process = Boolean(dojoTagName);
+    }
+    
+    if(node && node.getAttribute && node.getAttribute("parseWidgets") && node.getAttribute("parseWidgets") == "false") {
+      return {};
+    }
+
+    parsedNodeSet[tagName] = [];
+    var pos = tagName.indexOf(":");
+    if(pos>0){
+      var ns = tagName.substring(0,pos);
+      parsedNodeSet["ns"] = ns;
+      // honor user namespace filters
+      if((dojo.ns)&&(!dojo.ns.allow(ns))){process=false;}
+    }
+
+    if(process){
+      var attributeSet = this.parseAttributes(node);
+      for(var attr in attributeSet){
+        if((!parsedNodeSet[tagName][attr])||(typeof parsedNodeSet[tagName][attr] != "array")){
+          parsedNodeSet[tagName][attr] = [];
+        }
+        parsedNodeSet[tagName][attr].push(attributeSet[attr]);
+      } 
+      // FIXME: we might want to make this optional or provide cloning instead of
+      // referencing, but for now, we include a node reference to allow
+      // instantiated components to figure out their "roots"
+      parsedNodeSet[tagName].nodeRef = node;
+      parsedNodeSet.tagName = tagName;
+      parsedNodeSet.index = thisIdx||0;
+    }
+
+    var count = 0;
+    for(var i = 0; i < node.childNodes.length; i++){
+      var tcn = node.childNodes.item(i);
+      switch(tcn.nodeType){
+        case  dojo.dom.ELEMENT_NODE: // element nodes, call this function recursively
+          count++;
+          var ctn = getDojoTagName(tcn) || getTagName(tcn);
+          if(!parsedNodeSet[ctn]){
+            parsedNodeSet[ctn] = [];
+          }
+          parsedNodeSet[ctn].push(this.parseElement(tcn, true, optimizeForDojoML, count));
+          if( (tcn.childNodes.length == 1)&&
+            (tcn.childNodes.item(0).nodeType == dojo.dom.TEXT_NODE)){
+            parsedNodeSet[ctn][parsedNodeSet[ctn].length-1].value = tcn.childNodes.item(0).nodeValue;
+          }
+          break;
+        case  dojo.dom.TEXT_NODE: // if a single text node is the child, treat it as an attribute
+          if(node.childNodes.length == 1){
+            parsedNodeSet[tagName].push({ value: node.childNodes.item(0).nodeValue });
+          }
+          break;
+        default: break;
+        /*
+        case  dojo.dom.ATTRIBUTE_NODE: // attribute node... not meaningful here
+          break;
+        case  dojo.dom.CDATA_SECTION_NODE: // cdata section... not sure if this would ever be meaningful... might be...
+          break;
+        case  dojo.dom.ENTITY_REFERENCE_NODE: // entity reference node... not meaningful here
+          break;
+        case  dojo.dom.ENTITY_NODE: // entity node... not sure if this would ever be meaningful
+          break;
+        case  dojo.dom.PROCESSING_INSTRUCTION_NODE: // processing instruction node... not meaningful here
+          break;
+        case  dojo.dom.COMMENT_NODE: // comment node... not not sure if this would ever be meaningful 
+          break;
+        case  dojo.dom.DOCUMENT_NODE: // document node... not sure if this would ever be meaningful
+          break;
+        case  dojo.dom.DOCUMENT_TYPE_NODE: // document type node... not meaningful here
+          break;
+        case  dojo.dom.DOCUMENT_FRAGMENT_NODE: // document fragment node... not meaningful here
+          break;
+        case  dojo.dom.NOTATION_NODE:// notation node... not meaningful here
+          break;
+        */
+      }
+    }
+    //return (hasParentNodeSet) ? parsedNodeSet[node.tagName] : parsedNodeSet;
+    //if(parsedNodeSet.tagName)dojo.debug("parseElement: RETURNING NODE WITH TAGNAME "+parsedNodeSet.tagName);
+    return parsedNodeSet;
+  };
+
+  /* parses a set of attributes on a node into an object tree */
+  this.parseAttributes = function(node){
+    var parsedAttributeSet = {};
+    var atts = node.attributes;
+    // TODO: should we allow for duplicate attributes at this point...
+    // would any of the relevant dom implementations even allow this?
+    var attnode, i=0;
+    while((attnode=atts[i++])){
+      if((dojo.render.html.capable)&&(dojo.render.html.ie)){
+        if(!attnode){ continue; }
+        if((typeof attnode == "object")&&
+          (typeof attnode.nodeValue == 'undefined')||
+          (attnode.nodeValue == null)||
+          (attnode.nodeValue == '')){ 
+          continue; 
+        }
+      }
+
+      var nn = attnode.nodeName.split(":");
+      nn = (nn.length == 2) ? nn[1] : attnode.nodeName;
+            
+      parsedAttributeSet[nn] = { 
+        value: attnode.nodeValue 
+      };
+    }
+    return parsedAttributeSet;
+  };
 };
+
 dojo.provide("dojo.xml.*");
+
 dojo.provide("dojo.undo.Manager");
-dojo.undo.Manager=function(_70e){
-this.clear();
-this._parent=_70e;
+
+dojo.undo.Manager = function(parent) {
+  this.clear();
+  this._parent = parent;
 };
-dojo.extend(dojo.undo.Manager,{_parent:null,_undoStack:null,_redoStack:null,_currentManager:null,canUndo:false,canRedo:false,isUndoing:false,isRedoing:false,onUndo:function(_70f,item){
-},onRedo:function(_711,item){
-},onUndoAny:function(_713,item){
-},onRedoAny:function(_715,item){
-},_updateStatus:function(){
-this.canUndo=this._undoStack.length>0;
-this.canRedo=this._redoStack.length>0;
-},clear:function(){
-this._undoStack=[];
-this._redoStack=[];
-this._currentManager=this;
-this.isUndoing=false;
-this.isRedoing=false;
-this._updateStatus();
-},undo:function(){
-if(!this.canUndo){
-return false;
-}
-this.endAllTransactions();
-this.isUndoing=true;
-var top=this._undoStack.pop();
-if(top instanceof dojo.undo.Manager){
-top.undoAll();
-}else{
-top.undo();
-}
-if(top.redo){
-this._redoStack.push(top);
-}
-this.isUndoing=false;
-this._updateStatus();
-this.onUndo(this,top);
-if(!(top instanceof dojo.undo.Manager)){
-this.getTop().onUndoAny(this,top);
-}
-return true;
-},redo:function(){
-if(!this.canRedo){
-return false;
-}
-this.isRedoing=true;
-var top=this._redoStack.pop();
-if(top instanceof dojo.undo.Manager){
-top.redoAll();
-}else{
-top.redo();
-}
-this._undoStack.push(top);
-this.isRedoing=false;
-this._updateStatus();
-this.onRedo(this,top);
-if(!(top instanceof dojo.undo.Manager)){
-this.getTop().onRedoAny(this,top);
-}
-return true;
-},undoAll:function(){
-while(this._undoStack.length>0){
-this.undo();
-}
-},redoAll:function(){
-while(this._redoStack.length>0){
-this.redo();
-}
-},push:function(undo,redo,_71b){
-if(!undo){
-return;
-}
-if(this._currentManager==this){
-this._undoStack.push({undo:undo,redo:redo,description:_71b});
-}else{
-this._currentManager.push.apply(this._currentManager,arguments);
-}
-this._redoStack=[];
-this._updateStatus();
-},concat:function(_71c){
-if(!_71c){
-return;
-}
-if(this._currentManager==this){
-for(var x=0;x<_71c._undoStack.length;x++){
-this._undoStack.push(_71c._undoStack[x]);
-}
-if(_71c._undoStack.length>0){
-this._redoStack=[];
-}
-this._updateStatus();
-}else{
-this._currentManager.concat.apply(this._currentManager,arguments);
-}
-},beginTransaction:function(_71e){
-if(this._currentManager==this){
-var mgr=new dojo.undo.Manager(this);
-mgr.description=_71e?_71e:"";
-this._undoStack.push(mgr);
-this._currentManager=mgr;
-return mgr;
-}else{
-this._currentManager=this._currentManager.beginTransaction.apply(this._currentManager,arguments);
-}
-},endTransaction:function(_720){
-if(this._currentManager==this){
-if(this._parent){
-this._parent._currentManager=this._parent;
-if(this._undoStack.length==0||_720){
-var idx=dojo.lang.find(this._parent._undoStack,this);
-if(idx>=0){
-this._parent._undoStack.splice(idx,1);
-if(_720){
-for(var x=0;x<this._undoStack.length;x++){
-this._parent._undoStack.splice(idx++,0,this._undoStack[x]);
-}
-this._updateStatus();
-}
-}
-}
-return this._parent;
-}
-}else{
-this._currentManager=this._currentManager.endTransaction.apply(this._currentManager,arguments);
-}
-},endAllTransactions:function(){
-while(this._currentManager!=this){
-this.endTransaction();
-}
-},getTop:function(){
-if(this._parent){
-return this._parent.getTop();
-}else{
-return this;
-}
-}});
+dojo.extend(dojo.undo.Manager, {
+  _parent: null,
+  _undoStack: null,
+  _redoStack: null,
+  _currentManager: null,
+
+  canUndo: false,
+  canRedo: false,
+
+  isUndoing: false,
+  isRedoing: false,
+
+  // these events allow you to hook in and update your code (UI?) as necessary
+  onUndo: function(manager, item) {},
+  onRedo: function(manager, item) {},
+
+  // fired when you do *any* undo action, which means you'll have one for every item
+  // in a transaction. this is usually only useful for debugging
+  onUndoAny: function(manager, item) {},
+  onRedoAny: function(manager, item) {},
+
+  _updateStatus: function() {
+    this.canUndo = this._undoStack.length > 0;
+    this.canRedo = this._redoStack.length > 0;
+  },
+
+  clear: function() {
+    this._undoStack = [];
+    this._redoStack = [];
+    this._currentManager = this;
+
+    this.isUndoing = false;
+    this.isRedoing = false;
+
+    this._updateStatus();
+  },
+
+  undo: function() {
+    if(!this.canUndo) { return false; }
+
+    this.endAllTransactions();
+
+    this.isUndoing = true;
+    var top = this._undoStack.pop();
+    if(top instanceof dojo.undo.Manager){
+      top.undoAll();
+    }else{
+      top.undo();
+    }
+    if(top.redo){
+      this._redoStack.push(top);
+    }
+    this.isUndoing = false;
+
+    this._updateStatus();
+    this.onUndo(this, top);
+    if(!(top instanceof dojo.undo.Manager)) {
+      this.getTop().onUndoAny(this, top);
+    }
+    return true;
+  },
+
+  redo: function() {
+    if(!this.canRedo){ return false; }
+
+    this.isRedoing = true;
+    var top = this._redoStack.pop();
+    if(top instanceof dojo.undo.Manager) {
+      top.redoAll();
+    }else{
+      top.redo();
+    }
+    this._undoStack.push(top);
+    this.isRedoing = false;
+
+    this._updateStatus();
+    this.onRedo(this, top);
+    if(!(top instanceof dojo.undo.Manager)){
+      this.getTop().onRedoAny(this, top);
+    }
+    return true;
+  },
+
+  undoAll: function() {
+    while(this._undoStack.length > 0) {
+      this.undo();
+    }
+  },
+
+  redoAll: function() {
+    while(this._redoStack.length > 0) {
+      this.redo();
+    }
+  },
+
+  push: function(undo, redo /* optional */, description /* optional */) {
+    if(!undo) { return; }
+
+    if(this._currentManager == this) {
+      this._undoStack.push({
+        undo: undo,
+        redo: redo,
+        description: description
+      });
+    } else {
+      this._currentManager.push.apply(this._currentManager, arguments);
+    }
+    // adding a new undo-able item clears out the redo stack
+    this._redoStack = [];
+    this._updateStatus();
+  },
+
+  concat: function(manager) {
+    if ( !manager ) { return; }
+
+    if (this._currentManager == this ) {
+      for(var x=0; x < manager._undoStack.length; x++) {
+        this._undoStack.push(manager._undoStack[x]);
+      }
+      // adding a new undo-able item clears out the redo stack
+      if (manager._undoStack.length > 0) {
+        this._redoStack = [];
+      }
+      this._updateStatus();
+    } else {
+      this._currentManager.concat.apply(this._currentManager, arguments);
+    }
+  },
+
+  beginTransaction: function(description /* optional */) {
+    if(this._currentManager == this) {
+      var mgr = new dojo.undo.Manager(this);
+      mgr.description = description ? description : "";
+      this._undoStack.push(mgr);
+      this._currentManager = mgr;
+      return mgr;
+    } else {
+      //for nested transactions need to make sure the top level _currentManager is set
+      this._currentManager = this._currentManager.beginTransaction.apply(this._currentManager, arguments);
+    }
+  },
+
+  endTransaction: function(flatten /* optional */) {
+    if(this._currentManager == this) {
+      if(this._parent) {
+        this._parent._currentManager = this._parent;
+        // don't leave empty transactions hangin' around
+        if(this._undoStack.length == 0 || flatten) {
+          var idx = dojo.lang.find(this._parent._undoStack, this);
+          if (idx >= 0) {
+            this._parent._undoStack.splice(idx, 1);
+            //add the current transaction to parents undo stack
+            if (flatten) {
+              for(var x=0; x < this._undoStack.length; x++){
+                this._parent._undoStack.splice(idx++, 0, this._undoStack[x]);
+              }
+              this._updateStatus();
+            }
+          }
+        }
+        return this._parent;
+      }
+    } else {
+      //for nested transactions need to make sure the top level _currentManager is set
+      this._currentManager = this._currentManager.endTransaction.apply(this._currentManager, arguments);
+    }
+  },
+
+  endAllTransactions: function() {
+    while(this._currentManager != this) {
+      this.endTransaction();
+    }
+  },
+
+  // find the top parent of an undo manager
+  getTop: function() {
+    if(this._parent) {
+      return this._parent.getTop();
+    } else {
+      return this;
+    }
+  }
+});
+
 dojo.provide("dojo.undo.*");
+
 dojo.provide("dojo.crypto");
-dojo.crypto.cipherModes={ECB:0,CBC:1,PCBC:2,CFB:3,OFB:4,CTR:5};
-dojo.crypto.outputTypes={Base64:0,Hex:1,String:2,Raw:3};
+
+dojo.crypto.cipherModes={ 
+  //  summary
+  //  Enumeration for various cipher modes.
+  ECB:0, 
+  CBC:1, 
+  PCBC:2, 
+  CFB:3, 
+  OFB:4, 
+  CTR:5 
+};
+
+dojo.crypto.outputTypes={ 
+  //  summary
+  //  Enumeration for input and output encodings.
+  Base64:0,
+  Hex:1,
+  String:2,
+  Raw:3 
+};
+
 dojo.provide("dojo.crypto.MD5");
-dojo.crypto.MD5=new function(){
-var _723=8;
-var mask=(1<<_723)-1;
-function toWord(s){
-var wa=[];
-for(var i=0;i<s.length*_723;i+=_723){
-wa[i>>5]|=(s.charCodeAt(i/_723)&mask)<<(i%32);
-}
-return wa;
-}
-function toString(wa){
-var s=[];
-for(var i=0;i<wa.length*32;i+=_723){
-s.push(String.fromCharCode((wa[i>>5]>>>(i%32))&mask));
-}
-return s.join("");
-}
-function toHex(wa){
-var h="0123456789abcdef";
-var s=[];
-for(var i=0;i<wa.length*4;i++){
-s.push(h.charAt((wa[i>>2]>>((i%4)*8+4))&15)+h.charAt((wa[i>>2]>>((i%4)*8))&15));
-}
-return s.join("");
-}
-function toBase64(wa){
-var p="=";
-var tab="ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
-var s=[];
-for(var i=0;i<wa.length*4;i+=3){
-var t=(((wa[i>>2]>>8*(i%4))&255)<<16)|(((wa[i+1>>2]>>8*((i+1)%4))&255)<<8)|((wa[i+2>>2]>>8*((i+2)%4))&255);
-for(var j=0;j<4;j++){
-if(i*8+j*6>wa.length*32){
-s.push(p);
-}else{
-s.push(tab.charAt((t>>6*(3-j))&63));
-}
-}
-}
-return s.join("");
-}
-function add(x,y){
-var l=(x&65535)+(y&65535);
-var m=(x>>16)+(y>>16)+(l>>16);
-return (m<<16)|(l&65535);
-}
-function R(n,c){
-return (n<<c)|(n>>>(32-c));
-}
-function C(q,a,b,x,s,t){
-return add(R(add(add(a,q),add(x,t)),s),b);
-}
-function FF(a,b,c,d,x,s,t){
-return C((b&c)|((~b)&d),a,b,x,s,t);
-}
-function GG(a,b,c,d,x,s,t){
-return C((b&d)|(c&(~d)),a,b,x,s,t);
-}
-function HH(a,b,c,d,x,s,t){
-return C(b^c^d,a,b,x,s,t);
-}
-function II(a,b,c,d,x,s,t){
-return C(c^(b|(~d)),a,b,x,s,t);
-}
-function core(x,len){
-x[len>>5]|=128<<((len)%32);
-x[(((len+64)>>>9)<<4)+14]=len;
-var a=1732584193;
-var b=-271733879;
-var c=-1732584194;
-var d=271733878;
-for(var i=0;i<x.length;i+=16){
-var olda=a;
-var oldb=b;
-var oldc=c;
-var oldd=d;
-a=FF(a,b,c,d,x[i+0],7,-680876936);
-d=FF(d,a,b,c,x[i+1],12,-389564586);
-c=FF(c,d,a,b,x[i+2],17,606105819);
-b=FF(b,c,d,a,x[i+3],22,-1044525330);
-a=FF(a,b,c,d,x[i+4],7,-176418897);
-d=FF(d,a,b,c,x[i+5],12,1200080426);
-c=FF(c,d,a,b,x[i+6],17,-1473231341);
-b=FF(b,c,d,a,x[i+7],22,-45705983);
-a=FF(a,b,c,d,x[i+8],7,1770035416);
-d=FF(d,a,b,c,x[i+9],12,-1958414417);
-c=FF(c,d,a,b,x[i+10],17,-42063);
-b=FF(b,c,d,a,x[i+11],22,-1990404162);
-a=FF(a,b,c,d,x[i+12],7,1804603682);
-d=FF(d,a,b,c,x[i+13],12,-40341101);
-c=FF(c,d,a,b,x[i+14],17,-1502002290);
-b=FF(b,c,d,a,x[i+15],22,1236535329);
-a=GG(a,b,c,d,x[i+1],5,-165796510);
-d=GG(d,a,b,c,x[i+6],9,-1069501632);
-c=GG(c,d,a,b,x[i+11],14,643717713);
-b=GG(b,c,d,a,x[i+0],20,-373897302);
-a=GG(a,b,c,d,x[i+5],5,-701558691);
-d=GG(d,a,b,c,x[i+10],9,38016083);
-c=GG(c,d,a,b,x[i+15],14,-660478335);
-b=GG(b,c,d,a,x[i+4],20,-405537848);
-a=GG(a,b,c,d,x[i+9],5,568446438);
-d=GG(d,a,b,c,x[i+14],9,-1019803690);
-c=GG(c,d,a,b,x[i+3],14,-187363961);
-b=GG(b,c,d,a,x[i+8],20,1163531501);
-a=GG(a,b,c,d,x[i+13],5,-1444681467);
-d=GG(d,a,b,c,x[i+2],9,-51403784);
-c=GG(c,d,a,b,x[i+7],14,1735328473);
-b=GG(b,c,d,a,x[i+12],20,-1926607734);
-a=HH(a,b,c,d,x[i+5],4,-378558);
-d=HH(d,a,b,c,x[i+8],11,-2022574463);
-c=HH(c,d,a,b,x[i+11],16,1839030562);
-b=HH(b,c,d,a,x[i+14],23,-35309556);
-a=HH(a,b,c,d,x[i+1],4,-1530992060);
-d=HH(d,a,b,c,x[i+4],11,1272893353);
-c=HH(c,d,a,b,x[i+7],16,-155497632);
-b=HH(b,c,d,a,x[i+10],23,-1094730640);
-a=HH(a,b,c,d,x[i+13],4,681279174);
-d=HH(d,a,b,c,x[i+0],11,-358537222);
-c=HH(c,d,a,b,x[i+3],16,-722521979);
-b=HH(b,c,d,a,x[i+6],23,76029189);
-a=HH(a,b,c,d,x[i+9],4,-640364487);
-d=HH(d,a,b,c,x[i+12],11,-421815835);
-c=HH(c,d,a,b,x[i+15],16,530742520);
-b=HH(b,c,d,a,x[i+2],23,-995338651);
-a=II(a,b,c,d,x[i+0],6,-198630844);
-d=II(d,a,b,c,x[i+7],10,1126891415);
-c=II(c,d,a,b,x[i+14],15,-1416354905);
-b=II(b,c,d,a,x[i+5],21,-57434055);
-a=II(a,b,c,d,x[i+12],6,1700485571);
-d=II(d,a,b,c,x[i+3],10,-1894986606);
-c=II(c,d,a,b,x[i+10],15,-1051523);
-b=II(b,c,d,a,x[i+1],21,-2054922799);
-a=II(a,b,c,d,x[i+8],6,1873313359);
-d=II(d,a,b,c,x[i+15],10,-30611744);
-c=II(c,d,a,b,x[i+6],15,-1560198380);
-b=II(b,c,d,a,x[i+13],21,1309151649);
-a=II(a,b,c,d,x[i+4],6,-145523070);
-d=II(d,a,b,c,x[i+11],10,-1120210379);
-c=II(c,d,a,b,x[i+2],15,718787259);
-b=II(b,c,d,a,x[i+9],21,-343485551);
-a=add(a,olda);
-b=add(b,oldb);
-c=add(c,oldc);
-d=add(d,oldd);
-}
-return [a,b,c,d];
-}
-function hmac(data,key){
-var wa=toWord(key);
-if(wa.length>16){
-wa=core(wa,key.length*_723);
-}
-var l=[],r=[];
-for(var i=0;i<16;i++){
-l[i]=wa[i]^909522486;
-r[i]=wa[i]^1549556828;
-}
-var h=core(l.concat(toWord(data)),512+data.length*_723);
-return core(r.concat(h),640);
-}
-this.compute=function(data,_771){
-var out=_771||dojo.crypto.outputTypes.Base64;
-switch(out){
-case dojo.crypto.outputTypes.Hex:
-return toHex(core(toWord(data),data.length*_723));
-case dojo.crypto.outputTypes.String:
-return toString(core(toWord(data),data.length*_723));
-default:
-return toBase64(core(toWord(data),data.length*_723));
-}
-};
-this.getHMAC=function(data,key,_775){
-var out=_775||dojo.crypto.outputTypes.Base64;
-switch(out){
-case dojo.crypto.outputTypes.Hex:
-return toHex(hmac(data,key));
-case dojo.crypto.outputTypes.String:
-return toString(hmac(data,key));
-default:
-return toBase64(hmac(data,key));
-}
-};
+
+/*  Return to a port of Paul Johnstone's MD5 implementation
+ *  http://pajhome.org.uk/crypt/md5/index.html
+ *
+ *  Copyright (C) Paul Johnston 1999 - 2002.
+ *  Other contributors: Greg Holt, Andrew Kepert, Ydnar, Lostinet
+ *  Distributed under the BSD License
+ *
+ *  Dojo port by Tom Trenka
+ *
+ *  2005-12-7
+ *  All conversions are internalized (no dependencies)
+ *  implemented getHMAC for message digest auth.
+ */
+dojo.crypto.MD5 = new function(){
+  //  summary
+  //  object for creating digests using the MD5 algorithm
+  var chrsz=8;
+  var mask=(1<<chrsz)-1;
+  function toWord(s) {
+    var wa=[];
+    for(var i=0; i<s.length*chrsz; i+=chrsz)
+    wa[i>>5]|=(s.charCodeAt(i/chrsz)&mask)<<(i%32);
+    return wa;
+  }
+  function toString(wa){
+    var s=[];
+    for(var i=0; i<wa.length*32; i+=chrsz)
+      s.push(String.fromCharCode((wa[i>>5]>>>(i%32))&mask));
+    return s.join("");
+  }
+  function toHex(wa) {
+    var h="0123456789abcdef";
+    var s=[];
+    for(var i=0; i<wa.length*4; i++){
+      s.push(h.charAt((wa[i>>2]>>((i%4)*8+4))&0xF)+h.charAt((wa[i>>2]>>((i%4)*8))&0xF));
+    }
+    return s.join("");
+  }
+  function toBase64(wa){
+    var p="=";
+    var tab="ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
+    var s=[];
+    for(var i=0; i<wa.length*4; i+=3){
+      var t=(((wa[i>>2]>>8*(i%4))&0xFF)<<16)|(((wa[i+1>>2]>>8*((i+1)%4))&0xFF)<<8)|((wa[i+2>>2]>>8*((i+2)%4))&0xFF);
+      for(var j=0; j<4; j++){
+        if(i*8+j*6>wa.length*32) s.push(p);
+        else s.push(tab.charAt((t>>6*(3-j))&0x3F));
+      }
+    }
+    return s.join("");
+  }
+  function add(x,y) {
+    var l=(x&0xFFFF)+(y&0xFFFF);
+    var m=(x>>16)+(y>>16)+(l>>16);
+    return (m<<16)|(l&0xFFFF);
+  }
+  function R(n,c){ return (n<<c)|(n>>>(32-c)); }
+  function C(q,a,b,x,s,t){ return add(R(add(add(a,q),add(x,t)),s),b); }
+  function FF(a,b,c,d,x,s,t){ return C((b&c)|((~b)&d),a,b,x,s,t); }
+  function GG(a,b,c,d,x,s,t){ return C((b&d)|(c&(~d)),a,b,x,s,t); }
+  function HH(a,b,c,d,x,s,t){ return C(b^c^d,a,b,x,s,t); }
+  function II(a,b,c,d,x,s,t){ return C(c^(b|(~d)),a,b,x,s,t); }
+  function core(x,len){
+    x[len>>5]|=0x80<<((len)%32);
+    x[(((len+64)>>>9)<<4)+14]=len;
+    var a= 1732584193;
+    var b=-271733879;
+    var c=-1732584194;
+    var d= 271733878;
+    for(var i=0; i<x.length; i+=16){
+      var olda=a;
+      var oldb=b;
+      var oldc=c;
+      var oldd=d;
+
+      a=FF(a,b,c,d,x[i+ 0],7 ,-680876936);
+      d=FF(d,a,b,c,x[i+ 1],12,-389564586);
+      c=FF(c,d,a,b,x[i+ 2],17, 606105819);
+      b=FF(b,c,d,a,x[i+ 3],22,-1044525330);
+      a=FF(a,b,c,d,x[i+ 4],7 ,-176418897);
+      d=FF(d,a,b,c,x[i+ 5],12, 1200080426);
+      c=FF(c,d,a,b,x[i+ 6],17,-1473231341);
+      b=FF(b,c,d,a,x[i+ 7],22,-45705983);
+      a=FF(a,b,c,d,x[i+ 8],7 , 1770035416);
+      d=FF(d,a,b,c,x[i+ 9],12,-1958414417);
+      c=FF(c,d,a,b,x[i+10],17,-42063);
+      b=FF(b,c,d,a,x[i+11],22,-1990404162);
+      a=FF(a,b,c,d,x[i+12],7 , 1804603682);
+      d=FF(d,a,b,c,x[i+13],12,-40341101);
+      c=FF(c,d,a,b,x[i+14],17,-1502002290);
+      b=FF(b,c,d,a,x[i+15],22, 1236535329);
+
+      a=GG(a,b,c,d,x[i+ 1],5 ,-165796510);
+      d=GG(d,a,b,c,x[i+ 6],9 ,-1069501632);
+      c=GG(c,d,a,b,x[i+11],14, 643717713);
+      b=GG(b,c,d,a,x[i+ 0],20,-373897302);
+      a=GG(a,b,c,d,x[i+ 5],5 ,-701558691);
+      d=GG(d,a,b,c,x[i+10],9 , 38016083);
+      c=GG(c,d,a,b,x[i+15],14,-660478335);
+      b=GG(b,c,d,a,x[i+ 4],20,-405537848);
+      a=GG(a,b,c,d,x[i+ 9],5 , 568446438);
+      d=GG(d,a,b,c,x[i+14],9 ,-1019803690);
+      c=GG(c,d,a,b,x[i+ 3],14,-187363961);
+      b=GG(b,c,d,a,x[i+ 8],20, 1163531501);
+      a=GG(a,b,c,d,x[i+13],5 ,-1444681467);
+      d=GG(d,a,b,c,x[i+ 2],9 ,-51403784);
+      c=GG(c,d,a,b,x[i+ 7],14, 1735328473);
+      b=GG(b,c,d,a,x[i+12],20,-1926607734);
+
+      a=HH(a,b,c,d,x[i+ 5],4 ,-378558);
+      d=HH(d,a,b,c,x[i+ 8],11,-2022574463);
+      c=HH(c,d,a,b,x[i+11],16, 1839030562);
+      b=HH(b,c,d,a,x[i+14],23,-35309556);
+      a=HH(a,b,c,d,x[i+ 1],4 ,-1530992060);
+      d=HH(d,a,b,c,x[i+ 4],11, 1272893353);
+      c=HH(c,d,a,b,x[i+ 7],16,-155497632);
+      b=HH(b,c,d,a,x[i+10],23,-1094730640);
+      a=HH(a,b,c,d,x[i+13],4 , 681279174);
+      d=HH(d,a,b,c,x[i+ 0],11,-358537222);
+      c=HH(c,d,a,b,x[i+ 3],16,-722521979);
+      b=HH(b,c,d,a,x[i+ 6],23, 76029189);
+      a=HH(a,b,c,d,x[i+ 9],4 ,-640364487);
+      d=HH(d,a,b,c,x[i+12],11,-421815835);
+      c=HH(c,d,a,b,x[i+15],16, 530742520);
+      b=HH(b,c,d,a,x[i+ 2],23,-995338651);
+
+      a=II(a,b,c,d,x[i+ 0],6 ,-198630844);
+      d=II(d,a,b,c,x[i+ 7],10, 1126891415);
+      c=II(c,d,a,b,x[i+14],15,-1416354905);
+      b=II(b,c,d,a,x[i+ 5],21,-57434055);
+      a=II(a,b,c,d,x[i+12],6 , 1700485571);
+      d=II(d,a,b,c,x[i+ 3],10,-1894986606);
+      c=II(c,d,a,b,x[i+10],15,-1051523);
+      b=II(b,c,d,a,x[i+ 1],21,-2054922799);
+      a=II(a,b,c,d,x[i+ 8],6 , 1873313359);
+      d=II(d,a,b,c,x[i+15],10,-30611744);
+      c=II(c,d,a,b,x[i+ 6],15,-1560198380);
+      b=II(b,c,d,a,x[i+13],21, 1309151649);
+      a=II(a,b,c,d,x[i+ 4],6 ,-145523070);
+      d=II(d,a,b,c,x[i+11],10,-1120210379);
+      c=II(c,d,a,b,x[i+ 2],15, 718787259);
+      b=II(b,c,d,a,x[i+ 9],21,-343485551);
+
+      a = add(a,olda);
+      b = add(b,oldb);
+      c = add(c,oldc);
+      d = add(d,oldd);
+    }
+    return [a,b,c,d];
+  }
+  function hmac(data,key){
+    var wa=toWord(key);
+    if(wa.length>16) wa=core(wa,key.length*chrsz);
+    var l=[], r=[];
+    for(var i=0; i<16; i++){
+      l[i]=wa[i]^0x36363636;
+      r[i]=wa[i]^0x5c5c5c5c;
+    }
+    var h=core(l.concat(toWord(data)),512+data.length*chrsz);
+    return core(r.concat(h),640);
+  }
+
+  //  Public functions
+  this.compute=function(/* string */data, /* dojo.crypto.outputTypes */outputType){
+    //  summary
+    //  computes the digest of data, and returns the result as a string of type outputType
+    var out=outputType||dojo.crypto.outputTypes.Base64;
+    switch(out){
+      case dojo.crypto.outputTypes.Hex:{
+        return toHex(core(toWord(data),data.length*chrsz)); //  string
+      }
+      case dojo.crypto.outputTypes.String:{
+        return toString(core(toWord(data),data.length*chrsz));  //  string
+      }
+      default:{
+        return toBase64(core(toWord(data),data.length*chrsz));  //  string
+      }
+    }
+  };
+  this.getHMAC=function(/* string */data, /* string */key, /* dojo.crypto.outputTypes */outputType){
+    //  summary
+    //  computes a digest of data using key, and returns the result as a string of outputType
+    var out=outputType||dojo.crypto.outputTypes.Base64;
+    switch(out){
+      case dojo.crypto.outputTypes.Hex:{
+        return toHex(hmac(data,key)); //  string
+      }
+      case dojo.crypto.outputTypes.String:{
+        return toString(hmac(data,key));  //  string
+      }
+      default:{
+        return toBase64(hmac(data,key));  //  string
+      }
+    }
+  };
 }();
+
 dojo.provide("dojo.crypto.*");
+
 dojo.provide("dojo.collections.Collections");
-dojo.collections.DictionaryEntry=function(k,v){
-this.key=k;
-this.value=v;
-this.valueOf=function(){
-return this.value;
-};
-this.toString=function(){
-return String(this.value);
-};
-};
-dojo.collections.Iterator=function(arr){
-var a=arr;
-var _77b=0;
-this.element=a[_77b]||null;
-this.atEnd=function(){
-return (_77b>=a.length);
-};
-this.get=function(){
-if(this.atEnd()){
-return null;
+
+dojo.collections.DictionaryEntry=function(/* string */k, /* object */v){
+  //  summary
+  //  return an object of type dojo.collections.DictionaryEntry
+  this.key=k;
+  this.value=v;
+  this.valueOf=function(){ 
+    return this.value;  //  object
+  };
+  this.toString=function(){ 
+    return String(this.value);  //  string 
+  };
 }
-this.element=a[_77b++];
-return this.element;
-};
-this.map=function(fn,_77d){
-var s=_77d||dj_global;
-if(Array.map){
-return Array.map(a,fn,s);
-}else{
-var arr=[];
-for(var i=0;i<a.length;i++){
-arr.push(fn.call(s,a[i]));
-}
-return arr;
+
+/*  Iterators
+ *  The collections.Iterators (Iterator and DictionaryIterator) are built to
+ *  work with the Collections included in this module.  However, they *can*
+ *  be used with arrays and objects, respectively, should one choose to do so.
+ */
+dojo.collections.Iterator=function(/* array */arr){
+  //  summary
+  //  return an object of type dojo.collections.Iterator
+  var a=arr;
+  var position=0;
+  this.element=a[position]||null;
+  this.atEnd=function(){
+    //  summary
+    //  Test to see if the internal cursor has reached the end of the internal collection.
+    return (position>=a.length);  //  bool
+  };
+  this.get=function(){
+    //  summary
+    //  Test to see if the internal cursor has reached the end of the internal collection.
+    if(this.atEnd()){
+      return null;    //  object
+    }
+    this.element=a[position++];
+    return this.element;  //  object
+  };
+  this.map=function(/* function */fn, /* object? */scope){
+    //  summary
+    //  Functional iteration with optional scope.
+    var s=scope||dj_global;
+    if(Array.map){
+      return Array.map(a,fn,s); //  array
+    }else{
+      var arr=[];
+      for(var i=0; i<a.length; i++){
+        arr.push(fn.call(s,a[i]));
+      }
+      return arr;   //  array
+    }
+  };
+  this.reset=function(){
+    //  summary
+    //  reset the internal cursor.
+    position=0;
+    this.element=a[position];
+  };
 }
+
+/*  Notes:
+ *  The DictionaryIterator no longer supports a key and value property;
+ *  the reality is that you can use this to iterate over a JS object
+ *  being used as a hashtable.
+ */
+dojo.collections.DictionaryIterator=function(/* object */obj){
+  //  summary
+  //  return an object of type dojo.collections.DictionaryIterator
+  var a=[]; //  Create an indexing array
+  var testObject={};
+  for(var p in obj){
+    if(!testObject[p]){
+      a.push(obj[p]); //  fill it up
+    }
+  }
+  var position=0;
+  this.element=a[position]||null;
+  this.atEnd=function(){
+    //  summary
+    //  Test to see if the internal cursor has reached the end of the internal collection.
+    return (position>=a.length);  //  bool
+  };
+  this.get=function(){
+    //  summary
+    //  Test to see if the internal cursor has reached the end of the internal collection.
+    if(this.atEnd()){
+      return null;    //  object
+    }
+    this.element=a[position++];
+    return this.element;  //  object
+  };
+  this.map=function(/* function */fn, /* object? */scope){
+    //  summary
+    //  Functional iteration with optional scope.
+    var s=scope||dj_global;
+    if(Array.map){
+      return Array.map(a,fn,s); //  array
+    }else{
+      var arr=[];
+      for(var i=0; i<a.length; i++){
+        arr.push(fn.call(s,a[i]));
+      }
+      return arr;   //  array
+    }
+  };
+  this.reset=function() { 
+    //  summary
+    //  reset the internal cursor.
+    position=0; 
+    this.element=a[position];
+  };
 };
-this.reset=function(){
-_77b=0;
-this.element=a[_77b];
-};
-};
-dojo.collections.DictionaryIterator=function(obj){
-var a=[];
-var _783={};
-for(var p in obj){
-if(!_783[p]){
-a.push(obj[p]);
-}
-}
-var _785=0;
-this.element=a[_785]||null;
-this.atEnd=function(){
-return (_785>=a.length);
-};
-this.get=function(){
-if(this.atEnd()){
-return null;
-}
-this.element=a[_785++];
-return this.element;
-};
-this.map=function(fn,_787){
-var s=_787||dj_global;
-if(Array.map){
-return Array.map(a,fn,s);
-}else{
-var arr=[];
-for(var i=0;i<a.length;i++){
-arr.push(fn.call(s,a[i]));
-}
-return arr;
-}
-};
-this.reset=function(){
-_785=0;
-this.element=a[_785];
-};
-};
+
 dojo.provide("dojo.collections.ArrayList");
-dojo.collections.ArrayList=function(arr){
-var _78c=[];
-if(arr){
-_78c=_78c.concat(arr);
-}
-this.count=_78c.length;
-this.add=function(obj){
-_78c.push(obj);
-this.count=_78c.length;
-};
-this.addRange=function(a){
-if(a.getIterator){
-var e=a.getIterator();
-while(!e.atEnd()){
-this.add(e.get());
-}
-this.count=_78c.length;
-}else{
-for(var i=0;i<a.length;i++){
-_78c.push(a[i]);
-}
-this.count=_78c.length;
-}
-};
-this.clear=function(){
-_78c.splice(0,_78c.length);
-this.count=0;
-};
-this.clone=function(){
-return new dojo.collections.ArrayList(_78c);
-};
-this.contains=function(obj){
-for(var i=0;i<_78c.length;i++){
-if(_78c[i]==obj){
-return true;
-}
-}
-return false;
-};
-this.forEach=function(fn,_794){
-var s=_794||dj_global;
-if(Array.forEach){
-Array.forEach(_78c,fn,s);
-}else{
-for(var i=0;i<_78c.length;i++){
-fn.call(s,_78c[i],i,_78c);
-}
-}
-};
-this.getIterator=function(){
-return new dojo.collections.Iterator(_78c);
-};
-this.indexOf=function(obj){
-for(var i=0;i<_78c.length;i++){
-if(_78c[i]==obj){
-return i;
-}
-}
-return -1;
-};
-this.insert=function(i,obj){
-_78c.splice(i,0,obj);
-this.count=_78c.length;
-};
-this.item=function(i){
-return _78c[i];
-};
-this.remove=function(obj){
-var i=this.indexOf(obj);
-if(i>=0){
-_78c.splice(i,1);
-}
-this.count=_78c.length;
-};
-this.removeAt=function(i){
-_78c.splice(i,1);
-this.count=_78c.length;
-};
-this.reverse=function(){
-_78c.reverse();
-};
-this.sort=function(fn){
-if(fn){
-_78c.sort(fn);
-}else{
-_78c.sort();
-}
-};
-this.setByIndex=function(i,obj){
-_78c[i]=obj;
-this.count=_78c.length;
-};
-this.toArray=function(){
-return [].concat(_78c);
-};
-this.toString=function(_7a2){
-return _78c.join((_7a2||","));
-};
+
+dojo.collections.ArrayList=function(/* array? */arr){
+  //  summary
+  //  Returns a new object of type dojo.collections.ArrayList
+  var items=[];
+  if(arr) items=items.concat(arr);
+  this.count=items.length;
+  this.add=function(/* object */obj){
+    //  summary
+    //  Add an element to the collection.
+    items.push(obj);
+    this.count=items.length;
+  };
+  this.addRange=function(/* array */a){
+    //  summary
+    //  Add a range of objects to the ArrayList
+    if(a.getIterator){
+      var e=a.getIterator();
+      while(!e.atEnd()){
+        this.add(e.get());
+      }
+      this.count=items.length;
+    }else{
+      for(var i=0; i<a.length; i++){
+        items.push(a[i]);
+      }
+      this.count=items.length;
+    }
+  };
+  this.clear=function(){
+    //  summary
+    //  Clear all elements out of the collection, and reset the count.
+    items.splice(0, items.length);
+    this.count=0;
+  };
+  this.clone=function(){
+    //  summary
+    //  Clone the array list
+    return new dojo.collections.ArrayList(items); //  dojo.collections.ArrayList
+  };
+  this.contains=function(/* object */obj){
+    //  summary
+    //  Check to see if the passed object is a member in the ArrayList
+    for(var i=0; i < items.length; i++){
+      if(items[i] == obj) {
+        return true;  //  bool
+      }
+    }
+    return false; //  bool
+  };
+  this.forEach=function(/* function */ fn, /* object? */ scope){
+    //  summary
+    //  functional iterator, following the mozilla spec.
+    var s=scope||dj_global;
+    if(Array.forEach){
+      Array.forEach(items, fn, s);
+    }else{
+      for(var i=0; i<items.length; i++){
+        fn.call(s, items[i], i, items);
+      }
+    }
+  };
+  this.getIterator=function(){
+    //  summary
+    //  Get an Iterator for this object
+    return new dojo.collections.Iterator(items);  //  dojo.collections.Iterator
+  };
+  this.indexOf=function(/* object */obj){
+    //  summary
+    //  Return the numeric index of the passed object; will return -1 if not found.
+    for(var i=0; i < items.length; i++){
+      if(items[i] == obj) {
+        return i; //  int
+      }
+    }
+    return -1;  // int
+  };
+  this.insert=function(/* int */ i, /* object */ obj){
+    //  summary
+    //  Insert the passed object at index i
+    items.splice(i,0,obj);
+    this.count=items.length;
+  };
+  this.item=function(/* int */ i){
+    //  summary
+    //  return the element at index i
+    return items[i];  //  object
+  };
+  this.remove=function(/* object */obj){
+    //  summary
+    //  Look for the passed object, and if found, remove it from the internal array.
+    var i=this.indexOf(obj);
+    if(i >=0) {
+      items.splice(i,1);
+    }
+    this.count=items.length;
+  };
+  this.removeAt=function(/* int */ i){
+    //  summary
+    //  return an array with function applied to all elements
+    items.splice(i,1);
+    this.count=items.length;
+  };
+  this.reverse=function(){
+    //  summary
+    //  Reverse the internal array
+    items.reverse();
+  };
+  this.sort=function(/* function? */ fn){
+    //  summary
+    //  sort the internal array
+    if(fn){
+      items.sort(fn);
+    }else{
+      items.sort();
+    }
+  };
+  this.setByIndex=function(/* int */ i, /* object */ obj){
+    //  summary
+    //  Set an element in the array by the passed index.
+    items[i]=obj;
+    this.count=items.length;
+  };
+  this.toArray=function(){
+    //  summary
+    //  Return a new array with all of the items of the internal array concatenated.
+    return [].concat(items);
+  }
+  this.toString=function(/* string */ delim){
+    //  summary
+    //  implementation of toString, follows [].toString();
+    return items.join((delim||","));
+  };
 };
+
 dojo.provide("dojo.collections.Queue");
-dojo.collections.Queue=function(arr){
-var q=[];
-if(arr){
-q=q.concat(arr);
-}
-this.count=q.length;
-this.clear=function(){
-q=[];
-this.count=q.length;
-};
-this.clone=function(){
-return new dojo.collections.Queue(q);
-};
-this.contains=function(o){
-for(var i=0;i<q.length;i++){
-if(q[i]==o){
-return true;
-}
-}
-return false;
-};
-this.copyTo=function(arr,i){
-arr.splice(i,0,q);
-};
-this.dequeue=function(){
-var r=q.shift();
-this.count=q.length;
-return r;
-};
-this.enqueue=function(o){
-this.count=q.push(o);
-};
-this.forEach=function(fn,_7ac){
-var s=_7ac||dj_global;
-if(Array.forEach){
-Array.forEach(q,fn,s);
-}else{
-for(var i=0;i<q.length;i++){
-fn.call(s,q[i],i,q);
-}
-}
-};
-this.getIterator=function(){
-return new dojo.collections.Iterator(q);
-};
-this.peek=function(){
-return q[0];
-};
-this.toArray=function(){
-return [].concat(q);
-};
+
+dojo.collections.Queue=function(/* array? */arr){
+  //  summary
+  //  return an object of type dojo.collections.Queue
+  var q=[];
+  if (arr){
+    q=q.concat(arr);
+  }
+  this.count=q.length;
+  this.clear=function(){
+    //  summary
+    //  clears the internal collection
+    q=[];
+    this.count=q.length;
+  };
+  this.clone=function(){
+    //  summary
+    //  creates a new Queue based on this one
+    return new dojo.collections.Queue(q); //  dojo.collections.Queue
+  };
+  this.contains=function(/* object */ o){
+    //  summary
+    //  Check to see if the passed object is an element in this queue
+    for(var i=0; i<q.length; i++){
+      if (q[i]==o){
+        return true;  //  bool
+      }
+    }
+    return false; //  bool
+  };
+  this.copyTo=function(/* array */ arr, /* int */ i){
+    //  summary
+    //  Copy the contents of this queue into the passed array at index i.
+    arr.splice(i,0,q);
+  };
+  this.dequeue=function(){
+    //  summary
+    //  shift the first element off the queue and return it
+    var r=q.shift();
+    this.count=q.length;
+    return r; //  object
+  };
+  this.enqueue=function(/* object */ o){
+    //  summary
+    //  put the passed object at the end of the queue
+    this.count=q.push(o);
+  };
+  this.forEach=function(/* function */ fn, /* object? */ scope){
+    //  summary
+    //  functional iterator, following the mozilla spec.
+    var s=scope||dj_global;
+    if(Array.forEach){
+      Array.forEach(q, fn, s);
+    }else{
+      for(var i=0; i<q.length; i++){
+        fn.call(s, q[i], i, q);
+      }
+    }
+  };
+  this.getIterator=function(){
+    //  summary
+    //  get an Iterator based on this queue.
+    return new dojo.collections.Iterator(q);  //  dojo.collections.Iterator
+  };
+  this.peek=function(){
+    //  summary
+    //  get the next element in the queue without altering the queue.
+    return q[0];
+  };
+  this.toArray=function(){
+    //  summary
+    //  return an array based on the internal array of the queue.
+    return [].concat(q);
+  };
 };
+
 dojo.provide("dojo.collections.Stack");
-dojo.collections.Stack=function(arr){
-var q=[];
-if(arr){
-q=q.concat(arr);
+
+dojo.collections.Stack=function(/* array? */arr){
+  //  summary
+  //  returns an object of type dojo.collections.Stack
+  var q=[];
+  if (arr) q=q.concat(arr);
+  this.count=q.length;
+  this.clear=function(){
+    //  summary
+    //  Clear the internal array and reset the count
+    q=[];
+    this.count=q.length;
+  };
+  this.clone=function(){
+    //  summary
+    //  Create and return a clone of this Stack
+    return new dojo.collections.Stack(q);
+  };
+  this.contains=function(/* object */o){
+    //  summary
+    //  check to see if the stack contains object o
+    for (var i=0; i<q.length; i++){
+      if (q[i] == o){
+        return true;  //  bool
+      }
+    }
+    return false; //  bool
+  };
+  this.copyTo=function(/* array */ arr, /* int */ i){
+    //  summary
+    //  copy the stack into array arr at index i
+    arr.splice(i,0,q);
+  };
+  this.forEach=function(/* function */ fn, /* object? */ scope){
+    //  summary
+    //  functional iterator, following the mozilla spec.
+    var s=scope||dj_global;
+    if(Array.forEach){
+      Array.forEach(q, fn, s);
+    }else{
+      for(var i=0; i<q.length; i++){
+        fn.call(s, q[i], i, q);
+      }
+    }
+  };
+  this.getIterator=function(){
+    //  summary
+    //  get an iterator for this collection
+    return new dojo.collections.Iterator(q);  //  dojo.collections.Iterator
+  };
+  this.peek=function(){
+    //  summary
+    //  Return the next item without altering the stack itself.
+    return q[(q.length-1)]; //  object
+  };
+  this.pop=function(){
+    //  summary
+    //  pop and return the next item on the stack
+    var r=q.pop();
+    this.count=q.length;
+    return r; //  object
+  };
+  this.push=function(/* object */ o){
+    //  summary
+    //  Push object o onto the stack
+    this.count=q.push(o);
+  };
+  this.toArray=function(){
+    //  summary
+    //  create and return an array based on the internal collection
+    return [].concat(q);  //  array
+  };
 }
-this.count=q.length;
-this.clear=function(){
-q=[];
-this.count=q.length;
-};
-this.clone=function(){
-return new dojo.collections.Stack(q);
-};
-this.contains=function(o){
-for(var i=0;i<q.length;i++){
-if(q[i]==o){
-return true;
-}
-}
-return false;
-};
-this.copyTo=function(arr,i){
-arr.splice(i,0,q);
-};
-this.forEach=function(fn,_7b6){
-var s=_7b6||dj_global;
-if(Array.forEach){
-Array.forEach(q,fn,s);
-}else{
-for(var i=0;i<q.length;i++){
-fn.call(s,q[i],i,q);
-}
-}
-};
-this.getIterator=function(){
-return new dojo.collections.Iterator(q);
-};
-this.peek=function(){
-return q[(q.length-1)];
-};
-this.pop=function(){
-var r=q.pop();
-this.count=q.length;
-return r;
-};
-this.push=function(o){
-this.count=q.push(o);
-};
-this.toArray=function(){
-return [].concat(q);
-};
-};
+
 dojo.provide("dojo.lang.declare");
-dojo.lang.declare=function(_7bb,_7bc,init,_7be){
-if((dojo.lang.isFunction(_7be))||((!_7be)&&(!dojo.lang.isFunction(init)))){
-var temp=_7be;
-_7be=init;
-init=temp;
+
+
+dojo.lang.declare = function(/*String*/ className, /*Function|Array*/ superclass, /*Function?*/ init, /*Object|Array*/ props){
+/*
+ * summary: Create a feature-rich constructor with a compact notation
+ *
+ * className: the name of the constructor (loosely, a "class")
+ *
+ * superclass: may be a Function, or an Array of Functions. 
+ *   If "superclass" is an array, the first element is used 
+ *   as the prototypical ancestor and any following Functions 
+ *   become mixin ancestors.
+ *
+ * init: an initializer function
+ *
+ * props: an object (or array of objects) whose properties are copied to the created prototype
+ *
+ * description: Create a constructor using a compact notation for inheritance and prototype extension.
+ *
+ *   "superclass" argument may be a Function, or an array of 
+ *   Functions. 
+ *
+ *   If "superclass" is an array, the first element is used 
+ *   as the prototypical ancestor and any following Functions 
+ *   become mixin ancestors. 
+ * 
+ *   All "superclass(es)" must be Functions (not mere Objects).
+ *
+ *   Using mixin ancestors provides a type of multiple
+ *   inheritance. Mixin ancestors prototypical 
+ *   properties are copied to the subclass, and any 
+ *   inializater/constructor is invoked. 
+ *
+ *   Properties of object "props" are copied to the constructor 
+ *   prototype. If "props" is an array, properties of each
+ *   object in the array are copied to the constructor prototype.
+ *
+ *   name of the class ("className" argument) is stored in 
+ *   "declaredClass" property
+ * 
+ *   Initializer functions are called when an object 
+ *   is instantiated from this constructor.
+ * 
+ * Aliased as "dojo.declare"
+ *
+ * Usage:
+ *
+ * dojo.declare("my.classes.bar", my.classes.foo,
+ *  function() {
+ *    // initialization function
+ *    this.myComplicatedObject = new ReallyComplicatedObject(); 
+ *  },{
+ *  someValue: 2,
+ *  someMethod: function() { 
+ *    doStuff(); 
+ *  }
+ * });
+ *
+ */
+  if((dojo.lang.isFunction(props))||((!props)&&(!dojo.lang.isFunction(init)))){ 
+   // parameter juggling to support omitting init param (also allows reordering init and props arguments)
+    var temp = props;
+    props = init;
+    init = temp;
+  } 
+  var mixins = [ ];
+  if(dojo.lang.isArray(superclass)){
+    mixins = superclass;
+    superclass = mixins.shift();
+  }
+  if(!init){
+    init = dojo.evalObjPath(className, false);
+    if((init)&&(!dojo.lang.isFunction(init))){ init = null };
+  }
+  var ctor = dojo.lang.declare._makeConstructor();
+  var scp = (superclass ? superclass.prototype : null);
+  if(scp){
+    scp.prototyping = true;
+    ctor.prototype = new superclass();
+    scp.prototyping = false; 
+  }
+  ctor.superclass = scp;
+  ctor.mixins = mixins;
+  for(var i=0,l=mixins.length; i<l; i++){
+    dojo.lang.extend(ctor, mixins[i].prototype);
+  }
+  ctor.prototype.initializer = null;
+  ctor.prototype.declaredClass = className;
+  if(dojo.lang.isArray(props)){
+    dojo.lang.extend.apply(dojo.lang, [ctor].concat(props));
+  }else{
+    dojo.lang.extend(ctor, (props)||{});
+  }
+  dojo.lang.extend(ctor, dojo.lang.declare._common);
+  ctor.prototype.constructor = ctor;
+  ctor.prototype.initializer = (ctor.prototype.initializer)||(init)||(function(){});
+  dojo.lang.setObjPathValue(className, ctor, null, true);
+  return ctor; // Function
 }
-var _7c0=[];
-if(dojo.lang.isArray(_7bc)){
-_7c0=_7bc;
-_7bc=_7c0.shift();
+
+dojo.lang.declare._makeConstructor = function() {
+  return function(){ 
+    // get the generational context (which object [or prototype] should be constructed)
+    var self = this._getPropContext();
+    var s = self.constructor.superclass;
+    if((s)&&(s.constructor)){
+      if(s.constructor==arguments.callee){
+        // if this constructor is invoked directly (my.ancestor.call(this))
+        this._inherited("constructor", arguments);
+      }else{
+        this._contextMethod(s, "constructor", arguments);
+      }
+    }
+    var ms = (self.constructor.mixins)||([]);
+    for(var i=0, m; (m=ms[i]); i++) {
+      (((m.prototype)&&(m.prototype.initializer))||(m)).apply(this, arguments);
+    }
+    if((!this.prototyping)&&(self.initializer)){
+      self.initializer.apply(this, arguments);
+    }
+  }
 }
-if(!init){
-init=dojo.evalObjPath(_7bb,false);
-if((init)&&(!dojo.lang.isFunction(init))){
-init=null;
+
+dojo.lang.declare._common = {
+  _getPropContext: function() { return (this.___proto||this); },
+  // caches ptype context and calls method on it
+  _contextMethod: function(ptype, method, args){
+    var result, stack = this.___proto;
+    this.___proto = ptype;
+    try { result = ptype[method].apply(this,(args||[])); }
+    catch(e) { throw e; } 
+    finally { this.___proto = stack; }
+    return result;
+  },
+  _inherited: function(prop, args){
+    // summary
+    //  Searches backward thru prototype chain to find nearest ancestral instance of prop.
+    //  Internal use only.
+    var p = this._getPropContext();
+    do{
+      if((!p.constructor)||(!p.constructor.superclass)){return;}
+      p = p.constructor.superclass;
+    }while(!(prop in p));
+    return (dojo.lang.isFunction(p[prop]) ? this._contextMethod(p, prop, args) : p[prop]);
+  }
 }
-}
-var ctor=dojo.lang.declare._makeConstructor();
-var scp=(_7bc?_7bc.prototype:null);
-if(scp){
-scp.prototyping=true;
-ctor.prototype=new _7bc();
-scp.prototyping=false;
-}
-ctor.superclass=scp;
-ctor.mixins=_7c0;
-for(var i=0,l=_7c0.length;i<l;i++){
-dojo.lang.extend(ctor,_7c0[i].prototype);
-}
-ctor.prototype.initializer=null;
-ctor.prototype.declaredClass=_7bb;
-if(dojo.lang.isArray(_7be)){
-dojo.lang.extend.apply(dojo.lang,[ctor].concat(_7be));
-}else{
-dojo.lang.extend(ctor,(_7be)||{});
-}
-dojo.lang.extend(ctor,dojo.lang.declare._common);
-ctor.prototype.constructor=ctor;
-ctor.prototype.initializer=(ctor.prototype.initializer)||(init)||(function(){
-});
-dojo.lang.setObjPathValue(_7bb,ctor,null,true);
-return ctor;
-};
-dojo.lang.declare._makeConstructor=function(){
-return function(){
-var self=this._getPropContext();
-var s=self.constructor.superclass;
-if((s)&&(s.constructor)){
-if(s.constructor==arguments.callee){
-this._inherited("constructor",arguments);
-}else{
-this._contextMethod(s,"constructor",arguments);
-}
-}
-var ms=(self.constructor.mixins)||([]);
-for(var i=0,m;(m=ms[i]);i++){
-(((m.prototype)&&(m.prototype.initializer))||(m)).apply(this,arguments);
-}
-if((!this.prototyping)&&(self.initializer)){
-self.initializer.apply(this,arguments);
-}
-};
-};
-dojo.lang.declare._common={_getPropContext:function(){
-return (this.___proto||this);
-},_contextMethod:function(_7ca,_7cb,args){
-var _7cd,_7ce=this.___proto;
-this.___proto=_7ca;
-try{
-_7cd=_7ca[_7cb].apply(this,(args||[]));
-}
-catch(e){
-throw e;
-}
-finally{
-this.___proto=_7ce;
-}
-return _7cd;
-},_inherited:function(prop,args){
-var p=this._getPropContext();
-do{
-if((!p.constructor)||(!p.constructor.superclass)){
-return;
-}
-p=p.constructor.superclass;
-}while(!(prop in p));
-return (dojo.lang.isFunction(p[prop])?this._contextMethod(p,prop,args):p[prop]);
-}};
-dojo.declare=dojo.lang.declare;
+
+dojo.declare = dojo.lang.declare;
 dojo.provide("dojo.dnd.DragAndDrop");
-dojo.declare("dojo.dnd.DragSource",null,{type:"",onDragEnd:function(){
-},onDragStart:function(){
-},onSelected:function(){
-},unregister:function(){
-dojo.dnd.dragManager.unregisterDragSource(this);
-},reregister:function(){
-dojo.dnd.dragManager.registerDragSource(this);
-}},function(){
-var dm=dojo.dnd.dragManager;
-if(dm["registerDragSource"]){
-dm.registerDragSource(this);
-}
+
+dojo.declare("dojo.dnd.DragSource", null, {
+  type: "",
+
+  onDragEnd: function(){
+  },
+
+  onDragStart: function(){
+  },
+
+  /*
+   * This function gets called when the DOM element was 
+   * selected for dragging by the HtmlDragAndDropManager.
+   */
+  onSelected: function(){
+  },
+
+  unregister: function(){
+    dojo.dnd.dragManager.unregisterDragSource(this);
+  },
+
+  reregister: function(){
+    dojo.dnd.dragManager.registerDragSource(this);
+  }
+}, function(){
+
+  //dojo.profile.start("DragSource");
+
+  var dm = dojo.dnd.dragManager;
+  if(dm["registerDragSource"]){ // side-effect prevention
+    dm.registerDragSource(this);
+  }
+
+  //dojo.profile.end("DragSource");
+
 });
-dojo.declare("dojo.dnd.DragObject",null,{type:"",onDragStart:function(){
-},onDragMove:function(){
-},onDragOver:function(){
-},onDragOut:function(){
-},onDragEnd:function(){
-},onDragLeave:this.onDragOut,onDragEnter:this.onDragOver,ondragout:this.onDragOut,ondragover:this.onDragOver},function(){
-var dm=dojo.dnd.dragManager;
-if(dm["registerDragObject"]){
-dm.registerDragObject(this);
-}
+
+dojo.declare("dojo.dnd.DragObject", null, {
+  type: "",
+
+  onDragStart: function(){
+    // gets called directly after being created by the DragSource
+    // default action is to clone self as icon
+  },
+
+  onDragMove: function(){
+    // this changes the UI for the drag icon
+    //  "it moves itself"
+  },
+
+  onDragOver: function(){
+  },
+
+  onDragOut: function(){
+  },
+
+  onDragEnd: function(){
+  },
+
+  // normal aliases
+  onDragLeave: this.onDragOut,
+  onDragEnter: this.onDragOver,
+
+  // non-camel aliases
+  ondragout: this.onDragOut,
+  ondragover: this.onDragOver
+}, function(){
+  var dm = dojo.dnd.dragManager;
+  if(dm["registerDragObject"]){ // side-effect prevention
+    dm.registerDragObject(this);
+  }
 });
-dojo.declare("dojo.dnd.DropTarget",null,{acceptsType:function(type){
-if(!dojo.lang.inArray(this.acceptedTypes,"*")){
-if(!dojo.lang.inArray(this.acceptedTypes,type)){
-return false;
-}
-}
-return true;
-},accepts:function(_7d5){
-if(!dojo.lang.inArray(this.acceptedTypes,"*")){
-for(var i=0;i<_7d5.length;i++){
-if(!dojo.lang.inArray(this.acceptedTypes,_7d5[i].type)){
-return false;
-}
-}
-}
-return true;
-},unregister:function(){
-dojo.dnd.dragManager.unregisterDropTarget(this);
-},onDragOver:function(){
-},onDragOut:function(){
-},onDragMove:function(){
-},onDropStart:function(){
-},onDrop:function(){
-},onDropEnd:function(){
-}},function(){
-if(this.constructor==dojo.dnd.DropTarget){
-return;
-}
-this.acceptedTypes=[];
-dojo.dnd.dragManager.registerDropTarget(this);
+
+dojo.declare("dojo.dnd.DropTarget", null, {
+
+  acceptsType: function(type){
+    if(!dojo.lang.inArray(this.acceptedTypes, "*")){ // wildcard
+      if(!dojo.lang.inArray(this.acceptedTypes, type)) { return false; }
+    }
+    return true;
+  },
+
+  accepts: function(dragObjects){
+    if(!dojo.lang.inArray(this.acceptedTypes, "*")){ // wildcard
+      for (var i = 0; i < dragObjects.length; i++) {
+        if (!dojo.lang.inArray(this.acceptedTypes,
+          dragObjects[i].type)) { return false; }
+      }
+    }
+    return true;
+  },
+
+  unregister: function(){
+    dojo.dnd.dragManager.unregisterDropTarget(this);
+  },
+
+  onDragOver: function(){
+  },
+
+  onDragOut: function(){
+  },
+
+  onDragMove: function(){
+  },
+
+  onDropStart: function(){
+  },
+
+  onDrop: function(){
+  },
+
+  onDropEnd: function(){
+  }
+}, function(){
+  if (this.constructor == dojo.dnd.DropTarget) { return; } // need to be subclassed
+  this.acceptedTypes = [];
+  dojo.dnd.dragManager.registerDropTarget(this);
 });
-dojo.dnd.DragEvent=function(){
-this.dragSource=null;
-this.dragObject=null;
-this.target=null;
-this.eventStatus="success";
-};
-dojo.declare("dojo.dnd.DragManager",null,{selectedSources:[],dragObjects:[],dragSources:[],registerDragSource:function(){
-},dropTargets:[],registerDropTarget:function(){
-},lastDragTarget:null,currentDragTarget:null,onKeyDown:function(){
-},onMouseOut:function(){
-},onMouseMove:function(){
-},onMouseUp:function(){
-}});
+
+// NOTE: this interface is defined here for the convenience of the DragManager
+// implementor. It is expected that in most cases it will be satisfied by
+// extending a native event (DOM event in HTML and SVG).
+dojo.dnd.DragEvent = function(){
+  this.dragSource = null;
+  this.dragObject = null;
+  this.target = null;
+  this.eventStatus = "success";
+  //
+  // can be one of:
+  //  [ "dropSuccess", "dropFailure", "dragMove",
+  //    "dragStart", "dragEnter", "dragLeave"]
+  //
+}
+/*
+ *  The DragManager handles listening for low-level events and dispatching
+ *  them to higher-level primitives like drag sources and drop targets. In
+ *  order to do this, it must keep a list of the items.
+ */
+dojo.declare("dojo.dnd.DragManager", null, {
+  selectedSources: [],
+  dragObjects: [],
+  dragSources: [],
+  registerDragSource: function(){},
+  dropTargets: [],
+  registerDropTarget: function(){},
+  lastDragTarget: null,
+  currentDragTarget: null,
+  onKeyDown: function(){},
+  onMouseOut: function(){},
+  onMouseMove: function(){},
+  onMouseUp: function(){}
+});
+
+// NOTE: despite the existance of the DragManager class, there will be a
+// singleton drag manager provided by the renderer-specific D&D support code.
+// It is therefore sane for us to assign instance variables to the DragManager
+// prototype
+
+// The renderer-specific file will define the following object:
+// dojo.dnd.dragManager = null;
+
 dojo.provide("dojo.dnd.HtmlDragManager");
-dojo.declare("dojo.dnd.HtmlDragManager",dojo.dnd.DragManager,{disabled:false,nestedTargets:false,mouseDownTimer:null,dsCounter:0,dsPrefix:"dojoDragSource",dropTargetDimensions:[],currentDropTarget:null,previousDropTarget:null,_dragTriggered:false,selectedSources:[],dragObjects:[],currentX:null,currentY:null,lastX:null,lastY:null,mouseDownX:null,mouseDownY:null,threshold:7,dropAcceptable:false,cancelEvent:function(e){
-e.stopPropagation();
-e.preventDefault();
-},registerDragSource:function(ds){
-if(ds["domNode"]){
-var dp=this.dsPrefix;
-var _7da=dp+"Idx_"+(this.dsCounter++);
-ds.dragSourceId=_7da;
-this.dragSources[_7da]=ds;
-ds.domNode.setAttribute(dp,_7da);
-if(dojo.render.html.ie){
-dojo.event.browser.addListener(ds.domNode,"ondragstart",this.cancelEvent);
-}
-}
-},unregisterDragSource:function(ds){
-if(ds["domNode"]){
-var dp=this.dsPrefix;
-var _7dd=ds.dragSourceId;
-delete ds.dragSourceId;
-delete this.dragSources[_7dd];
-ds.domNode.setAttribute(dp,null);
-if(dojo.render.html.ie){
-dojo.event.browser.removeListener(ds.domNode,"ondragstart",this.cancelEvent);
-}
-}
-},registerDropTarget:function(dt){
-this.dropTargets.push(dt);
-},unregisterDropTarget:function(dt){
-var _7e0=dojo.lang.find(this.dropTargets,dt,true);
-if(_7e0>=0){
-this.dropTargets.splice(_7e0,1);
-}
-},getDragSource:function(e){
-var tn=e.target;
-if(tn===dojo.body()){
-return;
-}
-var ta=dojo.html.getAttribute(tn,this.dsPrefix);
-while((!ta)&&(tn)){
-tn=tn.parentNode;
-if((!tn)||(tn===dojo.body())){
-return;
-}
-ta=dojo.html.getAttribute(tn,this.dsPrefix);
-}
-return this.dragSources[ta];
-},onKeyDown:function(e){
-},onMouseDown:function(e){
-if(this.disabled){
-return;
-}
-if(dojo.render.html.ie){
-if(e.button!=1){
-return;
-}
-}else{
-if(e.which!=1){
-return;
-}
-}
-var _7e6=e.target.nodeType==dojo.html.TEXT_NODE?e.target.parentNode:e.target;
-if(dojo.html.isTag(_7e6,"button","textarea","input","select","option")){
-return;
-}
-var ds=this.getDragSource(e);
-if(!ds){
-return;
-}
-if(!dojo.lang.inArray(this.selectedSources,ds)){
-this.selectedSources.push(ds);
-ds.onSelected();
-}
-this.mouseDownX=e.pageX;
-this.mouseDownY=e.pageY;
-e.preventDefault();
-dojo.event.connect(document,"onmousemove",this,"onMouseMove");
-},onMouseUp:function(e,_7e9){
-if(this.selectedSources.length==0){
-return;
-}
-this.mouseDownX=null;
-this.mouseDownY=null;
-this._dragTriggered=false;
-e.dragSource=this.dragSource;
-if((!e.shiftKey)&&(!e.ctrlKey)){
-if(this.currentDropTarget){
-this.currentDropTarget.onDropStart();
-}
-dojo.lang.forEach(this.dragObjects,function(_7ea){
-var ret=null;
-if(!_7ea){
-return;
-}
-if(this.currentDropTarget){
-e.dragObject=_7ea;
-var ce=this.currentDropTarget.domNode.childNodes;
-if(ce.length>0){
-e.dropTarget=ce[0];
-while(e.dropTarget==_7ea.domNode){
-e.dropTarget=e.dropTarget.nextSibling;
-}
-}else{
-e.dropTarget=this.currentDropTarget.domNode;
-}
-if(this.dropAcceptable){
-ret=this.currentDropTarget.onDrop(e);
-}else{
-this.currentDropTarget.onDragOut(e);
-}
-}
-e.dragStatus=this.dropAcceptable&&ret?"dropSuccess":"dropFailure";
-dojo.lang.delayThese([function(){
-try{
-_7ea.dragSource.onDragEnd(e);
-}
-catch(err){
-var _7ed={};
-for(var i in e){
-if(i=="type"){
-_7ed.type="mouseup";
-continue;
-}
-_7ed[i]=e[i];
-}
-_7ea.dragSource.onDragEnd(_7ed);
-}
-},function(){
-_7ea.onDragEnd(e);
-}]);
-},this);
-this.selectedSources=[];
-this.dragObjects=[];
-this.dragSource=null;
-if(this.currentDropTarget){
-this.currentDropTarget.onDropEnd();
-}
-}else{
-}
-dojo.event.disconnect(document,"onmousemove",this,"onMouseMove");
-this.currentDropTarget=null;
-},onScroll:function(){
-for(var i=0;i<this.dragObjects.length;i++){
-if(this.dragObjects[i].updateDragOffset){
-this.dragObjects[i].updateDragOffset();
-}
-}
-if(this.dragObjects.length){
-this.cacheTargetLocations();
-}
-},_dragStartDistance:function(x,y){
-if((!this.mouseDownX)||(!this.mouseDownX)){
-return;
-}
-var dx=Math.abs(x-this.mouseDownX);
-var dx2=dx*dx;
-var dy=Math.abs(y-this.mouseDownY);
-var dy2=dy*dy;
-return parseInt(Math.sqrt(dx2+dy2),10);
-},cacheTargetLocations:function(){
-dojo.profile.start("cacheTargetLocations");
-this.dropTargetDimensions=[];
-dojo.lang.forEach(this.dropTargets,function(_7f6){
-var tn=_7f6.domNode;
-if(!tn||dojo.lang.find(_7f6.acceptedTypes,this.dragSource.type)<0){
-return;
-}
-var abs=dojo.html.getAbsolutePosition(tn,true);
-var bb=dojo.html.getBorderBox(tn);
-this.dropTargetDimensions.push([[abs.x,abs.y],[abs.x+bb.width,abs.y+bb.height],_7f6]);
-},this);
-dojo.profile.end("cacheTargetLocations");
-},onMouseMove:function(e){
-if((dojo.render.html.ie)&&(e.button!=1)){
-this.currentDropTarget=null;
-this.onMouseUp(e,true);
-return;
-}
-if((this.selectedSources.length)&&(!this.dragObjects.length)){
-var dx;
-var dy;
-if(!this._dragTriggered){
-this._dragTriggered=(this._dragStartDistance(e.pageX,e.pageY)>this.threshold);
-if(!this._dragTriggered){
-return;
-}
-dx=e.pageX-this.mouseDownX;
-dy=e.pageY-this.mouseDownY;
-}
-this.dragSource=this.selectedSources[0];
-dojo.lang.forEach(this.selectedSources,function(_7fd){
-if(!_7fd){
-return;
-}
-var tdo=_7fd.onDragStart(e);
-if(tdo){
-tdo.onDragStart(e);
-tdo.dragOffset.y+=dy;
-tdo.dragOffset.x+=dx;
-tdo.dragSource=_7fd;
-this.dragObjects.push(tdo);
-}
-},this);
-this.previousDropTarget=null;
-this.cacheTargetLocations();
-}
-dojo.lang.forEach(this.dragObjects,function(_7ff){
-if(_7ff){
-_7ff.onDragMove(e);
-}
+
+// NOTE: there will only ever be a single instance of HTMLDragManager, so it's
+// safe to use prototype properties for book-keeping.
+dojo.declare("dojo.dnd.HtmlDragManager", dojo.dnd.DragManager, {
+  /**
+   * There are several sets of actions that the DnD code cares about in the
+   * HTML context:
+   *  1.) mouse-down ->
+   *      (draggable selection)
+   *      (dragObject generation)
+   *    mouse-move ->
+   *      (draggable movement)
+   *      (droppable detection)
+   *      (inform droppable)
+   *      (inform dragObject)
+   *    mouse-up
+   *      (inform/destroy dragObject)
+   *      (inform draggable)
+   *      (inform droppable)
+   *  2.) mouse-down -> mouse-down
+   *      (click-hold context menu)
+   *  3.) mouse-click ->
+   *      (draggable selection)
+   *    shift-mouse-click ->
+   *      (augment draggable selection)
+   *    mouse-down ->
+   *      (dragObject generation)
+   *    mouse-move ->
+   *      (draggable movement)
+   *      (droppable detection)
+   *      (inform droppable)
+   *      (inform dragObject)
+   *    mouse-up
+   *      (inform draggable)
+   *      (inform droppable)
+   *  4.) mouse-up
+   *      (clobber draggable selection)
+   */
+  disabled: false, // to kill all dragging!
+  nestedTargets: false,
+  mouseDownTimer: null, // used for click-hold operations
+  dsCounter: 0,
+  dsPrefix: "dojoDragSource",
+
+  // dimension calculation cache for use durring drag
+  dropTargetDimensions: [],
+
+  currentDropTarget: null,
+  // currentDropTargetPoints: null,
+  previousDropTarget: null,
+  _dragTriggered: false,
+
+  selectedSources: [],
+  dragObjects: [],
+
+  // mouse position properties
+  currentX: null,
+  currentY: null,
+  lastX: null,
+  lastY: null,
+  mouseDownX: null,
+  mouseDownY: null,
+  threshold: 7,
+
+  dropAcceptable: false,
+
+  cancelEvent: function(e){ e.stopPropagation(); e.preventDefault();},
+
+  // method over-rides
+  registerDragSource: function(ds){
+    //dojo.profile.start("register DragSource");
+
+    if(ds["domNode"]){
+      // FIXME: dragSource objects SHOULD have some sort of property that
+      // references their DOM node, we shouldn't just be passing nodes and
+      // expecting it to work.
+      //dojo.profile.start("register DragSource 1");
+      var dp = this.dsPrefix;
+      var dpIdx = dp+"Idx_"+(this.dsCounter++);
+      ds.dragSourceId = dpIdx;
+      this.dragSources[dpIdx] = ds;
+      ds.domNode.setAttribute(dp, dpIdx);
+      //dojo.profile.end("register DragSource 1");
+
+      //dojo.profile.start("register DragSource 2");
+
+      // so we can drag links
+      if(dojo.render.html.ie){
+        //dojo.profile.start("register DragSource IE");
+        
+        dojo.event.browser.addListener(ds.domNode, "ondragstart", this.cancelEvent);
+        // terribly slow
+        //dojo.event.connect(ds.domNode, "ondragstart", this.cancelEvent);
+        //dojo.profile.end("register DragSource IE");
+
+      }
+      //dojo.profile.end("register DragSource 2");
+
+    }
+    //dojo.profile.end("register DragSource");
+  },
+
+  unregisterDragSource: function(ds){
+    if (ds["domNode"]){
+      var dp = this.dsPrefix;
+      var dpIdx = ds.dragSourceId;
+      delete ds.dragSourceId;
+      delete this.dragSources[dpIdx];
+      ds.domNode.setAttribute(dp, null);
+      if(dojo.render.html.ie){
+        dojo.event.browser.removeListener(ds.domNode, "ondragstart", this.cancelEvent);     
+      }
+    }
+  },
+
+  registerDropTarget: function(dt){
+    this.dropTargets.push(dt);
+  },
+
+  unregisterDropTarget: function(dt){
+    var index = dojo.lang.find(this.dropTargets, dt, true);
+    if (index>=0) {
+      this.dropTargets.splice(index, 1);
+    }
+  },
+
+  /**
+  * Get the DOM element that is meant to drag.
+  * Loop through the parent nodes of the event target until
+  * the element is found that was created as a DragSource and 
+  * return it.
+  *
+  * @param event object The event for which to get the drag source.
+  */
+  getDragSource: function(e){
+    var tn = e.target;
+    if(tn === dojo.body()){ return; }
+    var ta = dojo.html.getAttribute(tn, this.dsPrefix);
+    while((!ta)&&(tn)){
+      tn = tn.parentNode;
+      if((!tn)||(tn === dojo.body())){ return; }
+      ta = dojo.html.getAttribute(tn, this.dsPrefix);
+    }
+    return this.dragSources[ta];
+  },
+
+  onKeyDown: function(e){
+  },
+
+  onMouseDown: function(e){
+    if(this.disabled) { return; }
+
+    // only begin on left click
+    if(dojo.render.html.ie) {
+      if(e.button != 1) { return; }
+    } else if(e.which != 1) {
+      return;
+    }
+
+    var target = e.target.nodeType == dojo.html.TEXT_NODE ?
+      e.target.parentNode : e.target;
+
+    // do not start drag involvement if the user is interacting with
+    // a form element.
+    if(dojo.html.isTag(target, "button", "textarea", "input", "select", "option")) {
+      return;
+    }
+
+    // find a selection object, if one is a parent of the source node
+    var ds = this.getDragSource(e);
+    
+    // this line is important.  if we aren't selecting anything then
+    // we need to return now, so preventDefault() isn't called, and thus
+    // the event is propogated to other handling code
+    if(!ds){ return; }
+
+    if(!dojo.lang.inArray(this.selectedSources, ds)){
+      this.selectedSources.push(ds);
+      ds.onSelected();
+    }
+
+    this.mouseDownX = e.pageX;
+    this.mouseDownY = e.pageY;
+
+    // Must stop the mouse down from being propogated, or otherwise can't
+    // drag links in firefox.
+    // WARNING: preventing the default action on all mousedown events
+    // prevents user interaction with the contents.
+    e.preventDefault();
+
+    dojo.event.connect(document, "onmousemove", this, "onMouseMove");
+  },
+
+  onMouseUp: function(e, cancel){
+    // if we aren't dragging then ignore the mouse-up
+    // (in particular, don't call preventDefault(), because other
+    // code may need to process this event)
+    if(this.selectedSources.length==0){
+      return;
+    }
+
+    this.mouseDownX = null;
+    this.mouseDownY = null;
+    this._dragTriggered = false;
+    // e.preventDefault();
+    e.dragSource = this.dragSource;
+    // let ctrl be used for multiselect or another action
+    // if I use same key to trigger treeV3 node selection and here,
+    // I have bugs with drag'n'drop. why ?? no idea..
+    if((!e.shiftKey)&&(!e.ctrlKey)){ 
+    //if(!e.shiftKey){
+      if(this.currentDropTarget) {
+        this.currentDropTarget.onDropStart();
+      }
+      dojo.lang.forEach(this.dragObjects, function(tempDragObj){
+        var ret = null;
+        if(!tempDragObj){ return; }
+        if(this.currentDropTarget) {
+          e.dragObject = tempDragObj;
+
+          // NOTE: we can't get anything but the current drop target
+          // here since the drag shadow blocks mouse-over events.
+          // This is probelematic for dropping "in" something
+          var ce = this.currentDropTarget.domNode.childNodes;
+          if(ce.length > 0){
+            e.dropTarget = ce[0];
+            while(e.dropTarget == tempDragObj.domNode){
+              e.dropTarget = e.dropTarget.nextSibling;
+            }
+          }else{
+            e.dropTarget = this.currentDropTarget.domNode;
+          }
+          if(this.dropAcceptable){
+            ret = this.currentDropTarget.onDrop(e);
+          }else{
+             this.currentDropTarget.onDragOut(e);
+          }
+        }
+
+        e.dragStatus = this.dropAcceptable && ret ? "dropSuccess" : "dropFailure";
+        // decouple the calls for onDragEnd, so they don't block the execution here
+        // ie. if the onDragEnd would call an alert, the execution here is blocked until the
+        // user has confirmed the alert box and then the rest of the dnd code is executed
+        // while the mouse doesnt "hold" the dragged object anymore ... and so on
+        dojo.lang.delayThese([
+          function() {
+            // in FF1.5 this throws an exception, see 
+            // http://dojotoolkit.org/pipermail/dojo-interest/2006-April/006751.html
+            try{
+              tempDragObj.dragSource.onDragEnd(e)
+            } catch(err) {
+              // since the problem seems passing e, we just copy all 
+              // properties and try the copy ...
+              var ecopy = {};
+              for (var i in e) {
+                if (i=="type") { // the type property contains the exception, no idea why...
+                  ecopy.type = "mouseup";
+                  continue;
+                }
+                ecopy[i] = e[i];
+              }
+              tempDragObj.dragSource.onDragEnd(ecopy);
+            }
+          }
+          , function() {tempDragObj.onDragEnd(e)}]);
+      }, this);
+
+      this.selectedSources = [];
+      this.dragObjects = [];
+      this.dragSource = null;
+      if(this.currentDropTarget) {
+        this.currentDropTarget.onDropEnd();
+      }
+    } else {
+      //dojo.debug("special click");
+    }
+
+    dojo.event.disconnect(document, "onmousemove", this, "onMouseMove");
+    this.currentDropTarget = null;
+  },
+
+  onScroll: function(){
+    //dojo.profile.start("DNDManager updateoffset");
+    for(var i = 0; i < this.dragObjects.length; i++) {
+      if(this.dragObjects[i].updateDragOffset) {
+        this.dragObjects[i].updateDragOffset();
+      }
+    }
+    //dojo.profile.end("DNDManager updateoffset");
+
+    // TODO: do not recalculate, only adjust coordinates
+    if (this.dragObjects.length) {
+      this.cacheTargetLocations();
+    }
+  },
+
+  _dragStartDistance: function(x, y){
+    if((!this.mouseDownX)||(!this.mouseDownX)){
+      return;
+    }
+    var dx = Math.abs(x-this.mouseDownX);
+    var dx2 = dx*dx;
+    var dy = Math.abs(y-this.mouseDownY);
+    var dy2 = dy*dy;
+    return parseInt(Math.sqrt(dx2+dy2), 10);
+  },
+
+  cacheTargetLocations: function(){
+    dojo.profile.start("cacheTargetLocations");
+
+    this.dropTargetDimensions = [];
+    dojo.lang.forEach(this.dropTargets, function(tempTarget){
+      var tn = tempTarget.domNode;
+      //only cache dropTarget which can accept current dragSource
+      if(!tn || dojo.lang.find(tempTarget.acceptedTypes, this.dragSource.type) < 0){ return; }
+      var abs = dojo.html.getAbsolutePosition(tn, true);
+      var bb = dojo.html.getBorderBox(tn);
+      this.dropTargetDimensions.push([
+        [abs.x, abs.y], // upper-left
+        // lower-right
+        [ abs.x+bb.width, abs.y+bb.height ],
+        tempTarget
+      ]);
+      //dojo.debug("Cached for "+tempTarget)
+    }, this);
+
+    dojo.profile.end("cacheTargetLocations");
+
+    //dojo.debug("Cache locations")
+  },
+
+  onMouseMove: function(e){
+    if((dojo.render.html.ie)&&(e.button != 1)){
+      // Oooops - mouse up occurred - e.g. when mouse was not over the
+      // window. I don't think we can detect this for FF - but at least
+      // we can be nice in IE.
+      this.currentDropTarget = null;
+      this.onMouseUp(e, true);
+      return;
+    }
+
+    // if we've got some sources, but no drag objects, we need to send
+    // onDragStart to all the right parties and get things lined up for
+    // drop target detection
+
+    if( (this.selectedSources.length)&&
+      (!this.dragObjects.length) ){
+      var dx;
+      var dy;
+      if(!this._dragTriggered){
+        this._dragTriggered = (this._dragStartDistance(e.pageX, e.pageY) > this.threshold);
+        if(!this._dragTriggered){ return; }
+        dx = e.pageX - this.mouseDownX;
+        dy = e.pageY - this.mouseDownY;
+      }
+
+      // the first element is always our dragSource, if there are multiple
+      // selectedSources (elements that move along) then the first one is the master
+      // and for it the events will be fired etc.
+      this.dragSource = this.selectedSources[0];
+      
+      dojo.lang.forEach(this.selectedSources, function(tempSource){
+        if(!tempSource){ return; }
+        var tdo = tempSource.onDragStart(e);
+        if(tdo){
+          tdo.onDragStart(e);
+
+          // "bump" the drag object to account for the drag threshold
+          tdo.dragOffset.y += dy;
+          tdo.dragOffset.x += dx;
+          tdo.dragSource = tempSource;
+
+          this.dragObjects.push(tdo);
+        }
+      }, this);
+
+      /* clean previous drop target in dragStart */
+      this.previousDropTarget = null;
+
+      this.cacheTargetLocations();
+    }
+
+    // FIXME: we need to add dragSources and dragObjects to e
+    dojo.lang.forEach(this.dragObjects, function(dragObj){
+      if(dragObj){ dragObj.onDragMove(e); }
+    });
+
+    // if we have a current drop target, check to see if we're outside of
+    // it. If so, do all the actions that need doing.
+    if(this.currentDropTarget){
+      //dojo.debug(dojo.html.hasParent(this.currentDropTarget.domNode))
+      var c = dojo.html.toCoordinateObject(this.currentDropTarget.domNode, true);
+      //    var dtp = this.currentDropTargetPoints;
+      var dtp = [
+        [c.x,c.y], [c.x+c.width, c.y+c.height]
+      ];
+    }
+
+    if((!this.nestedTargets)&&(dtp)&&(this.isInsideBox(e, dtp))){
+      if(this.dropAcceptable){
+        this.currentDropTarget.onDragMove(e, this.dragObjects);
+      }
+    }else{
+      // FIXME: need to fix the event object!
+      // see if we can find a better drop target
+      var bestBox = this.findBestTarget(e);
+
+      if(bestBox.target === null){
+        if(this.currentDropTarget){
+          this.currentDropTarget.onDragOut(e);
+          this.previousDropTarget = this.currentDropTarget;
+          this.currentDropTarget = null;
+          // this.currentDropTargetPoints = null;
+        }
+        this.dropAcceptable = false;
+        return;
+      }
+
+      if(this.currentDropTarget !== bestBox.target){
+        if(this.currentDropTarget){
+          this.previousDropTarget = this.currentDropTarget;
+          this.currentDropTarget.onDragOut(e);
+        }
+        this.currentDropTarget = bestBox.target;
+        // this.currentDropTargetPoints = bestBox.points;
+        e.dragObjects = this.dragObjects;
+        this.dropAcceptable = this.currentDropTarget.onDragOver(e);
+
+      }else{
+        if(this.dropAcceptable){
+          this.currentDropTarget.onDragMove(e, this.dragObjects);
+        }
+      }
+    }
+  },
+
+  findBestTarget: function(e) {
+    var _this = this;
+    var bestBox = new Object();
+    bestBox.target = null;
+    bestBox.points = null;
+    dojo.lang.every(this.dropTargetDimensions, function(tmpDA) {
+      if(!_this.isInsideBox(e, tmpDA)){
+        return true;
+      }
+
+      bestBox.target = tmpDA[2];
+      bestBox.points = tmpDA;
+      // continue iterating only if _this.nestedTargets == true
+      return Boolean(_this.nestedTargets);
+    });
+
+    return bestBox;
+  },
+
+  isInsideBox: function(e, coords){
+    if( (e.pageX > coords[0][0])&&
+      (e.pageX < coords[1][0])&&
+      (e.pageY > coords[0][1])&&
+      (e.pageY < coords[1][1]) ){
+      return true;
+    }
+    return false;
+  },
+
+  onMouseOver: function(e){
+  },
+
+  onMouseOut: function(e){
+  }
 });
-if(this.currentDropTarget){
-var c=dojo.html.toCoordinateObject(this.currentDropTarget.domNode,true);
-var dtp=[[c.x,c.y],[c.x+c.width,c.y+c.height]];
-}
-if((!this.nestedTargets)&&(dtp)&&(this.isInsideBox(e,dtp))){
-if(this.dropAcceptable){
-this.currentDropTarget.onDragMove(e,this.dragObjects);
-}
-}else{
-var _802=this.findBestTarget(e);
-if(_802.target===null){
-if(this.currentDropTarget){
-this.currentDropTarget.onDragOut(e);
-this.previousDropTarget=this.currentDropTarget;
-this.currentDropTarget=null;
-}
-this.dropAcceptable=false;
-return;
-}
-if(this.currentDropTarget!==_802.target){
-if(this.currentDropTarget){
-this.previousDropTarget=this.currentDropTarget;
-this.currentDropTarget.onDragOut(e);
-}
-this.currentDropTarget=_802.target;
-e.dragObjects=this.dragObjects;
-this.dropAcceptable=this.currentDropTarget.onDragOver(e);
-}else{
-if(this.dropAcceptable){
-this.currentDropTarget.onDragMove(e,this.dragObjects);
-}
-}
-}
-},findBestTarget:function(e){
-var _804=this;
-var _805=new Object();
-_805.target=null;
-_805.points=null;
-dojo.lang.every(this.dropTargetDimensions,function(_806){
-if(!_804.isInsideBox(e,_806)){
-return true;
-}
-_805.target=_806[2];
-_805.points=_806;
-return Boolean(_804.nestedTargets);
-});
-return _805;
-},isInsideBox:function(e,_808){
-if((e.pageX>_808[0][0])&&(e.pageX<_808[1][0])&&(e.pageY>_808[0][1])&&(e.pageY<_808[1][1])){
-return true;
-}
-return false;
-},onMouseOver:function(e){
-},onMouseOut:function(e){
-}});
-dojo.dnd.dragManager=new dojo.dnd.HtmlDragManager();
+
+dojo.dnd.dragManager = new dojo.dnd.HtmlDragManager();
+
+// global namespace protection closure
 (function(){
-var d=document;
-var dm=dojo.dnd.dragManager;
-dojo.event.connect(d,"onkeydown",dm,"onKeyDown");
-dojo.event.connect(d,"onmouseover",dm,"onMouseOver");
-dojo.event.connect(d,"onmouseout",dm,"onMouseOut");
-dojo.event.connect(d,"onmousedown",dm,"onMouseDown");
-dojo.event.connect(d,"onmouseup",dm,"onMouseUp");
-dojo.event.connect(window,"onscroll",dm,"onScroll");
+  var d = document;
+  var dm = dojo.dnd.dragManager;
+  //TODO: when focus manager is ready, dragManager should be rewritten to use it
+  // set up event handlers on the document (or no?)
+  dojo.event.connect(d, "onkeydown", dm, "onKeyDown");
+  dojo.event.connect(d, "onmouseover", dm, "onMouseOver");
+  dojo.event.connect(d, "onmouseout", dm, "onMouseOut");
+  dojo.event.connect(d, "onmousedown", dm, "onMouseDown");
+  dojo.event.connect(d, "onmouseup", dm, "onMouseUp");
+  // TODO: process scrolling of elements, not only window (focus manager would 
+  // probably come to rescue here as well)
+  dojo.event.connect(window, "onscroll", dm, "onScroll");
 })();
+
 dojo.provide("dojo.html.selection");
-dojo.html.selectionType={NONE:0,TEXT:1,CONTROL:2};
-dojo.html.clearSelection=function(){
-var _80d=dojo.global();
-var _80e=dojo.doc();
-try{
-if(_80d["getSelection"]){
-if(dojo.render.html.safari){
-_80d.getSelection().collapse();
-}else{
-_80d.getSelection().removeAllRanges();
-}
-}else{
-if(_80e.selection){
-if(_80e.selection.empty){
-_80e.selection.empty();
-}else{
-if(_80e.selection.clear){
-_80e.selection.clear();
-}
-}
-}
-}
-return true;
-}
-catch(e){
-dojo.debug(e);
-return false;
-}
+
+
+/**
+ * type of selection
+**/
+dojo.html.selectionType = {
+  NONE : 0, //selection is empty
+  TEXT : 1, //selection contains text (may also contains CONTROL objects)
+  CONTROL : 2 //only one element is selected (such as img, table etc)
 };
-dojo.html.disableSelection=function(_80f){
-_80f=dojo.byId(_80f)||dojo.body();
-var h=dojo.render.html;
-if(h.mozilla){
-_80f.style.MozUserSelect="none";
-}else{
-if(h.safari){
-_80f.style.KhtmlUserSelect="none";
-}else{
-if(h.ie){
-_80f.unselectable="on";
-}else{
-return false;
+
+dojo.html.clearSelection = function(){
+  // summary: deselect the current selection to make it empty
+  var _window = dojo.global();
+  var _document = dojo.doc();
+  try{
+    if(_window["getSelection"]){ 
+      if(dojo.render.html.safari){
+        // pulled from WebCore/ecma/kjs_window.cpp, line 2536
+        _window.getSelection().collapse();
+      }else{
+        _window.getSelection().removeAllRanges();
+      }
+    }else if(_document.selection){
+      if(_document.selection.empty){
+        _document.selection.empty();
+      }else if(_document.selection.clear){
+        _document.selection.clear();
+      }
+    }
+    return true;
+  }catch(e){
+    dojo.debug(e);
+    return false;
+  }
 }
+
+dojo.html.disableSelection = function(/*DomNode*/element){
+  // summary: disable selection on a node
+  element = dojo.byId(element)||dojo.body();
+  var h = dojo.render.html;
+  
+  if(h.mozilla){
+    element.style.MozUserSelect = "none";
+  }else if(h.safari){
+    element.style.KhtmlUserSelect = "none"; 
+  }else if(h.ie){
+    element.unselectable = "on";
+  }else{
+    return false;
+  }
+  return true;
 }
+
+dojo.html.enableSelection = function(/*DomNode*/element){
+  // summary: enable selection on a node
+  element = dojo.byId(element)||dojo.body();
+  
+  var h = dojo.render.html;
+  if(h.mozilla){ 
+    element.style.MozUserSelect = ""; 
+  }else if(h.safari){
+    element.style.KhtmlUserSelect = "";
+  }else if(h.ie){
+    element.unselectable = "off";
+  }else{
+    return false;
+  }
+  return true;
 }
-return true;
-};
-dojo.html.enableSelection=function(_811){
-_811=dojo.byId(_811)||dojo.body();
-var h=dojo.render.html;
-if(h.mozilla){
-_811.style.MozUserSelect="";
-}else{
-if(h.safari){
-_811.style.KhtmlUserSelect="";
-}else{
-if(h.ie){
-_811.unselectable="off";
-}else{
-return false;
+
+dojo.html.selectElement = function(/*DomNode*/element){
+  dojo.deprecated("dojo.html.selectElement", "replaced by dojo.html.selection.selectElementChildren", 0.5);
 }
+
+dojo.html.selectInputText = function(/*DomNode*/element){
+  // summary: select all the text in an input element
+  var _window = dojo.global();
+  var _document = dojo.doc();
+  element = dojo.byId(element);
+  if(_document["selection"] && dojo.body()["createTextRange"]){ // IE
+    var range = element.createTextRange();
+    range.moveStart("character", 0);
+    range.moveEnd("character", element.value.length);
+    range.select();
+  }else if(_window["getSelection"]){
+    var selection = _window.getSelection();
+    // FIXME: does this work on Safari?
+    element.setSelectionRange(0, element.value.length);
+  }
+  element.focus();
 }
+
+
+dojo.html.isSelectionCollapsed = function(){
+  dojo.deprecated("dojo.html.isSelectionCollapsed", "replaced by dojo.html.selection.isCollapsed", 0.5);
+  return dojo.html.selection.isCollapsed();
 }
-return true;
-};
-dojo.html.selectElement=function(_813){
-dojo.deprecated("dojo.html.selectElement","replaced by dojo.html.selection.selectElementChildren",0.5);
-};
-dojo.html.selectInputText=function(_814){
-var _815=dojo.global();
-var _816=dojo.doc();
-_814=dojo.byId(_814);
-if(_816["selection"]&&dojo.body()["createTextRange"]){
-var _817=_814.createTextRange();
-_817.moveStart("character",0);
-_817.moveEnd("character",_814.value.length);
-_817.select();
-}else{
-if(_815["getSelection"]){
-var _818=_815.getSelection();
-_814.setSelectionRange(0,_814.value.length);
-}
-}
-_814.focus();
-};
-dojo.html.isSelectionCollapsed=function(){
-dojo.deprecated("dojo.html.isSelectionCollapsed","replaced by dojo.html.selection.isCollapsed",0.5);
-return dojo.html.selection.isCollapsed();
-};
-dojo.lang.mixin(dojo.html.selection,{getType:function(){
-if(dojo.doc()["selection"]){
-return dojo.html.selectionType[dojo.doc().selection.type.toUpperCase()];
-}else{
-var _819=dojo.html.selectionType.TEXT;
-var oSel;
-try{
-oSel=dojo.global().getSelection();
-}
-catch(e){
-}
-if(oSel&&oSel.rangeCount==1){
-var _81b=oSel.getRangeAt(0);
-if(_81b.startContainer==_81b.endContainer&&(_81b.endOffset-_81b.startOffset)==1&&_81b.startContainer.nodeType!=dojo.dom.TEXT_NODE){
-_819=dojo.html.selectionType.CONTROL;
-}
-}
-return _819;
-}
-},isCollapsed:function(){
-var _81c=dojo.global();
-var _81d=dojo.doc();
-if(_81d["selection"]){
-return _81d.selection.createRange().text=="";
-}else{
-if(_81c["getSelection"]){
-var _81e=_81c.getSelection();
-if(dojo.lang.isString(_81e)){
-return _81e=="";
-}else{
-return _81e.isCollapsed||_81e.toString()=="";
-}
-}
-}
-},getSelectedElement:function(){
-if(dojo.html.selection.getType()==dojo.html.selectionType.CONTROL){
-if(dojo.doc()["selection"]){
-var _81f=dojo.doc().selection.createRange();
-if(_81f&&_81f.item){
-return dojo.doc().selection.createRange().item(0);
-}
-}else{
-var _820=dojo.global().getSelection();
-return _820.anchorNode.childNodes[_820.anchorOffset];
-}
-}
-},getParentElement:function(){
-if(dojo.html.selection.getType()==dojo.html.selectionType.CONTROL){
-var p=dojo.html.selection.getSelectedElement();
-if(p){
-return p.parentNode;
-}
-}else{
-if(dojo.doc()["selection"]){
-return dojo.doc().selection.createRange().parentElement();
-}else{
-var _822=dojo.global().getSelection();
-if(_822){
-var node=_822.anchorNode;
-while(node&&node.nodeType!=dojo.dom.ELEMENT_NODE){
-node=node.parentNode;
-}
-return node;
-}
-}
-}
-},getSelectedText:function(){
-if(dojo.doc()["selection"]){
-if(dojo.html.selection.getType()==dojo.html.selectionType.CONTROL){
-return null;
-}
-return dojo.doc().selection.createRange().text;
-}else{
-var _824=dojo.global().getSelection();
-if(_824){
-return _824.toString();
-}
-}
-},getSelectedHtml:function(){
-if(dojo.doc()["selection"]){
-if(dojo.html.selection.getType()==dojo.html.selectionType.CONTROL){
-return null;
-}
-return dojo.doc().selection.createRange().htmlText;
-}else{
-var _825=dojo.global().getSelection();
-if(_825&&_825.rangeCount){
-var frag=_825.getRangeAt(0).cloneContents();
-var div=document.createElement("div");
-div.appendChild(frag);
-return div.innerHTML;
-}
-return null;
-}
-},hasAncestorElement:function(_828){
-return (dojo.html.selection.getAncestorElement.apply(this,arguments)!=null);
-},getAncestorElement:function(_829){
-var node=dojo.html.selection.getSelectedElement()||dojo.html.selection.getParentElement();
-while(node){
-if(dojo.html.selection.isTag(node,arguments).length>0){
-return node;
-}
-node=node.parentNode;
-}
-return null;
-},isTag:function(node,tags){
-if(node&&node.tagName){
-for(var i=0;i<tags.length;i++){
-if(node.tagName.toLowerCase()==String(tags[i]).toLowerCase()){
-return String(tags[i]).toLowerCase();
-}
-}
-}
-return "";
-},selectElement:function(_82e){
-var _82f=dojo.global();
-var _830=dojo.doc();
-_82e=dojo.byId(_82e);
-if(_830.selection&&dojo.body().createTextRange){
-try{
-var _831=dojo.body().createControlRange();
-_831.addElement(_82e);
-_831.select();
-}
-catch(e){
-dojo.html.selection.selectElementChildren(_82e);
-}
-}else{
-if(_82f["getSelection"]){
-var _832=_82f.getSelection();
-if(_832["removeAllRanges"]){
-var _831=_830.createRange();
-_831.selectNode(_82e);
-_832.removeAllRanges();
-_832.addRange(_831);
-}
-}
-}
-},selectElementChildren:function(_833){
-var _834=dojo.global();
-var _835=dojo.doc();
-_833=dojo.byId(_833);
-if(_835.selection&&dojo.body().createTextRange){
-var _836=dojo.body().createTextRange();
-_836.moveToElementText(_833);
-_836.select();
-}else{
-if(_834["getSelection"]){
-var _837=_834.getSelection();
-if(_837["setBaseAndExtent"]){
-_837.setBaseAndExtent(_833,0,_833,_833.innerText.length-1);
-}else{
-if(_837["selectAllChildren"]){
-_837.selectAllChildren(_833);
-}
-}
-}
-}
-},getBookmark:function(){
-var _838;
-var _839=dojo.doc();
-if(_839["selection"]){
-var _83a=_839.selection.createRange();
-_838=_83a.getBookmark();
-}else{
-var _83b;
-try{
-_83b=dojo.global().getSelection();
-}
-catch(e){
-}
-if(_83b){
-var _83a=_83b.getRangeAt(0);
-_838=_83a.cloneRange();
-}else{
-dojo.debug("No idea how to store the current selection for this browser!");
-}
-}
-return _838;
-},moveToBookmark:function(_83c){
-var _83d=dojo.doc();
-if(_83d["selection"]){
-var _83e=_83d.selection.createRange();
-_83e.moveToBookmark(_83c);
-_83e.select();
-}else{
-var _83f;
-try{
-_83f=dojo.global().getSelection();
-}
-catch(e){
-}
-if(_83f&&_83f["removeAllRanges"]){
-_83f.removeAllRanges();
-_83f.addRange(_83c);
-}else{
-dojo.debug("No idea how to restore selection for this browser!");
-}
-}
-},collapse:function(_840){
-if(dojo.global()["getSelection"]){
-var _841=dojo.global().getSelection();
-if(_841.removeAllRanges){
-if(_840){
-_841.collapseToStart();
-}else{
-_841.collapseToEnd();
-}
-}else{
-dojo.global().getSelection().collapse(_840);
-}
-}else{
-if(dojo.doc().selection){
-var _842=dojo.doc().selection.createRange();
-_842.collapse(_840);
-_842.select();
-}
-}
-},remove:function(){
-if(dojo.doc().selection){
-var _843=dojo.doc().selection;
-if(_843.type.toUpperCase()!="NONE"){
-_843.clear();
-}
-return _843;
-}else{
-var _843=dojo.global().getSelection();
-for(var i=0;i<_843.rangeCount;i++){
-_843.getRangeAt(i).deleteContents();
-}
-return _843;
-}
-}});
+
+dojo.lang.mixin(dojo.html.selection, {
+  getType: function() {
+    // summary: Get the selection type (like document.select.type in IE).
+    if(dojo.doc()["selection"]){ //IE
+      return dojo.html.selectionType[dojo.doc().selection.type.toUpperCase()];
+    }else{
+      var stype = dojo.html.selectionType.TEXT;
+  
+      // Check if the actual selection is a CONTROL (IMG, TABLE, HR, etc...).
+      var oSel;
+      try {oSel = dojo.global().getSelection();}
+      catch (e) {}
+      
+      if(oSel && oSel.rangeCount==1){
+        var oRange = oSel.getRangeAt(0);
+        if (oRange.startContainer == oRange.endContainer && (oRange.endOffset - oRange.startOffset) == 1
+          && oRange.startContainer.nodeType != dojo.dom.TEXT_NODE) {
+          stype = dojo.html.selectionType.CONTROL;
+        }
+      }
+      return stype;
+    }
+  },
+  isCollapsed: function() {
+    // summary: return whether the current selection is empty
+    var _window = dojo.global();
+    var _document = dojo.doc();
+    if(_document["selection"]){ // IE
+      return _document.selection.createRange().text == "";
+    }else if(_window["getSelection"]){
+      var selection = _window.getSelection();
+      if(dojo.lang.isString(selection)){ // Safari
+        return selection == "";
+      }else{ // Mozilla/W3
+        return selection.isCollapsed || selection.toString() == "";
+      }
+    }
+  },
+  getSelectedElement: function() {
+    // summary: 
+    //    Retrieves the selected element (if any), just in the case that a single
+    //    element (object like and image or a table) is selected.
+    if ( dojo.html.selection.getType() == dojo.html.selectionType.CONTROL ){
+      if(dojo.doc()["selection"]){ //IE
+        var range = dojo.doc().selection.createRange();
+    
+        if ( range && range.item ){
+          return dojo.doc().selection.createRange().item(0);
+        }
+      }else{
+        var selection = dojo.global().getSelection();
+        return selection.anchorNode.childNodes[ selection.anchorOffset ];
+      }
+    }
+  },
+  getParentElement: function() {
+    // summary: 
+    //    Get the parent element of the current selection
+    if(dojo.html.selection.getType() == dojo.html.selectionType.CONTROL){
+      var p = dojo.html.selection.getSelectedElement();
+      if(p){ return p.parentNode; }
+    }else{
+      if(dojo.doc()["selection"]){ //IE
+        return dojo.doc().selection.createRange().parentElement();
+      }else{
+        var selection = dojo.global().getSelection();
+        if(selection){
+          var node = selection.anchorNode;
+    
+          while ( node && node.nodeType != dojo.dom.ELEMENT_NODE ){
+            node = node.parentNode;
+          }
+    
+          return node;
+        }
+      }
+    }
+  },
+  getSelectedText: function(){
+    // summary:
+    //    Return the text (no html tags) included in the current selection or null if no text is selected
+    if(dojo.doc()["selection"]){ //IE
+      if(dojo.html.selection.getType() == dojo.html.selectionType.CONTROL){
+        return null;
+      }
+      return dojo.doc().selection.createRange().text;
+    }else{
+      var selection = dojo.global().getSelection();
+      if(selection){
+        return selection.toString();
+      }
+    }
+  },
+  getSelectedHtml: function(){
+    // summary:
+    //    Return the html of the current selection or null if unavailable
+    if(dojo.doc()["selection"]){ //IE
+      if(dojo.html.selection.getType() == dojo.html.selectionType.CONTROL){
+        return null;
+      }
+      return dojo.doc().selection.createRange().htmlText;
+    }else{
+      var selection = dojo.global().getSelection();
+      if(selection && selection.rangeCount){
+        var frag = selection.getRangeAt(0).cloneContents();
+        var div = document.createElement("div");
+        div.appendChild(frag);
+        return div.innerHTML;
+      }
+      return null;
+    }
+  },
+  hasAncestorElement: function(/*String*/tagName /* ... */){
+    // summary: 
+    //    Check whether current selection has a  parent element which is of type tagName (or one of the other specified tagName)
+    return (dojo.html.selection.getAncestorElement.apply(this, arguments) != null);
+  },
+  getAncestorElement: function(/*String*/tagName /* ... */){
+    // summary:
+    //    Return the parent element of the current selection which is of type tagName (or one of the other specified tagName)
+    var node = dojo.html.selection.getSelectedElement() || dojo.html.selection.getParentElement();
+    while(node /*&& node.tagName.toLowerCase() != 'body'*/){
+      if(dojo.html.selection.isTag(node, arguments).length>0){
+        return node;
+      }
+      node = node.parentNode;
+    }
+    return null;
+  },
+  //modified from dojo.html.isTag to take an array as second parameter
+  isTag: function(/*DomNode*/node, /*Array*/tags) {
+    if(node && node.tagName) {
+      for (var i=0; i<tags.length; i++){
+        if (node.tagName.toLowerCase()==String(tags[i]).toLowerCase()){
+          return String(tags[i]).toLowerCase();
+        }
+      }
+    }
+    return "";
+  },
+  selectElement: function(/*DomNode*/element) {
+    // summary: clear previous selection and select element (including all its children)
+    var _window = dojo.global();
+    var _document = dojo.doc();
+    element = dojo.byId(element);
+    if(_document.selection && dojo.body().createTextRange){ // IE
+      try{
+        var range = dojo.body().createControlRange();
+        range.addElement(element);
+        range.select();
+      }catch(e){
+        dojo.html.selection.selectElementChildren(element);
+      }
+    }else if(_window["getSelection"]){
+      var selection = _window.getSelection();
+      // FIXME: does this work on Safari?
+      if(selection["removeAllRanges"]){ // Mozilla
+        var range = _document.createRange() ;
+        range.selectNode(element) ;
+        selection.removeAllRanges() ;
+        selection.addRange(range) ;
+      }
+    }
+  },
+  selectElementChildren: function(/*DomNode*/element){
+    // summary: clear previous selection and select the content of the node (excluding the node itself)
+    var _window = dojo.global();
+    var _document = dojo.doc();
+    element = dojo.byId(element);
+    if(_document.selection && dojo.body().createTextRange){ // IE
+      var range = dojo.body().createTextRange();
+      range.moveToElementText(element);
+      range.select();
+    }else if(_window["getSelection"]){
+      var selection = _window.getSelection();
+      if(selection["setBaseAndExtent"]){ // Safari
+        selection.setBaseAndExtent(element, 0, element, element.innerText.length - 1);
+      } else if(selection["selectAllChildren"]){ // Mozilla
+        selection.selectAllChildren(element);
+      }
+    }
+  },
+  getBookmark: function(){
+    // summary: Retrieves a bookmark that can be used with moveToBookmark to return to the same range
+    var bookmark;
+    var _document = dojo.doc();
+    if(_document["selection"]){ // IE
+      var range = _document.selection.createRange();
+      bookmark = range.getBookmark();
+    }else{
+      var selection;
+      try {selection = dojo.global().getSelection();}
+      catch (e) {}
+      if(selection){
+        var range = selection.getRangeAt(0);
+        bookmark = range.cloneRange();
+      }else{
+        dojo.debug("No idea how to store the current selection for this browser!");
+      }
+    }
+    return bookmark;
+  },
+  moveToBookmark: function(/*Object*/bookmark){
+    // summary: Moves current selection to a bookmark
+    // bookmark: this should be a returned object from dojo.html.selection.getBookmark()
+    var _document = dojo.doc();
+    if(_document["selection"]){ // IE
+      var range = _document.selection.createRange();
+       range.moveToBookmark(bookmark);
+       range.select();
+    }else{ //Moz/W3C
+      var selection;
+      try {selection = dojo.global().getSelection();}
+      catch (e) {}
+      if(selection && selection['removeAllRanges']){
+        selection.removeAllRanges() ;
+        selection.addRange(bookmark) ;
+      }else{
+        dojo.debug("No idea how to restore selection for this browser!");
+      }
+    }
+  },
+  collapse: function(/*Boolean*/beginning) {
+    // summary: clear current selection
+    if(dojo.global()['getSelection']){
+      var selection = dojo.global().getSelection();
+      if(selection.removeAllRanges){ // Mozilla
+        if(beginning){
+          selection.collapseToStart();
+        }else{
+          selection.collapseToEnd();
+        }
+      }else{ // Safari
+        // pulled from WebCore/ecma/kjs_window.cpp, line 2536
+         dojo.global().getSelection().collapse(beginning);
+      }
+    }else if(dojo.doc().selection){ // IE
+      var range = dojo.doc().selection.createRange();
+      range.collapse(beginning);
+      range.select();
+    }
+  },
+  remove: function() {
+    // summary: delete current selection
+    if(dojo.doc().selection) { //IE
+      var selection = dojo.doc().selection;
+
+      if ( selection.type.toUpperCase() != "NONE" ){
+        selection.clear();
+      }
+    
+      return selection;
+    }else{
+      var selection = dojo.global().getSelection();
+
+      for ( var i = 0; i < selection.rangeCount; i++ ){
+        selection.getRangeAt(i).deleteContents();
+      }
+    
+      return selection;
+    }
+  }
+});
+
 dojo.provide("dojo.html.iframe");
-dojo.html.iframeContentWindow=function(_845){
-var win=dojo.html.getDocumentWindow(dojo.html.iframeContentDocument(_845))||dojo.html.iframeContentDocument(_845).__parent__||(_845.name&&document.frames[_845.name])||null;
-return win;
-};
-dojo.html.iframeContentDocument=function(_847){
-var doc=_847.contentDocument||((_847.contentWindow)&&(_847.contentWindow.document))||((_847.name)&&(document.frames[_847.name])&&(document.frames[_847.name].document))||null;
-return doc;
-};
-dojo.html.BackgroundIframe=function(node){
-if(dojo.render.html.ie55||dojo.render.html.ie60){
-var html="<iframe src='javascript:false'"+"' style='position: absolute; left: 0px; top: 0px; width: 100%; height: 100%;"+"z-index: -1; filter:Alpha(Opacity=\"0\");' "+">";
-this.iframe=dojo.doc().createElement(html);
-this.iframe.tabIndex=-1;
-if(node){
-node.appendChild(this.iframe);
-this.domNode=node;
-}else{
-dojo.body().appendChild(this.iframe);
-this.iframe.style.display="none";
+
+// thanks burstlib!
+dojo.html.iframeContentWindow = function(/* HTMLIFrameElement */iframe_el) {
+  //  summary
+  //  returns the window reference of the passed iframe
+  var win = dojo.html.getDocumentWindow(dojo.html.iframeContentDocument(iframe_el)) ||
+    // Moz. TODO: is this available when defaultView isn't?
+    dojo.html.iframeContentDocument(iframe_el).__parent__ ||
+    (iframe_el.name && document.frames[iframe_el.name]) || null;
+  return win; //  Window
 }
+
+dojo.html.iframeContentDocument = function(/* HTMLIFrameElement */iframe_el){
+  //  summary
+  //  returns a reference to the document object inside iframe_el
+  var doc = iframe_el.contentDocument // W3
+    || ((iframe_el.contentWindow)&&(iframe_el.contentWindow.document))  // IE
+    || ((iframe_el.name)&&(document.frames[iframe_el.name])&&(document.frames[iframe_el.name].document)) 
+    || null;
+  return doc; //  HTMLDocument
 }
-};
-dojo.lang.extend(dojo.html.BackgroundIframe,{iframe:null,onResized:function(){
-if(this.iframe&&this.domNode&&this.domNode.parentNode){
-var _84b=dojo.html.getMarginBox(this.domNode);
-if(_84b.width==0||_84b.height==0){
-dojo.lang.setTimeout(this,this.onResized,100);
-return;
+
+dojo.html.BackgroundIframe = function(/* HTMLElement */node) {
+  //  summary
+  //  For IE z-index schenanigans
+  //  Two possible uses:
+  //  1. new dojo.html.BackgroundIframe(node)
+  //    Makes a background iframe as a child of node, that fills area (and position) of node
+  //  2. new dojo.html.BackgroundIframe()
+  //    Attaches frame to dojo.body().  User must call size() to set size.
+  if(dojo.render.html.ie55 || dojo.render.html.ie60) {
+    var html="<iframe src='javascript:false'"
+      + "' style='position: absolute; left: 0px; top: 0px; width: 100%; height: 100%;"
+      + "z-index: -1; filter:Alpha(Opacity=\"0\");' "
+      + ">";
+    this.iframe = dojo.doc().createElement(html);
+    this.iframe.tabIndex = -1; // Magic to prevent iframe from getting focus on tab keypress - as style didnt work.
+    if(node){
+      node.appendChild(this.iframe);
+      this.domNode=node;
+    }else{
+      dojo.body().appendChild(this.iframe);
+      this.iframe.style.display="none";
+    }
+  }
 }
-this.iframe.style.width=_84b.width+"px";
-this.iframe.style.height=_84b.height+"px";
-}
-},size:function(node){
-if(!this.iframe){
-return;
-}
-var _84d=dojo.html.toCoordinateObject(node,true,dojo.html.boxSizing.BORDER_BOX);
-this.iframe.style.width=_84d.width+"px";
-this.iframe.style.height=_84d.height+"px";
-this.iframe.style.left=_84d.left+"px";
-this.iframe.style.top=_84d.top+"px";
-},setZIndex:function(node){
-if(!this.iframe){
-return;
-}
-if(dojo.dom.isNode(node)){
-this.iframe.style.zIndex=dojo.html.getStyle(node,"z-index")-1;
-}else{
-if(!isNaN(node)){
-this.iframe.style.zIndex=node;
-}
-}
-},show:function(){
-if(!this.iframe){
-return;
-}
-this.iframe.style.display="block";
-},hide:function(){
-if(!this.iframe){
-return;
-}
-this.iframe.style.display="none";
-},remove:function(){
-dojo.html.removeNode(this.iframe);
-}});
+dojo.lang.extend(dojo.html.BackgroundIframe, {
+  iframe: null,
+  onResized: function(){
+    //  summary
+    //  Resize event handler.
+    // TODO: this function shouldn't be necessary but setting width=height=100% doesn't work!
+    if(this.iframe && this.domNode && this.domNode.parentNode){ // No parentElement if onResized() timeout event occurs on a removed domnode
+      var outer = dojo.html.getMarginBox(this.domNode);
+      if (outer.width  == 0 || outer.height == 0 ){
+        dojo.lang.setTimeout(this, this.onResized, 100);
+        return;
+      }
+      this.iframe.style.width = outer.width + "px";
+      this.iframe.style.height = outer.height + "px";
+    }
+  },
+
+  size: function(/* HTMLElement */node) {
+    //  Call this function if the iframe is connected to dojo.body() rather than the node being shadowed 
+    //  (TODO: erase)
+    if(!this.iframe) { return; }
+    var coords = dojo.html.toCoordinateObject(node, true, dojo.html.boxSizing.BORDER_BOX);
+    this.iframe.style.width = coords.width + "px";
+    this.iframe.style.height = coords.height + "px";
+    this.iframe.style.left = coords.left + "px";
+    this.iframe.style.top = coords.top + "px";
+  },
+
+  setZIndex: function(/* HTMLElement */node) {
+    //  summary
+    //  Sets the z-index of the background iframe.
+    if(!this.iframe) { return; }
+    if(dojo.dom.isNode(node)) {
+      this.iframe.style.zIndex = dojo.html.getStyle(node, "z-index") - 1;
+    } else if(!isNaN(node)) {
+      this.iframe.style.zIndex = node;
+    }
+  },
+
+  show: function() {
+    //  summary
+    //  show the iframe
+    if(!this.iframe) { return; }
+    this.iframe.style.display = "block";
+  },
+
+  hide: function() {
+    //  summary
+    //  hide the iframe
+    if(!this.iframe) { return; }
+    this.iframe.style.display = "none";
+  },
+
+  remove: function() {
+    //  summary
+    //  remove the iframe
+    dojo.html.removeNode(this.iframe);
+  }
+});
+
 dojo.provide("dojo.dnd.HtmlDragAndDrop");
-dojo.declare("dojo.dnd.HtmlDragSource",dojo.dnd.DragSource,{dragClass:"",onDragStart:function(){
-var _84f=new dojo.dnd.HtmlDragObject(this.dragObject,this.type);
-if(this.dragClass){
-_84f.dragClass=this.dragClass;
-}
-if(this.constrainToContainer){
-_84f.constrainTo(this.constrainingContainer||this.domNode.parentNode);
-}
-return _84f;
-},setDragHandle:function(node){
-node=dojo.byId(node);
-dojo.dnd.dragManager.unregisterDragSource(this);
-this.domNode=node;
-dojo.dnd.dragManager.registerDragSource(this);
-},setDragTarget:function(node){
-this.dragObject=node;
-},constrainTo:function(_852){
-this.constrainToContainer=true;
-if(_852){
-this.constrainingContainer=_852;
-}
-},onSelected:function(){
-for(var i=0;i<this.dragObjects.length;i++){
-dojo.dnd.dragManager.selectedSources.push(new dojo.dnd.HtmlDragSource(this.dragObjects[i]));
-}
-},addDragObjects:function(el){
-for(var i=0;i<arguments.length;i++){
-this.dragObjects.push(arguments[i]);
-}
-}},function(node,type){
-node=dojo.byId(node);
-this.dragObjects=[];
-this.constrainToContainer=false;
-if(node){
-this.domNode=node;
-this.dragObject=node;
-dojo.dnd.DragSource.call(this);
-this.type=(type)||(this.domNode.nodeName.toLowerCase());
-}
+
+
+
+dojo.declare("dojo.dnd.HtmlDragSource", dojo.dnd.DragSource, {
+  dragClass: "", // CSS classname(s) applied to node when it is being dragged
+
+  onDragStart: function(){
+    var dragObj = new dojo.dnd.HtmlDragObject(this.dragObject, this.type);
+    if(this.dragClass) { dragObj.dragClass = this.dragClass; }
+
+    if (this.constrainToContainer) {
+      dragObj.constrainTo(this.constrainingContainer || this.domNode.parentNode);
+    }
+
+    return dragObj;
+  },
+
+  setDragHandle: function(node){
+    node = dojo.byId(node);
+    dojo.dnd.dragManager.unregisterDragSource(this);
+    this.domNode = node;
+    dojo.dnd.dragManager.registerDragSource(this);
+  },
+
+  setDragTarget: function(node){
+    this.dragObject = node;
+  },
+
+  constrainTo: function(container) {
+    this.constrainToContainer = true;
+    if (container) {
+      this.constrainingContainer = container;
+    }
+  },
+  
+  /*
+  *
+  * see dojo.dnd.DragSource.onSelected
+  */
+  onSelected: function() {
+    for (var i=0; i<this.dragObjects.length; i++) {
+      dojo.dnd.dragManager.selectedSources.push(new dojo.dnd.HtmlDragSource(this.dragObjects[i]));
+    }
+  },
+
+  /**
+  * Register elements that should be dragged along with
+  * the actual DragSource.
+  *
+  * Example usage:
+  *   var dragSource = new dojo.dnd.HtmlDragSource(...);
+  * // add a single element
+  * dragSource.addDragObjects(dojo.byId('id1'));
+  * // add multiple elements to drag along
+  * dragSource.addDragObjects(dojo.byId('id2'), dojo.byId('id3'));
+  *
+  * el A dom node to add to the drag list.
+  */
+  addDragObjects: function(/*DOMNode*/ el) {
+    for (var i=0; i<arguments.length; i++) {
+      this.dragObjects.push(arguments[i]);
+    }
+  }
+}, function(node, type){
+  node = dojo.byId(node);
+  this.dragObjects = [];
+  this.constrainToContainer = false;
+  if(node){
+    this.domNode = node;
+    this.dragObject = node;
+    // register us
+    dojo.dnd.DragSource.call(this);
+    // set properties that might have been clobbered by the mixin
+    this.type = (type)||(this.domNode.nodeName.toLowerCase());
+  }
+
 });
-dojo.declare("dojo.dnd.HtmlDragObject",dojo.dnd.DragObject,{dragClass:"",opacity:0.5,createIframe:true,disableX:false,disableY:false,createDragNode:function(){
-var node=this.domNode.cloneNode(true);
-if(this.dragClass){
-dojo.html.addClass(node,this.dragClass);
-}
-if(this.opacity<1){
-dojo.html.setOpacity(node,this.opacity);
-}
-if(node.tagName.toLowerCase()=="tr"){
-var doc=this.domNode.ownerDocument;
-var _85a=doc.createElement("table");
-var _85b=doc.createElement("tbody");
-_85a.appendChild(_85b);
-_85b.appendChild(node);
-var _85c=this.domNode.childNodes;
-var _85d=node.childNodes;
-for(var i=0;i<_85c.length;i++){
-if((_85d[i])&&(_85d[i].style)){
-_85d[i].style.width=dojo.html.getContentBox(_85c[i]).width+"px";
-}
-}
-node=_85a;
-}
-if((dojo.render.html.ie55||dojo.render.html.ie60)&&this.createIframe){
-with(node.style){
-top="0px";
-left="0px";
-}
-var _85f=document.createElement("div");
-_85f.appendChild(node);
-this.bgIframe=new dojo.html.BackgroundIframe(_85f);
-_85f.appendChild(this.bgIframe.iframe);
-node=_85f;
-}
-node.style.zIndex=999;
-return node;
-},onDragStart:function(e){
-dojo.html.clearSelection();
-this.scrollOffset=dojo.html.getScroll().offset;
-this.dragStartPosition=dojo.html.getAbsolutePosition(this.domNode,true);
-this.dragOffset={y:this.dragStartPosition.y-e.pageY,x:this.dragStartPosition.x-e.pageX};
-this.dragClone=this.createDragNode();
-this.containingBlockPosition=this.domNode.offsetParent?dojo.html.getAbsolutePosition(this.domNode.offsetParent,true):{x:0,y:0};
-if(this.constrainToContainer){
-this.constraints=this.getConstraints();
-}
-with(this.dragClone.style){
-position="absolute";
-top=this.dragOffset.y+e.pageY+"px";
-left=this.dragOffset.x+e.pageX+"px";
-}
-dojo.body().appendChild(this.dragClone);
-dojo.event.connect(this.domNode,"onclick",this,"squelchOnClick");
-dojo.event.topic.publish("dragStart",{source:this});
-},getConstraints:function(){
-if(this.constrainingContainer.nodeName.toLowerCase()=="body"){
-var _861=dojo.html.getViewport();
-var _862=_861.width;
-var _863=_861.height;
-var x=0;
-var y=0;
-}else{
-var _866=dojo.html.getContentBox(this.constrainingContainer);
-_862=_866.width;
-_863=_866.height;
-x=this.containingBlockPosition.x+dojo.html.getPixelValue(this.constrainingContainer,"padding-left",true)+dojo.html.getBorderExtent(this.constrainingContainer,"left");
-y=this.containingBlockPosition.y+dojo.html.getPixelValue(this.constrainingContainer,"padding-top",true)+dojo.html.getBorderExtent(this.constrainingContainer,"top");
-}
-var mb=dojo.html.getMarginBox(this.domNode);
-return {minX:x,minY:y,maxX:x+_862-mb.width,maxY:y+_863-mb.height};
-},updateDragOffset:function(){
-var _868=dojo.html.getScroll().offset;
-if(_868.y!=this.scrollOffset.y){
-var diff=_868.y-this.scrollOffset.y;
-this.dragOffset.y+=diff;
-this.scrollOffset.y=_868.y;
-}
-if(_868.x!=this.scrollOffset.x){
-var diff=_868.x-this.scrollOffset.x;
-this.dragOffset.x+=diff;
-this.scrollOffset.x=_868.x;
-}
-},onDragMove:function(e){
-this.updateDragOffset();
-var x=this.dragOffset.x+e.pageX;
-var y=this.dragOffset.y+e.pageY;
-if(this.constrainToContainer){
-if(x<this.constraints.minX){
-x=this.constraints.minX;
-}
-if(y<this.constraints.minY){
-y=this.constraints.minY;
-}
-if(x>this.constraints.maxX){
-x=this.constraints.maxX;
-}
-if(y>this.constraints.maxY){
-y=this.constraints.maxY;
-}
-}
-this.setAbsolutePosition(x,y);
-dojo.event.topic.publish("dragMove",{source:this});
-},setAbsolutePosition:function(x,y){
-if(!this.disableY){
-this.dragClone.style.top=y+"px";
-}
-if(!this.disableX){
-this.dragClone.style.left=x+"px";
-}
-},onDragEnd:function(e){
-switch(e.dragStatus){
-case "dropSuccess":
-dojo.html.removeNode(this.dragClone);
-this.dragClone=null;
-break;
-case "dropFailure":
-var _870=dojo.html.getAbsolutePosition(this.dragClone,true);
-var _871={left:this.dragStartPosition.x+1,top:this.dragStartPosition.y+1};
-var anim=dojo.lfx.slideTo(this.dragClone,_871,500,dojo.lfx.easeOut);
-var _873=this;
-dojo.event.connect(anim,"onEnd",function(e){
-dojo.lang.setTimeout(function(){
-dojo.html.removeNode(_873.dragClone);
-_873.dragClone=null;
-},200);
+
+dojo.declare("dojo.dnd.HtmlDragObject", dojo.dnd.DragObject, {
+  dragClass: "",
+  opacity: 0.5,
+  createIframe: true,   // workaround IE6 bug
+
+  // if true, node will not move in X and/or Y direction
+  disableX: false,
+  disableY: false,
+
+  createDragNode: function() {
+    var node = this.domNode.cloneNode(true);
+    if(this.dragClass) { dojo.html.addClass(node, this.dragClass); }
+    if(this.opacity < 1) { dojo.html.setOpacity(node, this.opacity); }
+    if(node.tagName.toLowerCase() == "tr"){
+      // dojo.debug("Dragging table row")
+      // Create a table for the cloned row
+      var doc = this.domNode.ownerDocument;
+      var table = doc.createElement("table");
+      var tbody = doc.createElement("tbody");
+      table.appendChild(tbody);
+      tbody.appendChild(node);
+
+      // Set a fixed width to the cloned TDs
+      var domTds = this.domNode.childNodes;
+      var cloneTds = node.childNodes;
+      for(var i = 0; i < domTds.length; i++){
+          if((cloneTds[i])&&(cloneTds[i].style)){
+            cloneTds[i].style.width = dojo.html.getContentBox(domTds[i]).width + "px";
+          }
+      }
+      node = table;
+    }
+
+    if((dojo.render.html.ie55||dojo.render.html.ie60) && this.createIframe){
+      with(node.style) {
+        top="0px";
+        left="0px";
+      }
+      var outer = document.createElement("div");
+      outer.appendChild(node);
+      this.bgIframe = new dojo.html.BackgroundIframe(outer);
+      outer.appendChild(this.bgIframe.iframe);
+      node = outer;
+    }
+    node.style.zIndex = 999;
+
+    return node;
+  },
+
+  onDragStart: function(e){
+    dojo.html.clearSelection();
+
+    this.scrollOffset = dojo.html.getScroll().offset;
+    this.dragStartPosition = dojo.html.getAbsolutePosition(this.domNode, true);
+
+    this.dragOffset = {y: this.dragStartPosition.y - e.pageY,
+      x: this.dragStartPosition.x - e.pageX};
+
+    this.dragClone = this.createDragNode();
+
+    this.containingBlockPosition = this.domNode.offsetParent ? 
+      dojo.html.getAbsolutePosition(this.domNode.offsetParent, true) : {x:0, y:0};
+
+    if (this.constrainToContainer) {
+      this.constraints = this.getConstraints();
+    }
+
+    // set up for dragging
+    with(this.dragClone.style){
+      position = "absolute";
+      top = this.dragOffset.y + e.pageY + "px";
+      left = this.dragOffset.x + e.pageX + "px";
+    }
+
+    dojo.body().appendChild(this.dragClone);
+
+    // shortly the browser will fire an onClick() event,
+    // but since this was really a drag, just squelch it
+    dojo.event.connect(this.domNode, "onclick", this, "squelchOnClick");
+
+    dojo.event.topic.publish('dragStart', { source: this } );
+  },
+
+  /** Return min/max x/y (relative to document.body) for this object) **/
+  getConstraints: function() {
+    if (this.constrainingContainer.nodeName.toLowerCase() == 'body') {
+      var viewport = dojo.html.getViewport();
+      var width = viewport.width;
+      var height = viewport.height;
+      var x = 0;
+      var y = 0;
+    } else {
+      var content = dojo.html.getContentBox(this.constrainingContainer);
+      width = content.width;
+      height = content.height;
+      x =
+        this.containingBlockPosition.x +
+        dojo.html.getPixelValue(this.constrainingContainer, "padding-left", true) +
+        dojo.html.getBorderExtent(this.constrainingContainer, "left");
+      y =
+        this.containingBlockPosition.y +
+        dojo.html.getPixelValue(this.constrainingContainer, "padding-top", true) +
+        dojo.html.getBorderExtent(this.constrainingContainer, "top");
+    }
+    
+    var mb = dojo.html.getMarginBox(this.domNode);
+    return {
+      minX: x,
+      minY: y,
+      maxX: x + width - mb.width,
+      maxY: y + height - mb.height
+    }
+  },
+
+  updateDragOffset: function() {
+    var scroll = dojo.html.getScroll().offset;
+    if(scroll.y != this.scrollOffset.y) {
+      var diff = scroll.y - this.scrollOffset.y;
+      this.dragOffset.y += diff;
+      this.scrollOffset.y = scroll.y;
+    }
+    if(scroll.x != this.scrollOffset.x) {
+      var diff = scroll.x - this.scrollOffset.x;
+      this.dragOffset.x += diff;
+      this.scrollOffset.x = scroll.x;
+    }
+  },
+
+  /** Moves the node to follow the mouse */
+  onDragMove: function(e){
+    this.updateDragOffset();
+    var x = this.dragOffset.x + e.pageX;
+    var y = this.dragOffset.y + e.pageY;
+
+    if (this.constrainToContainer) {
+      if (x < this.constraints.minX) { x = this.constraints.minX; }
+      if (y < this.constraints.minY) { y = this.constraints.minY; }
+      if (x > this.constraints.maxX) { x = this.constraints.maxX; }
+      if (y > this.constraints.maxY) { y = this.constraints.maxY; }
+    }
+
+    this.setAbsolutePosition(x, y);
+
+    dojo.event.topic.publish('dragMove', { source: this } );
+  },
+
+  /**
+   * Set the position of the drag clone.  (x,y) is relative to <body>.
+   */
+  setAbsolutePosition: function(x, y){
+    // The drag clone is attached to document.body so this is trivial
+    if(!this.disableY) { this.dragClone.style.top = y + "px"; }
+    if(!this.disableX) { this.dragClone.style.left = x + "px"; }
+  },
+
+
+  /**
+   * If the drag operation returned a success we reomve the clone of
+   * ourself from the original position. If the drag operation returned
+   * failure we slide back over to where we came from and end the operation
+   * with a little grace.
+   */
+  onDragEnd: function(e){
+    switch(e.dragStatus){
+
+      case "dropSuccess":
+        dojo.html.removeNode(this.dragClone);
+        this.dragClone = null;
+        break;
+
+      case "dropFailure": // slide back to the start
+        var startCoords = dojo.html.getAbsolutePosition(this.dragClone, true);
+        // offset the end so the effect can be seen
+        var endCoords = { left: this.dragStartPosition.x + 1,
+          top: this.dragStartPosition.y + 1};
+
+        // animate
+        var anim = dojo.lfx.slideTo(this.dragClone, endCoords, 500, dojo.lfx.easeOut);
+        var dragObject = this;
+        dojo.event.connect(anim, "onEnd", function (e) {
+          // pause for a second (not literally) and disappear
+          dojo.lang.setTimeout(function() {
+              dojo.html.removeNode(dragObject.dragClone);
+              // Allow drag clone to be gc'ed
+              dragObject.dragClone = null;
+            },
+            200);
+        });
+        anim.play();
+        break;
+    }
+
+    dojo.event.topic.publish('dragEnd', { source: this } );
+  },
+
+  squelchOnClick: function(e){
+    // squelch this onClick() event because it's the result of a drag (it's not a real click)
+    dojo.event.browser.stopEvent(e);
+
+    // disconnect after a short delay to prevent "Null argument to unrollAdvice()" warning
+    dojo.lang.setTimeout(function() {
+        dojo.event.disconnect(this.domNode, "onclick", this, "squelchOnClick");
+      },50);
+  },
+
+  constrainTo: function(container) {
+    this.constrainToContainer=true;
+    if (container) {
+      this.constrainingContainer = container;
+    } else {
+      this.constrainingContainer = this.domNode.parentNode;
+    }
+  }
+}, function(node, type){
+  this.domNode = dojo.byId(node);
+  this.type = type;
+  this.constrainToContainer = false;
+  this.dragSource = null;
 });
-anim.play();
-break;
-}
-dojo.event.topic.publish("dragEnd",{source:this});
-},squelchOnClick:function(e){
-dojo.event.browser.stopEvent(e);
-dojo.lang.setTimeout(function(){
-dojo.event.disconnect(this.domNode,"onclick",this,"squelchOnClick");
-},50);
-},constrainTo:function(_876){
-this.constrainToContainer=true;
-if(_876){
-this.constrainingContainer=_876;
-}else{
-this.constrainingContainer=this.domNode.parentNode;
-}
-}},function(node,type){
-this.domNode=dojo.byId(node);
-this.type=type;
-this.constrainToContainer=false;
-this.dragSource=null;
-});
-dojo.declare("dojo.dnd.HtmlDropTarget",dojo.dnd.DropTarget,{vertical:false,onDragOver:function(e){
-if(!this.accepts(e.dragObjects)){
-return false;
-}
-this.childBoxes=[];
-for(var i=0,_87b;i<this.domNode.childNodes.length;i++){
-_87b=this.domNode.childNodes[i];
-if(_87b.nodeType!=dojo.html.ELEMENT_NODE){
-continue;
-}
-var pos=dojo.html.getAbsolutePosition(_87b,true);
-var _87d=dojo.html.getBorderBox(_87b);
-this.childBoxes.push({top:pos.y,bottom:pos.y+_87d.height,left:pos.x,right:pos.x+_87d.width,height:_87d.height,width:_87d.width,node:_87b});
-}
-return true;
-},_getNodeUnderMouse:function(e){
-for(var i=0,_880;i<this.childBoxes.length;i++){
-with(this.childBoxes[i]){
-if(e.pageX>=left&&e.pageX<=right&&e.pageY>=top&&e.pageY<=bottom){
-return i;
-}
-}
-}
-return -1;
-},createDropIndicator:function(){
-this.dropIndicator=document.createElement("div");
-with(this.dropIndicator.style){
-position="absolute";
-zIndex=999;
-if(this.vertical){
-borderLeftWidth="1px";
-borderLeftColor="black";
-borderLeftStyle="solid";
-height=dojo.html.getBorderBox(this.domNode).height+"px";
-top=dojo.html.getAbsolutePosition(this.domNode,true).y+"px";
-}else{
-borderTopWidth="1px";
-borderTopColor="black";
-borderTopStyle="solid";
-width=dojo.html.getBorderBox(this.domNode).width+"px";
-left=dojo.html.getAbsolutePosition(this.domNode,true).x+"px";
-}
-}
-},onDragMove:function(e,_882){
-var i=this._getNodeUnderMouse(e);
-if(!this.dropIndicator){
-this.createDropIndicator();
-}
-var _884=this.vertical?dojo.html.gravity.WEST:dojo.html.gravity.NORTH;
-var hide=false;
-if(i<0){
-if(this.childBoxes.length){
-var _886=(dojo.html.gravity(this.childBoxes[0].node,e)&_884);
-if(_886){
-hide=true;
-}
-}else{
-var _886=true;
-}
-}else{
-var _887=this.childBoxes[i];
-var _886=(dojo.html.gravity(_887.node,e)&_884);
-if(_887.node===_882[0].dragSource.domNode){
-hide=true;
-}else{
-var _888=_886?(i>0?this.childBoxes[i-1]:_887):(i<this.childBoxes.length-1?this.childBoxes[i+1]:_887);
-if(_888.node===_882[0].dragSource.domNode){
-hide=true;
-}
-}
-}
-if(hide){
-this.dropIndicator.style.display="none";
-return;
-}else{
-this.dropIndicator.style.display="";
-}
-this.placeIndicator(e,_882,i,_886);
-if(!dojo.html.hasParent(this.dropIndicator)){
-dojo.body().appendChild(this.dropIndicator);
-}
-},placeIndicator:function(e,_88a,_88b,_88c){
-var _88d=this.vertical?"left":"top";
-var _88e;
-if(_88b<0){
-if(this.childBoxes.length){
-_88e=_88c?this.childBoxes[0]:this.childBoxes[this.childBoxes.length-1];
-}else{
-this.dropIndicator.style[_88d]=dojo.html.getAbsolutePosition(this.domNode,true)[this.vertical?"x":"y"]+"px";
-}
-}else{
-_88e=this.childBoxes[_88b];
-}
-if(_88e){
-this.dropIndicator.style[_88d]=(_88c?_88e[_88d]:_88e[this.vertical?"right":"bottom"])+"px";
-if(this.vertical){
-this.dropIndicator.style.height=_88e.height+"px";
-this.dropIndicator.style.top=_88e.top+"px";
-}else{
-this.dropIndicator.style.width=_88e.width+"px";
-this.dropIndicator.style.left=_88e.left+"px";
-}
-}
-},onDragOut:function(e){
-if(this.dropIndicator){
-dojo.html.removeNode(this.dropIndicator);
-delete this.dropIndicator;
-}
-},onDrop:function(e){
-this.onDragOut(e);
-var i=this._getNodeUnderMouse(e);
-var _892=this.vertical?dojo.html.gravity.WEST:dojo.html.gravity.NORTH;
-if(i<0){
-if(this.childBoxes.length){
-if(dojo.html.gravity(this.childBoxes[0].node,e)&_892){
-return this.insert(e,this.childBoxes[0].node,"before");
-}else{
-return this.insert(e,this.childBoxes[this.childBoxes.length-1].node,"after");
-}
-}
-return this.insert(e,this.domNode,"append");
-}
-var _893=this.childBoxes[i];
-if(dojo.html.gravity(_893.node,e)&_892){
-return this.insert(e,_893.node,"before");
-}else{
-return this.insert(e,_893.node,"after");
-}
-},insert:function(e,_895,_896){
-var node=e.dragObject.domNode;
-if(_896=="before"){
-return dojo.html.insertBefore(node,_895);
-}else{
-if(_896=="after"){
-return dojo.html.insertAfter(node,_895);
-}else{
-if(_896=="append"){
-_895.appendChild(node);
-return true;
-}
-}
-}
-return false;
-}},function(node,_899){
-if(arguments.length==0){
-return;
-}
-this.domNode=dojo.byId(node);
-dojo.dnd.DropTarget.call(this);
-if(_899&&dojo.lang.isString(_899)){
-_899=[_899];
-}
-this.acceptedTypes=_899||[];
+
+dojo.declare("dojo.dnd.HtmlDropTarget", dojo.dnd.DropTarget, {
+  vertical: false,
+  onDragOver: function(e){
+    if(!this.accepts(e.dragObjects)){ return false; }
+
+    // cache the positions of the child nodes
+    this.childBoxes = [];
+    for (var i = 0, child; i < this.domNode.childNodes.length; i++) {
+      child = this.domNode.childNodes[i];
+      if (child.nodeType != dojo.html.ELEMENT_NODE) { continue; }
+      var pos = dojo.html.getAbsolutePosition(child, true);
+      var inner = dojo.html.getBorderBox(child);
+      this.childBoxes.push({top: pos.y, bottom: pos.y+inner.height,
+        left: pos.x, right: pos.x+inner.width, height: inner.height, 
+        width: inner.width, node: child});
+    }
+
+    // TODO: use dummy node
+
+    return true;
+  },
+
+  _getNodeUnderMouse: function(e){
+    // find the child
+    for (var i = 0, child; i < this.childBoxes.length; i++) {
+      with (this.childBoxes[i]) {
+        if (e.pageX >= left && e.pageX <= right &&
+          e.pageY >= top && e.pageY <= bottom) { return i; }
+      }
+    }
+
+    return -1;
+  },
+
+  createDropIndicator: function() {
+    this.dropIndicator = document.createElement("div");
+    with (this.dropIndicator.style) {
+      position = "absolute";
+      zIndex = 999;
+      if(this.vertical){
+        borderLeftWidth = "1px";
+        borderLeftColor = "black";
+        borderLeftStyle = "solid";
+        height = dojo.html.getBorderBox(this.domNode).height + "px";
+        top = dojo.html.getAbsolutePosition(this.domNode, true).y + "px";
+      }else{
+        borderTopWidth = "1px";
+        borderTopColor = "black";
+        borderTopStyle = "solid";
+        width = dojo.html.getBorderBox(this.domNode).width + "px";
+        left = dojo.html.getAbsolutePosition(this.domNode, true).x + "px";
+      }
+    }
+  },
+
+  onDragMove: function(e, dragObjects){
+    var i = this._getNodeUnderMouse(e);
+
+    if(!this.dropIndicator){
+      this.createDropIndicator();
+    }
+
+    var gravity = this.vertical ? dojo.html.gravity.WEST : dojo.html.gravity.NORTH;
+    var hide = false;
+    if(i < 0) {
+      if(this.childBoxes.length) {
+        var before = (dojo.html.gravity(this.childBoxes[0].node, e) & gravity);
+        if(before){ hide = true; }
+      } else {
+        var before = true;
+      }
+    } else {
+      var child = this.childBoxes[i];
+      var before = (dojo.html.gravity(child.node, e) & gravity);
+      if(child.node === dragObjects[0].dragSource.domNode){
+        hide = true;
+      }else{
+        var currentPosChild = before ? 
+            (i>0?this.childBoxes[i-1]:child) : 
+            (i<this.childBoxes.length-1?this.childBoxes[i+1]:child);
+        if(currentPosChild.node === dragObjects[0].dragSource.domNode){
+          hide = true;
+        }
+      }
+    }
+
+    if(hide){
+      this.dropIndicator.style.display="none";
+      return;
+    }else{
+      this.dropIndicator.style.display="";
+    }
+
+    this.placeIndicator(e, dragObjects, i, before);
+
+    if(!dojo.html.hasParent(this.dropIndicator)) {
+      dojo.body().appendChild(this.dropIndicator);
+    }
+  },
+
+  /**
+   * Position the horizontal line that indicates "insert between these two items"
+   */
+  placeIndicator: function(e, dragObjects, boxIndex, before) {
+    var targetProperty = this.vertical ? "left" : "top";
+    var child;
+    if (boxIndex < 0) {
+      if (this.childBoxes.length) {
+        child = before ? this.childBoxes[0]
+          : this.childBoxes[this.childBoxes.length - 1];
+      } else {
+        this.dropIndicator.style[targetProperty] = dojo.html.getAbsolutePosition(this.domNode, true)[this.vertical?"x":"y"] + "px";
+      }
+    } else {
+      child = this.childBoxes[boxIndex];
+    }
+    if(child){
+      this.dropIndicator.style[targetProperty] = (before ? child[targetProperty] : child[this.vertical?"right":"bottom"]) + "px";
+      if(this.vertical){
+        this.dropIndicator.style.height = child.height + "px";
+        this.dropIndicator.style.top = child.top + "px";
+      }else{
+        this.dropIndicator.style.width = child.width + "px";
+        this.dropIndicator.style.left = child.left + "px";
+      }
+    }
+  },
+
+  onDragOut: function(e) {
+    if(this.dropIndicator) {
+      dojo.html.removeNode(this.dropIndicator);
+      delete this.dropIndicator;
+    }
+  },
+
+  /**
+   * Inserts the DragObject as a child of this node relative to the
+   * position of the mouse.
+   *
+   * @return true if the DragObject was inserted, false otherwise
+   */
+  onDrop: function(e){
+    this.onDragOut(e);
+
+    var i = this._getNodeUnderMouse(e);
+
+    var gravity = this.vertical ? dojo.html.gravity.WEST : dojo.html.gravity.NORTH;
+    if (i < 0) {
+      if (this.childBoxes.length) {
+        if (dojo.html.gravity(this.childBoxes[0].node, e) & gravity) {
+          return this.insert(e, this.childBoxes[0].node, "before");
+        } else {
+          return this.insert(e, this.childBoxes[this.childBoxes.length-1].node, "after");
+        }
+      }
+      return this.insert(e, this.domNode, "append");
+    }
+
+    var child = this.childBoxes[i];
+    if (dojo.html.gravity(child.node, e) & gravity) {
+      return this.insert(e, child.node, "before");
+    } else {
+      return this.insert(e, child.node, "after");
+    }
+  },
+
+  insert: function(e, refNode, position) {
+    var node = e.dragObject.domNode;
+
+    if(position == "before") {
+      return dojo.html.insertBefore(node, refNode);
+    } else if(position == "after") {
+      return dojo.html.insertAfter(node, refNode);
+    } else if(position == "append") {
+      refNode.appendChild(node);
+      return true;
+    }
+
+    return false;
+  }
+}, function(node, types){
+  if (arguments.length == 0) { return; }
+  this.domNode = dojo.byId(node);
+  dojo.dnd.DropTarget.call(this);
+  if(types && dojo.lang.isString(types)) {
+    types = [types];
+  }
+  this.acceptedTypes = types || [];
 });
+
 dojo.provide("dojo.dnd.*");
+
 dojo.provide("dojo.ns");
-dojo.ns={namespaces:{},failed:{},loading:{},loaded:{},register:function(name,_89b,_89c,_89d){
-if(!_89d||!this.namespaces[name]){
-this.namespaces[name]=new dojo.ns.Ns(name,_89b,_89c);
+
+dojo.ns = {
+  // summary: private object that implements widget namespace management
+  namespaces: {},
+  failed: {},
+  loading: {},
+  loaded: {},
+  register: function(/*String*/name, /*String*/module, /*Function?*/resolver, /*Boolean?*/noOverride){
+    // summary: creates and registers a dojo.ns.Ns object
+    if(!noOverride || !this.namespaces[name]){
+      this.namespaces[name] = new dojo.ns.Ns(name, module, resolver);
+    }
+  },
+  allow: function(/*String*/name){
+    // summary: Returns false if 'name' is filtered by configuration or has failed to load, true otherwise
+    if(this.failed[name]){return false;} // Boolean
+    if((djConfig.excludeNamespace)&&(dojo.lang.inArray(djConfig.excludeNamespace, name))){return false;} // Boolean
+    // If the namespace is "dojo", or the user has not specified allowed namespaces return true.
+    // Otherwise, if the user has specifically allowed this namespace, return true, otherwise false.
+    return((name==this.dojo)||(!djConfig.includeNamespace)||(dojo.lang.inArray(djConfig.includeNamespace, name))); // Boolean
+  },
+  get: function(/*String*/name){
+    // summary
+    //  Return Ns object registered to 'name', if any
+    return this.namespaces[name]; // Ns
+  },
+  require: function(/*String*/name){
+    // summary
+    //  Try to ensure that 'name' is registered, loading a namespace manifest if necessary
+    var ns = this.namespaces[name];
+    if((ns)&&(this.loaded[name])){return ns;} // Ns
+    if(!this.allow(name)){return false;} // Boolean
+    if(this.loading[name]){
+      // FIXME: do we really ever have re-entrancy situation? this would appear to be really bad
+      // original code did not throw an exception, although that seems the only course
+      // adding debug output here to track if this occurs.
+      dojo.debug('dojo.namespace.require: re-entrant request to load namespace "' + name + '" must fail.'); 
+      return false; // Boolean
+    }
+    // workaround so we don't break the build system
+    var req = dojo.require;
+    this.loading[name] = true;
+    try {
+      //dojo namespace file is always in the Dojo namespaces folder, not any custom folder
+      if(name=="dojo"){
+        req("dojo.namespaces.dojo");
+      }else{
+        // if no registered module prefix, use ../<name> by convention
+        if(!dojo.hostenv.moduleHasPrefix(name)){
+          dojo.registerModulePath(name, "../" + name);
+        }
+        req([name, 'manifest'].join('.'), false, true);
+      }
+      if(!this.namespaces[name]){
+        this.failed[name] = true; //only look for a namespace once
+      }
+    }finally{
+      this.loading[name]=false;
+    }
+    return this.namespaces[name]; // Ns
+  }
 }
-},allow:function(name){
-if(this.failed[name]){
-return false;
+
+dojo.ns.Ns = function(/*String*/name, /*String*/module, /*Function?*/resolver){
+  // summary: this object simply encapsulates namespace data
+  this.name = name;
+  this.module = module;
+  this.resolver = resolver;
+  this._loaded = [ ];
+  this._failed = [ ];
 }
-if((djConfig.excludeNamespace)&&(dojo.lang.inArray(djConfig.excludeNamespace,name))){
-return false;
+
+dojo.ns.Ns.prototype.resolve = function(/*String*/name, /*String*/domain, /*Boolean?*/omitModuleCheck){
+  //summary: map component with 'name' and 'domain' to a module via namespace resolver, if specified
+  if(!this.resolver || djConfig["skipAutoRequire"]){return false;} // Boolean
+  var fullName = this.resolver(name, domain);
+  //only load a widget once. This is a quicker check than dojo.require does
+  if((fullName)&&(!this._loaded[fullName])&&(!this._failed[fullName])){
+    //workaround so we don't break the build system
+    var req = dojo.require;
+    req(fullName, false, true); //omit the module check, we'll do it ourselves.
+    if(dojo.hostenv.findModule(fullName, false)){
+      this._loaded[fullName] = true;
+    }else{
+      if(!omitModuleCheck){dojo.raise("dojo.ns.Ns.resolve: module '" + fullName + "' not found after loading via namespace '" + this.name + "'");} 
+      this._failed[fullName] = true;
+    }
+  }
+  return Boolean(this._loaded[fullName]); // Boolean
 }
-return ((name==this.dojo)||(!djConfig.includeNamespace)||(dojo.lang.inArray(djConfig.includeNamespace,name)));
-},get:function(name){
-return this.namespaces[name];
-},require:function(name){
-var ns=this.namespaces[name];
-if((ns)&&(this.loaded[name])){
-return ns;
+
+dojo.registerNamespace = function(/*String*/name, /*String*/module, /*Function?*/resolver){
+  // summary: maps a module name to a namespace for widgets, and optionally maps widget names to modules for auto-loading
+  // description: An unregistered namespace is mapped to an eponymous module.
+  //  For example, namespace acme is mapped to module acme, and widgets are
+  //  assumed to belong to acme.widget. If you want to use a different widget
+  //  module, use dojo.registerNamespace.
+  dojo.ns.register.apply(dojo.ns, arguments);
 }
-if(!this.allow(name)){
-return false;
+
+dojo.registerNamespaceResolver = function(/*String*/name, /*Function*/resolver){
+  // summary: a resolver function maps widget names to modules, so the
+  //  widget manager can auto-load needed widget implementations
+  //
+  // description: The resolver provides information to allow Dojo
+  //  to load widget modules on demand. When a widget is created,
+  //  a namespace resolver can tell Dojo what module to require
+  //  to ensure that the widget implementation code is loaded.
+  //
+  // name: will always be lower-case.
+  //
+  // example:
+  //  dojo.registerNamespaceResolver("acme",
+  //    function(name){ 
+  //      return "acme.widget."+dojo.string.capitalize(name);
+  //    }
+  //  );
+  var n = dojo.ns.namespaces[name];
+  if(n){
+    n.resolver = resolver;
+  }
 }
-if(this.loading[name]){
-dojo.debug("dojo.namespace.require: re-entrant request to load namespace \""+name+"\" must fail.");
-return false;
+
+dojo.registerNamespaceManifest = function(/*String*/module, /*String*/path, /*String*/name, /*String*/widgetModule, /*Function?*/resolver){
+  // summary: convenience function to register a module path, a namespace, and optionally a resolver all at once.
+  dojo.registerModulePath(name, path);
+  dojo.registerNamespace(name, widgetModule, resolver);
 }
-var req=dojo.require;
-this.loading[name]=true;
-try{
-if(name=="dojo"){
-req("dojo.namespaces.dojo");
-}else{
-if(!dojo.hostenv.moduleHasPrefix(name)){
-dojo.registerModulePath(name,"../"+name);
-}
-req([name,"manifest"].join("."),false,true);
-}
-if(!this.namespaces[name]){
-this.failed[name]=true;
-}
-}
-finally{
-this.loading[name]=false;
-}
-return this.namespaces[name];
-}};
-dojo.ns.Ns=function(name,_8a4,_8a5){
-this.name=name;
-this.module=_8a4;
-this.resolver=_8a5;
-this._loaded=[];
-this._failed=[];
-};
-dojo.ns.Ns.prototype.resolve=function(name,_8a7,_8a8){
-if(!this.resolver||djConfig["skipAutoRequire"]){
-return false;
-}
-var _8a9=this.resolver(name,_8a7);
-if((_8a9)&&(!this._loaded[_8a9])&&(!this._failed[_8a9])){
-var req=dojo.require;
-req(_8a9,false,true);
-if(dojo.hostenv.findModule(_8a9,false)){
-this._loaded[_8a9]=true;
-}else{
-if(!_8a8){
-dojo.raise("dojo.ns.Ns.resolve: module '"+_8a9+"' not found after loading via namespace '"+this.name+"'");
-}
-this._failed[_8a9]=true;
-}
-}
-return Boolean(this._loaded[_8a9]);
-};
-dojo.registerNamespace=function(name,_8ac,_8ad){
-dojo.ns.register.apply(dojo.ns,arguments);
-};
-dojo.registerNamespaceResolver=function(name,_8af){
-var n=dojo.ns.namespaces[name];
-if(n){
-n.resolver=_8af;
-}
-};
-dojo.registerNamespaceManifest=function(_8b1,path,name,_8b4,_8b5){
-dojo.registerModulePath(name,path);
-dojo.registerNamespace(name,_8b4,_8b5);
-};
-dojo.registerNamespace("dojo","dojo.widget");
+
+// NOTE: rather put this in dojo.widget.Widget, but that fubars debugAtAllCosts
+dojo.registerNamespace("dojo", "dojo.widget");
+
 dojo.provide("dojo.widget.Manager");
-dojo.widget.manager=new function(){
-this.widgets=[];
-this.widgetIds=[];
-this.topWidgets={};
-var _8b6={};
-var _8b7=[];
-this.getUniqueId=function(_8b8){
-var _8b9;
-do{
-_8b9=_8b8+"_"+(_8b6[_8b8]!=undefined?++_8b6[_8b8]:_8b6[_8b8]=0);
-}while(this.getWidgetById(_8b9));
-return _8b9;
-};
-this.add=function(_8ba){
-this.widgets.push(_8ba);
-if(!_8ba.extraArgs["id"]){
-_8ba.extraArgs["id"]=_8ba.extraArgs["ID"];
-}
-if(_8ba.widgetId==""){
-if(_8ba["id"]){
-_8ba.widgetId=_8ba["id"];
-}else{
-if(_8ba.extraArgs["id"]){
-_8ba.widgetId=_8ba.extraArgs["id"];
-}else{
-_8ba.widgetId=this.getUniqueId(_8ba.widgetType);
-}
-}
-}
-if(this.widgetIds[_8ba.widgetId]){
-dojo.debug("widget ID collision on ID: "+_8ba.widgetId);
-}
-this.widgetIds[_8ba.widgetId]=_8ba;
-};
-this.destroyAll=function(){
-for(var x=this.widgets.length-1;x>=0;x--){
-try{
-this.widgets[x].destroy(true);
-delete this.widgets[x];
-}
-catch(e){
-}
-}
-};
-this.remove=function(_8bc){
-if(dojo.lang.isNumber(_8bc)){
-var tw=this.widgets[_8bc].widgetId;
-delete this.widgetIds[tw];
-this.widgets.splice(_8bc,1);
-}else{
-this.removeById(_8bc);
-}
-};
-this.removeById=function(id){
-if(!dojo.lang.isString(id)){
-id=id["widgetId"];
-if(!id){
-dojo.debug("invalid widget or id passed to removeById");
-return;
-}
-}
-for(var i=0;i<this.widgets.length;i++){
-if(this.widgets[i].widgetId==id){
-this.remove(i);
-break;
-}
-}
-};
-this.getWidgetById=function(id){
-if(dojo.lang.isString(id)){
-return this.widgetIds[id];
-}
-return id;
-};
-this.getWidgetsByType=function(type){
-var lt=type.toLowerCase();
-var _8c3=(type.indexOf(":")<0?function(x){
-return x.widgetType.toLowerCase();
-}:function(x){
-return x.getNamespacedType();
-});
-var ret=[];
-dojo.lang.forEach(this.widgets,function(x){
-if(_8c3(x)==lt){
-ret.push(x);
-}
-});
-return ret;
-};
-this.getWidgetsByFilter=function(_8c8,_8c9){
-var ret=[];
-dojo.lang.every(this.widgets,function(x){
-if(_8c8(x)){
-ret.push(x);
-if(_8c9){
-return false;
-}
-}
-return true;
-});
-return (_8c9?ret[0]:ret);
-};
-this.getAllWidgets=function(){
-return this.widgets.concat();
-};
-this.getWidgetByNode=function(node){
-var w=this.getAllWidgets();
-node=dojo.byId(node);
-for(var i=0;i<w.length;i++){
-if(w[i].domNode==node){
-return w[i];
-}
-}
-return null;
-};
-this.byId=this.getWidgetById;
-this.byType=this.getWidgetsByType;
-this.byFilter=this.getWidgetsByFilter;
-this.byNode=this.getWidgetByNode;
-var _8cf={};
-var _8d0=["dojo.widget"];
-for(var i=0;i<_8d0.length;i++){
-_8d0[_8d0[i]]=true;
-}
-this.registerWidgetPackage=function(_8d2){
-if(!_8d0[_8d2]){
-_8d0[_8d2]=true;
-_8d0.push(_8d2);
-}
-};
-this.getWidgetPackageList=function(){
-return dojo.lang.map(_8d0,function(elt){
-return (elt!==true?elt:undefined);
-});
-};
-this.getImplementation=function(_8d4,_8d5,_8d6,ns){
-var impl=this.getImplementationName(_8d4,ns);
-if(impl){
-var ret=_8d5?new impl(_8d5):new impl();
-return ret;
-}
-};
-function buildPrefixCache(){
-for(var _8da in dojo.render){
-if(dojo.render[_8da]["capable"]===true){
-var _8db=dojo.render[_8da].prefixes;
-for(var i=0;i<_8db.length;i++){
-_8b7.push(_8db[i].toLowerCase());
-}
-}
-}
-}
-var _8dd=function(_8de,_8df){
-if(!_8df){
-return null;
-}
-for(var i=0,l=_8b7.length,_8e2;i<=l;i++){
-_8e2=(i<l?_8df[_8b7[i]]:_8df);
-if(!_8e2){
-continue;
-}
-for(var name in _8e2){
-if(name.toLowerCase()==_8de){
-return _8e2[name];
-}
-}
-}
-return null;
-};
-var _8e4=function(_8e5,_8e6){
-var _8e7=dojo.evalObjPath(_8e6,false);
-return (_8e7?_8dd(_8e5,_8e7):null);
-};
-this.getImplementationName=function(_8e8,ns){
-var _8ea=_8e8.toLowerCase();
-ns=ns||"dojo";
-var imps=_8cf[ns]||(_8cf[ns]={});
-var impl=imps[_8ea];
-if(impl){
-return impl;
-}
-if(!_8b7.length){
-buildPrefixCache();
-}
-var _8ed=dojo.ns.get(ns);
-if(!_8ed){
-dojo.ns.register(ns,ns+".widget");
-_8ed=dojo.ns.get(ns);
-}
-if(_8ed){
-_8ed.resolve(_8e8);
-}
-impl=_8e4(_8ea,_8ed.module);
-if(impl){
-return (imps[_8ea]=impl);
-}
-_8ed=dojo.ns.require(ns);
-if((_8ed)&&(_8ed.resolver)){
-_8ed.resolve(_8e8);
-impl=_8e4(_8ea,_8ed.module);
-if(impl){
-return (imps[_8ea]=impl);
-}
-}
-dojo.deprecated("dojo.widget.Manager.getImplementationName","Could not locate widget implementation for \""+_8e8+"\" in \""+_8ed.module+"\" registered to namespace \""+_8ed.name+"\". "+"Developers must specify correct namespaces for all non-Dojo widgets","0.5");
-for(var i=0;i<_8d0.length;i++){
-impl=_8e4(_8ea,_8d0[i]);
-if(impl){
-return (imps[_8ea]=impl);
-}
-}
-throw new Error("Could not locate widget implementation for \""+_8e8+"\" in \""+_8ed.module+"\" registered to namespace \""+_8ed.name+"\"");
-};
-this.resizing=false;
-this.onWindowResized=function(){
-if(this.resizing){
-return;
-}
-try{
-this.resizing=true;
-for(var id in this.topWidgets){
-var _8f0=this.topWidgets[id];
-if(_8f0.checkSize){
-_8f0.checkSize();
-}
-}
-}
-catch(e){
-}
-finally{
-this.resizing=false;
-}
-};
-if(typeof window!="undefined"){
-dojo.addOnLoad(this,"onWindowResized");
-dojo.event.connect(window,"onresize",this,"onWindowResized");
-}
+
+// Manager class
+dojo.widget.manager = new function(){
+  this.widgets = [];
+  this.widgetIds = [];
+  
+  // map of widgetId-->widget for widgets without parents (top level widgets)
+  this.topWidgets = {};
+
+  var widgetTypeCtr = {};
+  var renderPrefixCache = [];
+
+  this.getUniqueId = function (widgetType) {
+    var widgetId;
+    do{
+      widgetId = widgetType + "_" + (widgetTypeCtr[widgetType] != undefined ?
+      ++widgetTypeCtr[widgetType] : widgetTypeCtr[widgetType] = 0);
+    }while(this.getWidgetById(widgetId));
+    return widgetId;
+  }
+
+  this.add = function(widget){
+    //dojo.profile.start("dojo.widget.manager.add");
+    this.widgets.push(widget);
+    // Opera9 uses ID (caps)
+    if(!widget.extraArgs["id"]){
+      widget.extraArgs["id"] = widget.extraArgs["ID"];
+    }
+    // FIXME: the rest of this method is very slow!
+    if(widget.widgetId == ""){
+      if(widget["id"]){
+        widget.widgetId = widget["id"];
+      }else if(widget.extraArgs["id"]){
+        widget.widgetId = widget.extraArgs["id"];
+      }else{
+        widget.widgetId = this.getUniqueId(widget.widgetType);
+      }
+    }
+    if(this.widgetIds[widget.widgetId]){
+      dojo.debug("widget ID collision on ID: "+widget.widgetId);
+    }
+    this.widgetIds[widget.widgetId] = widget;
+    // Widget.destroy already calls removeById(), so we don't need to
+    // connect() it here
+    //dojo.profile.end("dojo.widget.manager.add");
+  }
+
+  this.destroyAll = function(){
+    for(var x=this.widgets.length-1; x>=0; x--){
+      try{
+        // this.widgets[x].destroyChildren();
+        this.widgets[x].destroy(true);
+        delete this.widgets[x];
+      }catch(e){ }
+    }
+  }
+
+  // FIXME: we should never allow removal of the root widget until all others
+  // are removed!
+  this.remove = function(widgetIndex){
+    if(dojo.lang.isNumber(widgetIndex)){
+      var tw = this.widgets[widgetIndex].widgetId;
+      delete this.widgetIds[tw];
+      this.widgets.splice(widgetIndex, 1);
+    }else{
+      this.removeById(widgetIndex);
+    }
+  }
+  
+  // FIXME: suboptimal performance
+  this.removeById = function(id) {
+    if(!dojo.lang.isString(id)){
+      id = id["widgetId"];
+      if(!id){ dojo.debug("invalid widget or id passed to removeById"); return; }
+    }
+    for (var i=0; i<this.widgets.length; i++){
+      if(this.widgets[i].widgetId == id){
+        this.remove(i);
+        break;
+      }
+    }
+  }
+
+  this.getWidgetById = function(id){
+    if(dojo.lang.isString(id)){
+      return this.widgetIds[id];
+    }
+    return id;
+  }
+
+  this.getWidgetsByType = function(type){
+    var lt = type.toLowerCase();
+    var getType = (type.indexOf(":") < 0 ? 
+      function(x) { return x.widgetType.toLowerCase(); } :
+      function(x) { return x.getNamespacedType(); }
+    );
+    var ret = [];
+    dojo.lang.forEach(this.widgets, function(x){
+      if(getType(x) == lt){ret.push(x);}
+    });
+    return ret;
+  }
+
+  this.getWidgetsByFilter = function(unaryFunc, onlyOne){
+    var ret = [];
+    dojo.lang.every(this.widgets, function(x){
+      if(unaryFunc(x)){
+        ret.push(x);
+        if(onlyOne){return false;}
+      }
+      return true;
+    });
+    return (onlyOne ? ret[0] : ret);
+  }
+
+  this.getAllWidgets = function() {
+    return this.widgets.concat();
+  }
+
+  //  added, trt 2006-01-20
+  this.getWidgetByNode = function(/* DOMNode */ node){
+    var w=this.getAllWidgets();
+    node = dojo.byId(node);
+    for(var i=0; i<w.length; i++){
+      if(w[i].domNode==node){
+        return w[i];
+      }
+    }
+    return null;
+  }
+
+  // shortcuts, baby
+  this.byId = this.getWidgetById;
+  this.byType = this.getWidgetsByType;
+  this.byFilter = this.getWidgetsByFilter;
+  this.byNode = this.getWidgetByNode;
+
+  // map of previousally discovered implementation names to constructors
+  var knownWidgetImplementations = {};
+
+  // support manually registered widget packages
+  var widgetPackages = ["dojo.widget"];
+  for (var i=0; i<widgetPackages.length; i++) {
+    // convenience for checking if a package exists (reverse lookup)
+    widgetPackages[widgetPackages[i]] = true;
+  }
+
+  this.registerWidgetPackage = function(pname) {
+    if(!widgetPackages[pname]){
+      widgetPackages[pname] = true;
+      widgetPackages.push(pname);
+    }
+  }
+  
+  this.getWidgetPackageList = function() {
+    return dojo.lang.map(widgetPackages, function(elt) { return(elt!==true ? elt : undefined); });
+  }
+  
+  this.getImplementation = function(widgetName, ctorObject, mixins, ns){
+    // try and find a name for the widget
+    var impl = this.getImplementationName(widgetName, ns);
+    if(impl){ 
+      // var tic = new Date();
+      var ret = ctorObject ? new impl(ctorObject) : new impl();
+      // dojo.debug(new Date() - tic);
+      return ret;
+    }
+  }
+
+  function buildPrefixCache() {
+    for(var renderer in dojo.render){
+      if(dojo.render[renderer]["capable"] === true){
+        var prefixes = dojo.render[renderer].prefixes;
+        for(var i=0; i<prefixes.length; i++){
+          renderPrefixCache.push(prefixes[i].toLowerCase());
+        }
+      }
+    }
+    // make sure we don't HAVE to prefix widget implementation names
+    // with anything to get them to render
+    //renderPrefixCache.push("");
+    // empty prefix is included automatically
+  }
+  
+  var findImplementationInModule = function(lowerCaseWidgetName, module){
+    if(!module){return null;}
+    for(var i=0, l=renderPrefixCache.length, widgetModule; i<=l; i++){
+      widgetModule = (i<l ? module[renderPrefixCache[i]] : module);
+      if(!widgetModule){continue;}
+      for(var name in widgetModule){
+        if(name.toLowerCase() == lowerCaseWidgetName){
+          return widgetModule[name];
+        }
+      }
+    }
+    return null;
+  }
+
+  var findImplementation = function(lowerCaseWidgetName, moduleName){
+    // locate registered widget module
+    var module = dojo.evalObjPath(moduleName, false);
+    // locate a widget implementation in the registered module for our current rendering environment
+    return (module ? findImplementationInModule(lowerCaseWidgetName, module) : null);
+  }
+
+  this.getImplementationName = function(widgetName, ns){
+    /*
+     * Locate an implementation (constructor) for 'widgetName' in namespace 'ns' 
+     * widgetNames are case INSENSITIVE
+     * 
+     * 1. Return value from implementation cache, if available, for quick turnaround.
+     * 2. Locate a namespace registration for 'ns'
+     * 3. If no namespace found, register the conventional one (ns.widget)
+     * 4. Allow the namespace resolver (if any) to load a module for this widget.
+     * 5. Permute the widget name and capable rendering prefixes to locate, cache, and return 
+     *    an appropriate widget implementation.
+     * 6. If no implementation is found, attempt to load the namespace manifest,
+     *    and then look again for an implementation to cache and return.
+     * 7. Use the deprecated widgetPackages registration system to attempt to locate the widget
+     * 8. Fail
+     */
+    var lowerCaseWidgetName = widgetName.toLowerCase();
+
+    // default to dojo namespace
+    ns=ns||"dojo";
+    // use cache if available
+    var imps = knownWidgetImplementations[ns] || (knownWidgetImplementations[ns]={});
+    //if(!knownWidgetImplementations[ns]){knownWidgetImplementations[ns]={};}
+    var impl = imps[lowerCaseWidgetName];
+    if(impl){
+      return impl;
+    }
+    
+    // (one time) store a list of the render prefixes we are capable of rendering
+    if(!renderPrefixCache.length){
+      buildPrefixCache();
+    }
+
+    // lookup namespace
+    var nsObj = dojo.ns.get(ns);
+    if(!nsObj){
+      // default to <ns>.widget by convention
+      dojo.ns.register(ns, ns + '.widget');
+      nsObj = dojo.ns.get(ns);
+    }
+    
+    // allow the namespace to resolve the widget module
+    if(nsObj){nsObj.resolve(widgetName);}
+
+    // locate a widget implementation in the registered module for our current rendering environment
+    impl = findImplementation(lowerCaseWidgetName, nsObj.module);
+    if(impl){return(imps[lowerCaseWidgetName] = impl)};
+
+    // try to load a manifest to resolve this implemenation
+    nsObj = dojo.ns.require(ns);
+    if((nsObj)&&(nsObj.resolver)){
+      nsObj.resolve(widgetName);
+      impl = findImplementation(lowerCaseWidgetName, nsObj.module);
+      if(impl){return(imps[lowerCaseWidgetName] = impl)};
+    }
+  
+    // this is an error condition under new rules
+    dojo.deprecated('dojo.widget.Manager.getImplementationName', 
+      'Could not locate widget implementation for "' + widgetName + '" in "' + nsObj.module + '" registered to namespace "' + nsObj.name + '". '                    
+      + "Developers must specify correct namespaces for all non-Dojo widgets", "0.5");
+
+    // backward compat: if the user has not specified any namespace and their widget is not in dojo.widget.*
+    // search registered widget packages [sic]
+    // note: registerWidgetPackage itself is now deprecated 
+    for(var i=0; i<widgetPackages.length; i++){
+      impl = findImplementation(lowerCaseWidgetName, widgetPackages[i]);
+      if(impl){return(imps[lowerCaseWidgetName] = impl)};
+    }
+    
+    throw new Error('Could not locate widget implementation for "' + widgetName + '" in "' + nsObj.module + '" registered to namespace "' + nsObj.name + '"');
+  }
+
+  // FIXME: does it even belong in this module?
+  // NOTE: this method is implemented by DomWidget.js since not all
+  // hostenv's would have an implementation.
+  /*this.getWidgetFromPrimitive = function(baseRenderType){
+    dojo.unimplemented("dojo.widget.manager.getWidgetFromPrimitive");
+  }
+
+  this.getWidgetFromEvent = function(nativeEvt){
+    dojo.unimplemented("dojo.widget.manager.getWidgetFromEvent");
+  }*/
+
+  // Catch window resize events and notify top level widgets
+  this.resizing=false;
+  this.onWindowResized = function(){
+    if(this.resizing){
+      return; // duplicate event
+    }
+    try{
+      this.resizing=true;
+      for(var id in this.topWidgets){
+        var child = this.topWidgets[id];
+        if(child.checkSize ){
+          child.checkSize();
+        }
+      }
+    }catch(e){
+    }finally{
+      this.resizing=false;
+    }
+  }
+  if(typeof window != "undefined") {
+    dojo.addOnLoad(this, 'onWindowResized');              // initial sizing
+    dojo.event.connect(window, 'onresize', this, 'onWindowResized');  // window resize
+  }
+
+  // FIXME: what else?
 };
+
 (function(){
-var dw=dojo.widget;
-var dwm=dw.manager;
-var h=dojo.lang.curry(dojo.lang,"hitch",dwm);
-var g=function(_8f5,_8f6){
-dw[(_8f6||_8f5)]=h(_8f5);
-};
-g("add","addWidget");
-g("destroyAll","destroyAllWidgets");
-g("remove","removeWidget");
-g("removeById","removeWidgetById");
-g("getWidgetById");
-g("getWidgetById","byId");
-g("getWidgetsByType");
-g("getWidgetsByFilter");
-g("getWidgetsByType","byType");
-g("getWidgetsByFilter","byFilter");
-g("getWidgetByNode","byNode");
-dw.all=function(n){
-var _8f8=dwm.getAllWidgets.apply(dwm,arguments);
-if(arguments.length>0){
-return _8f8[n];
-}
-return _8f8;
-};
-g("registerWidgetPackage");
-g("getImplementation","getWidgetImplementation");
-g("getImplementationName","getWidgetImplementationName");
-dw.widgets=dwm.widgets;
-dw.widgetIds=dwm.widgetIds;
-dw.root=dwm.root;
+  var dw = dojo.widget;
+  var dwm = dw.manager;
+  var h = dojo.lang.curry(dojo.lang, "hitch", dwm);
+  var g = function(oldName, newName){
+    dw[(newName||oldName)] = h(oldName);
+  }
+  // copy the methods from the default manager (this) to the widget namespace
+  g("add", "addWidget");
+  g("destroyAll", "destroyAllWidgets");
+  g("remove", "removeWidget");
+  g("removeById", "removeWidgetById");
+  g("getWidgetById");
+  g("getWidgetById", "byId");
+  g("getWidgetsByType");
+  g("getWidgetsByFilter");
+  g("getWidgetsByType", "byType");
+  g("getWidgetsByFilter", "byFilter");
+  g("getWidgetByNode", "byNode");
+  dw.all = function(n){
+    var widgets = dwm.getAllWidgets.apply(dwm, arguments);
+    if(arguments.length > 0) {
+      return widgets[n];
+    }
+    return widgets;
+  }
+  g("registerWidgetPackage");
+  g("getImplementation", "getWidgetImplementation");
+  g("getImplementationName", "getWidgetImplementationName");
+
+  dw.widgets = dwm.widgets;
+  dw.widgetIds = dwm.widgetIds;
+  dw.root = dwm.root;
 })();
+
 dojo.provide("dojo.a11y");
-dojo.a11y={imgPath:dojo.uri.dojoUri("src/widget/templates/images"),doAccessibleCheck:true,accessible:null,checkAccessible:function(){
-if(this.accessible===null){
-this.accessible=false;
-if(this.doAccessibleCheck==true){
-this.accessible=this.testAccessible();
-}
-}
-return this.accessible;
-},testAccessible:function(){
-this.accessible=false;
-if(dojo.render.html.ie||dojo.render.html.mozilla){
-var div=document.createElement("div");
-div.style.backgroundImage="url(\""+this.imgPath+"/tab_close.gif\")";
-dojo.body().appendChild(div);
-var _8fa=null;
-if(window.getComputedStyle){
-var _8fb=getComputedStyle(div,"");
-_8fa=_8fb.getPropertyValue("background-image");
-}else{
-_8fa=div.currentStyle.backgroundImage;
-}
-var _8fc=false;
-if(_8fa!=null&&(_8fa=="none"||_8fa=="url(invalid-url:)")){
-this.accessible=true;
-}
-dojo.body().removeChild(div);
-}
-return this.accessible;
-},setCheckAccessible:function(_8fd){
-this.doAccessibleCheck=_8fd;
-},setAccessibleMode:function(){
-if(this.accessible===null){
-if(this.checkAccessible()){
-dojo.render.html.prefixes.unshift("a11y");
-}
-}
-return this.accessible;
-}};
+
+
+dojo.a11y = {
+  // imgPath: String path to the test image for determining if images are displayed or not
+  // doAccessibleCheck: Boolean if true will perform check for need to create accessible widgets
+  // accessible: Boolean uninitialized when null (accessible check has not been performed)
+  //   if true generate accessible widgets
+  imgPath:dojo.uri.dojoUri("src/widget/templates/images"),
+  doAccessibleCheck: true,
+  accessible: null,   
+
+  checkAccessible: function(){ 
+  // summary: 
+  //    perform check for accessibility if accessibility checking is turned
+  //    on and the accessibility test has not been performed yet
+    if(this.accessible === null){ 
+      this.accessible = false; //default
+      if(this.doAccessibleCheck == true){ 
+        this.accessible = this.testAccessible();
+      }
+    }
+    return this.accessible; /* Boolean */
+  },
+  
+  testAccessible: function(){
+  // summary: 
+  //    Always perform the accessibility check to determine if high 
+  //    contrast mode is on or display of images are turned off. Currently only checks 
+  //    in IE and Mozilla. 
+    this.accessible = false; //default
+    if (dojo.render.html.ie || dojo.render.html.mozilla){
+      var div = document.createElement("div");
+      //div.style.color="rgb(153,204,204)";
+      div.style.backgroundImage = "url(\"" + this.imgPath + "/tab_close.gif\")";
+      // must add to hierarchy before can view currentStyle below
+      dojo.body().appendChild(div);
+      // in FF and IE the value for the current background style of the added div
+      // will be "none" in high contrast mode
+      // in FF the return value will be url(invalid-url:) when running over http 
+      var bkImg = null;
+      if (window.getComputedStyle  ) {
+        var cStyle = getComputedStyle(div, ""); 
+        bkImg = cStyle.getPropertyValue("background-image");
+      }else{
+        bkImg = div.currentStyle.backgroundImage;
+      }
+      var bUseImgElem = false;
+      if (bkImg != null && (bkImg == "none" || bkImg == "url(invalid-url:)" )) {
+        this.accessible = true;
+      }
+      /*
+      if(this.accessible == false && document.images){
+        // test if images are off in IE
+        var testImg = new Image();
+        if(testImg.fileSize) {
+          testImg.src = this.imgPath + "/tab_close.gif";
+          if(testImg.fileSize < 0){ 
+            this.accessible = true;
+          }
+        } 
+      }*/
+      dojo.body().removeChild(div);
+    }
+    return this.accessible; /* Boolean */
+  },
+  
+  setCheckAccessible: function(/* Boolean */ bTest){ 
+  // summary: 
+  //    Set whether or not to check for accessibility mode.  Default value
+  //    of module is true - perform check for accessibility modes. 
+  //    bTest: Boolean - true to check; false to turn off checking
+    this.doAccessibleCheck = bTest;
+  },
+
+  setAccessibleMode: function(){
+  // summary:
+  //    perform the accessibility check and sets the correct mode to load 
+  //    a11y widgets. Only runs if test for accessiiblity has not been performed yet. 
+  //    Call testAccessible() to force the test.
+    if (this.accessible === null){
+      if (this.checkAccessible()){
+        dojo.render.html.prefixes.unshift("a11y");
+      }
+    }
+    return this.accessible; /* Boolean */
+  }
+};
+
+//dojo.hostenv.modulesLoadedListeners.unshift(function() { dojo.a11y.setAccessibleMode(); });
+//dojo.event.connect("before", dojo.hostenv, "makeWidgets", dojo.a11y, "setAccessibleMode");
+
 dojo.provide("dojo.widget.Widget");
-dojo.declare("dojo.widget.Widget",null,function(){
-this.children=[];
-this.extraArgs={};
-},{parent:null,children:[],extraArgs:{},isTopLevel:false,isModal:false,isEnabled:true,isHidden:false,isContainer:false,widgetId:"",widgetType:"Widget",ns:"dojo",getNamespacedType:function(){
-return (this.ns?this.ns+":"+this.widgetType:this.widgetType).toLowerCase();
-},toString:function(){
-return "[Widget "+this.getNamespacedType()+", "+(this.widgetId||"NO ID")+"]";
-},repr:function(){
-return this.toString();
-},enable:function(){
-this.isEnabled=true;
-},disable:function(){
-this.isEnabled=false;
-},hide:function(){
-this.isHidden=true;
-},show:function(){
-this.isHidden=false;
-},onResized:function(){
-this.notifyChildrenOfResize();
-},notifyChildrenOfResize:function(){
-for(var i=0;i<this.children.length;i++){
-var _8ff=this.children[i];
-if(_8ff.onResized){
-_8ff.onResized();
-}
-}
-},create:function(args,_901,_902,ns){
-if(ns){
-this.ns=ns;
-}
-this.satisfyPropertySets(args,_901,_902);
-this.mixInProperties(args,_901,_902);
-this.postMixInProperties(args,_901,_902);
-dojo.widget.manager.add(this);
-this.buildRendering(args,_901,_902);
-this.initialize(args,_901,_902);
-this.postInitialize(args,_901,_902);
-this.postCreate(args,_901,_902);
-return this;
-},destroy:function(_904){
-this.destroyChildren();
-this.uninitialize();
-this.destroyRendering(_904);
-dojo.widget.manager.removeById(this.widgetId);
-},destroyChildren:function(){
-var _905;
-var i=0;
-while(this.children.length>i){
-_905=this.children[i];
-if(_905 instanceof dojo.widget.Widget){
-this.removeChild(_905);
-_905.destroy();
-continue;
-}
-i++;
-}
-},getChildrenOfType:function(type,_908){
-var ret=[];
-var _90a=dojo.lang.isFunction(type);
-if(!_90a){
-type=type.toLowerCase();
-}
-for(var x=0;x<this.children.length;x++){
-if(_90a){
-if(this.children[x] instanceof type){
-ret.push(this.children[x]);
-}
-}else{
-if(this.children[x].widgetType.toLowerCase()==type){
-ret.push(this.children[x]);
-}
-}
-if(_908){
-ret=ret.concat(this.children[x].getChildrenOfType(type,_908));
-}
-}
-return ret;
-},getDescendants:function(){
-var _90c=[];
-var _90d=[this];
-var elem;
-while((elem=_90d.pop())){
-_90c.push(elem);
-if(elem.children){
-dojo.lang.forEach(elem.children,function(elem){
-_90d.push(elem);
+
+
+dojo.declare("dojo.widget.Widget", null,
+  function(){
+    //dojo.debug("NEW "+this.widgetType);
+    // these properties aren't primitives and need to be created on a per-item
+    // basis.
+    this.children = [];
+    // this.selection = new dojo.widget.Selection();
+    // FIXME: need to replace this with context menu stuff
+    this.extraArgs = {};
+  },
+{
+  // FIXME: need to be able to disambiguate what our rendering context is
+  //        here!
+  //
+  // needs to be a string with the end classname. Every subclass MUST
+  // over-ride.
+  //
+  // base widget properties
+
+  // Widget: the parent of this widget
+  parent: null, 
+
+  // NOTE: "children" and "extraArgs" re-defined in the constructor as they need to be local to the widget
+
+  // Array:
+  //    a list of all of the widgets that have been added as children of
+  //    this component. Should only have values if isContainer is true.
+  children: [],
+
+  // Object:
+  //    a map of properties which the widget system tried to assign from
+  //    user input but did not correspond to any of the properties set on
+  //    the class prototype. These names will also be available in all
+  //    lower-case form in this map
+  extraArgs: {},
+
+  // obviously, top-level and modal widgets should set these appropriately
+
+  // Boolean: should this widget eat all events that bubble up to it?
+  isTopLevel:  false, 
+
+  // Boolean: should this widget block other widgets?
+  isModal: false, 
+
+  // Boolean: should this widget respond to user input?
+  isEnabled: true,
+
+  // Boolean: have we hidden the widget via hide()?
+  isHidden: false,
+
+  // Boolean: can this widget contain other widgets?
+  isContainer: false, 
+
+  // String:
+  //    a unique, opaque ID string that can be assigned by users or by the
+  //    system. If the developer passes an ID which is known not to be
+  //    unique, the specified ID is ignored and the system-generated ID is
+  //    used instead.
+  widgetId: "",
+
+  // String: used for building generic widgets
+  widgetType: "Widget",
+
+  // String: defaults to 'dojo'.  "namespace" is a reserved word in JavaScript, so we abbreviate
+  ns: "dojo",
+
+  getNamespacedType: function(){ 
+    // summary:
+    //    get the "full" name of the widget. If the widget comes from the
+    //    "dojo" namespace and is a Button, calling this method will
+    //    return "dojo:button", all lower-case
+    return (this.ns ? this.ns + ":" + this.widgetType : this.widgetType).toLowerCase(); // String
+  },
+  
+  toString: function(){
+    // summary:
+    //    returns a string that represents the widget. When a widget is
+    //    cast to a string, this method will be used to generate the
+    //    output. Currently, it does not implement any sort of reversable
+    //    serialization.
+    return '[Widget ' + this.getNamespacedType() + ', ' + (this.widgetId || 'NO ID') + ']'; // String
+  },
+
+  repr: function(){
+    // summary: returns the string representation of the widget.
+    return this.toString(); // String
+  },
+
+  enable: function(){
+    // summary:
+    //    enables the widget, usually involving unmasking inputs and
+    //    turning on event handlers. Not implemented here.
+    this.isEnabled = true;
+  },
+
+  disable: function(){
+    // summary:
+    //    disables the widget, usually involves masking inputs and
+    //    unsetting event handlers. Not implemented here.
+    this.isEnabled = false;
+  },
+
+  hide: function(){
+    // summary: hides the widget from view. Not implemented here.
+    this.isHidden = true;
+  },
+
+  show: function(){
+    // summary: re-adds the widget to the view. Not implemented here.
+    this.isHidden = false;
+  },
+
+  onResized: function(){
+    // summary:
+    //    A signal that widgets will call when they have been resized.
+    //    Can be connected to for determining if a layout needs to be
+    //    reflowed. Clients should override this function to do special
+    //    processing, then call this.notifyChildrenOfResize() to notify
+    //    children of resize.
+    this.notifyChildrenOfResize();
+  },
+  
+  notifyChildrenOfResize: function(){
+    // summary: dispatches resized events to all children of this widget
+    for(var i=0; i<this.children.length; i++){
+      var child = this.children[i];
+      //dojo.debug(this.widgetId + " resizing child " + child.widgetId);
+      if( child.onResized ){
+        child.onResized();
+      }
+    }
+  },
+
+  create: function(/*Object*/ args, /*Object*/fragment, /*Widget, optional*/parent, /*String, optional*/ns){
+    // summary:
+    //    'create' manages the initialization part of the widget
+    //    lifecycle. It's called implicitly when any widget is created.
+    //    All other initialization functions for widgets, except for the
+    //    constructor, are called as a result of 'create' being fired.
+    // args:
+    //    a normalized view of the parameters that the widget should take
+    // fragment:
+    //    if the widget is being instantiated from markup, this object 
+    // parent:
+    //    the widget, if any, that this widget will be the child of.  If
+    //    none is passed, the global default widget is used.
+    // ns: what namespace the widget belongs to
+    // description:
+    //    to understand the process by which widgets are instantiated, it
+    //    is critical to understand what other methods 'create' calls and
+    //    which of them you'll want to over-ride. Of course, adventurous
+    //    developers could over-ride 'create' entirely, but this should
+    //    only be done as a last resort.
+    //
+    //    Below is a list of the methods that are called, in the order
+    //    they are fired, along with notes about what they do and if/when
+    //    you should over-ride them in your widget:
+    //      
+    //      mixInProperties:
+    //        takes the args and does lightweight type introspection
+    //        on pre-existing object properties to initialize widget
+    //        values by casting the values that are passed in args
+    //      postMixInProperties:
+    //        a stub function that you can over-ride to modify
+    //        variables that may have been naively assigned by
+    //        mixInProperties
+    //      # widget is added to manager object here
+    //      buildRendering
+    //        subclasses use this method to handle all UI initialization
+    //      initialize:
+    //        a stub function that you can over-ride.
+    //      postInitialize:
+    //        a stub function that you can over-ride.
+    //      postCreate
+    //        a stub function that you can over-ride to modify take
+    //        actions once the widget has been placed in the UI
+    //
+    //    all of these functions are passed the same arguments as are
+    //    passed to 'create'
+
+    //dojo.profile.start(this.widgetType + " create");
+    if(ns){
+      this.ns = ns;
+    }
+    // dojo.debug(this.widgetType, "create");
+    //dojo.profile.start(this.widgetType + " satisfyPropertySets");
+    this.satisfyPropertySets(args, fragment, parent);
+    //dojo.profile.end(this.widgetType + " satisfyPropertySets");
+    // dojo.debug(this.widgetType, "-> mixInProperties");
+    //dojo.profile.start(this.widgetType + " mixInProperties");
+    this.mixInProperties(args, fragment, parent);
+    //dojo.profile.end(this.widgetType + " mixInProperties");
+    // dojo.debug(this.widgetType, "-> postMixInProperties");
+    //dojo.profile.start(this.widgetType + " postMixInProperties");
+    this.postMixInProperties(args, fragment, parent);
+    //dojo.profile.end(this.widgetType + " postMixInProperties");
+    // dojo.debug(this.widgetType, "-> dojo.widget.manager.add");
+    dojo.widget.manager.add(this);
+    // dojo.debug(this.widgetType, "-> buildRendering");
+    //dojo.profile.start(this.widgetType + " buildRendering");
+    this.buildRendering(args, fragment, parent);
+    //dojo.profile.end(this.widgetType + " buildRendering");
+    // dojo.debug(this.widgetType, "-> initialize");
+    //dojo.profile.start(this.widgetType + " initialize");
+    this.initialize(args, fragment, parent);
+    //dojo.profile.end(this.widgetType + " initialize");
+    // dojo.debug(this.widgetType, "-> postInitialize");
+    // postinitialize includes subcomponent creation
+    // profile is put directly to function
+    this.postInitialize(args, fragment, parent);
+    // dojo.debug(this.widgetType, "-> postCreate");
+    //dojo.profile.start(this.widgetType + " postCreate");
+    this.postCreate(args, fragment, parent);
+    //dojo.profile.end(this.widgetType + " postCreate");
+    // dojo.debug(this.widgetType, "done!");
+    
+    //dojo.profile.end(this.widgetType + " create");
+    
+    return this;
+  },
+
+  destroy: function(/*Boolean*/finalize){
+    // summary:
+    //    Destroy this widget and it's descendants. This is the generic
+    //    "destructor" function that all widget users should call to
+    //    clealy discard with a widget. Once a widget is destroyed, it's
+    //    removed from the manager object.
+    // finalize:
+    //    is this function being called part of global environment
+    //    tear-down?
+
+    // FIXME: this is woefully incomplete
+    this.destroyChildren();
+    this.uninitialize();
+    this.destroyRendering(finalize);
+    dojo.widget.manager.removeById(this.widgetId);
+  },
+
+  destroyChildren: function(){
+    // summary:
+    //    Recursively destroy the children of this widget and their
+    //    descendents.
+    var widget;
+    var i=0;
+    while(this.children.length > i){
+      widget = this.children[i];
+      if (widget instanceof dojo.widget.Widget) { // find first widget
+        this.removeChild(widget);
+        widget.destroy();
+        continue;
+      }
+      
+      i++; // skip data object
+    }
+        
+  },
+
+  getChildrenOfType: function(/*String*/type, /*Boolean*/recurse){
+    // summary: 
+    //    return an array of descendant widgets who match the passed type
+    // recurse:
+    //    should we try to get all descendants that match? Defaults to
+    //    false.
+    var ret = [];
+    var isFunc = dojo.lang.isFunction(type);
+    if(!isFunc){
+      type = type.toLowerCase();
+    }
+    for(var x=0; x<this.children.length; x++){
+      if(isFunc){
+        if(this.children[x] instanceof type){
+          ret.push(this.children[x]);
+        }
+      }else{
+        if(this.children[x].widgetType.toLowerCase() == type){
+          ret.push(this.children[x]);
+        }
+      }
+      if(recurse){
+        ret = ret.concat(this.children[x].getChildrenOfType(type, recurse));
+      }
+    }
+    return ret; // Array
+  },
+
+  getDescendants: function(){
+    // summary: returns a flattened array of all direct descendants including self
+    var result = [];
+    var stack = [this];
+    var elem;
+    while ((elem = stack.pop())){
+      result.push(elem);
+      // a child may be data object without children field set (not widget)
+      if (elem.children) {
+        dojo.lang.forEach(elem.children, function(elem) { stack.push(elem); });
+      }
+    }
+    return result; // Array
+  },
+
+
+  isFirstChild: function(){
+    return this === this.parent.children[0]; // Boolean
+  },
+
+  isLastChild: function() {
+    return this === this.parent.children[this.parent.children.length-1]; // Boolean
+  },
+
+  satisfyPropertySets: function(args){
+    // summary: not implemented!
+
+    // dojo.profile.start("satisfyPropertySets");
+    // get the default propsets for our component type
+    /*
+    var typePropSets = []; // FIXME: need to pull these from somewhere!
+    var localPropSets = []; // pull out propsets from the parser's return structure
+
+    // for(var x=0; x<args.length; x++){
+    // }
+
+    for(var x=0; x<typePropSets.length; x++){
+    }
+
+    for(var x=0; x<localPropSets.length; x++){
+    }
+    */
+    // dojo.profile.end("satisfyPropertySets");
+    
+    return args;
+  },
+
+  mixInProperties: function(/*Object*/args, /*Object*/frag){
+    // summary:
+    //    takes the list of properties listed in args and sets values of
+    //    the current object based on existence of properties with the
+    //    same name (case insensitive) and the type of the pre-existing
+    //    property. This is a lightweight conversion and is not intended
+    //    to capture custom type semantics.
+    // args:
+    //    A map of properties and values to set on the current object. By
+    //    default it is assumed that properties in args are in string
+    //    form and need to be converted. However, if there is a
+    //    'fastMixIn' property with the value 'true' in the args param,
+    //    this assumption is ignored and all values in args are copied
+    //    directly to the current object without any form of type
+    //    casting.
+    // description:
+    //    The mix-in code attempts to do some type-assignment based on
+    //    PRE-EXISTING properties of the "this" object. When a named
+    //    property of args is located, it is first tested to make
+    //    sure that the current object already "has one". Properties
+    //    which are undefined in the base widget are NOT settable here.
+    //    The next step is to try to determine type of the pre-existing
+    //    property. If it's a string, the property value is simply
+    //    assigned. If a function, it is first cast using "new
+    //    Function()" and the execution scope modified such that it
+    //    always evaluates in the context of the current object. This
+    //    listener is then added to the original function via
+    //    dojo.event.connect(). If an Array, the system attempts to split
+    //    the string value on ";" chars, and no further processing is
+    //    attempted (conversion of array elements to a integers, for
+    //    instance). If the property value is an Object
+    //    (testObj.constructor === Object), the property is split first
+    //    on ";" chars, secondly on ":" chars, and the resulting
+    //    key/value pairs are assigned to an object in a map style. The
+    //    onus is on the property user to ensure that all property values
+    //    are converted to the expected type before usage. Properties
+    //    which do not occur in the "this" object are assigned to the
+    //    this.extraArgs map using both the original name and the
+    //    lower-case name of the property. This allows for consistent
+    //    access semantics regardless of the case preservation of the
+    //    source of the property names.
+    
+    if((args["fastMixIn"])||(frag["fastMixIn"])){
+      // dojo.profile.start("mixInProperties_fastMixIn");
+      // fast mix in assumes case sensitivity, no type casting, etc...
+      // dojo.lang.mixin(this, args);
+      for(var x in args){
+        this[x] = args[x];
+      }
+      // dojo.profile.end("mixInProperties_fastMixIn");
+      return;
+    }
+    // dojo.profile.start("mixInProperties");
+
+    var undef;
+
+    // NOTE: we cannot assume that the passed properties are case-correct
+    // (esp due to some browser bugs). Therefore, we attempt to locate
+    // properties for assignment regardless of case. This may cause
+    // problematic assignments and bugs in the future and will need to be
+    // documented with big bright neon lights.
+
+    // FIXME: fails miserably if a mixin property has a default value of null in 
+    // a widget
+
+    // NOTE: caching lower-cased args in the prototype is only 
+    // acceptable if the properties are invariant.
+    // if we have a name-cache, get it
+    var lcArgs = dojo.widget.lcArgsCache[this.widgetType];
+    if ( lcArgs == null ){
+      // build a lower-case property name cache if we don't have one
+      lcArgs = {};
+      for(var y in this){
+        lcArgs[((new String(y)).toLowerCase())] = y;
+      }
+      dojo.widget.lcArgsCache[this.widgetType] = lcArgs;
+    }
+    var visited = {};
+    for(var x in args){
+      if(!this[x]){ // check the cache for properties
+        var y = lcArgs[(new String(x)).toLowerCase()];
+        if(y){
+          args[y] = args[x];
+          x = y; 
+        }
+      }
+      if(visited[x]){ continue; }
+      visited[x] = true;
+      if((typeof this[x]) != (typeof undef)){
+        if(typeof args[x] != "string"){
+          this[x] = args[x];
+        }else{
+          if(dojo.lang.isString(this[x])){
+            this[x] = args[x];
+          }else if(dojo.lang.isNumber(this[x])){
+            this[x] = new Number(args[x]); // FIXME: what if NaN is the result?
+          }else if(dojo.lang.isBoolean(this[x])){
+            this[x] = (args[x].toLowerCase()=="false") ? false : true;
+          }else if(dojo.lang.isFunction(this[x])){
+
+            // FIXME: need to determine if always over-writing instead
+            // of attaching here is appropriate. I suspect that we
+            // might want to only allow attaching w/ action items.
+            
+            // RAR, 1/19/05: I'm going to attach instead of
+            // over-write here. Perhaps function objects could have
+            // some sort of flag set on them? Or mixed-into objects
+            // could have some list of non-mutable properties
+            // (although I'm not sure how that would alleviate this
+            // particular problem)? 
+
+            // this[x] = new Function(args[x]);
+
+            // after an IRC discussion last week, it was decided
+            // that these event handlers should execute in the
+            // context of the widget, so that the "this" pointer
+            // takes correctly.
+            
+            // argument that contains no punctuation other than . is 
+            // considered a function spec, not code
+            if(args[x].search(/[^\w\.]+/i) == -1){
+              this[x] = dojo.evalObjPath(args[x], false);
+            }else{
+              var tn = dojo.lang.nameAnonFunc(new Function(args[x]), this);
+              dojo.event.kwConnect({
+                srcObj: this, 
+                srcFunc: x, 
+                adviceObj: this, 
+                adviceFunc: tn
+              });
+            }
+          }else if(dojo.lang.isArray(this[x])){ // typeof [] == "object"
+            this[x] = args[x].split(";");
+          } else if (this[x] instanceof Date) {
+            this[x] = new Date(Number(args[x])); // assume timestamp
+          }else if(typeof this[x] == "object"){ 
+            // FIXME: should we be allowing extension here to handle
+            // other object types intelligently?
+
+            // if we defined a URI, we probably want to allow plain strings
+            // to override it
+            if (this[x] instanceof dojo.uri.Uri){
+
+              this[x] = args[x];
+            }else{
+
+              // FIXME: unlike all other types, we do not replace the
+              // object with a new one here. Should we change that?
+              var pairs = args[x].split(";");
+              for(var y=0; y<pairs.length; y++){
+                var si = pairs[y].indexOf(":");
+                if((si != -1)&&(pairs[y].length>si)){
+                  this[x][pairs[y].substr(0, si).replace(/^\s+|\s+$/g, "")] = pairs[y].substr(si+1);
+                }
+              }
+            }
+          }else{
+            // the default is straight-up string assignment. When would
+            // we ever hit this?
+            this[x] = args[x];
+          }
+        }
+      }else{
+        // collect any extra 'non mixed in' args
+        this.extraArgs[x.toLowerCase()] = args[x];
+      }
+    }
+    // dojo.profile.end("mixInProperties");
+  },
+  
+  postMixInProperties: function(/*Object*/args, /*Object*/frag, /*Widget*/parent){
+    // summary:
+    //    stub function. Can be over-ridden to handle advanced property
+    //    casting and object configuration.
+  },
+
+  initialize: function(/*Object*/args, /*Object*/frag, /*Widget*/parent){
+    // summary: stub function.
+    return false;
+    // dojo.unimplemented("dojo.widget.Widget.initialize");
+  },
+
+  postInitialize: function(/*Object*/args, /*Object*/frag, /*Widget*/parent){
+    // summary: stub function.
+    return false;
+  },
+
+  postCreate: function(/*Object*/args, /*Object*/frag, /*Widget*/parent){
+    // summary: stub function.
+    return false;
+  },
+
+  uninitialize: function(){
+    // summary: 
+    //    stub function. Over-ride to implement custom widget tear-down
+    //    behavior.
+    return false;
+  },
+
+  buildRendering: function(/*Object*/args, /*Object*/frag, /*Widget*/parent){
+    // summary: stub function. SUBCLASSES MUST IMPLEMENT
+    dojo.unimplemented("dojo.widget.Widget.buildRendering, on "+this.toString()+", ");
+    return false;
+  },
+
+  destroyRendering: function(){
+    // summary: stub function. SUBCLASSES MUST IMPLEMENT
+    dojo.unimplemented("dojo.widget.Widget.destroyRendering");
+    return false;
+  },
+
+  cleanUp: function(){
+    // summary: 
+    //    stub function for destruction finalization. SUBCLASSES MUST
+    //    IMPLEMENT
+    dojo.unimplemented("dojo.widget.Widget.cleanUp");
+    return false;
+  },
+
+  addedTo: function(/*Widget*/parent){
+    // summary:
+    //    stub function this is just a signal that can be caught
+    // parent: instance of dojo.widget.Widget that we were added to
+  },
+
+  addChild: function(child){
+    // summary: stub function. SUBCLASSES MUST IMPLEMENT
+    dojo.unimplemented("dojo.widget.Widget.addChild");
+    return false;
+  },
+
+  // Detach the given child widget from me, but don't destroy it
+  removeChild: function(/*Widget*/widget){
+    // summary: 
+    //    removes the passed widget instance from this widget but does
+    //    not destroy it
+    for(var x=0; x<this.children.length; x++){
+      if(this.children[x] === widget){
+        this.children.splice(x, 1);
+        break;
+      }
+    }
+    return widget; // Widget
+  },
+
+  resize: function(/*String or int*/width, /*String or int*/height){
+    // summary:
+    //    both width and height may be set as percentages. The setWidth
+    //    and setHeight  functions attempt to determine if the passed
+    //    param is specified in percentage or native units. Integers
+    //    without a measurement are assumed to be in the native unit of
+    //    measure.
+    // width:
+    //    the width, either in native measures, or as a percentage. If as
+    //    percentage, pass it as a string in the form "30%".
+    // height:
+    //    the height, either in native measures, or as a percentage. If as
+    //    percentage, pass it as a string in the form "30%".
+    this.setWidth(width);
+    this.setHeight(height);
+  },
+
+  setWidth: function(/*String or int*/width){
+    // summary: like it says on the tin...
+    // width:
+    //    the width, either in native measures, or as a percentage. If as
+    //    percentage, pass it as a string in the form "30%".
+    if((typeof width == "string")&&(width.substr(-1) == "%")){
+      this.setPercentageWidth(width);
+    }else{
+      this.setNativeWidth(width);
+    }
+  },
+
+  setHeight: function(/*String or int*/height){
+    // summary: like it says on the tin...
+    // height:
+    //    the height, either in native measures, or as a percentage. If
+    //    as percentage, pass it as a string in the form "30%".
+    if((typeof height == "string")&&(height.substr(-1) == "%")){
+      this.setPercentageHeight(height);
+    }else{
+      this.setNativeHeight(height);
+    }
+  },
+
+  setPercentageHeight: function(/*int*/height){
+    // summary: stub function. SUBCLASSES MUST IMPLEMENT
+    return false;
+  },
+
+  setNativeHeight: function(/*int*/height){
+    // summary: stub function. SUBCLASSES MUST IMPLEMENT
+    return false;
+  },
+
+  setPercentageWidth: function(/*int*/width){
+    // summary: stub function. SUBCLASSES MUST IMPLEMENT
+    return false;
+  },
+
+  setNativeWidth: function(/*int*/width){
+    // summary: stub function. SUBCLASSES MUST IMPLEMENT
+    return false;
+  },
+
+  getPreviousSibling: function(){
+    // summary:
+    //    returns null if this is the first child of the parent,
+    //    otherwise returns the next sibling to the "left".
+    var idx = this.getParentIndex();
+ 
+     // first node is idx=0 not found is idx<0
+    if (idx<=0) return null;
+ 
+    return this.parent.children[idx-1]; // Widget
+  },
+ 
+  getSiblings: function(){
+    // summary: gets an array of all children of our parent, including "this"
+    return this.parent.children; // Array
+  },
+ 
+  getParentIndex: function(){
+    // summary: what index are we at in the parent's children array?
+    return dojo.lang.indexOf(this.parent.children, this, true); // int
+  },
+ 
+  getNextSibling: function(){
+    // summary:
+    //    returns null if this is the last child of the parent,
+    //    otherwise returns the next sibling to the "right".
+ 
+    var idx = this.getParentIndex();
+ 
+    if (idx == this.parent.children.length-1){return null;} // last node
+    if (idx < 0){return null;} // not found
+ 
+    return this.parent.children[idx+1]; // Widget
+  }
 });
+
+// Lower case name cache: listing of the lower case elements in each widget.
+// We can't store the lcArgs in the widget itself because if B subclasses A,
+// then B.prototype.lcArgs might return A.prototype.lcArgs, which is not what we
+// want
+dojo.widget.lcArgsCache = {};
+
+// TODO: should have a more general way to add tags or tag libraries?
+// TODO: need a default tags class to inherit from for things like getting propertySets
+// TODO: parse properties/propertySets into component attributes
+// TODO: parse subcomponents
+// TODO: copy/clone raw markup fragments/nodes as appropriate
+dojo.widget.tags = {};
+dojo.widget.tags.addParseTreeHandler = function(/*String*/type){
+  // summary: deprecated!
+  dojo.deprecated("addParseTreeHandler", ". ParseTreeHandlers are now reserved for components. Any unfiltered DojoML tag without a ParseTreeHandler is assumed to be a widget", "0.5");
+  /*
+  var ltype = type.toLowerCase();
+  this[ltype] = function(fragment, widgetParser, parentComp, insertionIndex, localProps){
+    var _ltype = ltype;
+    dojo.profile.start(_ltype);
+    var n = dojo.widget.buildWidgetFromParseTree(ltype, fragment, widgetParser, parentComp, insertionIndex, localProps);
+    dojo.profile.end(_ltype);
+    return n;
+  }
+  */
 }
+
+//dojo.widget.tags.addParseTreeHandler("dojo:widget");
+
+dojo.widget.tags["dojo:propertyset"] = function(fragment, widgetParser, parentComp){
+  // FIXME: Is this needed?
+  // FIXME: Not sure that this parses into the structure that I want it to parse into...
+  // FIXME: add support for nested propertySets
+  var properties = widgetParser.parseProperties(fragment["dojo:propertyset"]);
 }
-return _90c;
-},isFirstChild:function(){
-return this===this.parent.children[0];
-},isLastChild:function(){
-return this===this.parent.children[this.parent.children.length-1];
-},satisfyPropertySets:function(args){
-return args;
-},mixInProperties:function(args,frag){
-if((args["fastMixIn"])||(frag["fastMixIn"])){
-for(var x in args){
-this[x]=args[x];
+
+// FIXME: need to add the <dojo:connect />
+dojo.widget.tags["dojo:connect"] = function(fragment, widgetParser, parentComp){
+  var properties = widgetParser.parseProperties(fragment["dojo:connect"]);
 }
-return;
+
+// FIXME: if we know the insertion point (to a reasonable location), why then do we:
+//  - create a template node
+//  - clone the template node
+//  - render the clone and set properties
+//  - remove the clone from the render tree
+//  - place the clone
+// this is quite dumb
+dojo.widget.buildWidgetFromParseTree = function(/*String*/        type,
+                        /*Object*/        frag, 
+                        /*dojo.widget.Parse*/ parser,
+                        /*Widget, optional*/  parentComp, 
+                        /*int, optional*/   insertionIndex,
+                        /*Object*/        localProps){
+
+  // summary: creates a tree of widgets from the data structure produced by the first-pass parser (frag)
+  
+  // test for accessibility mode 
+  dojo.a11y.setAccessibleMode();
+  //dojo.profile.start("buildWidgetFromParseTree");
+  // FIXME: for codepath from createComponentFromScript, we are now splitting a path 
+  // that we already split and then joined
+  var stype = type.split(":");
+  stype = (stype.length == 2) ? stype[1] : type;
+  
+  // FIXME: we don't seem to be doing anything with this!
+  // var propertySets = parser.getPropertySets(frag);
+  var localProperties = localProps || parser.parseProperties(frag[frag["ns"]+":"+stype]);
+  var twidget = dojo.widget.manager.getImplementation(stype,null,null,frag["ns"]);
+  if(!twidget){
+    throw new Error('cannot find "' + type + '" widget');
+  }else if (!twidget.create){
+    throw new Error('"' + type + '" widget object has no "create" method and does not appear to implement *Widget');
+  }
+  localProperties["dojoinsertionindex"] = insertionIndex;
+  // FIXME: we lose no less than 5ms in construction!
+  var ret = twidget.create(localProperties, frag, parentComp, frag["ns"]);
+  // dojo.profile.end("buildWidgetFromParseTree");
+  return ret;
 }
-var _914;
-var _915=dojo.widget.lcArgsCache[this.widgetType];
-if(_915==null){
-_915={};
-for(var y in this){
-_915[((new String(y)).toLowerCase())]=y;
+
+dojo.widget.defineWidget = function(/*String*/      widgetClass, 
+                  /*String*/      renderer,
+                  /*function||array*/ superclasses, 
+                  /*function*/    init,
+                  /*Object*/      props){
+
+  // summary: Create a widget constructor function (aka widgetClass)
+  // widgetClass: the location in the object hierarchy to place the new widget class constructor
+  // renderer: usually "html", determines when this delcaration will be used
+  // superclasses:
+  //    can be either a single function or an array of functions to be
+  //    mixed in as superclasses. If an array, only the first will be used
+  //    to set prototype inheritance.
+  // init: an optional constructor function. Will be called after superclasses are mixed in.
+  // props: a map of properties and functions to extend the class prototype with
+
+  // This meta-function does parameter juggling for backward compat and overloading
+  // if 4th argument is a string, we are using the old syntax
+  // old sig: widgetClass, superclasses, props (object), renderer (string), init (function)
+  if(dojo.lang.isString(arguments[3])){
+    dojo.widget._defineWidget(arguments[0], arguments[3], arguments[1], arguments[4], arguments[2]);
+  }else{
+    // widgetClass
+    var args = [ arguments[0] ], p = 3;
+    if(dojo.lang.isString(arguments[1])){
+      // renderer, superclass
+      args.push(arguments[1], arguments[2]);
+    }else{
+      // superclass
+      args.push('', arguments[1]);
+      p = 2;
+    }
+    if(dojo.lang.isFunction(arguments[p])){
+      // init (function), props (object) 
+      args.push(arguments[p], arguments[p+1]);
+    }else{
+      // props (object) 
+      args.push(null, arguments[p]);
+    }
+    dojo.widget._defineWidget.apply(this, args);
+  }
 }
-dojo.widget.lcArgsCache[this.widgetType]=_915;
+
+dojo.widget.defineWidget.renderers = "html|svg|vml";
+
+dojo.widget._defineWidget = function(widgetClass /*string*/, renderer /*string*/, superclasses /*function||array*/, init /*function*/, props /*object*/){
+  // FIXME: uncomment next line to test parameter juggling ... remove when confidence improves
+  // dojo.debug('(c:)' + widgetClass + '\n\n(r:)' + renderer + '\n\n(i:)' + init + '\n\n(p:)' + props);
+  // widgetClass takes the form foo.bar.baz<.renderer>.WidgetName (e.g. foo.bar.baz.WidgetName or foo.bar.baz.html.WidgetName)
+  var module = widgetClass.split(".");
+  var type = module.pop(); // type <= WidgetName, module <= foo.bar.baz<.renderer>
+  var regx = "\\.(" + (renderer ? renderer + '|' : '') + dojo.widget.defineWidget.renderers + ")\\.";
+  var r = widgetClass.search(new RegExp(regx));
+  module = (r < 0 ? module.join(".") : widgetClass.substr(0, r));
+
+  // deprecated in favor of namespace system, remove for 0.5
+  dojo.widget.manager.registerWidgetPackage(module);
+  
+  var pos = module.indexOf(".");
+  var nsName = (pos > -1) ? module.substring(0,pos) : module;
+
+  // FIXME: hrm, this might make things simpler
+  //dojo.widget.tags.addParseTreeHandler(nsName+":"+type.toLowerCase());
+  
+  props=(props)||{};
+  props.widgetType = type;
+  if((!init)&&(props["classConstructor"])){
+    init = props.classConstructor;
+    delete props.classConstructor;
+  }
+  dojo.declare(widgetClass, superclasses, init, props);
 }
-var _917={};
-for(var x in args){
-if(!this[x]){
-var y=_915[(new String(x)).toLowerCase()];
-if(y){
-args[y]=args[x];
-x=y;
-}
-}
-if(_917[x]){
-continue;
-}
-_917[x]=true;
-if((typeof this[x])!=(typeof _914)){
-if(typeof args[x]!="string"){
-this[x]=args[x];
-}else{
-if(dojo.lang.isString(this[x])){
-this[x]=args[x];
-}else{
-if(dojo.lang.isNumber(this[x])){
-this[x]=new Number(args[x]);
-}else{
-if(dojo.lang.isBoolean(this[x])){
-this[x]=(args[x].toLowerCase()=="false")?false:true;
-}else{
-if(dojo.lang.isFunction(this[x])){
-if(args[x].search(/[^\w\.]+/i)==-1){
-this[x]=dojo.evalObjPath(args[x],false);
-}else{
-var tn=dojo.lang.nameAnonFunc(new Function(args[x]),this);
-dojo.event.kwConnect({srcObj:this,srcFunc:x,adviceObj:this,adviceFunc:tn});
-}
-}else{
-if(dojo.lang.isArray(this[x])){
-this[x]=args[x].split(";");
-}else{
-if(this[x] instanceof Date){
-this[x]=new Date(Number(args[x]));
-}else{
-if(typeof this[x]=="object"){
-if(this[x] instanceof dojo.uri.Uri){
-this[x]=args[x];
-}else{
-var _919=args[x].split(";");
-for(var y=0;y<_919.length;y++){
-var si=_919[y].indexOf(":");
-if((si!=-1)&&(_919[y].length>si)){
-this[x][_919[y].substr(0,si).replace(/^\s+|\s+$/g,"")]=_919[y].substr(si+1);
-}
-}
-}
-}else{
-this[x]=args[x];
-}
-}
-}
-}
-}
-}
-}
-}
-}else{
-this.extraArgs[x.toLowerCase()]=args[x];
-}
-}
-},postMixInProperties:function(args,frag,_91d){
-},initialize:function(args,frag,_920){
-return false;
-},postInitialize:function(args,frag,_923){
-return false;
-},postCreate:function(args,frag,_926){
-return false;
-},uninitialize:function(){
-return false;
-},buildRendering:function(args,frag,_929){
-dojo.unimplemented("dojo.widget.Widget.buildRendering, on "+this.toString()+", ");
-return false;
-},destroyRendering:function(){
-dojo.unimplemented("dojo.widget.Widget.destroyRendering");
-return false;
-},cleanUp:function(){
-dojo.unimplemented("dojo.widget.Widget.cleanUp");
-return false;
-},addedTo:function(_92a){
-},addChild:function(_92b){
-dojo.unimplemented("dojo.widget.Widget.addChild");
-return false;
-},removeChild:function(_92c){
-for(var x=0;x<this.children.length;x++){
-if(this.children[x]===_92c){
-this.children.splice(x,1);
-break;
-}
-}
-return _92c;
-},resize:function(_92e,_92f){
-this.setWidth(_92e);
-this.setHeight(_92f);
-},setWidth:function(_930){
-if((typeof _930=="string")&&(_930.substr(-1)=="%")){
-this.setPercentageWidth(_930);
-}else{
-this.setNativeWidth(_930);
-}
-},setHeight:function(_931){
-if((typeof _931=="string")&&(_931.substr(-1)=="%")){
-this.setPercentageHeight(_931);
-}else{
-this.setNativeHeight(_931);
-}
-},setPercentageHeight:function(_932){
-return false;
-},setNativeHeight:function(_933){
-return false;
-},setPercentageWidth:function(_934){
-return false;
-},setNativeWidth:function(_935){
-return false;
-},getPreviousSibling:function(){
-var idx=this.getParentIndex();
-if(idx<=0){
-return null;
-}
-return this.parent.children[idx-1];
-},getSiblings:function(){
-return this.parent.children;
-},getParentIndex:function(){
-return dojo.lang.indexOf(this.parent.children,this,true);
-},getNextSibling:function(){
-var idx=this.getParentIndex();
-if(idx==this.parent.children.length-1){
-return null;
-}
-if(idx<0){
-return null;
-}
-return this.parent.children[idx+1];
-}});
-dojo.widget.lcArgsCache={};
-dojo.widget.tags={};
-dojo.widget.tags.addParseTreeHandler=function(type){
-dojo.deprecated("addParseTreeHandler",". ParseTreeHandlers are now reserved for components. Any unfiltered DojoML tag without a ParseTreeHandler is assumed to be a widget","0.5");
-};
-dojo.widget.tags["dojo:propertyset"]=function(_939,_93a,_93b){
-var _93c=_93a.parseProperties(_939["dojo:propertyset"]);
-};
-dojo.widget.tags["dojo:connect"]=function(_93d,_93e,_93f){
-var _940=_93e.parseProperties(_93d["dojo:connect"]);
-};
-dojo.widget.buildWidgetFromParseTree=function(type,frag,_943,_944,_945,_946){
-dojo.a11y.setAccessibleMode();
-var _947=type.split(":");
-_947=(_947.length==2)?_947[1]:type;
-var _948=_946||_943.parseProperties(frag[frag["ns"]+":"+_947]);
-var _949=dojo.widget.manager.getImplementation(_947,null,null,frag["ns"]);
-if(!_949){
-throw new Error("cannot find \""+type+"\" widget");
-}else{
-if(!_949.create){
-throw new Error("\""+type+"\" widget object has no \"create\" method and does not appear to implement *Widget");
-}
-}
-_948["dojoinsertionindex"]=_945;
-var ret=_949.create(_948,frag,_944,frag["ns"]);
-return ret;
-};
-dojo.widget.defineWidget=function(_94b,_94c,_94d,init,_94f){
-if(dojo.lang.isString(arguments[3])){
-dojo.widget._defineWidget(arguments[0],arguments[3],arguments[1],arguments[4],arguments[2]);
-}else{
-var args=[arguments[0]],p=3;
-if(dojo.lang.isString(arguments[1])){
-args.push(arguments[1],arguments[2]);
-}else{
-args.push("",arguments[1]);
-p=2;
-}
-if(dojo.lang.isFunction(arguments[p])){
-args.push(arguments[p],arguments[p+1]);
-}else{
-args.push(null,arguments[p]);
-}
-dojo.widget._defineWidget.apply(this,args);
-}
-};
-dojo.widget.defineWidget.renderers="html|svg|vml";
-dojo.widget._defineWidget=function(_952,_953,_954,init,_956){
-var _957=_952.split(".");
-var type=_957.pop();
-var regx="\\.("+(_953?_953+"|":"")+dojo.widget.defineWidget.renderers+")\\.";
-var r=_952.search(new RegExp(regx));
-_957=(r<0?_957.join("."):_952.substr(0,r));
-dojo.widget.manager.registerWidgetPackage(_957);
-var pos=_957.indexOf(".");
-var _95c=(pos>-1)?_957.substring(0,pos):_957;
-_956=(_956)||{};
-_956.widgetType=type;
-if((!init)&&(_956["classConstructor"])){
-init=_956.classConstructor;
-delete _956.classConstructor;
-}
-dojo.declare(_952,_954,init,_956);
-};
+
 dojo.provide("dojo.widget.Parse");
-dojo.widget.Parse=function(_95d){
-this.propertySetsList=[];
-this.fragment=_95d;
-this.createComponents=function(frag,_95f){
-var _960=[];
-var _961=false;
-try{
-if((frag)&&(frag["tagName"])&&(frag!=frag["nodeRef"])){
-var _962=dojo.widget.tags;
-var tna=String(frag["tagName"]).split(";");
-for(var x=0;x<tna.length;x++){
-var ltn=(tna[x].replace(/^\s+|\s+$/g,"")).toLowerCase();
-frag.tagName=ltn;
-if(_962[ltn]){
-_961=true;
-var ret=_962[ltn](frag,this,_95f,frag["index"]);
-_960.push(ret);
-}else{
-if(ltn.indexOf(":")==-1){
-ltn="dojo:"+ltn;
+
+//
+// dojoML parser should be moved out of 'widget', codifying the difference between a 'component'
+// and a 'widget'. A 'component' being anything that can be generated from a tag.
+//
+// a particular dojoML tag would be handled by a registered tagHandler with a hook for a default handler
+// if the widget system is loaded, a widget builder would be attach itself as the default handler
+// 
+// widget tags are no longer registered themselves:
+// they are now arbitrarily namespaced, so we cannot register them all, and the non-prefixed portions 
+// are no longer guaranteed unique 
+// 
+// therefore dojo.widget.tags should go with this parser code out of the widget module
+//
+
+dojo.widget.Parse = function(fragment){
+  this.propertySetsList = [];
+  this.fragment = fragment;
+  
+  this.createComponents = function(frag, parentComp){
+    var comps = [];
+    var built = false;
+    // if we have items to parse/create at this level, do it!
+    try{
+      if((frag)&&(frag["tagName"])&&(frag!=frag["nodeRef"])){
+        
+        // these are in fact, not ever for widgets per-se anymore, 
+        // but for other markup elements (aka components)
+        var djTags = dojo.widget.tags;
+        
+        // we split so that you can declare multiple 
+        // non-destructive components from the same ctor node
+        var tna = String(frag["tagName"]).split(";");
+        for(var x=0; x<tna.length; x++){
+          var ltn = (tna[x].replace(/^\s+|\s+$/g, "")).toLowerCase();
+          // FIXME: unsure what this does
+          frag.tagName = ltn;
+          if(djTags[ltn]){
+            built = true;
+            var ret = djTags[ltn](frag, this, parentComp, frag["index"]);
+            comps.push(ret);
+          } else {
+            // we require a namespace prefix, default to dojo:
+            if (ltn.indexOf(":") == -1){
+              ltn = "dojo:"+ltn;
+            }
+            // FIXME: handling failure condition correctly?
+            //var ret = djTags[ltn](frag, this, parentComp, frag["index"]);
+            var ret = dojo.widget.buildWidgetFromParseTree(ltn, frag, this, parentComp, frag["index"]);
+            if (ret) {
+              built = true;
+              comps.push(ret);
+            }
+          }
+        }
+      }
+    }catch(e){
+      dojo.debug("dojo.widget.Parse: error:" + e);
+      // note, commenting out the next line is breaking several widgets for me
+      // throw e;
+      // IE is such a bitch sometimes
+    }
+    // if there's a sub-frag, build widgets from that too
+    if(!built){
+      comps = comps.concat(this.createSubComponents(frag, parentComp));
+    }
+    return comps;
+  }
+
+  /*  createSubComponents recurses over a raw JavaScript object structure,
+      and calls the corresponding handler for its normalized tagName if it exists
+  */
+  this.createSubComponents = function(fragment, parentComp){
+    var frag, comps = [];
+    for(var item in fragment){
+      frag = fragment[item];
+      if ((frag)&&(typeof frag == "object")&&(frag!=fragment.nodeRef)&&(frag!=fragment["tagName"])){
+        comps = comps.concat(this.createComponents(frag, parentComp));
+      }
+    }
+    return comps;
+  }
+
+  /*  parsePropertySets checks the top level of a raw JavaScript object
+      structure for any propertySets.  It stores an array of references to 
+      propertySets that it finds.
+  */
+  this.parsePropertySets = function(fragment){
+    return [];
+    /*
+    var propertySets = [];
+    for(var item in fragment){
+      if((fragment[item]["tagName"] == "dojo:propertyset")){
+        propertySets.push(fragment[item]);
+      }
+    }
+    // FIXME: should we store these propertySets somewhere for later retrieval
+    this.propertySetsList.push(propertySets);
+    return propertySets;
+    */
+  }
+  
+  /*  parseProperties checks a raw JavaScript object structure for
+      properties, and returns an array of properties that it finds.
+  */
+  this.parseProperties = function(fragment){
+    var properties = {};
+    for(var item in fragment){
+      // FIXME: need to check for undefined?
+      // case: its a tagName or nodeRef
+      if((fragment[item] == fragment["tagName"])||(fragment[item] == fragment.nodeRef)){
+        // do nothing
+      }else{
+        if((fragment[item]["tagName"])&&
+          (dojo.widget.tags[fragment[item].tagName.toLowerCase()])){
+          // TODO: it isn't a property or property set, it's a fragment, 
+          // so do something else
+          // FIXME: needs to be a better/stricter check
+          // TODO: handle xlink:href for external property sets
+        }else if((fragment[item][0])&&(fragment[item][0].value!="")&&(fragment[item][0].value!=null)){
+          try{
+            // FIXME: need to allow more than one provider
+            if(item.toLowerCase() == "dataprovider") {
+              var _this = this;
+              this.getDataProvider(_this, fragment[item][0].value);
+              properties.dataProvider = this.dataProvider;
+            }
+            properties[item] = fragment[item][0].value;
+            var nestedProperties = this.parseProperties(fragment[item]);
+            // FIXME: this kind of copying is expensive and inefficient!
+            for(var property in nestedProperties){
+              properties[property] = nestedProperties[property];
+            }
+          }catch(e){ dojo.debug(e); }
+        }
+        switch(item.toLowerCase()){
+        case "checked":
+        case "disabled":
+          if (typeof properties[item] != "boolean"){ 
+            properties[item] = true;
+          }
+        break;
+        }
+      } 
+    }
+    return properties;
+  }
+
+  /* getPropertySetById returns the propertySet that matches the provided id
+  */
+  
+  this.getDataProvider = function(objRef, dataUrl){
+    // FIXME: this is currently sync.  To make this async, we made need to move 
+    //this step into the widget ctor, so that it is loaded when it is needed 
+    // to populate the widget
+    dojo.io.bind({
+      url: dataUrl,
+      load: function(type, evaldObj){
+        if(type=="load"){
+          objRef.dataProvider = evaldObj;
+        }
+      },
+      mimetype: "text/javascript",
+      sync: true
+    });
+  }
+
+  
+  this.getPropertySetById = function(propertySetId){
+    for(var x = 0; x < this.propertySetsList.length; x++){
+      if(propertySetId == this.propertySetsList[x]["id"][0].value){
+        return this.propertySetsList[x];
+      }
+    }
+    return "";
+  }
+  
+  /* getPropertySetsByType returns the propertySet(s) that match(es) the
+   * provided componentClass
+   */
+  this.getPropertySetsByType = function(componentType){
+    var propertySets = [];
+    for(var x=0; x < this.propertySetsList.length; x++){
+      var cpl = this.propertySetsList[x];
+      var cpcc = cpl["componentClass"]||cpl["componentType"]||null;
+      var propertySetId = this.propertySetsList[x]["id"][0].value;
+      if((cpcc)&&(propertySetId == cpcc[0].value)){
+        propertySets.push(cpl);
+      }
+    }
+    return propertySets;
+  }
+  
+  /* getPropertySets returns the propertySet for a given component fragment
+  */
+  this.getPropertySets = function(fragment){
+    var ppl = "dojo:propertyproviderlist";
+    var propertySets = [];
+    var tagname = fragment["tagName"];
+    if(fragment[ppl]){ 
+      var propertyProviderIds = fragment[ppl].value.split(" ");
+      // FIXME: should the propertyProviderList attribute contain #
+      //      syntax for reference to ids or not?
+      // FIXME: need a better test to see if this is local or external
+      // FIXME: doesn't handle nested propertySets, or propertySets that
+      //      just contain information about css documents, etc.
+      for(var propertySetId in propertyProviderIds){
+        if((propertySetId.indexOf("..")==-1)&&(propertySetId.indexOf("://")==-1)){
+          // get a reference to a propertySet within the current parsed structure
+          var propertySet = this.getPropertySetById(propertySetId);
+          if(propertySet != ""){
+            propertySets.push(propertySet);
+          }
+        }else{
+          // FIXME: add code to parse and return a propertySet from
+          // another document
+          // alex: is this even necessaray? Do we care? If so, why?
+        }
+      }
+    }
+    // we put the typed ones first so that the parsed ones override when
+    // iteration happens.
+    return (this.getPropertySetsByType(tagname)).concat(propertySets);
+  }
+  
+  /* 
+    nodeRef is the node to be replaced... in the future, we might want to add 
+    an alternative way to specify an insertion point
+
+    componentName is the expected dojo widget name, i.e. Button of ContextMenu
+
+    properties is an object of name value pairs
+    ns is the namespace of the widget.  Defaults to "dojo"
+  */
+  this.createComponentFromScript = function(nodeRef, componentName, properties, ns){
+    properties.fastMixIn = true;      
+    // FIXME: we pulled it apart and now we put it back together ... 
+    var ltn = (ns || "dojo") + ":" + componentName.toLowerCase();
+    if(dojo.widget.tags[ltn]){
+      return [dojo.widget.tags[ltn](properties, this, null, null, properties)];
+    }
+    return [dojo.widget.buildWidgetFromParseTree(ltn, properties, this, null, null, properties)];
+  }
 }
-var ret=dojo.widget.buildWidgetFromParseTree(ltn,frag,this,_95f,frag["index"]);
-if(ret){
-_961=true;
-_960.push(ret);
+
+dojo.widget._parser_collection = {"dojo": new dojo.widget.Parse() };
+dojo.widget.getParser = function(name){
+  if(!name){ name = "dojo"; }
+  if(!this._parser_collection[name]){
+    this._parser_collection[name] = new dojo.widget.Parse();
+  }
+  return this._parser_collection[name];
 }
+
+/**
+ * Creates widget.
+ *
+ * @param name     The name of the widget to create with optional namespace prefix,
+ *                 e.g."ns:widget", namespace defaults to "dojo".
+ * @param props    Key-Value pairs of properties of the widget
+ * @param refNode  If the position argument is specified, this node is used as
+ *                 a reference for inserting this node into a DOM tree; else
+ *                 the widget becomes the domNode
+ * @param position The position to insert this widget's node relative to the
+ *                 refNode argument
+ * @return The new Widget object
+ */
+
+dojo.widget.createWidget = function(name, props, refNode, position){
+  var isNode = false;
+  var isNameStr = (typeof name == "string");
+  if(isNameStr){
+    var pos = name.indexOf(":");
+    var ns = (pos > -1) ? name.substring(0,pos) : "dojo";
+    if(pos > -1){ name = name.substring(pos+1); }
+    var lowerCaseName = name.toLowerCase();
+    var namespacedName = ns + ":" + lowerCaseName;
+    isNode = (dojo.byId(name) && (!dojo.widget.tags[namespacedName])); 
+  }
+
+  if((arguments.length == 1) && ((isNode)||(!isNameStr))){
+    // we got a DOM node 
+    var xp = new dojo.xml.Parse(); 
+    // FIXME: we should try to find the parent! 
+    var tn = (isNode) ? dojo.byId(name) : name; 
+    return dojo.widget.getParser().createComponents(xp.parseElement(tn, null, true))[0]; 
+  }
+  
+  function fromScript(placeKeeperNode, name, props, ns){
+    props[namespacedName] = { 
+      dojotype: [{value: lowerCaseName}],
+      nodeRef: placeKeeperNode,
+      fastMixIn: true
+    };
+    props.ns = ns;
+    return dojo.widget.getParser().createComponentFromScript(placeKeeperNode, name, props, ns);
+  }
+
+  props = props||{};
+  var notRef = false;
+  var tn = null;
+  var h = dojo.render.html.capable;
+  if(h){
+    tn = document.createElement("span");
+  }
+  if(!refNode){
+    notRef = true;
+    refNode = tn;
+    if(h){
+      dojo.body().appendChild(refNode);
+    }
+  }else if(position){
+    dojo.dom.insertAtPosition(tn, refNode, position);
+  }else{ // otherwise don't replace, but build in-place
+    tn = refNode;
+  }
+  var widgetArray = fromScript(tn, name.toLowerCase(), props, ns);
+  if( (!widgetArray)||(!widgetArray[0])||
+    (typeof widgetArray[0].widgetType == "undefined") ){
+    throw new Error("createWidget: Creation of \"" + name + "\" widget failed.");
+  }
+  try{
+    if(notRef){
+      if(widgetArray[0].domNode.parentNode){
+        widgetArray[0].domNode.parentNode.removeChild(widgetArray[0].domNode);
+      }
+    }
+  }catch(e){
+    /* squelch for Safari */
+    dojo.debug(e);
+  }
+  return widgetArray[0]; // just return the widget
 }
-}
-}
-}
-catch(e){
-dojo.debug("dojo.widget.Parse: error:"+e);
-}
-if(!_961){
-_960=_960.concat(this.createSubComponents(frag,_95f));
-}
-return _960;
-};
-this.createSubComponents=function(_967,_968){
-var frag,_96a=[];
-for(var item in _967){
-frag=_967[item];
-if((frag)&&(typeof frag=="object")&&(frag!=_967.nodeRef)&&(frag!=_967["tagName"])){
-_96a=_96a.concat(this.createComponents(frag,_968));
-}
-}
-return _96a;
-};
-this.parsePropertySets=function(_96c){
-return [];
-};
-this.parseProperties=function(_96d){
-var _96e={};
-for(var item in _96d){
-if((_96d[item]==_96d["tagName"])||(_96d[item]==_96d.nodeRef)){
-}else{
-if((_96d[item]["tagName"])&&(dojo.widget.tags[_96d[item].tagName.toLowerCase()])){
-}else{
-if((_96d[item][0])&&(_96d[item][0].value!="")&&(_96d[item][0].value!=null)){
-try{
-if(item.toLowerCase()=="dataprovider"){
-var _970=this;
-this.getDataProvider(_970,_96d[item][0].value);
-_96e.dataProvider=this.dataProvider;
-}
-_96e[item]=_96d[item][0].value;
-var _971=this.parseProperties(_96d[item]);
-for(var _972 in _971){
-_96e[_972]=_971[_972];
-}
-}
-catch(e){
-dojo.debug(e);
-}
-}
-}
-switch(item.toLowerCase()){
-case "checked":
-case "disabled":
-if(typeof _96e[item]!="boolean"){
-_96e[item]=true;
-}
-break;
-}
-}
-}
-return _96e;
-};
-this.getDataProvider=function(_973,_974){
-dojo.io.bind({url:_974,load:function(type,_976){
-if(type=="load"){
-_973.dataProvider=_976;
-}
-},mimetype:"text/javascript",sync:true});
-};
-this.getPropertySetById=function(_977){
-for(var x=0;x<this.propertySetsList.length;x++){
-if(_977==this.propertySetsList[x]["id"][0].value){
-return this.propertySetsList[x];
-}
-}
-return "";
-};
-this.getPropertySetsByType=function(_979){
-var _97a=[];
-for(var x=0;x<this.propertySetsList.length;x++){
-var cpl=this.propertySetsList[x];
-var cpcc=cpl["componentClass"]||cpl["componentType"]||null;
-var _97e=this.propertySetsList[x]["id"][0].value;
-if((cpcc)&&(_97e==cpcc[0].value)){
-_97a.push(cpl);
-}
-}
-return _97a;
-};
-this.getPropertySets=function(_97f){
-var ppl="dojo:propertyproviderlist";
-var _981=[];
-var _982=_97f["tagName"];
-if(_97f[ppl]){
-var _983=_97f[ppl].value.split(" ");
-for(var _984 in _983){
-if((_984.indexOf("..")==-1)&&(_984.indexOf("://")==-1)){
-var _985=this.getPropertySetById(_984);
-if(_985!=""){
-_981.push(_985);
-}
-}else{
-}
-}
-}
-return (this.getPropertySetsByType(_982)).concat(_981);
-};
-this.createComponentFromScript=function(_986,_987,_988,ns){
-_988.fastMixIn=true;
-var ltn=(ns||"dojo")+":"+_987.toLowerCase();
-if(dojo.widget.tags[ltn]){
-return [dojo.widget.tags[ltn](_988,this,null,null,_988)];
-}
-return [dojo.widget.buildWidgetFromParseTree(ltn,_988,this,null,null,_988)];
-};
-};
-dojo.widget._parser_collection={"dojo":new dojo.widget.Parse()};
-dojo.widget.getParser=function(name){
-if(!name){
-name="dojo";
-}
-if(!this._parser_collection[name]){
-this._parser_collection[name]=new dojo.widget.Parse();
-}
-return this._parser_collection[name];
-};
-dojo.widget.createWidget=function(name,_98d,_98e,_98f){
-var _990=false;
-var _991=(typeof name=="string");
-if(_991){
-var pos=name.indexOf(":");
-var ns=(pos>-1)?name.substring(0,pos):"dojo";
-if(pos>-1){
-name=name.substring(pos+1);
-}
-var _994=name.toLowerCase();
-var _995=ns+":"+_994;
-_990=(dojo.byId(name)&&(!dojo.widget.tags[_995]));
-}
-if((arguments.length==1)&&((_990)||(!_991))){
-var xp=new dojo.xml.Parse();
-var tn=(_990)?dojo.byId(name):name;
-return dojo.widget.getParser().createComponents(xp.parseElement(tn,null,true))[0];
-}
-function fromScript(_998,name,_99a,ns){
-_99a[_995]={dojotype:[{value:_994}],nodeRef:_998,fastMixIn:true};
-_99a.ns=ns;
-return dojo.widget.getParser().createComponentFromScript(_998,name,_99a,ns);
-}
-_98d=_98d||{};
-var _99c=false;
-var tn=null;
-var h=dojo.render.html.capable;
-if(h){
-tn=document.createElement("span");
-}
-if(!_98e){
-_99c=true;
-_98e=tn;
-if(h){
-dojo.body().appendChild(_98e);
-}
-}else{
-if(_98f){
-dojo.dom.insertAtPosition(tn,_98e,_98f);
-}else{
-tn=_98e;
-}
-}
-var _99e=fromScript(tn,name.toLowerCase(),_98d,ns);
-if((!_99e)||(!_99e[0])||(typeof _99e[0].widgetType=="undefined")){
-throw new Error("createWidget: Creation of \""+name+"\" widget failed.");
-}
-try{
-if(_99c){
-if(_99e[0].domNode.parentNode){
-_99e[0].domNode.parentNode.removeChild(_99e[0].domNode);
-}
-}
-}
-catch(e){
-dojo.debug(e);
-}
-return _99e[0];
-};
+
 dojo.provide("dojo.widget.DomWidget");
-dojo.widget._cssFiles={};
-dojo.widget._cssStrings={};
-dojo.widget._templateCache={};
-dojo.widget.defaultStrings={dojoRoot:dojo.hostenv.getBaseScriptUri(),baseScriptUri:dojo.hostenv.getBaseScriptUri()};
-dojo.widget.fillFromTemplateCache=function(obj,_9a0,_9a1,_9a2){
-var _9a3=_9a0||obj.templatePath;
-var _9a4=dojo.widget._templateCache;
-if(!obj["widgetType"]){
-do{
-var _9a5="__dummyTemplate__"+dojo.widget._templateCache.dummyCount++;
-}while(_9a4[_9a5]);
-obj.widgetType=_9a5;
-}
-var wt=obj.widgetType;
-var ts=_9a4[wt];
-if(!ts){
-_9a4[wt]={"string":null,"node":null};
-if(_9a2){
-ts={};
-}else{
-ts=_9a4[wt];
-}
-}
-if((!obj.templateString)&&(!_9a2)){
-obj.templateString=_9a1||ts["string"];
-}
-if((!obj.templateNode)&&(!_9a2)){
-obj.templateNode=ts["node"];
-}
-if((!obj.templateNode)&&(!obj.templateString)&&(_9a3)){
-var _9a8=dojo.hostenv.getText(_9a3);
-if(_9a8){
-_9a8=_9a8.replace(/^\s*<\?xml(\s)+version=[\'\"](\d)*.(\d)*[\'\"](\s)*\?>/im,"");
-var _9a9=_9a8.match(/<body[^>]*>\s*([\s\S]+)\s*<\/body>/im);
-if(_9a9){
-_9a8=_9a9[1];
-}
-}else{
-_9a8="";
-}
-obj.templateString=_9a8;
-if(!_9a2){
-_9a4[wt]["string"]=_9a8;
-}
-}
-if((!ts["string"])&&(!_9a2)){
-ts.string=obj.templateString;
-}
+
+
+dojo.widget._cssFiles = {};
+dojo.widget._cssStrings = {};
+dojo.widget._templateCache = {};
+
+// Object: a mapping of strings that are used in template variable replacement
+dojo.widget.defaultStrings = {
+  dojoRoot: dojo.hostenv.getBaseScriptUri(),
+  baseScriptUri: dojo.hostenv.getBaseScriptUri()
 };
-dojo.widget._templateCache.dummyCount=0;
-dojo.widget.attachProperties=["dojoAttachPoint","id"];
-dojo.widget.eventAttachProperty="dojoAttachEvent";
-dojo.widget.onBuildProperty="dojoOnBuild";
-dojo.widget.waiNames=["waiRole","waiState"];
-dojo.widget.wai={waiRole:{name:"waiRole","namespace":"http://www.w3.org/TR/xhtml2",alias:"x2",prefix:"wairole:"},waiState:{name:"waiState","namespace":"http://www.w3.org/2005/07/aaa",alias:"aaa",prefix:""},setAttr:function(node,ns,attr,_9ad){
-if(dojo.render.html.ie){
-node.setAttribute(this[ns].alias+":"+attr,this[ns].prefix+_9ad);
-}else{
-node.setAttributeNS(this[ns]["namespace"],attr,this[ns].prefix+_9ad);
-}
-},getAttr:function(node,ns,attr){
-if(dojo.render.html.ie){
-return node.getAttribute(this[ns].alias+":"+attr);
-}else{
-return node.getAttributeNS(this[ns]["namespace"],attr);
-}
-},removeAttr:function(node,ns,attr){
-var _9b4=true;
-if(dojo.render.html.ie){
-_9b4=node.removeAttribute(this[ns].alias+":"+attr);
-}else{
-node.removeAttributeNS(this[ns]["namespace"],attr);
-}
-return _9b4;
-}};
-dojo.widget.attachTemplateNodes=function(_9b5,_9b6,_9b7){
-var _9b8=dojo.dom.ELEMENT_NODE;
-function trim(str){
-return str.replace(/^\s+|\s+$/g,"");
-}
-if(!_9b5){
-_9b5=_9b6.domNode;
-}
-if(_9b5.nodeType!=_9b8){
-return;
-}
-var _9ba=_9b5.all||_9b5.getElementsByTagName("*");
-var _9bb=_9b6;
-for(var x=-1;x<_9ba.length;x++){
-var _9bd=(x==-1)?_9b5:_9ba[x];
-var _9be=[];
-if(!_9b6.widgetsInTemplate||!_9bd.getAttribute("dojoType")){
-for(var y=0;y<this.attachProperties.length;y++){
-var _9c0=_9bd.getAttribute(this.attachProperties[y]);
-if(_9c0){
-_9be=_9c0.split(";");
-for(var z=0;z<_9be.length;z++){
-if(dojo.lang.isArray(_9b6[_9be[z]])){
-_9b6[_9be[z]].push(_9bd);
-}else{
-_9b6[_9be[z]]=_9bd;
-}
-}
-break;
-}
-}
-var _9c2=_9bd.getAttribute(this.eventAttachProperty);
-if(_9c2){
-var evts=_9c2.split(";");
-for(var y=0;y<evts.length;y++){
-if((!evts[y])||(!evts[y].length)){
-continue;
-}
-var _9c4=null;
-var tevt=trim(evts[y]);
-if(evts[y].indexOf(":")>=0){
-var _9c6=tevt.split(":");
-tevt=trim(_9c6[0]);
-_9c4=trim(_9c6[1]);
-}
-if(!_9c4){
-_9c4=tevt;
-}
-var tf=function(){
-var ntf=new String(_9c4);
-return function(evt){
-if(_9bb[ntf]){
-_9bb[ntf](dojo.event.browser.fixEvent(evt,this));
+
+dojo.widget.fillFromTemplateCache = function( /*DomWidget*/       obj, 
+                        /*String||dojo.uri.Uri*/  templatePath,
+                        /*String, optional*/    templateString,
+                        /*Boolean, optional*/   avoidCache){
+  // summary:
+  //    static method to build from a template w/ or w/o a real widget in
+  //    place
+  // obj: an instance of dojo.widget.DomWidget to initialize the template for
+  // templatePath: the URL to get the template from 
+  // templateString:
+  //    a string to use in lieu of fetching the template from a URL
+  // avoidCache:
+  //    should the template system not use whatever is in the cache and
+  //    always use the passed templatePath or templateString?
+
+  // dojo.debug("avoidCache:", avoidCache);
+  var tpath = templatePath || obj.templatePath;
+
+  var tmplts = dojo.widget._templateCache;
+  if(!obj["widgetType"]) { // don't have a real template here
+    do {
+      var dummyName = "__dummyTemplate__" + dojo.widget._templateCache.dummyCount++;
+    } while(tmplts[dummyName]);
+    obj.widgetType = dummyName;
+  }
+  var wt = obj.widgetType;
+
+  var ts = tmplts[wt];
+  if(!ts){
+    tmplts[wt] = { "string": null, "node": null };
+    if(avoidCache){
+      ts = {};
+    }else{
+      ts = tmplts[wt];
+    }
+  }
+  if((!obj.templateString)&&(!avoidCache)){
+    obj.templateString = templateString || ts["string"];
+  }
+  if((!obj.templateNode)&&(!avoidCache)){
+    obj.templateNode = ts["node"];
+  }
+  if((!obj.templateNode)&&(!obj.templateString)&&(tpath)){
+    // fetch a text fragment and assign it to templateString
+    // NOTE: we rely on blocking IO here!
+    var tstring = dojo.hostenv.getText(tpath);
+    if(tstring){
+      // strip <?xml ...?> declarations so that external SVG and XML
+      // documents can be added to a document without worry
+      tstring = tstring.replace(/^\s*<\?xml(\s)+version=[\'\"](\d)*.(\d)*[\'\"](\s)*\?>/im, "");
+      var matches = tstring.match(/<body[^>]*>\s*([\s\S]+)\s*<\/body>/im);
+      if(matches){
+        tstring = matches[1];
+      }
+    }else{
+      tstring = "";
+    }
+    obj.templateString = tstring;
+    if(!avoidCache){
+      tmplts[wt]["string"] = tstring;
+    }
+  }
+  if((!ts["string"])&&(!avoidCache)){
+    ts.string = obj.templateString;
+  }
 }
+dojo.widget._templateCache.dummyCount = 0;
+
+// Array: list of properties to search for node-to-property mappings
+dojo.widget.attachProperties = ["dojoAttachPoint", "id"];
+// String: name of the property to use for mapping DOM events to widget functions
+dojo.widget.eventAttachProperty = "dojoAttachEvent";
+// String: property name of code to evaluate when the widget is constructed
+dojo.widget.onBuildProperty = "dojoOnBuild";
+// Array:  possible accessibility values to set on widget elements - role or state
+dojo.widget.waiNames  = ["waiRole", "waiState"];
+// Object: Contains functions to set accessibility roles and states 
+//  onto widget elements
+dojo.widget.wai = {
+  waiRole: {  
+        // String: information for mapping accessibility role
+        name: "waiRole", 
+        // String: URI of the namespace for the set of roles
+        "namespace": "http://www.w3.org/TR/xhtml2", 
+        // String: alias to assign the namespace
+        alias: "x2",
+        // String: prefix to assign to the role value
+        prefix: "wairole:"
+  },
+  waiState: { 
+        // String: informatin for mapping accessibility state
+        name: "waiState", 
+        // String: URI of the namespace for the set of states
+        "namespace": "http://www.w3.org/2005/07/aaa", 
+        // String: alias to assign the namespace
+        alias: "aaa",
+        // String: empty string - state value does not require prefix
+        prefix: ""
+  },
+  setAttr: function(/*DomNode*/node, /*String*/ ns, /*String*/ attr, /*String|Boolean*/value){
+    // Summary: Use appropriate API to set the role or state attribute onto the element.
+    // Description: In IE use the generic setAttribute() api.  Append a namespace
+    //   alias to the attribute name and appropriate prefix to the value. 
+    //   Otherwise, use the setAttribueNS api to set the namespaced attribute. Also
+    //   add the appropriate prefix to the attribute value.
+    if(dojo.render.html.ie){
+      node.setAttribute(this[ns].alias+":"+ attr, this[ns].prefix+value);
+    }else{
+      node.setAttributeNS(this[ns]["namespace"], attr, this[ns].prefix+value);
+    }
+  },
+
+  getAttr: function(/*DomNode*/ node, /*String*/ ns, /*String|Boolena*/ attr){
+    // Summary:  Use the appropriate API to retrieve the role or state value
+    // Description: In IE use the generic getAttribute() api.  An alias value 
+    //  was added to the attribute name to simulate a namespace when the attribute
+    //  was set.  Otherwise use the getAttributeNS() api to retrieve the state value
+    if(dojo.render.html.ie){
+      return node.getAttribute(this[ns].alias+":"+attr);
+    }else{
+      return node.getAttributeNS(this[ns]["namespace"], attr);
+    }
+  },
+  removeAttr: function(/*DomNode*/ node, /*String*/ ns, /*String|Boolena*/ attr){
+    // Summary:  Use the appropriate API to remove the role or state value
+    // Description: In IE use the generic removeAttribute() api.  An alias value 
+    //  was added to the attribute name to simulate a namespace when the attribute
+    //  was set.  Otherwise use the removeAttributeNS() api to remove the state value
+    var success = true; //only IE returns a value
+    if(dojo.render.html.ie){
+       success = node.removeAttribute(this[ns].alias+":"+attr);
+    }else{
+      node.removeAttributeNS(this[ns]["namespace"], attr);
+    }
+    return success;
+  }
 };
-}();
-dojo.event.browser.addListener(_9bd,tevt,tf,false,true);
-}
-}
-for(var y=0;y<_9b7.length;y++){
-var _9ca=_9bd.getAttribute(_9b7[y]);
-if((_9ca)&&(_9ca.length)){
-var _9c4=null;
-var _9cb=_9b7[y].substr(4);
-_9c4=trim(_9ca);
-var _9cc=[_9c4];
-if(_9c4.indexOf(";")>=0){
-_9cc=dojo.lang.map(_9c4.split(";"),trim);
-}
-for(var z=0;z<_9cc.length;z++){
-if(!_9cc[z].length){
-continue;
-}
-var tf=function(){
-var ntf=new String(_9cc[z]);
-return function(evt){
-if(_9bb[ntf]){
-_9bb[ntf](dojo.event.browser.fixEvent(evt,this));
-}
-};
-}();
-dojo.event.browser.addListener(_9bd,_9cb,tf,false,true);
-}
-}
-}
-}
-var _9cf=_9bd.getAttribute(this.templateProperty);
-if(_9cf){
-_9b6[_9cf]=_9bd;
-}
-dojo.lang.forEach(dojo.widget.waiNames,function(name){
-var wai=dojo.widget.wai[name];
-var val=_9bd.getAttribute(wai.name);
-if(val){
-if(val.indexOf("-")==-1){
-dojo.widget.wai.setAttr(_9bd,wai.name,"role",val);
-}else{
-var _9d3=val.split("-");
-dojo.widget.wai.setAttr(_9bd,wai.name,_9d3[0],_9d3[1]);
-}
-}
-},this);
-var _9d4=_9bd.getAttribute(this.onBuildProperty);
-if(_9d4){
-eval("var node = baseNode; var widget = targetObj; "+_9d4);
-}
-}
-};
-dojo.widget.getDojoEventsFromStr=function(str){
-var re=/(dojoOn([a-z]+)(\s?))=/gi;
-var evts=str?str.match(re)||[]:[];
-var ret=[];
-var lem={};
-for(var x=0;x<evts.length;x++){
-if(evts[x].length<1){
-continue;
-}
-var cm=evts[x].replace(/\s/,"");
-cm=(cm.slice(0,cm.length-1));
-if(!lem[cm]){
-lem[cm]=true;
-ret.push(cm);
-}
-}
-return ret;
-};
-dojo.declare("dojo.widget.DomWidget",dojo.widget.Widget,function(){
-if((arguments.length>0)&&(typeof arguments[0]=="object")){
-this.create(arguments[0]);
-}
-},{templateNode:null,templateString:null,templateCssString:null,preventClobber:false,domNode:null,containerNode:null,widgetsInTemplate:false,addChild:function(_9dc,_9dd,pos,ref,_9e0){
-if(!this.isContainer){
-dojo.debug("dojo.widget.DomWidget.addChild() attempted on non-container widget");
-return null;
-}else{
-if(_9e0==undefined){
-_9e0=this.children.length;
-}
-this.addWidgetAsDirectChild(_9dc,_9dd,pos,ref,_9e0);
-this.registerChild(_9dc,_9e0);
-}
-return _9dc;
-},addWidgetAsDirectChild:function(_9e1,_9e2,pos,ref,_9e5){
-if((!this.containerNode)&&(!_9e2)){
-this.containerNode=this.domNode;
-}
-var cn=(_9e2)?_9e2:this.containerNode;
-if(!pos){
-pos="after";
-}
-if(!ref){
-if(!cn){
-cn=dojo.body();
-}
-ref=cn.lastChild;
-}
-if(!_9e5){
-_9e5=0;
-}
-_9e1.domNode.setAttribute("dojoinsertionindex",_9e5);
-if(!ref){
-cn.appendChild(_9e1.domNode);
-}else{
-if(pos=="insertAtIndex"){
-dojo.dom.insertAtIndex(_9e1.domNode,ref.parentNode,_9e5);
-}else{
-if((pos=="after")&&(ref===cn.lastChild)){
-cn.appendChild(_9e1.domNode);
-}else{
-dojo.dom.insertAtPosition(_9e1.domNode,cn,pos);
-}
-}
-}
-},registerChild:function(_9e7,_9e8){
-_9e7.dojoInsertionIndex=_9e8;
-var idx=-1;
-for(var i=0;i<this.children.length;i++){
-if(this.children[i].dojoInsertionIndex<=_9e8){
-idx=i;
-}
-}
-this.children.splice(idx+1,0,_9e7);
-_9e7.parent=this;
-_9e7.addedTo(this,idx+1);
-delete dojo.widget.manager.topWidgets[_9e7.widgetId];
-},removeChild:function(_9eb){
-dojo.dom.removeNode(_9eb.domNode);
-return dojo.widget.DomWidget.superclass.removeChild.call(this,_9eb);
-},getFragNodeRef:function(frag){
-if(!frag){
-return null;
-}
-if(!frag[this.getNamespacedType()]){
-dojo.raise("Error: no frag for widget type "+this.getNamespacedType()+", id "+this.widgetId+" (maybe a widget has set it's type incorrectly)");
-}
-return frag[this.getNamespacedType()]["nodeRef"];
-},postInitialize:function(args,frag,_9ef){
-var _9f0=this.getFragNodeRef(frag);
-if(_9ef&&(_9ef.snarfChildDomOutput||!_9f0)){
-_9ef.addWidgetAsDirectChild(this,"","insertAtIndex","",args["dojoinsertionindex"],_9f0);
-}else{
-if(_9f0){
-if(this.domNode&&(this.domNode!==_9f0)){
-var _9f1=_9f0.parentNode.replaceChild(this.domNode,_9f0);
-}
-}
-}
-if(_9ef){
-_9ef.registerChild(this,args.dojoinsertionindex);
-}else{
-dojo.widget.manager.topWidgets[this.widgetId]=this;
-}
-if(this.widgetsInTemplate){
-var _9f2=new dojo.xml.Parse();
-var _9f3;
-var _9f4=this.domNode.getElementsByTagName("*");
-for(var i=0;i<_9f4.length;i++){
-if(_9f4[i].getAttribute("dojoAttachPoint")=="subContainerWidget"){
-_9f3=_9f4[i];
-}
-if(_9f4[i].getAttribute("dojoType")){
-_9f4[i].setAttribute("_isSubWidget",true);
-}
-}
-if(this.isContainer&&!this.containerNode){
-if(_9f3){
-var src=this.getFragNodeRef(frag);
-if(src){
-dojo.dom.moveChildren(src,_9f3);
-frag["dojoDontFollow"]=true;
-}
-}else{
-dojo.debug("No subContainerWidget node can be found in template file for widget "+this);
-}
-}
-var _9f7=_9f2.parseElement(this.domNode,null,true);
-dojo.widget.getParser().createSubComponents(_9f7,this);
-var _9f8=[];
-var _9f9=[this];
-var w;
-while((w=_9f9.pop())){
-for(var i=0;i<w.children.length;i++){
-var _9fb=w.children[i];
-if(_9fb._processedSubWidgets||!_9fb.extraArgs["_issubwidget"]){
-continue;
-}
-_9f8.push(_9fb);
-if(_9fb.isContainer){
-_9f9.push(_9fb);
-}
-}
-}
-for(var i=0;i<_9f8.length;i++){
-var _9fc=_9f8[i];
-if(_9fc._processedSubWidgets){
-dojo.debug("This should not happen: widget._processedSubWidgets is already true!");
-return;
-}
-_9fc._processedSubWidgets=true;
-if(_9fc.extraArgs["dojoattachevent"]){
-var evts=_9fc.extraArgs["dojoattachevent"].split(";");
-for(var j=0;j<evts.length;j++){
-var _9ff=null;
-var tevt=dojo.string.trim(evts[j]);
-if(tevt.indexOf(":")>=0){
-var _a01=tevt.split(":");
-tevt=dojo.string.trim(_a01[0]);
-_9ff=dojo.string.trim(_a01[1]);
-}
-if(!_9ff){
-_9ff=tevt;
-}
-if(dojo.lang.isFunction(_9fc[tevt])){
-dojo.event.kwConnect({srcObj:_9fc,srcFunc:tevt,targetObj:this,targetFunc:_9ff});
-}else{
-alert(tevt+" is not a function in widget "+_9fc);
-}
-}
-}
-if(_9fc.extraArgs["dojoattachpoint"]){
-this[_9fc.extraArgs["dojoattachpoint"]]=_9fc;
-}
-}
-}
-if(this.isContainer&&!frag["dojoDontFollow"]){
-dojo.widget.getParser().createSubComponents(frag,this);
-}
-},buildRendering:function(args,frag){
-var ts=dojo.widget._templateCache[this.widgetType];
-if(args["templatecsspath"]){
-args["templateCssPath"]=args["templatecsspath"];
-}
-var _a05=args["templateCssPath"]||this.templateCssPath;
-if(_a05&&!dojo.widget._cssFiles[_a05.toString()]){
-if((!this.templateCssString)&&(_a05)){
-this.templateCssString=dojo.hostenv.getText(_a05);
-this.templateCssPath=null;
-}
-dojo.widget._cssFiles[_a05.toString()]=true;
-}
-if((this["templateCssString"])&&(!this.templateCssString["loaded"])){
-dojo.html.insertCssText(this.templateCssString,null,_a05);
-if(!this.templateCssString){
-this.templateCssString="";
-}
-this.templateCssString.loaded=true;
-}
-if((!this.preventClobber)&&((this.templatePath)||(this.templateNode)||((this["templateString"])&&(this.templateString.length))||((typeof ts!="undefined")&&((ts["string"])||(ts["node"]))))){
-this.buildFromTemplate(args,frag);
-}else{
-this.domNode=this.getFragNodeRef(frag);
-}
-this.fillInTemplate(args,frag);
-},buildFromTemplate:function(args,frag){
-var _a08=false;
-if(args["templatepath"]){
-_a08=true;
-args["templatePath"]=args["templatepath"];
-}
-dojo.widget.fillFromTemplateCache(this,args["templatePath"],null,_a08);
-var ts=dojo.widget._templateCache[this.widgetType];
-if((ts)&&(!_a08)){
-if(!this.templateString.length){
-this.templateString=ts["string"];
-}
-if(!this.templateNode){
-this.templateNode=ts["node"];
-}
-}
-var _a0a=false;
-var node=null;
-var tstr=this.templateString;
-if((!this.templateNode)&&(this.templateString)){
-_a0a=this.templateString.match(/\$\{([^\}]+)\}/g);
-if(_a0a){
-var hash=this.strings||{};
-for(var key in dojo.widget.defaultStrings){
-if(dojo.lang.isUndefined(hash[key])){
-hash[key]=dojo.widget.defaultStrings[key];
-}
-}
-for(var i=0;i<_a0a.length;i++){
-var key=_a0a[i];
-key=key.substring(2,key.length-1);
-var kval=(key.substring(0,5)=="this.")?dojo.lang.getObjPathValue(key.substring(5),this):hash[key];
-var _a11;
-if((kval)||(dojo.lang.isString(kval))){
-_a11=new String((dojo.lang.isFunction(kval))?kval.call(this,key,this.templateString):kval);
-while(_a11.indexOf("\"")>-1){
-_a11=_a11.replace("\"","&quot;");
-}
-tstr=tstr.replace(_a0a[i],_a11);
-}
-}
-}else{
-this.templateNode=this.createNodesFromText(this.templateString,true)[0];
-if(!_a08){
-ts.node=this.templateNode;
-}
-}
-}
-if((!this.templateNode)&&(!_a0a)){
-dojo.debug("DomWidget.buildFromTemplate: could not create template");
-return false;
-}else{
-if(!_a0a){
-node=this.templateNode.cloneNode(true);
-if(!node){
-return false;
-}
-}else{
-node=this.createNodesFromText(tstr,true)[0];
-}
-}
-this.domNode=node;
-this.attachTemplateNodes();
-if(this.isContainer&&this.containerNode){
-var src=this.getFragNodeRef(frag);
-if(src){
-dojo.dom.moveChildren(src,this.containerNode);
-}
-}
-},attachTemplateNodes:function(_a13,_a14){
-if(!_a13){
-_a13=this.domNode;
-}
-if(!_a14){
-_a14=this;
-}
-return dojo.widget.attachTemplateNodes(_a13,_a14,dojo.widget.getDojoEventsFromStr(this.templateString));
-},fillInTemplate:function(){
-},destroyRendering:function(){
-try{
-delete this.domNode;
-}
-catch(e){
-}
-},cleanUp:function(){
-},getContainerHeight:function(){
-dojo.unimplemented("dojo.widget.DomWidget.getContainerHeight");
-},getContainerWidth:function(){
-dojo.unimplemented("dojo.widget.DomWidget.getContainerWidth");
-},createNodesFromText:function(){
-dojo.unimplemented("dojo.widget.DomWidget.createNodesFromText");
-}});
+
+dojo.widget.attachTemplateNodes = function( /*DomNode*/   rootNode, 
+                      /*Widget*/    targetObj, 
+                      /*Array*/   events ){
+  // summary:
+  //    map widget properties and functions to the handlers specified in
+  //    the dom node and it's descendants. This function iterates over all
+  //    nodes and looks for these properties:
+  //      * dojoAttachPoint
+  //      * dojoAttachEvent 
+  //      * waiRole
+  //      * waiState
+  //      * any "dojoOn*" proprties passed in the events array
+  // rootNode:
+  //    the node to search for properties. All children will be searched.
+  // events: a list of properties generated from getDojoEventsFromStr.
+
+  // FIXME: this method is still taking WAAAY too long. We need ways of optimizing:
+  //  a.) what we are looking for on each node
+  //  b.) the nodes that are subject to interrogation (use xpath instead?)
+  //  c.) how expensive event assignment is (less eval(), more connect())
+  // var start = new Date();
+  var elementNodeType = dojo.dom.ELEMENT_NODE;
+
+  function trim(str){
+    return str.replace(/^\s+|\s+$/g, "");
+  }
+
+  if(!rootNode){ 
+    rootNode = targetObj.domNode;
+  }
+
+  if(rootNode.nodeType != elementNodeType){
+    return;
+  }
+  // alert(events.length);
+
+  var nodes = rootNode.all || rootNode.getElementsByTagName("*");
+  var _this = targetObj;
+  for(var x=-1; x<nodes.length; x++){
+    var baseNode = (x == -1) ? rootNode : nodes[x];
+    // FIXME: is this going to have capitalization problems?  Could use getAttribute(name, 0); to get attributes case-insensitve
+    var attachPoint = [];
+    if(!targetObj.widgetsInTemplate || !baseNode.getAttribute('dojoType')){
+      for(var y=0; y<this.attachProperties.length; y++){
+        var tmpAttachPoint = baseNode.getAttribute(this.attachProperties[y]);
+        if(tmpAttachPoint){
+          attachPoint = tmpAttachPoint.split(";");
+          for(var z=0; z<attachPoint.length; z++){
+            if(dojo.lang.isArray(targetObj[attachPoint[z]])){
+              targetObj[attachPoint[z]].push(baseNode);
+            }else{
+              targetObj[attachPoint[z]]=baseNode;
+            }
+          }
+          break;
+        }
+      }
+
+      var attachEvent = baseNode.getAttribute(this.eventAttachProperty);
+      if(attachEvent){
+        // NOTE: we want to support attributes that have the form
+        // "domEvent: nativeEvent; ..."
+        var evts = attachEvent.split(";");
+        for(var y=0; y<evts.length; y++){
+          if((!evts[y])||(!evts[y].length)){ continue; }
+          var thisFunc = null;
+          var tevt = trim(evts[y]);
+          if(evts[y].indexOf(":") >= 0){
+            // oh, if only JS had tuple assignment
+            var funcNameArr = tevt.split(":");
+            tevt = trim(funcNameArr[0]);
+            thisFunc = trim(funcNameArr[1]);
+          }
+          if(!thisFunc){
+            thisFunc = tevt;
+          }
+  
+          var tf = function(){ 
+            var ntf = new String(thisFunc);
+            return function(evt){
+              if(_this[ntf]){
+                _this[ntf](dojo.event.browser.fixEvent(evt, this));
+              }
+            };
+          }();
+          dojo.event.browser.addListener(baseNode, tevt, tf, false, true);
+          // dojo.event.browser.addListener(baseNode, tevt, dojo.lang.hitch(_this, thisFunc));
+        }
+      }
+  
+      for(var y=0; y<events.length; y++){
+        //alert(events[x]);
+        var evtVal = baseNode.getAttribute(events[y]);
+        if((evtVal)&&(evtVal.length)){
+          var thisFunc = null;
+          var domEvt = events[y].substr(4); // clober the "dojo" prefix
+          thisFunc = trim(evtVal);
+          var funcs = [thisFunc];
+          if(thisFunc.indexOf(";")>=0){
+            funcs = dojo.lang.map(thisFunc.split(";"), trim);
+          }
+          for(var z=0; z<funcs.length; z++){
+            if(!funcs[z].length){ continue; }
+            var tf = function(){ 
+              var ntf = new String(funcs[z]);
+              return function(evt){
+                if(_this[ntf]){
+                  _this[ntf](dojo.event.browser.fixEvent(evt, this));
+                }
+              }
+            }();
+            dojo.event.browser.addListener(baseNode, domEvt, tf, false, true);
+            // dojo.event.browser.addListener(baseNode, domEvt, dojo.lang.hitch(_this, funcs[z]));
+          }
+        }
+      }
+    }
+    // continue;
+
+    // FIXME: we need to put this into some kind of lookup structure
+    // instead of direct assignment
+    var tmpltPoint = baseNode.getAttribute(this.templateProperty);
+    if(tmpltPoint){
+      targetObj[tmpltPoint]=baseNode;
+    }
+
+    dojo.lang.forEach(dojo.widget.waiNames, function(name){
+      var wai = dojo.widget.wai[name];
+      var val = baseNode.getAttribute(wai.name);
+      if(val){
+        if(val.indexOf('-') == -1){ 
+          dojo.widget.wai.setAttr(baseNode, wai.name, "role", val);
+        }else{
+          // this is a state-value pair
+          var statePair = val.split('-');
+          dojo.widget.wai.setAttr(baseNode, wai.name, statePair[0], statePair[1]);
+        }
+      }
+    }, this);
+
+    var onBuild = baseNode.getAttribute(this.onBuildProperty);
+    if(onBuild){
+      eval("var node = baseNode; var widget = targetObj; "+onBuild);
+    }
+  }
+
+}
+
+dojo.widget.getDojoEventsFromStr = function(/*String*/str){
+  // summary:
+  //    generates a list of properties with names that match the form
+  //    dojoOn*
+  // str: the template string to search
+  
+  // var lstr = str.toLowerCase();
+  var re = /(dojoOn([a-z]+)(\s?))=/gi;
+  var evts = str ? str.match(re)||[] : [];
+  var ret = [];
+  var lem = {};
+  for(var x=0; x<evts.length; x++){
+    if(evts[x].length < 1){ continue; }
+    var cm = evts[x].replace(/\s/, "");
+    cm = (cm.slice(0, cm.length-1));
+    if(!lem[cm]){
+      lem[cm] = true;
+      ret.push(cm);
+    }
+  }
+  return ret; // Array
+}
+
+/*
+dojo.widget.buildAndAttachTemplate = function(obj, templatePath, templateCssPath, templateString, targetObj) {
+  this.buildFromTemplate(obj, templatePath, templateCssPath, templateString);
+  var node = dojo.dom.createNodesFromText(obj.templateString, true)[0];
+  this.attachTemplateNodes(node, targetObj||obj, dojo.widget.getDojoEventsFromStr(templateString));
+  return node;
+}
+*/
+
+
+// summary:
+//    dojo.widget.DomWidget is the superclass that provides behavior for all
+//    DOM-based renderers, including HtmlWidget and SvgWidget. DomWidget
+//    implements the templating system that most widget authors use to define
+//    the UI for their widgets.
+dojo.declare("dojo.widget.DomWidget", 
+  dojo.widget.Widget,
+  function(){
+    if((arguments.length>0)&&(typeof arguments[0] == "object")){
+      this.create(arguments[0]);
+    }
+  },
+  {              
+    // DomNode: a node that represents the widget template. Pre-empts both templateString and templatePath.
+    templateNode: null,
+
+    // String:
+    //    a string that represents the widget template. Pre-empts the
+    //    templatePath. In builds that have their strings "interned", the
+    //    templatePath is converted to an inline templateString, thereby
+    //    preventing a synchronous network call.
+    templateString: null,
+
+    // String:
+    //    a string that represents the CSS for the widgettemplate.
+    //    Pre-empts the templateCssPath. In builds that have their
+    //    strings "interned", the templateCssPath is converted to an
+    //    inline templateCssString, thereby preventing a synchronous
+    //    network call.
+    templateCssString: null,
+
+    // Boolean:
+    //    should the widget not replace the node from which it was
+    //    constructed? Widgets that apply behaviors to pre-existing parts
+    //    of a page can be implemented easily by setting this to "true".
+    //    In these cases, the domNode property will point to the node
+    //    which the widget was created from.
+    preventClobber: false,
+
+    // DomNode:
+    //    this is our visible representation of the widget! Other DOM
+    //    Nodes may by assigned to other properties, usually through the
+    //    template system's dojoAttachPonit syntax, but the domNode
+    //    property is the canonical "top level" node in widget UI.
+    domNode: null, 
+
+    // DomNode:
+    //    holds child elements. "containerNode" is generally set via a
+    //    dojoAttachPoint assignment and it designates where widgets that
+    //    are defined as "children" of the parent will be placed
+    //    visually.
+    containerNode: null,
+
+    // Boolean:
+    //    should we parse the template to find widgets that might be
+    //    declared in markup inside it? false by default.
+    widgetsInTemplate: false,
+
+    addChild: function( /*Widget*/        widget, 
+              /*DomNode, optional*/ overrideContainerNode, 
+              /*String, optional*/  pos, 
+              /*DomNode, optional*/ ref,
+              /*int, optional*/   insertIndex){
+      // summary:
+      //    Process the given child widget, inserting it's dom node as
+      //    a child of our dom node
+      // overrideContainerNode: a non-default container node for the widget
+      // pos:
+      //    can be one of "before", "after", "first", or "last". This
+      //    has the same meaning as in dojo.dom.insertAtPosition()
+      // ref: a node to place the widget relative to
+      // insertIndex: DOM index, same meaning as in dojo.dom.insertAtIndex()
+
+      // FIXME: should we support addition at an index in the children arr and
+      // order the display accordingly? Right now we always append.
+      if(!this.isContainer){ // we aren't allowed to contain other widgets, it seems
+        dojo.debug("dojo.widget.DomWidget.addChild() attempted on non-container widget");
+        return null;
+      }else{
+        if(insertIndex == undefined){
+          insertIndex = this.children.length;
+        }
+        this.addWidgetAsDirectChild(widget, overrideContainerNode, pos, ref, insertIndex);
+        this.registerChild(widget, insertIndex);
+      }
+      return widget; // Widget: the widget that was inserted
+    },
+    
+    addWidgetAsDirectChild: function( /*Widget*/        widget, 
+                      /*DomNode*/       overrideContainerNode, 
+                      /*String, optional*/  pos, 
+                      /*DomNode, optional*/ ref, 
+                      /*int, optional*/   insertIndex){
+      // summary:
+      //    Process the given child widget, inserting it's dom node as
+      //    a child of our dom node
+      // overrideContainerNode: a non-default container node for the widget
+      // pos:
+      //    can be one of "before", "after", "first", or "last". This
+      //    has the same meaning as in dojo.dom.insertAtPosition()
+      // ref: a node to place the widget relative to
+      // insertIndex: DOM index, same meaning as in dojo.dom.insertAtIndex()
+      if((!this.containerNode)&&(!overrideContainerNode)){
+        this.containerNode = this.domNode;
+      }
+      var cn = (overrideContainerNode) ? overrideContainerNode : this.containerNode;
+      if(!pos){ pos = "after"; }
+      if(!ref){ 
+        if(!cn){ cn = dojo.body(); }
+        ref = cn.lastChild; 
+      }
+      if(!insertIndex) { insertIndex = 0; }
+      widget.domNode.setAttribute("dojoinsertionindex", insertIndex);
+
+      // insert the child widget domNode directly underneath my domNode, in the
+      // specified position (by default, append to end)
+      if(!ref){
+        cn.appendChild(widget.domNode);
+      }else{
+        // FIXME: was this meant to be the (ugly hack) way to support insert @ index?
+        //dojo.dom[pos](widget.domNode, ref, insertIndex);
+
+        // CAL: this appears to be the intended way to insert a node at a given position...
+        if (pos == 'insertAtIndex'){
+          // dojo.debug("idx:", insertIndex, "isLast:", ref === cn.lastChild);
+          dojo.dom.insertAtIndex(widget.domNode, ref.parentNode, insertIndex);
+        }else{
+          // dojo.debug("pos:", pos, "isLast:", ref === cn.lastChild);
+          if((pos == "after")&&(ref === cn.lastChild)){
+            cn.appendChild(widget.domNode);
+          }else{
+            dojo.dom.insertAtPosition(widget.domNode, cn, pos);
+          }
+        }
+      }
+    },
+
+    registerChild: function(/*Widget*/widget, /*int*/insertionIndex){
+      // summary: record that given widget descends from me
+      // widget: the widget that is now a child
+      // inesrtionIndex: where in the children[] array to place it
+
+      // we need to insert the child at the right point in the parent's 
+      // 'children' array, based on the insertionIndex
+
+      widget.dojoInsertionIndex = insertionIndex;
+
+      var idx = -1;
+      for(var i=0; i<this.children.length; i++){
+
+        //This appears to fix an out of order issue in the case of mixed
+        //markup and programmatically added children.  Previously, if a child
+        //existed from markup, and another child was addChild()d without specifying
+        //any additional parameters, it would end up first in the list, when in fact
+        //it should be after.  I can't see cases where this would break things, but
+        //I could see no other obvious solution. -dustin
+
+        if (this.children[i].dojoInsertionIndex <= insertionIndex){
+          idx = i;
+        }
+      }
+
+      this.children.splice(idx+1, 0, widget);
+
+      widget.parent = this;
+      widget.addedTo(this, idx+1);
+      
+      // If this widget was created programatically, then it was erroneously added
+      // to dojo.widget.manager.topWidgets.  Fix that here.
+      delete dojo.widget.manager.topWidgets[widget.widgetId];
+    },
+
+    removeChild: function(/*Widget*/widget){
+      // summary: detach child domNode from parent domNode
+      dojo.dom.removeNode(widget.domNode);
+
+      // remove child widget from parent widget 
+      return dojo.widget.DomWidget.superclass.removeChild.call(this, widget); // Widget
+    },
+
+    getFragNodeRef: function(/*Object*/frag){
+      // summary:
+      //    returns the source node, if any, that the widget was
+      //    declared from
+      // frag:
+      //    an opaque data structure generated by the first-pass parser
+      if(!frag){return null;} // null
+      if(!frag[this.getNamespacedType()]){
+        dojo.raise("Error: no frag for widget type " + this.getNamespacedType() 
+          + ", id " + this.widgetId
+          + " (maybe a widget has set it's type incorrectly)");
+      }
+      return frag[this.getNamespacedType()]["nodeRef"]; // DomNode
+    },
+    
+    postInitialize: function(/*Object*/args, /*Object*/frag, /*Widget*/parentComp){
+      // summary:
+      //    Replace the source domNode with the generated dom
+      //    structure, and register the widget with its parent.
+      //    This is an implementation of the stub function defined in
+      //    dojo.widget.Widget.
+      
+      //dojo.profile.start(this.widgetType + " postInitialize");
+      
+      var sourceNodeRef = this.getFragNodeRef(frag);
+      // Stick my generated dom into the output tree
+      //alert(this.widgetId + ": replacing " + sourceNodeRef + " with " + this.domNode.innerHTML);
+      if (parentComp && (parentComp.snarfChildDomOutput || !sourceNodeRef)){
+        // Add my generated dom as a direct child of my parent widget
+        // This is important for generated widgets, and also cases where I am generating an
+        // <li> node that can't be inserted back into the original DOM tree
+        parentComp.addWidgetAsDirectChild(this, "", "insertAtIndex", "",  args["dojoinsertionindex"], sourceNodeRef);
+      } else if (sourceNodeRef){
+        // Do in-place replacement of the my source node with my generated dom
+        if(this.domNode && (this.domNode !== sourceNodeRef)){
+          var oldNode = sourceNodeRef.parentNode.replaceChild(this.domNode, sourceNodeRef);
+        }
+      }
+
+      // Register myself with my parent, or with the widget manager if
+      // I have no parent
+      // TODO: the code below erroneously adds all programatically generated widgets
+      // to topWidgets (since we don't know who the parent is until after creation finishes)
+      if ( parentComp ) {
+        parentComp.registerChild(this, args.dojoinsertionindex);
+      } else {
+        dojo.widget.manager.topWidgets[this.widgetId]=this;
+      }
+
+      if(this.widgetsInTemplate){
+        var parser = new dojo.xml.Parse();
+
+        var subContainerNode;
+        //TODO: use xpath here?
+        var subnodes = this.domNode.getElementsByTagName("*");
+        for(var i=0;i<subnodes.length;i++){
+          if(subnodes[i].getAttribute('dojoAttachPoint') == 'subContainerWidget'){
+            subContainerNode = subnodes[i];
+//            break;
+          }
+          if(subnodes[i].getAttribute('dojoType')){
+            subnodes[i].setAttribute('_isSubWidget', true);
+          }
+        }
+        if (this.isContainer && !this.containerNode){
+          //no containerNode is available, which means a widget is used as a container. find it here and move
+          //all dom nodes defined in the main html page as children of this.domNode into the actual container
+          //widget's node (at this point, the subwidgets defined in the template file is not parsed yet)
+          if(subContainerNode){
+            var src = this.getFragNodeRef(frag);
+            if (src){
+              dojo.dom.moveChildren(src, subContainerNode);
+              //do not need to follow children nodes in the main html page, as they
+              //will be dealt with in the subContainerWidget
+              frag['dojoDontFollow'] = true;
+            }
+          }else{
+            dojo.debug("No subContainerWidget node can be found in template file for widget "+this);
+          }
+        }
+
+        var templatefrag = parser.parseElement(this.domNode, null, true);
+        // createSubComponents not createComponents because frag has already been created
+        dojo.widget.getParser().createSubComponents(templatefrag, this);
+  
+        //find all the sub widgets defined in the template file of this widget
+        var subwidgets = [];
+        var stack = [this];
+        var w;
+        while((w = stack.pop())){
+          for(var i = 0; i < w.children.length; i++){
+            var cwidget = w.children[i];
+            if(cwidget._processedSubWidgets || !cwidget.extraArgs['_issubwidget']){ continue; }
+            subwidgets.push(cwidget);
+            if(cwidget.isContainer){
+              stack.push(cwidget);
+            }
+          }
+        }
+  
+        //connect event to this widget/attach dom node
+        for(var i = 0; i < subwidgets.length; i++){
+          var widget = subwidgets[i];
+          if(widget._processedSubWidgets){
+            dojo.debug("This should not happen: widget._processedSubWidgets is already true!");
+            return;
+          }
+          widget._processedSubWidgets = true;
+          if(widget.extraArgs['dojoattachevent']){
+            var evts = widget.extraArgs['dojoattachevent'].split(";");
+            for(var j=0; j<evts.length; j++){
+              var thisFunc = null;
+              var tevt = dojo.string.trim(evts[j]);
+              if(tevt.indexOf(":") >= 0){
+                // oh, if only JS had tuple assignment
+                var funcNameArr = tevt.split(":");
+                tevt = dojo.string.trim(funcNameArr[0]);
+                thisFunc = dojo.string.trim(funcNameArr[1]);
+              }
+              if(!thisFunc){
+                thisFunc = tevt;
+              }
+              if(dojo.lang.isFunction(widget[tevt])){
+                dojo.event.kwConnect({
+                  srcObj: widget, 
+                  srcFunc: tevt, 
+                  targetObj: this, 
+                  targetFunc: thisFunc
+                });
+              }else{
+                alert(tevt+" is not a function in widget "+widget);
+              }
+            }
+          }
+  
+          if(widget.extraArgs['dojoattachpoint']){
+            //don't attach widget.domNode here, as we do not know which
+            //dom node we should connect to (in checkbox widget case, 
+            //it is inputNode). So we make the widget itself available
+            this[widget.extraArgs['dojoattachpoint']] = widget;
+          }
+        }
+      }
+
+      //dojo.profile.end(this.widgetType + " postInitialize");
+
+      // Expand my children widgets
+      /* dojoDontFollow is important for a very special case
+       * basically if you have a widget that you instantiate from script
+       * and that widget is a container, and it contains a reference to a parent
+       * instance, the parser will start recursively parsing until the browser
+       * complains.  So the solution is to set an initialization property of 
+       * dojoDontFollow: true and then it won't recurse where it shouldn't
+       */
+      if(this.isContainer && !frag["dojoDontFollow"]){
+        //alert("recurse from " + this.widgetId);
+        // build any sub-components with us as the parent
+        dojo.widget.getParser().createSubComponents(frag, this);
+      }
+    },
+
+    // method over-ride
+    buildRendering: function(/*Object*/args, /*Object*/frag){
+      // summary:
+      //    Construct the UI for this widget, generally from a
+      //    template. This can be over-ridden for custom UI creation to
+      //    to side-step the template system.  This is an
+      //    implementation of the stub function defined in
+      //    dojo.widget.Widget.
+
+      // DOM widgets construct themselves from a template
+      var ts = dojo.widget._templateCache[this.widgetType];
+      
+      // Handle style for this widget here, as even if templatePath
+      // is not set, style specified by templateCssString or templateCssPath
+      // should be applied. templateCssString has higher priority
+      // than templateCssPath
+      if(args["templatecsspath"]){
+        args["templateCssPath"] = args["templatecsspath"];
+      }
+      var cpath = args["templateCssPath"] || this.templateCssPath;
+      if(cpath && !dojo.widget._cssFiles[cpath.toString()]){
+        if((!this.templateCssString)&&(cpath)){
+          this.templateCssString = dojo.hostenv.getText(cpath);
+          this.templateCssPath = null;
+        }
+        dojo.widget._cssFiles[cpath.toString()] = true;
+      }
+    
+      if((this["templateCssString"])&&(!this.templateCssString["loaded"])){
+        dojo.html.insertCssText(this.templateCssString, null, cpath);
+        if(!this.templateCssString){ this.templateCssString = ""; }
+        this.templateCssString.loaded = true;
+      }
+      if( 
+        (!this.preventClobber)&&(
+          (this.templatePath)||
+          (this.templateNode)||
+          (
+            (this["templateString"])&&(this.templateString.length) 
+          )||
+          (
+            (typeof ts != "undefined")&&( (ts["string"])||(ts["node"]) )
+          )
+        )
+      ){
+        // if it looks like we can build the thing from a template, do it!
+        this.buildFromTemplate(args, frag);
+      }else{
+        // otherwise, assign the DOM node that was the source of the widget
+        // parsing to be the root node
+        this.domNode = this.getFragNodeRef(frag);
+      }
+      this.fillInTemplate(args, frag);  // this is where individual widgets
+                        // will handle population of data
+                        // from properties, remote data
+                        // sets, etc.
+  },
+
+    buildFromTemplate: function(/*Object*/args, /*Object*/frag){
+      // summary:
+      //    Called by buildRendering, creates the actual UI in a DomWidget.
+
+      // var start = new Date();
+      // copy template properties if they're already set in the templates object
+      // dojo.debug("buildFromTemplate:", this);
+      var avoidCache = false;
+      if(args["templatepath"]){
+        avoidCache = true;
+        args["templatePath"] = args["templatepath"];
+      }
+      dojo.widget.fillFromTemplateCache(  this, 
+                        args["templatePath"], 
+                        null,
+                        avoidCache);
+      var ts = dojo.widget._templateCache[this.widgetType];
+      if((ts)&&(!avoidCache)){
+        if(!this.templateString.length){
+          this.templateString = ts["string"];
+        }
+        if(!this.templateNode){
+          this.templateNode = ts["node"];
+        }
+      }
+      var matches = false;
+      var node = null;
+      // var tstr = new String(this.templateString); 
+      var tstr = this.templateString; 
+      // attempt to clone a template node, if there is one
+      if((!this.templateNode)&&(this.templateString)){
+        matches = this.templateString.match(/\$\{([^\}]+)\}/g);
+        if(matches) {
+          // if we do property replacement, don't create a templateNode
+          // to clone from.
+          var hash = this.strings || {};
+          // FIXME: should this hash of default replacements be cached in
+          // templateString?
+          for(var key in dojo.widget.defaultStrings) {
+            if(dojo.lang.isUndefined(hash[key])) {
+              hash[key] = dojo.widget.defaultStrings[key];
+            }
+          }
+          // FIXME: this is a lot of string munging. Can we make it faster?
+          for(var i = 0; i < matches.length; i++) {
+            var key = matches[i];
+            key = key.substring(2, key.length-1);
+            var kval = (key.substring(0, 5) == "this.") ? dojo.lang.getObjPathValue(key.substring(5), this) : hash[key];
+            var value;
+            if((kval)||(dojo.lang.isString(kval))){
+              value = new String((dojo.lang.isFunction(kval)) ? kval.call(this, key, this.templateString) : kval);
+              // Safer substitution, see heading "Attribute values" in  
+              // http://www.w3.org/TR/REC-html40/appendix/notes.html#h-B.3.2
+              while (value.indexOf("\"") > -1) {
+                value=value.replace("\"","&quot;");
+              }
+              tstr = tstr.replace(matches[i], value);
+            }
+          }
+        }else{
+          // otherwise, we are required to instantiate a copy of the template
+          // string if one is provided.
+          
+          // FIXME: need to be able to distinguish here what should be done
+          // or provide a generic interface across all DOM implementations
+          // FIMXE: this breaks if the template has whitespace as its first 
+          // characters
+          // node = this.createNodesFromText(this.templateString, true);
+          // this.templateNode = node[0].cloneNode(true); // we're optimistic here
+          this.templateNode = this.createNodesFromText(this.templateString, true)[0];
+          if(!avoidCache){
+            ts.node = this.templateNode;
+          }
+        }
+      }
+      if((!this.templateNode)&&(!matches)){ 
+        dojo.debug("DomWidget.buildFromTemplate: could not create template");
+        return false;
+      }else if(!matches){
+        node = this.templateNode.cloneNode(true);
+        if(!node){ return false; }
+      }else{
+        node = this.createNodesFromText(tstr, true)[0];
+      }
+
+      // recurse through the node, looking for, and attaching to, our
+      // attachment points which should be defined on the template node.
+
+      this.domNode = node;
+      // dojo.profile.start("attachTemplateNodes");
+      this.attachTemplateNodes();
+      // dojo.profile.end("attachTemplateNodes");
+    
+      // relocate source contents to templated container node
+      // this.containerNode must be able to receive children, or exceptions will be thrown
+      if (this.isContainer && this.containerNode){
+        var src = this.getFragNodeRef(frag);
+        if (src){
+          dojo.dom.moveChildren(src, this.containerNode);
+        }
+      }
+    },
+
+    attachTemplateNodes: function(/*DomNode*/baseNode, /*Widget*/targetObj){
+      // summary: 
+      //    hooks up event handlers and property/node linkages. Calls
+      //    dojo.widget.attachTemplateNodes to do all the hard work.
+      // baseNode: defaults to "this.domNode"
+      // targetObj: defaults to "this"
+      if(!baseNode){ baseNode = this.domNode; }
+      if(!targetObj){ targetObj = this; }
+      return dojo.widget.attachTemplateNodes(baseNode, targetObj, 
+            dojo.widget.getDojoEventsFromStr(this.templateString));
+    },
+
+    fillInTemplate: function(){
+      // summary:
+      //    stub function! sub-classes may use as a default UI
+      //    initializer function. The UI rendering will be available by
+      //    the time this is called from buildRendering. If
+      //    buildRendering is over-ridden, this function may not be
+      //    fired!
+      // dojo.unimplemented("dojo.widget.DomWidget.fillInTemplate");
+    },
+    
+    // method over-ride
+    destroyRendering: function(){
+      // summary: UI destructor
+      try{
+        delete this.domNode;
+      }catch(e){ /* squelch! */ }
+    },
+
+    // FIXME: method over-ride
+    cleanUp: function(){},
+    
+    getContainerHeight: function(){
+      // summary: unimplemented!
+      dojo.unimplemented("dojo.widget.DomWidget.getContainerHeight");
+    },
+
+    getContainerWidth: function(){
+      // summary: unimplemented!
+      dojo.unimplemented("dojo.widget.DomWidget.getContainerWidth");
+    },
+
+    createNodesFromText: function(){
+      // summary: unimplemented!
+      dojo.unimplemented("dojo.widget.DomWidget.createNodesFromText");
+    }
+  }
+);
+
 dojo.provide("dojo.lfx.toggle");
-dojo.lfx.toggle.plain={show:function(node,_a16,_a17,_a18){
-dojo.html.show(node);
-if(dojo.lang.isFunction(_a18)){
-_a18();
+
+dojo.lfx.toggle.plain = {
+  show: function(node, duration, easing, callback){
+    dojo.html.show(node);
+    if(dojo.lang.isFunction(callback)){ callback(); }
+  },
+  
+  hide: function(node, duration, easing, callback){
+    dojo.html.hide(node);
+    if(dojo.lang.isFunction(callback)){ callback(); }
+  }
 }
-},hide:function(node,_a1a,_a1b,_a1c){
-dojo.html.hide(node);
-if(dojo.lang.isFunction(_a1c)){
-_a1c();
+
+dojo.lfx.toggle.fade = {
+  show: function(node, duration, easing, callback){
+    dojo.lfx.fadeShow(node, duration, easing, callback).play();
+  },
+
+  hide: function(node, duration, easing, callback){
+    dojo.lfx.fadeHide(node, duration, easing, callback).play();
+  }
 }
-}};
-dojo.lfx.toggle.fade={show:function(node,_a1e,_a1f,_a20){
-dojo.lfx.fadeShow(node,_a1e,_a1f,_a20).play();
-},hide:function(node,_a22,_a23,_a24){
-dojo.lfx.fadeHide(node,_a22,_a23,_a24).play();
-}};
-dojo.lfx.toggle.wipe={show:function(node,_a26,_a27,_a28){
-dojo.lfx.wipeIn(node,_a26,_a27,_a28).play();
-},hide:function(node,_a2a,_a2b,_a2c){
-dojo.lfx.wipeOut(node,_a2a,_a2b,_a2c).play();
-}};
-dojo.lfx.toggle.explode={show:function(node,_a2e,_a2f,_a30,_a31){
-dojo.lfx.explode(_a31||{x:0,y:0,width:0,height:0},node,_a2e,_a2f,_a30).play();
-},hide:function(node,_a33,_a34,_a35,_a36){
-dojo.lfx.implode(node,_a36||{x:0,y:0,width:0,height:0},_a33,_a34,_a35).play();
-}};
+
+dojo.lfx.toggle.wipe = {
+  show: function(node, duration, easing, callback){
+    dojo.lfx.wipeIn(node, duration, easing, callback).play();
+  },
+
+  hide: function(node, duration, easing, callback){
+    dojo.lfx.wipeOut(node, duration, easing, callback).play();
+  }
+}
+
+dojo.lfx.toggle.explode = {
+  show: function(node, duration, easing, callback, explodeSrc){
+    dojo.lfx.explode(explodeSrc||{x:0,y:0,width:0,height:0}, node, duration, easing, callback).play();
+  },
+
+  hide: function(node, duration, easing, callback, explodeSrc){
+    dojo.lfx.implode(node, explodeSrc||{x:0,y:0,width:0,height:0}, duration, easing, callback).play();
+  }
+}
+
 dojo.provide("dojo.widget.HtmlWidget");
-dojo.declare("dojo.widget.HtmlWidget",dojo.widget.DomWidget,{widgetType:"HtmlWidget",templateCssPath:null,templatePath:null,lang:"",toggle:"plain",toggleDuration:150,animationInProgress:false,initialize:function(args,frag){
-},postMixInProperties:function(args,frag){
-if(this.lang===""){
-this.lang=null;
-}
-this.toggleObj=dojo.lfx.toggle[this.toggle.toLowerCase()]||dojo.lfx.toggle.plain;
-},getContainerHeight:function(){
-dojo.unimplemented("dojo.widget.HtmlWidget.getContainerHeight");
-},getContainerWidth:function(){
-return this.parent.domNode.offsetWidth;
-},setNativeHeight:function(_a3b){
-var ch=this.getContainerHeight();
-},createNodesFromText:function(txt,wrap){
-return dojo.html.createNodesFromText(txt,wrap);
-},destroyRendering:function(_a3f){
-try{
-if(!_a3f&&this.domNode){
-dojo.event.browser.clean(this.domNode);
-}
-this.domNode.parentNode.removeChild(this.domNode);
-delete this.domNode;
-}
-catch(e){
-}
-},isShowing:function(){
-return dojo.html.isShowing(this.domNode);
-},toggleShowing:function(){
-if(this.isHidden){
-this.show();
-}else{
-this.hide();
-}
-},show:function(){
-this.animationInProgress=true;
-this.isHidden=false;
-this.toggleObj.show(this.domNode,this.toggleDuration,null,dojo.lang.hitch(this,this.onShow),this.explodeSrc);
-},onShow:function(){
-this.animationInProgress=false;
-this.checkSize();
-},hide:function(){
-this.animationInProgress=true;
-this.isHidden=true;
-this.toggleObj.hide(this.domNode,this.toggleDuration,null,dojo.lang.hitch(this,this.onHide),this.explodeSrc);
-},onHide:function(){
-this.animationInProgress=false;
-},_isResized:function(w,h){
-if(!this.isShowing()){
-return false;
-}
-var wh=dojo.html.getMarginBox(this.domNode);
-var _a43=w||wh.width;
-var _a44=h||wh.height;
-if(this.width==_a43&&this.height==_a44){
-return false;
-}
-this.width=_a43;
-this.height=_a44;
-return true;
-},checkSize:function(){
-if(!this._isResized()){
-return;
-}
-this.onResized();
-},resizeTo:function(w,h){
-dojo.html.setMarginBox(this.domNode,{width:w,height:h});
-if(this.isShowing()){
-this.onResized();
-}
-},resizeSoon:function(){
-if(this.isShowing()){
-dojo.lang.setTimeout(this,this.onResized,0);
-}
-},onResized:function(){
-dojo.lang.forEach(this.children,function(_a47){
-if(_a47.checkSize){
-_a47.checkSize();
-}
+
+dojo.declare("dojo.widget.HtmlWidget", dojo.widget.DomWidget, {                
+  widgetType: "HtmlWidget",
+
+  templateCssPath: null,
+  templatePath: null,
+
+  lang: "",
+  // for displaying/hiding widget
+  toggle: "plain",
+  toggleDuration: 150,
+
+  animationInProgress: false,
+
+  initialize: function(args, frag){
+  },
+
+  postMixInProperties: function(args, frag){
+    if(this.lang === ""){this.lang = null;}
+    // now that we know the setting for toggle, get toggle object
+    // (default to plain toggler if user specified toggler not present)
+    this.toggleObj =
+      dojo.lfx.toggle[this.toggle.toLowerCase()] || dojo.lfx.toggle.plain;
+  },
+
+  getContainerHeight: function(){
+    // NOTE: container height must be returned as the INNER height
+    dojo.unimplemented("dojo.widget.HtmlWidget.getContainerHeight");
+  },
+
+  getContainerWidth: function(){
+    return this.parent.domNode.offsetWidth;
+  },
+
+  setNativeHeight: function(height){
+    var ch = this.getContainerHeight();
+  },
+
+  createNodesFromText: function(txt, wrap){
+    return dojo.html.createNodesFromText(txt, wrap);
+  },
+
+  destroyRendering: function(finalize){
+    try{
+      if(!finalize && this.domNode){
+        dojo.event.browser.clean(this.domNode);
+      }
+      this.domNode.parentNode.removeChild(this.domNode);
+      delete this.domNode;
+    }catch(e){ /* squelch! */ }
+  },
+
+  /////////////////////////////////////////////////////////
+  // Displaying/hiding the widget
+  /////////////////////////////////////////////////////////
+  isShowing: function(){
+    return dojo.html.isShowing(this.domNode);
+  },
+
+  toggleShowing: function(){
+    // dojo.html.toggleShowing(this.domNode);
+    if(this.isHidden){
+      this.show();
+    }else{
+      this.hide();
+    }
+  },
+
+  show: function(){
+    this.animationInProgress=true;
+    this.isHidden = false;
+    this.toggleObj.show(this.domNode, this.toggleDuration, null,
+      dojo.lang.hitch(this, this.onShow), this.explodeSrc);
+  },
+
+  // called after the show() animation has completed
+  onShow: function(){
+    this.animationInProgress=false;
+    this.checkSize();
+  },
+
+  hide: function(){
+    this.animationInProgress = true;
+    this.isHidden = true;
+    this.toggleObj.hide(this.domNode, this.toggleDuration, null,
+      dojo.lang.hitch(this, this.onHide), this.explodeSrc);
+  },
+
+  // called after the hide() animation has completed
+  onHide: function(){
+    this.animationInProgress=false;
+  },
+
+  //////////////////////////////////////////////////////////////////////////////
+  // Sizing related methods
+  //  If the parent changes size then for each child it should call either
+  //   - resizeTo(): size the child explicitly
+  //   - or checkSize(): notify the child the the parent has changed size
+  //////////////////////////////////////////////////////////////////////////////
+
+  // Test if my size has changed.
+  // If width & height are specified then that's my new size; otherwise,
+  // query outerWidth/outerHeight of my domNode
+  _isResized: function(w, h){
+    // If I'm not being displayed then disregard (show() must
+    // check if the size has changed)
+    if(!this.isShowing()){ return false; }
+
+    // If my parent has been resized and I have style="height: 100%"
+    // or something similar then my size has changed too.
+    var wh = dojo.html.getMarginBox(this.domNode);
+    var width=w||wh.width;
+    var height=h||wh.height;
+    if(this.width == width && this.height == height){ return false; }
+
+    this.width=width;
+    this.height=height;
+    return true;
+  },
+
+  // Called when my parent has changed size, but my parent won't call resizeTo().
+  // This is useful if my size is height:100% or something similar.
+  // Also called whenever I am shown, because the first time I am shown I may need
+  // to do size calculations.
+  checkSize: function(){
+    if(!this._isResized()){ return; }
+    this.onResized();
+  },
+
+  // Explicitly set this widget's size (in pixels).
+  resizeTo: function(w, h){
+    dojo.html.setMarginBox(this.domNode, { width: w, height: h });
+    
+    // can't do sizing if widget is hidden because referencing node.offsetWidth/node.offsetHeight returns 0.
+    // do sizing on show() instead.
+    if(this.isShowing()){
+      this.onResized();
+    }
+  },
+
+  resizeSoon: function(){
+    if(this.isShowing()){
+      dojo.lang.setTimeout(this, this.onResized, 0);
+    }
+  },
+
+  // Called when my size has changed.
+  // Must notify children if their size has (possibly) changed
+  onResized: function(){
+    dojo.lang.forEach(this.children, function(child){ if(child.checkSize){child.checkSize();} });
+  }
 });
-}});
+
 dojo.provide("dojo.widget.*");
+
 dojo.provide("dojo.math");
-dojo.math.degToRad=function(x){
-return (x*Math.PI)/180;
-};
-dojo.math.radToDeg=function(x){
-return (x*180)/Math.PI;
-};
-dojo.math.factorial=function(n){
-if(n<1){
-return 0;
+
+dojo.math.degToRad = function(/* float */x) {
+  //  summary
+  //  Converts degrees to radians.
+  return (x*Math.PI) / 180;   //  float
 }
-var _a4b=1;
-for(var i=1;i<=n;i++){
-_a4b*=i;
+dojo.math.radToDeg = function(/* float */x) { 
+  //  summary
+  //  Converts radians to degrees.
+  return (x*180) / Math.PI;   //  float
 }
-return _a4b;
-};
-dojo.math.permutations=function(n,k){
-if(n==0||k==0){
-return 1;
+
+dojo.math.factorial = function(/* integer */n){
+  //  summary
+  //  Returns n!
+  if(n<1){ return 0; }
+  var retVal = 1;
+  for(var i=1;i<=n;i++){ retVal *= i; }
+  return retVal;  //  integer
 }
-return (dojo.math.factorial(n)/dojo.math.factorial(n-k));
-};
-dojo.math.combinations=function(n,r){
-if(n==0||r==0){
-return 1;
+
+dojo.math.permutations = function(/* integer */n, /* integer */k) {
+  //  summary
+  //  The number of ways of obtaining an ordered subset of k elements from a set of n elements
+  if(n==0 || k==0) return 1;
+  return (dojo.math.factorial(n) / dojo.math.factorial(n-k)); //  float
 }
-return (dojo.math.factorial(n)/(dojo.math.factorial(n-r)*dojo.math.factorial(r)));
-};
-dojo.math.bernstein=function(t,n,i){
-return (dojo.math.combinations(n,i)*Math.pow(t,i)*Math.pow(1-t,n-i));
-};
-dojo.math.gaussianRandom=function(){
-var k=2;
-do{
-var i=2*Math.random()-1;
-var j=2*Math.random()-1;
-k=i*i+j*j;
-}while(k>=1);
-k=Math.sqrt((-2*Math.log(k))/k);
-return i*k;
-};
-dojo.math.mean=function(){
-var _a57=dojo.lang.isArray(arguments[0])?arguments[0]:arguments;
-var mean=0;
-for(var i=0;i<_a57.length;i++){
-mean+=_a57[i];
+
+dojo.math.combinations = function (/* integer */n, /* integer */r) {
+  //  summary
+  //  The number of ways of picking n unordered outcomes from r possibilities
+  if(n==0 || r==0) return 1;
+  return (dojo.math.factorial(n) / (dojo.math.factorial(n-r) * dojo.math.factorial(r)));  //  float
 }
-return mean/_a57.length;
-};
-dojo.math.round=function(_a5a,_a5b){
-if(!_a5b){
-var _a5c=1;
-}else{
-var _a5c=Math.pow(10,_a5b);
+
+dojo.math.bernstein = function(/* float */t, /* float */n, /* float */i) {
+  //  summary
+  //  Calculates a weighted average based on the Bernstein theorem.
+  return (dojo.math.combinations(n,i) * Math.pow(t,i) * Math.pow(1-t,n-i)); //  float
 }
-return Math.round(_a5a*_a5c)/_a5c;
-};
-dojo.math.sd=dojo.math.standardDeviation=function(){
-var _a5d=dojo.lang.isArray(arguments[0])?arguments[0]:arguments;
-return Math.sqrt(dojo.math.variance(_a5d));
-};
-dojo.math.variance=function(){
-var _a5e=dojo.lang.isArray(arguments[0])?arguments[0]:arguments;
-var mean=0,_a60=0;
-for(var i=0;i<_a5e.length;i++){
-mean+=_a5e[i];
-_a60+=Math.pow(_a5e[i],2);
+
+dojo.math.gaussianRandom = function(){
+  //  summary
+  //  Returns random numbers with a Gaussian distribution, with the mean set at 0 and the variance set at 1.
+  var k = 2;
+  do {
+    var i = 2 * Math.random() - 1;
+    var j = 2 * Math.random() - 1;
+    k = i * i + j * j;
+  } while (k >= 1);
+  k = Math.sqrt((-2 * Math.log(k)) / k);
+  return i * k; //  float
 }
-return (_a60/_a5e.length)-Math.pow(mean/_a5e.length,2);
-};
-dojo.math.range=function(a,b,step){
-if(arguments.length<2){
-b=a;
-a=0;
+
+dojo.math.mean = function() {
+  //  summary
+  //  Calculates the mean of an Array of numbers.
+  var array = dojo.lang.isArray(arguments[0]) ? arguments[0] : arguments;
+  var mean = 0;
+  for (var i = 0; i < array.length; i++) { mean += array[i]; }
+  return mean / array.length; //  float
 }
-if(arguments.length<3){
-step=1;
+
+dojo.math.round = function(/* float */number, /* integer */places) {
+  //  summary
+  //  Extends Math.round by adding a second argument specifying the number of decimal places to round to.
+  // TODO: add support for significant figures
+  if (!places) { var shift = 1; }
+  else { var shift = Math.pow(10, places); }
+  return Math.round(number * shift) / shift;  //  float
 }
-var _a65=[];
-if(step>0){
-for(var i=a;i<b;i+=step){
-_a65.push(i);
+
+dojo.math.sd = dojo.math.standardDeviation = function(/* array */){
+  //  summary
+  //  Calculates the standard deviation of an Array of numbers
+  var array = dojo.lang.isArray(arguments[0]) ? arguments[0] : arguments;
+  return Math.sqrt(dojo.math.variance(array));  //  float
 }
-}else{
-if(step<0){
-for(var i=a;i>b;i+=step){
-_a65.push(i);
+
+dojo.math.variance = function(/* array */) {
+  //  summary
+  //  Calculates the variance of an Array of numbers
+  var array = dojo.lang.isArray(arguments[0]) ? arguments[0] : arguments;
+  var mean = 0, squares = 0;
+  for (var i = 0; i < array.length; i++) {
+    mean += array[i];
+    squares += Math.pow(array[i], 2);
+  }
+  return (squares / array.length) - Math.pow(mean / array.length, 2); //  float
 }
-}else{
-throw new Error("dojo.math.range: step must be non-zero");
+
+dojo.math.range = function(/* integer */a, /* integer */b, /* integer */step) {
+  //  summary
+  //  implementation of Python's range()
+    if(arguments.length < 2) {
+        b = a;
+        a = 0;
+    }
+    if(arguments.length < 3) {
+        step = 1;
+    }
+
+    var range = [];
+    if(step > 0) {
+        for(var i = a; i < b; i += step) {
+            range.push(i);
+        }
+    } else if(step < 0) {
+        for(var i = a; i > b; i += step) {
+            range.push(i);
+        }
+    } else {
+        throw new Error("dojo.math.range: step must be non-zero");
+    }
+    return range; //  array
 }
-}
-return _a65;
-};
+
 dojo.provide("dojo.math.curves");
-dojo.math.curves={Line:function(_a67,end){
-this.start=_a67;
-this.end=end;
-this.dimensions=_a67.length;
-for(var i=0;i<_a67.length;i++){
-_a67[i]=Number(_a67[i]);
-}
-for(var i=0;i<end.length;i++){
-end[i]=Number(end[i]);
-}
-this.getValue=function(n){
-var _a6b=new Array(this.dimensions);
-for(var i=0;i<this.dimensions;i++){
-_a6b[i]=((this.end[i]-this.start[i])*n)+this.start[i];
-}
-return _a6b;
+
+/* Curves from Dan's 13th lib stuff.
+ * See: http://pupius.co.uk/js/Toolkit.Drawing.js
+ *      http://pupius.co.uk/dump/dojo/Dojo.Math.js
+ */
+
+dojo.math.curves = {
+  Line: function(/* array */start, /* array */end) {
+    //  summary
+    //  Creates a straight line object
+    this.start = start;
+    this.end = end;
+    this.dimensions = start.length;
+
+    for(var i = 0; i < start.length; i++) {
+      start[i] = Number(start[i]);
+    }
+
+    for(var i = 0; i < end.length; i++) {
+      end[i] = Number(end[i]);
+    }
+
+    //simple function to find point on an n-dimensional, straight line
+    this.getValue = function(/* float */n){
+      //  summary
+      //  Returns the point at point N (in terms of percentage) on this line.
+      var retVal = new Array(this.dimensions);
+      for(var i=0;i<this.dimensions;i++)
+        retVal[i] = ((this.end[i] - this.start[i]) * n) + this.start[i];
+      return retVal;  //  array
+    }
+    return this;  //  dojo.math.curves.Line
+  },
+
+  Bezier: function(/* array */pnts) {
+    //  summary
+    //  Creates a bezier curve
+    //  Takes an array of points, the first is the start point, the last is end point and the ones in
+    //  between are the Bezier control points.
+    this.getValue = function(/* float */step) {
+      //  summary
+      //  Returns the point at point N (in terms of percentage) on this curve.
+      if(step >= 1) return this.p[this.p.length-1]; // if step>=1 we must be at the end of the curve
+      if(step <= 0) return this.p[0];         // if step<=0 we must be at the start of the curve
+      var retVal = new Array(this.p[0].length);
+      for(var k=0;j<this.p[0].length;k++) { retVal[k]=0; }
+      for(var j=0;j<this.p[0].length;j++) {
+        var C=0; var D=0;
+        for(var i=0;i<this.p.length;i++) {
+          C += this.p[i][j] * this.p[this.p.length-1][0]
+            * dojo.math.bernstein(step,this.p.length,i);
+        }
+        for(var l=0;l<this.p.length;l++) {
+          D += this.p[this.p.length-1][0] * dojo.math.bernstein(step,this.p.length,l);
+        }
+        retVal[j] = C/D;
+      }
+      return retVal;  //  array
+    }
+    this.p = pnts;
+    return this;  //  dojo.math.curves.Bezier
+  },
+
+  CatmullRom : function(/* array */pnts, /* float */c) {
+    //  summary
+    //  Creates a catmull-rom spline curve with c tension.
+    this.getValue = function(/* float */step) {
+      //  summary
+      //  Returns the point at point N (in terms of percentage) on this curve.
+      var percent = step * (this.p.length-1);
+      var node = Math.floor(percent);
+      var progress = percent - node;
+
+      var i0 = node-1; if(i0 < 0) i0 = 0;
+      var i = node;
+      var i1 = node+1; if(i1 >= this.p.length) i1 = this.p.length-1;
+      var i2 = node+2; if(i2 >= this.p.length) i2 = this.p.length-1;
+
+      var u = progress;
+      var u2 = progress*progress;
+      var u3 = progress*progress*progress;
+
+      var retVal = new Array(this.p[0].length);
+      for(var k=0;k<this.p[0].length;k++) {
+        var x1 = ( -this.c * this.p[i0][k] ) + ( (2 - this.c) * this.p[i][k] ) + ( (this.c-2) * this.p[i1][k] ) + ( this.c * this.p[i2][k] );
+        var x2 = ( 2 * this.c * this.p[i0][k] ) + ( (this.c-3) * this.p[i][k] ) + ( (3 - 2 * this.c) * this.p[i1][k] ) + ( -this.c * this.p[i2][k] );
+        var x3 = ( -this.c * this.p[i0][k] ) + ( this.c * this.p[i1][k] );
+        var x4 = this.p[i][k];
+
+        retVal[k] = x1*u3 + x2*u2 + x3*u + x4;
+      }
+      return retVal;  //  array
+    }
+
+    if(!c) this.c = 0.7;
+    else this.c = c;
+    this.p = pnts;
+
+    return this;  //  dojo.math.curves.CatmullRom
+  },
+
+  // FIXME: This is the bad way to do a partial-arc with 2 points. We need to have the user
+  // supply the radius, otherwise we always get a half-circle between the two points.
+  Arc : function(/* array */start, /* array */end, /* boolean? */ccw) {
+    //  summary
+    //  Creates an arc with a counter clockwise switch
+    var center = dojo.math.points.midpoint(start, end);
+    var sides = dojo.math.points.translate(dojo.math.points.invert(center), start);
+    var rad = Math.sqrt(Math.pow(sides[0], 2) + Math.pow(sides[1], 2));
+    var theta = dojo.math.radToDeg(Math.atan(sides[1]/sides[0]));
+    if( sides[0] < 0 ) {
+      theta -= 90;
+    } else {
+      theta += 90;
+    }
+    dojo.math.curves.CenteredArc.call(this, center, rad, theta, theta+(ccw?-180:180));
+  },
+
+  CenteredArc : function(/* array */center, /* float */radius, /* array */start, /* array */end) {
+    //  summary
+    //  Creates an arc object, with center and radius (Top of arc = 0 degrees, increments clockwise)
+    //  center => 2D point for center of arc
+    //  radius => scalar quantity for radius of arc
+    //  start  => to define an arc specify start angle (default: 0)
+    //  end    => to define an arc specify start angle
+    this.center = center;
+    this.radius = radius;
+    this.start = start || 0;
+    this.end = end;
+
+    this.getValue = function(/* float */n) {
+      //  summary
+      //  Returns the point at point N (in terms of percentage) on this curve.
+      var retVal = new Array(2);
+      var theta = dojo.math.degToRad(this.start+((this.end-this.start)*n));
+
+      retVal[0] = this.center[0] + this.radius*Math.sin(theta);
+      retVal[1] = this.center[1] - this.radius*Math.cos(theta);
+  
+      return retVal;  //  array
+    }
+
+    return this;  //  dojo.math.curves.CenteredArc
+  },
+
+  Circle : function(/* array */center, /* float */radius) {
+    //  summary
+    // Special case of Arc (start = 0, end = 360)
+    dojo.math.curves.CenteredArc.call(this, center, radius, 0, 360);
+    return this;  //  dojo.math.curves.Circle
+  },
+
+  Path : function() {
+    //  summary
+    //  Generic path shape, created from curve segments
+    var curves = [];
+    var weights = [];
+    var ranges = [];
+    var totalWeight = 0;
+
+    this.add = function(/* dojo.math.curves.* */curve, /* float */weight) {
+      //  summary
+      //  Add a curve segment to this path
+      if( weight < 0 ) { dojo.raise("dojo.math.curves.Path.add: weight cannot be less than 0"); }
+      curves.push(curve);
+      weights.push(weight);
+      totalWeight += weight;
+      computeRanges();
+    }
+
+    this.remove = function(/* dojo.math.curves.* */curve) {
+      //  summary
+      //  Remove a curve segment from this path
+      for(var i = 0; i < curves.length; i++) {
+        if( curves[i] == curve ) {
+          curves.splice(i, 1);
+          totalWeight -= weights.splice(i, 1)[0];
+          break;
+        }
+      }
+      computeRanges();
+    }
+
+    this.removeAll = function() {
+      //  summary
+      //  Remove all curve segments
+      curves = [];
+      weights = [];
+      totalWeight = 0;
+    }
+
+    this.getValue = function(/* float */n) {
+      //  summary
+      //  Returns the point at point N (in terms of percentage) on this curve.
+      var found = false, value = 0;
+      for(var i = 0; i < ranges.length; i++) {
+        var r = ranges[i];
+        //w(r.join(" ... "));
+        if( n >= r[0] && n < r[1] ) {
+          var subN = (n - r[0]) / r[2];
+          value = curves[i].getValue(subN);
+          found = true;
+          break;
+        }
+      }
+
+      // FIXME: Do we want to assume we're at the end?
+      if( !found ) {
+        value = curves[curves.length-1].getValue(1);
+      }
+
+      for(var j = 0; j < i; j++) {
+        value = dojo.math.points.translate(value, curves[j].getValue(1));
+      }
+      return value; //  array
+    }
+
+    function computeRanges() {
+      var start = 0;
+      for(var i = 0; i < weights.length; i++) {
+        var end = start + weights[i] / totalWeight;
+        var len = end - start;
+        ranges[i] = [start, end, len];
+        start = end;
+      }
+    }
+
+    return this;  //  dojo.math.curves.Path
+  }
 };
-return this;
-},Bezier:function(pnts){
-this.getValue=function(step){
-if(step>=1){
-return this.p[this.p.length-1];
-}
-if(step<=0){
-return this.p[0];
-}
-var _a6f=new Array(this.p[0].length);
-for(var k=0;j<this.p[0].length;k++){
-_a6f[k]=0;
-}
-for(var j=0;j<this.p[0].length;j++){
-var C=0;
-var D=0;
-for(var i=0;i<this.p.length;i++){
-C+=this.p[i][j]*this.p[this.p.length-1][0]*dojo.math.bernstein(step,this.p.length,i);
-}
-for(var l=0;l<this.p.length;l++){
-D+=this.p[this.p.length-1][0]*dojo.math.bernstein(step,this.p.length,l);
-}
-_a6f[j]=C/D;
-}
-return _a6f;
-};
-this.p=pnts;
-return this;
-},CatmullRom:function(pnts,c){
-this.getValue=function(step){
-var _a79=step*(this.p.length-1);
-var node=Math.floor(_a79);
-var _a7b=_a79-node;
-var i0=node-1;
-if(i0<0){
-i0=0;
-}
-var i=node;
-var i1=node+1;
-if(i1>=this.p.length){
-i1=this.p.length-1;
-}
-var i2=node+2;
-if(i2>=this.p.length){
-i2=this.p.length-1;
-}
-var u=_a7b;
-var u2=_a7b*_a7b;
-var u3=_a7b*_a7b*_a7b;
-var _a83=new Array(this.p[0].length);
-for(var k=0;k<this.p[0].length;k++){
-var x1=(-this.c*this.p[i0][k])+((2-this.c)*this.p[i][k])+((this.c-2)*this.p[i1][k])+(this.c*this.p[i2][k]);
-var x2=(2*this.c*this.p[i0][k])+((this.c-3)*this.p[i][k])+((3-2*this.c)*this.p[i1][k])+(-this.c*this.p[i2][k]);
-var x3=(-this.c*this.p[i0][k])+(this.c*this.p[i1][k]);
-var x4=this.p[i][k];
-_a83[k]=x1*u3+x2*u2+x3*u+x4;
-}
-return _a83;
-};
-if(!c){
-this.c=0.7;
-}else{
-this.c=c;
-}
-this.p=pnts;
-return this;
-},Arc:function(_a89,end,ccw){
-var _a8c=dojo.math.points.midpoint(_a89,end);
-var _a8d=dojo.math.points.translate(dojo.math.points.invert(_a8c),_a89);
-var rad=Math.sqrt(Math.pow(_a8d[0],2)+Math.pow(_a8d[1],2));
-var _a8f=dojo.math.radToDeg(Math.atan(_a8d[1]/_a8d[0]));
-if(_a8d[0]<0){
-_a8f-=90;
-}else{
-_a8f+=90;
-}
-dojo.math.curves.CenteredArc.call(this,_a8c,rad,_a8f,_a8f+(ccw?-180:180));
-},CenteredArc:function(_a90,_a91,_a92,end){
-this.center=_a90;
-this.radius=_a91;
-this.start=_a92||0;
-this.end=end;
-this.getValue=function(n){
-var _a95=new Array(2);
-var _a96=dojo.math.degToRad(this.start+((this.end-this.start)*n));
-_a95[0]=this.center[0]+this.radius*Math.sin(_a96);
-_a95[1]=this.center[1]-this.radius*Math.cos(_a96);
-return _a95;
-};
-return this;
-},Circle:function(_a97,_a98){
-dojo.math.curves.CenteredArc.call(this,_a97,_a98,0,360);
-return this;
-},Path:function(){
-var _a99=[];
-var _a9a=[];
-var _a9b=[];
-var _a9c=0;
-this.add=function(_a9d,_a9e){
-if(_a9e<0){
-dojo.raise("dojo.math.curves.Path.add: weight cannot be less than 0");
-}
-_a99.push(_a9d);
-_a9a.push(_a9e);
-_a9c+=_a9e;
-computeRanges();
-};
-this.remove=function(_a9f){
-for(var i=0;i<_a99.length;i++){
-if(_a99[i]==_a9f){
-_a99.splice(i,1);
-_a9c-=_a9a.splice(i,1)[0];
-break;
-}
-}
-computeRanges();
-};
-this.removeAll=function(){
-_a99=[];
-_a9a=[];
-_a9c=0;
-};
-this.getValue=function(n){
-var _aa2=false,_aa3=0;
-for(var i=0;i<_a9b.length;i++){
-var r=_a9b[i];
-if(n>=r[0]&&n<r[1]){
-var subN=(n-r[0])/r[2];
-_aa3=_a99[i].getValue(subN);
-_aa2=true;
-break;
-}
-}
-if(!_aa2){
-_aa3=_a99[_a99.length-1].getValue(1);
-}
-for(var j=0;j<i;j++){
-_aa3=dojo.math.points.translate(_aa3,_a99[j].getValue(1));
-}
-return _aa3;
-};
-function computeRanges(){
-var _aa8=0;
-for(var i=0;i<_a9a.length;i++){
-var end=_aa8+_a9a[i]/_a9c;
-var len=end-_aa8;
-_a9b[i]=[_aa8,end,len];
-_aa8=end;
-}
-}
-return this;
-}};
+
 dojo.provide("dojo.math.points");
-dojo.math.points={translate:function(a,b){
-if(a.length!=b.length){
-dojo.raise("dojo.math.translate: points not same size (a:["+a+"], b:["+b+"])");
-}
-var c=new Array(a.length);
-for(var i=0;i<a.length;i++){
-c[i]=a[i]+b[i];
-}
-return c;
-},midpoint:function(a,b){
-if(a.length!=b.length){
-dojo.raise("dojo.math.midpoint: points not same size (a:["+a+"], b:["+b+"])");
-}
-var c=new Array(a.length);
-for(var i=0;i<a.length;i++){
-c[i]=(a[i]+b[i])/2;
-}
-return c;
-},invert:function(a){
-var b=new Array(a.length);
-for(var i=0;i<a.length;i++){
-b[i]=-a[i];
-}
-return b;
-},distance:function(a,b){
-return Math.sqrt(Math.pow(b[0]-a[0],2)+Math.pow(b[1]-a[1],2));
-}};
+
+dojo.math.points = {
+  translate: function(/* array */a, /* array */b) {
+    //  summary
+    //  translate a by b, and return the result.
+    if( a.length != b.length ) {
+      dojo.raise("dojo.math.translate: points not same size (a:[" + a + "], b:[" + b + "])");
+    }
+    var c = new Array(a.length);
+    for(var i = 0; i < a.length; i++) {
+      c[i] = a[i] + b[i];
+    }
+    return c; //  array
+  },
+
+  midpoint: function(/* array */a, /* array */b) {
+    //  summary
+    //  Find the point midway between a and b
+    if( a.length != b.length ) {
+      dojo.raise("dojo.math.midpoint: points not same size (a:[" + a + "], b:[" + b + "])");
+    }
+    var c = new Array(a.length);
+    for(var i = 0; i < a.length; i++) {
+      c[i] = (a[i] + b[i]) / 2;
+    }
+    return c; //  array
+  },
+
+  invert: function(/* array */a) {
+    //  summary
+    //  invert the values in a and return it.
+    var b = new Array(a.length);
+    for(var i = 0; i < a.length; i++) { b[i] = -a[i]; }
+    return b; //  array
+  },
+
+  distance: function(/* array */a, /* array */b) {
+    //  summary
+    //  Calculate the distance between point a and point b
+    return Math.sqrt(Math.pow(b[0]-a[0], 2) + Math.pow(b[1]-a[1], 2));  //  float
+  }
+};
+
 dojo.provide("dojo.math.*");
 
diff --git a/plugins/dojo/src/main/resources/template/ajax/a.ftl b/plugins/dojo/src/main/resources/template/ajax/a.ftl
index 236716b83..633d3e959 100644
--- a/plugins/dojo/src/main/resources/template/ajax/a.ftl
+++ b/plugins/dojo/src/main/resources/template/ajax/a.ftl
@@ -1,4 +1,3 @@
 <a dojoType="struts:BindAnchor"
   <#include "/${parameters.templateDir}/ajax/ajax-common.ftl" />
-  <#include "/${parameters.templateDir}/simple/scripting-events.ftl" />
 >
diff --git a/plugins/dojo/src/test/java/org/apache/struts2/TestAction.java b/plugins/dojo/src/test/java/org/apache/struts2/dojo/TestAction.java
similarity index 98%
rename from plugins/dojo/src/test/java/org/apache/struts2/TestAction.java
rename to plugins/dojo/src/test/java/org/apache/struts2/dojo/TestAction.java
index 7e6836363..3f5a25282 100644
--- a/plugins/dojo/src/test/java/org/apache/struts2/TestAction.java
+++ b/plugins/dojo/src/test/java/org/apache/struts2/dojo/TestAction.java
@@ -18,7 +18,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.struts2;
+package org.apache.struts2.dojo;
 
 import java.util.Collection;
 import java.util.List;
diff --git a/plugins/dojo/src/test/java/org/apache/struts2/views/jsp/ui/AbstractTagTest.java b/plugins/dojo/src/test/java/org/apache/struts2/dojo/views/jsp/ui/AbstractTagTest.java
similarity index 98%
rename from plugins/dojo/src/test/java/org/apache/struts2/views/jsp/ui/AbstractTagTest.java
rename to plugins/dojo/src/test/java/org/apache/struts2/dojo/views/jsp/ui/AbstractTagTest.java
index fc43aa168..c33c69aa7 100644
--- a/plugins/dojo/src/test/java/org/apache/struts2/views/jsp/ui/AbstractTagTest.java
+++ b/plugins/dojo/src/test/java/org/apache/struts2/dojo/views/jsp/ui/AbstractTagTest.java
@@ -18,7 +18,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.struts2.views.jsp.ui;
+package org.apache.struts2.dojo.views.jsp.ui;
 
 import java.io.File;
 import java.io.StringWriter;
@@ -30,11 +30,11 @@ import javax.servlet.jsp.JspWriter;
 
 import org.apache.struts2.ServletActionContext;
 import org.apache.struts2.StrutsTestCase;
-import org.apache.struts2.TestAction;
 import org.apache.struts2.dispatcher.ApplicationMap;
 import org.apache.struts2.dispatcher.Dispatcher;
 import org.apache.struts2.dispatcher.RequestMap;
 import org.apache.struts2.dispatcher.SessionMap;
+import org.apache.struts2.dojo.TestAction;
 
 import com.mockobjects.dynamic.Mock;
 import com.opensymphony.xwork2.Action;
diff --git a/plugins/dojo/src/test/java/org/apache/struts2/views/jsp/ui/AbstractUITagTest.java b/plugins/dojo/src/test/java/org/apache/struts2/dojo/views/jsp/ui/AbstractUITagTest.java
similarity index 99%
rename from plugins/dojo/src/test/java/org/apache/struts2/views/jsp/ui/AbstractUITagTest.java
rename to plugins/dojo/src/test/java/org/apache/struts2/dojo/views/jsp/ui/AbstractUITagTest.java
index 164d3d3eb..fe68162d2 100644
--- a/plugins/dojo/src/test/java/org/apache/struts2/views/jsp/ui/AbstractUITagTest.java
+++ b/plugins/dojo/src/test/java/org/apache/struts2/dojo/views/jsp/ui/AbstractUITagTest.java
@@ -18,7 +18,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.struts2.views.jsp.ui;
+package org.apache.struts2.dojo.views.jsp.ui;
 
 import java.beans.IntrospectionException;
 import java.beans.Introspector;
@@ -41,7 +41,6 @@ import org.apache.struts2.views.jsp.ui.AbstractUITag;
 
 import com.opensymphony.xwork2.ActionContext;
 
-
 /**
  */
 public abstract class AbstractUITagTest extends AbstractTagTest {
diff --git a/plugins/dojo/src/test/java/org/apache/struts2/views/jsp/ui/AnchorTest.java b/plugins/dojo/src/test/java/org/apache/struts2/dojo/views/jsp/ui/AnchorTest.java
similarity index 91%
rename from plugins/dojo/src/test/java/org/apache/struts2/views/jsp/ui/AnchorTest.java
rename to plugins/dojo/src/test/java/org/apache/struts2/dojo/views/jsp/ui/AnchorTest.java
index e7fa595e1..6bb7576f8 100644
--- a/plugins/dojo/src/test/java/org/apache/struts2/views/jsp/ui/AnchorTest.java
+++ b/plugins/dojo/src/test/java/org/apache/struts2/dojo/views/jsp/ui/AnchorTest.java
@@ -18,11 +18,9 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.struts2.views.jsp.ui;
-
-import org.apache.struts2.TestAction;
-import org.apache.struts2.views.jsp.ui.dojo.AnchorTag;
+package org.apache.struts2.dojo.views.jsp.ui;
 
+import org.apache.struts2.dojo.TestAction;
 
 /**
  */
@@ -37,7 +35,6 @@ public class AnchorTest extends AbstractUITagTest {
         tag.setPageContext(pageContext);
 
         tag.setId("mylink");
-        tag.setTheme("ajax");
         tag.setHref("a");
         tag.setErrorText("c");
         tag.setLoadingText("d");
diff --git a/plugins/dojo/src/test/java/org/apache/struts2/views/jsp/ui/AutocompleterTest.java b/plugins/dojo/src/test/java/org/apache/struts2/dojo/views/jsp/ui/AutocompleterTest.java
similarity index 94%
rename from plugins/dojo/src/test/java/org/apache/struts2/views/jsp/ui/AutocompleterTest.java
rename to plugins/dojo/src/test/java/org/apache/struts2/dojo/views/jsp/ui/AutocompleterTest.java
index 0b0c17c62..425fc0550 100644
--- a/plugins/dojo/src/test/java/org/apache/struts2/views/jsp/ui/AutocompleterTest.java
+++ b/plugins/dojo/src/test/java/org/apache/struts2/dojo/views/jsp/ui/AutocompleterTest.java
@@ -18,10 +18,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.struts2.views.jsp.ui;
-
-import org.apache.struts2.views.jsp.ui.dojo.AutocompleterTag;
-
+package org.apache.struts2.dojo.views.jsp.ui;
 
 /**
  * @see org.apache.struts2.components.Autocompleter
@@ -31,7 +28,6 @@ public class AutocompleterTest extends AbstractUITagTest {
     public void testAjax() throws Exception {
         AutocompleterTag tag = new AutocompleterTag();
         tag.setPageContext(pageContext);
-        tag.setTheme("ajax");
         tag.setAutoComplete("true");
         tag.setDisabled("false");
         tag.setForceValidOption("false");
@@ -60,7 +56,6 @@ public class AutocompleterTest extends AbstractUITagTest {
     public void testSimple() throws Exception {
         AutocompleterTag tag = new AutocompleterTag();
         tag.setPageContext(pageContext);
-        tag.setTheme("simple");
         tag.setAutoComplete("true");
         tag.setDisabled("false");
         tag.setForceValidOption("false");
diff --git a/plugins/dojo/src/test/java/org/apache/struts2/views/jsp/ui/Category.java b/plugins/dojo/src/test/java/org/apache/struts2/dojo/views/jsp/ui/Category.java
similarity index 98%
rename from plugins/dojo/src/test/java/org/apache/struts2/views/jsp/ui/Category.java
rename to plugins/dojo/src/test/java/org/apache/struts2/dojo/views/jsp/ui/Category.java
index 13a65b45c..2bfb03cae 100644
--- a/plugins/dojo/src/test/java/org/apache/struts2/views/jsp/ui/Category.java
+++ b/plugins/dojo/src/test/java/org/apache/struts2/dojo/views/jsp/ui/Category.java
@@ -18,7 +18,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.struts2.views.jsp.ui;
+package org.apache.struts2.dojo.views.jsp.ui;
 
 import java.util.ArrayList;
 import java.util.HashMap;
diff --git a/plugins/dojo/src/test/java/org/apache/struts2/views/jsp/ui/DateTimePickerTagTest.java b/plugins/dojo/src/test/java/org/apache/struts2/dojo/views/jsp/ui/DateTimePickerTagTest.java
similarity index 64%
rename from plugins/dojo/src/test/java/org/apache/struts2/views/jsp/ui/DateTimePickerTagTest.java
rename to plugins/dojo/src/test/java/org/apache/struts2/dojo/views/jsp/ui/DateTimePickerTagTest.java
index 2de5ff150..0c32f6592 100644
--- a/plugins/dojo/src/test/java/org/apache/struts2/views/jsp/ui/DateTimePickerTagTest.java
+++ b/plugins/dojo/src/test/java/org/apache/struts2/dojo/views/jsp/ui/DateTimePickerTagTest.java
@@ -18,40 +18,16 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.struts2.views.jsp.ui;
-
-import org.apache.struts2.views.jsp.ui.dojo.AbstractRemoteCallUITag;
-import org.apache.struts2.views.jsp.ui.dojo.DateTimePickerTag;
-import org.apache.struts2.views.jsp.ui.dojo.DivTag;
-
-
+package org.apache.struts2.dojo.views.jsp.ui;
 
 /**
  */
 public class DateTimePickerTagTest extends AbstractUITagTest {
-
-
-    public void testGenericSimple() throws Exception {
-        AbstractRemoteCallUITag tag = new DivTag();
-        verifyGenericProperties(tag, "simple", new String[]{"value","tabindex","disabled"});
-    }
-
-    public void testGenericXhtml() throws Exception {
-        AbstractRemoteCallUITag tag = new DivTag();
-        verifyGenericProperties(tag, "xhtml", new String[]{"value","tabindex","disabled"});
-    }
-
-    public void testGenericAjax() throws Exception {
-        AbstractRemoteCallUITag tag = new DivTag();
-        verifyGenericProperties(tag, "ajax", new String[]{"value","tabindex","disabled"});
-    }
-
     public void testSimple() throws Exception {
         DateTimePickerTag tag = new DateTimePickerTag();
         tag.setPageContext(pageContext);
 
         tag.setId("id");
-        tag.setTheme("ajax");
 
         tag.setAdjustWeeks("true");
         tag.setDayWidth("b");
diff --git a/plugins/dojo/src/test/java/org/apache/struts2/views/jsp/ui/DivTest.java b/plugins/dojo/src/test/java/org/apache/struts2/dojo/views/jsp/ui/DivTest.java
similarity index 68%
rename from plugins/dojo/src/test/java/org/apache/struts2/views/jsp/ui/DivTest.java
rename to plugins/dojo/src/test/java/org/apache/struts2/dojo/views/jsp/ui/DivTest.java
index cb3907c1a..39c2cafbb 100644
--- a/plugins/dojo/src/test/java/org/apache/struts2/views/jsp/ui/DivTest.java
+++ b/plugins/dojo/src/test/java/org/apache/struts2/dojo/views/jsp/ui/DivTest.java
@@ -18,33 +18,15 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.struts2.views.jsp.ui;
+package org.apache.struts2.dojo.views.jsp.ui;
 
-import org.apache.struts2.TestAction;
-import org.apache.struts2.views.jsp.ui.dojo.AbstractRemoteCallUITag;
-import org.apache.struts2.views.jsp.ui.dojo.DivTag;
+import org.apache.struts2.dojo.TestAction;
 
 
 /**
  */
 public class DivTest extends AbstractUITagTest {
 
-
-    public void testGenericSimple() throws Exception {
-        AbstractRemoteCallUITag tag = new DivTag();
-        verifyGenericProperties(tag, "simple", new String[]{"value","tabindex","disabled"});
-    }
-
-    public void testGenericXhtml() throws Exception {
-        AbstractRemoteCallUITag tag = new DivTag();
-        verifyGenericProperties(tag, "xhtml", new String[]{"value","tabindex","disabled"});
-    }
-
-    public void testGenericAjax() throws Exception {
-        AbstractRemoteCallUITag tag = new DivTag();
-        verifyGenericProperties(tag, "ajax", new String[]{"value","tabindex","disabled"});
-    }
-
     public void testSimple() throws Exception {
         TestAction testAction = (TestAction) action;
         testAction.setFoo("bar");
@@ -53,7 +35,6 @@ public class DivTest extends AbstractUITagTest {
         tag.setPageContext(pageContext);
 
         tag.setId("mylabel");
-        tag.setTheme("ajax");
         tag.setHref("a");
         tag.setLoadingText("b");
         tag.setErrorText("c");
diff --git a/plugins/dojo/src/test/java/org/apache/struts2/views/jsp/ui/StrutsMockHttpServletRequest.java b/plugins/dojo/src/test/java/org/apache/struts2/dojo/views/jsp/ui/StrutsMockHttpServletRequest.java
similarity index 99%
rename from plugins/dojo/src/test/java/org/apache/struts2/views/jsp/ui/StrutsMockHttpServletRequest.java
rename to plugins/dojo/src/test/java/org/apache/struts2/dojo/views/jsp/ui/StrutsMockHttpServletRequest.java
index 9eaa8b304..71a2de1b3 100644
--- a/plugins/dojo/src/test/java/org/apache/struts2/views/jsp/ui/StrutsMockHttpServletRequest.java
+++ b/plugins/dojo/src/test/java/org/apache/struts2/dojo/views/jsp/ui/StrutsMockHttpServletRequest.java
@@ -18,7 +18,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.struts2.views.jsp.ui;
+package org.apache.struts2.dojo.views.jsp.ui;
 
 import java.util.Collections;
 import java.util.Enumeration;
diff --git a/plugins/dojo/src/test/java/org/apache/struts2/views/jsp/ui/StrutsMockHttpServletResponse.java b/plugins/dojo/src/test/java/org/apache/struts2/dojo/views/jsp/ui/StrutsMockHttpServletResponse.java
similarity index 98%
rename from plugins/dojo/src/test/java/org/apache/struts2/views/jsp/ui/StrutsMockHttpServletResponse.java
rename to plugins/dojo/src/test/java/org/apache/struts2/dojo/views/jsp/ui/StrutsMockHttpServletResponse.java
index 56514d42a..21d9334a8 100644
--- a/plugins/dojo/src/test/java/org/apache/struts2/views/jsp/ui/StrutsMockHttpServletResponse.java
+++ b/plugins/dojo/src/test/java/org/apache/struts2/dojo/views/jsp/ui/StrutsMockHttpServletResponse.java
@@ -18,7 +18,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.struts2.views.jsp.ui;
+package org.apache.struts2.dojo.views.jsp.ui;
 
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
diff --git a/plugins/dojo/src/test/java/org/apache/struts2/views/jsp/ui/StrutsMockHttpSession.java b/plugins/dojo/src/test/java/org/apache/struts2/dojo/views/jsp/ui/StrutsMockHttpSession.java
similarity index 97%
rename from plugins/dojo/src/test/java/org/apache/struts2/views/jsp/ui/StrutsMockHttpSession.java
rename to plugins/dojo/src/test/java/org/apache/struts2/dojo/views/jsp/ui/StrutsMockHttpSession.java
index 1c171ecf2..db821152b 100644
--- a/plugins/dojo/src/test/java/org/apache/struts2/views/jsp/ui/StrutsMockHttpSession.java
+++ b/plugins/dojo/src/test/java/org/apache/struts2/dojo/views/jsp/ui/StrutsMockHttpSession.java
@@ -18,7 +18,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.struts2.views.jsp.ui;
+package org.apache.struts2.dojo.views.jsp.ui;
 
 import java.util.Enumeration;
 import java.util.Hashtable;
diff --git a/plugins/dojo/src/test/java/org/apache/struts2/views/jsp/ui/StrutsMockJspWriter.java b/plugins/dojo/src/test/java/org/apache/struts2/dojo/views/jsp/ui/StrutsMockJspWriter.java
similarity index 98%
rename from plugins/dojo/src/test/java/org/apache/struts2/views/jsp/ui/StrutsMockJspWriter.java
rename to plugins/dojo/src/test/java/org/apache/struts2/dojo/views/jsp/ui/StrutsMockJspWriter.java
index 538fec3e5..66b8fcf6c 100644
--- a/plugins/dojo/src/test/java/org/apache/struts2/views/jsp/ui/StrutsMockJspWriter.java
+++ b/plugins/dojo/src/test/java/org/apache/struts2/dojo/views/jsp/ui/StrutsMockJspWriter.java
@@ -18,7 +18,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.struts2.views.jsp.ui;
+package org.apache.struts2.dojo.views.jsp.ui;
 
 import java.io.IOException;
 import java.io.StringWriter;
diff --git a/plugins/dojo/src/test/java/org/apache/struts2/views/jsp/ui/StrutsMockPageContext.java b/plugins/dojo/src/test/java/org/apache/struts2/dojo/views/jsp/ui/StrutsMockPageContext.java
similarity index 98%
rename from plugins/dojo/src/test/java/org/apache/struts2/views/jsp/ui/StrutsMockPageContext.java
rename to plugins/dojo/src/test/java/org/apache/struts2/dojo/views/jsp/ui/StrutsMockPageContext.java
index 8add56ae6..7a0c214d7 100644
--- a/plugins/dojo/src/test/java/org/apache/struts2/views/jsp/ui/StrutsMockPageContext.java
+++ b/plugins/dojo/src/test/java/org/apache/struts2/dojo/views/jsp/ui/StrutsMockPageContext.java
@@ -18,7 +18,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.struts2.views.jsp.ui;
+package org.apache.struts2.dojo.views.jsp.ui;
 
 import java.util.HashMap;
 import java.util.Map;
diff --git a/plugins/dojo/src/test/java/org/apache/struts2/views/jsp/ui/StrutsMockServletContext.java b/plugins/dojo/src/test/java/org/apache/struts2/dojo/views/jsp/ui/StrutsMockServletContext.java
similarity index 98%
rename from plugins/dojo/src/test/java/org/apache/struts2/views/jsp/ui/StrutsMockServletContext.java
rename to plugins/dojo/src/test/java/org/apache/struts2/dojo/views/jsp/ui/StrutsMockServletContext.java
index f2b7f9059..f3f2b8a01 100644
--- a/plugins/dojo/src/test/java/org/apache/struts2/views/jsp/ui/StrutsMockServletContext.java
+++ b/plugins/dojo/src/test/java/org/apache/struts2/dojo/views/jsp/ui/StrutsMockServletContext.java
@@ -18,7 +18,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.struts2.views.jsp.ui;
+package org.apache.struts2.dojo.views.jsp.ui;
 
 import java.io.InputStream;
 import java.net.MalformedURLException;
diff --git a/plugins/dojo/src/test/java/org/apache/struts2/views/jsp/ui/SubmitAjaxTest.java b/plugins/dojo/src/test/java/org/apache/struts2/dojo/views/jsp/ui/SubmitAjaxTest.java
similarity index 77%
rename from plugins/dojo/src/test/java/org/apache/struts2/views/jsp/ui/SubmitAjaxTest.java
rename to plugins/dojo/src/test/java/org/apache/struts2/dojo/views/jsp/ui/SubmitAjaxTest.java
index 649595c1e..fb24a8a3f 100644
--- a/plugins/dojo/src/test/java/org/apache/struts2/views/jsp/ui/SubmitAjaxTest.java
+++ b/plugins/dojo/src/test/java/org/apache/struts2/dojo/views/jsp/ui/SubmitAjaxTest.java
@@ -15,33 +15,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.struts2.views.jsp.ui;
+package org.apache.struts2.dojo.views.jsp.ui;
 
-import org.apache.struts2.TestAction;
-import org.apache.struts2.views.jsp.ui.dojo.AbstractRemoteCallUITag;
-import org.apache.struts2.views.jsp.ui.dojo.DivTag;
-import org.apache.struts2.views.jsp.ui.dojo.SubmitTag;
+import org.apache.struts2.dojo.TestAction;
 
 /**
  * Test Submit component in "ajax" theme.
  */
 public class SubmitAjaxTest extends AbstractUITagTest {
-
-    public void testGenericSimple() throws Exception {
-        AbstractRemoteCallUITag tag = new DivTag();
-        verifyGenericProperties(tag, "simple", new String[]{"value","tabindex","disabled"});
-    }
-
-    public void testGenericXhtml() throws Exception {
-        AbstractRemoteCallUITag tag = new DivTag();
-        verifyGenericProperties(tag, "xhtml", new String[]{"value","tabindex","disabled"});
-    }
-
-    public void testGenericAjax() throws Exception {
-        AbstractRemoteCallUITag tag = new DivTag();
-        verifyGenericProperties(tag, "ajax", new String[]{"value","tabindex","disabled"});
-    }
-
     public void testSubmit() throws Exception {
         TestAction testAction = (TestAction) action;
         testAction.setFoo("bar");
@@ -50,7 +31,6 @@ public class SubmitAjaxTest extends AbstractUITagTest {
         tag.setPageContext(pageContext);
 
         tag.setId("a");
-        tag.setTheme("ajax");
         tag.setHref("b");
         tag.setLoadingText("c");
         tag.setErrorText("d");
diff --git a/plugins/dojo/src/test/java/org/apache/struts2/views/jsp/ui/TreeTest.java b/plugins/dojo/src/test/java/org/apache/struts2/dojo/views/jsp/ui/TreeTest.java
similarity index 96%
rename from plugins/dojo/src/test/java/org/apache/struts2/views/jsp/ui/TreeTest.java
rename to plugins/dojo/src/test/java/org/apache/struts2/dojo/views/jsp/ui/TreeTest.java
index 611f29da2..b09044dd6 100644
--- a/plugins/dojo/src/test/java/org/apache/struts2/views/jsp/ui/TreeTest.java
+++ b/plugins/dojo/src/test/java/org/apache/struts2/dojo/views/jsp/ui/TreeTest.java
@@ -18,12 +18,9 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.struts2.views.jsp.ui;
+package org.apache.struts2.dojo.views.jsp.ui;
 
 
-import org.apache.struts2.views.jsp.ui.dojo.TreeNodeTag;
-import org.apache.struts2.views.jsp.ui.dojo.TreeTag;
-
 import com.opensymphony.xwork2.Action;
 import com.opensymphony.xwork2.ActionSupport;
 
@@ -38,7 +35,6 @@ public class TreeTest extends AbstractUITagTest{
         tag.setShowRootGrid("false");
         tag.setShowGrid("false");
         tag.setTemplateCssPath("/struts/tree.css");
-        tag.setTheme("ajax");
         tag.setPageContext(pageContext);
         tag.setId("rootId");
         tag.setLabel("Root");
diff --git a/plugins/dojo/src/test/resources/org/apache/struts2/views/jsp/ui/Autocompleter-1.txt b/plugins/dojo/src/test/resources/org/apache/struts2/dojo/views/jsp/ui/Autocompleter-1.txt
similarity index 100%
rename from plugins/dojo/src/test/resources/org/apache/struts2/views/jsp/ui/Autocompleter-1.txt
rename to plugins/dojo/src/test/resources/org/apache/struts2/dojo/views/jsp/ui/Autocompleter-1.txt
diff --git a/plugins/dojo/src/test/resources/org/apache/struts2/views/jsp/ui/Autocompleter-2.txt b/plugins/dojo/src/test/resources/org/apache/struts2/dojo/views/jsp/ui/Autocompleter-2.txt
similarity index 100%
rename from plugins/dojo/src/test/resources/org/apache/struts2/views/jsp/ui/Autocompleter-2.txt
rename to plugins/dojo/src/test/resources/org/apache/struts2/dojo/views/jsp/ui/Autocompleter-2.txt
diff --git a/plugins/dojo/src/test/resources/org/apache/struts2/views/jsp/ui/DateTimePickerTagTest-1.txt b/plugins/dojo/src/test/resources/org/apache/struts2/dojo/views/jsp/ui/DateTimePickerTagTest-1.txt
similarity index 100%
rename from plugins/dojo/src/test/resources/org/apache/struts2/views/jsp/ui/DateTimePickerTagTest-1.txt
rename to plugins/dojo/src/test/resources/org/apache/struts2/dojo/views/jsp/ui/DateTimePickerTagTest-1.txt
diff --git a/plugins/dojo/src/test/resources/org/apache/struts2/views/jsp/ui/TabbedPanel-1.txt b/plugins/dojo/src/test/resources/org/apache/struts2/dojo/views/jsp/ui/TabbedPanel-1.txt
similarity index 100%
rename from plugins/dojo/src/test/resources/org/apache/struts2/views/jsp/ui/TabbedPanel-1.txt
rename to plugins/dojo/src/test/resources/org/apache/struts2/dojo/views/jsp/ui/TabbedPanel-1.txt
diff --git a/plugins/dojo/src/test/resources/org/apache/struts2/views/jsp/ui/TabbedPanel-2.txt b/plugins/dojo/src/test/resources/org/apache/struts2/dojo/views/jsp/ui/TabbedPanel-2.txt
similarity index 100%
rename from plugins/dojo/src/test/resources/org/apache/struts2/views/jsp/ui/TabbedPanel-2.txt
rename to plugins/dojo/src/test/resources/org/apache/struts2/dojo/views/jsp/ui/TabbedPanel-2.txt
diff --git a/plugins/dojo/src/test/resources/org/apache/struts2/views/jsp/ui/TabbedPanel-3.txt b/plugins/dojo/src/test/resources/org/apache/struts2/dojo/views/jsp/ui/TabbedPanel-3.txt
similarity index 100%
rename from plugins/dojo/src/test/resources/org/apache/struts2/views/jsp/ui/TabbedPanel-3.txt
rename to plugins/dojo/src/test/resources/org/apache/struts2/dojo/views/jsp/ui/TabbedPanel-3.txt
diff --git a/plugins/dojo/src/test/resources/org/apache/struts2/views/jsp/ui/TabbedPanel-4.txt b/plugins/dojo/src/test/resources/org/apache/struts2/dojo/views/jsp/ui/TabbedPanel-4.txt
similarity index 100%
rename from plugins/dojo/src/test/resources/org/apache/struts2/views/jsp/ui/TabbedPanel-4.txt
rename to plugins/dojo/src/test/resources/org/apache/struts2/dojo/views/jsp/ui/TabbedPanel-4.txt
diff --git a/plugins/dojo/src/test/resources/org/apache/struts2/views/jsp/ui/div-1.txt b/plugins/dojo/src/test/resources/org/apache/struts2/dojo/views/jsp/ui/div-1.txt
similarity index 100%
rename from plugins/dojo/src/test/resources/org/apache/struts2/views/jsp/ui/div-1.txt
rename to plugins/dojo/src/test/resources/org/apache/struts2/dojo/views/jsp/ui/div-1.txt
diff --git a/plugins/dojo/src/test/resources/org/apache/struts2/views/jsp/ui/href-1.txt b/plugins/dojo/src/test/resources/org/apache/struts2/dojo/views/jsp/ui/href-1.txt
similarity index 100%
rename from plugins/dojo/src/test/resources/org/apache/struts2/views/jsp/ui/href-1.txt
rename to plugins/dojo/src/test/resources/org/apache/struts2/dojo/views/jsp/ui/href-1.txt
diff --git a/plugins/dojo/src/test/resources/org/apache/struts2/views/jsp/ui/submit-ajax-1.txt b/plugins/dojo/src/test/resources/org/apache/struts2/dojo/views/jsp/ui/submit-ajax-1.txt
similarity index 100%
rename from plugins/dojo/src/test/resources/org/apache/struts2/views/jsp/ui/submit-ajax-1.txt
rename to plugins/dojo/src/test/resources/org/apache/struts2/dojo/views/jsp/ui/submit-ajax-1.txt
diff --git a/plugins/dojo/src/test/resources/org/apache/struts2/views/jsp/ui/submit-ajax-2.txt b/plugins/dojo/src/test/resources/org/apache/struts2/dojo/views/jsp/ui/submit-ajax-2.txt
similarity index 100%
rename from plugins/dojo/src/test/resources/org/apache/struts2/views/jsp/ui/submit-ajax-2.txt
rename to plugins/dojo/src/test/resources/org/apache/struts2/dojo/views/jsp/ui/submit-ajax-2.txt
diff --git a/plugins/dojo/src/test/resources/org/apache/struts2/views/jsp/ui/submit-ajax-3.txt b/plugins/dojo/src/test/resources/org/apache/struts2/dojo/views/jsp/ui/submit-ajax-3.txt
similarity index 100%
rename from plugins/dojo/src/test/resources/org/apache/struts2/views/jsp/ui/submit-ajax-3.txt
rename to plugins/dojo/src/test/resources/org/apache/struts2/dojo/views/jsp/ui/submit-ajax-3.txt
diff --git a/plugins/dojo/src/test/resources/org/apache/struts2/views/jsp/ui/tree-1.txt b/plugins/dojo/src/test/resources/org/apache/struts2/dojo/views/jsp/ui/tree-1.txt
similarity index 100%
rename from plugins/dojo/src/test/resources/org/apache/struts2/views/jsp/ui/tree-1.txt
rename to plugins/dojo/src/test/resources/org/apache/struts2/dojo/views/jsp/ui/tree-1.txt
diff --git a/plugins/dojo/src/test/resources/org/apache/struts2/views/jsp/ui/tree-2.txt b/plugins/dojo/src/test/resources/org/apache/struts2/dojo/views/jsp/ui/tree-2.txt
similarity index 100%
rename from plugins/dojo/src/test/resources/org/apache/struts2/views/jsp/ui/tree-2.txt
rename to plugins/dojo/src/test/resources/org/apache/struts2/dojo/views/jsp/ui/tree-2.txt