From efe55b062c8573b426da2c995dd37b6a4791010e Mon Sep 17 00:00:00 2001 From: Rufus Pollock Date: Sun, 2 Jun 2013 20:04:52 +0100 Subject: [PATCH] [build][xs]: . --- dist/recline.dataset.js | 8 +++++++- dist/recline.js | 8 +++++++- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/dist/recline.dataset.js b/dist/recline.dataset.js index 2f9946d6..fd97e552 100644 --- a/dist/recline.dataset.js +++ b/dist/recline.dataset.js @@ -71,7 +71,13 @@ my.Dataset = Backbone.Model.extend({ } function handleResults(results) { - var out = self._normalizeRecordsAndFields(results.records, results.fields); + // if explicitly given the fields + // (e.g. var dataset = new Dataset({fields: fields, ...}) + // use that field info over anything we get back by parsing the data + // (results.fields) + var fields = self.get('fields') || results.fields; + + var out = self._normalizeRecordsAndFields(results.records, fields); if (results.useMemoryStore) { self._store = new recline.Backend.Memory.Store(out.records, out.fields); } diff --git a/dist/recline.js b/dist/recline.js index 71e57b19..1fa38c4e 100644 --- a/dist/recline.js +++ b/dist/recline.js @@ -1199,7 +1199,13 @@ my.Dataset = Backbone.Model.extend({ } function handleResults(results) { - var out = self._normalizeRecordsAndFields(results.records, results.fields); + // if explicitly given the fields + // (e.g. var dataset = new Dataset({fields: fields, ...}) + // use that field info over anything we get back by parsing the data + // (results.fields) + var fields = self.get('fields') || results.fields; + + var out = self._normalizeRecordsAndFields(results.records, fields); if (results.useMemoryStore) { self._store = new recline.Backend.Memory.Store(out.records, out.fields); }