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

Merge remote-tracking branch 'upstream/master' 

* upstream/master:
  Fixed IE 8 Bugs
pull/12/head
Martin Widmann 13 years ago
parent
b75c06a34b 2215170007
commit
b1addcd565
6 changed files with 8 additions and 70 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. BIN
      examples/.DS_Store
  2. 26
      examples/template_googlespreadsheet/index.html
  3. 26
      examples/template_html/index.html
  4. 20
      examples/template_json/index.html
  5. BIN
      source/.DS_Store
  6. 6
      source/js/VMM.js

BIN
examples/.DS_Store vendored
View File

Binary file not shown.

26
examples/template_googlespreadsheet/index.html
Unescape View File

@ -6,10 +6,6 @@
<meta name="description" content="Template Description"> <meta name="description" content="Template Description">
<meta name="author" content="Zach Wise"> <meta name="author" content="Zach Wise">
<!-- Set the viewport for mobile devices -->
<!-- <meta name="viewport" content="width=device-width,maximum-scale=1.0" /> -->
<meta name="viewport" content="width=device-width; initial-scale=1.0; maximum-scale=1.0; user-scalable=no;"/>
<meta name="apple-mobile-web-app-capable" content="yes"/>
<!-- Le HTML5 shim, for IE6-8 support of HTML elements --> <!-- Le HTML5 shim, for IE6-8 support of HTML elements -->
<!--[if lt IE 9]> <!--[if lt IE 9]>
<script src="http://html5shim.googlecode.com/svn/trunk/html5.js"></script> <script src="http://html5shim.googlecode.com/svn/trunk/html5.js"></script>
@ -24,32 +20,12 @@
<script type="text/javascript" src="../../timeline-min.js"></script> <script type="text/javascript" src="../../timeline-min.js"></script>
<script> <script>
$(document).ready(function() { $(document).ready(function() {
timeline = new VMM.Timeline(); var timeline = new VMM.Timeline();
timeline.init("https://docs.google.com/a/digitalartwork.net/spreadsheet/ccc?hl=en_US&key=0Agl_Dv6iEbDadGRwZjJSRTR4RHJpanE2U3lkb0lyYUE&rm=full#gid=0"); timeline.init("https://docs.google.com/a/digitalartwork.net/spreadsheet/ccc?hl=en_US&key=0Agl_Dv6iEbDadGRwZjJSRTR4RHJpanE2U3lkb0lyYUE&rm=full#gid=0");
}); });
</script> </script>
<!-- Icons -->
<link rel="shortcut icon" href="../../gfx/favicons/favicon.ico">
<link rel="apple-touch-icon" href="../../gfx/favicons/apple-touch-icon.png">
<link rel="apple-touch-icon" sizes="72x72" href="../../gfx/favicons/apple-touch-icon-72x72.png">
<link rel="apple-touch-icon" sizes="114x114" href="../../gfx/favicons/apple-touch-icon-114x114.png">
<!-- Google Analytics -->
<script type="text/javascript">
var _gaq = _gaq || [];
_gaq.push(['_setAccount', 'UA-537357-18']);
_gaq.push(['_setDomainName', 'verite.co']);
_gaq.push(['_trackPageview']);
(function() {
var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
})();
</script>
</head> </head>

26
examples/template_html/index.html
Unescape View File

@ -2,13 +2,11 @@
<html lang="en"> <html lang="en">
<head> <head>
<meta charset="utf-8"> <meta charset="utf-8">
<title>Elizabeth Taylor 1932-2011 - Timeline</title> <title>Timeline</title>
<meta name="description" content="Template Description"> <meta name="description" content="Template Description">
<meta name="author" content="Zach Wise"> <meta name="author" content="Zach Wise">
<!-- Set the viewport for mobile devices -->
<!-- <meta name="viewport" content="width=device-width,maximum-scale=1.0" /> -->
<meta name="viewport" content="width=device-width; initial-scale=1.0; maximum-scale=1.0; user-scalable=no;"/>
<meta name="apple-mobile-web-app-capable" content="yes"/> <meta name="apple-mobile-web-app-capable" content="yes"/>
<!-- Le HTML5 shim, for IE6-8 support of HTML elements --> <!-- Le HTML5 shim, for IE6-8 support of HTML elements -->
<!--[if lt IE 9]> <!--[if lt IE 9]>
@ -24,30 +22,12 @@
<script type="text/javascript" src="../../timeline-min.js"></script> <script type="text/javascript" src="../../timeline-min.js"></script>
<script> <script>
$(document).ready(function() { $(document).ready(function() {
timeline = new VMM.Timeline(); var timeline = new VMM.Timeline();
timeline.init(); timeline.init();
}); });
</script> </script>
<!-- Icons -->
<link rel="shortcut icon" href="../../gfx/favicons/favicon.ico">
<link rel="apple-touch-icon" href="../../gfx/favicons/apple-touch-icon.png">
<link rel="apple-touch-icon" sizes="72x72" href="../../gfx/favicons/apple-touch-icon-72x72.png">
<link rel="apple-touch-icon" sizes="114x114" href="../../gfx/favicons/apple-touch-icon-114x114.png">
<script type="text/javascript">
var _gaq = _gaq || [];
_gaq.push(['_setAccount', 'UA-537357-18']);
_gaq.push(['_setDomainName', 'verite.co']);
_gaq.push(['_trackPageview']);
(function() {
var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
})();
</script>
</head> </head>
<body> <body>

20
examples/template_json/index.html
Unescape View File

@ -24,30 +24,12 @@
<script type="text/javascript" src="../../timeline-min.js"></script> <script type="text/javascript" src="../../timeline-min.js"></script>
<script> <script>
$(document).ready(function() { $(document).ready(function() {
timeline = new VMM.Timeline(); var timeline = new VMM.Timeline();
timeline.init("data.json"); timeline.init("data.json");
}); });
</script> </script>
<!-- Icons -->
<link rel="shortcut icon" href="../../gfx/favicons/favicon.ico">
<link rel="apple-touch-icon" href="../../gfx/favicons/apple-touch-icon.png">
<link rel="apple-touch-icon" sizes="72x72" href="../../gfx/favicons/apple-touch-icon-72x72.png">
<link rel="apple-touch-icon" sizes="114x114" href="../../gfx/favicons/apple-touch-icon-114x114.png">
<script type="text/javascript">
var _gaq = _gaq || [];
_gaq.push(['_setAccount', 'UA-537357-18']);
_gaq.push(['_setDomainName', 'verite.co']);
_gaq.push(['_trackPageview']);
(function() {
var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
})();
</script>
</head> </head>
<body> <body>

BIN
source/.DS_Store vendored
View File

Binary file not shown.

6
source/js/VMM.js
Unescape View File

@ -1359,7 +1359,7 @@ if (typeof VMM == 'undefined') {
VMM.ExternalAPI.youtube.init(m.id); VMM.ExternalAPI.youtube.init(m.id);
//mediaElem = "<iframe class='media-frame youtube' onload='timeline.iframeLoaded()' frameborder='0' width='100%' height='100%' src='http://www.youtube.com/embed/" + m.id + "?&rel=0&theme=light&showinfo=0&hd=1&autohide=0&color=white&enablejsapi=1' allowfullscreen></iframe>"; //mediaElem = "<iframe class='media-frame youtube' onload='timeline.iframeLoaded()' frameborder='0' width='100%' height='100%' src='http://www.youtube.com/embed/" + m.id + "?&rel=0&theme=light&showinfo=0&hd=1&autohide=0&color=white&enablejsapi=1' allowfullscreen></iframe>";
} else if (m.type == "vimeo") { } else if (m.type == "vimeo") {
mediaElem = "<iframe class='media-frame video vimeo' onload='timeline.iframeLoaded()' 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' 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>";
} else if (m.type == "twitter"){ } else if (m.type == "twitter"){
mediaElem = "<div class='twitter' id='" + m.id + "'>Loading Tweet</div>"; mediaElem = "<div class='twitter' id='" + m.id + "'>Loading Tweet</div>";
//VMM.ExternalAPI.twitter.getHTML(m.id); //VMM.ExternalAPI.twitter.getHTML(m.id);
@ -1373,12 +1373,12 @@ if (typeof VMM == 'undefined') {
mediaElem = "<div class='media-frame soundcloud' id='" + soundcloud_id + "'>Loading Sound</div>"; mediaElem = "<div class='media-frame soundcloud' id='" + soundcloud_id + "'>Loading Sound</div>";
VMM.ExternalAPI.soundcloud.getSound(m.id, soundcloud_id) VMM.ExternalAPI.soundcloud.getSound(m.id, soundcloud_id)
} else if (m.type == "google-map") { } else if (m.type == "google-map") {
mediaElem = "<iframe class='media-frame map' onload='timeline.iframeLoaded()' frameborder='0' width='100%' height='100%' scrolling='no' marginheight='0' marginwidth='0' src='" + m.id + "&amp;output=embed'></iframe>" mediaElem = "<iframe class='media-frame map' frameborder='0' width='100%' height='100%' scrolling='no' marginheight='0' marginwidth='0' src='" + m.id + "&amp;output=embed'></iframe>"
} else if (m.type == "unknown") { } else if (m.type == "unknown") {
trace("NO KNOWN MEDIA TYPE FOUND TRYING TO JUST PLACE THE HTML"); trace("NO KNOWN MEDIA TYPE FOUND TRYING TO JUST PLACE THE HTML");
mediaElem = VMM.Util.properQuotes(m.id); mediaElem = VMM.Util.properQuotes(m.id);
} else if (m.type == "website") { } else if (m.type == "website") {
mediaElem = "<iframe class='media-frame' onload='timeline.iframeLoaded()' frameborder='0' width='100%' height='100%' scrolling='yes' marginheight='0' marginwidth='0' src='" + m.id + "'></iframe>" mediaElem = "<iframe class='media-frame' frameborder='0' width='100%' height='100%' scrolling='yes' marginheight='0' marginwidth='0' src='" + m.id + "'></iframe>"
} else { } else {
trace("NO KNOWN MEDIA TYPE FOUND"); trace("NO KNOWN MEDIA TYPE FOUND");
trace(m.type); trace(m.type);

Write Preview
Loading…
Cancel
Save