Fixes for Internet Explorer 7 and its strict JSON object modelling
This commit is contained in:
@@ -74,21 +74,21 @@ var createExplorer = function(dataset, state) {
|
|||||||
label: 'Grid',
|
label: 'Grid',
|
||||||
view: new recline.View.SlickGrid({
|
view: new recline.View.SlickGrid({
|
||||||
model: dataset
|
model: dataset
|
||||||
}),
|
})
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
id: 'graph',
|
id: 'graph',
|
||||||
label: 'Graph',
|
label: 'Graph',
|
||||||
view: new recline.View.Graph({
|
view: new recline.View.Graph({
|
||||||
model: dataset
|
model: dataset
|
||||||
}),
|
})
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
id: 'map',
|
id: 'map',
|
||||||
label: 'Map',
|
label: 'Map',
|
||||||
view: new recline.View.Map({
|
view: new recline.View.Map({
|
||||||
model: dataset
|
model: dataset
|
||||||
}),
|
})
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
id: 'transform',
|
id: 'transform',
|
||||||
|
|||||||
@@ -230,7 +230,7 @@ this.recline.Backend.ElasticSearch = this.recline.Backend.ElasticSearch || {};
|
|||||||
var jqxhr = es.query(queryObj);
|
var jqxhr = es.query(queryObj);
|
||||||
jqxhr.done(function(results) {
|
jqxhr.done(function(results) {
|
||||||
var out = {
|
var out = {
|
||||||
total: results.hits.total,
|
total: results.hits.total
|
||||||
};
|
};
|
||||||
out.hits = _.map(results.hits.hits, function(hit) {
|
out.hits = _.map(results.hits.hits, function(hit) {
|
||||||
if (!('id' in hit._source) && hit._id) {
|
if (!('id' in hit._source) && hit._id) {
|
||||||
|
|||||||
@@ -221,7 +221,7 @@ my.Graph = Backbone.View.extend({
|
|||||||
horizontal: true,
|
horizontal: true,
|
||||||
shadowSize: 0,
|
shadowSize: 0,
|
||||||
barWidth: 0.8
|
barWidth: 0.8
|
||||||
},
|
}
|
||||||
},
|
},
|
||||||
columns: {
|
columns: {
|
||||||
legend: legend,
|
legend: legend,
|
||||||
@@ -242,9 +242,9 @@ my.Graph = Backbone.View.extend({
|
|||||||
horizontal: false,
|
horizontal: false,
|
||||||
shadowSize: 0,
|
shadowSize: 0,
|
||||||
barWidth: 0.8
|
barWidth: 0.8
|
||||||
},
|
}
|
||||||
},
|
},
|
||||||
grid: { hoverable: true, clickable: true },
|
grid: { hoverable: true, clickable: true }
|
||||||
};
|
};
|
||||||
return optionsPerGraphType[typeId];
|
return optionsPerGraphType[typeId];
|
||||||
},
|
},
|
||||||
@@ -424,7 +424,7 @@ my.GraphControls = Backbone.View.extend({
|
|||||||
addSeries: function (idx) {
|
addSeries: function (idx) {
|
||||||
var data = _.extend({
|
var data = _.extend({
|
||||||
seriesIndex: idx,
|
seriesIndex: idx,
|
||||||
seriesName: String.fromCharCode(idx + 64 + 1),
|
seriesName: String.fromCharCode(idx + 64 + 1)
|
||||||
}, this.model.toTemplateJSON());
|
}, this.model.toTemplateJSON());
|
||||||
|
|
||||||
var htmls = Mustache.render(this.templateSeriesEditor, data);
|
var htmls = Mustache.render(this.templateSeriesEditor, data);
|
||||||
|
|||||||
Reference in New Issue
Block a user