Refactored code to be easier to update/read

gijs · Sep 18, 2012 · 890faad · 890faad
1 parent 64179c9
commit 890faad
Show file tree

Hide file tree

Showing 8 changed files with 5,845 additions and 11 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -1,3 +1,6 @@
 [submodule "lib/d3"]
 	path = lib/d3
 	url = git://github.com/mbostock/d3.git
+[submodule "lib/raphael"]
+	path = lib/raphael
+	url = git://github.com/DmitryBaranovskiy/raphael.git
diff --git a/Makefile b/Makefile
@@ -9,6 +9,7 @@ all: \
 # Modify this rule to build your own custom release.
 
 .INTERMEDIATE r2d3.v2.js: \
+	lib/raphael/raphael.js \
 	lib/d3/src/start.js \
 	r2d3.core.js \
 	r2d3.scale.js \

diff --git a/examples/circle.html b/examples/circle.html
@@ -6,7 +6,6 @@
     <!--[if lte IE 8]>
     <script type="text/javascript" src="../lib/compat/compat.js"></script>
 		<![endif]-->
-		<script src="../lib/raphael/raphael.js"></script>
     <script src="../r2d3.v2.js"></script>
   </head>
   <body>

diff --git a/examples/line.html b/examples/line.html
@@ -6,7 +6,6 @@
     <!--[if lte IE 8]>
     <script type="text/javascript" src="../lib/compat/compat.js"></script>
 		<![endif]-->
-		<script src="../lib/raphael/raphael.js"></script>
     <script src="../r2d3.v2.js"></script>
   </head>
   <body>

diff --git a/examples/text.html b/examples/text.html
@@ -6,22 +6,22 @@
     <!--[if lte IE 8]>
     <script type="text/javascript" src="../lib/compat/compat.js"></script>
 		<![endif]-->
-		<script src="../lib/raphael/raphael.js"></script>
     <script src="../r2d3.v2.js"></script>
   </head>
   <body>
 		<div></div>
 		<div></div>
 		<script>
-      var svg = d3.select('div').append('svg')
+      var count = 0,
+          svg = d3.select('div').append('svg')
                   .attr('height', 200)
                   .attr('width', 200);
       svg.append('text')
         .attr('x', 100)
         .attr('y', 100)
-        .attr('font-size', 72);
+        .attr('font-size', 72)
+        .text(count);
 
-      var count = 0;
 
 			function drawText() {
         svg.selectAll('text').text(count);

diff --git a/lib/raphael b/lib/raphael