Author: jmorliaguet
Date: Sat Jan 14 16:47:34 2006
New Revision: 2210
Modified:
cpsskins/branches/jmo-perspectives/ui/framework/cpsskins.js
cpsskins/branches/jmo-perspectives/ui/framework/tests/functional/data1.txt
cpsskins/branches/jmo-perspectives/ui/framework/tests/unit/cpsskins_test.html
cpsskins/branches/jmo-perspectives/ui/framework/tests/unit/p3.html
Log:
- test fixes
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 Sat Jan 14
16:47:34 2006
@@ -68,7 +68,7 @@
}
});
} else {
- load(el, classid);
+ CPSSkins.load(el, classid);
}
});
@@ -727,14 +727,14 @@
Canvas.addScript(this.script_id, script);
}
- var widget = this.widget;
- var options = {
- onComplete: function() {
- CPSSkins.parse(widget);
- }
- };
-
if (url) {
+ var widget = this.widget;
+ var options = {
+ onComplete: function() {
+ CPSSkins.parse(widget);
+ }
+ };
+
var parts = url.split('?');
if (parts.length == 2) {
var url = parts[0];
Modified:
cpsskins/branches/jmo-perspectives/ui/framework/tests/functional/data1.txt
==============================================================================
--- cpsskins/branches/jmo-perspectives/ui/framework/tests/functional/data1.txt
(original)
+++ cpsskins/branches/jmo-perspectives/ui/framework/tests/functional/data1.txt
Sat Jan 14 16:47:34 2006
@@ -1 +1 @@
-{"hint":"Click here to open the document."}
+{"hint":"Click here to close the document."}
Modified:
cpsskins/branches/jmo-perspectives/ui/framework/tests/unit/cpsskins_test.html
==============================================================================
---
cpsskins/branches/jmo-perspectives/ui/framework/tests/unit/cpsskins_test.html
(original)
+++
cpsskins/branches/jmo-perspectives/ui/framework/tests/unit/cpsskins_test.html
Sat Jan 14 16:47:34 2006
@@ -60,17 +60,59 @@
</div>
<!-- panels -->
- <view widget="panel" perspectives="1" url="p1.html"></view>
+ <object classid="cpsskins:view">
+ {"widget": {
+ "type": "panel",
+ "url": "p1.html"
+ },
+ "perspectives": ["1"]
+ }
+ </object>
- <view widget="panel" perspectives="1,2" url="p2.html"></view>
+ <object classid="cpsskins:view">
+ {"widget": {
+ "type": "panel",
+ "url": "p2.html"
+ },
+ "perspectives": ["1", "2"]
+ }
+ </object>
- <view widget="panel" perspectives="3" url="p3.html"></view>
+ <object classid="cpsskins:view">
+ {"widget": {
+ "type": "panel",
+ "url": "p3.html"
+ },
+ "perspectives": ["3"]
+ }
+ </object>
- <view widget="panel" perspectives="1/2" url="p1_2.html"></view>
+ <object classid="cpsskins:view">
+ {"widget": {
+ "type": "panel",
+ "url": "p1_2.html"
+ },
+ "perspectives": ["1/2"]
+ }
+ </object>
- <view widget="panel" perspectives="2/3" url="p2_3.html"></view>
+ <object classid="cpsskins:view">
+ {"widget": {
+ "type": "panel",
+ "url": "p2_3.html"
+ },
+ "perspectives": ["2/3"]
+ }
+ </object>
- <view widget="panel" perspectives="2/3/1" url="p2_3_1.html"></view>
+ <object classid="cpsskins:view">
+ {"widget": {
+ "type": "panel",
+ "url": "p2_3_1.html"
+ },
+ "perspectives": ["2/3/1"]
+ }
+ </object>
</div>
@@ -333,5 +375,6 @@
// ]]>
</script>
+<div id="message"></div>
</body>
</html>
Modified: cpsskins/branches/jmo-perspectives/ui/framework/tests/unit/p3.html
==============================================================================
--- cpsskins/branches/jmo-perspectives/ui/framework/tests/unit/p3.html
(original)
+++ cpsskins/branches/jmo-perspectives/ui/framework/tests/unit/p3.html Sat Jan
14 16:47:34 2006
@@ -1,5 +1,12 @@
<div id="p3">
- <view widget="panel" perspectives="4" url="p4.html"></view>
+ <object classid="cpsskins:view">
+ {"widget": {
+ "type": "panel",
+ "url": "p4.html"
+ },
+ "perspectives": ["4"]
+ }
+ </object>
</div>
--
http://lists.nuxeo.com/mailman/listinfo/z3lab-checkins
