From 4ede229b7b7aab8297a9ecbf8f013d8c4e6bd59f Mon Sep 17 00:00:00 2001 From: Rufus Pollock Date: Sun, 15 Apr 2012 16:03:08 +0100 Subject: [PATCH] [refactor][s]: rename view-flot-graph to view-graph and FlotGraph to Graph. --- app/index.html | 2 +- app/js/app.js | 2 +- index.html | 4 ++-- make | 2 +- src/{view-flot-graph.js => view-graph.js} | 2 +- src/view.js | 4 ++-- test/index.html | 2 +- test/view-graph.test.js | 4 ++-- test/view-grid.test.js | 2 +- 9 files changed, 12 insertions(+), 12 deletions(-) rename src/{view-flot-graph.js => view-graph.js} (99%) diff --git a/app/index.html b/app/index.html index b5c66400..fb2a1c56 100644 --- a/app/index.html +++ b/app/index.html @@ -45,7 +45,7 @@ - + diff --git a/app/js/app.js b/app/js/app.js index a7f63c72..bdf612f9 100755 --- a/app/js/app.js +++ b/app/js/app.js @@ -58,7 +58,7 @@ function standardViews(dataset) { { id: 'graph', label: 'Graph', - view: new recline.View.FlotGraph({ + view: new recline.View.Graph({ model: dataset }) }, diff --git a/index.html b/index.html index 1db10c36..7eb729cb 100644 --- a/index.html +++ b/index.html @@ -252,7 +252,7 @@ also easily write your own). Each view holds a pointer to a Dataset:

  • DataExplorer: the parent view which manages the overall app and sets up sub views.
  • DataGrid: the data grid view.
    • -
  • FlotGraph: a simple graphing view using Graph: a simple graphing view using Flot.
  • Map: a map view using Leaflet.
    • @@ -271,7 +271,7 @@ are useful:

  • Models
  • DataExplorer View (plus common view code)
  • DataGrid View
    • -
  • Graph View (based on Flot)
    • +
  • Graph View (based on Flot)
  • Map View (based on Leaflet)
    • diff --git a/make b/make index c4553597..97feeeaf 100755 --- a/make +++ b/make @@ -13,7 +13,7 @@ def docs(): print("** Building docs") docco_executable = os.environ.get('DOCCO_EXECUTABLE','docco') - cmd = '%s src/model.js src/view.js src/view-grid.js src/view-flot-graph.js src/view-map.js' % (docco_executable) + cmd = '%s src/model.js src/view.js src/view-grid.js src/view-graph.js src/view-map.js' % (docco_executable) os.system(cmd) if os.path.exists('/tmp/recline-docs'): shutil.rmtree('/tmp/recline-docs') diff --git a/src/view-flot-graph.js b/src/view-graph.js similarity index 99% rename from src/view-flot-graph.js rename to src/view-graph.js index ed3142f9..4b3a9d23 100644 --- a/src/view-flot-graph.js +++ b/src/view-graph.js @@ -20,7 +20,7 @@ this.recline.View = this.recline.View || {}; // // NB: should *not* provide an el argument to the view but must let the view // generate the element itself (you can then append view.el to the DOM. -my.FlotGraph = Backbone.View.extend({ +my.Graph = Backbone.View.extend({ tagName: "div", className: "data-graph-container", diff --git a/src/view.js b/src/view.js index 53b7a859..368bc95b 100644 --- a/src/view.js +++ b/src/view.js @@ -34,7 +34,7 @@ this.recline.View = this.recline.View || {}; // // **el**: (required) DOM element to bind to. NB: the element already // being in the DOM is important for rendering of some subviews (e.g. -// FlotGraph). +// Graph). // // **views**: (optional) the dataset views (Grid, Graph etc) for // DataExplorer to show. This is an array of view hashes. If not provided @@ -52,7 +52,7 @@ this.recline.View = this.recline.View || {}; // { // id: 'graph', // label: 'Graph', -// view: new recline.View.FlotGraph({ +// view: new recline.View.Graph({ // model: dataset // }) // } diff --git a/test/index.html b/test/index.html index 82751d57..a3c508d5 100644 --- a/test/index.html +++ b/test/index.html @@ -32,7 +32,7 @@ - + diff --git a/test/view-graph.test.js b/test/view-graph.test.js index 122937f9..f7e6dae5 100644 --- a/test/view-graph.test.js +++ b/test/view-graph.test.js @@ -1,8 +1,8 @@ -module("View - FlotGraph"); +module("View - Graph"); test('basics', function () { var dataset = Fixture.getDataset(); - var view = new recline.View.FlotGraph({ + var view = new recline.View.Graph({ model: dataset }); $('.fixtures').append(view.el); diff --git a/test/view-grid.test.js b/test/view-grid.test.js index 8a723c89..750cca2a 100644 --- a/test/view-grid.test.js +++ b/test/view-grid.test.js @@ -13,7 +13,7 @@ test('menu - hideColumn', function () { assertPresent('.column-header[data-field="x"]'); var hideColumn = view.el.find('.column-header[data-field="x"] a[data-action="hideColumn"]'); hideColumn.trigger('click'); - assertNotPresent('.column-header[data-field="x"]'); + assertNotPresent('.column-header[data-field="x"]', view.el); // also test a bit of state deepEqual(view.state.toJSON(), {hiddenFields: ['x']});