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

Added dailymotion video support thanks to @salvadordiaz 

Had problems merging because of some other work in progress that was
not committed yet. This effectively merges
131994bd6b
pull/79/head
Zach Wise 13 years ago
parent
8fa7835a34
commit
5368204fc5
15 changed files with 90 additions and 110 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. 4
      locale/de.js
  2. 4
      locale/en.js
  3. 4
      locale/es.js
  4. 4
      locale/fr.js
  5. 4
      locale/is.js
  6. 4
      locale/it.js
  7. 4
      locale/kr.js
  8. 4
      locale/nl.js
  9. 4
      locale/pt-br.js
  10. 4
      locale/zh-ch.js
  11. 4
      locale/zh-tw.js
  12. 6
      source/js/VMM.MediaElement.js
  13. 70
      source/js/VMM.MediaType.js
  14. 4
      timeline-min.js
  15. 76
      timeline.js

4
locale/de.js
View File

File diff suppressed because one or more lines are too long

4
locale/en.js
View File

File diff suppressed because one or more lines are too long

4
locale/es.js
View File

File diff suppressed because one or more lines are too long

4
locale/fr.js
View File

File diff suppressed because one or more lines are too long

4
locale/is.js
View File

File diff suppressed because one or more lines are too long

4
locale/it.js
View File

File diff suppressed because one or more lines are too long

4
locale/kr.js
View File

File diff suppressed because one or more lines are too long

4
locale/nl.js
View File

File diff suppressed because one or more lines are too long

4
locale/pt-br.js
View File

File diff suppressed because one or more lines are too long

4
locale/zh-ch.js
View File

File diff suppressed because one or more lines are too long

4
locale/zh-tw.js
View File

File diff suppressed because one or more lines are too long

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

@ -33,6 +33,9 @@ if(typeof VMM != 'undefined' && typeof VMM.MediaElement == 'undefined') {
} else if (m.type == "vimeo") { } else if (m.type == "vimeo") {
mediaElem = "<div class='thumbnail vimeo'></div>"; mediaElem = "<div class='thumbnail vimeo'></div>";
return mediaElem; return mediaElem;
} else if (m.type == "dailymotion") {
mediaElem = "<div class='thumbnail dailymotion'></div>";
return mediaElem;
} else if (m.type == "twitter"){ } else if (m.type == "twitter"){
mediaElem = "<div class='thumbnail twitter'></div>"; mediaElem = "<div class='thumbnail twitter'></div>";
return mediaElem; return mediaElem;
@ -99,6 +102,9 @@ if(typeof VMM != 'undefined' && typeof VMM.MediaElement == 'undefined') {
// VIMEO // VIMEO
} else if (m.type == "vimeo") { } else if (m.type == "vimeo") {
mediaElem = "<iframe class='media-frame video vimeo' autostart='false' frameborder='0' width='100%' height='100%' src='http://player.vimeo.com/video/" + m.id + "?title=0&amp;byline=0&amp;portrait=0&amp;color=ffffff'></iframe>"; mediaElem = "<iframe class='media-frame video vimeo' autostart='false' frameborder='0' width='100%' height='100%' src='http://player.vimeo.com/video/" + m.id + "?title=0&amp;byline=0&amp;portrait=0&amp;color=ffffff'></iframe>";
// DAILYMOTION
} else if (m.type == "dailymotion") {
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'>Loading Tweet</span></div>";

70
source/js/VMM.MediaType.js
Unescape View File

@ -8,82 +8,66 @@ if(typeof VMM != 'undefined' && typeof VMM.MediaType == 'undefined') {
VMM.MediaType = function(d) { VMM.MediaType = function(d) {
var success = false; var success = false;
var media = {}; var media = {};
if (d.match("div class='twitter'")) { if (d.match("div class='twitter'")) {
media.type = "twitter-ready"; media.type = "twitter-ready";
media.id = d; media.id = d;
success = true; success = true;
} else if (d.match('(www.)?youtube|youtu\.be')) { } else if (d.match('(www.)?youtube|youtu\.be')) {
if (d.match('v=')) { if (d.match('v=')) {
youtube_id = VMM.Util.getUrlVars(d)["v"]; media.id = VMM.Util.getUrlVars(d)["v"];
//youtube_id = d.split(/embed\//)[1].split('"')[0];
} else { } else {
youtube_id = d.split(/v\/|v=|youtu\.be\//)[1].split(/[?&]/)[0]; media.id = d.split(/v\/|v=|youtu\.be\//)[1].split(/[?&]/)[0];
} }
//youtube_id = d.split(/v\/|v=|youtu\.be\//)[1].split(/[?&]/)[0]; media.type = "youtube";
// http://www.youtube.com/watch?feature=player_embedded&v=0l-ivcnLrSc
//http://www.youtube.com/watch?v=0l-ivcnLrSc
media.type = "youtube";
media.id = youtube_id;
success = true; success = true;
} else if (d.match('(player.)?vimeo\.com')) { } else if (d.match('(player.)?vimeo\.com')) {
//vimeo_id = d.split(/video\/|http:\/\/vimeo\.com\//)[1].split(/[?&]/)[0]; media.type = "vimeo";
vimeo_id = d.split(/video\/|\/\/vimeo\.com\//)[1].split(/[?&]/)[0]; media.id = d.split(/video\/|\/\/vimeo\.com\//)[1].split(/[?&]/)[0];;
media.type = "vimeo";
media.id = vimeo_id;
success = true; success = true;
} else if (d.match('(www.)?dailymotion\.com')) {
media.id = d.split(/video\/|\/\/dailymotion\.com\//)[1];
media.type = "dailymotion";
success = true;
} else if (d.match('(player.)?soundcloud\.com')) { } else if (d.match('(player.)?soundcloud\.com')) {
//soundcloud_url = unescape(d.split(/value="/)[1].split(/["]/)[0]); media.type = "soundcloud";
//soundcloud_id = soundcloud_url.split(/tracks\//)[1].split(/[&"]/)[0]; media.id = d;
media.type = "soundcloud";
media.id = d;
success = true; success = true;
} else if (d.match('(www.)?twitter\.com')) { } else if (d.match('(www.)?twitter\.com')) {
trace("TWITTER MATCH");
// https://twitter.com/#!/twitterapi/statuses/133640144317198338
// https://twitter.com/#!/DeliciousHot/status/23189589820702720
if (d.match("status\/")) { if (d.match("status\/")) {
twitter_id = d.split("status\/")[1]; media.id = d.split("status\/")[1];
} else if (d.match("statuses\/")) { } else if (d.match("statuses\/")) {
twitter_id = d.split("statuses\/")[1]; media.id = d.split("statuses\/")[1];
} else { } else {
twitter_id = ""; media.id = "";
} }
media.type = "twitter"; media.type = "twitter";
media.id = twitter_id;
success = true; success = true;
} else if (d.match("maps.google") && !d.match("staticmap")) { } else if (d.match("maps.google") && !d.match("staticmap")) {
//maps.google.com media.type = "google-map";
media.type = "google-map"; media.id = d.split(/src=['|"][^'|"]*?['|"]/gi);
media.id = d.split(/src=['|"][^'|"]*?['|"]/gi);
//trace("google map " + media.id);
success = true; success = true;
} else if (d.match("flickr.com/photos")) { } else if (d.match("flickr.com/photos")) {
media.type = "flickr"; media.type = "flickr";
//media.id = d.split('/photos/[^/]+/([0-9]+)/gi');
media.id = d.split("photos\/")[1].split("/")[1]; media.id = d.split("photos\/")[1].split("/")[1];
media.link = d; media.link = d;
//media.id = media.id.split("/")[1];
//trace("FLICKR " + media.id);
success = true; success = true;
} else if (d.match(/jpg|jpeg|png|gif/i) || d.match("staticmap")) { } else if (d.match(/jpg|jpeg|png|gif/i) || d.match("staticmap")) {
media.type = "image"; media.type = "image";
media.id = d; media.id = d;
success = true; success = true;
} else if (VMM.FileExtention.googleDocType(d)) { } else if (VMM.FileExtention.googleDocType(d)) {
media.type = "googledoc"; media.type = "googledoc";
media.id = d; media.id = d;
success = true; success = true;
} else if (d.indexOf('http://') == 0) { } else if (d.indexOf('http://') == 0) {
media.type = "website"; media.type = "website";
media.id = d; media.id = d;
success = true; success = true;
} else { } else {
trace("unknown media"); trace("unknown media");
media.type = "unknown"; media.type = "unknown";
media.id = d; media.id = d;
success = true; success = true;
} }

4
timeline-min.js vendored
View File

File diff suppressed because one or more lines are too long

76
timeline.js
Unescape View File

@ -1756,6 +1756,9 @@ if(typeof VMM != 'undefined' && typeof VMM.MediaElement == 'undefined') {
} else if (m.type == "vimeo") { } else if (m.type == "vimeo") {
mediaElem = "<div class='thumbnail vimeo'></div>"; mediaElem = "<div class='thumbnail vimeo'></div>";
return mediaElem; return mediaElem;
} else if (m.type == "dailymotion") {
mediaElem = "<div class='thumbnail dailymotion'></div>";
return mediaElem;
} else if (m.type == "twitter"){ } else if (m.type == "twitter"){
mediaElem = "<div class='thumbnail twitter'></div>"; mediaElem = "<div class='thumbnail twitter'></div>";
return mediaElem; return mediaElem;
@ -1822,6 +1825,9 @@ if(typeof VMM != 'undefined' && typeof VMM.MediaElement == 'undefined') {
// VIMEO // VIMEO
} else if (m.type == "vimeo") { } else if (m.type == "vimeo") {
mediaElem = "<iframe class='media-frame video vimeo' autostart='false' frameborder='0' width='100%' height='100%' src='http://player.vimeo.com/video/" + m.id + "?title=0&amp;byline=0&amp;portrait=0&amp;color=ffffff'></iframe>"; mediaElem = "<iframe class='media-frame video vimeo' autostart='false' frameborder='0' width='100%' height='100%' src='http://player.vimeo.com/video/" + m.id + "?title=0&amp;byline=0&amp;portrait=0&amp;color=ffffff'></iframe>";
// DAILYMOTION
} else if (m.type == "dailymotion") {
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'>Loading Tweet</span></div>";
@ -1897,82 +1903,66 @@ if(typeof VMM != 'undefined' && typeof VMM.MediaType == 'undefined') {
VMM.MediaType = function(d) { VMM.MediaType = function(d) {
var success = false; var success = false;
var media = {}; var media = {};
if (d.match("div class='twitter'")) { if (d.match("div class='twitter'")) {
media.type = "twitter-ready"; media.type = "twitter-ready";
media.id = d; media.id = d;
success = true; success = true;
} else if (d.match('(www.)?youtube|youtu\.be')) { } else if (d.match('(www.)?youtube|youtu\.be')) {
if (d.match('v=')) { if (d.match('v=')) {
youtube_id = VMM.Util.getUrlVars(d)["v"]; media.id = VMM.Util.getUrlVars(d)["v"];
//youtube_id = d.split(/embed\//)[1].split('"')[0];
} else { } else {
youtube_id = d.split(/v\/|v=|youtu\.be\//)[1].split(/[?&]/)[0]; media.id = d.split(/v\/|v=|youtu\.be\//)[1].split(/[?&]/)[0];
} }
//youtube_id = d.split(/v\/|v=|youtu\.be\//)[1].split(/[?&]/)[0]; media.type = "youtube";
// http://www.youtube.com/watch?feature=player_embedded&v=0l-ivcnLrSc
//http://www.youtube.com/watch?v=0l-ivcnLrSc
media.type = "youtube";
media.id = youtube_id;
success = true; success = true;
} else if (d.match('(player.)?vimeo\.com')) { } else if (d.match('(player.)?vimeo\.com')) {
//vimeo_id = d.split(/video\/|http:\/\/vimeo\.com\//)[1].split(/[?&]/)[0]; media.type = "vimeo";
vimeo_id = d.split(/video\/|\/\/vimeo\.com\//)[1].split(/[?&]/)[0]; media.id = d.split(/video\/|\/\/vimeo\.com\//)[1].split(/[?&]/)[0];;
media.type = "vimeo";
media.id = vimeo_id;
success = true; success = true;
} else if (d.match('(www.)?dailymotion\.com')) {
media.id = d.split(/video\/|\/\/dailymotion\.com\//)[1];
media.type = "dailymotion";
success = true;
} else if (d.match('(player.)?soundcloud\.com')) { } else if (d.match('(player.)?soundcloud\.com')) {
//soundcloud_url = unescape(d.split(/value="/)[1].split(/["]/)[0]); media.type = "soundcloud";
//soundcloud_id = soundcloud_url.split(/tracks\//)[1].split(/[&"]/)[0]; media.id = d;
media.type = "soundcloud";
media.id = d;
success = true; success = true;
} else if (d.match('(www.)?twitter\.com')) { } else if (d.match('(www.)?twitter\.com')) {
trace("TWITTER MATCH");
// https://twitter.com/#!/twitterapi/statuses/133640144317198338
// https://twitter.com/#!/DeliciousHot/status/23189589820702720
if (d.match("status\/")) { if (d.match("status\/")) {
twitter_id = d.split("status\/")[1]; media.id = d.split("status\/")[1];
} else if (d.match("statuses\/")) { } else if (d.match("statuses\/")) {
twitter_id = d.split("statuses\/")[1]; media.id = d.split("statuses\/")[1];
} else { } else {
twitter_id = ""; media.id = "";
} }
media.type = "twitter"; media.type = "twitter";
media.id = twitter_id;
success = true; success = true;
} else if (d.match("maps.google") && !d.match("staticmap")) { } else if (d.match("maps.google") && !d.match("staticmap")) {
//maps.google.com media.type = "google-map";
media.type = "google-map"; media.id = d.split(/src=['|"][^'|"]*?['|"]/gi);
media.id = d.split(/src=['|"][^'|"]*?['|"]/gi);
//trace("google map " + media.id);
success = true; success = true;
} else if (d.match("flickr.com/photos")) { } else if (d.match("flickr.com/photos")) {
media.type = "flickr"; media.type = "flickr";
//media.id = d.split('/photos/[^/]+/([0-9]+)/gi');
media.id = d.split("photos\/")[1].split("/")[1]; media.id = d.split("photos\/")[1].split("/")[1];
media.link = d; media.link = d;
//media.id = media.id.split("/")[1];
//trace("FLICKR " + media.id);
success = true; success = true;
} else if (d.match(/jpg|jpeg|png|gif/i) || d.match("staticmap")) { } else if (d.match(/jpg|jpeg|png|gif/i) || d.match("staticmap")) {
media.type = "image"; media.type = "image";
media.id = d; media.id = d;
success = true; success = true;
} else if (VMM.FileExtention.googleDocType(d)) { } else if (VMM.FileExtention.googleDocType(d)) {
media.type = "googledoc"; media.type = "googledoc";
media.id = d; media.id = d;
success = true; success = true;
} else if (d.indexOf('http://') == 0) { } else if (d.indexOf('http://') == 0) {
media.type = "website"; media.type = "website";
media.id = d; media.id = d;
success = true; success = true;
} else { } else {
trace("unknown media"); trace("unknown media");
media.type = "unknown"; media.type = "unknown";
media.id = d; media.id = d;
success = true; success = true;
} }

Write Preview
Loading…
Cancel
Save