Merge branch 'master' of github.com:iros/clientsidedata

code/crossfilter-basic/crossfilter-basic.js

@@ -1,5 +1,5 @@
 // fetch our json file... this time with d3 just for fun.
-d3.json("../../data/heroes.json", function(heroes) {
+d3.json("../../data/all.json", function(heroes) {
 
   // before we pass heroes out to crossfilter, remove those that don't
   // have an intelligence property.

code/json-streams/json-streams.js

@@ -77,7 +77,7 @@ XHRStream.prototype.write = function() {
 
 // Create a new XHR Request and fetch a large json file.
 var xhr = new XMLHttpRequest();
-xhr.open("GET", "../../data/heroes.json", true);
+xhr.open("GET", "../../data/all.json", true);
 
 // create a new XHRStream object
 var xhrstream = new XHRStream(xhr);

code/miso-dataset-basics/miso-dataset-basics.js

@@ -1,7 +1,7 @@
 // Instantiate a new Miso Dataset object and point it
 // at our trusty hero database.
 var heroes = new Miso.Dataset({
-   url: '../../data/heroes.json'
+   url: '../../data/all.json'
 });
 
 // fetch data

code/mvc-backbone/mvc-backbone.js

@@ -6,7 +6,7 @@
     // and create a model for each available hero
         Heroes = Backbone.Collection.extend({
             model : Hero,
-            url: '../../data/heroes.json'
+            url: '../../data/all.json'
         }),
 
     // Define a basic view for a hero model - just an li element

code/mvc-canjs/mvc-canjs.js

@@ -6,7 +6,7 @@
   var Heroes = can.Model({
       // To fetch all models, define the findAll fetch method 'GET'
       // and the URL we are going against.
-      findAll: 'GET ../../data/heroes.json'
+      findAll: 'GET ../../data/all.json'
   }, {});
 
 

code/taffy-db/taffy-db.js

@@ -1,5 +1,5 @@
 // fetch our hero json file...
-$.get('../../data/heroes.json', function(heroes) {
+$.get('../../data/all.json', function(heroes) {
 
   // create a database of heroes
   heroes = TAFFY(heroes);

code/underscore-basics/underscore-basics-efficient.js

@@ -1,5 +1,5 @@
 // fetch our hero json file...
-$.get('../../data/heroes.json', function(heroes) {
+$.get('../../data/all.json', function(heroes) {
 
   // === modify each record:
   // add a property called hasHeight to each object that marks whether it

code/underscore-basics/underscore-basics.js

@@ -1,5 +1,5 @@
 // fetch our hero json file...
-$.get('../../data/heroes.json', function(heroes) {
+$.get('../../data/all.json', function(heroes) {
 
   // === modify each record:
   // add a property called hasHeight to each object that marks whether it

data/README.md

@@ -5,11 +5,12 @@ This is data about super heroes and villains. It's that simple.
 
 ## Files
 
-* heroes.json
-  This file actually contains both heroes AND villains. All the code examples
-  were written using this file, so I kept it this way.
+* all.json
+  This file contains both heroes AND villains. All the code examples
+  were written using this file. It was previously named heroes.json just
+  to be confusing :P
 
-* heroes.csv
+* all.csv
   Same as above, just csv.
 
 * just_heroes.json
@@ -20,7 +21,7 @@ This is data about super heroes and villains. It's that simple.
 
 ## Where did it come from?
 
-It was scraped from the web. Ask me for more details offline if you must.
+It was scraped from the web. Ask me for more details offline if you want.
 
 ## Schema