From 24904bd10111cac04d366e33064045d9b4add544 Mon Sep 17 00:00:00 2001 From: Zach Wise Date: Tue, 12 Feb 2013 13:02:58 -0600 Subject: [PATCH] Added ability to specify worksheet in Google Spreadsheet source url via @motin --- codekit-config.json | 15 +++++++++++++-- compiled/js/timeline-min.js | 2 +- compiled/js/timeline.js | 7 +++++-- source/js/VMM.Timeline.DataObj.js | 7 +++++-- 4 files changed, 24 insertions(+), 7 deletions(-) diff --git a/codekit-config.json b/codekit-config.json index 7b30214..25c3fde 100644 --- a/codekit-config.json +++ b/codekit-config.json @@ -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" : { diff --git a/compiled/js/timeline-min.js b/compiled/js/timeline-min.js index de7d791..58557bf 100644 --- a/compiled/js/timeline-min.js +++ b/compiled/js/timeline-min.js @@ -33,4 +33,4 @@ :"h:MM TT",time_no_seconds_small_date:"h:MM TT'
'mmmm d',' yyyy''",full_long:"mmm d',' yyyy 'at' h:MM TT",full_long_small_date:"h:MM TT'
mmm d',' yyyy''"},messages:{loading_timeline:"Loading Timeline... ",return_to_title:"Return to Title",expand_timeline:"Expand Timeline",contract_timeline:"Contract Timeline",wikipedia:"From Wikipedia, the free encyclopedia",loading_content:"Loading Content",loading:"Loading"}});typeof VMM!="undefined"&&typeof VMM.ExternalAPI=="undefined"&&(VMM.ExternalAPI={keys:{google:"",flickr:"",twitter:""},keys_master:{vp:"Pellentesque nibh felis, eleifend id, commodo in, interdum vitae, leo",flickr:"RAIvxHY4hE/Elm5cieh4X5ptMyDpj7MYIxziGxi0WGCcy1s+yr7rKQ==",google:"jwNGnYw4hE9lmAez4ll0QD+jo6SKBJFknkopLS4FrSAuGfIwyj57AusuR0s8dAo=",twitter:""},init:function(){return this},setKeys:function(e){VMM.ExternalAPI.keys=e},pushQues:function(){VMM.master_config.googlemaps.active&&VMM.ExternalAPI.googlemaps.pushQue();VMM.master_config.youtube.active&&VMM.ExternalAPI.youtube.pushQue();VMM.master_config.soundcloud.active&&VMM.ExternalAPI.soundcloud.pushQue();VMM.master_config.googledocs.active&&VMM.ExternalAPI.googledocs.pushQue();VMM.master_config.googleplus.active&&VMM.ExternalAPI.googleplus.pushQue();VMM.master_config.wikipedia.active&&VMM.ExternalAPI.wikipedia.pushQue();VMM.master_config.vimeo.active&&VMM.ExternalAPI.vimeo.pushQue();VMM.master_config.twitter.active&&VMM.ExternalAPI.twitter.pushQue();VMM.master_config.flickr.active&&VMM.ExternalAPI.flickr.pushQue();VMM.master_config.webthumb.active&&VMM.ExternalAPI.webthumb.pushQue()},twitter:{tweetArray:[],get:function(e){var t={mid:e.id,id:e.uid};VMM.master_config.twitter.que.push(t);VMM.master_config.twitter.active=!0},create:function(e,t){var n=e.mid.toString(),r={twitterid:e.mid},i="http://api.twitter.com/1/statuses/show.json?id="+e.mid+"&include_entities=true&callback=?",s=setTimeout(VMM.ExternalAPI.twitter.errorTimeOut,VMM.master_config.timers.api,e),o=setTimeout(t,VMM.master_config.timers.api,e);VMM.getJSON(i,function(t){var n=t.id_str,r="

",i=VMM.Util.linkify_with_twitter(t.text,"_blank");r+=i;r+="

";typeof t.entities.media!="undefined"&&t.entities.media[0].type=="photo";r+="
";r+="";r+="";r+=""+t.user.name+"";r+="@"+t.user.screen_name+"";r+="";r+="
";VMM.attachElement("#"+e.id.toString(),r);VMM.attachElement("#text_thumb_"+e.id.toString(),t.text);VMM.attachElement("#marker_content_"+e.id.toString(),t.text)}).error(function(t,n,r){trace("TWITTER error");trace("TWITTER ERROR: "+n+" "+t.responseText);VMM.attachElement("#"+e.id,VMM.MediaElement.loadingmessage("ERROR LOADING TWEET "+e.mid))}).success(function(e){clearTimeout(s);clearTimeout(o);t()})},errorTimeOut:function(e){trace("TWITTER JSON ERROR TIMEOUT "+e.mid);VMM.attachElement("#"+e.id.toString(),VMM.MediaElement.loadingmessage("Still waiting on Twitter: "+e.mid));VMM.getJSON("http://api.twitter.com/1/account/rate_limit_status.json",function(t){trace("REMAINING TWITTER API CALLS "+t.remaining_hits);trace("TWITTER RATE LIMIT WILL RESET AT "+t.reset_time);var n="";if(t.remaining_hits==0){n="

You've reached the maximum number of tweets you can load in an hour.

";n+="

You can view tweets again starting at:
"+t.reset_time+"

"}else n="

Still waiting on Twitter. "+e.mid+"

";VMM.attachElement("#"+e.id.toString(),VMM.MediaElement.loadingmessage(n))})},pushQue:function(){if(VMM.master_config.twitter.que.length>0){VMM.ExternalAPI.twitter.create(VMM.master_config.twitter.que[0],VMM.ExternalAPI.twitter.pushQue);VMM.master_config.twitter.que.remove(0)}},getHTML:function(e){var t="http://api.twitter.com/1/statuses/oembed.json?id="+e+"&callback=?";VMM.getJSON(t,VMM.ExternalAPI.twitter.onJSONLoaded)},onJSONLoaded:function(e){trace("TWITTER JSON LOADED");var t=e.id;VMM.attachElement("#"+t,VMM.Util.linkify_with_twitter(e.html))},parseTwitterDate:function(e){var t=new Date(Date.parse(e));return t},prettyParseTwitterDate:function(e){var t=new Date(Date.parse(e));return VMM.Date.prettyDate(t,!0)},getTweets:function(e){var t=[],n=e.length;for(var r=0;r

",s=VMM.Util.linkify_with_twitter(e.text,"_blank");i+=s;i+="

";i+="— "+e.user.name+" (@"+e.user.screen_name+") "+VMM.ExternalAPI.twitter.prettyParseTwitterDate(e.created_at)+"
";r.content=i;r.raw=e;t.push(r);if(t.length==n){var o={tweetdata:t};VMM.fireEvent(global,"TWEETSLOADED",o)}}).success(function(){trace("second success")}).error(function(){trace("error")}).complete(function(){trace("complete")})}},getTweetSearch:function(e,t){var n=40;t!=null&&t!=""&&(n=t);var r="http://search.twitter.com/search.json?q="+e+"&rpp="+n+"&include_entities=true&result_type=mixed",i=[];VMM.getJSON(r,function(e){for(var t=0;t