m

git-svn-id: svn+ssh://udev.org/home/wis/SVNROOT/qwebsvn/trunk@187 0ef81754-500e-0410-91f5-c6cf7c7314d8
antonylesuisse · Nov 15, 2006 · c9132bc · c9132bc
1 parent 58bc317
commit c9132bc
Show file tree

Hide file tree

Showing 2 changed files with 41 additions and 11 deletions.
diff --git a/javascript/qweb.html b/javascript/qweb.html
@@ -6,23 +6,43 @@
 	<script type="text/javascript" src="qweb.js"></script>
 	<script type="text/javascript">
 	var debug=function(s){
-		$("#output")[0].innerHTML+=s.replace(/&/g,"&amp;").replace(/</g,"&lt;").replace(/>/g,"&gt;")+"<br/>\n"
+		out="";
+		if(typeof(s)=="object") {
+			for(var i in s) {
+				out+=i+" : "+s+"\n"
+			}
+			out=s+" {\n"+out+"}"
+		} else {
+			out=s+"";
+		}
+		$("#output")[0].innerHTML+=out.replace(/&/g,"&amp;").replace(/</g,"&lt;").replace(/>/g,"&gt;")+"<br/>\n"
 	}
 	$(function(){
-		debug("debug test");
+		debug($("#template")[0].innerHTML);
+		$("#caca").addClass("re");
+		debug($("#template")[0].innerHTML);
 		debug(QWeb.render($("#template")[0],{}));
 	})
 	</script>
 </head>
 <body>
 
+
+TEMPLATE:
 <div id="template">
-	Hello <b>world</b><br/>
+	Hello <b id="caca">world</b><br/>
 	<b t-test="attvalue"></b>
-	<t></t>
+	Standar: <b></b>
+	Pas stand: <t></t>
+	Fini: <q></q>
 </div>
+<br/>
+<br/>
+<br/>
+<br/>
+<br/>
 
-<div id="output" style="padding: 4px; border: 1px solid #000;"></div>
+<pre id="output" style="padding: 4px; border: 1px solid #000;"></pre>
 
 </body>
 </html>
diff --git a/javascript/qweb.js b/javascript/qweb.js
@@ -21,19 +21,29 @@ var QWeb={
 	},
 	render_node:function(e,v){
 		var r=""
-		if(e.nodeType==e.TEXT_NODE) {
+		if(e.nodeType==3) {
 			r=e.data;
-		} else if(e.nodeType==e.ELEMENT_NODE) {
+		} else if(e.nodeType==1) {
 			var g_att={};
 			var t_att={};
 			var t_render=null;
 			var a=e.attributes;
+			debug(a.length);
+			//ec=e.childNodes;
+			//debug(ec.length);
+			//for (var i=0; i<ec.length; i++) {
+				//debug("node:"+ec[i].nodeType+" "+ec[i].nodeName)
+			//}
 			for(var i=0; i<a.length; i++) {
-				an=a[i].name
-				av=a[i].value
-				g_att[an]=av
+				if(a[i].specified) {
+					an=a[i].name
+					av=a[i].value
+					g_att[an]=av
+				}
 			}
 			r=this.render_element(e, t_att, g_att, v)
+		} else {
+			debug("caca"+e.nodeType);
 		}
 		return r;
 	},
@@ -48,7 +58,7 @@ var QWeb={
 		}
 		r="<"+e.tagName+att+">"+inner+"</"+e.tagName+">"
 		return r
-	},
+	}
 }
 
 //---------------------------------------------------------