midsuit
/
core-jgi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Upgrade to zk 3.6.0

This commit is contained in:
Heng Sin Low 2009-03-10 02:08:08 +00:00
parent a27e86f006
commit bd452d6b5b
3 changed files with 109 additions and 121 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
zkwebui/WEB-INF/tld/web/core.dsp.tld
View File

@ -210,6 +210,16 @@ Copyright (C) 2005 Potix Corporation. All Rights Reserved.
<!-- --> <!-- -->
<!-- String Utilities --> <!-- String Utilities -->
<!-- --> <!-- -->
<function>
<name>eatQuot</name>
<function-class>org.zkoss.xel.fn.StringFns</function-class>
<function-signature>
java.lang.String eatQuot(java.lang.String)
</function-signature>
<description>
Eliminates single and double quotations to avoid JavaScript injection.
</description>
</function>
<function> <function>
<name>cat</name> <name>cat</name>
<function-class>org.zkoss.xel.fn.StringFns</function-class> <function-class>org.zkoss.xel.fn.StringFns</function-class>

43
zkwebui/WEB-INF/tld/zk/core.dsp.tld
View File

@ -74,17 +74,15 @@ Copyright (C) 2005 Potix Corporation. All Rights Reserved.
</description> </description>
</function> </function>
<function> <function>
<name>outDeviceStyleSheets</name> <name>outHtmlUnavailable</name>
<function-class>org.zkoss.zk.fn.ZkFns</function-class> <function-class>org.zkoss.zk.fn.ZkFns</function-class>
<function-signature> <function-signature>
java.lang.String outDeviceStyleSheets(java.lang.String deviceType) java.lang.String outHtmlUnavailable(org.zkoss.zk.ui.Page)
</function-signature> </function-signature>
<description> <description>
Returns HTML tags to include all style sheets used by the specified device. Generates the unavailable message in HTML tags, if any.
Note: unlike outLangStyleSheets, it can be called without current execution.
</description> </description>
</function> </function>
<function> <function>
<name>outHeaders</name> <name>outHeaders</name>
<function-class>org.zkoss.zk.fn.ZkFns</function-class> <function-class>org.zkoss.zk.fn.ZkFns</function-class>
@ -150,17 +148,6 @@ Copyright (C) 2005 Potix Corporation. All Rights Reserved.
</description> </description>
</function> </function>
<function>
<name>outLocaleJavaScript</name>
<function-class>org.zkoss.zk.fn.ZkFns</function-class>
<function-signature>
java.lang.String outLocaleJavaScript()
</function-signature>
<description>
Returns date relevant labels in JavaScript.
</description>
</function>
<function> <function>
<name>outPageAttrs</name> <name>outPageAttrs</name>
<function-class>org.zkoss.zk.fn.ZkFns</function-class> <function-class>org.zkoss.zk.fn.ZkFns</function-class>
@ -204,4 +191,28 @@ Copyright (C) 2005 Potix Corporation. All Rights Reserved.
Returns only the class and style attributes from the specified one. Returns only the class and style attributes from the specified one.
</description> </description>
</function> </function>
<!-- DSP only -->
<function>
<name>outLocaleJavaScript</name>
<function-class>org.zkoss.zk.fn.DspFns</function-class>
<function-signature>
java.lang.String outLocaleJavaScript()
</function-signature>
<description>
Returns date relevant labels in JavaScript.
</description>
</function>
<function>
<name>outDeviceStyleSheets</name>
<function-class>org.zkoss.zk.fn.DspFns</function-class>
<function-signature>
java.lang.String outDeviceStyleSheets(java.lang.String)
</function-signature>
<description>
Returns HTML tags to include all style sheets used by the specified device.
Note: unlike outLangStyleSheets, it can be called without current execution.
@param deviceType the device type. If null, "ajax" is assumed.
</description>
</function>
</taglib> </taglib>

177
zkwebui/WEB-INF/xsd/zul.xsd
View File

@ -347,6 +347,18 @@
<!-- <!--
ATTRIBUTEGROUP ATTRIBUTEGROUP
--> -->
<xs:attributeGroup name="mouseAttrGroup">
<xs:attribute name="onClick" use="optional"/>
<xs:attribute name="onRightClick" use="optional"/>
</xs:attributeGroup>
<xs:attributeGroup name="mouseExtAttrGroup">
<xs:attributeGroup ref="mouseAttrGroup" />
<xs:attribute name="onDoubleClick" use="optional"/>
</xs:attributeGroup>
<xs:attributeGroup name="rootAttrGroup">
<xs:attribute name="onBookmarkChange" type="xs:string" use="optional" />
<xs:attribute name="onClientInfo" type="xs:string" use="optional" />
</xs:attributeGroup>
<xs:attributeGroup name="zkAttrGroup"> <xs:attributeGroup name="zkAttrGroup">
<xs:attribute name="apply" type="xs:string" use="optional" /> <xs:attribute name="apply" type="xs:string" use="optional" />
<xs:attribute name="forEach" type="xs:string" use="optional" /> <xs:attribute name="forEach" type="xs:string" use="optional" />
@ -411,6 +423,7 @@
<xs:attributeGroup name="labelElementAttrGroup"> <xs:attributeGroup name="labelElementAttrGroup">
<xs:attributeGroup ref="xulElementAttrGroup" /> <xs:attributeGroup ref="xulElementAttrGroup" />
<xs:attribute name="label" type="xs:string" use="optional" /> <xs:attribute name="label" type="xs:string" use="optional" />
<xs:attributeGroup ref="mouseExtAttrGroup" />
</xs:attributeGroup> </xs:attributeGroup>
<xs:attributeGroup name="labelImageElementAttrGroup"> <xs:attributeGroup name="labelImageElementAttrGroup">
<xs:attributeGroup ref="labelElementAttrGroup" /> <xs:attributeGroup ref="labelElementAttrGroup" />
@ -587,8 +600,7 @@
<xs:attribute name="border" type="xs:string" use="optional" /> <xs:attribute name="border" type="xs:string" use="optional" />
<xs:attribute name="src" type="xs:string" use="optional" /> <xs:attribute name="src" type="xs:string" use="optional" />
<xs:attribute name="autostart" type="booleanType" use="optional" /> <xs:attribute name="autostart" type="booleanType" use="optional" />
<xs:attribute name="onBookmarkChange" type="xs:string" use="optional" /> <xs:attributeGroup ref="rootAttrGroup" />
<xs:attribute name="onClientInfo" type="xs:string" use="optional" />
</xs:complexType> </xs:complexType>
<!-- auxhead --> <!-- auxhead -->
<xs:element name="auxhead" type="auxheadType" /> <xs:element name="auxhead" type="auxheadType" />
@ -629,8 +641,7 @@
<xs:attribute name="type" type="textboxTypeAttrType" use="optional" /> <xs:attribute name="type" type="textboxTypeAttrType" use="optional" />
<xs:attribute name="open" type="booleanType" use="optional" /> <xs:attribute name="open" type="booleanType" use="optional" />
<xs:attribute name="onOpen" type="xs:string" use="optional" /> <xs:attribute name="onOpen" type="xs:string" use="optional" />
<xs:attribute name="onBookmarkChange" type="xs:string" use="optional" /> <xs:attributeGroup ref="rootAttrGroup" />
<xs:attribute name="onClientInfo" type="xs:string" use="optional" />
<xs:attribute name="onOK" type="xs:string" use="optional" /> <xs:attribute name="onOK" type="xs:string" use="optional" />
</xs:complexType> </xs:complexType>
<!-- bandpopup --> <!-- bandpopup -->
@ -666,8 +677,7 @@
<xs:attribute name="spacing" type="xs:string" use="optional" /> <xs:attribute name="spacing" type="xs:string" use="optional" />
<xs:attribute name="widths" type="xs:string" use="optional" /> <xs:attribute name="widths" type="xs:string" use="optional" />
<xs:attribute name="heights" type="xs:string" use="optional" /> <xs:attribute name="heights" type="xs:string" use="optional" />
<xs:attribute name="onBookmarkChange" type="xs:string" use="optional" /> <xs:attributeGroup ref="rootAttrGroup" />
<xs:attribute name="onClientInfo" type="xs:string" use="optional" />
<xs:attribute name="align" type="packAttrType" use="optional" /> <xs:attribute name="align" type="packAttrType" use="optional" />
<xs:attribute name="pack" type="packAttrType" use="optional" /> <xs:attribute name="pack" type="packAttrType" use="optional" />
</xs:complexType> </xs:complexType>
@ -683,8 +693,7 @@
<xs:attribute name="disabled" type="booleanType" use="optional" /> <xs:attribute name="disabled" type="booleanType" use="optional" />
<xs:attribute name="readonly" type="booleanType" use="optional" /> <xs:attribute name="readonly" type="booleanType" use="optional" />
<xs:attribute name="tabindex" type="intType" use="optional" /> <xs:attribute name="tabindex" type="intType" use="optional" />
<xs:attribute name="onBookmarkChange" type="xs:string" use="optional" /> <xs:attributeGroup ref="rootAttrGroup" />
<xs:attribute name="onClientInfo" type="xs:string" use="optional" />
</xs:complexType> </xs:complexType>
<!-- calendar --> <!-- calendar -->
<xs:element name="calendar" type="calendarType" /> <xs:element name="calendar" type="calendarType" />
@ -696,8 +705,7 @@
<xs:attribute name="compact" type="booleanType" use="optional" /> <xs:attribute name="compact" type="booleanType" use="optional" />
<xs:attribute name="timeZone" type="xs:string" use="optional" /> <xs:attribute name="timeZone" type="xs:string" use="optional" />
<xs:attribute name="onChange" type="xs:string" use="optional" /> <xs:attribute name="onChange" type="xs:string" use="optional" />
<xs:attribute name="onBookmarkChange" type="xs:string" use="optional" /> <xs:attributeGroup ref="rootAttrGroup" />
<xs:attribute name="onClientInfo" type="xs:string" use="optional" />
</xs:complexType> </xs:complexType>
<!-- caption --> <!-- caption -->
<xs:element name="caption" type="captionType" /> <xs:element name="caption" type="captionType" />
@ -745,10 +753,8 @@
<xs:attribute name="timeZone" type="xs:string" use="optional" /> <xs:attribute name="timeZone" type="xs:string" use="optional" />
<xs:attribute name="period" type="chartPeriodAttrType" use="optional" /> <xs:attribute name="period" type="chartPeriodAttrType" use="optional" />
<xs:attribute name="areaListener" type="xs:string" use="optional" /> <xs:attribute name="areaListener" type="xs:string" use="optional" />
<xs:attribute name="onClick" type="xs:string" use="optional" /> <xs:attributeGroup ref="mouseAttrGroup" />
<xs:attribute name="onRightClick" type="xs:string" use="optional" /> <xs:attributeGroup ref="rootAttrGroup" />
<xs:attribute name="onBookmarkChange" type="xs:string" use="optional" />
<xs:attribute name="onClientInfo" type="xs:string" use="optional" />
</xs:complexType> </xs:complexType>
<!-- checkbox --> <!-- checkbox -->
<xs:element name="checkbox" type="checkboxType" /> <xs:element name="checkbox" type="checkboxType" />
@ -761,8 +767,7 @@
<xs:attribute name="readonly" type="booleanType" use="optional" /> <xs:attribute name="readonly" type="booleanType" use="optional" />
<xs:attribute name="tabindex" type="intType" use="optional" /> <xs:attribute name="tabindex" type="intType" use="optional" />
<xs:attribute name="onCheck" type="xs:string" use="optional" /> <xs:attribute name="onCheck" type="xs:string" use="optional" />
<xs:attribute name="onBookmarkChange" type="xs:string" use="optional" /> <xs:attributeGroup ref="rootAttrGroup" />
<xs:attribute name="onClientInfo" type="xs:string" use="optional" />
</xs:complexType> </xs:complexType>
<!-- column --> <!-- column -->
<xs:element name="column" type="columnType" /> <xs:element name="column" type="columnType" />
@ -773,6 +778,7 @@
<xs:attribute name="sortAscending" type="xs:string" use="optional" /> <xs:attribute name="sortAscending" type="xs:string" use="optional" />
<xs:attribute name="sortDescending" type="xs:string" use="optional" /> <xs:attribute name="sortDescending" type="xs:string" use="optional" />
<xs:attribute name="onSort" type="xs:string" use="optional" /> <xs:attribute name="onSort" type="xs:string" use="optional" />
<xs:attribute name="value" type="xs:string" use="optional" />
</xs:complexType> </xs:complexType>
<!-- columnchildren --> <!-- columnchildren -->
<xs:element name="columnchildren" type="columnchildrenType" /> <xs:element name="columnchildren" type="columnchildrenType" />
@ -801,6 +807,7 @@
</xs:choice> </xs:choice>
<xs:attributeGroup ref="xulElementAttrGroup" /> <xs:attributeGroup ref="xulElementAttrGroup" />
<xs:attribute name="sizable" type="xs:string" use="optional" /> <xs:attribute name="sizable" type="xs:string" use="optional" />
<xs:attribute name="value" type="xs:string" use="optional" />
</xs:complexType> </xs:complexType>
<!-- combobox --> <!-- combobox -->
<xs:element name="combobox" type="comboboxType" /> <xs:element name="combobox" type="comboboxType" />
@ -823,8 +830,7 @@
<xs:attribute name="selectedIndex" type="intType" use="optional" /> <xs:attribute name="selectedIndex" type="intType" use="optional" />
<xs:attribute name="onOpen" type="xs:string" use="optional" /> <xs:attribute name="onOpen" type="xs:string" use="optional" />
<xs:attribute name="onSelect" type="xs:string" use="optional" /> <xs:attribute name="onSelect" type="xs:string" use="optional" />
<xs:attribute name="onBookmarkChange" type="xs:string" use="optional" /> <xs:attributeGroup ref="rootAttrGroup" />
<xs:attribute name="onClientInfo" type="xs:string" use="optional" />
</xs:complexType> </xs:complexType>
<!-- comboitem --> <!-- comboitem -->
<xs:element name="comboitem" type="comboitemType" /> <xs:element name="comboitem" type="comboitemType" />
@ -854,8 +860,7 @@
<xs:attribute name="buttonVisible" type="booleanType" use="optional" /> <xs:attribute name="buttonVisible" type="booleanType" use="optional" />
<xs:attribute name="image" type="xs:string" use="optional" /> <xs:attribute name="image" type="xs:string" use="optional" />
<xs:attribute name="open" type="booleanType" use="optional" /> <xs:attribute name="open" type="booleanType" use="optional" />
<xs:attribute name="onBookmarkChange" type="xs:string" use="optional" /> <xs:attributeGroup ref="rootAttrGroup" />
<xs:attribute name="onClientInfo" type="xs:string" use="optional" />
</xs:complexType> </xs:complexType>
<!-- decimalbox --> <!-- decimalbox -->
<xs:element name="decimalbox" type="decimalboxType" /> <xs:element name="decimalbox" type="decimalboxType" />
@ -865,8 +870,7 @@
<xs:attribute name="constraint" type="numberConstraintAttrType" use="optional" /> <xs:attribute name="constraint" type="numberConstraintAttrType" use="optional" />
<xs:attribute name="value" type="decimalType" use="optional" /> <xs:attribute name="value" type="decimalType" use="optional" />
<xs:attribute name="scale" type="intType" use="optional" /> <xs:attribute name="scale" type="intType" use="optional" />
<xs:attribute name="onBookmarkChange" type="xs:string" use="optional" /> <xs:attributeGroup ref="rootAttrGroup" />
<xs:attribute name="onClientInfo" type="xs:string" use="optional" />
</xs:complexType> </xs:complexType>
<!-- detail --> <!-- detail -->
@ -885,11 +889,8 @@
<xs:group ref="anyGroup" minOccurs="0" maxOccurs="unbounded" /> <xs:group ref="anyGroup" minOccurs="0" maxOccurs="unbounded" />
<xs:attributeGroup ref="xulElementAttrGroup" /> <xs:attributeGroup ref="xulElementAttrGroup" />
<xs:attribute name="align" type="divAlignAttrType" use="optional" /> <xs:attribute name="align" type="divAlignAttrType" use="optional" />
<xs:attribute name="onClick" type="xs:string" use="optional" /> <xs:attributeGroup ref="mouseExtAttrGroup" />
<xs:attribute name="onRightClick" type="xs:string" use="optional" /> <xs:attributeGroup ref="rootAttrGroup" />
<xs:attribute name="onDoubleClick" type="xs:string" use="optional" />
<xs:attribute name="onBookmarkChange" type="xs:string" use="optional" />
<xs:attribute name="onClientInfo" type="xs:string" use="optional" />
</xs:complexType> </xs:complexType>
<!-- doublebox --> <!-- doublebox -->
<xs:element name="doublebox" type="doubleboxType" /> <xs:element name="doublebox" type="doubleboxType" />
@ -898,8 +899,7 @@
<xs:attributeGroup ref="formatInputElementAttrGroup" /> <xs:attributeGroup ref="formatInputElementAttrGroup" />
<xs:attribute name="constraint" type="numberConstraintAttrType" use="optional" /> <xs:attribute name="constraint" type="numberConstraintAttrType" use="optional" />
<xs:attribute name="value" type="doubleType" use="optional" /> <xs:attribute name="value" type="doubleType" use="optional" />
<xs:attribute name="onBookmarkChange" type="xs:string" use="optional" /> <xs:attributeGroup ref="rootAttrGroup" />
<xs:attribute name="onClientInfo" type="xs:string" use="optional" />
</xs:complexType> </xs:complexType>
<!-- east --> <!-- east -->
<xs:element name="east" type="eastType" /> <xs:element name="east" type="eastType" />
@ -1119,8 +1119,7 @@
<xs:attribute name="fixedLayout" type="booleanType" use="optional" /> <xs:attribute name="fixedLayout" type="booleanType" use="optional" />
<xs:attribute name="oddRowSclass" type="xs:string" use="optional" /> <xs:attribute name="oddRowSclass" type="xs:string" use="optional" />
<xs:attribute name="onPaging" type="xs:string" use="optional" /> <xs:attribute name="onPaging" type="xs:string" use="optional" />
<xs:attribute name="onBookmarkChange" type="xs:string" use="optional" /> <xs:attributeGroup ref="rootAttrGroup" />
<xs:attribute name="onClientInfo" type="xs:string" use="optional" />
<xs:attribute name="preloadSize" type="intType" use="optional" /> <xs:attribute name="preloadSize" type="intType" use="optional" />
</xs:complexType> </xs:complexType>
@ -1138,12 +1137,9 @@
<xs:attribute name="open" type="booleanType" use="optional" /> <xs:attribute name="open" type="booleanType" use="optional" />
<xs:attribute name="closable" type="booleanType" use="optional" /> <xs:attribute name="closable" type="booleanType" use="optional" />
<xs:attribute name="contentStyle" type="xs:string" use="optional" /> <xs:attribute name="contentStyle" type="xs:string" use="optional" />
<xs:attribute name="onClick" type="xs:string" use="optional" /> <xs:attributeGroup ref="mouseExtAttrGroup" />
<xs:attribute name="onRightClick" type="xs:string" use="optional" />
<xs:attribute name="onDoubleClick" type="xs:string" use="optional" />
<xs:attribute name="onOpen" type="xs:string" use="optional" /> <xs:attribute name="onOpen" type="xs:string" use="optional" />
<xs:attribute name="onBookmarkChange" type="xs:string" use="optional" /> <xs:attributeGroup ref="rootAttrGroup" />
<xs:attribute name="onClientInfo" type="xs:string" use="optional" />
</xs:complexType> </xs:complexType>
<!-- hbox --> <!-- hbox -->
<!-- group --> <!-- group -->
@ -1184,8 +1180,7 @@
<xs:attributeGroup ref="xulElementAttrGroup" /> <xs:attributeGroup ref="xulElementAttrGroup" />
<xs:attribute name="spacing" type="xs:string" use="optional" /> <xs:attribute name="spacing" type="xs:string" use="optional" />
<xs:attribute name="widths" type="xs:string" use="optional" /> <xs:attribute name="widths" type="xs:string" use="optional" />
<xs:attribute name="onBookmarkChange" type="xs:string" use="optional" /> <xs:attributeGroup ref="rootAttrGroup" />
<xs:attribute name="onClientInfo" type="xs:string" use="optional" />
<xs:attribute name="align" type="packAttrType" use="optional" /> <xs:attribute name="align" type="packAttrType" use="optional" />
<xs:attribute name="pack" type="packAttrType" use="optional" /> <xs:attribute name="pack" type="packAttrType" use="optional" />
</xs:complexType> </xs:complexType>
@ -1195,8 +1190,7 @@
<xs:group ref="baseGroup" minOccurs="0" maxOccurs="unbounded" /> <xs:group ref="baseGroup" minOccurs="0" maxOccurs="unbounded" />
<xs:attributeGroup ref="xulElementAttrGroup" /> <xs:attributeGroup ref="xulElementAttrGroup" />
<xs:attribute name="content" type="xs:string" use="optional" /> <xs:attribute name="content" type="xs:string" use="optional" />
<xs:attribute name="onBookmarkChange" type="xs:string" use="optional" /> <xs:attributeGroup ref="rootAttrGroup" />
<xs:attribute name="onClientInfo" type="xs:string" use="optional" />
</xs:complexType> </xs:complexType>
<!-- iframe --> <!-- iframe -->
<xs:element name="iframe" type="iframeType" /> <xs:element name="iframe" type="iframeType" />
@ -1208,8 +1202,7 @@
<xs:attribute name="scrolling" type="iframeScrollingAttrType" use="optional" /> <xs:attribute name="scrolling" type="iframeScrollingAttrType" use="optional" />
<xs:attribute name="align" type="alignAttrType" use="optional" /> <xs:attribute name="align" type="alignAttrType" use="optional" />
<xs:attribute name="autohide" type="booleanType" use="optional" /> <xs:attribute name="autohide" type="booleanType" use="optional" />
<xs:attribute name="onBookmarkChange" type="xs:string" use="optional" /> <xs:attributeGroup ref="rootAttrGroup" />
<xs:attribute name="onClientInfo" type="xs:string" use="optional" />
<xs:attribute name="onURIChange" type="xs:string" use="optional" /> <xs:attribute name="onURIChange" type="xs:string" use="optional" />
</xs:complexType> </xs:complexType>
<xs:simpleType name="iframeScrollingAttrType"> <xs:simpleType name="iframeScrollingAttrType">
@ -1239,11 +1232,8 @@
<xs:attribute name="align" type="alignAttrType" use="optional" /> <xs:attribute name="align" type="alignAttrType" use="optional" />
<xs:attribute name="hspace" type="xs:string" use="optional" /> <xs:attribute name="hspace" type="xs:string" use="optional" />
<xs:attribute name="vspace" type="xs:string" use="optional" /> <xs:attribute name="vspace" type="xs:string" use="optional" />
<xs:attribute name="onClick" type="xs:string" use="optional" /> <xs:attributeGroup ref="mouseExtAttrGroup" />
<xs:attribute name="onRightClick" type="xs:string" use="optional" /> <xs:attributeGroup ref="rootAttrGroup" />
<xs:attribute name="onDoubleClick" type="xs:string" use="optional" />
<xs:attribute name="onBookmarkChange" type="xs:string" use="optional" />
<xs:attribute name="onClientInfo" type="xs:string" use="optional" />
</xs:complexType> </xs:complexType>
<!-- imagemap --> <!-- imagemap -->
<xs:element name="imagemap" type="imagemapType" /> <xs:element name="imagemap" type="imagemapType" />
@ -1259,10 +1249,8 @@
<xs:attribute name="hspace" type="xs:string" use="optional" /> <xs:attribute name="hspace" type="xs:string" use="optional" />
<xs:attribute name="vspace" type="xs:string" use="optional" /> <xs:attribute name="vspace" type="xs:string" use="optional" />
<xs:attribute name="content" type="xs:string" use="optional" /> <xs:attribute name="content" type="xs:string" use="optional" />
<xs:attribute name="onClick" type="xs:string" use="optional" /> <xs:attributeGroup ref="mouseAttrGroup" />
<xs:attribute name="onRightClick" type="xs:string" use="optional" /> <xs:attributeGroup ref="rootAttrGroup" />
<xs:attribute name="onBookmarkChange" type="xs:string" use="optional" />
<xs:attribute name="onClientInfo" type="xs:string" use="optional" />
</xs:complexType> </xs:complexType>
<!-- include --> <!-- include -->
<xs:element name="include" type="includeType" /> <xs:element name="include" type="includeType" />
@ -1272,8 +1260,7 @@
<xs:attribute name="src" type="xs:string" use="optional" /> <xs:attribute name="src" type="xs:string" use="optional" />
<xs:attribute name="localized" type="booleanType" use="optional" /> <xs:attribute name="localized" type="booleanType" use="optional" />
<xs:attribute name="progressing" type="booleanType" use="optional" /> <xs:attribute name="progressing" type="booleanType" use="optional" />
<xs:attribute name="onBookmarkChange" type="xs:string" use="optional" /> <xs:attributeGroup ref="rootAttrGroup" />
<xs:attribute name="onClientInfo" type="xs:string" use="optional" />
</xs:complexType> </xs:complexType>
<!-- intbox --> <!-- intbox -->
<xs:element name="intbox" type="intboxType" /> <xs:element name="intbox" type="intboxType" />
@ -1282,8 +1269,7 @@
<xs:attributeGroup ref="formatInputElementAttrGroup" /> <xs:attributeGroup ref="formatInputElementAttrGroup" />
<xs:attribute name="constraint" type="numberConstraintAttrType" use="optional" /> <xs:attribute name="constraint" type="numberConstraintAttrType" use="optional" />
<xs:attribute name="value" type="intType" use="optional" /> <xs:attribute name="value" type="intType" use="optional" />
<xs:attribute name="onBookmarkChange" type="xs:string" use="optional" /> <xs:attributeGroup ref="rootAttrGroup" />
<xs:attribute name="onClientInfo" type="xs:string" use="optional" />
</xs:complexType> </xs:complexType>
<!-- longbox --> <!-- longbox -->
<xs:element name="longbox" type="longboxType" /> <xs:element name="longbox" type="longboxType" />
@ -1292,8 +1278,7 @@
<xs:attributeGroup ref="formatInputElementAttrGroup" /> <xs:attributeGroup ref="formatInputElementAttrGroup" />
<xs:attribute name="constraint" type="numberConstraintAttrType" use="optional" /> <xs:attribute name="constraint" type="numberConstraintAttrType" use="optional" />
<xs:attribute name="value" type="longType" use="optional" /> <xs:attribute name="value" type="longType" use="optional" />
<xs:attribute name="onBookmarkChange" type="xs:string" use="optional" /> <xs:attributeGroup ref="rootAttrGroup" />
<xs:attribute name="onClientInfo" type="xs:string" use="optional" />
</xs:complexType> </xs:complexType>
<!-- label --> <!-- label -->
<xs:element name="label" type="labelType" /> <xs:element name="label" type="labelType" />
@ -1303,11 +1288,8 @@
<xs:attribute name="value" type="xs:string" use="optional" /> <xs:attribute name="value" type="xs:string" use="optional" />
<xs:attribute name="multiline" type="booleanType" use="optional" /> <xs:attribute name="multiline" type="booleanType" use="optional" />
<xs:attribute name="maxlength" type="intType" use="optional" /> <xs:attribute name="maxlength" type="intType" use="optional" />
<xs:attribute name="onClick" type="xs:string" use="optional" /> <xs:attributeGroup ref="mouseExtAttrGroup" />
<xs:attribute name="onRightClick" type="xs:string" use="optional" /> <xs:attributeGroup ref="rootAttrGroup" />
<xs:attribute name="onDoubleClick" type="xs:string" use="optional" />
<xs:attribute name="onBookmarkChange" type="xs:string" use="optional" />
<xs:attribute name="onClientInfo" type="xs:string" use="optional" />
</xs:complexType> </xs:complexType>
<!-- listbox --> <!-- listbox -->
<xs:element name="listbox" type="listboxType" /> <xs:element name="listbox" type="listboxType" />
@ -1383,8 +1365,7 @@
<xs:attribute name="itemRenderer" type="xs:string" use="optional" /> <xs:attribute name="itemRenderer" type="xs:string" use="optional" />
<xs:attribute name="fixedLayout" type="booleanType" use="optional" /> <xs:attribute name="fixedLayout" type="booleanType" use="optional" />
<xs:attribute name="onSelect" type="xs:string" use="optional" /> <xs:attribute name="onSelect" type="xs:string" use="optional" />
<xs:attribute name="onBookmarkChange" type="xs:string" use="optional" /> <xs:attributeGroup ref="rootAttrGroup" />
<xs:attribute name="onClientInfo" type="xs:string" use="optional" />
<xs:attribute name="pagingPosition" type="listboxPagingPositionAttrType" use="optional" /> <xs:attribute name="pagingPosition" type="listboxPagingPositionAttrType" use="optional" />
<xs:attribute name="preloadSize" type="intType" use="optional" /> <xs:attribute name="preloadSize" type="intType" use="optional" />
<xs:attribute name="innerWidth" type="xs:string" use="optional" /> <xs:attribute name="innerWidth" type="xs:string" use="optional" />
@ -1470,6 +1451,7 @@
</xs:choice> </xs:choice>
<xs:attributeGroup ref="xulElementAttrGroup" /> <xs:attributeGroup ref="xulElementAttrGroup" />
<xs:attribute name="sizable" type="booleanType" use="optional" /> <xs:attribute name="sizable" type="booleanType" use="optional" />
<xs:attribute name="value" type="xs:string" use="optional" />
</xs:complexType> </xs:complexType>
<!-- listheader --> <!-- listheader -->
<xs:element name="listheader" type="listheaderType" /> <xs:element name="listheader" type="listheaderType" />
@ -1482,6 +1464,7 @@
<xs:attribute name="sortDescending" type="xs:string" use="optional" /> <xs:attribute name="sortDescending" type="xs:string" use="optional" />
<xs:attribute name="maxlength" type="intType" use="optional" /> <xs:attribute name="maxlength" type="intType" use="optional" />
<xs:attribute name="onSort" type="xs:string" use="optional" /> <xs:attribute name="onSort" type="xs:string" use="optional" />
<xs:attribute name="value" type="xs:string" use="optional" />
</xs:complexType> </xs:complexType>
<!-- listitem --> <!-- listitem -->
<xs:element name="listitem" type="listitemType" /> <xs:element name="listitem" type="listitemType" />
@ -1520,8 +1503,7 @@
<xs:attributeGroup ref="xulElementAttrGroup" /> <xs:attributeGroup ref="xulElementAttrGroup" />
<xs:attribute name="orient" type="orientAttrType" use="optional" /> <xs:attribute name="orient" type="orientAttrType" use="optional" />
<xs:attribute name="autodrop" type="booleanType" use="optional" /> <xs:attribute name="autodrop" type="booleanType" use="optional" />
<xs:attribute name="onBookmarkChange" type="xs:string" use="optional" /> <xs:attributeGroup ref="rootAttrGroup" />
<xs:attribute name="onClientInfo" type="xs:string" use="optional" />
</xs:complexType> </xs:complexType>
<!-- menuitem --> <!-- menuitem -->
<xs:element name="menuitem" type="menuitemType" /> <xs:element name="menuitem" type="menuitemType" />
@ -1642,8 +1624,7 @@
</xs:choice> </xs:choice>
<xs:attributeGroup ref="xulElementAttrGroup" /> <xs:attributeGroup ref="xulElementAttrGroup" />
<xs:attribute name="onOpen" type="xs:string" use="optional" /> <xs:attribute name="onOpen" type="xs:string" use="optional" />
<xs:attribute name="onBookmarkChange" type="xs:string" use="optional" /> <xs:attributeGroup ref="rootAttrGroup" />
<xs:attribute name="onClientInfo" type="xs:string" use="optional" />
</xs:complexType> </xs:complexType>
<!-- portalchildren --> <!-- portalchildren -->
<xs:element name="portalchildren" type="portalchildrenType" /> <xs:element name="portalchildren" type="portalchildrenType" />
@ -1690,8 +1671,7 @@
<xs:attribute name="name" type="xs:string" use="optional" /> <xs:attribute name="name" type="xs:string" use="optional" />
<xs:attribute name="orient" type="orientAttrType" use="optional" /> <xs:attribute name="orient" type="orientAttrType" use="optional" />
<xs:attribute name="onCheck" type="xs:string" use="optional" /> <xs:attribute name="onCheck" type="xs:string" use="optional" />
<xs:attribute name="onBookmarkChange" type="xs:string" use="optional" /> <xs:attributeGroup ref="rootAttrGroup" />
<xs:attribute name="onClientInfo" type="xs:string" use="optional" />
</xs:complexType> </xs:complexType>
<!-- row --> <!-- row -->
<xs:element name="row" type="rowType" /> <xs:element name="row" type="rowType" />
@ -1756,8 +1736,7 @@
<xs:attribute name="spacing" type="xs:string" use="optional" /> <xs:attribute name="spacing" type="xs:string" use="optional" />
<xs:attribute name="orient" type="orientAttrType" use="optional" /> <xs:attribute name="orient" type="orientAttrType" use="optional" />
<xs:attribute name="bar" type="booleanType" use="optional" /> <xs:attribute name="bar" type="booleanType" use="optional" />
<xs:attribute name="onBookmarkChange" type="xs:string" use="optional" /> <xs:attributeGroup ref="rootAttrGroup" />
<xs:attribute name="onClientInfo" type="xs:string" use="optional" />
</xs:complexType> </xs:complexType>
<!-- slider --> <!-- slider -->
<xs:element name="slider" type="sliderType" /> <xs:element name="slider" type="sliderType" />
@ -1772,8 +1751,7 @@
<xs:attribute name="onRightClick" type="xs:string" use="optional" /> <xs:attribute name="onRightClick" type="xs:string" use="optional" />
<xs:attribute name="onScroll" type="xs:string" use="optional" /> <xs:attribute name="onScroll" type="xs:string" use="optional" />
<xs:attribute name="onScrolling" type="xs:string" use="optional" /> <xs:attribute name="onScrolling" type="xs:string" use="optional" />
<xs:attribute name="onBookmarkChange" type="xs:string" use="optional" /> <xs:attributeGroup ref="rootAttrGroup" />
<xs:attribute name="onClientInfo" type="xs:string" use="optional" />
</xs:complexType> </xs:complexType>
<!-- south --> <!-- south -->
<xs:element name="south" type="southType" /> <xs:element name="south" type="southType" />
@ -1803,8 +1781,7 @@
<xs:attribute name="spacing" type="xs:string" use="optional" /> <xs:attribute name="spacing" type="xs:string" use="optional" />
<xs:attribute name="orient" type="orientAttrType" use="optional" /> <xs:attribute name="orient" type="orientAttrType" use="optional" />
<xs:attribute name="bar" type="booleanType" use="optional" /> <xs:attribute name="bar" type="booleanType" use="optional" />
<xs:attribute name="onBookmarkChange" type="xs:string" use="optional" /> <xs:attributeGroup ref="rootAttrGroup" />
<xs:attribute name="onClientInfo" type="xs:string" use="optional" />
</xs:complexType> </xs:complexType>
<!-- spinner --> <!-- spinner -->
<xs:element name="spinner" type="spinnerType" /> <xs:element name="spinner" type="spinnerType" />
@ -1814,7 +1791,7 @@
<xs:attribute name="constraint" type="constraintAttrType" use="optional" /> <xs:attribute name="constraint" type="constraintAttrType" use="optional" />
<xs:attribute name="buttonVisible" type="xs:string" use="optional" /> <xs:attribute name="buttonVisible" type="xs:string" use="optional" />
<xs:attribute name="image" type="xs:string" use="optional" /> <xs:attribute name="image" type="xs:string" use="optional" />
<xs:attribute name="onClientInfo" type="xs:string" use="optional" /> <xs:attributeGroup ref="rootAttrGroup" />
<xs:attribute name="step" type="xs:integer" use="optional" /> <xs:attribute name="step" type="xs:integer" use="optional" />
<xs:attribute name="value" type="xs:dateTime" use="optional" /> <xs:attribute name="value" type="xs:dateTime" use="optional" />
</xs:complexType> </xs:complexType>
@ -1863,17 +1840,14 @@
<xs:attribute name="orient" type="orientAttrType" use="optional" /> <xs:attribute name="orient" type="orientAttrType" use="optional" />
<xs:attribute name="onRightClick" type="xs:string" use="optional" /> <xs:attribute name="onRightClick" type="xs:string" use="optional" />
<xs:attribute name="onSelect" type="xs:string" use="optional" /> <xs:attribute name="onSelect" type="xs:string" use="optional" />
<xs:attribute name="onBookmarkChange" type="xs:string" use="optional" /> <xs:attributeGroup ref="rootAttrGroup" />
<xs:attribute name="onClientInfo" type="xs:string" use="optional" />
</xs:complexType> </xs:complexType>
<!-- tabpanel --> <!-- tabpanel -->
<xs:element name="tabpanel" type="tabpanelType" /> <xs:element name="tabpanel" type="tabpanelType" />
<xs:complexType name="tabpanelType" mixed="true"> <xs:complexType name="tabpanelType" mixed="true">
<xs:group ref="anyGroup" minOccurs="0" maxOccurs="unbounded" /> <xs:group ref="anyGroup" minOccurs="0" maxOccurs="unbounded" />
<xs:attributeGroup ref="xulElementAttrGroup" /> <xs:attributeGroup ref="xulElementAttrGroup" />
<xs:attribute name="onClick" type="xs:string" use="optional" /> <xs:attributeGroup ref="mouseExtAttrGroup" />
<xs:attribute name="onRightClick" type="xs:string" use="optional" />
<xs:attribute name="onDoubleClick" type="xs:string" use="optional" />
</xs:complexType> </xs:complexType>
<!-- tabpanels --> <!-- tabpanels -->
<xs:element name="tabpanels" type="tabpanelsType" /> <xs:element name="tabpanels" type="tabpanelsType" />
@ -1897,7 +1871,10 @@
<!-- tablechildren --> <!-- tablechildren -->
<xs:element name="tablechildren" type="tablechildrenType" /> <xs:element name="tablechildren" type="tablechildrenType" />
<xs:complexType name="tablechildrenType"> <xs:complexType name="tablechildrenType">
<xs:group ref="anyGroup" minOccurs="0" maxOccurs="unbounded" /> <xs:choice minOccurs="0" maxOccurs="unbounded">
<xs:group ref="baseGroup" />
<xs:element ref="panel" />
</xs:choice>
<xs:attributeGroup ref="xulElementAttrGroup" /> <xs:attributeGroup ref="xulElementAttrGroup" />
</xs:complexType> </xs:complexType>
@ -1920,8 +1897,8 @@
<xs:attribute name="type" type="textboxTypeAttrType" use="optional" /> <xs:attribute name="type" type="textboxTypeAttrType" use="optional" />
<xs:attribute name="rows" type="intType" use="optional" /> <xs:attribute name="rows" type="intType" use="optional" />
<xs:attribute name="multiline" type="booleanType" use="optional" /> <xs:attribute name="multiline" type="booleanType" use="optional" />
<xs:attribute name="onBookmarkChange" type="xs:string" use="optional" /> <xs:attribute name="tabbable" type="booleanType" use="optional" />
<xs:attribute name="onClientInfo" type="xs:string" use="optional" /> <xs:attributeGroup ref="rootAttrGroup" />
</xs:complexType> </xs:complexType>
<!-- timer --> <!-- timer -->
<xs:element name="timer" type="timerType" /> <xs:element name="timer" type="timerType" />
@ -1932,8 +1909,7 @@
<xs:attribute name="repeats" type="booleanType" use="optional" /> <xs:attribute name="repeats" type="booleanType" use="optional" />
<xs:attribute name="running" type="booleanType" use="optional" /> <xs:attribute name="running" type="booleanType" use="optional" />
<xs:attribute name="onTimer" type="xs:string" use="optional" /> <xs:attribute name="onTimer" type="xs:string" use="optional" />
<xs:attribute name="onBookmarkChange" type="xs:string" use="optional" /> <xs:attributeGroup ref="rootAttrGroup" />
<xs:attribute name="onClientInfo" type="xs:string" use="optional" />
</xs:complexType> </xs:complexType>
<!-- timebox --> <!-- timebox -->
<xs:element name="timebox" type="timeboxType" /> <xs:element name="timebox" type="timeboxType" />
@ -1945,8 +1921,7 @@
<xs:attribute name="buttonVisible" type="booleanType" use="optional" /> <xs:attribute name="buttonVisible" type="booleanType" use="optional" />
<xs:attribute name="image" type="xs:string" use="optional" /> <xs:attribute name="image" type="xs:string" use="optional" />
<xs:attribute name="timeZone" type="xs:string" use="optional" /> <xs:attribute name="timeZone" type="xs:string" use="optional" />
<xs:attribute name="onBookmarkChange" type="xs:string" use="optional" /> <xs:attributeGroup ref="rootAttrGroup" />
<xs:attribute name="onClientInfo" type="xs:string" use="optional" />
</xs:complexType> </xs:complexType>
<!-- toolbar --> <!-- toolbar -->
<xs:element name="toolbar" type="toolbarType" /> <xs:element name="toolbar" type="toolbarType" />
@ -1959,11 +1934,8 @@
</xs:choice> </xs:choice>
<xs:attributeGroup ref="xulElementAttrGroup" /> <xs:attributeGroup ref="xulElementAttrGroup" />
<xs:attribute name="orient" type="orientAttrType" use="optional" /> <xs:attribute name="orient" type="orientAttrType" use="optional" />
<xs:attribute name="onClick" type="xs:string" use="optional" /> <xs:attributeGroup ref="mouseExtAttrGroup" />
<xs:attribute name="onRightClick" type="xs:string" use="optional" /> <xs:attributeGroup ref="rootAttrGroup" />
<xs:attribute name="onDoubleClick" type="xs:string" use="optional" />
<xs:attribute name="onBookmarkChange" type="xs:string" use="optional" />
<xs:attribute name="onClientInfo" type="xs:string" use="optional" />
</xs:complexType> </xs:complexType>
<!-- toolbarbutton --> <!-- toolbarbutton -->
<xs:element name="toolbarbutton" type="toolbarbuttonType" /> <xs:element name="toolbarbutton" type="toolbarbuttonType" />
@ -1976,8 +1948,7 @@
<xs:attribute name="target" type="xs:string" use="optional" /> <xs:attribute name="target" type="xs:string" use="optional" />
<xs:attribute name="tabindex" type="intType" use="optional" /> <xs:attribute name="tabindex" type="intType" use="optional" />
<xs:attribute name="disabled" type="booleanType" use="optional" /> <xs:attribute name="disabled" type="booleanType" use="optional" />
<xs:attribute name="onBookmarkChange" type="xs:string" use="optional" /> <xs:attributeGroup ref="rootAttrGroup" />
<xs:attribute name="onClientInfo" type="xs:string" use="optional" />
</xs:complexType> </xs:complexType>
<!-- tree --> <!-- tree -->
<xs:element name="tree" type="treeType" /> <xs:element name="tree" type="treeType" />
@ -2111,8 +2082,7 @@
<xs:attribute name="vflex" type="booleanType" use="optional" /> <xs:attribute name="vflex" type="booleanType" use="optional" />
<xs:attribute name="fixedLayout" type="booleanType" use="optional" /> <xs:attribute name="fixedLayout" type="booleanType" use="optional" />
<xs:attribute name="onSelect" type="xs:string" use="optional" /> <xs:attribute name="onSelect" type="xs:string" use="optional" />
<xs:attribute name="onBookmarkChange" type="xs:string" use="optional" /> <xs:attributeGroup ref="rootAttrGroup" />
<xs:attribute name="onClientInfo" type="xs:string" use="optional" />
<xs:attribute name="model" type="xs:string" use="optional" /> <xs:attribute name="model" type="xs:string" use="optional" />
<xs:attribute name="treeitemRenderer" type="xs:string" use="optional" /> <xs:attribute name="treeitemRenderer" type="xs:string" use="optional" />
</xs:complexType> </xs:complexType>
@ -2206,6 +2176,7 @@
<xs:element ref="treecell" /> <xs:element ref="treecell" />
</xs:choice> </xs:choice>
<xs:attributeGroup ref="xulElementAttrGroup" /> <xs:attributeGroup ref="xulElementAttrGroup" />
<xs:attributeGroup ref="mouseExtAttrGroup" />
</xs:complexType> </xs:complexType>
<!-- variables --> <!-- variables -->
<xs:element name="variables" type="variablesType" /> <xs:element name="variables" type="variablesType" />
@ -2222,8 +2193,7 @@
<xs:attributeGroup ref="xulElementAttrGroup" /> <xs:attributeGroup ref="xulElementAttrGroup" />
<xs:attribute name="spacing" type="xs:string" use="optional" /> <xs:attribute name="spacing" type="xs:string" use="optional" />
<xs:attribute name="heights" type="xs:string" use="optional" /> <xs:attribute name="heights" type="xs:string" use="optional" />
<xs:attribute name="onBookmarkChange" type="xs:string" use="optional" /> <xs:attributeGroup ref="rootAttrGroup" />
<xs:attribute name="onClientInfo" type="xs:string" use="optional" />
<xs:attribute name="align" type="packAttrType" use="optional" /> <xs:attribute name="align" type="packAttrType" use="optional" />
<xs:attribute name="pack" type="packAttrType" use="optional" /> <xs:attribute name="pack" type="packAttrType" use="optional" />
</xs:complexType> </xs:complexType>
@ -2274,9 +2244,7 @@
<xs:attribute name="minimized" type="booleanType" use="optional" /> <xs:attribute name="minimized" type="booleanType" use="optional" />
<xs:attribute name="minimizable" type="booleanType" use="optional" /> <xs:attribute name="minimizable" type="booleanType" use="optional" />
<xs:attribute name="contentSclass" type="xs:string" use="optional" /> <xs:attribute name="contentSclass" type="xs:string" use="optional" />
<xs:attribute name="onClick" type="xs:string" use="optional" /> <xs:attributeGroup ref="mouseExtAttrGroup" />
<xs:attribute name="onRightClick" type="xs:string" use="optional" />
<xs:attribute name="onDoubleClick" type="xs:string" use="optional" />
<xs:attribute name="onOK" type="xs:string" use="optional" /> <xs:attribute name="onOK" type="xs:string" use="optional" />
<xs:attribute name="onCancel" type="xs:string" use="optional" /> <xs:attribute name="onCancel" type="xs:string" use="optional" />
<xs:attribute name="onCtrlKey" type="xs:string" use="optional" /> <xs:attribute name="onCtrlKey" type="xs:string" use="optional" />
@ -2284,8 +2252,7 @@
<xs:attribute name="onOpen" type="xs:string" use="optional" /> <xs:attribute name="onOpen" type="xs:string" use="optional" />
<xs:attribute name="onClose" type="xs:string" use="optional" /> <xs:attribute name="onClose" type="xs:string" use="optional" />
<xs:attribute name="onZIndex" type="xs:string" use="optional" /> <xs:attribute name="onZIndex" type="xs:string" use="optional" />
<xs:attribute name="onBookmarkChange" type="xs:string" use="optional" /> <xs:attributeGroup ref="rootAttrGroup" />
<xs:attribute name="onClientInfo" type="xs:string" use="optional" />
</xs:complexType> </xs:complexType>
<xs:simpleType name="windowActionOnShowAttrType"> <xs:simpleType name="windowActionOnShowAttrType">
<xs:union> <xs:union>