Browse Source

fix a bug when import iframe-code from player.vimeo.com

pull/605/head
PiasyXu 11 years ago
parent
commit
a9e017a216
  1. 27
      build/js/timeline.js

27
build/js/timeline.js

@ -4651,7 +4651,22 @@ if(typeof VMM != 'undefined' && typeof VMM.MediaType == 'undefined') {
media.hd = VMM.Util.getUrlVars(d)["hd"]; media.hd = VMM.Util.getUrlVars(d)["hd"];
media.type = "youtube"; media.type = "youtube";
success = true; success = true;
} else if (d.match('(player.)?vimeo\.com')) { } else if (d.match('iframe')) {
media.type = "iframe";
trace("IFRAME")
regex = /src=['"](\S+?)['"]\s/;
group = d.match(regex);
if (group) {
media.id = group[1];
}
trace( "iframe url: " + media.id );
success = Boolean(media.id);
}
//Due to vimeo website need login to play the video, it not very convenient.
//But use the iframe of player.vimeo.com site will go into
//this if-clause first, so just move the iframe-if-clause before the vimeo-if-clause will
//be OK.
else if (d.match('(player.)?vimeo\.com')) {
media.type = "vimeo"; media.type = "vimeo";
media.id = d.split(/video\/|\/\/vimeo\.com\//)[1].split(/[?&]/)[0];; media.id = d.split(/video\/|\/\/vimeo\.com\//)[1].split(/[?&]/)[0];;
success = true; success = true;
@ -4735,16 +4750,6 @@ if(typeof VMM != 'undefined' && typeof VMM.MediaType == 'undefined') {
media.type = "quote"; media.type = "quote";
media.id = d; media.id = d;
success = true; success = true;
} else if (d.match('iframe')) {
media.type = "iframe";
trace("IFRAME")
regex = /src=['"](\S+?)['"]\s/;
group = d.match(regex);
if (group) {
media.id = group[1];
}
trace( "iframe url: " + media.id );
success = Boolean(media.id);
} else { } else {
trace("unknown media"); trace("unknown media");
media.type = "unknown"; media.type = "unknown";

Loading…
Cancel
Save