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

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

Revision: 654
          http://openautomation.svn.sourceforge.net/openautomation/?rev=654&view=rev
Author:   makki1
Date:     2012-01-15 17:09:04 +0000 (Sun, 15 Jan 2012)
Log Message:
-----------
small fixes on variants in editor, save should work now

Modified Paths:
--------------
    CometVisu/trunk/visu/designs/structure_pure.js
    CometVisu/trunk/visu/edit/cometeditor.js
    CometVisu/trunk/visu/edit/visuconfig_edit.js

Modified: CometVisu/trunk/visu/designs/structure_pure.js
===================================================================
--- CometVisu/trunk/visu/designs/structure_pure.js	2012-01-15 12:32:22 UTC (rev 653)
+++ CometVisu/trunk/visu/designs/structure_pure.js	2012-01-15 17:09:04 UTC (rev 654)
@@ -929,7 +929,7 @@
     },
     elements: {
       label:             { type: 'string',    required: false, multi: false },
-      address:           { type: 'address',   required: true, multi: true }
+      address:           { type: 'address',   required: true, multi: true, options: {variant: ['', 'isbutton']} }
     },
     content:      false
   });
@@ -1180,4 +1180,5 @@
   if( layout.getAttribute('y'    ) ) ret_val += 'top:'   + layout.getAttribute('y'    ) + ';';
   if( layout.getAttribute('width') ) ret_val += 'width:' + layout.getAttribute('width') + ';';
   return ret_val;
-}
\ No newline at end of file
+}
+

Modified: CometVisu/trunk/visu/edit/cometeditor.js
===================================================================
--- CometVisu/trunk/visu/edit/cometeditor.js	2012-01-15 12:32:22 UTC (rev 653)
+++ CometVisu/trunk/visu/edit/cometeditor.js	2012-01-15 17:09:04 UTC (rev 654)
@@ -311,7 +311,7 @@
                     $elements.each(function (index, e) {
                         $address = $("<address />")
                             .attr("transform", $(e).data("transform"))
-                            .attr("variant", $(e).data("variant"))
+                            .attr("variant", $(e).data("variant") || "")
                             .attr("readonly", $(e).data("readonly") == true ? "true" : "false")
                             .append($(e).data("address"));
                         dataObject.append($address);
@@ -646,8 +646,9 @@
         elementDiv.find(".title").append(t.find("option[value='" + elementData.textContent + "']").text());
         elementDiv.find(".value").append(elementData.textContent);
         elementDiv.find(".transform").append(elementData._attributes.transform);
+        elementDiv.find(".variant").append(elementData._attributes.variant);
         if (elementData._attributes.variant != "undefined" && elementData._attributes.variant != "") {
-            elementDiv.find(".variant").append(elementData._attributes.variant).show();
+            elementDiv.find(".variant").show();
         } else {
             elementDiv.find(".variant").hide();
         }

Modified: CometVisu/trunk/visu/edit/visuconfig_edit.js
===================================================================
--- CometVisu/trunk/visu/edit/visuconfig_edit.js	2012-01-15 12:32:22 UTC (rev 653)
+++ CometVisu/trunk/visu/edit/visuconfig_edit.js	2012-01-15 17:09:04 UTC (rev 654)
@@ -273,7 +273,7 @@
                     element.find("label").html("variant");
             
                     // variants can be selected from a pre-defined list ONLY.
-                    var variantList = $("<select name=\"variant\" />");
+                    var variantList = $("<select name=\"variant\" class=\"add_variant\" />");
 
                     // go through list of available variants and display as select-list
                     $.each(options.variant, function (i, element) {

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