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

Made slides their own object and started optimizing slide load

pull/75/head
Zach Wise 13 years ago
parent
408a3407d9
commit
8b5313afa4
18 changed files with 799 additions and 650 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
      locale/de.js
  2. 8
      locale/en.js
  3. 8
      locale/es.js
  4. 8
      locale/fr.js
  5. 8
      locale/is.js
  6. 8
      locale/it.js
  7. 8
      locale/kr.js
  8. 8
      locale/nl.js
  9. 8
      locale/pt-br.js
  10. 8
      locale/zh-ch.js
  11. 8
      locale/zh-tw.js
  12. 44
      source/js/VMM.ExternalAPI.js
  13. 73
      source/js/VMM.MediaElement.js
  14. 138
      source/js/VMM.Slider.Slide.js
  15. 116
      source/js/VMM.Slider.js
  16. 110
      source/js/VMM.Timeline.js
  17. 8
      timeline-min.js
  18. 488
      timeline.js

8
locale/de.js
View File

File diff suppressed because one or more lines are too long

8
locale/en.js
View File

File diff suppressed because one or more lines are too long

8
locale/es.js
View File

File diff suppressed because one or more lines are too long

8
locale/fr.js
View File

File diff suppressed because one or more lines are too long

8
locale/is.js
View File

File diff suppressed because one or more lines are too long

8
locale/it.js
View File

File diff suppressed because one or more lines are too long

8
locale/kr.js
View File

File diff suppressed because one or more lines are too long

8
locale/nl.js
View File

File diff suppressed because one or more lines are too long

8
locale/pt-br.js
View File

File diff suppressed because one or more lines are too long

8
locale/zh-ch.js
View File

File diff suppressed because one or more lines are too long

8
locale/zh-tw.js
View File

File diff suppressed because one or more lines are too long

44
source/js/VMM.ExternalAPI.js
Unescape View File

@ -4,6 +4,15 @@ if(typeof VMM != 'undefined' && typeof VMM.ExternalAPI == 'undefined') {
VMM.ExternalAPI = { VMM.ExternalAPI = {
pushQues: function() {
if (VMM.master_config.googlemaps.active) {
VMM.ExternalAPI.googlemaps.pushQue();
}
if (VMM.master_config.youtube.active) {
VMM.ExternalAPI.youtube.pushQue();
}
},
twitter: { twitter: {
tweetArray: [], tweetArray: [],
// VMM.ExternalAPI.twitter.getHTML(id); // VMM.ExternalAPI.twitter.getHTML(id);
@ -188,13 +197,14 @@ if(typeof VMM != 'undefined' && typeof VMM.ExternalAPI == 'undefined') {
http://maps.google.com/maps?q=Zernikedreef+11,+Leiden,+Nederland&hl=en&sll=37.0625,-95.677068&sspn=45.957536,93.076172&oq=zernike&hnear=Zernikedreef+11,+Leiden,+Zuid-Holland,+The+Netherlands&t=m&z=16 http://maps.google.com/maps?q=Zernikedreef+11,+Leiden,+Nederland&hl=en&sll=37.0625,-95.677068&sspn=45.957536,93.076172&oq=zernike&hnear=Zernikedreef+11,+Leiden,+Zuid-Holland,+The+Netherlands&t=m&z=16
*/ */
getMap: function(url, id) { getMap: function(url, id) {
var timer;
var map_vars = VMM.Util.getUrlVars(url); var map_vars = VMM.Util.getUrlVars(url);
trace(map_vars); trace(map_vars);
var map_url = "http://maps.googleapis.com/maps/api/js?key=" + Aes.Ctr.decrypt(VMM.master_config.keys.google, VMM.master_config.vp, 256) + "&libraries=places&sensor=false&callback=VMM.ExternalAPI.googlemaps.onMapAPIReady"; var map_url = "http://maps.googleapis.com/maps/api/js?key=" + Aes.Ctr.decrypt(VMM.master_config.keys.google, VMM.master_config.vp, 256) + "&libraries=places&sensor=false&callback=VMM.ExternalAPI.googlemaps.onMapAPIReady";
var map = {url: url, vars: map_vars, id: id} var map = {url: url, vars: map_vars, id: id}
trace(map);
if (VMM.master_config.googlemaps.active) { if (VMM.master_config.googlemaps.active) {
VMM.master_config.googlemaps.createMap(map); VMM.master_config.googlemaps.que.push(map);
} else { } else {
VMM.master_config.googlemaps.que.push(map); VMM.master_config.googlemaps.que.push(map);
@ -226,11 +236,17 @@ if(typeof VMM != 'undefined' && typeof VMM.ExternalAPI == 'undefined') {
if (!VMM.master_config.googlemaps.active) { if (!VMM.master_config.googlemaps.active) {
if (VMM.master_config.googlemaps.map_active && VMM.master_config.googlemaps.places_active) { if (VMM.master_config.googlemaps.map_active && VMM.master_config.googlemaps.places_active) {
VMM.master_config.googlemaps.active = true; VMM.master_config.googlemaps.active = true;
for(var i = 0; i < VMM.master_config.googlemaps.que.length; i++) { VMM.ExternalAPI.googlemaps.pushQue();
VMM.ExternalAPI.googlemaps.createMap(VMM.master_config.googlemaps.que[i]);
} }
} }
},
pushQue: function() {
for(var i = 0; i < VMM.master_config.googlemaps.que.length; i++) {
VMM.ExternalAPI.googlemaps.createMap(VMM.master_config.googlemaps.que[i]);
} }
VMM.master_config.googlemaps.que = [];
}, },
defaultType: function(name) { defaultType: function(name) {
@ -296,6 +312,8 @@ if(typeof VMM != 'undefined' && typeof VMM.ExternalAPI == 'undefined') {
================================================== */ ================================================== */
var map_attribution = ""; var map_attribution = "";
var layer;
var map;
function mapProvider(name) { function mapProvider(name) {
if (name in VMM.ExternalAPI.googlemaps.map_providers) { if (name in VMM.ExternalAPI.googlemaps.map_providers) {
@ -342,7 +360,7 @@ if(typeof VMM != 'undefined' && typeof VMM.ExternalAPI == 'undefined') {
/* Make the Map /* Make the Map
================================================== */ ================================================== */
var layer;
if (type.of(VMM.master_config.Timeline.maptype) == "string") { if (type.of(VMM.master_config.Timeline.maptype) == "string") {
if (VMM.ExternalAPI.googlemaps.defaultType(VMM.master_config.Timeline.maptype)) { if (VMM.ExternalAPI.googlemaps.defaultType(VMM.master_config.Timeline.maptype)) {
@ -409,6 +427,8 @@ if(typeof VMM != 'undefined' && typeof VMM.ExternalAPI == 'undefined') {
loadKML(); loadKML();
// KML // KML
function loadKML() { function loadKML() {
var kml_url = m.url + "&output=kml"; var kml_url = m.url + "&output=kml";
@ -495,9 +515,10 @@ if(typeof VMM != 'undefined' && typeof VMM.ExternalAPI == 'undefined') {
// VMM.ExternalAPI.youtube.init(id); // VMM.ExternalAPI.youtube.init(id);
youtube: { youtube: {
init: function(id) { init: function(id) {
var timer;
if (VMM.master_config.youtube.active) { if (VMM.master_config.youtube.active) {
VMM.master_config.youtube.createPlayer(id); trace(id);
VMM.master_config.youtube.que.push(id);
} else { } else {
VMM.master_config.youtube.que.push(id); VMM.master_config.youtube.que.push(id);
@ -517,13 +538,21 @@ if(typeof VMM != 'undefined' && typeof VMM.ExternalAPI == 'undefined') {
onAPIReady: function() { onAPIReady: function() {
trace("YOUTUBE API READY") trace("YOUTUBE API READY")
VMM.master_config.youtube.active = true; VMM.master_config.youtube.active = true;
VMM.ExternalAPI.youtube.pushQue();
},
pushQue: function() {
for(var i = 0; i < VMM.master_config.youtube.que.length; i++) { for(var i = 0; i < VMM.master_config.youtube.que.length; i++) {
VMM.ExternalAPI.youtube.createPlayer(VMM.master_config.youtube.que[i]); VMM.ExternalAPI.youtube.createPlayer(VMM.master_config.youtube.que[i]);
} }
VMM.master_config.youtube.que = [];
}, },
// VMM.ExternalAPI.youtube.createPlayer(id); // VMM.ExternalAPI.youtube.createPlayer(id);
createPlayer: function(id) { createPlayer: function(id) {
trace("create player")
var p = { var p = {
active: false, active: false,
player: {}, player: {},
@ -579,6 +608,7 @@ if(typeof VMM != 'undefined' && typeof VMM.ExternalAPI == 'undefined') {
} }
} }
} }

73
source/js/VMM.MediaElement.js
Unescape View File

@ -7,25 +7,17 @@ if(typeof VMM != 'undefined' && typeof VMM.MediaElement == 'undefined') {
init: function() { init: function() {
return this; return this;
}, },
// somestring = VMM.MediaElement.thumbnail(data);
thumbnail: function(data, w, h) { thumbnail: function(data, w, h) {
_w = 32; _w = 32;
_h = 32; _h = 32;
if (w != null && w != "") { if (w != null && w != "") {_w = w};
_w = w; if (h != null && h != "") {_h = h};
}
if (h != null && h != "") {
_h = h;
}
if (data.media != null && data.media != "") { if (data.media != null && data.media != "") {
_valid = true; _valid = true;
var mediaElem = ""; var mediaElem = "";
var m = {}; var m = VMM.MediaType(data.media); //returns an object with .type and .id
// MEDIA TYPE
m = VMM.MediaType(data.media); //returns an object with .type and .id
// CREATE MEDIA CODE // CREATE MEDIA CODE
if (m.type == "image") { if (m.type == "image") {
mediaElem = "<div class='thumbnail'><img src='" + m.id + "' width='" + _w + "px' height='" + _h + "px'></div>"; mediaElem = "<div class='thumbnail'><img src='" + m.id + "' width='" + _w + "px' height='" + _h + "px'></div>";
@ -59,7 +51,6 @@ if(typeof VMM != 'undefined' && typeof VMM.MediaElement == 'undefined') {
} 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 {
mediaElem = "<div class='thumbnail'></div>"; mediaElem = "<div class='thumbnail'></div>";
@ -67,31 +58,18 @@ if(typeof VMM != 'undefined' && typeof VMM.MediaElement == 'undefined') {
} }
} }
}, },
//VMM.MediaElement.create(element, data, returntrue);
create: function(element, data, __return, w, h) {
_return = __return; create: function(data) {
_w = 500; //$mediacontainer = element;
_h = 400;
$mediacontainer = element;
//VMM.MediaElement.container = element;
var _valid = false; var _valid = false;
if (w != null && w != "") {
_w = w;
}
if (h != null && h != "") {
_h = h;
}
if (data.media != null && data.media != "") { if (data.media != null && data.media != "") {
_valid = true;
var mediaElem = ""; var mediaElem = "";
var captionElem = ""; var captionElem = "";
var creditElem = ""; var creditElem = "";
var m = {}; var m = VMM.MediaType(data.media); //returns an object with .type and .id
var media_height = (_h - 50);
var isTextMedia = false; var isTextMedia = false;
_valid = true;
// CREDIT // CREDIT
if (data.credit != null && data.credit != "") { if (data.credit != null && data.credit != "") {
@ -102,60 +80,70 @@ if(typeof VMM != 'undefined' && typeof VMM.MediaElement == 'undefined') {
captionElem = "<div class='caption'>" + VMM.Util.linkify_with_twitter(data.caption, "_blank") + "</div>"; captionElem = "<div class='caption'>" + VMM.Util.linkify_with_twitter(data.caption, "_blank") + "</div>";
} }
// MEDIA TYPE // IMAGE
m = VMM.MediaType(data.media); //returns an object with .type and .id
// CREATE MEDIA CODE
if (m.type == "image") { if (m.type == "image") {
mediaElem = "<img src='" + m.id + "'>"; mediaElem = "<img src='" + m.id + "'>";
// FLICKR
} else if (m.type == "flickr") { } else if (m.type == "flickr") {
var flickr_id = "flickr_" + m.id; var flickr_id = "flickr_" + m.id;
mediaElem = "<a href='" + m.link + "' target='_blank'><img id='" + flickr_id + "_large" + "'></a>"; mediaElem = "<a href='" + m.link + "' target='_blank'><img id='" + flickr_id + "_large" + "'></a>";
VMM.ExternalAPI.flickr.getPhoto(m.id, "#" + flickr_id); VMM.ExternalAPI.flickr.getPhoto(m.id, "#" + flickr_id);
// GOOGLE DOCS
} else if (m.type == "googledoc") { } else if (m.type == "googledoc") {
if (m.id.match(/docs.google.com/i)) { if (m.id.match(/docs.google.com/i)) {
mediaElem = "<iframe class='media-frame doc' frameborder='0' width='100%' height='100%' src='" + m.id + "&embedded=true'></iframe>"; mediaElem = "<iframe class='media-frame doc' frameborder='0' width='100%' height='100%' src='" + m.id + "&embedded=true'></iframe>";
} else { } else {
mediaElem = "<iframe class='media-frame doc' frameborder='0' width='100%' height='100%' src='http://docs.google.com/viewer?url=" + m.id + "&embedded=true'></iframe>"; mediaElem = "<iframe class='media-frame doc' frameborder='0' width='100%' height='100%' src='http://docs.google.com/viewer?url=" + m.id + "&embedded=true'></iframe>";
} }
// YOUTUBE
} else if (m.type == "youtube") { } else if (m.type == "youtube") {
mediaElem = "<div class='media-frame video youtube' id='youtube_" + m.id + "'>Loading YouTube video...</div>"; mediaElem = "<div class='media-frame video youtube' id='youtube_" + m.id + "'>Loading YouTube video...</div>";
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>"; // VIMEO
} else if (m.type == "vimeo") { } else if (m.type == "vimeo") {
mediaElem = "<iframe class='media-frame video vimeo' autostart='false' 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' autostart='false' 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>";
// TWITTER
} else if (m.type == "twitter"){ } else if (m.type == "twitter"){
mediaElem = "<div class='twitter' id='" + "twitter_" + m.id + "'>Loading Tweet</div>"; mediaElem = "<div class='twitter' id='" + "twitter_" + m.id + "'>Loading Tweet</div>";
//VMM.ExternalAPI.twitter.getHTML(m.id);
trace("TWITTER");
VMM.ExternalAPI.twitter.prettyHTML(m.id);
isTextMedia = true; isTextMedia = true;
VMM.ExternalAPI.twitter.prettyHTML(m.id);
// TWITTER
} else if (m.type == "twitter-ready") { } else if (m.type == "twitter-ready") {
mediaElem = m.id; mediaElem = m.id;
// SOUNDCLOUD
} else if (m.type == "soundcloud") { } else if (m.type == "soundcloud") {
var soundcloud_id = "soundcloud_" + VMM.Util.unique_ID(5); var soundcloud_id = "soundcloud_" + VMM.Util.unique_ID(5);
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);
// GOOGLE MAPS
} else if (m.type == "google-map") { } else if (m.type == "google-map") {
//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>"
var map_id = "googlemap_" + VMM.Util.unique_ID(7); var map_id = "googlemap_" + VMM.Util.unique_ID(7);
mediaElem = "<div class='media-frame map' id='" + map_id + "'>Loading Map...</div>"; mediaElem = "<div class='media-frame map' id='" + map_id + "'>Loading Map...</div>";
VMM.ExternalAPI.googlemaps.getMap(m.id, map_id); VMM.ExternalAPI.googlemaps.getMap(m.id, map_id);
// UNKNOWN
} 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);
// WEBSITE
} else if (m.type == "website") { } else if (m.type == "website") {
mediaElem = "<iframe class='media-frame' frameborder='0' autostart='false' width='100%' height='100%' scrolling='yes' marginheight='0' marginwidth='0' src='" + m.id + "'></iframe>"; mediaElem = "<iframe class='media-frame' frameborder='0' autostart='false' 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>";
// NO MATCH
} else { } else {
trace("NO KNOWN MEDIA TYPE FOUND"); trace("NO KNOWN MEDIA TYPE FOUND");
trace(m.type); trace(m.type);
} }
// WRAP THE MEDIA ELEMENT // WRAP THE MEDIA ELEMENT
mediaElem = "<div class='media-container' >" + mediaElem + creditElem + captionElem + "</div>"; mediaElem = "<div class='media-container' >" + mediaElem + creditElem + captionElem + "</div>";
// RETURN
if (isTextMedia) {
return "<div class='media text-media'><div class='media-wrapper'>" + mediaElem + "</div></div>";
} else {
return "<div class='media'><div class='media-wrapper'>" + mediaElem + "</div></div>";
}
/*
if (_return) { if (_return) {
if (isTextMedia) { if (isTextMedia) {
return "<div class='media text-media'><div class='media-wrapper'>" + mediaElem + "</div></div>"; return "<div class='media text-media'><div class='media-wrapper'>" + mediaElem + "</div></div>";
@ -167,6 +155,7 @@ if(typeof VMM != 'undefined' && typeof VMM.MediaElement == 'undefined') {
VMM.appendElement($mediacontainer, creditElem); VMM.appendElement($mediacontainer, creditElem);
VMM.appendElement($mediacontainer, captionElem); VMM.appendElement($mediacontainer, captionElem);
} }
*/
}; };
}, },

138
source/js/VMM.Slider.Slide.js
Unescape View File

@ -0,0 +1,138 @@
/* Slider Slide
================================================== */
if (typeof VMM.Slider != 'undefined') {
// VMM.Slider.Slide(element, data)
VMM.Slider.Slide = function(d, _parent) {
var data = d;
var slide = {};
var media = "";
var loaded = false;
var element = VMM.appendAndGetElement(_parent, "<div>", "slider-item");
/* PUBLIC
================================================== */
this.show = function() {
trace("LOADED: " + loaded);
if (!loaded) {
render();
}
};
this.hide = function() {
if (loaded) {
removeSlide();
}
};
this.elem = function() {
return element;
};
this.position = function() {
return VMM.Element.position(element);
};
this.leftpos = function(p) {
if(typeof p != 'undefined') {
VMM.Element.css(element, "left", p);
} else {
trace("LEFT: " + VMM.Element.position(element).left);
return VMM.Element.position(element).left
}
};
this.animate = function(d, e, p) {
VMM.Element.animate(element, d, e, p);
};
this.css = function(p, v) {
VMM.Element.css(element, p, v );
}
this.opacity = function(p) {
VMM.Element.css(element, "opacity", p);
}
this.width = function() {
return VMM.Element.width(element);
};
this.height = function() {
return VMM.Element.height(element);
};
/* PRIVATE
================================================== */
var render = function() {
trace(data);
VMM.attachElement(element, "");
VMM.appendElement(element, buildSlide() );
loaded = true;
var timer = setTimeout(VMM.ExternalAPI.pushQues, 500);
};
var removeSlide = function() {
VMM.attachElement(element, "");
loaded = false;
}
var buildSlide = function() {
var c = {slide:"", text: "", media: "", layout: "content-container layout", has: { text: false, media: false }};
var b_slide, c_wrap;
/* DATE
================================================== */
if (data.startdate != null && data.startdate != "") {
if (type.of(data.startdate) == "date") {
if (data.type != "start") {
c.text += VMM.createElement("h2", VMM.Util.date.prettyDate(data.startdate), "date");
}
}
}
/* HEADLINE
================================================== */
if (data.headline != null && data.headline != "") {
if (data.type == "start") {
c.text += VMM.createElement("h2", VMM.Util.linkify_with_twitter(data.headline, "_blank"), "start");
} else {
c.text += VMM.createElement("h3", VMM.Util.linkify_with_twitter(data.headline, "_blank"));
}
}
/* TEXT
================================================== */
if (data.text != null && data.text != "") {
c.has.text = true;
c.text += VMM.createElement("p", VMM.Util.linkify_with_twitter(data.text, "_blank"));
c.text = VMM.createElement("div", c.text, "container");
c.text = VMM.createElement("div", c.text, "text");
}
/* MEDIA
================================================== */
if (data.asset != null && data.asset != "") {
if (data.asset.media != null && data.asset.media != "") {
c.has.media = true;
c.media = VMM.MediaElement.create(data.asset);
}
}
/* COMBINE
================================================== */
if (c.has.text) { c.layout += "-text" };
if (c.has.media){ c.layout += "-media" };
c.slide = VMM.createElement("div", c.text + c.media, c.layout);
c_wrap = VMM.createElement("div", c.slide, "content");
/* RETURN
================================================== */
// return c.slide;
return c_wrap;
};
}
};

116
source/js/VMM.Slider.js
Unescape View File

@ -4,11 +4,10 @@ if(typeof VMM != 'undefined' && typeof VMM.Slider == 'undefined') {
VMM.Slider = function(parent, parent_config) { VMM.Slider = function(parent, parent_config) {
/* PRIVATE VARS
================================================== */
var events = {}, config; var events = {}, config;
// ARRAYS var $slider, $slider_mask, $slider_container, $slides_items;
var data = [], slides = [], slide_positions = []; var data = [], slides = [], slide_positions = [];
var slides_content = ""; var slides_content = "";
var current_slide = 0; var current_slide = 0;
var current_width = 960; var current_width = 960;
@ -16,15 +15,15 @@ if(typeof VMM != 'undefined' && typeof VMM.Slider == 'undefined') {
var content = ""; var content = "";
var _active = false; var _active = false;
var layout = parent; var layout = parent;
// ELEMENTS
var $slider, $slider_mask, $slider_container, $slides_items;
// NAVIGATION
var navigation = {nextBtn:"", prevBtn:"", nextDate:"", prevDate:"", nextTitle:"", prevTitle:""}; var navigation = {nextBtn:"", prevBtn:"", nextDate:"", prevDate:"", nextTitle:"", prevTitle:""};
var timer;
// CONFIG // CONFIG
if(typeof VMM.Timeline != 'undefined') { if(typeof VMM.Timeline != 'undefined') {
config = VMM.Timeline.Config; config = VMM.Timeline.Config;
} else { } else {
config = { config = {
preload: 4,
current_slide: 0, current_slide: 0,
interval: 10, interval: 10,
something: 0, something: 0,
@ -159,8 +158,8 @@ if(typeof VMM != 'undefined' && typeof VMM.Slider == 'undefined') {
VMM.Element.width($slides_items, (slides.length * config.slider.content.width)); VMM.Element.width($slides_items, (slides.length * config.slider.content.width));
if (_from_start) { if (_from_start) {
var _pos = VMM.Element.position(slides[current_slide]); var _pos = slides[current_slide].leftpos();
VMM.Element.css($slider_container, "left", _pos.left); VMM.Element.css($slider_container, "left", _pos);
} }
// RESIZE SLIDES // RESIZE SLIDES
@ -176,7 +175,6 @@ if(typeof VMM != 'undefined' && typeof VMM.Slider == 'undefined') {
VMM.Element.css(navigation.nextBtnContainer, "top", ( (config.slider.height/2) - (config.slider.nav.height/2) ) ); VMM.Element.css(navigation.nextBtnContainer, "top", ( (config.slider.height/2) - (config.slider.nav.height/2) ) );
VMM.Element.css(navigation.prevBtnContainer, "top", ( (config.slider.height/2) - (config.slider.nav.height/2) ) ); VMM.Element.css(navigation.prevBtnContainer, "top", ( (config.slider.height/2) - (config.slider.nav.height/2) ) );
// Animate Changes // Animate Changes
VMM.Element.height($slider_mask, config.slider.height); VMM.Element.height($slider_mask, config.slider.height);
VMM.Element.width($slider_mask, current_width); VMM.Element.width($slider_mask, current_width);
@ -195,7 +193,7 @@ if(typeof VMM != 'undefined' && typeof VMM.Slider == 'undefined') {
================================================== */ ================================================== */
function onNextClick(e) { function onNextClick(e) {
if (current_slide == slides.length - 1) { if (current_slide == slides.length - 1) {
VMM.Element.animate($slider_container, config.duration, config.ease, {"left": -(VMM.Element.position(slides[current_slide]).left)}); VMM.Element.animate($slider_container, config.duration, config.ease, {"left": -(slides[current_slide].leftpos()) } );
} else { } else {
goToSlide(current_slide+1); goToSlide(current_slide+1);
upDate(); upDate();
@ -227,28 +225,25 @@ if(typeof VMM != 'undefined' && typeof VMM.Slider == 'undefined') {
function onTouchUpdate(e, b) { function onTouchUpdate(e, b) {
if (slide_positions.length == 0) { if (slide_positions.length == 0) {
for(var i = 0; i < slides.length; i++) { for(var i = 0; i < slides.length; i++) {
var sp = VMM.Element.position(slides[i]); slide_positions.push( slides[i].leftpos() );
slide_positions.push(sp.left);
} }
} }
if (typeof b.left == "number") { if (typeof b.left == "number") {
var _pos = b.left; var _pos = b.left;
if (_pos < -(VMM.Element.position(slides[current_slide]).left) - (config.slider_width/3)) { var _slide_pos = -(slides[current_slide].leftpos());
if (_pos < _slide_pos - (config.slider_width/3)) {
onNextClick(); onNextClick();
} else if (_pos > -(VMM.Element.position(slides[current_slide]).left) + (config.slider_width/3)) { } else if (_pos > _slide_pos + (config.slider_width/3)) {
onPrevClick(); onPrevClick();
} else { } else {
VMM.Element.animate($slider_container, config.duration, config.ease, {"left": -(VMM.Element.position(slides[current_slide]).left)}); VMM.Element.animate($slider_container, config.duration, config.ease, {"left": _slide_pos });
} }
} else { } else {
VMM.Element.animate($slider_container, config.duration, config.ease, {"left": -(VMM.Element.position(slides[current_slide]).left)}); VMM.Element.animate($slider_container, config.duration, config.ease, {"left": _slide_pos });
} }
if (typeof b.top == "number") { if (typeof b.top == "number") {
VMM.Element.animate($slider_container, config.duration, config.ease, {"top": -b.top}); VMM.Element.animate($slider_container, config.duration, config.ease, {"top": -b.top});
//VMM.Element.animate(layout, _duration, _ease, {scrollTop: VMM.Element.prop(layout, "scrollHeight") + b.top });
//VMM.Element.animate(layout, _duration, _ease, {scrollTop: VMM.Element.prop(layout, "scrollHeight") + VMM.Element.height(layout) });
//VMM.Element.animate($slider_container, config.duration, config.ease, {"top": -400});
} else { } else {
} }
@ -270,24 +265,39 @@ if(typeof VMM != 'undefined' && typeof VMM.Slider == 'undefined') {
/* BUILD SLIDES /* BUILD SLIDES
================================================== */ ================================================== */
var buildSlides = function(d) { var buildSlides = function(d) {
// Clear out existing content
VMM.attachElement($slides_items, ""); VMM.attachElement($slides_items, "");
slides = []; slides = [];
for(var i = 0; i < d.length; i++) { for(var i = 0; i < d.length; i++) {
var bw = ""; var _slide = new VMM.Slider.Slide(d[i], $slides_items);
var _slide; //_slide.show();
var _media;
bw = VMM.createElement("div", d[i].content, "content");
_slide = VMM.appendAndGetElement($slides_items, "<div>", "slider-item" , bw);
slides.push(_slide); slides.push(_slide);
} }
}
var preloadSlides = function(skip) {
if (skip) {
preloadTimeOutSlides();
} else {
timer = setTimeout(preloadTimeOutSlides, config.duration);
}
}
var preloadTimeOutSlides = function() {
trace("preloadTimeOutSlides");
trace("CURRENT SLIDE: " + current_slide);
for(var j = 0; j < config.preload; j++) {
if ( !((current_slide + j) >= slides.length - 1)) {
trace("PRELOAD: " + (current_slide + j) );
slides[current_slide + j].show();
}
if ( !( (current_slide - j) < 0 ) ) {
trace("PRELOAD: " + (current_slide - j) );
slides[current_slide - j].show();
}
}
sizeSlides();
} }
/* SIZE SLIDES /* SIZE SLIDES
@ -336,7 +346,6 @@ if(typeof VMM != 'undefined' && typeof VMM.Slider == 'undefined') {
mediasize.text_media.width = config.slider.content.width; mediasize.text_media.width = config.slider.content.width;
mediasize.text_media.height = ((config.slider.height/100) * 50 ) - 50; mediasize.text_media.height = ((config.slider.height/100) * 50 ) - 50;
//mediasize.media.height = ((config.slider.height/100) * 80 ) - 40;
mediasize.media.height = ((config.slider.height/100) * 70 ) - 40; mediasize.media.height = ((config.slider.height/100) * 70 ) - 40;
mediasize.text_media.video = VMM.Util.ratio.fit(mediasize.text_media.width, mediasize.text_media.height, 16, 9); mediasize.text_media.video = VMM.Util.ratio.fit(mediasize.text_media.width, mediasize.text_media.height, 16, 9);
@ -357,9 +366,9 @@ if(typeof VMM != 'undefined' && typeof VMM.Slider == 'undefined') {
// MAINTAINS VERTICAL CENTER IF IT CAN // MAINTAINS VERTICAL CENTER IF IT CAN
for(var i = 0; i < slides.length; i++) { for(var i = 0; i < slides.length; i++) {
if (VMM.Element.height(VMM.Element.find( slides[i], ".content")) > config.slider.height) { if (VMM.Element.height(VMM.Element.find( slides[i], ".content")) > config.slider.height) {
VMM.Element.css(slides[i], "display", "block" ); slides[i].css("display", "block");
} else { } else {
VMM.Element.css(slides[i], "display", "table" ); slides[i].css("display", "table");
} }
} }
@ -429,7 +438,8 @@ if(typeof VMM != 'undefined' && typeof VMM.Slider == 'undefined') {
var pos = 0; var pos = 0;
for(var i = 0; i < slides.length; i++) { for(var i = 0; i < slides.length; i++) {
pos = i * (config.slider.width+config.spacing); pos = i * (config.slider.width+config.spacing);
VMM.Element.css(slides[i], "left", pos); //VMM.Element.css(slides[i], "left", pos);
slides[i].leftpos(pos);
} }
} }
@ -439,13 +449,14 @@ if(typeof VMM != 'undefined' && typeof VMM.Slider == 'undefined') {
var _ease = "linear"; var _ease = "linear";
for(var i = 0; i < slides.length; i++) { for(var i = 0; i < slides.length; i++) {
if (i == current_slide) { if (i == current_slide) {
VMM.Element.animate(slides[i], config.duration, _ease, {"opacity": 1}); //VMM.Element.animate(slides[i], config.duration, _ease, {"opacity": 1});
} else if (i == current_slide - 1) { slides[i].animate(config.duration, _ease, {"opacity": 1});
VMM.Element.animate(slides[i], config.duration, _ease, {"opacity": 0.1}); } else if (i == current_slide - 1 || i == current_slide + 1) {
} else if (i == current_slide + 1) { //VMM.Element.animate(slides[i], config.duration, _ease, {"opacity": 0.1});
VMM.Element.animate(slides[i], config.duration, _ease, {"opacity": 0.1}); slides[i].animate(config.duration, _ease, {"opacity": 0.1});
} else { } else {
VMM.Element.css(slides[i], "opacity", n); //VMM.Element.css(slides[i], "opacity", n);
slides[i].opacity(n);
} }
} }
} }
@ -466,21 +477,14 @@ if(typeof VMM != 'undefined' && typeof VMM.Slider == 'undefined') {
var _duration = config.duration; var _duration = config.duration;
var is_last = false; var is_last = false;
var is_first = false; var is_first = false;
var _pos = slides[current_slide].leftpos();
//var _pos = VMM.Element.position(slides[current_slide]);
if (current_slide == 0) { if (current_slide == 0) {is_first = true};
is_first = true; if (current_slide +1 >= slides.length) {is_last = true};
}
if (current_slide +1 >= slides.length) {
is_last = true
}
if (ease != null && ease != "") {_ease = ease}; if (ease != null && ease != "") {_ease = ease};
if (duration != null && duration != "") {_duration = duration}; if (duration != null && duration != "") {_duration = duration};
/* get slide position
================================================== */
var _pos = VMM.Element.position(slides[current_slide]);
/* set proper nav titles and dates etc. /* set proper nav titles and dates etc.
================================================== */ ================================================== */
if (is_first) { if (is_first) {
@ -505,10 +509,10 @@ if(typeof VMM != 'undefined' && typeof VMM.Slider == 'undefined') {
/* ANIMATE SLIDE /* ANIMATE SLIDE
================================================== */ ================================================== */
if (fast) { if (fast) {
VMM.Element.css($slider_container, "left", -(_pos.left - config.slider.content.padding)); VMM.Element.css($slider_container, "left", -(_pos - config.slider.content.padding));
} else{ } else{
VMM.Element.stop($slider_container); VMM.Element.stop($slider_container);
VMM.Element.animate($slider_container, _duration, _ease, {"left": -(_pos.left - config.slider.content.padding)}); VMM.Element.animate($slider_container, _duration, _ease, {"left": -(_pos - config.slider.content.padding)});
} }
if (firstrun) { if (firstrun) {
@ -518,14 +522,15 @@ if(typeof VMM != 'undefined' && typeof VMM.Slider == 'undefined') {
/* SET Vertical Scoll /* SET Vertical Scoll
================================================== */ ================================================== */
//opacitySlides(0.85); //opacitySlides(0.85);
if (VMM.Element.height(slides[current_slide]) > config.slider_height) { //if (VMM.Element.height(slides[current_slide]) > config.slider_height) {
if (slides[current_slide].height() > config.slider_height) {
VMM.Element.css(".slider", "overflow-y", "scroll" ); VMM.Element.css(".slider", "overflow-y", "scroll" );
} else { } else {
VMM.Element.css(layout, "overflow-y", "hidden" ); VMM.Element.css(layout, "overflow-y", "hidden" );
VMM.Element.animate(layout, _duration, _ease, {scrollTop: VMM.Element.prop(layout, "scrollHeight") - VMM.Element.height(layout) }); VMM.Element.animate(layout, _duration, _ease, {scrollTop: VMM.Element.prop(layout, "scrollHeight") - VMM.Element.height(layout) });
} }
preloadSlides();
//VMM.Element.css(navigation.nextBtnContainer, "left", ( VMM.Element.width(navigation.nextBtnContainer) - config.slider.nav.width) ); //VMM.Element.css(navigation.nextBtnContainer, "left", ( VMM.Element.width(navigation.nextBtnContainer) - config.slider.nav.width) );
} }
@ -578,7 +583,8 @@ if(typeof VMM != 'undefined' && typeof VMM.Slider == 'undefined') {
if (VMM.Browser.device == "tablet" || VMM.Browser.device == "mobile") { if (VMM.Browser.device == "tablet" || VMM.Browser.device == "mobile") {
config.duration = 500; config.duration = 500;
__duration = 1000; __duration = 1000;
VMM.TouchSlider.createPanel($slider_container, $slider_container, VMM.Element.width(slides[0]), config.spacing, true); //VMM.TouchSlider.createPanel($slider_container, $slider_container, VMM.Element.width(slides[0]), config.spacing, true);
VMM.TouchSlider.createPanel($slider_container, $slider_container, slides[0].width(), config.spacing, true);
VMM.bindEvent($slider_container, onTouchUpdate, "TOUCHUPDATE"); VMM.bindEvent($slider_container, onTouchUpdate, "TOUCHUPDATE");
} else if (VMM.Browser.device == "mobile") { } else if (VMM.Browser.device == "mobile") {

110
source/js/VMM.Timeline.js
Unescape View File

@ -31,6 +31,7 @@
// @codekit-prepend "VMM.TouchSlider.js"; // @codekit-prepend "VMM.TouchSlider.js";
// @codekit-prepend "VMM.DragSlider.js"; // @codekit-prepend "VMM.DragSlider.js";
// @codekit-prepend "VMM.Slider.js"; // @codekit-prepend "VMM.Slider.js";
// @codekit-prepend "VMM.Slider.Slide.js";
// @codekit-prepend "VMM.Util.js"; // @codekit-prepend "VMM.Util.js";
// @codekit-prepend "VMM.LoadLib.js"; // @codekit-prepend "VMM.LoadLib.js";
// @codekit-prepend "VMM.Language.js"; // @codekit-prepend "VMM.Language.js";
@ -57,7 +58,7 @@ if(typeof VMM != 'undefined' && typeof VMM.Timeline == 'undefined') {
timeline_id = "#timeline"; timeline_id = "#timeline";
} }
version = "0.98.72"; version = "0.99.00";
trace("TIMELINE VERSION " + version); trace("TIMELINE VERSION " + version);
@ -67,6 +68,7 @@ if(typeof VMM != 'undefined' && typeof VMM.Timeline == 'undefined') {
id: timeline_id, id: timeline_id,
type: "timeline", type: "timeline",
maptype: "toner", maptype: "toner",
preload: 4,
current_slide: 0, current_slide: 0,
hash_bookmark: false, hash_bookmark: false,
start_at_end: false, start_at_end: false,
@ -375,75 +377,6 @@ if(typeof VMM != 'undefined' && typeof VMM.Timeline == 'undefined') {
}; };
// BUILD SLIDE CONTENT pass in json object
var buildSlide = function(dd, d_date) {
var d = dd;
var slide = "";
var _valid = false;
var _hasmedia = false;
var _hastext = false;
var c = {};
c._text = "";
c._media = "";
updateSize();
if (type.of(d_date) == "date") {
_valid = true;
if (dd.type != "start") {
c._text += VMM.createElement("h2", VMM.Util.date.prettyDate(d_date), "date");
}
if (d.headline != null && d.headline != "") {
if (d.type == "tweets") {
} else if (dd.type == "start") {
c._text += VMM.createElement("h2", VMM.Util.linkify_with_twitter(d.headline, "_blank"), "start");
} else {
c._text += VMM.createElement("h3", VMM.Util.linkify_with_twitter(d.headline, "_blank"));
}
}
if (d.text != null && d.text != "") {
_hastext = true;
c._text += VMM.createElement("p", VMM.Util.linkify_with_twitter(d.text, "_blank"));
}
c._text = VMM.createElement("div", c._text, "container");
c._text = VMM.createElement("div", c._text, "text");
}
if (_valid) {
var _layout_class = "content-container layout";
if (d.asset != null && d.asset != "") {
if (d.asset.media != null && d.asset.media != "") {
_hasmedia = true;
c._media = VMM.MediaElement.create("", d.asset, true, config.feature.width, config.feature.height);
}
}
if (_hastext) {
_layout_class += "-text"
}
if (_hasmedia) {
_layout_class += "-media";
}
slide = VMM.createElement("div", c._text + c._media, _layout_class);
return slide;
}
return slide;
}
var updateSize = function() { var updateSize = function() {
trace("UPDATE SIZE"); trace("UPDATE SIZE");
config.width = VMM.Element.width($timeline); config.width = VMM.Element.width($timeline);
@ -476,9 +409,6 @@ if(typeof VMM != 'undefined' && typeof VMM.Timeline == 'undefined') {
// START DATE // START DATE
if (data.date[i].type == "tweets") { if (data.date[i].type == "tweets") {
_date.startdate = VMM.ExternalAPI.twitter.parseTwitterDate(data.date[i].startDate); _date.startdate = VMM.ExternalAPI.twitter.parseTwitterDate(data.date[i].startDate);
} else if (data.date[i].type == "google spreadsheet") {
//_date.startdate = new Date(Date.parse(data.date[i].startDate));
_date.startdate = VMM.Util.date.parse(data.date[i].startDate);
} else { } else {
_date.startdate = VMM.Util.date.parse(data.date[i].startDate); _date.startdate = VMM.Util.date.parse(data.date[i].startDate);
} }
@ -489,9 +419,6 @@ if(typeof VMM != 'undefined' && typeof VMM.Timeline == 'undefined') {
if (data.date[i].endDate != null && data.date[i].endDate != "") { if (data.date[i].endDate != null && data.date[i].endDate != "") {
if (data.date[i].type == "tweets") { if (data.date[i].type == "tweets") {
_date.enddate = VMM.ExternalAPI.twitter.parseTwitterDate(data.date[i].endDate); _date.enddate = VMM.ExternalAPI.twitter.parseTwitterDate(data.date[i].endDate);
} else if (data.date[i].type == "google spreadsheet") {
//_date.enddate = new Date(Date.parse(data.date[i].endDate));
_date.enddate = VMM.Util.date.parse(data.date[i].endDate);
} else { } else {
_date.enddate = VMM.Util.date.parse(data.date[i].endDate); _date.enddate = VMM.Util.date.parse(data.date[i].endDate);
} }
@ -500,17 +427,15 @@ if(typeof VMM != 'undefined' && typeof VMM.Timeline == 'undefined') {
} }
_date.title = data.date[i].headline; _date.title = data.date[i].headline;
_date.headline = data.date[i].headline;
_date.type = data.date[i].type; _date.type = data.date[i].type;
_date.date = VMM.Util.date.prettyDate(_date.startdate); _date.date = VMM.Util.date.prettyDate(_date.startdate);
_date.asset = data.date[i].asset; _date.asset = data.date[i].asset;
_date.fulldate = _date.startdate.getTime(); _date.fulldate = _date.startdate.getTime();
_date.text = data.date[i].text;
_date.content = "";
// BUILD SLIDE CONTENT
_date.content = buildSlide(data.date[i], _date.startdate);
if (_date.content != null && _date.content != "") {
_dates.push(_date); _dates.push(_date);
}
} }
@ -527,24 +452,9 @@ if(typeof VMM != 'undefined' && typeof VMM.Timeline == 'undefined') {
if (data.headline != null && data.headline != "" && data.text != null && data.text != "") { if (data.headline != null && data.headline != "" && data.text != null && data.text != "") {
trace("HAS STARTPAGE"); trace("HAS STARTPAGE");
var _date = {}; var _date = {};
if (data.type == "google spreadsheet") {
trace("google spreadsheet startpage date " + data.startDate);
//_date.startdate = new Date(Date.parse(data.startDate));
} else {
_date.startdate = VMM.Util.date.parse(data.startDate);
}
_date.startdate = new Date(_dates[0].startdate);
var td = _dates[0].startdate;
var td_num = 0; var td_num = 0;
/* var td = _dates[0].startdate;
if (_dates[0].startdate.getDate() > 1) { _date.startdate = VMM.Util.date.parse(data.startDate);
_date.startdate.setDate(td.getDate() - 1);
} else if (_dates[0].startdate.getHours() > 0) {
_date.startdate.setHours(td.getHours() - 1);
}
*/
if (td.getMonth() === 0 && td.getDate() == 1 && td.getHours() === 0 && td.getMinutes() === 0 ) { if (td.getMonth() === 0 && td.getDate() == 1 && td.getHours() === 0 && td.getMinutes() === 0 ) {
// trace("YEAR ONLY"); // trace("YEAR ONLY");
@ -572,11 +482,9 @@ if(typeof VMM != 'undefined' && typeof VMM.Timeline == 'undefined') {
_date.date = VMM.Util.date.prettyDate(data.startDate); _date.date = VMM.Util.date.prettyDate(data.startDate);
_date.asset = data.asset; _date.asset = data.asset;
_date.fulldate = _date.startdate.getTime(); _date.fulldate = _date.startdate.getTime();
_date.content = buildSlide(_date, _date.startdate);
if (_date.content != null && _date.content != "" || _date.title != null && _date.title != "") {
_dates.push(_date); _dates.push(_date);
} }
}
/* CUSTOM SORT /* CUSTOM SORT
================================================== */ ================================================== */

8
timeline-min.js vendored
View File

File diff suppressed because one or more lines are too long

488
timeline.js
Unescape View File

@ -1757,25 +1757,17 @@ if(typeof VMM != 'undefined' && typeof VMM.MediaElement == 'undefined') {
init: function() { init: function() {
return this; return this;
}, },
// somestring = VMM.MediaElement.thumbnail(data);
thumbnail: function(data, w, h) { thumbnail: function(data, w, h) {
_w = 32; _w = 32;
_h = 32; _h = 32;
if (w != null && w != "") { if (w != null && w != "") {_w = w};
_w = w; if (h != null && h != "") {_h = h};
}
if (h != null && h != "") {
_h = h;
}
if (data.media != null && data.media != "") { if (data.media != null && data.media != "") {
_valid = true; _valid = true;
var mediaElem = ""; var mediaElem = "";
var m = {}; var m = VMM.MediaType(data.media); //returns an object with .type and .id
// MEDIA TYPE
m = VMM.MediaType(data.media); //returns an object with .type and .id
// CREATE MEDIA CODE // CREATE MEDIA CODE
if (m.type == "image") { if (m.type == "image") {
mediaElem = "<div class='thumbnail'><img src='" + m.id + "' width='" + _w + "px' height='" + _h + "px'></div>"; mediaElem = "<div class='thumbnail'><img src='" + m.id + "' width='" + _w + "px' height='" + _h + "px'></div>";
@ -1809,7 +1801,6 @@ if(typeof VMM != 'undefined' && typeof VMM.MediaElement == 'undefined') {
} 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 {
mediaElem = "<div class='thumbnail'></div>"; mediaElem = "<div class='thumbnail'></div>";
@ -1817,31 +1808,18 @@ if(typeof VMM != 'undefined' && typeof VMM.MediaElement == 'undefined') {
} }
} }
}, },
//VMM.MediaElement.create(element, data, returntrue);
create: function(element, data, __return, w, h) {
_return = __return; create: function(data) {
_w = 500; //$mediacontainer = element;
_h = 400;
$mediacontainer = element;
//VMM.MediaElement.container = element;
var _valid = false; var _valid = false;
if (w != null && w != "") {
_w = w;
}
if (h != null && h != "") {
_h = h;
}
if (data.media != null && data.media != "") { if (data.media != null && data.media != "") {
_valid = true;
var mediaElem = ""; var mediaElem = "";
var captionElem = ""; var captionElem = "";
var creditElem = ""; var creditElem = "";
var m = {}; var m = VMM.MediaType(data.media); //returns an object with .type and .id
var media_height = (_h - 50);
var isTextMedia = false; var isTextMedia = false;
_valid = true;
// CREDIT // CREDIT
if (data.credit != null && data.credit != "") { if (data.credit != null && data.credit != "") {
@ -1852,60 +1830,70 @@ if(typeof VMM != 'undefined' && typeof VMM.MediaElement == 'undefined') {
captionElem = "<div class='caption'>" + VMM.Util.linkify_with_twitter(data.caption, "_blank") + "</div>"; captionElem = "<div class='caption'>" + VMM.Util.linkify_with_twitter(data.caption, "_blank") + "</div>";
} }
// MEDIA TYPE // IMAGE
m = VMM.MediaType(data.media); //returns an object with .type and .id
// CREATE MEDIA CODE
if (m.type == "image") { if (m.type == "image") {
mediaElem = "<img src='" + m.id + "'>"; mediaElem = "<img src='" + m.id + "'>";
// FLICKR
} else if (m.type == "flickr") { } else if (m.type == "flickr") {
var flickr_id = "flickr_" + m.id; var flickr_id = "flickr_" + m.id;
mediaElem = "<a href='" + m.link + "' target='_blank'><img id='" + flickr_id + "_large" + "'></a>"; mediaElem = "<a href='" + m.link + "' target='_blank'><img id='" + flickr_id + "_large" + "'></a>";
VMM.ExternalAPI.flickr.getPhoto(m.id, "#" + flickr_id); VMM.ExternalAPI.flickr.getPhoto(m.id, "#" + flickr_id);
// GOOGLE DOCS
} else if (m.type == "googledoc") { } else if (m.type == "googledoc") {
if (m.id.match(/docs.google.com/i)) { if (m.id.match(/docs.google.com/i)) {
mediaElem = "<iframe class='media-frame doc' frameborder='0' width='100%' height='100%' src='" + m.id + "&embedded=true'></iframe>"; mediaElem = "<iframe class='media-frame doc' frameborder='0' width='100%' height='100%' src='" + m.id + "&embedded=true'></iframe>";
} else { } else {
mediaElem = "<iframe class='media-frame doc' frameborder='0' width='100%' height='100%' src='http://docs.google.com/viewer?url=" + m.id + "&embedded=true'></iframe>"; mediaElem = "<iframe class='media-frame doc' frameborder='0' width='100%' height='100%' src='http://docs.google.com/viewer?url=" + m.id + "&embedded=true'></iframe>";
} }
// YOUTUBE
} else if (m.type == "youtube") { } else if (m.type == "youtube") {
mediaElem = "<div class='media-frame video youtube' id='youtube_" + m.id + "'>Loading YouTube video...</div>"; mediaElem = "<div class='media-frame video youtube' id='youtube_" + m.id + "'>Loading YouTube video...</div>";
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>"; // VIMEO
} else if (m.type == "vimeo") { } else if (m.type == "vimeo") {
mediaElem = "<iframe class='media-frame video vimeo' autostart='false' 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' autostart='false' 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>";
// TWITTER
} else if (m.type == "twitter"){ } else if (m.type == "twitter"){
mediaElem = "<div class='twitter' id='" + "twitter_" + m.id + "'>Loading Tweet</div>"; mediaElem = "<div class='twitter' id='" + "twitter_" + m.id + "'>Loading Tweet</div>";
//VMM.ExternalAPI.twitter.getHTML(m.id);
trace("TWITTER");
VMM.ExternalAPI.twitter.prettyHTML(m.id);
isTextMedia = true; isTextMedia = true;
VMM.ExternalAPI.twitter.prettyHTML(m.id);
// TWITTER
} else if (m.type == "twitter-ready") { } else if (m.type == "twitter-ready") {
mediaElem = m.id; mediaElem = m.id;
// SOUNDCLOUD
} else if (m.type == "soundcloud") { } else if (m.type == "soundcloud") {
var soundcloud_id = "soundcloud_" + VMM.Util.unique_ID(5); var soundcloud_id = "soundcloud_" + VMM.Util.unique_ID(5);
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);
// GOOGLE MAPS
} else if (m.type == "google-map") { } else if (m.type == "google-map") {
//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>"
var map_id = "googlemap_" + VMM.Util.unique_ID(7); var map_id = "googlemap_" + VMM.Util.unique_ID(7);
mediaElem = "<div class='media-frame map' id='" + map_id + "'>Loading Map...</div>"; mediaElem = "<div class='media-frame map' id='" + map_id + "'>Loading Map...</div>";
VMM.ExternalAPI.googlemaps.getMap(m.id, map_id); VMM.ExternalAPI.googlemaps.getMap(m.id, map_id);
// UNKNOWN
} 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);
// WEBSITE
} else if (m.type == "website") { } else if (m.type == "website") {
mediaElem = "<iframe class='media-frame' frameborder='0' autostart='false' width='100%' height='100%' scrolling='yes' marginheight='0' marginwidth='0' src='" + m.id + "'></iframe>"; mediaElem = "<iframe class='media-frame' frameborder='0' autostart='false' 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>";
// NO MATCH
} else { } else {
trace("NO KNOWN MEDIA TYPE FOUND"); trace("NO KNOWN MEDIA TYPE FOUND");
trace(m.type); trace(m.type);
} }
// WRAP THE MEDIA ELEMENT // WRAP THE MEDIA ELEMENT
mediaElem = "<div class='media-container' >" + mediaElem + creditElem + captionElem + "</div>"; mediaElem = "<div class='media-container' >" + mediaElem + creditElem + captionElem + "</div>";
// RETURN
if (isTextMedia) {
return "<div class='media text-media'><div class='media-wrapper'>" + mediaElem + "</div></div>";
} else {
return "<div class='media'><div class='media-wrapper'>" + mediaElem + "</div></div>";
}
/*
if (_return) { if (_return) {
if (isTextMedia) { if (isTextMedia) {
return "<div class='media text-media'><div class='media-wrapper'>" + mediaElem + "</div></div>"; return "<div class='media text-media'><div class='media-wrapper'>" + mediaElem + "</div></div>";
@ -1917,6 +1905,7 @@ if(typeof VMM != 'undefined' && typeof VMM.MediaElement == 'undefined') {
VMM.appendElement($mediacontainer, creditElem); VMM.appendElement($mediacontainer, creditElem);
VMM.appendElement($mediacontainer, captionElem); VMM.appendElement($mediacontainer, captionElem);
} }
*/
}; };
}, },
@ -2237,6 +2226,15 @@ if(typeof VMM != 'undefined' && typeof VMM.ExternalAPI == 'undefined') {
VMM.ExternalAPI = { VMM.ExternalAPI = {
pushQues: function() {
if (VMM.master_config.googlemaps.active) {
VMM.ExternalAPI.googlemaps.pushQue();
}
if (VMM.master_config.youtube.active) {
VMM.ExternalAPI.youtube.pushQue();
}
},
twitter: { twitter: {
tweetArray: [], tweetArray: [],
// VMM.ExternalAPI.twitter.getHTML(id); // VMM.ExternalAPI.twitter.getHTML(id);
@ -2421,13 +2419,14 @@ if(typeof VMM != 'undefined' && typeof VMM.ExternalAPI == 'undefined') {
http://maps.google.com/maps?q=Zernikedreef+11,+Leiden,+Nederland&hl=en&sll=37.0625,-95.677068&sspn=45.957536,93.076172&oq=zernike&hnear=Zernikedreef+11,+Leiden,+Zuid-Holland,+The+Netherlands&t=m&z=16 http://maps.google.com/maps?q=Zernikedreef+11,+Leiden,+Nederland&hl=en&sll=37.0625,-95.677068&sspn=45.957536,93.076172&oq=zernike&hnear=Zernikedreef+11,+Leiden,+Zuid-Holland,+The+Netherlands&t=m&z=16
*/ */
getMap: function(url, id) { getMap: function(url, id) {
var timer;
var map_vars = VMM.Util.getUrlVars(url); var map_vars = VMM.Util.getUrlVars(url);
trace(map_vars); trace(map_vars);
var map_url = "http://maps.googleapis.com/maps/api/js?key=" + Aes.Ctr.decrypt(VMM.master_config.keys.google, VMM.master_config.vp, 256) + "&libraries=places&sensor=false&callback=VMM.ExternalAPI.googlemaps.onMapAPIReady"; var map_url = "http://maps.googleapis.com/maps/api/js?key=" + Aes.Ctr.decrypt(VMM.master_config.keys.google, VMM.master_config.vp, 256) + "&libraries=places&sensor=false&callback=VMM.ExternalAPI.googlemaps.onMapAPIReady";
var map = {url: url, vars: map_vars, id: id} var map = {url: url, vars: map_vars, id: id}
trace(map);
if (VMM.master_config.googlemaps.active) { if (VMM.master_config.googlemaps.active) {
VMM.master_config.googlemaps.createMap(map); VMM.master_config.googlemaps.que.push(map);
} else { } else {
VMM.master_config.googlemaps.que.push(map); VMM.master_config.googlemaps.que.push(map);
@ -2459,11 +2458,17 @@ if(typeof VMM != 'undefined' && typeof VMM.ExternalAPI == 'undefined') {
if (!VMM.master_config.googlemaps.active) { if (!VMM.master_config.googlemaps.active) {
if (VMM.master_config.googlemaps.map_active && VMM.master_config.googlemaps.places_active) { if (VMM.master_config.googlemaps.map_active && VMM.master_config.googlemaps.places_active) {
VMM.master_config.googlemaps.active = true; VMM.master_config.googlemaps.active = true;
for(var i = 0; i < VMM.master_config.googlemaps.que.length; i++) { VMM.ExternalAPI.googlemaps.pushQue();
VMM.ExternalAPI.googlemaps.createMap(VMM.master_config.googlemaps.que[i]);
} }
} }
},
pushQue: function() {
for(var i = 0; i < VMM.master_config.googlemaps.que.length; i++) {
VMM.ExternalAPI.googlemaps.createMap(VMM.master_config.googlemaps.que[i]);
} }
VMM.master_config.googlemaps.que = [];
}, },
defaultType: function(name) { defaultType: function(name) {
@ -2529,6 +2534,8 @@ if(typeof VMM != 'undefined' && typeof VMM.ExternalAPI == 'undefined') {
================================================== */ ================================================== */
var map_attribution = ""; var map_attribution = "";
var layer;
var map;
function mapProvider(name) { function mapProvider(name) {
if (name in VMM.ExternalAPI.googlemaps.map_providers) { if (name in VMM.ExternalAPI.googlemaps.map_providers) {
@ -2575,7 +2582,7 @@ if(typeof VMM != 'undefined' && typeof VMM.ExternalAPI == 'undefined') {
/* Make the Map /* Make the Map
================================================== */ ================================================== */
var layer;
if (type.of(VMM.master_config.Timeline.maptype) == "string") { if (type.of(VMM.master_config.Timeline.maptype) == "string") {
if (VMM.ExternalAPI.googlemaps.defaultType(VMM.master_config.Timeline.maptype)) { if (VMM.ExternalAPI.googlemaps.defaultType(VMM.master_config.Timeline.maptype)) {
@ -2642,6 +2649,8 @@ if(typeof VMM != 'undefined' && typeof VMM.ExternalAPI == 'undefined') {
loadKML(); loadKML();
// KML // KML
function loadKML() { function loadKML() {
var kml_url = m.url + "&output=kml"; var kml_url = m.url + "&output=kml";
@ -2728,9 +2737,10 @@ if(typeof VMM != 'undefined' && typeof VMM.ExternalAPI == 'undefined') {
// VMM.ExternalAPI.youtube.init(id); // VMM.ExternalAPI.youtube.init(id);
youtube: { youtube: {
init: function(id) { init: function(id) {
var timer;
if (VMM.master_config.youtube.active) { if (VMM.master_config.youtube.active) {
VMM.master_config.youtube.createPlayer(id); trace(id);
VMM.master_config.youtube.que.push(id);
} else { } else {
VMM.master_config.youtube.que.push(id); VMM.master_config.youtube.que.push(id);
@ -2750,13 +2760,21 @@ if(typeof VMM != 'undefined' && typeof VMM.ExternalAPI == 'undefined') {
onAPIReady: function() { onAPIReady: function() {
trace("YOUTUBE API READY") trace("YOUTUBE API READY")
VMM.master_config.youtube.active = true; VMM.master_config.youtube.active = true;
VMM.ExternalAPI.youtube.pushQue();
},
pushQue: function() {
for(var i = 0; i < VMM.master_config.youtube.que.length; i++) { for(var i = 0; i < VMM.master_config.youtube.que.length; i++) {
VMM.ExternalAPI.youtube.createPlayer(VMM.master_config.youtube.que[i]); VMM.ExternalAPI.youtube.createPlayer(VMM.master_config.youtube.que[i]);
} }
VMM.master_config.youtube.que = [];
}, },
// VMM.ExternalAPI.youtube.createPlayer(id); // VMM.ExternalAPI.youtube.createPlayer(id);
createPlayer: function(id) { createPlayer: function(id) {
trace("create player")
var p = { var p = {
active: false, active: false,
player: {}, player: {},
@ -2812,6 +2830,7 @@ if(typeof VMM != 'undefined' && typeof VMM.ExternalAPI == 'undefined') {
} }
} }
} }
@ -3182,11 +3201,10 @@ if(typeof VMM != 'undefined' && typeof VMM.Slider == 'undefined') {
VMM.Slider = function(parent, parent_config) { VMM.Slider = function(parent, parent_config) {
/* PRIVATE VARS
================================================== */
var events = {}, config; var events = {}, config;
// ARRAYS var $slider, $slider_mask, $slider_container, $slides_items;
var data = [], slides = [], slide_positions = []; var data = [], slides = [], slide_positions = [];
var slides_content = ""; var slides_content = "";
var current_slide = 0; var current_slide = 0;
var current_width = 960; var current_width = 960;
@ -3194,15 +3212,15 @@ if(typeof VMM != 'undefined' && typeof VMM.Slider == 'undefined') {
var content = ""; var content = "";
var _active = false; var _active = false;
var layout = parent; var layout = parent;
// ELEMENTS
var $slider, $slider_mask, $slider_container, $slides_items;
// NAVIGATION
var navigation = {nextBtn:"", prevBtn:"", nextDate:"", prevDate:"", nextTitle:"", prevTitle:""}; var navigation = {nextBtn:"", prevBtn:"", nextDate:"", prevDate:"", nextTitle:"", prevTitle:""};
var timer;
// CONFIG // CONFIG
if(typeof VMM.Timeline != 'undefined') { if(typeof VMM.Timeline != 'undefined') {
config = VMM.Timeline.Config; config = VMM.Timeline.Config;
} else { } else {
config = { config = {
preload: 4,
current_slide: 0, current_slide: 0,
interval: 10, interval: 10,
something: 0, something: 0,
@ -3337,8 +3355,8 @@ if(typeof VMM != 'undefined' && typeof VMM.Slider == 'undefined') {
VMM.Element.width($slides_items, (slides.length * config.slider.content.width)); VMM.Element.width($slides_items, (slides.length * config.slider.content.width));
if (_from_start) { if (_from_start) {
var _pos = VMM.Element.position(slides[current_slide]); var _pos = slides[current_slide].leftpos();
VMM.Element.css($slider_container, "left", _pos.left); VMM.Element.css($slider_container, "left", _pos);
} }
// RESIZE SLIDES // RESIZE SLIDES
@ -3354,7 +3372,6 @@ if(typeof VMM != 'undefined' && typeof VMM.Slider == 'undefined') {
VMM.Element.css(navigation.nextBtnContainer, "top", ( (config.slider.height/2) - (config.slider.nav.height/2) ) ); VMM.Element.css(navigation.nextBtnContainer, "top", ( (config.slider.height/2) - (config.slider.nav.height/2) ) );
VMM.Element.css(navigation.prevBtnContainer, "top", ( (config.slider.height/2) - (config.slider.nav.height/2) ) ); VMM.Element.css(navigation.prevBtnContainer, "top", ( (config.slider.height/2) - (config.slider.nav.height/2) ) );
// Animate Changes // Animate Changes
VMM.Element.height($slider_mask, config.slider.height); VMM.Element.height($slider_mask, config.slider.height);
VMM.Element.width($slider_mask, current_width); VMM.Element.width($slider_mask, current_width);
@ -3373,7 +3390,7 @@ if(typeof VMM != 'undefined' && typeof VMM.Slider == 'undefined') {
================================================== */ ================================================== */
function onNextClick(e) { function onNextClick(e) {
if (current_slide == slides.length - 1) { if (current_slide == slides.length - 1) {
VMM.Element.animate($slider_container, config.duration, config.ease, {"left": -(VMM.Element.position(slides[current_slide]).left)}); VMM.Element.animate($slider_container, config.duration, config.ease, {"left": -(slides[current_slide].leftpos()) } );
} else { } else {
goToSlide(current_slide+1); goToSlide(current_slide+1);
upDate(); upDate();
@ -3405,28 +3422,25 @@ if(typeof VMM != 'undefined' && typeof VMM.Slider == 'undefined') {
function onTouchUpdate(e, b) { function onTouchUpdate(e, b) {
if (slide_positions.length == 0) { if (slide_positions.length == 0) {
for(var i = 0; i < slides.length; i++) { for(var i = 0; i < slides.length; i++) {
var sp = VMM.Element.position(slides[i]); slide_positions.push( slides[i].leftpos() );
slide_positions.push(sp.left);
} }
} }
if (typeof b.left == "number") { if (typeof b.left == "number") {
var _pos = b.left; var _pos = b.left;
if (_pos < -(VMM.Element.position(slides[current_slide]).left) - (config.slider_width/3)) { var _slide_pos = -(slides[current_slide].leftpos());
if (_pos < _slide_pos - (config.slider_width/3)) {
onNextClick(); onNextClick();
} else if (_pos > -(VMM.Element.position(slides[current_slide]).left) + (config.slider_width/3)) { } else if (_pos > _slide_pos + (config.slider_width/3)) {
onPrevClick(); onPrevClick();
} else { } else {
VMM.Element.animate($slider_container, config.duration, config.ease, {"left": -(VMM.Element.position(slides[current_slide]).left)}); VMM.Element.animate($slider_container, config.duration, config.ease, {"left": _slide_pos });
} }
} else { } else {
VMM.Element.animate($slider_container, config.duration, config.ease, {"left": -(VMM.Element.position(slides[current_slide]).left)}); VMM.Element.animate($slider_container, config.duration, config.ease, {"left": _slide_pos });
} }
if (typeof b.top == "number") { if (typeof b.top == "number") {
VMM.Element.animate($slider_container, config.duration, config.ease, {"top": -b.top}); VMM.Element.animate($slider_container, config.duration, config.ease, {"top": -b.top});
//VMM.Element.animate(layout, _duration, _ease, {scrollTop: VMM.Element.prop(layout, "scrollHeight") + b.top });
//VMM.Element.animate(layout, _duration, _ease, {scrollTop: VMM.Element.prop(layout, "scrollHeight") + VMM.Element.height(layout) });
//VMM.Element.animate($slider_container, config.duration, config.ease, {"top": -400});
} else { } else {
} }
@ -3448,24 +3462,39 @@ if(typeof VMM != 'undefined' && typeof VMM.Slider == 'undefined') {
/* BUILD SLIDES /* BUILD SLIDES
================================================== */ ================================================== */
var buildSlides = function(d) { var buildSlides = function(d) {
// Clear out existing content
VMM.attachElement($slides_items, ""); VMM.attachElement($slides_items, "");
slides = []; slides = [];
for(var i = 0; i < d.length; i++) { for(var i = 0; i < d.length; i++) {
var bw = ""; var _slide = new VMM.Slider.Slide(d[i], $slides_items);
var _slide; //_slide.show();
var _media;
bw = VMM.createElement("div", d[i].content, "content");
_slide = VMM.appendAndGetElement($slides_items, "<div>", "slider-item" , bw);
slides.push(_slide); slides.push(_slide);
} }
}
var preloadSlides = function(skip) {
if (skip) {
preloadTimeOutSlides();
} else {
timer = setTimeout(preloadTimeOutSlides, config.duration);
}
}
var preloadTimeOutSlides = function() {
trace("preloadTimeOutSlides");
trace("CURRENT SLIDE: " + current_slide);
for(var j = 0; j < config.preload; j++) {
if ( !((current_slide + j) >= slides.length - 1)) {
trace("PRELOAD: " + (current_slide + j) );
slides[current_slide + j].show();
}
if ( !( (current_slide - j) < 0 ) ) {
trace("PRELOAD: " + (current_slide - j) );
slides[current_slide - j].show();
}
}
sizeSlides();
} }
/* SIZE SLIDES /* SIZE SLIDES
@ -3514,7 +3543,6 @@ if(typeof VMM != 'undefined' && typeof VMM.Slider == 'undefined') {
mediasize.text_media.width = config.slider.content.width; mediasize.text_media.width = config.slider.content.width;
mediasize.text_media.height = ((config.slider.height/100) * 50 ) - 50; mediasize.text_media.height = ((config.slider.height/100) * 50 ) - 50;
//mediasize.media.height = ((config.slider.height/100) * 80 ) - 40;
mediasize.media.height = ((config.slider.height/100) * 70 ) - 40; mediasize.media.height = ((config.slider.height/100) * 70 ) - 40;
mediasize.text_media.video = VMM.Util.ratio.fit(mediasize.text_media.width, mediasize.text_media.height, 16, 9); mediasize.text_media.video = VMM.Util.ratio.fit(mediasize.text_media.width, mediasize.text_media.height, 16, 9);
@ -3535,9 +3563,9 @@ if(typeof VMM != 'undefined' && typeof VMM.Slider == 'undefined') {
// MAINTAINS VERTICAL CENTER IF IT CAN // MAINTAINS VERTICAL CENTER IF IT CAN
for(var i = 0; i < slides.length; i++) { for(var i = 0; i < slides.length; i++) {
if (VMM.Element.height(VMM.Element.find( slides[i], ".content")) > config.slider.height) { if (VMM.Element.height(VMM.Element.find( slides[i], ".content")) > config.slider.height) {
VMM.Element.css(slides[i], "display", "block" ); slides[i].css("display", "block");
} else { } else {
VMM.Element.css(slides[i], "display", "table" ); slides[i].css("display", "table");
} }
} }
@ -3607,7 +3635,8 @@ if(typeof VMM != 'undefined' && typeof VMM.Slider == 'undefined') {
var pos = 0; var pos = 0;
for(var i = 0; i < slides.length; i++) { for(var i = 0; i < slides.length; i++) {
pos = i * (config.slider.width+config.spacing); pos = i * (config.slider.width+config.spacing);
VMM.Element.css(slides[i], "left", pos); //VMM.Element.css(slides[i], "left", pos);
slides[i].leftpos(pos);
} }
} }
@ -3617,13 +3646,14 @@ if(typeof VMM != 'undefined' && typeof VMM.Slider == 'undefined') {
var _ease = "linear"; var _ease = "linear";
for(var i = 0; i < slides.length; i++) { for(var i = 0; i < slides.length; i++) {
if (i == current_slide) { if (i == current_slide) {
VMM.Element.animate(slides[i], config.duration, _ease, {"opacity": 1}); //VMM.Element.animate(slides[i], config.duration, _ease, {"opacity": 1});
} else if (i == current_slide - 1) { slides[i].animate(config.duration, _ease, {"opacity": 1});
VMM.Element.animate(slides[i], config.duration, _ease, {"opacity": 0.1}); } else if (i == current_slide - 1 || i == current_slide + 1) {
} else if (i == current_slide + 1) { //VMM.Element.animate(slides[i], config.duration, _ease, {"opacity": 0.1});
VMM.Element.animate(slides[i], config.duration, _ease, {"opacity": 0.1}); slides[i].animate(config.duration, _ease, {"opacity": 0.1});
} else { } else {
VMM.Element.css(slides[i], "opacity", n); //VMM.Element.css(slides[i], "opacity", n);
slides[i].opacity(n);
} }
} }
} }
@ -3644,21 +3674,14 @@ if(typeof VMM != 'undefined' && typeof VMM.Slider == 'undefined') {
var _duration = config.duration; var _duration = config.duration;
var is_last = false; var is_last = false;
var is_first = false; var is_first = false;
var _pos = slides[current_slide].leftpos();
//var _pos = VMM.Element.position(slides[current_slide]);
if (current_slide == 0) { if (current_slide == 0) {is_first = true};
is_first = true; if (current_slide +1 >= slides.length) {is_last = true};
}
if (current_slide +1 >= slides.length) {
is_last = true
}
if (ease != null && ease != "") {_ease = ease}; if (ease != null && ease != "") {_ease = ease};
if (duration != null && duration != "") {_duration = duration}; if (duration != null && duration != "") {_duration = duration};
/* get slide position
================================================== */
var _pos = VMM.Element.position(slides[current_slide]);
/* set proper nav titles and dates etc. /* set proper nav titles and dates etc.
================================================== */ ================================================== */
if (is_first) { if (is_first) {
@ -3683,10 +3706,10 @@ if(typeof VMM != 'undefined' && typeof VMM.Slider == 'undefined') {
/* ANIMATE SLIDE /* ANIMATE SLIDE
================================================== */ ================================================== */
if (fast) { if (fast) {
VMM.Element.css($slider_container, "left", -(_pos.left - config.slider.content.padding)); VMM.Element.css($slider_container, "left", -(_pos - config.slider.content.padding));
} else{ } else{
VMM.Element.stop($slider_container); VMM.Element.stop($slider_container);
VMM.Element.animate($slider_container, _duration, _ease, {"left": -(_pos.left - config.slider.content.padding)}); VMM.Element.animate($slider_container, _duration, _ease, {"left": -(_pos - config.slider.content.padding)});
} }
if (firstrun) { if (firstrun) {
@ -3696,14 +3719,15 @@ if(typeof VMM != 'undefined' && typeof VMM.Slider == 'undefined') {
/* SET Vertical Scoll /* SET Vertical Scoll
================================================== */ ================================================== */
//opacitySlides(0.85); //opacitySlides(0.85);
if (VMM.Element.height(slides[current_slide]) > config.slider_height) { //if (VMM.Element.height(slides[current_slide]) > config.slider_height) {
if (slides[current_slide].height() > config.slider_height) {
VMM.Element.css(".slider", "overflow-y", "scroll" ); VMM.Element.css(".slider", "overflow-y", "scroll" );
} else { } else {
VMM.Element.css(layout, "overflow-y", "hidden" ); VMM.Element.css(layout, "overflow-y", "hidden" );
VMM.Element.animate(layout, _duration, _ease, {scrollTop: VMM.Element.prop(layout, "scrollHeight") - VMM.Element.height(layout) }); VMM.Element.animate(layout, _duration, _ease, {scrollTop: VMM.Element.prop(layout, "scrollHeight") - VMM.Element.height(layout) });
} }
preloadSlides();
//VMM.Element.css(navigation.nextBtnContainer, "left", ( VMM.Element.width(navigation.nextBtnContainer) - config.slider.nav.width) ); //VMM.Element.css(navigation.nextBtnContainer, "left", ( VMM.Element.width(navigation.nextBtnContainer) - config.slider.nav.width) );
} }
@ -3756,7 +3780,8 @@ if(typeof VMM != 'undefined' && typeof VMM.Slider == 'undefined') {
if (VMM.Browser.device == "tablet" || VMM.Browser.device == "mobile") { if (VMM.Browser.device == "tablet" || VMM.Browser.device == "mobile") {
config.duration = 500; config.duration = 500;
__duration = 1000; __duration = 1000;
VMM.TouchSlider.createPanel($slider_container, $slider_container, VMM.Element.width(slides[0]), config.spacing, true); //VMM.TouchSlider.createPanel($slider_container, $slider_container, VMM.Element.width(slides[0]), config.spacing, true);
VMM.TouchSlider.createPanel($slider_container, $slider_container, slides[0].width(), config.spacing, true);
VMM.bindEvent($slider_container, onTouchUpdate, "TOUCHUPDATE"); VMM.bindEvent($slider_container, onTouchUpdate, "TOUCHUPDATE");
} else if (VMM.Browser.device == "mobile") { } else if (VMM.Browser.device == "mobile") {
@ -3782,6 +3807,150 @@ if(typeof VMM != 'undefined' && typeof VMM.Slider == 'undefined') {
/***********************************************
Begin VMM.Slider.Slide.js
***********************************************/
/* Slider Slide
================================================== */
if (typeof VMM.Slider != 'undefined') {
// VMM.Slider.Slide(element, data)
VMM.Slider.Slide = function(d, _parent) {
var data = d;
var slide = {};
var media = "";
var loaded = false;
var element = VMM.appendAndGetElement(_parent, "<div>", "slider-item");
/* PUBLIC
================================================== */
this.show = function() {
trace("LOADED: " + loaded);
if (!loaded) {
render();
}
};
this.hide = function() {
if (loaded) {
removeSlide();
}
};
this.elem = function() {
return element;
};
this.position = function() {
return VMM.Element.position(element);
};
this.leftpos = function(p) {
if(typeof p != 'undefined') {
VMM.Element.css(element, "left", p);
} else {
trace("LEFT: " + VMM.Element.position(element).left);
return VMM.Element.position(element).left
}
};
this.animate = function(d, e, p) {
VMM.Element.animate(element, d, e, p);
};
this.css = function(p, v) {
VMM.Element.css(element, p, v );
}
this.opacity = function(p) {
VMM.Element.css(element, "opacity", p);
}
this.width = function() {
return VMM.Element.width(element);
};
this.height = function() {
return VMM.Element.height(element);
};
/* PRIVATE
================================================== */
var render = function() {
trace(data);
VMM.attachElement(element, "");
VMM.appendElement(element, buildSlide() );
loaded = true;
var timer = setTimeout(VMM.ExternalAPI.pushQues, 500);
};
var removeSlide = function() {
VMM.attachElement(element, "");
loaded = false;
}
var buildSlide = function() {
var c = {slide:"", text: "", media: "", layout: "content-container layout", has: { text: false, media: false }};
var b_slide, c_wrap;
/* DATE
================================================== */
if (data.startdate != null && data.startdate != "") {
if (type.of(data.startdate) == "date") {
if (data.type != "start") {
c.text += VMM.createElement("h2", VMM.Util.date.prettyDate(data.startdate), "date");
}
}
}
/* HEADLINE
================================================== */
if (data.headline != null && data.headline != "") {
if (data.type == "start") {
c.text += VMM.createElement("h2", VMM.Util.linkify_with_twitter(data.headline, "_blank"), "start");
} else {
c.text += VMM.createElement("h3", VMM.Util.linkify_with_twitter(data.headline, "_blank"));
}
}
/* TEXT
================================================== */
if (data.text != null && data.text != "") {
c.has.text = true;
c.text += VMM.createElement("p", VMM.Util.linkify_with_twitter(data.text, "_blank"));
c.text = VMM.createElement("div", c.text, "container");
c.text = VMM.createElement("div", c.text, "text");
}
/* MEDIA
================================================== */
if (data.asset != null && data.asset != "") {
if (data.asset.media != null && data.asset.media != "") {
c.has.media = true;
c.media = VMM.MediaElement.create(data.asset);
}
}
/* COMBINE
================================================== */
if (c.has.text) { c.layout += "-text" };
if (c.has.media){ c.layout += "-media" };
c.slide = VMM.createElement("div", c.text + c.media, c.layout);
c_wrap = VMM.createElement("div", c.slide, "content");
/* RETURN
================================================== */
// return c.slide;
return c_wrap;
};
}
};
/*********************************************** /***********************************************
Begin VMM.Util.js Begin VMM.Util.js
***********************************************/ ***********************************************/
@ -4832,6 +5001,7 @@ if(typeof VMM != 'undefined' && typeof VMM.Language == 'undefined') {
// @codekit-prepend "VMM.TouchSlider.js"; // @codekit-prepend "VMM.TouchSlider.js";
// @codekit-prepend "VMM.DragSlider.js"; // @codekit-prepend "VMM.DragSlider.js";
// @codekit-prepend "VMM.Slider.js"; // @codekit-prepend "VMM.Slider.js";
// @codekit-prepend "VMM.Slider.Slide.js";
// @codekit-prepend "VMM.Util.js"; // @codekit-prepend "VMM.Util.js";
// @codekit-prepend "VMM.LoadLib.js"; // @codekit-prepend "VMM.LoadLib.js";
// @codekit-prepend "VMM.Language.js"; // @codekit-prepend "VMM.Language.js";
@ -4858,7 +5028,7 @@ if(typeof VMM != 'undefined' && typeof VMM.Timeline == 'undefined') {
timeline_id = "#timeline"; timeline_id = "#timeline";
} }
version = "0.98.72"; version = "0.99.00";
trace("TIMELINE VERSION " + version); trace("TIMELINE VERSION " + version);
@ -4868,6 +5038,7 @@ if(typeof VMM != 'undefined' && typeof VMM.Timeline == 'undefined') {
id: timeline_id, id: timeline_id,
type: "timeline", type: "timeline",
maptype: "toner", maptype: "toner",
preload: 4,
current_slide: 0, current_slide: 0,
hash_bookmark: false, hash_bookmark: false,
start_at_end: false, start_at_end: false,
@ -4938,6 +5109,7 @@ if(typeof VMM != 'undefined' && typeof VMM.Timeline == 'undefined') {
config.current_slide = parseInt(hash); config.current_slide = parseInt(hash);
} }
} }
window.onhashchange = function () { window.onhashchange = function () {
if (config.hash_bookmark) { if (config.hash_bookmark) {
if (is_moving) { if (is_moving) {
@ -5175,75 +5347,6 @@ if(typeof VMM != 'undefined' && typeof VMM.Timeline == 'undefined') {
}; };
// BUILD SLIDE CONTENT pass in json object
var buildSlide = function(dd, d_date) {
var d = dd;
var slide = "";
var _valid = false;
var _hasmedia = false;
var _hastext = false;
var c = {};
c._text = "";
c._media = "";
updateSize();
if (type.of(d_date) == "date") {
_valid = true;
if (dd.type != "start") {
c._text += VMM.createElement("h2", VMM.Util.date.prettyDate(d_date), "date");
}
if (d.headline != null && d.headline != "") {
if (d.type == "tweets") {
} else if (dd.type == "start") {
c._text += VMM.createElement("h2", VMM.Util.linkify_with_twitter(d.headline, "_blank"), "start");
} else {
c._text += VMM.createElement("h3", VMM.Util.linkify_with_twitter(d.headline, "_blank"));
}
}
if (d.text != null && d.text != "") {
_hastext = true;
c._text += VMM.createElement("p", VMM.Util.linkify_with_twitter(d.text, "_blank"));
}
c._text = VMM.createElement("div", c._text, "container");
c._text = VMM.createElement("div", c._text, "text");
}
if (_valid) {
var _layout_class = "content-container layout";
if (d.asset != null && d.asset != "") {
if (d.asset.media != null && d.asset.media != "") {
_hasmedia = true;
c._media = VMM.MediaElement.create("", d.asset, true, config.feature.width, config.feature.height);
}
}
if (_hastext) {
_layout_class += "-text"
}
if (_hasmedia) {
_layout_class += "-media";
}
slide = VMM.createElement("div", c._text + c._media, _layout_class);
return slide;
}
return slide;
}
var updateSize = function() { var updateSize = function() {
trace("UPDATE SIZE"); trace("UPDATE SIZE");
config.width = VMM.Element.width($timeline); config.width = VMM.Element.width($timeline);
@ -5276,9 +5379,6 @@ if(typeof VMM != 'undefined' && typeof VMM.Timeline == 'undefined') {
// START DATE // START DATE
if (data.date[i].type == "tweets") { if (data.date[i].type == "tweets") {
_date.startdate = VMM.ExternalAPI.twitter.parseTwitterDate(data.date[i].startDate); _date.startdate = VMM.ExternalAPI.twitter.parseTwitterDate(data.date[i].startDate);
} else if (data.date[i].type == "google spreadsheet") {
//_date.startdate = new Date(Date.parse(data.date[i].startDate));
_date.startdate = VMM.Util.date.parse(data.date[i].startDate);
} else { } else {
_date.startdate = VMM.Util.date.parse(data.date[i].startDate); _date.startdate = VMM.Util.date.parse(data.date[i].startDate);
} }
@ -5289,9 +5389,6 @@ if(typeof VMM != 'undefined' && typeof VMM.Timeline == 'undefined') {
if (data.date[i].endDate != null && data.date[i].endDate != "") { if (data.date[i].endDate != null && data.date[i].endDate != "") {
if (data.date[i].type == "tweets") { if (data.date[i].type == "tweets") {
_date.enddate = VMM.ExternalAPI.twitter.parseTwitterDate(data.date[i].endDate); _date.enddate = VMM.ExternalAPI.twitter.parseTwitterDate(data.date[i].endDate);
} else if (data.date[i].type == "google spreadsheet") {
//_date.enddate = new Date(Date.parse(data.date[i].endDate));
_date.enddate = VMM.Util.date.parse(data.date[i].endDate);
} else { } else {
_date.enddate = VMM.Util.date.parse(data.date[i].endDate); _date.enddate = VMM.Util.date.parse(data.date[i].endDate);
} }
@ -5300,17 +5397,15 @@ if(typeof VMM != 'undefined' && typeof VMM.Timeline == 'undefined') {
} }
_date.title = data.date[i].headline; _date.title = data.date[i].headline;
_date.headline = data.date[i].headline;
_date.type = data.date[i].type; _date.type = data.date[i].type;
_date.date = VMM.Util.date.prettyDate(_date.startdate); _date.date = VMM.Util.date.prettyDate(_date.startdate);
_date.asset = data.date[i].asset; _date.asset = data.date[i].asset;
_date.fulldate = _date.startdate.getTime(); _date.fulldate = _date.startdate.getTime();
_date.text = data.date[i].text;
_date.content = "";
// BUILD SLIDE CONTENT
_date.content = buildSlide(data.date[i], _date.startdate);
if (_date.content != null && _date.content != "") {
_dates.push(_date); _dates.push(_date);
}
} }
@ -5327,24 +5422,9 @@ if(typeof VMM != 'undefined' && typeof VMM.Timeline == 'undefined') {
if (data.headline != null && data.headline != "" && data.text != null && data.text != "") { if (data.headline != null && data.headline != "" && data.text != null && data.text != "") {
trace("HAS STARTPAGE"); trace("HAS STARTPAGE");
var _date = {}; var _date = {};
if (data.type == "google spreadsheet") {
trace("google spreadsheet startpage date " + data.startDate);
//_date.startdate = new Date(Date.parse(data.startDate));
} else {
_date.startdate = VMM.Util.date.parse(data.startDate);
}
_date.startdate = new Date(_dates[0].startdate);
var td = _dates[0].startdate;
var td_num = 0; var td_num = 0;
/* var td = _dates[0].startdate;
if (_dates[0].startdate.getDate() > 1) { _date.startdate = VMM.Util.date.parse(data.startDate);
_date.startdate.setDate(td.getDate() - 1);
} else if (_dates[0].startdate.getHours() > 0) {
_date.startdate.setHours(td.getHours() - 1);
}
*/
if (td.getMonth() === 0 && td.getDate() == 1 && td.getHours() === 0 && td.getMinutes() === 0 ) { if (td.getMonth() === 0 && td.getDate() == 1 && td.getHours() === 0 && td.getMinutes() === 0 ) {
// trace("YEAR ONLY"); // trace("YEAR ONLY");
@ -5372,11 +5452,9 @@ if(typeof VMM != 'undefined' && typeof VMM.Timeline == 'undefined') {
_date.date = VMM.Util.date.prettyDate(data.startDate); _date.date = VMM.Util.date.prettyDate(data.startDate);
_date.asset = data.asset; _date.asset = data.asset;
_date.fulldate = _date.startdate.getTime(); _date.fulldate = _date.startdate.getTime();
_date.content = buildSlide(_date, _date.startdate);
if (_date.content != null && _date.content != "" || _date.title != null && _date.title != "") {
_dates.push(_date); _dates.push(_date);
} }
}
/* CUSTOM SORT /* CUSTOM SORT
================================================== */ ================================================== */

Write Preview
Loading…
Cancel
Save