Author: jmorliaguet
Date: Sat Feb 11 16:33:05 2006
New Revision: 2354
Modified:
cpsskins/branches/jmo-perspectives/ui/framework/ctal.js
cpsskins/branches/jmo-perspectives/ui/framework/tests/unit/cpsskins_ctal_test.html
Log:
- more robust code (e.g. Opera) - test updates
Modified: cpsskins/branches/jmo-perspectives/ui/framework/ctal.js
==============================================================================
--- cpsskins/branches/jmo-perspectives/ui/framework/ctal.js (original)
+++ cpsskins/branches/jmo-perspectives/ui/framework/ctal.js Sat Feb 11
16:33:05 2006
@@ -170,11 +170,16 @@
if (tmpl.nodeType == 1) {
var parsers = ctal.parsers;
for (ctal_attr in parsers) {
- var attrnode = tmpl.getAttribute(ctal_attr);
- if (attrnode) {
+ var attrs = tmpl.attributes;
+ for (i=0; i<attrs.length; i++) {
+ var attrnode = attrs[i];
+ var attrname = attrnode.nodeName;
+ if (attrname != ctal_attr) {
+ continue;
+ }
tmpl.removeAttribute(ctal_attr);
var parser = parsers[ctal_attr];
- parser(tmpl, attrnode, data)
+ parser(tmpl, attrnode.value, data)
}
}
}
Modified:
cpsskins/branches/jmo-perspectives/ui/framework/tests/unit/cpsskins_ctal_test.html
==============================================================================
---
cpsskins/branches/jmo-perspectives/ui/framework/tests/unit/cpsskins_ctal_test.html
(original)
+++
cpsskins/branches/jmo-perspectives/ui/framework/tests/unit/cpsskins_ctal_test.html
Sat Feb 11 16:33:05 2006
@@ -9,6 +9,7 @@
<meta http-equiv="content-type" content="text/html; charset=utf-8" />
<script src="../../prototype.js" type="text/javascript"></script>
<script src="../../ctal.js" type="text/javascript"></script>
+ <script src="../../cpsskins.js" type="text/javascript"></script>
<script src="../unittest.js" type="text/javascript"></script>
<link rel="stylesheet" href="../test.css" type="text/css" />
</head>
@@ -252,37 +253,6 @@
ctal:repeat="item f"
ctal:content="item">...</div></div>
-<!-- ctal:attributes -->
-<div id="e30"><span
- ctal:attributes="color string:red">...</span></div>
-
-<div id="e30b"><span
- ctal:attributes="color string:red;">...</span></div>
-
-<div id="e30c"><span
- ctal:attributes="color string:red ;">...</span></div>
-
-<div id="e30d"><span
- ctal:attributes="color string:red; class string: large">...</span></div>
-
-<div id="e30e"><span
- ctal:attributes="color string:red; class string: large;">...</span></div>
-
-<div id="e30f"><span
- ctal:attributes=" color string:red; class string: large;
">...</span></div>
-
-<div id="e30g"><span
- ctal:attributes="color string: red; class string: large;
">...</span></div>
-
-<!-- javascript: -->
-<div id="e31"><span ctal:content="javascript:1">...</span></div>
-
-<div id="e31b"><span ctal:content="javascript:1+1">...</span></div>
-
-<div id="e31c"><span
- ctal:content="javascript:data['k']['l']['m']">...</span></div>
-
-<!-- ctal:attributes -->
<!-- Tests follow -->
<script type="text/javascript">
@@ -460,26 +430,6 @@
assertEqual('<div>4</div><div>5</div><div>6</div>', $("e28").innerHTML);
assertEqual('', $("e29").innerHTML);
- }},
-
- testTALAttributes: function() { with(this) {
- assertEqual('<span color="red">...</span>', $("e30").innerHTML);
- assertEqual('<span color="red">...</span>', $("e30b").innerHTML);
- assertEqual('<span color="red">...</span>', $("e30c").innerHTML);
- assertEqual('<span class="large" color="red">...</span>',
- $("e30d").innerHTML);
- assertEqual('<span class="large" color="red">...</span>',
- $("e30e").innerHTML);
- assertEqual('<span class="large" color="red">...</span>',
- $("e30f").innerHTML);
- assertEqual('<span class="large" color=" red">...</span>',
- $("e30g").innerHTML);
- }},
-
- testJavascript: function() { with(this) {
- assertEqual('<span>1</span>', $("e31").innerHTML);
- assertEqual('<span>2</span>', $("e31b").innerHTML);
- assertEqual('<span>10</span>', $("e31c").innerHTML);
}}
});
--
http://lists.nuxeo.com/mailman/listinfo/z3lab-checkins
