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

Fix for some YouTube URL constructs breaking

pull/23/merge
Zach Wise 13 years ago
parent
2c23477905
commit
b0dd0ccee3
13 changed files with 21 additions and 15 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. 2
      locale/de.js
  2. 2
      locale/en.js
  3. 2
      locale/es.js
  4. 2
      locale/fr.js
  5. 2
      locale/it.js
  6. 2
      locale/kr.js
  7. 2
      locale/nl.js
  8. 2
      locale/pt-br.js
  9. 2
      locale/zh-ch.js
  10. 2
      locale/zh-tw.js
  11. 7
      source/js/VMM.js
  12. 2
      timeline-min.js
  13. 7
      timeline.js

2
locale/de.js
View File

File diff suppressed because one or more lines are too long

2
locale/en.js
View File

File diff suppressed because one or more lines are too long

2
locale/es.js
View File

File diff suppressed because one or more lines are too long

2
locale/fr.js
View File

File diff suppressed because one or more lines are too long

2
locale/it.js
View File

File diff suppressed because one or more lines are too long

2
locale/kr.js
View File

File diff suppressed because one or more lines are too long

2
locale/nl.js
View File

File diff suppressed because one or more lines are too long

2
locale/pt-br.js
View File

File diff suppressed because one or more lines are too long

2
locale/zh-ch.js
View File

File diff suppressed because one or more lines are too long

2
locale/zh-tw.js
View File

File diff suppressed because one or more lines are too long

7
source/js/VMM.js
Unescape View File

@ -1403,12 +1403,15 @@ if (typeof VMM == 'undefined') {
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('embed')) { if (d.match('v=')) {
youtube_id = d.split(/embed\//)[1].split('"')[0]; youtube_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]; youtube_id = d.split(/v\/|v=|youtu\.be\//)[1].split(/[?&]/)[0];
} }
//youtube_id = d.split(/v\/|v=|youtu\.be\//)[1].split(/[?&]/)[0]; //youtube_id = d.split(/v\/|v=|youtu\.be\//)[1].split(/[?&]/)[0];
// http://www.youtube.com/watch?feature=player_embedded&v=0l-ivcnLrSc
//http://www.youtube.com/watch?v=0l-ivcnLrSc
media.type = "youtube"; media.type = "youtube";
media.id = youtube_id; media.id = youtube_id;
success = true; success = true;

2
timeline-min.js vendored
View File

File diff suppressed because one or more lines are too long

7
timeline.js
Unescape View File

@ -1403,12 +1403,15 @@ if (typeof VMM == 'undefined') {
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('embed')) { if (d.match('v=')) {
youtube_id = d.split(/embed\//)[1].split('"')[0]; youtube_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]; youtube_id = d.split(/v\/|v=|youtu\.be\//)[1].split(/[?&]/)[0];
} }
//youtube_id = d.split(/v\/|v=|youtu\.be\//)[1].split(/[?&]/)[0]; //youtube_id = d.split(/v\/|v=|youtu\.be\//)[1].split(/[?&]/)[0];
// http://www.youtube.com/watch?feature=player_embedded&v=0l-ivcnLrSc
//http://www.youtube.com/watch?v=0l-ivcnLrSc
media.type = "youtube"; media.type = "youtube";
media.id = youtube_id; media.id = youtube_id;
success = true; success = true;

Write Preview
Loading…
Cancel
Save