knight/datahub
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Build.

Browse Source
This commit is contained in:
Dan Wilson 2013-05-17 18:30:48 +01:00
parent f6a6a41c07
commit 8daba7e4e4
2 changed files with 20 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
dist/recline.dataset.js vendored
View File

@ -6,7 +6,7 @@ this.recline.Model = this.recline.Model || {};
"use strict"; "use strict";
// use either jQuery or Underscore Deferred depending on what is available // 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;
// ## <a id="dataset">Dataset</a> // ## <a id="dataset">Dataset</a>
my.Dataset = Backbone.Model.extend({ my.Dataset = Backbone.Model.extend({
@ -16,6 +16,7 @@ my.Dataset = Backbone.Model.extend({
// ### initialize // ### initialize
initialize: function() { initialize: function() {
var self = this;
_.bindAll(this, 'query'); _.bindAll(this, 'query');
this.backend = null; this.backend = null;
if (this.get('backend')) { if (this.get('backend')) {
@ -35,8 +36,9 @@ my.Dataset = Backbone.Model.extend({
this.facets = new my.FacetList(); this.facets = new my.FacetList();
this.recordCount = null; this.recordCount = null;
this.queryState = new my.Query(); this.queryState = new my.Query();
this.queryState.bind('change', this.query); this.queryState.bind('change facet:add', function () {
this.queryState.bind('facet:add', this.query); self.query(); // We want to call query() without any arguments.
});
// store is what we query and save against // store is what we query and save against
// store will either be the backend or be a memory store if Backend fetch // store will either be the backend or be a memory store if Backend fetch
// tells us to use memory store // tells us to use memory store
@ -593,7 +595,7 @@ this.recline.Backend.Memory = this.recline.Backend.Memory || {};
my.__type__ = 'memory'; my.__type__ = 'memory';
// private data - use either jQuery or Underscore Deferred depending on what is available // 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 // ## Data Wrapper
// //

23
dist/recline.js vendored
View File

@ -8,7 +8,7 @@ this.recline.Backend.CSV = this.recline.Backend.CSV || {};
my.__type__ = 'csv'; my.__type__ = 'csv';
// use either jQuery or Underscore Deferred depending on what is available // 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 // ## fetch
// //
@ -129,7 +129,7 @@ this.recline.Backend.CSV = this.recline.Backend.CSV || {};
// If we are at a EOF or EOR // If we are at a EOF or EOR
if (inQuote === false && (cur === delimiter || cur === "\n")) { if (inQuote === false && (cur === delimiter || cur === "\n")) {
field = processField(field); field = processField(field);
// Add the current field to the current row // Add the current field to the current row
row.push(field); row.push(field);
// If this is EOR append row to output and flush row // 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); row.push(field);
out.push(row); out.push(row);
// Expose the ability to discard initial rows
if (options.skipInitialRows) out = out.slice(options.skipInitialRows);
return out; 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 // 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 // ## load
// //
@ -376,7 +379,7 @@ this.recline.Backend.ElasticSearch = this.recline.Backend.ElasticSearch || {};
my.__type__ = 'elasticsearch'; my.__type__ = 'elasticsearch';
// use either jQuery or Underscore Deferred depending on what is available // 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 // ## ElasticSearch Wrapper
// //
@ -662,7 +665,7 @@ this.recline.Backend.GDocs = this.recline.Backend.GDocs || {};
my.__type__ = 'gdocs'; my.__type__ = 'gdocs';
// use either jQuery or Underscore Deferred depending on what is available // 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 // ## Google spreadsheet backend
// //
@ -830,7 +833,7 @@ this.recline.Backend.Memory = this.recline.Backend.Memory || {};
my.__type__ = 'memory'; my.__type__ = 'memory';
// private data - use either jQuery or Underscore Deferred depending on what is available // 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 // ## Data Wrapper
// //
@ -1131,7 +1134,7 @@ this.recline.Model = this.recline.Model || {};
"use strict"; "use strict";
// use either jQuery or Underscore Deferred depending on what is available // 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;
// ## <a id="dataset">Dataset</a> // ## <a id="dataset">Dataset</a>
my.Dataset = Backbone.Model.extend({ my.Dataset = Backbone.Model.extend({
@ -1141,6 +1144,7 @@ my.Dataset = Backbone.Model.extend({
// ### initialize // ### initialize
initialize: function() { initialize: function() {
var self = this;
_.bindAll(this, 'query'); _.bindAll(this, 'query');
this.backend = null; this.backend = null;
if (this.get('backend')) { if (this.get('backend')) {
@ -1160,8 +1164,9 @@ my.Dataset = Backbone.Model.extend({
this.facets = new my.FacetList(); this.facets = new my.FacetList();
this.recordCount = null; this.recordCount = null;
this.queryState = new my.Query(); this.queryState = new my.Query();
this.queryState.bind('change', this.query); this.queryState.bind('change facet:add', function () {
this.queryState.bind('facet:add', this.query); self.query(); // We want to call query() without any arguments.
});
// store is what we query and save against // store is what we query and save against
// store will either be the backend or be a memory store if Backend fetch // store will either be the backend or be a memory store if Backend fetch
// tells us to use memory store // tells us to use memory store