[Z3lab-checkins] r2418 - cpsskins/branches/jmo-perspectives/ui/framework/tests/zope3/functional/treeview

[svn]

Author: jmorliaguet
Date: Sat Feb 18 17:05:19 2006
New Revision: 2418

Modified:
   
cpsskins/branches/jmo-perspectives/ui/framework/tests/zope3/functional/treeview/browser.py
   
cpsskins/branches/jmo-perspectives/ui/framework/tests/zope3/functional/treeview/configure.zcml
   
cpsskins/branches/jmo-perspectives/ui/framework/tests/zope3/functional/treeview/cpsskins_treeview.pt
Log:

- simplifications



Modified: 
cpsskins/branches/jmo-perspectives/ui/framework/tests/zope3/functional/treeview/browser.py
==============================================================================
--- 
cpsskins/branches/jmo-perspectives/ui/framework/tests/zope3/functional/treeview/browser.py
  (original)
+++ 
cpsskins/branches/jmo-perspectives/ui/framework/tests/zope3/functional/treeview/browser.py
  Sat Feb 18 17:05:19 2006
@@ -19,15 +19,13 @@
 
 class Views(BrowserView):
 
-    def setTreeData(self, data):
-        data = json.read(data)
-        return json.write(data)
-
     def getTreeData(self):
+        local_data = self._getLocalStorageData(1)
+        if local_data is None:
+            local_data = {}
+        tree_state = local_data.get('states', {})
 
-        print self._getLocalStorageData(1)
-
-
+        print local_data
         return json.write(data)
 
     # TODO: moves this to an API

Modified: 
cpsskins/branches/jmo-perspectives/ui/framework/tests/zope3/functional/treeview/configure.zcml
==============================================================================
--- 
cpsskins/branches/jmo-perspectives/ui/framework/tests/zope3/functional/treeview/configure.zcml
      (original)
+++ 
cpsskins/branches/jmo-perspectives/ui/framework/tests/zope3/functional/treeview/configure.zcml
      Sat Feb 18 17:05:19 2006
@@ -48,11 +48,6 @@
         attribute="getTreeData"
     />
 
-    <browser:page
-        name="setTreeData"
-        attribute="setTreeData"
-    />
-
   </browser:pages>
 
 </configure>

Modified: 
cpsskins/branches/jmo-perspectives/ui/framework/tests/zope3/functional/treeview/cpsskins_treeview.pt
==============================================================================
--- 
cpsskins/branches/jmo-perspectives/ui/framework/tests/zope3/functional/treeview/cpsskins_treeview.pt
        (original)
+++ 
cpsskins/branches/jmo-perspectives/ui/framework/tests/zope3/functional/treeview/cpsskins_treeview.pt
        Sat Feb 18 17:05:19 2006
@@ -30,17 +30,21 @@
     function openContainer(event) {
       var target = Event.element(event);
       var nodeid = target.getAttribute("nodeid");
-      var state_data = CPSSkins.getModelById("tree-state").getData();
-      state_data['state'][nodeid] = "open";
-      CPSSkins.getModelById("tree").setData(state_data);
+
+      var model = CPSSkins.getModelById("tree");
+      var data = model.getData();
+      data['state'][nodeid] = "open";
+      model.setData(data);
     }
 
     function closeContainer(event) {
       var target = Event.element(event);
       var nodeid = target.getAttribute("nodeid");
-      var state_data = CPSSkins.getModelById("tree-state").getData();
-      delete state_data['state'][nodeid];
-      CPSSkins.getModelById("tree").setData(state_data);
+
+      var model = CPSSkins.getModelById("tree");
+      var data = model.getData();
+      delete data['state'][nodeid];
+      model.setData(data);
     }
 
     CPSSkins.registerHandlers(
-- 
http://lists.nuxeo.com/mailman/listinfo/z3lab-checkins