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

Rolled back attempt at dealing with google spreadsheets https issue closes #80

pull/90/head
Zach Wise 13 years ago
parent
eab9f039ae
commit
e6ae4346e5
16 changed files with 106 additions and 94 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 8
      locale/de.js
  2. 8
      locale/en.js
  3. 8
      locale/es.js
  4. 8
      locale/fr.js
  5. 8
      locale/is.js
  6. 8
      locale/it.js
  7. 8
      locale/kr.js
  8. 8
      locale/nl.js
  9. 8
      locale/pt-br.js
  10. 8
      locale/zh-ch.js
  11. 8
      locale/zh-tw.js
  12. 45
      source/js/VMM.MediaElement.js
  13. 2
      source/js/VMM.Timeline.DataObj.js
  14. 5
      source/js/VMM.Timeline.TimeNav.js
  15. 8
      timeline-min.js
  16. 52
      timeline.js

8
locale/de.js
View File

File diff suppressed because one or more lines are too long

8
locale/en.js
View File

File diff suppressed because one or more lines are too long

8
locale/es.js
View File

File diff suppressed because one or more lines are too long

8
locale/fr.js
View File

File diff suppressed because one or more lines are too long

8
locale/is.js
View File

File diff suppressed because one or more lines are too long

8
locale/it.js
View File

File diff suppressed because one or more lines are too long

8
locale/kr.js
View File

File diff suppressed because one or more lines are too long

8
locale/nl.js
View File

File diff suppressed because one or more lines are too long

8
locale/pt-br.js
View File

File diff suppressed because one or more lines are too long

8
locale/zh-ch.js
View File

File diff suppressed because one or more lines are too long

8
locale/zh-tw.js
View File

File diff suppressed because one or more lines are too long

45
source/js/VMM.MediaElement.js
Unescape View File

@ -9,8 +9,8 @@ if(typeof VMM != 'undefined' && typeof VMM.MediaElement == 'undefined') {
}, },
thumbnail: function(data, w, h) { thumbnail: function(data, w, h) {
_w = 32; _w = 16;
_h = 32; _h = 24;
if (w != null && w != "") {_w = w}; if (w != null && w != "") {_w = w};
if (h != null && h != "") {_h = h}; if (h != null && h != "") {_h = h};
@ -20,46 +20,49 @@ if(typeof VMM != 'undefined' && typeof VMM.MediaElement == 'undefined') {
var m = VMM.MediaType(data.media); //returns an object with .type and .id var m = VMM.MediaType(data.media); //returns an object with .type and .id
// CREATE MEDIA CODE // CREATE MEDIA CODE
if (m.type == "image") { if (m.type == "image") {
mediaElem = "<div class='thumbnail'><img src='" + m.id + "' width='" + _w + "px' height='" + _h + "px'></div>"; //mediaElem = "<div class='thumbnail thumb-photo'><img src='" + m.id + "' width='" + _w + "px' height='" + _h + "px'></div>";
mediaElem = "<div class='thumbnail thumb-photo'></div>";
return mediaElem; return mediaElem;
} else if (m.type == "flickr") { } else if (m.type == "flickr") {
mediaElem = "<div class='thumbnail'><img id='flickr_" + m.id + "_thumb' width='" + _w + "px' height='" + _h + "px'></div>"; //mediaElem = "<div class='thumbnail thumb-photo'><img id='flickr_" + m.id + "_thumb' width='" + _w + "px' height='" + _h + "px'></div>";
mediaElem = "<div class='thumbnail thumb-photo'></div>";
return mediaElem; return mediaElem;
} else if (m.type == "youtube") { } else if (m.type == "youtube") {
mediaElem = "<div class='thumbnail youtube'></div>"; mediaElem = "<div class='thumbnail thumb-youtube'></div>";
return mediaElem; return mediaElem;
} else if (m.type == "googledoc") { } else if (m.type == "googledoc") {
mediaElem = ""; mediaElem = "<div class='thumbnail thumb-document'></div>";
return mediaElem;
} else if (m.type == "vimeo") { } else if (m.type == "vimeo") {
mediaElem = "<div class='thumbnail vimeo'></div>"; mediaElem = "<div class='thumbnail thumb-vimeo'></div>";
return mediaElem; return mediaElem;
} else if (m.type == "dailymotion") { } else if (m.type == "dailymotion") {
mediaElem = "<div class='thumbnail dailymotion'></div>"; mediaElem = "<div class='thumbnail thumb-video'></div>";
return mediaElem; return mediaElem;
} else if (m.type == "twitter"){ } else if (m.type == "twitter"){
mediaElem = "<div class='thumbnail twitter'></div>"; mediaElem = "<div class='thumbnail thumb-twitter'></div>";
return mediaElem; return mediaElem;
} else if (m.type == "twitter-ready") { } else if (m.type == "twitter-ready") {
mediaElem = "<div class='thumbnail twitter'></div>"; mediaElem = "<div class='thumbnail thumb-twitter'></div>";
return mediaElem; return mediaElem;
} else if (m.type == "soundcloud") { } else if (m.type == "soundcloud") {
mediaElem = "<div class='thumbnail soundcloud'></div>"; mediaElem = "<div class='thumbnail thumb-audio'></div>";
return mediaElem; return mediaElem;
} else if (m.type == "google-map") { } else if (m.type == "google-map") {
mediaElem = "<div class='thumbnail map'></div>"; mediaElem = "<div class='thumbnail thumb-map'></div>";
return mediaElem; return mediaElem;
} else if (m.type == "unknown") { } else if (m.type == "unknown") {
mediaElem = ""; mediaElem = "<div class='thumbnail thumb-plaintext'></div>";
return mediaElem; return mediaElem;
} else if (m.type == "website") { } else if (m.type == "website") {
mediaElem = "<div class='thumbnail website'></div>"; mediaElem = "<div class='thumbnail thumb-website'></div>";
//mediaElem = "<div class='thumbnail'><img src='http://api.snapito.com/free/sc?url=" + m.id + "' width='" + _w + "px' height='" + _h + "px'></div>"; //mediaElem = "<div class='thumbnail'><img src='http://api.snapito.com/free/sc?url=" + m.id + "' width='" + _w + "px' height='" + _h + "px'></div>";
return mediaElem; return mediaElem;
} else { } else {
mediaElem = "<div class='thumbnail'></div>"; mediaElem = "<div class='thumbnail thumb-plaintext'></div>";
return mediaElem; return mediaElem;
} }
} }
}, },
create: function(data) { create: function(data) {
@ -93,11 +96,11 @@ if(typeof VMM != 'undefined' && typeof VMM.MediaElement == 'undefined') {
// GOOGLE DOCS // GOOGLE DOCS
} else if (m.type == "googledoc") { } else if (m.type == "googledoc") {
var googledocs_id = "googledoc_" + VMM.Util.unique_ID(5); var googledocs_id = "googledoc_" + VMM.Util.unique_ID(5);
mediaElem = "<div class='media-frame doc' id='" + googledocs_id + "'><span class='messege'>Loading Document</span></div>"; mediaElem = "<div class='media-frame doc' id='" + googledocs_id + "'><span class='messege'><p>Loading Document</p></span></div>";
VMM.ExternalAPI.googledocs.get(m.id, googledocs_id); VMM.ExternalAPI.googledocs.get(m.id, googledocs_id);
// YOUTUBE // YOUTUBE
} else if (m.type == "youtube") { } else if (m.type == "youtube") {
mediaElem = "<div class='media-frame video youtube' id='youtube_" + m.id + "'><span class='messege'>Loading YouTube video</span></div>"; mediaElem = "<div class='media-frame video youtube' id='youtube_" + m.id + "'><span class='messege'><p>Loading YouTube video</p></span></div>";
VMM.ExternalAPI.youtube.get(m.id); VMM.ExternalAPI.youtube.get(m.id);
// VIMEO // VIMEO
} else if (m.type == "vimeo") { } else if (m.type == "vimeo") {
@ -107,7 +110,7 @@ if(typeof VMM != 'undefined' && typeof VMM.MediaElement == 'undefined') {
mediaElem = "<iframe class='media-frame video dailymotion' autostart='false' frameborder='0' width='100%' height='100%' src='http://www.dailymotion.com/embed/video/" + m.id + "'></iframe>"; mediaElem = "<iframe class='media-frame video dailymotion' autostart='false' frameborder='0' width='100%' height='100%' src='http://www.dailymotion.com/embed/video/" + m.id + "'></iframe>";
// TWITTER // TWITTER
} else if (m.type == "twitter"){ } else if (m.type == "twitter"){
mediaElem = "<div class='twitter' id='" + "twitter_" + m.id + "'><span class='messege'>Loading Tweet</span></div>"; mediaElem = "<div class='twitter' id='" + "twitter_" + m.id + "'><span class='messege'><p>Loading Tweet</p></span></div>";
isTextMedia = true; isTextMedia = true;
VMM.ExternalAPI.twitter.prettyHTML(m.id); VMM.ExternalAPI.twitter.prettyHTML(m.id);
// TWITTER // TWITTER
@ -116,12 +119,12 @@ if(typeof VMM != 'undefined' && typeof VMM.MediaElement == 'undefined') {
// SOUNDCLOUD // SOUNDCLOUD
} else if (m.type == "soundcloud") { } else if (m.type == "soundcloud") {
var soundcloud_id = "soundcloud_" + VMM.Util.unique_ID(5); var soundcloud_id = "soundcloud_" + VMM.Util.unique_ID(5);
mediaElem = "<div class='media-frame soundcloud' id='" + soundcloud_id + "'><span class='messege'>Loading Sound</span></div>"; mediaElem = "<div class='media-frame soundcloud' id='" + soundcloud_id + "'><span class='messege'><p>Loading Sound</p></span></div>";
VMM.ExternalAPI.soundcloud.get(m.id, soundcloud_id); VMM.ExternalAPI.soundcloud.get(m.id, soundcloud_id);
// GOOGLE MAPS // GOOGLE MAPS
} else if (m.type == "google-map") { } else if (m.type == "google-map") {
var map_id = "googlemap_" + VMM.Util.unique_ID(7); var map_id = "googlemap_" + VMM.Util.unique_ID(7);
mediaElem = "<div class='media-frame map' id='" + map_id + "'><span class='messege'>Loading Map</span></div>"; mediaElem = "<div class='media-frame map' id='" + map_id + "'><span class='messege'><p>Loading Map</p></span></div>";
VMM.ExternalAPI.googlemaps.get(m.id, map_id); VMM.ExternalAPI.googlemaps.get(m.id, map_id);
// UNKNOWN // UNKNOWN
} else if (m.type == "unknown") { } else if (m.type == "unknown") {

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

@ -234,7 +234,7 @@ if(typeof VMM.Timeline != 'undefined' && typeof VMM.Timeline.DataObj == 'undefin
} }
var _key = VMM.Util.getUrlVars(raw_data)["key"]; var _key = VMM.Util.getUrlVars(raw_data)["key"];
var _url = prefix + "spreadsheets.google.com/feeds/list/" + _key + "/od6/public/values?alt=json"; var _url ="https://spreadsheets.google.com/feeds/list/" + _key + "/od6/public/values?alt=json";
VMM.getJSON(_url, VMM.Timeline.DataObj.model_GoogleSpreadsheet.buildData); VMM.getJSON(_url, VMM.Timeline.DataObj.model_GoogleSpreadsheet.buildData);
}, },

5
source/js/VMM.Timeline.TimeNav.js
Unescape View File

@ -1045,7 +1045,10 @@ if(typeof VMM.Timeline != 'undefined' && typeof VMM.Timeline.TimeNav == 'undefin
// THUMBNAIL // THUMBNAIL
if (data[i].asset != null && data[i].asset != "") { if (data[i].asset != null && data[i].asset != "") {
VMM.appendElement(_marker_content, VMM.MediaElement.thumbnail(data[i].asset, 32, 32)); VMM.appendElement(_marker_content, VMM.MediaElement.thumbnail(data[i].asset, 24, 24));
} else {
//VMM.appendElement(_marker_content, "<div class='thumbnail thumb-plaintext'></div>");
VMM.appendElement(_marker_content, "<div style='margin-right:7px;height:50px;width:2px;float:left;'></div>");
} }
// ADD DATE AND TITLE // ADD DATE AND TITLE

8
timeline-min.js vendored
View File

File diff suppressed because one or more lines are too long

52
timeline.js
Unescape View File

@ -1733,8 +1733,8 @@ if(typeof VMM != 'undefined' && typeof VMM.MediaElement == 'undefined') {
}, },
thumbnail: function(data, w, h) { thumbnail: function(data, w, h) {
_w = 32; _w = 16;
_h = 32; _h = 24;
if (w != null && w != "") {_w = w}; if (w != null && w != "") {_w = w};
if (h != null && h != "") {_h = h}; if (h != null && h != "") {_h = h};
@ -1744,46 +1744,49 @@ if(typeof VMM != 'undefined' && typeof VMM.MediaElement == 'undefined') {
var m = VMM.MediaType(data.media); //returns an object with .type and .id var m = VMM.MediaType(data.media); //returns an object with .type and .id
// CREATE MEDIA CODE // CREATE MEDIA CODE
if (m.type == "image") { if (m.type == "image") {
mediaElem = "<div class='thumbnail'><img src='" + m.id + "' width='" + _w + "px' height='" + _h + "px'></div>"; //mediaElem = "<div class='thumbnail thumb-photo'><img src='" + m.id + "' width='" + _w + "px' height='" + _h + "px'></div>";
mediaElem = "<div class='thumbnail thumb-photo'></div>";
return mediaElem; return mediaElem;
} else if (m.type == "flickr") { } else if (m.type == "flickr") {
mediaElem = "<div class='thumbnail'><img id='flickr_" + m.id + "_thumb' width='" + _w + "px' height='" + _h + "px'></div>"; //mediaElem = "<div class='thumbnail thumb-photo'><img id='flickr_" + m.id + "_thumb' width='" + _w + "px' height='" + _h + "px'></div>";
mediaElem = "<div class='thumbnail thumb-photo'></div>";
return mediaElem; return mediaElem;
} else if (m.type == "youtube") { } else if (m.type == "youtube") {
mediaElem = "<div class='thumbnail youtube'></div>"; mediaElem = "<div class='thumbnail thumb-youtube'></div>";
return mediaElem; return mediaElem;
} else if (m.type == "googledoc") { } else if (m.type == "googledoc") {
mediaElem = ""; mediaElem = "<div class='thumbnail thumb-document'></div>";
return mediaElem;
} else if (m.type == "vimeo") { } else if (m.type == "vimeo") {
mediaElem = "<div class='thumbnail vimeo'></div>"; mediaElem = "<div class='thumbnail thumb-vimeo'></div>";
return mediaElem; return mediaElem;
} else if (m.type == "dailymotion") { } else if (m.type == "dailymotion") {
mediaElem = "<div class='thumbnail dailymotion'></div>"; mediaElem = "<div class='thumbnail thumb-video'></div>";
return mediaElem; return mediaElem;
} else if (m.type == "twitter"){ } else if (m.type == "twitter"){
mediaElem = "<div class='thumbnail twitter'></div>"; mediaElem = "<div class='thumbnail thumb-twitter'></div>";
return mediaElem; return mediaElem;
} else if (m.type == "twitter-ready") { } else if (m.type == "twitter-ready") {
mediaElem = "<div class='thumbnail twitter'></div>"; mediaElem = "<div class='thumbnail thumb-twitter'></div>";
return mediaElem; return mediaElem;
} else if (m.type == "soundcloud") { } else if (m.type == "soundcloud") {
mediaElem = "<div class='thumbnail soundcloud'></div>"; mediaElem = "<div class='thumbnail thumb-audio'></div>";
return mediaElem; return mediaElem;
} else if (m.type == "google-map") { } else if (m.type == "google-map") {
mediaElem = "<div class='thumbnail map'></div>"; mediaElem = "<div class='thumbnail thumb-map'></div>";
return mediaElem; return mediaElem;
} else if (m.type == "unknown") { } else if (m.type == "unknown") {
mediaElem = ""; mediaElem = "<div class='thumbnail thumb-plaintext'></div>";
return mediaElem; return mediaElem;
} else if (m.type == "website") { } else if (m.type == "website") {
mediaElem = "<div class='thumbnail website'></div>"; mediaElem = "<div class='thumbnail thumb-website'></div>";
//mediaElem = "<div class='thumbnail'><img src='http://api.snapito.com/free/sc?url=" + m.id + "' width='" + _w + "px' height='" + _h + "px'></div>"; //mediaElem = "<div class='thumbnail'><img src='http://api.snapito.com/free/sc?url=" + m.id + "' width='" + _w + "px' height='" + _h + "px'></div>";
return mediaElem; return mediaElem;
} else { } else {
mediaElem = "<div class='thumbnail'></div>"; mediaElem = "<div class='thumbnail thumb-plaintext'></div>";
return mediaElem; return mediaElem;
} }
} }
}, },
create: function(data) { create: function(data) {
@ -1817,11 +1820,11 @@ if(typeof VMM != 'undefined' && typeof VMM.MediaElement == 'undefined') {
// GOOGLE DOCS // GOOGLE DOCS
} else if (m.type == "googledoc") { } else if (m.type == "googledoc") {
var googledocs_id = "googledoc_" + VMM.Util.unique_ID(5); var googledocs_id = "googledoc_" + VMM.Util.unique_ID(5);
mediaElem = "<div class='media-frame doc' id='" + googledocs_id + "'><span class='messege'>Loading Document</span></div>"; mediaElem = "<div class='media-frame doc' id='" + googledocs_id + "'><span class='messege'><p>Loading Document</p></span></div>";
VMM.ExternalAPI.googledocs.get(m.id, googledocs_id); VMM.ExternalAPI.googledocs.get(m.id, googledocs_id);
// YOUTUBE // YOUTUBE
} else if (m.type == "youtube") { } else if (m.type == "youtube") {
mediaElem = "<div class='media-frame video youtube' id='youtube_" + m.id + "'><span class='messege'>Loading YouTube video</span></div>"; mediaElem = "<div class='media-frame video youtube' id='youtube_" + m.id + "'><span class='messege'><p>Loading YouTube video</p></span></div>";
VMM.ExternalAPI.youtube.get(m.id); VMM.ExternalAPI.youtube.get(m.id);
// VIMEO // VIMEO
} else if (m.type == "vimeo") { } else if (m.type == "vimeo") {
@ -1831,7 +1834,7 @@ if(typeof VMM != 'undefined' && typeof VMM.MediaElement == 'undefined') {
mediaElem = "<iframe class='media-frame video dailymotion' autostart='false' frameborder='0' width='100%' height='100%' src='http://www.dailymotion.com/embed/video/" + m.id + "'></iframe>"; mediaElem = "<iframe class='media-frame video dailymotion' autostart='false' frameborder='0' width='100%' height='100%' src='http://www.dailymotion.com/embed/video/" + m.id + "'></iframe>";
// TWITTER // TWITTER
} else if (m.type == "twitter"){ } else if (m.type == "twitter"){
mediaElem = "<div class='twitter' id='" + "twitter_" + m.id + "'><span class='messege'>Loading Tweet</span></div>"; mediaElem = "<div class='twitter' id='" + "twitter_" + m.id + "'><span class='messege'><p>Loading Tweet</p></span></div>";
isTextMedia = true; isTextMedia = true;
VMM.ExternalAPI.twitter.prettyHTML(m.id); VMM.ExternalAPI.twitter.prettyHTML(m.id);
// TWITTER // TWITTER
@ -1840,12 +1843,12 @@ if(typeof VMM != 'undefined' && typeof VMM.MediaElement == 'undefined') {
// SOUNDCLOUD // SOUNDCLOUD
} else if (m.type == "soundcloud") { } else if (m.type == "soundcloud") {
var soundcloud_id = "soundcloud_" + VMM.Util.unique_ID(5); var soundcloud_id = "soundcloud_" + VMM.Util.unique_ID(5);
mediaElem = "<div class='media-frame soundcloud' id='" + soundcloud_id + "'><span class='messege'>Loading Sound</span></div>"; mediaElem = "<div class='media-frame soundcloud' id='" + soundcloud_id + "'><span class='messege'><p>Loading Sound</p></span></div>";
VMM.ExternalAPI.soundcloud.get(m.id, soundcloud_id); VMM.ExternalAPI.soundcloud.get(m.id, soundcloud_id);
// GOOGLE MAPS // GOOGLE MAPS
} else if (m.type == "google-map") { } else if (m.type == "google-map") {
var map_id = "googlemap_" + VMM.Util.unique_ID(7); var map_id = "googlemap_" + VMM.Util.unique_ID(7);
mediaElem = "<div class='media-frame map' id='" + map_id + "'><span class='messege'>Loading Map</span></div>"; mediaElem = "<div class='media-frame map' id='" + map_id + "'><span class='messege'><p>Loading Map</p></span></div>";
VMM.ExternalAPI.googlemaps.get(m.id, map_id); VMM.ExternalAPI.googlemaps.get(m.id, map_id);
// UNKNOWN // UNKNOWN
} else if (m.type == "unknown") { } else if (m.type == "unknown") {
@ -6552,7 +6555,10 @@ if(typeof VMM.Timeline != 'undefined' && typeof VMM.Timeline.TimeNav == 'undefin
// THUMBNAIL // THUMBNAIL
if (data[i].asset != null && data[i].asset != "") { if (data[i].asset != null && data[i].asset != "") {
VMM.appendElement(_marker_content, VMM.MediaElement.thumbnail(data[i].asset, 32, 32)); VMM.appendElement(_marker_content, VMM.MediaElement.thumbnail(data[i].asset, 24, 24));
} else {
//VMM.appendElement(_marker_content, "<div class='thumbnail thumb-plaintext'></div>");
VMM.appendElement(_marker_content, "<div style='margin-right:7px;height:50px;width:2px;float:left;'></div>");
} }
// ADD DATE AND TITLE // ADD DATE AND TITLE
@ -6851,7 +6857,7 @@ if(typeof VMM.Timeline != 'undefined' && typeof VMM.Timeline.DataObj == 'undefin
} }
var _key = VMM.Util.getUrlVars(raw_data)["key"]; var _key = VMM.Util.getUrlVars(raw_data)["key"];
var _url = prefix + "spreadsheets.google.com/feeds/list/" + _key + "/od6/public/values?alt=json"; var _url ="https://spreadsheets.google.com/feeds/list/" + _key + "/od6/public/values?alt=json";
VMM.getJSON(_url, VMM.Timeline.DataObj.model_GoogleSpreadsheet.buildData); VMM.getJSON(_url, VMM.Timeline.DataObj.model_GoogleSpreadsheet.buildData);
}, },

Write Preview
Loading…
Cancel
Save