updated DOMinate version

ad-si · Mar 13, 2013 · 82877ca · 82877ca
1 parent f5a8749
commit 82877ca
Show file tree

Hide file tree

Showing 3 changed files with 35 additions and 32 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,2 +1,3 @@
 .DS_Store
-.idea/
+.idea
+.sass-cache
diff --git a/index.html b/index.html
@@ -1,30 +1,33 @@
 <!doctype html>
 <html>
 <head>
-    <meta charset="utf-8">
-    <title>vectual.js</title>
-    <link rel="stylesheet" type="text/css" href="css/vectual.css"/>
-    <script src="https://raw.github.com/adius/DOMinate/master/src/dominate.extended.min.js"></script>
-    <script src="js/config.js"></script>
-    <script src="js/data.js"></script>
-    <script type="text/javascript" src="js/vectual.js"></script>
+	<meta charset="utf-8">
+	<title>vectual.js</title>
+	<link rel="stylesheet" type="text/css" href="css/vectual.css"/>
 </head>
 <body>
+
 <h1>vectual.js</h1>
 
 <div id="demo"></div>
 
+<script src="https://raw.github.com/adius/DOMinate/master/src/dominate.min.js"></script>
+<script src="js/config.js"></script>
+<script src="js/data.js"></script>
+<script src="js/vectual.js"></script>
 <script>
 
-    vectual(fruitConsumption)
-    //.pieChart()
-    .barChart()
-    //.lineChart()
-    //.scatterChart()
-    //.map()
-    //.table()
-    //.tagCloud();
+	vectual(fruitConsumption)
+	.pieChart()
+	//.barChart()
+	//.lineChart()
+	//.tagCloud();
+
+	//.scatterChart()
+	//.map()
+	//.table()
 
 </script>
+
 </body>
 </html>
diff --git a/js/vectual.js b/js/vectual.js
@@ -1,4 +1,5 @@
 (function (window, document, undefined) {
+
 	var svg, //SVG DOM-fragment
 		svgNS = "http://www.w3.org/2000/svg", //SVG namespace
 		dom = DOMinate, //DOM-building utility
@@ -41,7 +42,7 @@
 				['g', {
 					'transform': 'translate(' + (0.5 * c.width) + ', ' + (0.5 * c.height) + ')'
 				}], svgNS
-			);
+			)[0];
 
 
 		function init() {
@@ -67,7 +68,7 @@
 					nextx,
 					nexty,
 					size = (((c.sorted.values[i] / c.totalValue) * 360) > 180) ? '0 1,0' : '0 0,0',
-					sector = dom(['g', {'class': "vectual_pie_sector"}], svgNS);
+					sector = dom(['g', {'class': "vectual_pie_sector"}], svgNS)[0];
 
 				function init() {
 
@@ -93,7 +94,7 @@
 							'style': 'stroke-width:' + (radius * 0.015) + ';fill:' + c.colors[i],
 							'd': 'M 0,0 L ' + lastx + ',' + lasty + ' A ' + radius + ',' + radius + ' ' + size + ' ' + nextx + ',' + nexty + ' z'}
 						], svgNS
-					);
+					)[0];
 
 					text = dom(
 						['text', {
@@ -105,15 +106,15 @@
 							'fill': c.colors[i],
 							'transform': 'translate(0, 5)'
 						}], svgNS
-					);
+					)[0];
 
 					title = dom(
 						['title',
 							c.sorted.keys[i] + ' | ' +
 								c.sorted.values[i] + ' | ' +
 								(Math.round(c.sorted.values[i] / c.totalValue * 100) ) + '%'
 						], svgNS
-					);
+					)[0];
 
 				}
 
@@ -246,9 +247,9 @@
 				['g', {
 					transform: 'translate(' + (graphWidth * 0.1) + ', ' + graphHeight + ')'
 				}], svgNS
-			),
-			coordinateSystem = dom(['g'], svgNS),
-			bars = dom(['g'], svgNS);
+			)[0],
+			coordinateSystem = dom(['g'], svgNS)[0],
+			bars = dom(['g'], svgNS)[0];
 
 
 		function buildCoordinateSystem() {
@@ -331,7 +332,7 @@
 					},
 						['title', c.keys[i] + ':  ' + c.values[i]]
 					], svgNS
-				);
+				)[0];
 
 				function setAnimations() {
 					dom(
@@ -432,7 +433,7 @@
 				['g', {
 					'transform': 'translate(' + (graphWidth * 0.1) + ', ' + (graphHeight) + ')'
 				}], svgNS
-			);
+			)[0];
 
 		function init() {
 			dom([svg, [graph]]);
@@ -567,7 +568,7 @@
 
 							, ['title', c.keys[i] + ':  ' + c.values[i]]
 						]
-						, svgNS);
+						, svgNS)[0];
 
 
 					graph.appendChild(circle);
@@ -631,7 +632,7 @@
 					transform: 'translate(' + (0.5 * c.width) + ', ' + (0.5 * c.height) + ')',
 					class: 'vectualTagcloud'
 				}], svgNS
-			);
+			)[0];
 
 		function init() {
 
@@ -853,8 +854,6 @@
 
 		c.range = c.max.value - c.min.value;
 
-		console.log(c);
-
 		//--------------------------------------------------------
 
 		svg = dom(
@@ -914,10 +913,10 @@
 					style: 'font-size:' + (c.height * 0.05) + 'px'
 				}]
 			]
-			, svgNS);
+			, svgNS)[0];
 
 
-		dom([document.getElementById(c.id) , [svg]]);
+		document.getElementById(c.id).appendChild(svg)
 
 		return {
 			pieChart: function () {