Author: jmorliaguet
Date: Mon Feb 27 15:19:03 2006
New Revision: 2490
Modified:
cpsskins/branches/jmo-perspectives/ui/framework/cpsskins.js
cpsskins/branches/jmo-perspectives/ui/framework/tests/functional/cpsskins_panel_test.html
Log:
- refactoring of the perspective infrastructure (sub-perspectives will be
removed, instead views will be able to specify which controller to use
to switch perspectives)
- registered a new controller: "perspective selector" that controls a
collection of views.
Modified: cpsskins/branches/jmo-perspectives/ui/framework/cpsskins.js
==============================================================================
--- cpsskins/branches/jmo-perspectives/ui/framework/cpsskins.js (original)
+++ cpsskins/branches/jmo-perspectives/ui/framework/cpsskins.js Mon Feb 27
15:19:03 2006
@@ -431,6 +431,10 @@
'drag-and-drop': function(node, def) {
return new CPSSkins.DragAndDropController(node, def);
+ },
+
+ 'perspective selector': function(node, def) {
+ return new CPSSkins.PerspectiveSelector(node, def);
}
});
@@ -609,6 +613,18 @@
});
+CPSSkins.PerspectiveSelector= Class.create();
+CPSSkins.PerspectiveSelector.prototype = Object.extend(
+ new CPSSkins.Controller(), {
+
+ setup: function() {
+ },
+
+ register: function(view) {
+ }
+
+});
+
// Identifiable DOM elements.
if (!CPSSkins.Identifiable) { CPSSkins.Identifiable = new Object() }
Object.extend(CPSSkins.Identifiable, {
Modified:
cpsskins/branches/jmo-perspectives/ui/framework/tests/functional/cpsskins_panel_test.html
==============================================================================
---
cpsskins/branches/jmo-perspectives/ui/framework/tests/functional/cpsskins_panel_test.html
(original)
+++
cpsskins/branches/jmo-perspectives/ui/framework/tests/functional/cpsskins_panel_test.html
Mon Feb 27 15:19:03 2006
@@ -36,6 +36,13 @@
Element editor</a>
</div>
+ <!-- perspective controller -->
+ <ins class="controller">
+ {"id": "perspective-selector1",
+ "type": "perspective selector"
+ }
+ </ins>
+
<table style="width:100%">
<tr style="vertical-align: top">
<td colspan="3">
@@ -72,20 +79,13 @@
}}
</ins>
- <ins class="model">
- {"id": "panel5",
- "data": {
- "url": "panel5.html",
- "css": "popup.css"
- }}
- </ins>
-
<ins class="view">
{"widget": {
"type": "panel"
},
"model": "panel1",
- "perspectives": ["page-designer", "layout-designer"]
+ "perspectives": ["page-designer", "layout-designer"],
+ "controllers": ["perspective-selector1"]
}
</ins>
@@ -94,7 +94,8 @@
"type": "panel"
},
"model": "panel2",
- "perspectives": ["site-designer"]
+ "perspectives": ["site-designer"],
+ "controllers": ["perspective-selector1"]
}
</ins>
@@ -109,7 +110,8 @@
"type": "panel"
},
"model": "panel2",
- "perspectives": ["page-designer"]
+ "perspectives": ["page-designer"],
+ "controllers": ["perspective-selector1"]
}
</ins>
@@ -118,7 +120,8 @@
"type": "panel"
},
"model": "panel3",
- "perspectives": ["site-designer", "layout-designer"]
+ "perspectives": ["site-designer", "layout-designer"],
+ "controllers": ["perspective-selector1"]
}
</ins>
@@ -130,7 +133,8 @@
"type": "panel"
},
"model": "panel3",
- "perspectives": ["page-designer"]
+ "perspectives": ["page-designer"],
+ "controllers": ["perspective-selector1"]
}
</ins>
@@ -139,7 +143,8 @@
"type": "panel"
},
"model": "panel4",
- "perspectives": ["page-designer"]
+ "perspectives": ["page-designer"],
+ "controllers": ["perspective-selector1"]
}
</ins>
@@ -151,7 +156,8 @@
"type": "panel"
},
"model": "panel4",
- "perspectives": ["site-designer", "layout-designer"]
+ "perspectives": ["site-designer", "layout-designer"],
+ "controllers": ["perspective-selector1"]
}
</ins>
@@ -160,7 +166,8 @@
"type": "panel"
},
"model": "panel2",
- "perspectives": ["site-designer"]
+ "perspectives": ["site-designer"],
+ "controllers": ["perspective-selector1"]
}
</ins>
@@ -169,14 +176,6 @@
</tr>
</table>
- <ins class="view">
- {"widget": {
- "type": "panel"
- },
- "model": "panel5",
- "perspectives": ["element-editor"]
- }
- </ins>
</body>
--
http://lists.nuxeo.com/mailman/listinfo/z3lab-checkins
