[Openautomation-svn] SF.net SVN: openautomation:[651] CometVisu/trunk/visu

[<ma...@us...>]

Revision: 651
          http://openautomation.svn.sourceforge.net/openautomation/?rev=651&view=rev
Author:   makki1
Date:     2012-01-14 16:26:53 +0000 (Sat, 14 Jan 2012)
Log Message:
-----------
(interims?) fix for saving addr in editor, updated xsd with plugins

Modified Paths:
--------------
    CometVisu/trunk/visu/edit/cometeditor.js
    CometVisu/trunk/visu/visu_config.xsd

Modified: CometVisu/trunk/visu/edit/cometeditor.js
===================================================================
--- CometVisu/trunk/visu/edit/cometeditor.js	2012-01-14 15:18:07 UTC (rev 650)
+++ CometVisu/trunk/visu/edit/cometeditor.js	2012-01-14 16:26:53 UTC (rev 651)
@@ -654,17 +654,19 @@
         elementDiv.find(".readonly").append(elementData._attributes.readonly == "true" ? "readonly" : "")
 
         elementDiv.data("transform", elementData._attributes.transform)
-            .data("variant", elementData._attributes.variant)
             .data("readonly", elementData._attributes.readonly == "true" ? true : false)
             .data("address", elementData.textContent);
 
         if (typeof options == "undefined" || typeof options.variant == "undefined" || options.variant == false) {
             // if this element does not support variants, then remove them from the HTML.
             elementDiv.find("div.variant").remove();
+        } else {
+            elementDiv.data("variant", elementData._attributes.variant);
         }
 
         elementDiv.data("options", options);
 
         return elementDiv;
     }
-}
\ No newline at end of file
+}
+

Modified: CometVisu/trunk/visu/visu_config.xsd
===================================================================
--- CometVisu/trunk/visu/visu_config.xsd	2012-01-14 15:18:07 UTC (rev 650)
+++ CometVisu/trunk/visu/visu_config.xsd	2012-01-14 16:26:53 UTC (rev 651)
@@ -63,6 +63,7 @@
 
 <xsd:attribute name="readonly" type="xsd:boolean" />
 <xsd:attribute name="align" type="xsd:string" />
+<xsd:attribute name="variant" type="xsd:string" />
 
 <!-- complex elements -->
 
@@ -179,6 +180,9 @@
             <xsd:element name="colorchooser" type="colorchooser" />
             <xsd:element name="diagram_popup" type="diagram_popup" />
             <xsd:element name="diagram_inline" type="diagram_inline" />
+            <xsd:element name="gweather" type="gweather" />
+            <xsd:element name="rss" type="rss" />
+            <xsd:element name="jqclock" type="jqclock" />
             <xsd:element ref="page" />
         </xsd:choice>
         <xsd:attribute name="name" type="xsd:string" use="required" />
@@ -222,6 +226,9 @@
         <xsd:element name="colorchooser" type="colorchooser" />
         <xsd:element name="diagram_popup" type="diagram_popup" />
         <xsd:element name="diagram_inline" type="diagram_inline" />
+        <xsd:element name="gweather" type="gweather" />
+        <xsd:element name="rss" type="rss" />
+        <xsd:element name="jqclock" type="jqclock" />
         <xsd:element ref="page" />
     </xsd:choice>
     <xsd:attribute name="name" type="xsd:string" use="required" />
@@ -428,6 +435,51 @@
     <xsd:attribute name="gridcolor" type="xsd:string" use="optional" />
 </xsd:complexType>
 
+<xsd:complexType name="gweather" >
+    <xsd:choice maxOccurs="unbounded" minOccurs="1">
+        <xsd:element name="label" type="xsd:string" maxOccurs="1" />
+    </xsd:choice>    
+    <xsd:attribute name="width" type="dimension" use="optional"/>
+    <xsd:attribute name="height" type="dimension" use="optional"/>
+    <xsd:attribute name="refresh" type="xsd:integer" use="optional" />
+    <xsd:attribute name="city" type="xsd:string" use="required" />
+    <xsd:attribute name="lang" type="xsd:string" use="optional" />
+    <xsd:attribute name="image_url" type="xsd:string" use="optional" />
+    <xsd:attribute name="refresh" type="xsd:integer" use="optional" />
+    <xsd:attribute name="current" type="xsd:string" use="optional" />
+    <xsd:attribute name="forecast" type="xsd:string" use="optional" />
+</xsd:complexType>
+
+<xsd:complexType name="rss" >
+    <xsd:choice maxOccurs="unbounded" minOccurs="1">
+        <xsd:element name="label" type="xsd:string" maxOccurs="1" />
+    </xsd:choice>    
+    <xsd:attribute name="src" type="xsd:string" use="required" />
+    <xsd:attribute name="width" type="dimension" use="optional"/>
+    <xsd:attribute name="height" type="dimension" use="optional"/>
+    <xsd:attribute name="refresh" type="xsd:integer" use="optional" />
+    <xsd:attribute name="limit" type="xsd:integer" use="optional" />
+    <xsd:attribute name="header" type="xsd:string" use="required" />
+    <xsd:attribute name="date" type="xsd:string" use="optional" />
+    <xsd:attribute name="content" type="xsd:string" use="optional" />
+    <xsd:attribute name="snippet" type="xsd:integer" use="optional" />
+    <xsd:attribute name="showerror" type="xsd:string" use="optional" />
+    <xsd:attribute name="ssl" type="xsd:string" use="optional" />
+    <xsd:attribute name="linktarget" type="xsd:string" use="optional" />
+    <xsd:attribute name="link" type="xsd:string" use="optional" />
+    <xsd:attribute name="title" type="xsd:string" use="optional" />
+</xsd:complexType>
+
+<xsd:complexType name="jqclock" >
+    <xsd:choice maxOccurs="unbounded" minOccurs="1">
+        <xsd:element name="label" type="xsd:string" maxOccurs="1" />
+    </xsd:choice>    
+    <xsd:attribute name="width" type="dimension" use="optional"/>
+    <xsd:attribute name="height" type="dimension" use="optional"/>
+    <xsd:attribute name="lang" type="xsd:string" use="required" />
+    <xsd:attribute name="date" type="xsd:string" use="optional" />
+</xsd:complexType>
+
 <xsd:complexType name="break" />
 
 <xsd:complexType name="line" />

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.