|
From: <ha...@us...> - 2013-01-03 22:58:52
|
Revision: 1296
http://openautomation.svn.sourceforge.net/openautomation/?rev=1296&view=rev
Author: hausl
Date: 2013-01-03 22:58:45 +0000 (Thu, 03 Jan 2013)
Log Message:
-----------
Schema: use base type xsd:anyURI, changed editor to recognize this type
Modified Paths:
--------------
CometVisu/trunk/visu/editor/lib/Schema.js
CometVisu/trunk/visu/visu_config.xsd
Modified: CometVisu/trunk/visu/editor/lib/Schema.js
===================================================================
--- CometVisu/trunk/visu/editor/lib/Schema.js 2013-01-03 22:05:11 UTC (rev 1295)
+++ CometVisu/trunk/visu/editor/lib/Schema.js 2013-01-03 22:58:45 UTC (rev 1296)
@@ -244,6 +244,7 @@
// xsd:-namespaces types, those are the originals
switch (_type.baseType) {
case 'xsd:string':
+ case 'xsd:anyURI':
if (!(typeof(value) == 'string')) {
// it's not a string, but it should be.
// pretty much any input a user gives us is string, so this is pretty much moot.
Modified: CometVisu/trunk/visu/visu_config.xsd
===================================================================
--- CometVisu/trunk/visu/visu_config.xsd 2013-01-03 22:05:11 UTC (rev 1295)
+++ CometVisu/trunk/visu/visu_config.xsd 2013-01-03 22:58:45 UTC (rev 1296)
@@ -13,7 +13,7 @@
</xsd:simpleType>
<xsd:simpleType name="uri">
- <xsd:restriction base="xsd:string" />
+ <xsd:restriction base="xsd:anyURI" />
</xsd:simpleType>
<xsd:complexType name="layout">
@@ -294,7 +294,7 @@
<xsd:complexType name="icon-definition">
<xsd:attribute name="name" type="xsd:string" use="required" />
- <xsd:attribute name="uri" type="xsd:string" use="required" />
+ <xsd:attribute name="uri" type="uri" use="required" />
<xsd:attribute name="type" type="xsd:string" use="optional" />
<xsd:attribute ref="flavour" use="optional" />
<xsd:attribute name="color" type="xsd:string" use="optional" />
@@ -508,7 +508,7 @@
<xsd:attribute ref="mapping" use="optional" />
<xsd:attribute ref="styling" use="optional" />
<xsd:attribute ref="align" use="optional" />
- <xsd:attribute name="url" type="xsd:string" use="required" />
+ <xsd:attribute name="url" type="uri" use="required" />
<xsd:attribute name="params" type="xsd:string" use="optional" />
<xsd:attribute ref="flavour" use="optional" />
</xsd:complexType>
@@ -623,7 +623,7 @@
<xsd:element name="layout" type="layout" minOccurs="0" maxOccurs="1" />
<xsd:element name="address" type="address" minOccurs="1" />
</xsd:choice>
- <xsd:attribute name="src" type="xsd:string" />
+ <xsd:attribute name="src" type="uri" />
<xsd:attribute name="suffix" type="xsd:string" use="required" />
<xsd:attribute name="type" type="xsd:string" use="optional" />
<xsd:attribute name="width" type="dimension" />
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|