Permalink
Browse files

refactor various renderers so they subclass a base class renerer

  • Loading branch information...
1 parent 76f1cc5 commit b69c8d1a31758ad296f75fcaf2d09444b01d14e0 @dchester dchester committed Mar 12, 2012
View
@@ -30,6 +30,7 @@ JS_FILES=\
src/js/Rickshaw.Graph.JSONP.js\
src/js/Rickshaw.Graph.Legend.js\
src/js/Rickshaw.Graph.RangeSlider.js\
+ src/js/Rickshaw.Graph.Renderer.js\
src/js/Rickshaw.Graph.Renderer.Line.js\
src/js/Rickshaw.Graph.Renderer.Stack.js\
src/js/Rickshaw.Graph.Renderer.Bar.js\
@@ -63,4 +64,4 @@ rickshaw.min.css: $(CSS_MIN) rickshaw.css
$(CSS_MIN) rickshaw.css > rickshaw.min.css
rickshaw.min.js: $(JS_MIN) rickshaw.js
- $(JS_MIN) rickshaw.js > rickshaw.min.js
+ $(JS_MIN) --reserved-names "\$$super" rickshaw.js > rickshaw.min.js
View
@@ -8,12 +8,7 @@
<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.6.2/jquery.min.js"></script>
- <script src="../src/js/Rickshaw.js"></script>
- <script src="../src/js/Rickshaw.Compat.ClassList.js"></script>
- <script src="../src/js/Rickshaw.Graph.js"></script>
- <script src="../src/js/Rickshaw.Graph.Ajax.js"></script>
- <script src="../src/js/Rickshaw.Graph.Unstacker.js"></script>
- <script src="../src/js/Rickshaw.Graph.Renderer.Line.js"></script>
+ <script src="../rickshaw.js"></script>
</head>
<body>
View
@@ -8,11 +8,7 @@
<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.6.2/jquery.min.js"></script>
<script src="https://ajax.googleapis.com/ajax/libs/jqueryui/1.8.15/jquery-ui.min.js"></script>
- <script src="../src/js/Rickshaw.js"></script>
- <script src="../src/js/Rickshaw.Compat.ClassList.js"></script>
- <script src="../src/js/Rickshaw.Graph.js"></script>
- <script src="../src/js/Rickshaw.Graph.Renderer.Bar.js"></script>
- <script src="../src/js/Rickshaw.Fixtures.RandomData.js"></script>
+ <script src="../rickshaw.js"></script>
</head>
<body>
View
@@ -1,14 +1,14 @@
[
{
- 'color': 'blue',
- 'name': 'New York',
- 'data': [ { x: 0, y: 40 }, { x: 1, y: 49 }, { x: 2, y: 38 }, { x: 3, y: 30 }, { x: 4, y: 32 } ],
+ "color": "blue",
+ "name": "New York",
+ "data": [ { "x": 0, "y": 40 }, { "x": 1, "y": 49 }, { "x": 2, "y": 38 }, { "x": 3, "y": 30 }, { "x": 4, "y": 32 } ]
}, {
- 'name': 'London',
- 'data': [ { x: 0, y: 19 }, { x: 1, y: 22 }, { x: 2, y: 29 }, { x: 3, y: 20 }, { x: 4, y: 14 } ],
+ "name": "London",
+ "data": [ { "x": 0, "y": 19 }, { "x": 1, "y": 22 }, { "x": 2, "y": 29 }, { "x": 3, "y": 20 }, { "x": 4, "y": 14 } ]
}, {
- 'name': 'Tokyo',
- 'data': [ { x: 0, y: 8 }, { x: 1, y: 12 }, { x: 2, y: 15 }, { x: 3, y: 11 }, { x: 4, y: 10 } ],
+ "name": "Tokyo",
+ "data": [ { "x": 0, "y": 8 }, { "x": 1, "y": 12 }, { "x": 2, "y": 15 }, { "x": 3, "y": 11 }, { "x": 4, "y": 10 } ]
}
]
View
@@ -13,8 +13,10 @@
<script src="https://ajax.googleapis.com/ajax/libs/jqueryui/1.8.15/jquery-ui.min.js"></script>
<script src="../src/js/Rickshaw.js"></script>
+ <script src="../src/js/Rickshaw.Class.js"></script>
<script src="../src/js/Rickshaw.Compat.ClassList.js"></script>
<script src="../src/js/Rickshaw.Graph.js"></script>
+ <script src="../src/js/Rickshaw.Graph.Renderer.js"></script>
<script src="../src/js/Rickshaw.Graph.Renderer.Area.js"></script>
<script src="../src/js/Rickshaw.Graph.Renderer.Line.js"></script>
<script src="../src/js/Rickshaw.Graph.Renderer.Bar.js"></script>
View
@@ -15,6 +15,7 @@
<script src="../src/js/Rickshaw.js"></script>
<script src="../src/js/Rickshaw.Class.js"></script>
<script src="../src/js/Rickshaw.Graph.js"></script>
+ <script src="../src/js/Rickshaw.Graph.Renderer.js"></script>
<script src="../src/js/Rickshaw.Graph.Renderer.Stack.js"></script>
<script src="../src/js/Rickshaw.Graph.Renderer.Line.js"></script>
<script src="../src/js/Rickshaw.Graph.Renderer.Area.js"></script>
View
@@ -12,17 +12,7 @@
<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.6.2/jquery.min.js"></script>
<script src="https://ajax.googleapis.com/ajax/libs/jqueryui/1.8.15/jquery-ui.min.js"></script>
- <script src="../src/js/Rickshaw.js"></script>
- <script src="../src/js/Rickshaw.Compat.ClassList.js"></script>
- <script src="../src/js/Rickshaw.Graph.js"></script>
- <script src="../src/js/Rickshaw.Graph.Renderer.Line.js"></script>
- <script src="../src/js/Rickshaw.Graph.HoverDetail.js"></script>
- <script src="../src/js/Rickshaw.Graph.Legend.js"></script>
- <script src="../src/js/Rickshaw.Graph.Axis.Time.js"></script>
- <script src="../src/js/Rickshaw.Graph.Behavior.Series.Toggle.js"></script>
- <script src="../src/js/Rickshaw.Graph.Unstacker.js"></script>
- <script src="../src/js/Rickshaw.Fixtures.Time.js"></script>
- <script src="../src/js/Rickshaw.Fixtures.RandomData.js"></script>
+ <script src="../rickshaw.js"></script>
</head>
<body>
@@ -4,12 +4,7 @@
<script src="../vendor/d3.min.js"></script>
<script src="../vendor/d3.layout.min.js"></script>
-<script src="../src/js/Rickshaw.js"></script>
-<script src="../src/js/Rickshaw.Compat.ClassList.js"></script>
-<script src="../src/js/Rickshaw.Graph.js"></script>
-<script src="../src/js/Rickshaw.Graph.Unstacker.js"></script>
-<script src="../src/js/Rickshaw.Graph.Renderer.ScatterPlot.js"></script>
-<script src="../src/js/Rickshaw.Fixtures.RandomData.js"></script>
+<script src="../rickshaw.js"></script>
<div id="chart"></div>
View
@@ -15,6 +15,7 @@
<script src="../src/js/Rickshaw.js"></script>
<script src="../src/js/Rickshaw.Class.js"></script>
<script src="../src/js/Rickshaw.Graph.js"></script>
+ <script src="../src/js/Rickshaw.Graph.Renderer.js"></script>
<script src="../src/js/Rickshaw.Graph.Renderer.Stack.js"></script>
<script src="../src/js/Rickshaw.Graph.Renderer.Line.js"></script>
<script src="../src/js/Rickshaw.Graph.RangeSlider.js"></script>
View
@@ -1,6 +1,7 @@
<!doctype>
<script src="../vendor/d3.min.js"></script>
<script src="../vendor/d3.layout.min.js"></script>
+
<script src="../rickshaw.min.js"></script>
<div id="chart"></div>
Oops, something went wrong.

0 comments on commit b69c8d1

Please sign in to comment.