Merge branch 'master' of https://github.com/jlord/sheetsee.js

Author: Jessica Lord

docs/basics.md

@@ -91,4 +91,4 @@ You should have an address in a box at the bottom, your key is the portion betwe
 
 ### CSS
 
-Sheetsee.js comes with a bare minimum stylesheet, `sss.csss`, which contains elements you'll want to style when using the feature they correspond to.
+Sheetsee.js comes with a bare minimum stylesheet, `sss.css`, which contains elements you'll want to style when using the feature they correspond to.

js/tabletop1.3.3.js

@@ -96,9 +96,8 @@
     }
 
     if(/pubhtml/.test(this.key)) {
-      alert("You passed a new Google Spreadsheets url as the key! This won't work yet, you'll need to change back to old Sheets.");
+      this.log("You passed a new Google Spreadsheets url as the key! Attempting to parse.");
       this.key = this.key.match("d\\/(.*?)\\/pubhtml")[1];
-      console.log(this.key);
     }
 
     if(!this.key) {
@@ -309,13 +308,17 @@
         this.foundSheetNames.push(data.feed.entry[i].title.$t);
         // Only pull in desired sheets to reduce loading
         if( this.isWanted(data.feed.entry[i].content.$t) ) {
-          var sheet_id = data.feed.entry[i].link[3].href.substr( data.feed.entry[i].link[3].href.length - 3, 3);
-          var json_path = "/feeds/list/" + this.key + "/" + sheet_id + "/public/values?sq=" + this.query + '&alt='
+          var linkIdx = data.feed.entry[i].link.length-1;
+          var sheet_id = data.feed.entry[i].link[linkIdx].href.substr( data.feed.entry[i].link[linkIdx].href.length - 3, 3);
+          var json_path = "/feeds/list/" + this.key + "/" + sheet_id + "/public/values?alt="
           if (inNodeJS || supportsCORS) {
             json_path += 'json';
           } else {
             json_path += 'json-in-script';
           }
+          if(this.query) {
+            json_path += "&sq=" + this.query;
+          }
           if(this.orderby) {
             json_path += "&orderby=column:" + this.orderby.toLowerCase();
           }
@@ -468,4 +471,4 @@
     global.Tabletop = Tabletop;
   }
 
-})(this);
+})(this);