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

Revert "let iframe of player[at]vimeo work properly" 

This reverts commit d5b50bffb0.

let iframe of player[at]vimeo work properly
pull/605/head
PiasyXu 11 years ago
parent
d5b50bffb0
commit
2da8258726
4 changed files with 19 additions and 52 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
      build/js/jquery.min.js
  2. 10
      build/js/timeline.js
  3. 35
      example_googlespreadsheet.html
  4. 22
      examples/example_googlespreadsheet.html

4
build/js/jquery.min.js vendored
View File

File diff suppressed because one or more lines are too long

10
build/js/timeline.js
Unescape View File

@ -4651,16 +4651,11 @@ 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')) {
//due to vimeo website need login to play the video,
//while use the iframe of player site will go into
//this if, so just comment it and let code go into
//the iframe if below.
/*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;
}*/ else if (d.match('(www.)?dailymotion\.com')) { } else if (d.match('(www.)?dailymotion\.com')) {
media.id = d.split(/video\/|\/\/dailymotion\.com\//)[1]; media.id = d.split(/video\/|\/\/dailymotion\.com\//)[1];
media.type = "dailymotion"; media.type = "dailymotion";
success = true; success = true;
@ -4741,7 +4736,6 @@ if(typeof VMM != 'undefined' && typeof VMM.MediaType == 'undefined') {
media.id = d; media.id = d;
success = true; success = true;
} else if (d.match('iframe')) { } else if (d.match('iframe')) {
//alert('yes!');
media.type = "iframe"; media.type = "iframe";
trace("IFRAME") trace("IFRAME")
regex = /src=['"](\S+?)['"]\s/; regex = /src=['"](\S+?)['"]\s/;

35
example_googlespreadsheet.html
Unescape View File

@ -1,35 +0,0 @@
<!DOCTYPE html>
<html lang="en">
<head>
<title>Timeline JS Example</title>
<meta charset="utf-8">
<meta name="description" content="TimelineJS example">
<meta name="apple-mobile-web-app-capable" content="yes">
<meta name="apple-touch-fullscreen" content="yes">
<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0">
<!-- Style-->
<style>
html, body {
height:100%;
padding: 0px;
margin: 0px;
}
</style>
<script type="text/javascript" src="build/js/jquery.min.js"></script>
</head>
<body>
<!-- BEGIN Timeline Embed -->
<div id="timeline-embed"></div>
<script type="text/javascript">
var timeline_config = {
width: "100%",
height: "100%",
source: 'https://docs.google.com/spreadsheet/pub?key=0AkMdj0hth5RYdEZIR25PQ3V3NWRaajREZGlGY0pYX1E&output=html',
debug: true, //OPTIONAL DEBUG TO CONSOLE
lang: 'zh-cn'
}
</script>
<script type="text/javascript" src="build/js/storyjs-embed.js"></script>
<!-- END Timeline Embed-->
</body>
</html>

22
examples/example_googlespreadsheet.html
Unescape View File

@ -1,5 +1,18 @@
<!DOCTYPE html> <!DOCTYPE html>
<html lang="en"> <html lang="en"><!--
88888888888 d8b 888 d8b 888888 d8888b
888 Y8P 888 Y8P 88b d88P Y88b
888 888 888 Y88b
888 888 88888b d88b d88b 888 888 88888b d88b 888 Y888b
888 888 888 888 88b d8P Y8b 888 888 888 88b d8P Y8b 888 Y88b
888 888 888 888 888 88888888 888 888 888 888 88888888 888 888
888 888 888 888 888 Y8b 888 888 888 888 Y8b 88P Y88b d88P
888 888 888 888 888 Y8888 888 888 888 888 Y8888 888 Y8888P
d88P
d88P
888P
-->
<head> <head>
<title>Timeline JS Example</title> <title>Timeline JS Example</title>
<meta charset="utf-8"> <meta charset="utf-8">
@ -15,7 +28,8 @@
margin: 0px; margin: 0px;
} }
</style> </style>
<script type="text/javascript" src="../build/js/jquery.min.js"></script> <!-- HTML5 shim, for IE6-8 support of HTML elements--><!--[if lt IE 9]>
<script src="http://html5shim.googlecode.com/svn/trunk/html5.js"></script><![endif]-->
</head> </head>
<body> <body>
<!-- BEGIN Timeline Embed --> <!-- BEGIN Timeline Embed -->
@ -24,9 +38,7 @@
var timeline_config = { var timeline_config = {
width: "100%", width: "100%",
height: "100%", height: "100%",
source: 'https://docs.google.com/spreadsheet/pub?key=0AkMdj0hth5RYdEZIR25PQ3V3NWRaajREZGlGY0pYX1E&output=html', source: 'https://docs.google.com/spreadsheet/pub?key=0Agl_Dv6iEbDadHdKcHlHcTB5bzhvbF9iTWwyMmJHdkE&amp;output=html'
debug: true, //OPTIONAL DEBUG TO CONSOLE
lang: 'zh-cn'
} }
</script> </script>
<script type="text/javascript" src="../build/js/storyjs-embed.js"></script> <script type="text/javascript" src="../build/js/storyjs-embed.js"></script>

Write Preview
Loading…
Cancel
Save