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

[#313,model][s]: use jquery promise api if available.

Browse Source
This commit is contained in:
Rufus Pollock
2013-02-08 13:05:00 +00:00
parent 89ad7c1686
commit 68215a0fa5
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/model.js
View File

@@ -4,6 +4,8 @@ this.recline.Model = this.recline.Model || {};
(function(my) { (function(my) {
var Deferred = _.isUndefined(this.jQuery) ? _.Deferred : jQuery.Deferred;
// ## <a id="dataset">Dataset</a> // ## <a id="dataset">Dataset</a>
my.Dataset = Backbone.Model.extend({ my.Dataset = Backbone.Model.extend({
constructor: function Dataset() { constructor: function Dataset() {
@@ -47,7 +49,7 @@ my.Dataset = Backbone.Model.extend({
// Retrieve dataset and (some) records from the backend. // Retrieve dataset and (some) records from the backend.
fetch: function() { fetch: function() {
var self = this; var self = this;
var dfd = new _.Deferred(); var dfd = new Deferred();
if (this.backend !== recline.Backend.Memory) { if (this.backend !== recline.Backend.Memory) {
this.backend.fetch(this.toJSON()) this.backend.fetch(this.toJSON())
@@ -181,7 +183,7 @@ my.Dataset = Backbone.Model.extend({
// also returned. // also returned.
query: function(queryObj) { query: function(queryObj) {
var self = this; var self = this;
var dfd = new _.Deferred(); var dfd = new Deferred();
this.trigger('query:start'); this.trigger('query:start');
if (queryObj) { if (queryObj) {
@@ -245,7 +247,7 @@ my.Dataset = Backbone.Model.extend({
this.fields.each(function(field) { this.fields.each(function(field) {
query.addFacet(field.id); query.addFacet(field.id);
}); });
var dfd = new _.Deferred(); var dfd = new Deferred();
this._store.query(query.toJSON(), this.toJSON()).done(function(queryResult) { this._store.query(query.toJSON(), this.toJSON()).done(function(queryResult) {
if (queryResult.facets) { if (queryResult.facets) {
_.each(queryResult.facets, function(facetResult, facetId) { _.each(queryResult.facets, function(facetResult, facetId) {