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

Removed snapitto website screenshot capability due to their free service ending 

Use website media element at your own risk, it's an iframe and can
cause problems with some sites.
pull/39/merge
Zach Wise 13 years ago
parent
18e347a385
commit
1fd53c3eaa
4 changed files with 15 additions and 28 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. 8
      source/js/VMM.js
  2. 6
      source/js/timeline.js
  3. 15
      timeline-min.js
  4. 14
      timeline.js

8
source/js/VMM.js
Unescape View File

@ -1277,8 +1277,8 @@ if (typeof VMM == 'undefined') {
mediaElem = ""; mediaElem = "";
return mediaElem; return mediaElem;
} else if (m.type == "website") { } else if (m.type == "website") {
//mediaElem = "<div class='thumbnail website'></div>"; mediaElem = "<div class='thumbnail website'></div>";
mediaElem = "<div class='thumbnail'><img src='http://api.snapito.com/free/sc?url=" + m.id + "' width='" + _w + "px' height='" + _h + "px'></div>"; //mediaElem = "<div class='thumbnail'><img src='http://api.snapito.com/free/sc?url=" + m.id + "' width='" + _w + "px' height='" + _h + "px'></div>";
return mediaElem; return mediaElem;
} else { } else {
@ -1367,8 +1367,8 @@ if (typeof VMM == 'undefined') {
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' 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>";
mediaElem = "<a href='" + m.id + "' target='_blank'>" + "<img src='http://api.snapito.com/free/lc?url=" + m.id + "'></a>"; //mediaElem = "<a href='" + m.id + "' target='_blank'>" + "<img src='http://api.snapito.com/free/lc?url=" + m.id + "'></a>";
} else { } else {
trace("NO KNOWN MEDIA TYPE FOUND"); trace("NO KNOWN MEDIA TYPE FOUND");
trace(m.type); trace(m.type);

6
source/js/timeline.js
Unescape View File

@ -1,5 +1,5 @@
/*! /*!
Open Timeline 0.89 Timeline 0.90
Designed and built by Zach Wise digitalartwork.net Designed and built by Zach Wise digitalartwork.net
Date: April 8, 2012 Date: April 8, 2012
@ -49,8 +49,8 @@ if(typeof VMM != 'undefined' && typeof VMM.Timeline == 'undefined') {
VMM.Timeline = function(w, h, conf) { VMM.Timeline = function(w, h, conf) {
var version = "0.89"; var version = "0.90";
trace("OPEN TIMELINE VERSION " + version); trace("TIMELINE VERSION " + version);
var $timeline = VMM.getElement("#timeline"); // expecting name only for parent var $timeline = VMM.getElement("#timeline"); // expecting name only for parent
var $feedback; var $feedback;

15
timeline-min.js vendored
View File

File diff suppressed because one or more lines are too long

14
timeline.js
Unescape View File

@ -1277,8 +1277,8 @@ if (typeof VMM == 'undefined') {
mediaElem = ""; mediaElem = "";
return mediaElem; return mediaElem;
} else if (m.type == "website") { } else if (m.type == "website") {
//mediaElem = "<div class='thumbnail website'></div>"; mediaElem = "<div class='thumbnail website'></div>";
mediaElem = "<div class='thumbnail'><img src='http://api.snapito.com/free/sc?url=" + m.id + "' width='" + _w + "px' height='" + _h + "px'></div>"; //mediaElem = "<div class='thumbnail'><img src='http://api.snapito.com/free/sc?url=" + m.id + "' width='" + _w + "px' height='" + _h + "px'></div>";
return mediaElem; return mediaElem;
} else { } else {
@ -1367,8 +1367,8 @@ if (typeof VMM == 'undefined') {
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' 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>";
mediaElem = "<a href='" + m.id + "' target='_blank'>" + "<img src='http://api.snapito.com/free/lc?url=" + m.id + "'></a>"; //mediaElem = "<a href='" + m.id + "' target='_blank'>" + "<img src='http://api.snapito.com/free/lc?url=" + m.id + "'></a>";
} else { } else {
trace("NO KNOWN MEDIA TYPE FOUND"); trace("NO KNOWN MEDIA TYPE FOUND");
trace(m.type); trace(m.type);
@ -4453,7 +4453,7 @@ Utf8.decode = function(strUtf) {
***********************************************/ ***********************************************/
/*! /*!
Open Timeline 0.89 Timeline 0.90
Designed and built by Zach Wise digitalartwork.net Designed and built by Zach Wise digitalartwork.net
Date: April 8, 2012 Date: April 8, 2012
@ -4503,8 +4503,8 @@ if(typeof VMM != 'undefined' && typeof VMM.Timeline == 'undefined') {
VMM.Timeline = function(w, h, conf) { VMM.Timeline = function(w, h, conf) {
var version = "0.89"; var version = "0.90";
trace("OPEN TIMELINE VERSION " + version); trace("TIMELINE VERSION " + version);
var $timeline = VMM.getElement("#timeline"); // expecting name only for parent var $timeline = VMM.getElement("#timeline"); // expecting name only for parent
var $feedback; var $feedback;

Write Preview
Loading…
Cancel
Save