Build current
This commit is contained in:
14
dist/recline.dataset.js
vendored
14
dist/recline.dataset.js
vendored
@@ -694,9 +694,9 @@ this.recline.Backend.Memory = this.recline.Backend.Memory || {};
|
|||||||
integer: function (e) { return parseFloat(e, 10); },
|
integer: function (e) { return parseFloat(e, 10); },
|
||||||
'float': function (e) { return parseFloat(e, 10); },
|
'float': function (e) { return parseFloat(e, 10); },
|
||||||
number: function (e) { return parseFloat(e, 10); },
|
number: function (e) { return parseFloat(e, 10); },
|
||||||
string : function (e) { return e.toString() },
|
string : function (e) { return e.toString(); },
|
||||||
date : function (e) { return moment(e).valueOf() },
|
date : function (e) { return moment(e).valueOf(); },
|
||||||
datetime : function (e) { return new Date(e).valueOf() }
|
datetime : function (e) { return new Date(e).valueOf(); }
|
||||||
};
|
};
|
||||||
var keyedFields = {};
|
var keyedFields = {};
|
||||||
_.each(self.fields, function(field) {
|
_.each(self.fields, function(field) {
|
||||||
@@ -727,8 +727,8 @@ this.recline.Backend.Memory = this.recline.Backend.Memory || {};
|
|||||||
}
|
}
|
||||||
|
|
||||||
function range(record, filter) {
|
function range(record, filter) {
|
||||||
var startnull = (filter.start == null || filter.start === '');
|
var startnull = (filter.start === null || filter.start === '');
|
||||||
var stopnull = (filter.stop == null || filter.stop === '');
|
var stopnull = (filter.stop === null || filter.stop === '');
|
||||||
var parse = getDataParser(filter);
|
var parse = getDataParser(filter);
|
||||||
var value = parse(record[filter.field]);
|
var value = parse(record[filter.field]);
|
||||||
var start = parse(filter.start);
|
var start = parse(filter.start);
|
||||||
@@ -752,8 +752,8 @@ this.recline.Backend.Memory = this.recline.Backend.Memory || {};
|
|||||||
if (queryObj.q) {
|
if (queryObj.q) {
|
||||||
var terms = queryObj.q.split(' ');
|
var terms = queryObj.q.split(' ');
|
||||||
var patterns=_.map(terms, function(term) {
|
var patterns=_.map(terms, function(term) {
|
||||||
return new RegExp(term.toLowerCase());;
|
return new RegExp(term.toLowerCase());
|
||||||
});
|
});
|
||||||
results = _.filter(results, function(rawdoc) {
|
results = _.filter(results, function(rawdoc) {
|
||||||
var matches = true;
|
var matches = true;
|
||||||
_.each(patterns, function(pattern) {
|
_.each(patterns, function(pattern) {
|
||||||
|
|||||||
26
dist/recline.js
vendored
26
dist/recline.js
vendored
@@ -507,7 +507,7 @@ this.recline.Backend.ElasticSearch = this.recline.Backend.ElasticSearch || {};
|
|||||||
|
|
||||||
this._convertFilter = function(filter) {
|
this._convertFilter = function(filter) {
|
||||||
var out = {};
|
var out = {};
|
||||||
out[filter.type] = {}
|
out[filter.type] = {};
|
||||||
if (filter.type === 'term') {
|
if (filter.type === 'term') {
|
||||||
out.term[filter.field] = filter.term.toLowerCase();
|
out.term[filter.field] = filter.term.toLowerCase();
|
||||||
} else if (filter.type === 'geo_distance') {
|
} else if (filter.type === 'geo_distance') {
|
||||||
@@ -537,7 +537,7 @@ this.recline.Backend.ElasticSearch = this.recline.Backend.ElasticSearch || {};
|
|||||||
dataType: this.options.dataType
|
dataType: this.options.dataType
|
||||||
});
|
});
|
||||||
return jqxhr;
|
return jqxhr;
|
||||||
}
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
@@ -798,14 +798,14 @@ this.recline.Backend.GDocs = this.recline.Backend.GDocs || {};
|
|||||||
if(!!matches) {
|
if(!!matches) {
|
||||||
key = matches[1];
|
key = matches[1];
|
||||||
// the gid in url is 0-based and feed url is 1-based
|
// the gid in url is 0-based and feed url is 1-based
|
||||||
worksheet = parseInt(matches[3]) + 1;
|
worksheet = parseInt(matches[3], 10) + 1;
|
||||||
if (isNaN(worksheet)) {
|
if (isNaN(worksheet)) {
|
||||||
worksheet = 1;
|
worksheet = 1;
|
||||||
}
|
}
|
||||||
urls = {
|
urls = {
|
||||||
worksheet : 'https://spreadsheets.google.com/feeds/list/'+ key +'/'+ worksheet +'/public/values?alt=json',
|
worksheet : 'https://spreadsheets.google.com/feeds/list/'+ key +'/'+ worksheet +'/public/values?alt=json',
|
||||||
spreadsheet: 'https://spreadsheets.google.com/feeds/worksheets/'+ key +'/public/basic?alt=json'
|
spreadsheet: 'https://spreadsheets.google.com/feeds/worksheets/'+ key +'/public/basic?alt=json'
|
||||||
}
|
};
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
// we assume that it's one of the feeds urls
|
// we assume that it's one of the feeds urls
|
||||||
@@ -815,7 +815,7 @@ this.recline.Backend.GDocs = this.recline.Backend.GDocs || {};
|
|||||||
urls = {
|
urls = {
|
||||||
worksheet : 'https://spreadsheets.google.com/feeds/list/'+ key +'/'+ worksheet +'/public/values?alt=json',
|
worksheet : 'https://spreadsheets.google.com/feeds/list/'+ key +'/'+ worksheet +'/public/values?alt=json',
|
||||||
spreadsheet: 'https://spreadsheets.google.com/feeds/worksheets/'+ key +'/public/basic?alt=json'
|
spreadsheet: 'https://spreadsheets.google.com/feeds/worksheets/'+ key +'/public/basic?alt=json'
|
||||||
}
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
return urls;
|
return urls;
|
||||||
@@ -931,9 +931,9 @@ this.recline.Backend.Memory = this.recline.Backend.Memory || {};
|
|||||||
integer: function (e) { return parseFloat(e, 10); },
|
integer: function (e) { return parseFloat(e, 10); },
|
||||||
'float': function (e) { return parseFloat(e, 10); },
|
'float': function (e) { return parseFloat(e, 10); },
|
||||||
number: function (e) { return parseFloat(e, 10); },
|
number: function (e) { return parseFloat(e, 10); },
|
||||||
string : function (e) { return e.toString() },
|
string : function (e) { return e.toString(); },
|
||||||
date : function (e) { return moment(e).valueOf() },
|
date : function (e) { return moment(e).valueOf(); },
|
||||||
datetime : function (e) { return new Date(e).valueOf() }
|
datetime : function (e) { return new Date(e).valueOf(); }
|
||||||
};
|
};
|
||||||
var keyedFields = {};
|
var keyedFields = {};
|
||||||
_.each(self.fields, function(field) {
|
_.each(self.fields, function(field) {
|
||||||
@@ -964,8 +964,8 @@ this.recline.Backend.Memory = this.recline.Backend.Memory || {};
|
|||||||
}
|
}
|
||||||
|
|
||||||
function range(record, filter) {
|
function range(record, filter) {
|
||||||
var startnull = (filter.start == null || filter.start === '');
|
var startnull = (filter.start === null || filter.start === '');
|
||||||
var stopnull = (filter.stop == null || filter.stop === '');
|
var stopnull = (filter.stop === null || filter.stop === '');
|
||||||
var parse = getDataParser(filter);
|
var parse = getDataParser(filter);
|
||||||
var value = parse(record[filter.field]);
|
var value = parse(record[filter.field]);
|
||||||
var start = parse(filter.start);
|
var start = parse(filter.start);
|
||||||
@@ -989,8 +989,8 @@ this.recline.Backend.Memory = this.recline.Backend.Memory || {};
|
|||||||
if (queryObj.q) {
|
if (queryObj.q) {
|
||||||
var terms = queryObj.q.split(' ');
|
var terms = queryObj.q.split(' ');
|
||||||
var patterns=_.map(terms, function(term) {
|
var patterns=_.map(terms, function(term) {
|
||||||
return new RegExp(term.toLowerCase());;
|
return new RegExp(term.toLowerCase());
|
||||||
});
|
});
|
||||||
results = _.filter(results, function(rawdoc) {
|
results = _.filter(results, function(rawdoc) {
|
||||||
var matches = true;
|
var matches = true;
|
||||||
_.each(patterns, function(pattern) {
|
_.each(patterns, function(pattern) {
|
||||||
@@ -1926,7 +1926,7 @@ my.Flot = Backbone.View.extend({
|
|||||||
var numTicks = Math.min(this.model.records.length, 15);
|
var numTicks = Math.min(this.model.records.length, 15);
|
||||||
var increment = this.model.records.length / numTicks;
|
var increment = this.model.records.length / numTicks;
|
||||||
var ticks = [];
|
var ticks = [];
|
||||||
for (i=0; i<numTicks; i++) {
|
for (var i=0; i<numTicks; i++) {
|
||||||
ticks.push(parseInt(i*increment, 10));
|
ticks.push(parseInt(i*increment, 10));
|
||||||
}
|
}
|
||||||
xaxis.ticks = ticks;
|
xaxis.ticks = ticks;
|
||||||
|
|||||||
Reference in New Issue
Block a user