pulse-meter 0.2.1 → 0.2.2

data/lib/pulse-meter/visualize/public/js/application.coffee

@@ -1,5 +1,8 @@
-$ ->
+document.startApp = ->
 	globalOptions = gon.options
+	
+	String::capitalize = ->
+	  @charAt(0).toUpperCase() + @slice(1)
 
 	PageInfo = Backbone.Model.extend {
 	}
@@ -10,7 +13,6 @@ $ ->
 			@find (m) ->
 				m.get 'selected'
 			
-
 		selectFirst: ->
 			@at(0).set('selected', true) if @length > 0
 
@@ -55,155 +57,205 @@ $ ->
 	}
 
 	pageTitlesApp = new PageTitlesView
-
 	pageInfos.reset gon.pageInfos
 
-	Widget = Backbone.Model.extend {
-		initialize: ->
-			@needRefresh = true
-			@setNextFetch()
-			@timespanInc = 0
-
-		increaseTimespan: (inc) ->
-			@timespanInc = @timespanInc + inc
-			@forceUpdate()
-
-		resetTimespan: ->
-			@timespanInc = 0
-			@forceUpdate()
-
-		url: ->
-			"#{@collection.url()}/#{@get('id')}?timespan=#{@get('timespan') + @timespanInc}"
 
-		time: -> (new Date()).getTime()
+	class WidgetPresenter
+		constructor: (model, el) ->
+			@model = model
+			chartClass = @chartClass()
+			@chart = new chartClass(el)
+			@draw()
 
-		setNextFetch: ->
-			@nextFetch = @time() + @get('interval') * 1000
+		get: (arg) -> @model.get(arg)
+	
+		dateOffset: ->
+			if globalOptions.useUtc
+				(new Date).getTimezoneOffset() * 60000
+			else
+				0
+		
+		options: ->
+			{
+				title: @get('title')
+				height: 300
+			}
 
-		setRefresh: (needRefresh) ->
-			@needRefresh = needRefresh
+		mergedOptions: -> $.extend(true,
+			@options(),
+			globalOptions.gchartOptions,
+			pageInfos.selected().get('gchartOptions')
+			@get('gchartOptions')
+		)
 
-		needFetch: ->
-			interval = @get('interval')
-			@time() > @nextFetch && @needRefresh && interval? && interval > 0
+		data: -> new google.visualization.DataTable
 
-		refetch: ->
-			if @needFetch()
-				@forceUpdate()
-				@setNextFetch()
+		chartClass: -> google.visualization[@visualization]
 
+		cutoff: ->
+		
 		cutoffValue: (v, min, max) ->
-			if v isnt null
-				if min isnt null && v < min
+			if v?
+				if min? && v < min
 					min
-				else if max isnt null && v > max
+				else if max? && v > max
 					max
 				else
 					v
 			else
 				0
 
-		cutoff: (min, max) ->
-			_.each(@get('series').rows, (row) ->
-				for i in [1 .. row.length - 1]
-					row[i] = @cutoffValue(row[i], min, max)
-			, this)
-
-		forceUpdate: ->
-			@fetch {
-				success: (model, response) ->
-					model.trigger('redraw')
-			}
-
-		pieData: ->
-			data = new google.visualization.DataTable()
+		draw: (min, max) ->
+			@cutoff(min, max)
+			@chart.draw(@data(), @mergedOptions())
+
+	WidgetPresenter.create = (model, el) ->
+		type = model.get('type')
+		if type? && type.match(/^\w+$/)
+			presenterClass = eval("#{type.capitalize()}Presenter")
+			new presenterClass(model, el)
+		else
+			null
+
+	class PiePresenter extends WidgetPresenter
+		visualization: 'PieChart'
+
+		cutoff: ->
+		
+		data: ->
+			data = super()
 			data.addColumn('string', 'Title')
 			data.addColumn('number', @get('valuesTitle'))
 			data.addRows(@get('series').data)
 			data
 
-		dateOffset: ->
-			if globalOptions.useUtc
-				(new Date).getTimezoneOffset() * 60000
-			else
-				0
+		options: ->
+			$.extend true, super(), {
+				slices: @get('series').options
+				legend: {
+					position: 'bottom'
+				}
+			}
 
-		lineData: ->
-			title = @get('title')
-			data = new google.visualization.DataTable()
+	class TimelinePresenter extends WidgetPresenter
+		data: ->
+			data = super()
 			data.addColumn('datetime', 'Time')
 			dateOffset = @dateOffset()
 			series = @get('series')
 			_.each series.titles, (t) ->
 				data.addColumn('number', t)
 
-			console.log series
 			_.each series.rows, (row) ->
 				row[0] = new Date(row[0] + dateOffset)
 				data.addRow(row)
 			data
 
+	class SeriesPresenter extends TimelinePresenter
 		options: ->
-			{
-				title: @get('title')
+			format = if @model.timespan() > 24 * 60 * 60
+				'yyyy.MM.dd HH:mm:ss'
+			else
+				'HH:mm:ss'
+
+			$.extend true, super(), {
 				lineWidth: 1
 				chartArea: {
 					left: 40
 					width: '100%'
 				}
-				height: 300
 				legend: {
 					position: 'bottom'
 				}
 				vAxis: {
 					title: @get('valuesTitle')
 				}
-				axisTitlesPosition: 'in'
-			}
-
-		pieOptions: ->
-			$.extend true, @options(), {
-				slices: @get('series').options
-			}
-
-		lineOptions: ->
-			$.extend true, @options(), {
 				hAxis: {
-					format: 'yyyy.MM.dd HH:mm:ss'
+					format: format
 				}
 				series: @get('series').options
+				axisTitlesPosition: 'in'
 			}
+		
+		cutoff: (min, max) ->
+			_.each(@get('series').rows, (row) ->
+				for i in [1 .. row.length - 1]
+					value = row[i]
+					value = 0 unless value?
+					row[i] = @cutoffValue(value, min, max)
+			, this)
+
+
+	class LinePresenter extends SeriesPresenter
+		visualization: 'LineChart'
+
+	class AreaPresenter extends SeriesPresenter
+		visualization: 'AreaChart'
+
+	class TablePresenter extends TimelinePresenter
+		visualization: 'Table'
+
+		cutoff: ->
 
-		tableOptions: ->
-			$.extend true, @lineOptions(), {
+		options: ->
+			$.extend true, super(), {
 				sortColumn: 0
 				sortAscending: false
 			}
 
-		chartOptions: ->
-			opts = if @get('type') == 'pie'
-				@pieOptions()
-			else if @get('type') == 'table'
-				@tableOptions()
-			else
-				@lineOptions()
-			$.extend true, opts, globalOptions.gchartOptions, pageInfos.selected().get('gchartOptions')
+	class GaugePresenter extends WidgetPresenter
+		visualization: 'Gauge'
 
-		chartData: ->
-			if @get('type') == 'pie'
-				@pieData()
-			else
-				@lineData()
-
-		chartClass: ->
-			if @get('type') == 'pie'
-				google.visualization.PieChart
-			else if @get('type') == 'area'
-				google.visualization.AreaChart
-			else if @get('type') == 'table'
-				google.visualization.Table
-			else
-				google.visualization.LineChart
+		cutoff: ->
+
+		data: ->
+			data = super()
+			data.addColumn('string', 'Label')
+			data.addColumn('number', @get('valuesTitle'))
+			data.addRows(@get('series'))
+			data
+
+	Widget = Backbone.Model.extend {
+		initialize: ->
+			@needRefresh = true
+			@setNextFetch()
+			@timespanInc = 0
+
+		increaseTimespan: (inc) ->
+			@timespanInc = @timespanInc + inc
+			@forceUpdate()
+
+		resetTimespan: ->
+			@timespanInc = 0
+			@forceUpdate()
+
+		timespan: -> @get('timespan') + @timespanInc
+
+		url: ->
+			"#{@collection.url()}/#{@get('id')}?timespan=#{@timespan()}"
+
+		time: -> (new Date()).getTime()
+
+		setNextFetch: ->
+			@nextFetch = @time() + @get('redrawInterval') * 1000
+
+		setRefresh: (needRefresh) ->
+			@needRefresh = needRefresh
+
+		needFetch: ->
+			interval = @get('redrawInterval')
+			@time() > @nextFetch && @needRefresh && interval? && interval > 0
+
+		refetch: ->
+			if @needFetch()
+				@forceUpdate()
+				@setNextFetch()
+
+		forceUpdate: ->
+			@fetch {
+				success: (model, response) ->
+					model.trigger('redraw')
+			}
 
 	}
 
@@ -220,20 +272,17 @@ $ ->
 			@model.bind 'destroy', @remove, this
 
 		updateData: (min, max) ->
-			@model.cutoff(min, max)
-			@chart.draw(@model.chartData(), @model.chartOptions())
+			@presenter.draw(min, max)
 
 		render: ->
-			chartClass = @model.chartClass()
-			@chart = new chartClass(@el)
-			@updateData()
-
+			@presenter = WidgetPresenter.create(@model, @el)
 	}
 
 	WidgetView = Backbone.View.extend {
 		tagName: 'div'
 
-		template: _.template($('#widget-template').html())
+		template: ->
+			_.template($(".widget-template[data-widget-type=\"#{@model.get('type')}\"]").html())
 
 		initialize: ->
 			@model.bind('destroy', @remove, this)
@@ -271,10 +320,10 @@ $ ->
 		render: ->
 			@$el.html @template(@model.toJSON())
 			@chartView = new WidgetChartView {
-        model: @model
-      }
-      @$el.find("#plotarea").append(@chartView.el)
-      @$el.addClass "span#{@model.get('width')}"
+				model: @model
+			}
+			@$el.find("#plotarea").append(@chartView.el)
+			@$el.addClass("span#{@model.get('width')}")
 
 		cutoffMin: ->
 			val = parseFloat(@controlValue('#cutoff-min'))

data/lib/pulse-meter/visualize/public/js/application.js

@@ -1,9 +1,14 @@
 // Generated by CoffeeScript 1.2.1-pre
 (function() {
+  var __hasProp = {}.hasOwnProperty,
+    __extends = function(child, parent) { for (var key in parent) { if (__hasProp.call(parent, key)) child[key] = parent[key]; } function ctor() { this.constructor = child; } ctor.prototype = parent.prototype; child.prototype = new ctor; child.__super__ = parent.prototype; return child; };
 
-  $(function() {
-    var AppRouter, PageInfo, PageInfoList, PageTitleView, PageTitlesView, Widget, WidgetChartView, WidgetList, WidgetListView, WidgetView, appRouter, globalOptions, pageInfos, pageTitlesApp, widgetList, widgetListApp;
+  document.startApp = function() {
+    var AppRouter, AreaPresenter, GaugePresenter, LinePresenter, PageInfo, PageInfoList, PageTitleView, PageTitlesView, PiePresenter, SeriesPresenter, TablePresenter, TimelinePresenter, Widget, WidgetChartView, WidgetList, WidgetListView, WidgetPresenter, WidgetView, appRouter, globalOptions, pageInfos, pageTitlesApp, widgetList, widgetListApp;
     globalOptions = gon.options;
+    String.prototype.capitalize = function() {
+      return this.charAt(0).toUpperCase() + this.slice(1);
+    };
     PageInfo = Backbone.Model.extend({});
     PageInfoList = Backbone.Collection.extend({
       model: PageInfo,
@@ -57,48 +62,56 @@
     });
     pageTitlesApp = new PageTitlesView;
     pageInfos.reset(gon.pageInfos);
-    Widget = Backbone.Model.extend({
-      initialize: function() {
-        this.needRefresh = true;
-        this.setNextFetch();
-        return this.timespanInc = 0;
-      },
-      increaseTimespan: function(inc) {
-        this.timespanInc = this.timespanInc + inc;
-        return this.forceUpdate();
-      },
-      resetTimespan: function() {
-        this.timespanInc = 0;
-        return this.forceUpdate();
-      },
-      url: function() {
-        return "" + (this.collection.url()) + "/" + (this.get('id')) + "?timespan=" + (this.get('timespan') + this.timespanInc);
-      },
-      time: function() {
-        return (new Date()).getTime();
-      },
-      setNextFetch: function() {
-        return this.nextFetch = this.time() + this.get('interval') * 1000;
-      },
-      setRefresh: function(needRefresh) {
-        return this.needRefresh = needRefresh;
-      },
-      needFetch: function() {
-        var interval;
-        interval = this.get('interval');
-        return this.time() > this.nextFetch && this.needRefresh && (interval != null) && interval > 0;
-      },
-      refetch: function() {
-        if (this.needFetch()) {
-          this.forceUpdate();
-          return this.setNextFetch();
+    WidgetPresenter = (function() {
+
+      WidgetPresenter.name = 'WidgetPresenter';
+
+      function WidgetPresenter(model, el) {
+        var chartClass;
+        this.model = model;
+        chartClass = this.chartClass();
+        this.chart = new chartClass(el);
+        this.draw();
+      }
+
+      WidgetPresenter.prototype.get = function(arg) {
+        return this.model.get(arg);
+      };
+
+      WidgetPresenter.prototype.dateOffset = function() {
+        if (globalOptions.useUtc) {
+          return (new Date).getTimezoneOffset() * 60000;
+        } else {
+          return 0;
         }
-      },
-      cutoffValue: function(v, min, max) {
-        if (v !== null) {
-          if (min !== null && v < min) {
+      };
+
+      WidgetPresenter.prototype.options = function() {
+        return {
+          title: this.get('title'),
+          height: 300
+        };
+      };
+
+      WidgetPresenter.prototype.mergedOptions = function() {
+        return $.extend(true, this.options(), globalOptions.gchartOptions, pageInfos.selected().get('gchartOptions'), this.get('gchartOptions'));
+      };
+
+      WidgetPresenter.prototype.data = function() {
+        return new google.visualization.DataTable;
+      };
+
+      WidgetPresenter.prototype.chartClass = function() {
+        return google.visualization[this.visualization];
+      };
+
+      WidgetPresenter.prototype.cutoff = function() {};
+
+      WidgetPresenter.prototype.cutoffValue = function(v, min, max) {
+        if (v != null) {
+          if ((min != null) && v < min) {
             return min;
-          } else if (max !== null && v > max) {
+          } else if ((max != null) && v > max) {
             return max;
           } else {
             return v;
@@ -106,115 +119,265 @@
         } else {
           return 0;
         }
-      },
-      cutoff: function(min, max) {
-        return _.each(this.get('series').rows, function(row) {
-          var i, _i, _ref, _results;
-          _results = [];
-          for (i = _i = 1, _ref = row.length - 1; 1 <= _ref ? _i <= _ref : _i >= _ref; i = 1 <= _ref ? ++_i : --_i) {
-            _results.push(row[i] = this.cutoffValue(row[i], min, max));
-          }
-          return _results;
-        }, this);
-      },
-      forceUpdate: function() {
-        return this.fetch({
-          success: function(model, response) {
-            return model.trigger('redraw');
-          }
-        });
-      },
-      pieData: function() {
+      };
+
+      WidgetPresenter.prototype.draw = function(min, max) {
+        this.cutoff(min, max);
+        return this.chart.draw(this.data(), this.mergedOptions());
+      };
+
+      return WidgetPresenter;
+
+    })();
+    WidgetPresenter.create = function(model, el) {
+      var presenterClass, type;
+      type = model.get('type');
+      if ((type != null) && type.match(/^\w+$/)) {
+        presenterClass = eval("" + (type.capitalize()) + "Presenter");
+        return new presenterClass(model, el);
+      } else {
+        return null;
+      }
+    };
+    PiePresenter = (function(_super) {
+
+      __extends(PiePresenter, _super);
+
+      PiePresenter.name = 'PiePresenter';
+
+      function PiePresenter() {
+        return PiePresenter.__super__.constructor.apply(this, arguments);
+      }
+
+      PiePresenter.prototype.visualization = 'PieChart';
+
+      PiePresenter.prototype.cutoff = function() {};
+
+      PiePresenter.prototype.data = function() {
         var data;
-        data = new google.visualization.DataTable();
+        data = PiePresenter.__super__.data.call(this);
         data.addColumn('string', 'Title');
         data.addColumn('number', this.get('valuesTitle'));
         data.addRows(this.get('series').data);
         return data;
-      },
-      dateOffset: function() {
-        if (globalOptions.useUtc) {
-          return (new Date).getTimezoneOffset() * 60000;
-        } else {
-          return 0;
-        }
-      },
-      lineData: function() {
-        var data, dateOffset, series, title;
-        title = this.get('title');
-        data = new google.visualization.DataTable();
+      };
+
+      PiePresenter.prototype.options = function() {
+        return $.extend(true, PiePresenter.__super__.options.call(this), {
+          slices: this.get('series').options,
+          legend: {
+            position: 'bottom'
+          }
+        });
+      };
+
+      return PiePresenter;
+
+    })(WidgetPresenter);
+    TimelinePresenter = (function(_super) {
+
+      __extends(TimelinePresenter, _super);
+
+      TimelinePresenter.name = 'TimelinePresenter';
+
+      function TimelinePresenter() {
+        return TimelinePresenter.__super__.constructor.apply(this, arguments);
+      }
+
+      TimelinePresenter.prototype.data = function() {
+        var data, dateOffset, series;
+        data = TimelinePresenter.__super__.data.call(this);
         data.addColumn('datetime', 'Time');
         dateOffset = this.dateOffset();
         series = this.get('series');
         _.each(series.titles, function(t) {
           return data.addColumn('number', t);
         });
-        console.log(series);
         _.each(series.rows, function(row) {
           row[0] = new Date(row[0] + dateOffset);
           return data.addRow(row);
         });
         return data;
-      },
-      options: function() {
-        return {
-          title: this.get('title'),
+      };
+
+      return TimelinePresenter;
+
+    })(WidgetPresenter);
+    SeriesPresenter = (function(_super) {
+
+      __extends(SeriesPresenter, _super);
+
+      SeriesPresenter.name = 'SeriesPresenter';
+
+      function SeriesPresenter() {
+        return SeriesPresenter.__super__.constructor.apply(this, arguments);
+      }
+
+      SeriesPresenter.prototype.options = function() {
+        var format;
+        format = this.model.timespan() > 24 * 60 * 60 ? 'yyyy.MM.dd HH:mm:ss' : 'HH:mm:ss';
+        return $.extend(true, SeriesPresenter.__super__.options.call(this), {
           lineWidth: 1,
           chartArea: {
             left: 40,
             width: '100%'
           },
-          height: 300,
           legend: {
             position: 'bottom'
           },
           vAxis: {
             title: this.get('valuesTitle')
           },
-          axisTitlesPosition: 'in'
-        };
-      },
-      pieOptions: function() {
-        return $.extend(true, this.options(), {
-          slices: this.get('series').options
-        });
-      },
-      lineOptions: function() {
-        return $.extend(true, this.options(), {
           hAxis: {
-            format: 'yyyy.MM.dd HH:mm:ss'
+            format: format
           },
-          series: this.get('series').options
+          series: this.get('series').options,
+          axisTitlesPosition: 'in'
         });
-      },
-      tableOptions: function() {
-        return $.extend(true, this.lineOptions(), {
+      };
+
+      SeriesPresenter.prototype.cutoff = function(min, max) {
+        return _.each(this.get('series').rows, function(row) {
+          var i, value, _i, _ref, _results;
+          _results = [];
+          for (i = _i = 1, _ref = row.length - 1; 1 <= _ref ? _i <= _ref : _i >= _ref; i = 1 <= _ref ? ++_i : --_i) {
+            value = row[i];
+            if (value == null) value = 0;
+            _results.push(row[i] = this.cutoffValue(value, min, max));
+          }
+          return _results;
+        }, this);
+      };
+
+      return SeriesPresenter;
+
+    })(TimelinePresenter);
+    LinePresenter = (function(_super) {
+
+      __extends(LinePresenter, _super);
+
+      LinePresenter.name = 'LinePresenter';
+
+      function LinePresenter() {
+        return LinePresenter.__super__.constructor.apply(this, arguments);
+      }
+
+      LinePresenter.prototype.visualization = 'LineChart';
+
+      return LinePresenter;
+
+    })(SeriesPresenter);
+    AreaPresenter = (function(_super) {
+
+      __extends(AreaPresenter, _super);
+
+      AreaPresenter.name = 'AreaPresenter';
+
+      function AreaPresenter() {
+        return AreaPresenter.__super__.constructor.apply(this, arguments);
+      }
+
+      AreaPresenter.prototype.visualization = 'AreaChart';
+
+      return AreaPresenter;
+
+    })(SeriesPresenter);
+    TablePresenter = (function(_super) {
+
+      __extends(TablePresenter, _super);
+
+      TablePresenter.name = 'TablePresenter';
+
+      function TablePresenter() {
+        return TablePresenter.__super__.constructor.apply(this, arguments);
+      }
+
+      TablePresenter.prototype.visualization = 'Table';
+
+      TablePresenter.prototype.cutoff = function() {};
+
+      TablePresenter.prototype.options = function() {
+        return $.extend(true, TablePresenter.__super__.options.call(this), {
           sortColumn: 0,
           sortAscending: false
         });
+      };
+
+      return TablePresenter;
+
+    })(TimelinePresenter);
+    GaugePresenter = (function(_super) {
+
+      __extends(GaugePresenter, _super);
+
+      GaugePresenter.name = 'GaugePresenter';
+
+      function GaugePresenter() {
+        return GaugePresenter.__super__.constructor.apply(this, arguments);
+      }
+
+      GaugePresenter.prototype.visualization = 'Gauge';
+
+      GaugePresenter.prototype.cutoff = function() {};
+
+      GaugePresenter.prototype.data = function() {
+        var data;
+        data = GaugePresenter.__super__.data.call(this);
+        data.addColumn('string', 'Label');
+        data.addColumn('number', this.get('valuesTitle'));
+        data.addRows(this.get('series'));
+        return data;
+      };
+
+      return GaugePresenter;
+
+    })(WidgetPresenter);
+    Widget = Backbone.Model.extend({
+      initialize: function() {
+        this.needRefresh = true;
+        this.setNextFetch();
+        return this.timespanInc = 0;
       },
-      chartOptions: function() {
-        var opts;
-        opts = this.get('type') === 'pie' ? this.pieOptions() : this.get('type') === 'table' ? this.tableOptions() : this.lineOptions();
-        return $.extend(true, opts, globalOptions.gchartOptions, pageInfos.selected().get('gchartOptions'));
+      increaseTimespan: function(inc) {
+        this.timespanInc = this.timespanInc + inc;
+        return this.forceUpdate();
       },
-      chartData: function() {
-        if (this.get('type') === 'pie') {
-          return this.pieData();
-        } else {
-          return this.lineData();
-        }
+      resetTimespan: function() {
+        this.timespanInc = 0;
+        return this.forceUpdate();
       },
-      chartClass: function() {
-        if (this.get('type') === 'pie') {
-          return google.visualization.PieChart;
-        } else if (this.get('type') === 'area') {
-          return google.visualization.AreaChart;
-        } else if (this.get('type') === 'table') {
-          return google.visualization.Table;
-        } else {
-          return google.visualization.LineChart;
+      timespan: function() {
+        return this.get('timespan') + this.timespanInc;
+      },
+      url: function() {
+        return "" + (this.collection.url()) + "/" + (this.get('id')) + "?timespan=" + (this.timespan());
+      },
+      time: function() {
+        return (new Date()).getTime();
+      },
+      setNextFetch: function() {
+        return this.nextFetch = this.time() + this.get('redrawInterval') * 1000;
+      },
+      setRefresh: function(needRefresh) {
+        return this.needRefresh = needRefresh;
+      },
+      needFetch: function() {
+        var interval;
+        interval = this.get('redrawInterval');
+        return this.time() > this.nextFetch && this.needRefresh && (interval != null) && interval > 0;
+      },
+      refetch: function() {
+        if (this.needFetch()) {
+          this.forceUpdate();
+          return this.setNextFetch();
         }
+      },
+      forceUpdate: function() {
+        return this.fetch({
+          success: function(model, response) {
+            return model.trigger('redraw');
+          }
+        });
       }
     });
     WidgetList = Backbone.Collection.extend({
@@ -229,19 +392,17 @@
         return this.model.bind('destroy', this.remove, this);
       },
       updateData: function(min, max) {
-        this.model.cutoff(min, max);
-        return this.chart.draw(this.model.chartData(), this.model.chartOptions());
+        return this.presenter.draw(min, max);
       },
       render: function() {
-        var chartClass;
-        chartClass = this.model.chartClass();
-        this.chart = new chartClass(this.el);
-        return this.updateData();
+        return this.presenter = WidgetPresenter.create(this.model, this.el);
       }
     });
     WidgetView = Backbone.View.extend({
       tagName: 'div',
-      template: _.template($('#widget-template').html()),
+      template: function() {
+        return _.template($(".widget-template[data-widget-type=\"" + (this.model.get('type')) + "\"]").html());
+      },
       initialize: function() {
         this.model.bind('destroy', this.remove, this);
         return this.model.bind('redraw', this.updateChart, this);
@@ -350,6 +511,6 @@
     });
     appRouter = new AppRouter;
     return Backbone.history.start();
-  });
+  };
 
 }).call(this);