From 6ee9e98e5e3deeaccaf319b2aa258d7b24ae9cf2 Mon Sep 17 00:00:00 2001 From: John Martin Date: Tue, 2 Oct 2012 14:36:46 +0100 Subject: [PATCH] Fixes for Internet Explorer 7 and its strict JSON object modelling --- demos/multiview/app.js | 6 +++--- src/backend.elasticsearch.js | 2 +- src/view.graph.js | 8 ++++---- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/demos/multiview/app.js b/demos/multiview/app.js index 3bfc12a1..ada770f3 100755 --- a/demos/multiview/app.js +++ b/demos/multiview/app.js @@ -74,21 +74,21 @@ var createExplorer = function(dataset, state) { label: 'Grid', view: new recline.View.SlickGrid({ model: dataset - }), + }) }, { id: 'graph', label: 'Graph', view: new recline.View.Graph({ model: dataset - }), + }) }, { id: 'map', label: 'Map', view: new recline.View.Map({ model: dataset - }), + }) }, { id: 'transform', diff --git a/src/backend.elasticsearch.js b/src/backend.elasticsearch.js index dc2d8f06..9037917f 100644 --- a/src/backend.elasticsearch.js +++ b/src/backend.elasticsearch.js @@ -230,7 +230,7 @@ this.recline.Backend.ElasticSearch = this.recline.Backend.ElasticSearch || {}; var jqxhr = es.query(queryObj); jqxhr.done(function(results) { var out = { - total: results.hits.total, + total: results.hits.total }; out.hits = _.map(results.hits.hits, function(hit) { if (!('id' in hit._source) && hit._id) { diff --git a/src/view.graph.js b/src/view.graph.js index 14d912df..c292a955 100644 --- a/src/view.graph.js +++ b/src/view.graph.js @@ -221,7 +221,7 @@ my.Graph = Backbone.View.extend({ horizontal: true, shadowSize: 0, barWidth: 0.8 - }, + } }, columns: { legend: legend, @@ -242,9 +242,9 @@ my.Graph = Backbone.View.extend({ horizontal: false, shadowSize: 0, barWidth: 0.8 - }, + } }, - grid: { hoverable: true, clickable: true }, + grid: { hoverable: true, clickable: true } }; return optionsPerGraphType[typeId]; }, @@ -424,7 +424,7 @@ my.GraphControls = Backbone.View.extend({ addSeries: function (idx) { var data = _.extend({ seriesIndex: idx, - seriesName: String.fromCharCode(idx + 64 + 1), + seriesName: String.fromCharCode(idx + 64 + 1) }, this.model.toTemplateJSON()); var htmls = Mustache.render(this.templateSeriesEditor, data);