Merge branch 'master' into sandstorm

Author: audreyt

Makefile

@@ -48,7 +48,7 @@ depends: app.js static/ethercalc.js static/start.css static/multi.js
 
 node_modules/socialcalc/dist/SocialCalc.js: ./node_modules/streamline/bin/_node
 	@-mkdir -p node_modules/socialcalc/dist
-	cp node_modules/socialcalc/SocialCalc.js node_modules/socialcalc/dist/SocialCalc.js
+	cp node_modules/socialcalc/SocialCalc.js node_modules/socialcalc/dist/SocialCalc.js || true
 
 static/ethercalc.js: $(ETHERCALC_FILES) \
      ./node_modules/socialcalc/dist/SocialCalc.js \

app.js

@@ -7,12 +7,12 @@ export class HackFoldr
     res <~ $.get "#{ @base }/_/#{ @id }/csv.json"
     if res.body?length
       res.body.shift! # header
-      @rows = [ { link, title, row: idx+2 } for [link, title], idx in res.body | link and title and link isnt /^#/ ]
+      @rows = [ { link, title, row: idx+2 } for [link, title], idx in res.body | link and link isnt /^#/ and title = if title then title else "Sheet"+ (idx+1) ]
     else
       @was-non-existent = true
     if !@rows?length
       @was-empty = true
-      return cb? @rows = [ { row: 2, link: "/#{ @id }#one", title: \Sheet1 } ]
+      return cb? @rows = [] , @.push({link: "/#{ @id }#one", title: \Sheet1 }) , cb(@)
     cb? @rows
   size: -> @rows.length
   lastIndex: -> @rows.length - 1