Merge branch 'master' into gh-pages

demo/js/app.js

@@ -1,19 +1,21 @@
 $(function() {
-  // do not like all these window globals ...
-  // window.$container = $('.container .right-panel');
-  window.$container = $('.data-explorer-here');
+  var $el = $('<div />');
+  $el.appendTo($('.data-explorer-here'));
   var dataset = demoDataset();
   window.dataExplorer = new recline.View.DataExplorer({
-    el: window.$container
+    el: $el
     , model: dataset
   });
+  Backbone.history.start();
   setupLoadFromWebstore(function(dataset) {
     window.dataExplorer.remove();
+    var $el = $('<div />');
+    $el.appendTo($('.data-explorer-here'));
     window.dataExplorer = null;
     window.dataExplorer = new recline.View.DataExplorer({
-      model: dataset,
+      el: $el
+      , model: dataset
     });
-    window.$container.append(window.dataExplorer.el);
   });
   $('a.set-read-only').click(function() {
     window.dataExplorer.setReadOnly();

src/model.js

@@ -214,7 +214,7 @@ my.BackendWebstore = Backbone.Model.extend({
     }
     var base = this.get('url');
     var jqxhr = $.ajax({
-      url: base + '.json',
+      url: base + '.json?_limit=' + numRows,
       dataType: 'jsonp',
       jsonp: '_callback',
       cache: true

src/view.js

@@ -98,7 +98,6 @@ my.DataExplorer = Backbone.View.extend({
 
     this.router = new Backbone.Router();
     this.setupRouting();
-    Backbone.history.start();
 
     // retrieve basic data like headers etc
     // note this.model and dataset returned are the same