Merge branch 'master' into gh-pages
This commit is contained in:
@@ -1,19 +1,21 @@
|
|||||||
$(function() {
|
$(function() {
|
||||||
// do not like all these window globals ...
|
var $el = $('<div />');
|
||||||
// window.$container = $('.container .right-panel');
|
$el.appendTo($('.data-explorer-here'));
|
||||||
window.$container = $('.data-explorer-here');
|
|
||||||
var dataset = demoDataset();
|
var dataset = demoDataset();
|
||||||
window.dataExplorer = new recline.View.DataExplorer({
|
window.dataExplorer = new recline.View.DataExplorer({
|
||||||
el: window.$container
|
el: $el
|
||||||
, model: dataset
|
, model: dataset
|
||||||
});
|
});
|
||||||
|
Backbone.history.start();
|
||||||
setupLoadFromWebstore(function(dataset) {
|
setupLoadFromWebstore(function(dataset) {
|
||||||
window.dataExplorer.remove();
|
window.dataExplorer.remove();
|
||||||
|
var $el = $('<div />');
|
||||||
|
$el.appendTo($('.data-explorer-here'));
|
||||||
window.dataExplorer = null;
|
window.dataExplorer = null;
|
||||||
window.dataExplorer = new recline.View.DataExplorer({
|
window.dataExplorer = new recline.View.DataExplorer({
|
||||||
model: dataset,
|
el: $el
|
||||||
|
, model: dataset
|
||||||
});
|
});
|
||||||
window.$container.append(window.dataExplorer.el);
|
|
||||||
});
|
});
|
||||||
$('a.set-read-only').click(function() {
|
$('a.set-read-only').click(function() {
|
||||||
window.dataExplorer.setReadOnly();
|
window.dataExplorer.setReadOnly();
|
||||||
|
|||||||
@@ -214,7 +214,7 @@ my.BackendWebstore = Backbone.Model.extend({
|
|||||||
}
|
}
|
||||||
var base = this.get('url');
|
var base = this.get('url');
|
||||||
var jqxhr = $.ajax({
|
var jqxhr = $.ajax({
|
||||||
url: base + '.json',
|
url: base + '.json?_limit=' + numRows,
|
||||||
dataType: 'jsonp',
|
dataType: 'jsonp',
|
||||||
jsonp: '_callback',
|
jsonp: '_callback',
|
||||||
cache: true
|
cache: true
|
||||||
|
|||||||
@@ -98,7 +98,6 @@ my.DataExplorer = Backbone.View.extend({
|
|||||||
|
|
||||||
this.router = new Backbone.Router();
|
this.router = new Backbone.Router();
|
||||||
this.setupRouting();
|
this.setupRouting();
|
||||||
Backbone.history.start();
|
|
||||||
|
|
||||||
// retrieve basic data like headers etc
|
// retrieve basic data like headers etc
|
||||||
// note this.model and dataset returned are the same
|
// note this.model and dataset returned are the same
|
||||||
|
|||||||
Reference in New Issue
Block a user