From 8daba7e4e41eae35a1d652dcacf96b1a4b4318bb Mon Sep 17 00:00:00 2001 From: Dan Wilson Date: Fri, 17 May 2013 18:30:48 +0100 Subject: [PATCH] Build. --- dist/recline.dataset.js | 10 ++++++---- dist/recline.js | 23 ++++++++++++++--------- 2 files changed, 20 insertions(+), 13 deletions(-) diff --git a/dist/recline.dataset.js b/dist/recline.dataset.js index 4dc804c8..2f9946d6 100644 --- a/dist/recline.dataset.js +++ b/dist/recline.dataset.js @@ -6,7 +6,7 @@ this.recline.Model = this.recline.Model || {}; "use strict"; // use either jQuery or Underscore Deferred depending on what is available -var Deferred = _.isUndefined(window.jQuery) ? _.Deferred : jQuery.Deferred; +var Deferred = (typeof jQuery !== "undefined" && jQuery.Deferred) || _.Deferred; // ## Dataset my.Dataset = Backbone.Model.extend({ @@ -16,6 +16,7 @@ my.Dataset = Backbone.Model.extend({ // ### initialize initialize: function() { + var self = this; _.bindAll(this, 'query'); this.backend = null; if (this.get('backend')) { @@ -35,8 +36,9 @@ my.Dataset = Backbone.Model.extend({ this.facets = new my.FacetList(); this.recordCount = null; this.queryState = new my.Query(); - this.queryState.bind('change', this.query); - this.queryState.bind('facet:add', this.query); + this.queryState.bind('change facet:add', function () { + self.query(); // We want to call query() without any arguments. + }); // store is what we query and save against // store will either be the backend or be a memory store if Backend fetch // tells us to use memory store @@ -593,7 +595,7 @@ this.recline.Backend.Memory = this.recline.Backend.Memory || {}; my.__type__ = 'memory'; // private data - use either jQuery or Underscore Deferred depending on what is available - var Deferred = _.isUndefined(window.jQuery) ? _.Deferred : jQuery.Deferred; + var Deferred = (typeof jQuery !== "undefined" && jQuery.Deferred) || _.Deferred; // ## Data Wrapper // diff --git a/dist/recline.js b/dist/recline.js index 81bf7e8d..03a5f7f1 100644 --- a/dist/recline.js +++ b/dist/recline.js @@ -8,7 +8,7 @@ this.recline.Backend.CSV = this.recline.Backend.CSV || {}; my.__type__ = 'csv'; // use either jQuery or Underscore Deferred depending on what is available - var Deferred = _.isUndefined(window.jQuery) ? _.Deferred : jQuery.Deferred; + var Deferred = (typeof jQuery !== "undefined" && jQuery.Deferred) || _.Deferred; // ## fetch // @@ -129,7 +129,7 @@ this.recline.Backend.CSV = this.recline.Backend.CSV || {}; // If we are at a EOF or EOR if (inQuote === false && (cur === delimiter || cur === "\n")) { - field = processField(field); + field = processField(field); // Add the current field to the current row row.push(field); // If this is EOR append row to output and flush row @@ -169,6 +169,9 @@ this.recline.Backend.CSV = this.recline.Backend.CSV || {}; row.push(field); out.push(row); + // Expose the ability to discard initial rows + if (options.skipInitialRows) out = out.slice(options.skipInitialRows); + return out; }; @@ -306,7 +309,7 @@ this.recline.Backend.DataProxy = this.recline.Backend.DataProxy || {}; // use either jQuery or Underscore Deferred depending on what is available - var Deferred = _.isUndefined(window.jQuery) ? _.Deferred : jQuery.Deferred; + var Deferred = (typeof jQuery !== "undefined" && jQuery.Deferred) || _.Deferred; // ## load // @@ -376,7 +379,7 @@ this.recline.Backend.ElasticSearch = this.recline.Backend.ElasticSearch || {}; my.__type__ = 'elasticsearch'; // use either jQuery or Underscore Deferred depending on what is available - var Deferred = _.isUndefined(window.jQuery) ? _.Deferred : jQuery.Deferred; + var Deferred = (typeof jQuery !== "undefined" && jQuery.Deferred) || _.Deferred; // ## ElasticSearch Wrapper // @@ -662,7 +665,7 @@ this.recline.Backend.GDocs = this.recline.Backend.GDocs || {}; my.__type__ = 'gdocs'; // use either jQuery or Underscore Deferred depending on what is available - var Deferred = _.isUndefined(window.jQuery) ? _.Deferred : jQuery.Deferred; + var Deferred = (typeof jQuery !== "undefined" && jQuery.Deferred) || _.Deferred; // ## Google spreadsheet backend // @@ -830,7 +833,7 @@ this.recline.Backend.Memory = this.recline.Backend.Memory || {}; my.__type__ = 'memory'; // private data - use either jQuery or Underscore Deferred depending on what is available - var Deferred = _.isUndefined(window.jQuery) ? _.Deferred : jQuery.Deferred; + var Deferred = (typeof jQuery !== "undefined" && jQuery.Deferred) || _.Deferred; // ## Data Wrapper // @@ -1131,7 +1134,7 @@ this.recline.Model = this.recline.Model || {}; "use strict"; // use either jQuery or Underscore Deferred depending on what is available -var Deferred = _.isUndefined(window.jQuery) ? _.Deferred : jQuery.Deferred; +var Deferred = (typeof jQuery !== "undefined" && jQuery.Deferred) || _.Deferred; // ## Dataset my.Dataset = Backbone.Model.extend({ @@ -1141,6 +1144,7 @@ my.Dataset = Backbone.Model.extend({ // ### initialize initialize: function() { + var self = this; _.bindAll(this, 'query'); this.backend = null; if (this.get('backend')) { @@ -1160,8 +1164,9 @@ my.Dataset = Backbone.Model.extend({ this.facets = new my.FacetList(); this.recordCount = null; this.queryState = new my.Query(); - this.queryState.bind('change', this.query); - this.queryState.bind('facet:add', this.query); + this.queryState.bind('change facet:add', function () { + self.query(); // We want to call query() without any arguments. + }); // store is what we query and save against // store will either be the backend or be a memory store if Backend fetch // tells us to use memory store