knight/datahub
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[#287,view/graph][s]: move current view.graph.js to view.flotr2.js and setup recline.View.Graph to point to recline.View.Flot.

Browse Source
This commit is contained in:
Rufus Pollock
2013-02-09 16:18:37 +00:00
parent 72bcedf419
commit 242bcc7a14
6 changed files with 476 additions and 472 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
test/index.html
View File

@@ -53,8 +53,9 @@
<script type="text/javascript" src="../src/view.grid.js"></script>
<script type="text/javascript" src="../src/view.slickgrid.js"></script>
<script type="text/javascript" src="../src/view.transform.js"></script>
<script type="text/javascript" src="../src/view.graph.js"></script>
<script type="text/javascript" src="../src/view.flot.js"></script>
<script type="text/javascript" src="../src/view.flotr2.js"></script>
<script type="text/javascript" src="../src/view.graph.js"></script>
<script type="text/javascript" src="../src/view.map.js"></script>
<script type="text/javascript" src="../src/view.timeline.js"></script>
<script type="text/javascript" src="../src/widget.pager.js"></script>
@@ -65,7 +66,7 @@
<script type="text/javascript" src="view.grid.test.js"></script>
<script type="text/javascript" src="view.slickgrid.test.js"></script>
<script type="text/javascript" src="view.graph.test.js"></script>
<script type="text/javascript" src="view.flotr2.test.js"></script>
<script type="text/javascript" src="view.flot.test.js"></script>
<script type="text/javascript" src="view.map.test.js"></script>
<script type="text/javascript" src="view.timeline.test.js"></script>

16
test/view.graph.test.js → test/view.flotr2.test.js
View File

@@ -1,8 +1,8 @@
module("View - Graph");
module("View - Flotr2");
test('basics', function () {
var dataset = Fixture.getDataset();
var view = new recline.View.Graph({
var view = new recline.View.Flotr2({
model: dataset
});
$('.fixtures').append(view.el);
@@ -14,7 +14,7 @@ test('basics', function () {
test('initialize', function () {
var dataset = Fixture.getDataset();
var view = new recline.View.Graph({
var view = new recline.View.Flotr2({
model: dataset,
state: {
'graphType': 'lines',
@@ -40,7 +40,7 @@ test('initialize', function () {
test('dates in graph view', function () {
expect(0);
var dataset = Fixture.getDataset();
var view = new recline.View.Graph({
var view = new recline.View.Flotr2({
model: dataset,
state: {
'graphType': 'lines',
@@ -53,9 +53,9 @@ test('dates in graph view', function () {
view.remove();
});
test('GraphControls basics', function () {
test('Flotr2Controls basics', function () {
var dataset = Fixture.getDataset();
var view = new recline.View.GraphControls({
var view = new recline.View.Flotr2Controls({
model: dataset,
state: {
graphType: 'bars',
@@ -72,7 +72,7 @@ test('GraphControls basics', function () {
test('Overriding graph options', function () {
var dataset = Fixture.getDataset();
var randomWidth = Math.random();
var view = new recline.View.Graph({
var view = new recline.View.Flotr2({
model: dataset,
state: {
'graphType': 'bars',
@@ -83,4 +83,4 @@ test('Overriding graph options', function () {
});
equal(view.getGraphOptions('bars').bars.barWidth, randomWidth)
view.remove();
});
});