playground
/
TimelineJS
mirror of https://github.com/NUKnightLab/TimelineJS.git
1
0
Fork 0
Code Issues Releases Activity
Browse Source

Added ability to specify worksheet in Google Spreadsheet source url via @motin

pull/290/merge
Zach Wise 12 years ago
parent
6a8771fdbb
commit
24904bd101
4 changed files with 24 additions and 7 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 15
      codekit-config.json
  2. 2
      compiled/js/timeline-min.js
  3. 7
      compiled/js/timeline.js
  4. 7
      source/js/VMM.Timeline.DataObj.js

15
codekit-config.json
Unescape View File

@ -143,6 +143,17 @@
"outputAbbreviatedPath" : "No Output Path",
"fileType" : 2048
},
"\/compiled\/js\/locale\/eu.js" : {
"ignoreWasSetByUser" : 0,
"ignore" : 1,
"hidden" : 0,
"outputPathIsSetByUser" : 0,
"inputAbbreviatedPath" : "\/compiled\/js\/locale\/eu.js",
"outputStyle" : 1,
"syntaxCheckerStyle" : 0,
"outputAbbreviatedPath" : "\/compiled\/js\/locale\/eu-min.js",
"fileType" : 64
},
"\/source\/less\/Core\/Font\/Pacifico-Arimo.less" : {
"ignoreWasSetByUser" : 0,
"ignore" : 0,
@ -645,11 +656,11 @@
"ignoreWasSetByUser" : 0,
"ignore" : 0,
"hidden" : 0,
"outputPathIsSetByUser" : 0,
"outputPathIsSetByUser" : 1,
"inputAbbreviatedPath" : "\/source\/js\/Core\/Language\/locale\/eu.js",
"outputStyle" : 1,
"syntaxCheckerStyle" : 0,
"outputAbbreviatedPath" : "\/source\/js\/Core\/Language\/locale\/eu-min.js",
"outputAbbreviatedPath" : "\/compiled\/js\/locale\/eu.js",
"fileType" : 64
},
"\/source\/js\/Core\/Language\/locale\/tr.js" : {

2
compiled/js/timeline-min.js vendored
View File

File diff suppressed because one or more lines are too long

7
compiled/js/timeline.js
Unescape View File

@ -9263,10 +9263,13 @@ if (typeof VMM.Timeline !== 'undefined' && typeof VMM.Timeline.DataObj == 'undef
googlespreadsheet: {
getData: function(raw) {
var getjsondata, key, url, timeout, tries = 0;
var getjsondata, key, worksheet, url, timeout, tries = 0;
key = VMM.Util.getUrlVars(raw)["key"];
url = "https://spreadsheets.google.com/feeds/list/" + key + "/od6/public/values?alt=json";
worksheet = VMM.Util.getUrlVars(raw)["worksheet"];
if (typeof worksheet == "undefined") worksheet = "od6";
url = "https://spreadsheets.google.com/feeds/list/" + key + "/" + worksheet + "/public/values?alt=json";
timeout = setTimeout(function() {
trace("Google Docs timeout " + url);

7
source/js/VMM.Timeline.DataObj.js
Unescape View File

@ -166,10 +166,13 @@ if (typeof VMM.Timeline !== 'undefined' && typeof VMM.Timeline.DataObj == 'undef
googlespreadsheet: {
getData: function(raw) {
var getjsondata, key, url, timeout, tries = 0;
var getjsondata, key, worksheet, url, timeout, tries = 0;
key = VMM.Util.getUrlVars(raw)["key"];
url = "https://spreadsheets.google.com/feeds/list/" + key + "/od6/public/values?alt=json";
worksheet = VMM.Util.getUrlVars(raw)["worksheet"];
if (typeof worksheet == "undefined") worksheet = "od6";
url = "https://spreadsheets.google.com/feeds/list/" + key + "/" + worksheet + "/public/values?alt=json";
timeout = setTimeout(function() {
trace("Google Docs timeout " + url);

Write Preview
Loading…
Cancel
Save