update tabletop
This commit is contained in:
parent
ceff5429ff
commit
a78b4f9213
@ -4,7 +4,7 @@
|
|||||||
<script type="text/javascript" src="js/ICanHaz.js"></script>
|
<script type="text/javascript" src="js/ICanHaz.js"></script>
|
||||||
<script type="text/javascript" src='http://api.tiles.mapbox.com/mapbox.js/v1.4.0/mapbox.js'></script>
|
<script type="text/javascript" src='http://api.tiles.mapbox.com/mapbox.js/v1.4.0/mapbox.js'></script>
|
||||||
<script type="text/javascript" src='js/jquery.js '></script>
|
<script type="text/javascript" src='js/jquery.js '></script>
|
||||||
<script type="text/javascript" src='js/tabletop.js'></script>
|
<script type="text/javascript" src='js/tabletop1.3.4.js'></script>
|
||||||
<script type="text/javascript" src='js/sheetsee.js'></script>
|
<script type="text/javascript" src='js/sheetsee.js'></script>
|
||||||
<script type="text/javascript" src='js/leaflet.markercluster.js'></script>
|
<script type="text/javascript" src='js/leaflet.markercluster.js'></script>
|
||||||
<link rel="shortcut icon" href="https://raw.github.com/jlord/hack-spots/master/favico.png"/>
|
<link rel="shortcut icon" href="https://raw.github.com/jlord/hack-spots/master/favico.png"/>
|
||||||
@ -129,8 +129,8 @@
|
|||||||
|
|
||||||
// so long, so messy
|
// so long, so messy
|
||||||
|
|
||||||
function showInfo(data) {
|
function showInfo(gData) {
|
||||||
gData = data
|
gData
|
||||||
// make the table, and the search bar
|
// make the table, and the search bar
|
||||||
Sheetsee.makeTable(gData, "#hackSpotsTable")
|
Sheetsee.makeTable(gData, "#hackSpotsTable")
|
||||||
Sheetsee.initiateTableFilter(gData, "#tableFilter", "#hackSpotsTable")
|
Sheetsee.initiateTableFilter(gData, "#tableFilter", "#hackSpotsTable")
|
||||||
@ -187,6 +187,7 @@
|
|||||||
var geoJSONnoHL = Sheetsee.createGeoJSON(gData, optionsJSON)
|
var geoJSONnoHL = Sheetsee.createGeoJSON(gData, optionsJSON)
|
||||||
// change the color of the most recently added spot's marker
|
// change the color of the most recently added spot's marker
|
||||||
var geoJSON = highlightLastMarker(geoJSONnoHL, "#FF4646")
|
var geoJSON = highlightLastMarker(geoJSONnoHL, "#FF4646")
|
||||||
|
|
||||||
// create map, tilelayer (map background), markers and popups
|
// create map, tilelayer (map background), markers and popups
|
||||||
var map = Sheetsee.loadMap("map")
|
var map = Sheetsee.loadMap("map")
|
||||||
Sheetsee.addTileLayer(map, 'examples.map-20v6611k')
|
Sheetsee.addTileLayer(map, 'examples.map-20v6611k')
|
||||||
|
@ -309,7 +309,7 @@
|
|||||||
// Only pull in desired sheets to reduce loading
|
// Only pull in desired sheets to reduce loading
|
||||||
if( this.isWanted(data.feed.entry[i].content.$t) ) {
|
if( this.isWanted(data.feed.entry[i].content.$t) ) {
|
||||||
var linkIdx = data.feed.entry[i].link.length-1;
|
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 sheet_id = data.feed.entry[i].link[linkIdx].href.split('/').pop();
|
||||||
var json_path = "/feeds/list/" + this.key + "/" + sheet_id + "/public/values?alt="
|
var json_path = "/feeds/list/" + this.key + "/" + sheet_id + "/public/values?alt="
|
||||||
if (inNodeJS || supportsCORS) {
|
if (inNodeJS || supportsCORS) {
|
||||||
json_path += 'json';
|
json_path += 'json';
|
Loading…
Reference in New Issue
Block a user