Merge branch 'master' into gh-pages

This commit is contained in:
Rufus Pollock
2012-11-13 12:07:51 +00:00
2 changed files with 4 additions and 3 deletions

View File

@@ -41,9 +41,9 @@ jQuery(function($) {
fields: [ fields: [
{id: 'id'}, {id: 'id'},
{id: 'date', type: 'date'}, {id: 'date', type: 'date'},
{id: 'x'}, {id: 'x', type: 'number'},
{id: 'y'}, {id: 'y', type: 'number'},
{id: 'z'}, {id: 'z', type: 'number'},
{id: 'country', 'label': 'Country'}, {id: 'country', 'label': 'Country'},
{id: 'title', 'label': 'Title'}, {id: 'title', 'label': 'Title'},
{id: 'lat'}, {id: 'lat'},

View File

@@ -101,6 +101,7 @@ this.recline.Backend.Memory = this.recline.Backend.Memory || {};
var dataParsers = { var dataParsers = {
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); },
string : function (e) { return e.toString() }, string : function (e) { return e.toString() },
date : function (e) { return new Date(e).valueOf() }, date : function (e) { return new Date(e).valueOf() },
datetime : function (e) { return new Date(e).valueOf() } datetime : function (e) { return new Date(e).valueOf() }