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

[<net...@us...>]

Revision: 345
          http://openautomation.svn.sourceforge.net/openautomation/?rev=345&view=rev
Author:   netzkind
Date:     2011-05-23 17:29:29 +0000 (Mon, 23 May 2011)

Log Message:
-----------
allow attributes for pages, don't drop names of "empty" pages

Modified Paths:
--------------
    CometVisu/trunk/visu/edit/save_config.php
    CometVisu/trunk/visu/edit/visuconfig_edit.js

Modified: CometVisu/trunk/visu/edit/save_config.php
===================================================================
--- CometVisu/trunk/visu/edit/save_config.php	2011-05-23 07:05:49 UTC (rev 344)
+++ CometVisu/trunk/visu/edit/save_config.php	2011-05-23 17:29:29 UTC (rev 345)
@@ -91,6 +91,27 @@
         $objXML->setAttribute("name", (string)$objJSON->name);
     }
 
+    if (false === empty($objJSON->_attributes)) {
+        // some attributes are in a sub-element - it's easier to get them out of there
+        // into our main namespace
+        foreach ($objJSON->_attributes as $strKey => $strValue) {
+            $objJSON->$strKey = $strValue;
+        }
+    }
+
+    foreach ($objJSON as $strAttribute => $mixValue) {
+        if (0 === strpos($strAttribute, "_")) {
+            // Parameter die mit "_" beginnen sind special purpose
+            continue;
+        }
+
+        if ($strAttribute === "textContent") {
+            $objXML->nodeValue = $mixValue;
+            continue;
+        }
+        $objXML->setAttribute($strAttribute, $mixValue);
+    }
+
     if (true === empty($objJSON->_elements) || false === is_array($objJSON->_elements)) {
         return $objXML;
     }

Modified: CometVisu/trunk/visu/edit/visuconfig_edit.js
===================================================================
--- CometVisu/trunk/visu/edit/visuconfig_edit.js	2011-05-23 07:05:49 UTC (rev 344)
+++ CometVisu/trunk/visu/edit/visuconfig_edit.js	2011-05-23 17:29:29 UTC (rev 345)
@@ -865,6 +865,10 @@
     return myObj;
 }
 
+function getPageData(element) {
+
+}
+
 function createObjectFromPage(pageObject) {
     var obj = {};
     var elements = new Array();
@@ -873,6 +877,10 @@
             // Seitenname
             obj.name = $(element).text();
             obj._type = "page";
+            if ($(element).parents("div.page").data("configData")) {
+                var data = $(element).parents("div.page").data("configData");
+                obj = jQuery.extend(obj, data.attributes);
+            }
         } else {
             var myObj = {};
             myObj = getWidgetData(element);


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