Browse Source

Added iframe media type

pull/387/head
Zach Wise 12 years ago
parent
commit
e053f26aeb
  1. 666
      codekit-config.json
  2. 8
      compiled/js/timeline-min.js
  3. 13
      compiled/js/timeline.js
  4. 2
      source/js/Core

666
codekit-config.json

File diff suppressed because it is too large Load Diff

8
compiled/js/timeline-min.js vendored

File diff suppressed because one or more lines are too long

13
compiled/js/timeline.js

@ -4362,6 +4362,9 @@ if(typeof VMM != 'undefined' && typeof VMM.MediaElement == 'undefined') {
} else if (m.type == "quote") {
mediaElem = "<div class='thumbnail thumb-quote'></div>";
return mediaElem;
} else if (m.type == "iframe") {
mediaElem = "<div class='thumbnail thumb-video'></div>";
return mediaElem;
} else if (m.type == "unknown") {
if (m.id.match("blockquote")) {
mediaElem = "<div class='thumbnail thumb-quote'></div>";
@ -4465,6 +4468,10 @@ if(typeof VMM != 'undefined' && typeof VMM.MediaElement == 'undefined') {
} else if (m.type == "storify") {
isTextMedia = true;
mediaElem = "<div class='plain-text-quote'>" + m.id + "</div>";
// IFRAME
} else if (m.type == "iframe") {
isTextMedia = true;
mediaElem = "<div class='media-shadow'><iframe class='media-frame video' autostart='false' frameborder='0' width='100%' height='100%' src='" + m.id + "'></iframe></div>";
// QUOTE
} else if (m.type == "quote") {
isTextMedia = true;
@ -4630,6 +4637,12 @@ if(typeof VMM != 'undefined' && typeof VMM.MediaType == 'undefined') {
media.type = "quote";
media.id = d;
success = true;
} else if (d.match('iframe')) {
media.type = "iframe";
trace("IFRAME")
trace( d.match(/src\=([^\s]*)\s/)[1].split(/"/)[1]);
media.id = d.match(/src\=([^\s]*)\s/)[1].split(/"/)[1];
success = true;
} else {
trace("unknown media");
media.type = "unknown";

2
source/js/Core

@ -1 +1 @@
Subproject commit f4bf104c371f2f80d27a7c83caac7edddfc27306
Subproject commit 70ed7d22a4c5fdfb483bf96ce75e7697827253c2
Loading…
Cancel
Save