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

[#34,view][s]: query state in url (store into and read from).

Browse Source 
* Also change so that query values are not automatically JSON.stringify-ied (bad idea since it leads to repeated jsonification of same value ...)
This commit is contained in:
Rufus Pollock 2012-03-14 19:45:28 +00:00
parent 58c06e5ad7
commit 733a9d3275
4 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/model.js
View File

@ -41,7 +41,7 @@ my.Dataset = Backbone.Model.extend({
query: function(queryObj) {
this.trigger('query:start');
var self = this;
this.queryState.set(queryObj, {silent: true});
this.queryState.set(queryObj);
var dfd = $.Deferred();
this.backend.query(this, this.queryState.toJSON()).done(function(rows) {
var docs = _.map(rows, function(row) {

2
src/view-flot-graph.js
View File

@ -123,7 +123,7 @@ my.FlotGraph = Backbone.View.extend({
this._getEditorData();
// update navigation
var qs = my.parseHashQueryString();
qs['graph'] = this.chartConfig;
qs['graph'] = JSON.stringify(this.chartConfig);
my.setHashQueryString(qs);
this.redraw();
},

13
src/view.js
View File

@ -111,6 +111,10 @@ my.DataExplorer = Backbone.View.extend({
my.clearNotifications();
self.el.find('.doc-count').text(self.model.docCount || 'Unknown');
my.notify('Data loaded', {category: 'success'});
// update navigation
var qs = my.parseHashQueryString();
qs['reclineQuery'] = JSON.stringify(self.model.queryState.toJSON());
my.setHashQueryString(qs);
});
this.model.bind('query:fail', function(error) {
my.clearNotifications();
@ -134,8 +138,11 @@ my.DataExplorer = Backbone.View.extend({
// note this.model and dataset returned are the same
this.model.fetch()
.done(function(dataset) {
self.el.find('.doc-count').text(self.model.docCount || 'Unknown');
self.model.query();
var queryState = my.parseHashQueryString().reclineQuery;
if (queryState) {
queryState = JSON.parse(queryState);
}
self.model.query(queryState);
})
.fail(function(error) {
my.notify(error.message, {category: 'error', persist: true});
@ -296,7 +303,7 @@ my.composeQueryString = function(queryParams) {
var queryString = '?';
var items = [];
$.each(queryParams, function(key, value) {
items.push(key + '=' + JSON.stringify(value));
items.push(key + '=' + value);
});
queryString += items.join('&');
return queryString;

2
test/util.test.js
View File

@ -16,7 +16,7 @@ test('composeQueryString', function () {
a: 'b'
};
var out = recline.View.composeQueryString(params);
equal(out, '?x="y"&a="b"');
equal(out, '?x=y&a=b');
});
})(this.jQuery);