Browse Source

Renamed VMM.Element to VMM.Lib to reflect that it's a library abstraction

pull/75/head
Zach Wise 13 years ago
parent
commit
8fa7835a34
  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. 14
      source/js/VMM.DragSlider.js
  13. 4
      source/js/VMM.ExternalAPI.js
  14. 111
      source/js/VMM.Library.js
  15. 18
      source/js/VMM.Slider.Slide.js
  16. 164
      source/js/VMM.Slider.js
  17. 54
      source/js/VMM.Timeline.DataObj.js
  18. 96
      source/js/VMM.Timeline.TimeNav.js
  19. 18
      source/js/VMM.Timeline.js
  20. 26
      source/js/VMM.TouchSlider.js
  21. 8
      timeline-min.js
  22. 505
      timeline.js

8
locale/de.js

File diff suppressed because one or more lines are too long

8
locale/en.js

File diff suppressed because one or more lines are too long

8
locale/es.js

File diff suppressed because one or more lines are too long

8
locale/fr.js

File diff suppressed because one or more lines are too long

8
locale/is.js

File diff suppressed because one or more lines are too long

8
locale/it.js

File diff suppressed because one or more lines are too long

8
locale/kr.js

File diff suppressed because one or more lines are too long

8
locale/nl.js

File diff suppressed because one or more lines are too long

8
locale/pt-br.js

File diff suppressed because one or more lines are too long

8
locale/zh-ch.js

File diff suppressed because one or more lines are too long

8
locale/zh-tw.js

File diff suppressed because one or more lines are too long

14
source/js/VMM.DragSlider.js

@ -72,12 +72,12 @@ if(typeof VMM != 'undefined' && typeof VMM.DragSlider == 'undefined') {
VMM.DragSlider.startLeft = VMM.DragSlider.getLeft(elem); VMM.DragSlider.startLeft = VMM.DragSlider.getLeft(elem);
VMM.DragSlider.dragStartTime = new Date().getTime(); VMM.DragSlider.dragStartTime = new Date().getTime();
VMM.DragSlider.dragWidth = VMM.Element.width(delem); VMM.DragSlider.dragWidth = VMM.Lib.width(delem);
// CANCEL CURRENT ANIMATION IF ANIMATING // CANCEL CURRENT ANIMATION IF ANIMATING
var _newx = Math.round(VMM.DragSlider.startX - e.pageX - VMM.DragSlider.startLeft); var _newx = Math.round(VMM.DragSlider.startX - e.pageX - VMM.DragSlider.startLeft);
VMM.Element.stop(elem); VMM.Lib.stop(elem);
VMM.bindEvent(delem, VMM.DragSlider.onDragMove, "mousemove", {element: elem}); VMM.bindEvent(delem, VMM.DragSlider.onDragMove, "mousemove", {element: elem});
}, },
@ -87,7 +87,7 @@ if(typeof VMM != 'undefined' && typeof VMM.DragSlider == 'undefined') {
if (VMM.DragSlider.getLeft(elem) > 0) { if (VMM.DragSlider.getLeft(elem) > 0) {
//(VMM.DragSlider.dragWidth/2) //(VMM.DragSlider.dragWidth/2)
//This means they dragged to the right past the first item //This means they dragged to the right past the first item
//VMM.Element.animate(elem, 1000, "linear", {"left": 0}); //VMM.Lib.animate(elem, 1000, "linear", {"left": 0});
//VMM.fireEvent(elem, "DRAGUPDATE", [0]); //VMM.fireEvent(elem, "DRAGUPDATE", [0]);
} else { } else {
@ -103,12 +103,12 @@ if(typeof VMM != 'undefined' && typeof VMM.DragSlider == 'undefined') {
VMM.DragSlider.sliding = true; VMM.DragSlider.sliding = true;
if (VMM.DragSlider.startX > e.pageX) { if (VMM.DragSlider.startX > e.pageX) {
//Sliding to the left //Sliding to the left
VMM.Element.css(elem, 'left', -(VMM.DragSlider.startX - e.pageX - VMM.DragSlider.startLeft)); VMM.Lib.css(elem, 'left', -(VMM.DragSlider.startX - e.pageX - VMM.DragSlider.startLeft));
VMM.DragSlider.slidingLeft = true; VMM.DragSlider.slidingLeft = true;
} else { } else {
//Sliding to the right //Sliding to the right
var left = (e.pageX - VMM.DragSlider.startX + VMM.DragSlider.startLeft); var left = (e.pageX - VMM.DragSlider.startX + VMM.DragSlider.startLeft);
VMM.Element.css(elem, 'left', -(VMM.DragSlider.startX - e.pageX - VMM.DragSlider.startLeft)); VMM.Lib.css(elem, 'left', -(VMM.DragSlider.startX - e.pageX - VMM.DragSlider.startLeft));
VMM.DragSlider.slidingLeft = false; VMM.DragSlider.slidingLeft = false;
} }
}, },
@ -133,14 +133,14 @@ if(typeof VMM != 'undefined' && typeof VMM.DragSlider == 'undefined') {
VMM.fireEvent(elem, "DRAGUPDATE", [_r_object]); VMM.fireEvent(elem, "DRAGUPDATE", [_r_object]);
var _ease = "easeOutExpo"; var _ease = "easeOutExpo";
if (_r_object.time > 0) { if (_r_object.time > 0) {
VMM.Element.animate(elem, _r_object.time, _ease, {"left": _r_object.left}); VMM.Lib.animate(elem, _r_object.time, _ease, {"left": _r_object.left});
}; };
//VMM.DragSlider.startX = null; //VMM.DragSlider.startX = null;
}, },
getLeft: function(elem) { getLeft: function(elem) {
return parseInt(VMM.Element.css(elem, 'left').substring(0, VMM.Element.css(elem, 'left').length - 2), 10); return parseInt(VMM.Lib.css(elem, 'left').substring(0, VMM.Lib.css(elem, 'left').length - 2), 10);
} }
} }

4
source/js/VMM.ExternalAPI.js

@ -504,8 +504,8 @@ if(typeof VMM != 'undefined' && typeof VMM.ExternalAPI == 'undefined') {
} }
var flickr_img_thumb = d.sizes.size[0].source; var flickr_img_thumb = d.sizes.size[0].source;
VMM.Element.attr("#"+flickr_large_id, "src", flickr_img_large); VMM.Lib.attr("#"+flickr_large_id, "src", flickr_img_large);
VMM.Element.attr("#"+flickr_thumb_id, "src", flickr_img_thumb); VMM.Lib.attr("#"+flickr_thumb_id, "src", flickr_img_thumb);
} }
}, },

111
source/js/VMM.Library.js

@ -2,14 +2,13 @@
================================================== */ ================================================== */
if(typeof VMM != 'undefined') { if(typeof VMM != 'undefined') {
//VMM.attachElement(element, content);
VMM.attachElement = function(element, content) { VMM.attachElement = function(element, content) {
if( typeof( jQuery ) != 'undefined' ){ if( typeof( jQuery ) != 'undefined' ){
jQuery(element).html(content); jQuery(element).html(content);
} }
}; };
//VMM.appendElement(element, content);
VMM.appendElement = function(element, content) { VMM.appendElement = function(element, content) {
if( typeof( jQuery ) != 'undefined' ){ if( typeof( jQuery ) != 'undefined' ){
@ -26,7 +25,7 @@ if(typeof VMM != 'undefined') {
} }
}; };
//VMM.getElement(element);
VMM.getElement = function(element, p) { VMM.getElement = function(element, p) {
var e; var e;
if( typeof( jQuery ) != 'undefined' ){ if( typeof( jQuery ) != 'undefined' ){
@ -40,8 +39,7 @@ if(typeof VMM != 'undefined') {
} }
}; };
//VMM.bindEvent(element, the_handler, the_event_type, event_data);
//VMM.bindEvent(window, the_handler, "event type", {event_data});
VMM.bindEvent = function(element, the_handler, the_event_type, event_data) { VMM.bindEvent = function(element, the_handler, the_event_type, event_data) {
var e; var e;
var _event_type = "click"; var _event_type = "click";
@ -62,7 +60,7 @@ if(typeof VMM != 'undefined') {
} }
}; };
//VMM.unbindEvent(window, the_handler, "event type");
VMM.unbindEvent = function(element, the_handler, the_event_type) { VMM.unbindEvent = function(element, the_handler, the_event_type) {
var e; var e;
var _event_type = "click"; var _event_type = "click";
@ -79,7 +77,7 @@ if(typeof VMM != 'undefined') {
} }
}; };
//VMM.fireEvent(element, "resize", [data]);
VMM.fireEvent = function(element, the_event_type, the_data) { VMM.fireEvent = function(element, the_event_type, the_data) {
var e; var e;
var _event_type = "click"; var _event_type = "click";
@ -100,7 +98,6 @@ if(typeof VMM != 'undefined') {
}; };
// VMM.getJSON(url, the_function);
VMM.getJSON = function(url, data, callback) { VMM.getJSON = function(url, data, callback) {
if( typeof( jQuery ) != 'undefined' ){ if( typeof( jQuery ) != 'undefined' ){
@ -138,14 +135,14 @@ if(typeof VMM != 'undefined') {
} }
} }
} }
// VMM.parseJSON(the_json);
VMM.parseJSON = function(the_json) { VMM.parseJSON = function(the_json) {
if( typeof( jQuery ) != 'undefined' ){ if( typeof( jQuery ) != 'undefined' ){
return jQuery.parseJSON(the_json); return jQuery.parseJSON(the_json);
} }
} }
// ADD ELEMENT AND RETURN IT // ADD ELEMENT AND RETURN IT
// VMM.appendAndGetElement(append_to_element, tag, cName, content, [attrib]);
VMM.appendAndGetElement = function(append_to_element, tag, cName, content) { VMM.appendAndGetElement = function(append_to_element, tag, cName, content) {
var e; var e;
var _tag = "<div>"; var _tag = "<div>";
@ -180,12 +177,12 @@ if(typeof VMM != 'undefined') {
}; };
VMM.Element = ({ VMM.Lib = ({
init: function() { init: function() {
return this; return this;
}, },
// VMM.Element.hide(element);
hide: function(element, duration) { hide: function(element, duration) {
if (duration != null && duration != "") { if (duration != null && duration != "") {
if( typeof( jQuery ) != 'undefined' ){ if( typeof( jQuery ) != 'undefined' ){
@ -198,25 +195,25 @@ if(typeof VMM != 'undefined') {
} }
}, },
// VMM.Element.remove(element);
remove: function(element) { remove: function(element) {
if( typeof( jQuery ) != 'undefined' ){ if( typeof( jQuery ) != 'undefined' ){
jQuery(element).remove(); jQuery(element).remove();
} }
}, },
// VMM.Element.detach(element);
detach: function(element) { detach: function(element) {
if( typeof( jQuery ) != 'undefined' ){ if( typeof( jQuery ) != 'undefined' ){
jQuery(element).detach(); jQuery(element).detach();
} }
}, },
// VMM.Element.append(element, value);
append: function(element, value) { append: function(element, value) {
if( typeof( jQuery ) != 'undefined' ){ if( typeof( jQuery ) != 'undefined' ){
jQuery(element).append(value); jQuery(element).append(value);
} }
}, },
// VMM.Element.show(element);
show: function(element, duration) { show: function(element, duration) {
if (duration != null && duration != "") { if (duration != null && duration != "") {
if( typeof( jQuery ) != 'undefined' ){ if( typeof( jQuery ) != 'undefined' ){
@ -229,7 +226,7 @@ if(typeof VMM != 'undefined') {
} }
}, },
// VMM.Element.load(element, callback_function, event_data);
load: function(element, callback_function, event_data) { load: function(element, callback_function, event_data) {
var _event_data = {elem:element}; // return element by default var _event_data = {elem:element}; // return element by default
if (_event_data != null && _event_data != "") { if (_event_data != null && _event_data != "") {
@ -239,19 +236,19 @@ if(typeof VMM != 'undefined') {
jQuery(element).load(_event_data, callback_function); jQuery(element).load(_event_data, callback_function);
} }
}, },
//VMM.Element.addClass(element, cName);
addClass: function(element, cName) { addClass: function(element, cName) {
if( typeof( jQuery ) != 'undefined' ){ if( typeof( jQuery ) != 'undefined' ){
jQuery(element).addClass(cName); jQuery(element).addClass(cName);
} }
}, },
//VMM.Element.removeClass(element, cName);
removeClass: function(element, cName) { removeClass: function(element, cName) {
if( typeof( jQuery ) != 'undefined' ){ if( typeof( jQuery ) != 'undefined' ){
jQuery(element).removeClass(cName); jQuery(element).removeClass(cName);
} }
}, },
//VMM.Element.attr(element, aName, value);
attr: function(element, aName, value) { attr: function(element, aName, value) {
if (value != null && value != "") { if (value != null && value != "") {
if( typeof( jQuery ) != 'undefined' ){ if( typeof( jQuery ) != 'undefined' ){
@ -263,15 +260,15 @@ if(typeof VMM != 'undefined') {
} }
} }
}, },
//VMM.Element.prop(element, aName, value);
prop: function(element, aName, value) { prop: function(element, aName, value) {
if (typeof jQuery == 'undefined' || !/[1-9]\.[3-9].[1-9]/.test(jQuery.fn.jquery)) { if (typeof jQuery == 'undefined' || !/[1-9]\.[3-9].[1-9]/.test(jQuery.fn.jquery)) {
VMM.Element.attribute(element, aName, value); VMM.Lib.attribute(element, aName, value);
} else { } else {
jQuery(element).prop(aName, value); jQuery(element).prop(aName, value);
} }
}, },
//VMM.Element.attribute(element, aName, value);
attribute: function(element, aName, value) { attribute: function(element, aName, value) {
if (value != null && value != "") { if (value != null && value != "") {
@ -284,9 +281,7 @@ if(typeof VMM != 'undefined') {
} }
} }
}, },
/* Sets or gets the visability of a dom element
================================================== */
//VMM.Element.visible(element, show);
visible: function(element, show) { visible: function(element, show) {
if (show != null) { if (show != null) {
if( typeof( jQuery ) != 'undefined' ){ if( typeof( jQuery ) != 'undefined' ){
@ -306,9 +301,7 @@ if(typeof VMM != 'undefined') {
} }
} }
}, },
/* Sets a style for the specified element or gets the style
================================================== */
//VMM.Element.css(element, prop, value);
css: function(element, prop, value) { css: function(element, prop, value) {
if (value != null && value != "") { if (value != null && value != "") {
@ -328,9 +321,7 @@ if(typeof VMM != 'undefined') {
return jQuery(element).css(propval); return jQuery(element).css(propval);
} }
}, },
/* Gets offset
================================================== */
//VMM.Element.offset(element);
offset: function(element) { offset: function(element) {
var p; var p;
if( typeof( jQuery ) != 'undefined' ){ if( typeof( jQuery ) != 'undefined' ){
@ -338,9 +329,7 @@ if(typeof VMM != 'undefined') {
} }
return p; return p;
}, },
/* Gets position
================================================== */
//VMM.Element.position(element);
position: function(element) { position: function(element) {
var p; var p;
if( typeof( jQuery ) != 'undefined' ){ if( typeof( jQuery ) != 'undefined' ){
@ -348,9 +337,7 @@ if(typeof VMM != 'undefined') {
} }
return p; return p;
}, },
/* Sets or gets the width of a dom element
================================================== */
//VMM.Element.width(element, s);
width: function(element, s) { width: function(element, s) {
if (s != null && s != "") { if (s != null && s != "") {
if( typeof( jQuery ) != 'undefined' ){ if( typeof( jQuery ) != 'undefined' ){
@ -362,8 +349,7 @@ if(typeof VMM != 'undefined') {
} }
} }
}, },
/* Sets or gets the width of a dom element
================================================== */
height: function(element, s) { height: function(element, s) {
if (s != null && s != "") { if (s != null && s != "") {
if( typeof( jQuery ) != 'undefined' ){ if( typeof( jQuery ) != 'undefined' ){
@ -375,26 +361,20 @@ if(typeof VMM != 'undefined') {
} }
} }
}, },
/* TOGGLE CLASS
================================================== */
// VMM.Element.toggleClass(element, cName);
toggleClass: function(element, cName) { toggleClass: function(element, cName) {
if( typeof( jQuery ) != 'undefined' ){ if( typeof( jQuery ) != 'undefined' ){
jQuery(element).toggleClass(cName); jQuery(element).toggleClass(cName);
} }
}, },
/* Each
================================================== */
// VMM.Element.each(element, return_function);
each:function(element, return_function) { each:function(element, return_function) {
if( typeof( jQuery ) != 'undefined' ){ if( typeof( jQuery ) != 'undefined' ){
jQuery(element).each(return_function); jQuery(element).each(return_function);
} }
}, },
/* Each
================================================== */
// VMM.Element.html(element, str);
html: function(element, str) { html: function(element, str) {
var e; var e;
if( typeof( jQuery ) != 'undefined' ){ if( typeof( jQuery ) != 'undefined' ){
@ -415,23 +395,19 @@ if(typeof VMM != 'undefined') {
} }
}, },
/* Find
================================================== */
// VMM.Element.find(element, selec);
find: function(element, selec) { find: function(element, selec) {
if( typeof( jQuery ) != 'undefined' ){ if( typeof( jQuery ) != 'undefined' ){
return jQuery(element).find(selec); return jQuery(element).find(selec);
} }
}, },
/* Animate
================================================== */
// VMM.Element.stop(element);
stop: function(element) { stop: function(element) {
if( typeof( jQuery ) != 'undefined' ){ if( typeof( jQuery ) != 'undefined' ){
jQuery(element).stop(); jQuery(element).stop();
} }
}, },
// VMM.Element.animate(element, duration, ease, att, callback_function);
animate: function(element, duration, ease, att, callback_function) { animate: function(element, duration, ease, att, callback_function) {
var _ease = "easein"; var _ease = "easein";
@ -462,12 +438,12 @@ if(typeof VMM != 'undefined') {
var _tdd = Math.round((_duration/1500)*10)/10 var _tdd = Math.round((_duration/1500)*10)/10
var __duration = _tdd + 's'; var __duration = _tdd + 's';
VMM.Element.css(element, '-webkit-transition', 'all '+ __duration + ' ease'); VMM.Lib.css(element, '-webkit-transition', 'all '+ __duration + ' ease');
VMM.Element.css(element, '-moz-transition', 'all '+ __duration + ' ease'); VMM.Lib.css(element, '-moz-transition', 'all '+ __duration + ' ease');
VMM.Element.css(element, '-o-transition', 'all '+ __duration + ' ease'); VMM.Lib.css(element, '-o-transition', 'all '+ __duration + ' ease');
VMM.Element.css(element, '-ms-transition', 'all '+ __duration + ' ease'); VMM.Lib.css(element, '-ms-transition', 'all '+ __duration + ' ease');
VMM.Element.css(element, 'transition', 'all '+ __duration + ' ease'); VMM.Lib.css(element, 'transition', 'all '+ __duration + ' ease');
VMM.Element.cssmultiple(element, _att); VMM.Lib.cssmultiple(element, _att);
//callback_function(); //callback_function();
/* /*
@ -490,17 +466,6 @@ if(typeof VMM != 'undefined') {
} }
} }
/*
VMM.Element.cssmultiple(element, {
'-webkit-transition': 'all 1s ease-in-out',
'-moz-transition': 'all 1s ease-in-out',
'-o-transition': 'all 1s ease-in-out',
'-ms-transition': 'all 1s ease-in-out',
'transition': 'all 1s ease-in-out',
});
*/
}, },
}).init(); }).init();

18
source/js/VMM.Slider.Slide.js

@ -29,36 +29,36 @@ if (typeof VMM.Slider != 'undefined') {
}; };
this.position = function() { this.position = function() {
return VMM.Element.position(element); return VMM.Lib.position(element);
}; };
this.leftpos = function(p) { this.leftpos = function(p) {
if(typeof p != 'undefined') { if(typeof p != 'undefined') {
VMM.Element.css(element, "left", p); VMM.Lib.css(element, "left", p);
} else { } else {
trace("LEFT: " + VMM.Element.position(element).left); trace("LEFT: " + VMM.Lib.position(element).left);
return VMM.Element.position(element).left return VMM.Lib.position(element).left
} }
}; };
this.animate = function(d, e, p) { this.animate = function(d, e, p) {
VMM.Element.animate(element, d, e, p); VMM.Lib.animate(element, d, e, p);
}; };
this.css = function(p, v) { this.css = function(p, v) {
VMM.Element.css(element, p, v ); VMM.Lib.css(element, p, v );
} }
this.opacity = function(p) { this.opacity = function(p) {
VMM.Element.css(element, "opacity", p); VMM.Lib.css(element, "opacity", p);
} }
this.width = function() { this.width = function() {
return VMM.Element.width(element); return VMM.Lib.width(element);
}; };
this.height = function() { this.height = function() {
return VMM.Element.height(element); return VMM.Lib.height(element);
}; };
/* PRIVATE /* PRIVATE

164
source/js/VMM.Slider.js

@ -151,15 +151,15 @@ if(typeof VMM != 'undefined' && typeof VMM.Slider == 'undefined') {
current_width = config.slider.width; current_width = config.slider.width;
config.slider.nav.height = VMM.Element.height(navigation.prevBtnContainer); config.slider.nav.height = VMM.Lib.height(navigation.prevBtnContainer);
config.slider.content.width = current_width - (config.slider.content.padding *2); config.slider.content.width = current_width - (config.slider.content.padding *2);
VMM.Element.width($slides_items, (slides.length * config.slider.content.width)); VMM.Lib.width($slides_items, (slides.length * config.slider.content.width));
if (_from_start) { if (_from_start) {
var _pos = slides[current_slide].leftpos(); var _pos = slides[current_slide].leftpos();
VMM.Element.css($slider_container, "left", _pos); VMM.Lib.css($slider_container, "left", _pos);
} }
// RESIZE SLIDES // RESIZE SLIDES
@ -169,22 +169,22 @@ if(typeof VMM != 'undefined' && typeof VMM.Slider == 'undefined') {
positionSlides(); positionSlides();
// POSITION NAV // POSITION NAV
VMM.Element.css(navigation.nextBtn, "left", (current_width - config.slider.nav.width)); VMM.Lib.css(navigation.nextBtn, "left", (current_width - config.slider.nav.width));
VMM.Element.height(navigation.prevBtn, config.slider.height); VMM.Lib.height(navigation.prevBtn, config.slider.height);
VMM.Element.height(navigation.nextBtn, config.slider.height); VMM.Lib.height(navigation.nextBtn, config.slider.height);
VMM.Element.css(navigation.nextBtnContainer, "top", ( (config.slider.height/2) - (config.slider.nav.height/2) ) ); VMM.Lib.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.Lib.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.Lib.height($slider_mask, config.slider.height);
VMM.Element.width($slider_mask, current_width); VMM.Lib.width($slider_mask, current_width);
if (_go_to_slide) { if (_go_to_slide) {
goToSlide(current_slide, "linear", 1); goToSlide(current_slide, "linear", 1);
}; };
if (current_slide == 0) { if (current_slide == 0) {
VMM.Element.visible(navigation.prevBtn, false); VMM.Lib.visible(navigation.prevBtn, false);
} }
} }
@ -193,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": -(slides[current_slide].leftpos()) } ); VMM.Lib.animate($slider_container, config.duration, config.ease, {"left": -(slides[current_slide].leftpos()) } );
} else { } else {
goToSlide(current_slide+1); goToSlide(current_slide+1);
upDate(); upDate();
@ -236,14 +236,14 @@ if(typeof VMM != 'undefined' && typeof VMM.Slider == 'undefined') {
} else if (_pos > _slide_pos + (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": _slide_pos }); VMM.Lib.animate($slider_container, config.duration, config.ease, {"left": _slide_pos });
} }
} else { } else {
VMM.Element.animate($slider_container, config.duration, config.ease, {"left": _slide_pos }); VMM.Lib.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.Lib.animate($slider_container, config.duration, config.ease, {"top": -b.top});
} else { } else {
} }
@ -324,8 +324,8 @@ if(typeof VMM != 'undefined' && typeof VMM.Slider == 'undefined') {
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);
mediasize.media.video = VMM.Util.ratio.fit(mediasize.media.width, mediasize.media.height, 16, 9); mediasize.media.video = VMM.Util.ratio.fit(mediasize.media.width, mediasize.media.height, 16, 9);
VMM.Element.css(".slider-item", "width", config.slider.content.width ); VMM.Lib.css(".slider-item", "width", config.slider.content.width );
VMM.Element.height(".slider-item", config.slider.height); VMM.Lib.height(".slider-item", config.slider.height);
// HANDLE SMALLER SIZES // HANDLE SMALLER SIZES
var is_skinny = false; var is_skinny = false;
@ -347,21 +347,21 @@ if(typeof VMM != 'undefined' && typeof VMM.Slider == 'undefined') {
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);
mediasize.media.video = VMM.Util.ratio.fit(mediasize.media.width, mediasize.media.height, 16, 9); mediasize.media.video = VMM.Util.ratio.fit(mediasize.media.width, mediasize.media.height, 16, 9);
VMM.Element.css(".slider-item .layout-text-media .text", "width", "100%" ); VMM.Lib.css(".slider-item .layout-text-media .text", "width", "100%" );
VMM.Element.css(".slider-item .layout-text-media .text", "display", "block" ); VMM.Lib.css(".slider-item .layout-text-media .text", "display", "block" );
VMM.Element.css(".slider-item .layout-text-media .text .container", "display", "block" ); VMM.Lib.css(".slider-item .layout-text-media .text .container", "display", "block" );
VMM.Element.css(".slider-item .layout-text-media .text .container", "width", config.slider.content.width ); VMM.Lib.css(".slider-item .layout-text-media .text .container", "width", config.slider.content.width );
VMM.Element.css(".slider-item .layout-text-media .media", "float", "none" ); VMM.Lib.css(".slider-item .layout-text-media .media", "float", "none" );
VMM.Element.css(".slider-item .media blockquote p", "line-height", "18px" ); VMM.Lib.css(".slider-item .media blockquote p", "line-height", "18px" );
VMM.Element.css(".slider-item .media blockquote p", "font-size", "16px" ); VMM.Lib.css(".slider-item .media blockquote p", "font-size", "16px" );
VMM.Element.css(".slider-item", "overflow-y", "auto" ); VMM.Lib.css(".slider-item", "overflow-y", "auto" );
// 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.Lib.height(VMM.Lib.find( slides[i], ".content")) > config.slider.height) {
slides[i].css("display", "block"); slides[i].css("display", "block");
} else { } else {
slides[i].css("display", "table"); slides[i].css("display", "table");
@ -370,60 +370,60 @@ if(typeof VMM != 'undefined' && typeof VMM.Slider == 'undefined') {
} else { } else {
VMM.Element.css(".slider-item .layout-text-media .text", "width", "40%" ); VMM.Lib.css(".slider-item .layout-text-media .text", "width", "40%" );
VMM.Element.css(".slider-item .layout-text-media .text", "display", "table-cell" ); VMM.Lib.css(".slider-item .layout-text-media .text", "display", "table-cell" );
VMM.Element.css(".slider-item .layout-text-media .text .container", "display", "table-cell" ); VMM.Lib.css(".slider-item .layout-text-media .text .container", "display", "table-cell" );
VMM.Element.css(".slider-item .layout-text-media .text .container", "width", "auto" ); VMM.Lib.css(".slider-item .layout-text-media .text .container", "width", "auto" );
VMM.Element.css(".slider-item .layout-text-media .media", "float", "left" ); VMM.Lib.css(".slider-item .layout-text-media .media", "float", "left" );
VMM.Element.css(".slider-item .layout-text-media", "display", "table" ); VMM.Lib.css(".slider-item .layout-text-media", "display", "table" );
VMM.Element.css(".slider-item .media blockquote p", "line-height", "36px" ); VMM.Lib.css(".slider-item .media blockquote p", "line-height", "36px" );
VMM.Element.css(".slider-item .media blockquote p", "font-size", "28px" ); VMM.Lib.css(".slider-item .media blockquote p", "font-size", "28px" );
VMM.Element.css(".slider-item", "display", "table" ); VMM.Lib.css(".slider-item", "display", "table" );
VMM.Element.css(".slider-item", "overflow-y", "auto" ); VMM.Lib.css(".slider-item", "overflow-y", "auto" );
} }
// MEDIA FRAME // MEDIA FRAME
VMM.Element.css( layout_text_media + ".media-frame", "max-width", mediasize.text_media.width); VMM.Lib.css( layout_text_media + ".media-frame", "max-width", mediasize.text_media.width);
VMM.Element.height( layout_text_media + ".media-frame", mediasize.text_media.height); VMM.Lib.height( layout_text_media + ".media-frame", mediasize.text_media.height);
VMM.Element.width( layout_text_media + ".media-frame", mediasize.text_media.width); VMM.Lib.width( layout_text_media + ".media-frame", mediasize.text_media.width);
// IMAGES // IMAGES
VMM.Element.css( layout_text_media + "img", "max-height", mediasize.text_media.height ); VMM.Lib.css( layout_text_media + "img", "max-height", mediasize.text_media.height );
VMM.Element.css( layout_media + "img", "max-height", mediasize.media.height ); VMM.Lib.css( layout_media + "img", "max-height", mediasize.media.height );
// FIX FOR NON-WEBKIT BROWSERS // FIX FOR NON-WEBKIT BROWSERS
VMM.Element.css( layout_text_media + "img", "max-width", mediasize.text_media.width ); VMM.Lib.css( layout_text_media + "img", "max-width", mediasize.text_media.width );
VMM.Element.css( layout_text_media + ".twitter .avatar img", "max-width", 32 ); VMM.Lib.css( layout_text_media + ".twitter .avatar img", "max-width", 32 );
VMM.Element.css( layout_text_media + ".twitter .avatar img", "max-height", 32 ); VMM.Lib.css( layout_text_media + ".twitter .avatar img", "max-height", 32 );
VMM.Element.css( layout_media + ".twitter .avatar img", "max-width", 32 ); VMM.Lib.css( layout_media + ".twitter .avatar img", "max-width", 32 );
VMM.Element.css( layout_media + ".twitter .avatar img", "max-height", 32 ); VMM.Lib.css( layout_media + ".twitter .avatar img", "max-height", 32 );
// IFRAME FULL SIZE VIDEO // IFRAME FULL SIZE VIDEO
VMM.Element.width( layout_text_media + ".media-frame", mediasize.text_media.video.width); VMM.Lib.width( layout_text_media + ".media-frame", mediasize.text_media.video.width);
VMM.Element.height( layout_text_media + ".media-frame", mediasize.text_media.video.height); VMM.Lib.height( layout_text_media + ".media-frame", mediasize.text_media.video.height);
VMM.Element.width( layout_media + ".media-frame", mediasize.media.video.width); VMM.Lib.width( layout_media + ".media-frame", mediasize.media.video.width);
VMM.Element.height( layout_media + ".media-frame", mediasize.media.video.height); VMM.Lib.height( layout_media + ".media-frame", mediasize.media.video.height);
VMM.Element.css( layout_media + ".media-frame", "max-height", mediasize.media.video.height); VMM.Lib.css( layout_media + ".media-frame", "max-height", mediasize.media.video.height);
VMM.Element.css( layout_media + ".media-frame", "max-width", mediasize.media.video.width); VMM.Lib.css( layout_media + ".media-frame", "max-width", mediasize.media.video.width);
// SOUNDCLOUD // SOUNDCLOUD
VMM.Element.height( layout_media + ".soundcloud", 168); VMM.Lib.height( layout_media + ".soundcloud", 168);
VMM.Element.height( layout_text_media + ".soundcloud", 168); VMM.Lib.height( layout_text_media + ".soundcloud", 168);
VMM.Element.width( layout_media + ".soundcloud", mediasize.media.width); VMM.Lib.width( layout_media + ".soundcloud", mediasize.media.width);
VMM.Element.width( layout_text_media + ".soundcloud", mediasize.text_media.width); VMM.Lib.width( layout_text_media + ".soundcloud", mediasize.text_media.width);
VMM.Element.css( layout_both + ".soundcloud", "max-height", 168 ); VMM.Lib.css( layout_both + ".soundcloud", "max-height", 168 );
// MAPS // MAPS
VMM.Element.height( layout_text_media + ".map", mediasize.text_media.height); VMM.Lib.height( layout_text_media + ".map", mediasize.text_media.height);
VMM.Element.css( layout_media + ".map", "max-height", mediasize.media.height); VMM.Lib.css( layout_media + ".map", "max-height", mediasize.media.height);
VMM.Element.width( layout_media + ".map", mediasize.media.width); VMM.Lib.width( layout_media + ".map", mediasize.media.width);
// DOCS // DOCS
VMM.Element.height( layout_text_media + ".doc", mediasize.text_media.height); VMM.Lib.height( layout_text_media + ".doc", mediasize.text_media.height);
VMM.Element.height( layout_media + ".doc", mediasize.media.height); VMM.Lib.height( layout_media + ".doc", mediasize.media.height);
trace(mediasize); trace(mediasize);
} }
@ -434,7 +434,7 @@ 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.Lib.css(slides[i], "left", pos);
slides[i].leftpos(pos); slides[i].leftpos(pos);
} }
} }
@ -445,13 +445,13 @@ 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.Lib.animate(slides[i], config.duration, _ease, {"opacity": 1});
slides[i].animate(config.duration, _ease, {"opacity": 1}); slides[i].animate(config.duration, _ease, {"opacity": 1});
} else if (i == current_slide - 1 || i == current_slide + 1) { } else if (i == current_slide - 1 || i == current_slide + 1) {
//VMM.Element.animate(slides[i], config.duration, _ease, {"opacity": 0.1}); //VMM.Lib.animate(slides[i], config.duration, _ease, {"opacity": 0.1});
slides[i].animate(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.Lib.css(slides[i], "opacity", n);
slides[i].opacity(n); slides[i].opacity(n);
} }
} }
@ -474,7 +474,7 @@ if(typeof VMM != 'undefined' && typeof VMM.Slider == 'undefined') {
var is_last = false; var is_last = false;
var is_first = false; var is_first = false;
var _pos = slides[current_slide].leftpos(); var _pos = slides[current_slide].leftpos();
//var _pos = VMM.Element.position(slides[current_slide]); //var _pos = VMM.Lib.position(slides[current_slide]);
if (current_slide == 0) {is_first = true}; if (current_slide == 0) {is_first = true};
if (current_slide +1 >= slides.length) {is_last = true}; if (current_slide +1 >= slides.length) {is_last = true};
@ -484,18 +484,18 @@ if(typeof VMM != 'undefined' && typeof VMM.Slider == 'undefined') {
/* set proper nav titles and dates etc. /* set proper nav titles and dates etc.
================================================== */ ================================================== */
if (is_first) { if (is_first) {
VMM.Element.visible(navigation.prevBtn, false); VMM.Lib.visible(navigation.prevBtn, false);
} else { } else {
VMM.Element.visible(navigation.prevBtn, true); VMM.Lib.visible(navigation.prevBtn, true);
if (config.type == "timeline") { if (config.type == "timeline") {
VMM.attachElement(navigation.prevDate, data[current_slide - 1].date); VMM.attachElement(navigation.prevDate, data[current_slide - 1].date);
} }
VMM.attachElement(navigation.prevTitle, VMM.Util.unlinkify(data[current_slide - 1].title)); VMM.attachElement(navigation.prevTitle, VMM.Util.unlinkify(data[current_slide - 1].title));
} }
if (is_last) { if (is_last) {
VMM.Element.visible(navigation.nextBtn, false); VMM.Lib.visible(navigation.nextBtn, false);
} else { } else {
VMM.Element.visible(navigation.nextBtn, true); VMM.Lib.visible(navigation.nextBtn, true);
if (config.type == "timeline") { if (config.type == "timeline") {
VMM.attachElement(navigation.nextDate, data[current_slide + 1].date); VMM.attachElement(navigation.nextDate, data[current_slide + 1].date);
} }
@ -505,10 +505,10 @@ if(typeof VMM != 'undefined' && typeof VMM.Slider == 'undefined') {
/* ANIMATE SLIDE /* ANIMATE SLIDE
================================================== */ ================================================== */
if (fast) { if (fast) {
VMM.Element.css($slider_container, "left", -(_pos - config.slider.content.padding)); VMM.Lib.css($slider_container, "left", -(_pos - config.slider.content.padding));
} else{ } else{
VMM.Element.stop($slider_container); VMM.Lib.stop($slider_container);
VMM.Element.animate($slider_container, _duration, _ease, {"left": -(_pos - config.slider.content.padding)}); VMM.Lib.animate($slider_container, _duration, _ease, {"left": -(_pos - config.slider.content.padding)});
} }
if (firstrun) { if (firstrun) {
@ -518,16 +518,16 @@ 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.Lib.height(slides[current_slide]) > config.slider_height) {
if (slides[current_slide].height() > config.slider_height) { if (slides[current_slide].height() > config.slider_height) {
VMM.Element.css(".slider", "overflow-y", "scroll" ); VMM.Lib.css(".slider", "overflow-y", "scroll" );
} else { } else {
VMM.Element.css(layout, "overflow-y", "hidden" ); VMM.Lib.css(layout, "overflow-y", "hidden" );
VMM.Element.animate(layout, _duration, _ease, {scrollTop: VMM.Element.prop(layout, "scrollHeight") - VMM.Element.height(layout) }); VMM.Lib.animate(layout, _duration, _ease, {scrollTop: VMM.Lib.prop(layout, "scrollHeight") - VMM.Lib.height(layout) });
} }
preloadSlides(); preloadSlides();
//VMM.Element.css(navigation.nextBtnContainer, "left", ( VMM.Element.width(navigation.nextBtnContainer) - config.slider.nav.width) ); //VMM.Lib.css(navigation.nextBtnContainer, "left", ( VMM.Lib.width(navigation.nextBtnContainer) - config.slider.nav.width) );
} }
/* BUILD NAVIGATION /* BUILD NAVIGATION
@ -579,17 +579,17 @@ 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.Lib.width(slides[0]), config.spacing, true);
VMM.TouchSlider.createPanel($slider_container, $slider_container, slides[0].width(), 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") {
} else { } else {
//VMM.DragSlider.createPanel($slider_container, $slider_container, VMM.Element.width(slides[0]), config.spacing, true); //VMM.DragSlider.createPanel($slider_container, $slider_container, VMM.Lib.width(slides[0]), config.spacing, true);
} }
reSize(false, true); reSize(false, true);
VMM.Element.visible(navigation.prevBtn, false); VMM.Lib.visible(navigation.prevBtn, false);
// GO TO FIRST SLIDE // GO TO FIRST SLIDE
trace("config.current_slide " + config.current_slide); trace("config.current_slide " + config.current_slide);
goToSlide(config.current_slide, "easeOutExpo", __duration, true, true); goToSlide(config.current_slide, "easeOutExpo", __duration, true, true);

54
source/js/VMM.Timeline.DataObj.js

@ -47,36 +47,36 @@ if(typeof VMM.Timeline != 'undefined' && typeof VMM.Timeline.DataObj == 'undefin
/* Timeline start slide /* Timeline start slide
================================================== */ ================================================== */
if (VMM.Element.find("#timeline section", "time")[0]) { if (VMM.Lib.find("#timeline section", "time")[0]) {
_data_obj.timeline.startDate = VMM.Element.html(VMM.Element.find("#timeline section", "time")[0]); _data_obj.timeline.startDate = VMM.Lib.html(VMM.Lib.find("#timeline section", "time")[0]);
_data_obj.timeline.headline = VMM.Element.html(VMM.Element.find("#timeline section", "h2")); _data_obj.timeline.headline = VMM.Lib.html(VMM.Lib.find("#timeline section", "h2"));
_data_obj.timeline.text = VMM.Element.html(VMM.Element.find("#timeline section", "article")); _data_obj.timeline.text = VMM.Lib.html(VMM.Lib.find("#timeline section", "article"));
var found_main_media = false; var found_main_media = false;
if (VMM.Element.find("#timeline section", "figure img").length != 0) { if (VMM.Lib.find("#timeline section", "figure img").length != 0) {
found_main_media = true; found_main_media = true;
_data_obj.timeline.asset.media = VMM.Element.attr(VMM.Element.find("#timeline section", "figure img"), "src"); _data_obj.timeline.asset.media = VMM.Lib.attr(VMM.Lib.find("#timeline section", "figure img"), "src");
} else if (VMM.Element.find("#timeline section", "figure a").length != 0) { } else if (VMM.Lib.find("#timeline section", "figure a").length != 0) {
found_main_media = true; found_main_media = true;
_data_obj.timeline.asset.media = VMM.Element.attr(VMM.Element.find("#timeline section", "figure a"), "href"); _data_obj.timeline.asset.media = VMM.Lib.attr(VMM.Lib.find("#timeline section", "figure a"), "href");
} else { } else {
//trace("NOT FOUND"); //trace("NOT FOUND");
} }
if (found_main_media) { if (found_main_media) {
if (VMM.Element.find("#timeline section", "cite").length != 0) { if (VMM.Lib.find("#timeline section", "cite").length != 0) {
_data_obj.timeline.asset.credit = VMM.Element.html(VMM.Element.find("#timeline section", "cite")); _data_obj.timeline.asset.credit = VMM.Lib.html(VMM.Lib.find("#timeline section", "cite"));
} }
if (VMM.Element.find(this, "figcaption").length != 0) { if (VMM.Lib.find(this, "figcaption").length != 0) {
_data_obj.timeline.asset.caption = VMM.Element.html(VMM.Element.find("#timeline section", "figcaption")); _data_obj.timeline.asset.caption = VMM.Lib.html(VMM.Lib.find("#timeline section", "figcaption"));
} }
} }
} }
/* Timeline Date Slides /* Timeline Date Slides
================================================== */ ================================================== */
VMM.Element.each("#timeline li", function(i, elem){ VMM.Lib.each("#timeline li", function(i, elem){
var valid_date = false; var valid_date = false;
@ -94,37 +94,37 @@ if(typeof VMM.Timeline != 'undefined' && typeof VMM.Timeline.DataObj == 'undefin
"tags":"Optional" "tags":"Optional"
}; };
if (VMM.Element.find(this, "time") != 0) { if (VMM.Lib.find(this, "time") != 0) {
valid_date = true; valid_date = true;
_date.startDate = VMM.Element.html(VMM.Element.find(this, "time")[0]); _date.startDate = VMM.Lib.html(VMM.Lib.find(this, "time")[0]);
if (VMM.Element.find(this, "time")[1]) { if (VMM.Lib.find(this, "time")[1]) {
_date.endDate = VMM.Element.html(VMM.Element.find(this, "time")[0]); _date.endDate = VMM.Lib.html(VMM.Lib.find(this, "time")[0]);
} }
_date.headline = VMM.Element.html(VMM.Element.find(this, "h3")); _date.headline = VMM.Lib.html(VMM.Lib.find(this, "h3"));
_date.text = VMM.Element.html(VMM.Element.find(this, "article")); _date.text = VMM.Lib.html(VMM.Lib.find(this, "article"));
var found_media = false; var found_media = false;
if (VMM.Element.find(this, "figure img").length != 0) { if (VMM.Lib.find(this, "figure img").length != 0) {
found_media = true; found_media = true;
_date.asset.media = VMM.Element.attr(VMM.Element.find(this, "figure img"), "src"); _date.asset.media = VMM.Lib.attr(VMM.Lib.find(this, "figure img"), "src");
} else if (VMM.Element.find(this, "figure a").length != 0) { } else if (VMM.Lib.find(this, "figure a").length != 0) {
found_media = true; found_media = true;
_date.asset.media = VMM.Element.attr(VMM.Element.find(this, "figure a"), "href"); _date.asset.media = VMM.Lib.attr(VMM.Lib.find(this, "figure a"), "href");
} else { } else {
//trace("NOT FOUND"); //trace("NOT FOUND");
} }
if (found_media) { if (found_media) {
if (VMM.Element.find(this, "cite").length != 0) { if (VMM.Lib.find(this, "cite").length != 0) {
_date.asset.credit = VMM.Element.html(VMM.Element.find(this, "cite")); _date.asset.credit = VMM.Lib.html(VMM.Lib.find(this, "cite"));
} }
if (VMM.Element.find(this, "figcaption").length != 0) { if (VMM.Lib.find(this, "figcaption").length != 0) {
_date.asset.caption = VMM.Element.html(VMM.Element.find(this, "figcaption")); _date.asset.caption = VMM.Lib.html(VMM.Lib.find(this, "figcaption"));
} }
} }

96
source/js/VMM.Timeline.TimeNav.js

@ -97,7 +97,7 @@ if(typeof VMM.Timeline != 'undefined' && typeof VMM.Timeline.TimeNav == 'undefin
}; };
function reSize(firstrun) { function reSize(firstrun) {
VMM.Element.css($timenavline, "left", Math.round(config.width/2)+2); VMM.Lib.css($timenavline, "left", Math.round(config.width/2)+2);
goToMarker(config.current_slide, config.ease, config.duration, true, firstrun); goToMarker(config.current_slide, config.ease, config.duration, true, firstrun);
}; };
@ -171,7 +171,7 @@ if(typeof VMM.Timeline != 'undefined' && typeof VMM.Timeline.TimeNav == 'undefin
}; };
function onMarkerHover(e) { function onMarkerHover(e) {
VMM.Element.toggleClass(e.data.elem, "zFront"); VMM.Lib.toggleClass(e.data.elem, "zFront");
}; };
var goToMarker = function(n, ease, duration, fast, firstrun) { var goToMarker = function(n, ease, duration, fast, firstrun) {
@ -181,7 +181,7 @@ if(typeof VMM.Timeline != 'undefined' && typeof VMM.Timeline.TimeNav == 'undefin
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 = VMM.Element.position(markers[current_marker].marker); var _pos = VMM.Lib.position(markers[current_marker].marker);
if (current_marker == 0) { if (current_marker == 0) {
is_first = true; is_first = true;
@ -194,26 +194,26 @@ if(typeof VMM.Timeline != 'undefined' && typeof VMM.Timeline.TimeNav == 'undefin
// set marker style // set marker style
for(var i = 0; i < markers.length; i++) { for(var i = 0; i < markers.length; i++) {
VMM.Element.removeClass(markers[i].marker, "active"); VMM.Lib.removeClass(markers[i].marker, "active");
} }
if (config.start_page && markers[0].type == "start") { if (config.start_page && markers[0].type == "start") {
VMM.Element.visible(markers[0].marker, false); VMM.Lib.visible(markers[0].marker, false);
VMM.Element.addClass(markers[0].marker, "start"); VMM.Lib.addClass(markers[0].marker, "start");
} }
VMM.Element.addClass(markers[current_marker].marker, "active"); VMM.Lib.addClass(markers[current_marker].marker, "active");
// ANIMATE MARKER // ANIMATE MARKER
VMM.Element.stop($timenav); VMM.Lib.stop($timenav);
VMM.Element.animate($timenav, _duration, _ease, {"left": (config.width/2) - (_pos.left)}); VMM.Lib.animate($timenav, _duration, _ease, {"left": (config.width/2) - (_pos.left)});
} }
/* TOUCH EVENTS /* TOUCH EVENTS
================================================== */ ================================================== */
function onTouchUpdate(e, b) { function onTouchUpdate(e, b) {
VMM.Element.animate($timenav, b.time/2, config.ease, {"left": b.left}); VMM.Lib.animate($timenav, b.time/2, config.ease, {"left": b.left});
}; };
/* CALCULATIONS /* CALCULATIONS
@ -570,9 +570,9 @@ if(typeof VMM.Timeline != 'undefined' && typeof VMM.Timeline.TimeNav == 'undefin
var _line_height = 6; var _line_height = 6;
var cur_mark = 0; var cur_mark = 0;
VMM.Element.removeClass(".flag", "row1"); VMM.Lib.removeClass(".flag", "row1");
VMM.Element.removeClass(".flag", "row2"); VMM.Lib.removeClass(".flag", "row2");
VMM.Element.removeClass(".flag", "row3"); VMM.Lib.removeClass(".flag", "row3");
for(var i = 0; i < markers.length; i++) { for(var i = 0; i < markers.length; i++) {
@ -593,10 +593,10 @@ if(typeof VMM.Timeline != 'undefined' && typeof VMM.Timeline.TimeNav == 'undefin
// APPLY POSITION TO MARKER // APPLY POSITION TO MARKER
if (is_animated) { if (is_animated) {
VMM.Element.stop(_marker); VMM.Lib.stop(_marker);
VMM.Element.animate(_marker, config.duration/2, config.ease, {"left": pos}); VMM.Lib.animate(_marker, config.duration/2, config.ease, {"left": pos});
} else { } else {
VMM.Element.css(_marker, "left", pos); VMM.Lib.css(_marker, "left", pos);
} }
if (i == current_marker) { if (i == current_marker) {
@ -605,9 +605,9 @@ if(typeof VMM.Timeline != 'undefined' && typeof VMM.Timeline.TimeNav == 'undefin
// EVENT LENGTH LINE // EVENT LENGTH LINE
if (_line > 5) { if (_line > 5) {
VMM.Element.css(_marker_line_event, "height", _line_height); VMM.Lib.css(_marker_line_event, "height", _line_height);
VMM.Element.css(_marker_line_event, "width", _line); VMM.Lib.css(_marker_line_event, "width", _line);
VMM.Element.css(_marker_line_event, "top", _line_last_height_pos); VMM.Lib.css(_marker_line_event, "top", _line_last_height_pos);
} }
// CONTROL ROW POSITION // CONTROL ROW POSITION
@ -628,15 +628,15 @@ if(typeof VMM.Timeline != 'undefined' && typeof VMM.Timeline.TimeNav == 'undefin
lpos = pos; lpos = pos;
if (is_animated) { if (is_animated) {
VMM.Element.stop(_marker_flag); VMM.Lib.stop(_marker_flag);
VMM.Element.animate(_marker_flag, config.duration, config.ease, {"top": config.nav.rows[row]}); VMM.Lib.animate(_marker_flag, config.duration, config.ease, {"top": config.nav.rows[row]});
} else { } else {
VMM.Element.css(_marker_flag, "top", config.nav.rows[row]); VMM.Lib.css(_marker_flag, "top", config.nav.rows[row]);
} }
// IS THE MARKER A REPRESENTATION OF A START SCREEN? // IS THE MARKER A REPRESENTATION OF A START SCREEN?
if (config.start_page && markers[i].type == "start") { if (config.start_page && markers[i].type == "start") {
VMM.Element.visible(_marker, false); VMM.Lib.visible(_marker, false);
} }
} }
@ -650,14 +650,14 @@ if(typeof VMM.Timeline != 'undefined' && typeof VMM.Timeline.TimeNav == 'undefin
var era_height = 25; var era_height = 25;
// APPLY POSITION TO MARKER // APPLY POSITION TO MARKER
VMM.Element.css(era_elem, "left", pos.begin); VMM.Lib.css(era_elem, "left", pos.begin);
VMM.Element.css(era_elem, "width", era_length); VMM.Lib.css(era_elem, "width", era_length);
} }
// ANIMATE THE TIMELINE TO ADJUST TO CHANGES // ANIMATE THE TIMELINE TO ADJUST TO CHANGES
VMM.Element.stop($timenav); VMM.Lib.stop($timenav);
VMM.Element.animate($timenav, config.duration/2, config.ease, {"left": (config.width/2) - (cur_mark)}); VMM.Lib.animate($timenav, config.duration/2, config.ease, {"left": (config.width/2) - (cur_mark)});
} }
@ -680,9 +680,9 @@ if(typeof VMM.Timeline != 'undefined' && typeof VMM.Timeline.TimeNav == 'undefin
// APPLY POSITION TO MARKER // APPLY POSITION TO MARKER
if (is_animated) { if (is_animated) {
VMM.Element.animate(_interval, config.duration/2, config.ease, {"left": pos}); VMM.Lib.animate(_interval, config.duration/2, config.ease, {"left": pos});
} else { } else {
VMM.Element.css(_interval, "left", pos); VMM.Lib.css(_interval, "left", pos);
} }
// CONDENSE WHAT IS DISPLAYED // CONDENSE WHAT IS DISPLAYED
@ -709,18 +709,18 @@ if(typeof VMM.Timeline != 'undefined' && typeof VMM.Timeline.TimeNav == 'undefin
if (_interval_visible) { if (_interval_visible) {
if (!is_visible) { if (!is_visible) {
if (is_animated) { if (is_animated) {
VMM.Element.animate(_interval, config.duration*2, config.ease, {"opacity": 0}); VMM.Lib.animate(_interval, config.duration*2, config.ease, {"opacity": 0});
} else { } else {
VMM.Element.css(_interval, "opacity", 0); VMM.Lib.css(_interval, "opacity", 0);
} }
the_intervals[i].interval_visible = false; the_intervals[i].interval_visible = false;
} }
} else { } else {
if (is_visible) { if (is_visible) {
if (is_animated) { if (is_animated) {
VMM.Element.animate(_interval, config.duration*2, config.ease, {"opacity": 100}); VMM.Lib.animate(_interval, config.duration*2, config.ease, {"opacity": 100});
} else { } else {
VMM.Element.css(_interval, "opacity", 100); VMM.Lib.css(_interval, "opacity", 100);
} }
the_intervals[i].interval_visible = true; the_intervals[i].interval_visible = true;
} }
@ -734,8 +734,8 @@ if(typeof VMM.Timeline != 'undefined' && typeof VMM.Timeline.TimeNav == 'undefin
} }
VMM.Element.css($timeintervalminor_minor, "left", -(config.width/2)); VMM.Lib.css($timeintervalminor_minor, "left", -(config.width/2));
VMM.Element.width($timeintervalminor_minor, (config.nav.minor_width)+(config.width) ); VMM.Lib.width($timeintervalminor_minor, (config.nav.minor_width)+(config.width) );
} }
var createIntervalElements = function(_interval, _array, _element_parent) { var createIntervalElements = function(_interval, _array, _element_parent) {
@ -851,8 +851,8 @@ if(typeof VMM.Timeline != 'undefined' && typeof VMM.Timeline.TimeNav == 'undefin
VMM.appendElement(_element, _idd); VMM.appendElement(_element, _idd);
VMM.Element.css(_element, "text-indent", -(VMM.Element.width(_element)/2)); VMM.Lib.css(_element, "text-indent", -(VMM.Lib.width(_element)/2));
VMM.Element.css(_element, "opacity", "0"); VMM.Lib.css(_element, "opacity", "0");
_last_pos = pos; _last_pos = pos;
@ -873,7 +873,7 @@ if(typeof VMM.Timeline != 'undefined' && typeof VMM.Timeline.TimeNav == 'undefin
} }
VMM.Element.width($timeintervalminor_minor, _largest_pos); VMM.Lib.width($timeintervalminor_minor, _largest_pos);
positionInterval(_array); positionInterval(_array);
@ -909,19 +909,19 @@ if(typeof VMM.Timeline != 'undefined' && typeof VMM.Timeline.TimeNav == 'undefin
if (config.start_page) { if (config.start_page) {
$backhome = VMM.appendAndGetElement($toolbar, "<div>", "back-home", "<div class='icon'></div>"); $backhome = VMM.appendAndGetElement($toolbar, "<div>", "back-home", "<div class='icon'></div>");
VMM.bindEvent(".back-home", onBackHome, "click"); VMM.bindEvent(".back-home", onBackHome, "click");
VMM.Element.css($toolbar, "top", 27); VMM.Lib.css($toolbar, "top", 27);
VMM.Element.attribute($backhome, "title", VMM.Timeline.Config.language.messages.return_to_title); VMM.Lib.attribute($backhome, "title", VMM.Timeline.Config.language.messages.return_to_title);
VMM.Element.attribute($backhome, "rel", "tooltip"); VMM.Lib.attribute($backhome, "rel", "tooltip");
} }
$zoomin = VMM.appendAndGetElement($toolbar, "<div>", "zoom-in", "<div class='icon'></div>"); $zoomin = VMM.appendAndGetElement($toolbar, "<div>", "zoom-in", "<div class='icon'></div>");
$zoomout = VMM.appendAndGetElement($toolbar, "<div>", "zoom-out", "<div class='icon'></div>"); $zoomout = VMM.appendAndGetElement($toolbar, "<div>", "zoom-out", "<div class='icon'></div>");
VMM.Element.attribute($zoomin, "title", VMM.Timeline.Config.language.messages.expand_timeline); VMM.Lib.attribute($zoomin, "title", VMM.Timeline.Config.language.messages.expand_timeline);
VMM.Element.attribute($zoomin, "rel", "tooltip"); VMM.Lib.attribute($zoomin, "rel", "tooltip");
VMM.Element.attribute($zoomout, "title", VMM.Timeline.Config.language.messages.contract_timeline); VMM.Lib.attribute($zoomout, "title", VMM.Timeline.Config.language.messages.contract_timeline);
VMM.Element.attribute($zoomout, "rel", "tooltip"); VMM.Lib.attribute($zoomout, "rel", "tooltip");
$toolbar.tooltip({selector: "div[rel=tooltip]", placement: "right"}) $toolbar.tooltip({selector: "div[rel=tooltip]", placement: "right"})
@ -1052,7 +1052,7 @@ if(typeof VMM.Timeline != 'undefined' && typeof VMM.Timeline.TimeNav == 'undefin
VMM.appendElement(_marker_content, "<h3>" + VMM.Util.unlinkify(data[i].title) + "</h3><h4>" + data[i].date + "</h4>"); VMM.appendElement(_marker_content, "<h3>" + VMM.Util.unlinkify(data[i].title) + "</h3><h4>" + data[i].date + "</h4>");
// ADD ID // ADD ID
VMM.Element.attr(_marker, "id", (data[i].uniqueid).toString()); VMM.Lib.attr(_marker, "id", (data[i].uniqueid).toString());
// MARKER CLICK // MARKER CLICK
VMM.bindEvent(_marker_flag, onMarkerClick, "", {number: i}); VMM.bindEvent(_marker_flag, onMarkerClick, "", {number: i});
@ -1090,8 +1090,8 @@ if(typeof VMM.Timeline != 'undefined' && typeof VMM.Timeline.TimeNav == 'undefin
color: eras[j].color color: eras[j].color
}; };
VMM.Element.attr(era.content, "id", era.uniqueid); VMM.Lib.attr(era.content, "id", era.uniqueid);
VMM.Element.css(era.content, "background", era.color); VMM.Lib.css(era.content, "background", era.color);
VMM.appendElement(era.content, "<h3>" + VMM.Util.unlinkify(era.title) + "</h3>"); VMM.appendElement(era.content, "<h3>" + VMM.Util.unlinkify(era.title) + "</h3>");
era_markers.push(era); era_markers.push(era);

18
source/js/VMM.Timeline.js

@ -186,7 +186,7 @@ if(typeof VMM != 'undefined' && typeof VMM.Timeline == 'undefined') {
var createStructure = function(w, h) { var createStructure = function(w, h) {
$timeline = VMM.getElement(timeline_id); $timeline = VMM.getElement(timeline_id);
VMM.Element.addClass(timeline_id, "vmm-timeline"); VMM.Lib.addClass(timeline_id, "vmm-timeline");
$feedback = VMM.appendAndGetElement($timeline, "<div>", "feedback", ""); $feedback = VMM.appendAndGetElement($timeline, "<div>", "feedback", "");
$messege = VMM.appendAndGetElement($feedback, "<div>", "messege", "Timeline"); $messege = VMM.appendAndGetElement($feedback, "<div>", "messege", "Timeline");
@ -194,15 +194,15 @@ if(typeof VMM != 'undefined' && typeof VMM.Timeline == 'undefined') {
timenav = new VMM.Timeline.TimeNav(timeline_id + " div.navigation"); timenav = new VMM.Timeline.TimeNav(timeline_id + " div.navigation");
if (!has_width) { if (!has_width) {
config.width = VMM.Element.width($timeline); config.width = VMM.Lib.width($timeline);
} else { } else {
VMM.Element.width($timeline, config.width); VMM.Lib.width($timeline, config.width);
} }
if (!has_height) { if (!has_height) {
config.height = VMM.Element.height($timeline); config.height = VMM.Lib.height($timeline);
} else { } else {
VMM.Element.height($timeline, config.height); VMM.Lib.height($timeline, config.height);
} }
} }
@ -342,11 +342,11 @@ if(typeof VMM != 'undefined' && typeof VMM.Timeline == 'undefined') {
}; };
var hideMessege = function() { var hideMessege = function() {
VMM.Element.animate($feedback, config.duration, config.ease*4, {"opacity": 0}, detachMessege); VMM.Lib.animate($feedback, config.duration, config.ease*4, {"opacity": 0}, detachMessege);
}; };
var detachMessege = function() { var detachMessege = function() {
VMM.Element.detach($feedback); VMM.Lib.detach($feedback);
} }
/* BUILD DISPLAY /* BUILD DISPLAY
@ -379,8 +379,8 @@ if(typeof VMM != 'undefined' && typeof VMM.Timeline == 'undefined') {
var updateSize = function() { var updateSize = function() {
trace("UPDATE SIZE"); trace("UPDATE SIZE");
config.width = VMM.Element.width($timeline); config.width = VMM.Lib.width($timeline);
config.height = VMM.Element.height($timeline); config.height = VMM.Lib.height($timeline);
config.nav.width = config.width; config.nav.width = config.width;
config.feature.width = config.width; config.feature.width = config.width;

26
source/js/VMM.TouchSlider.js

@ -58,14 +58,14 @@ if(typeof VMM != 'undefined' && typeof VMM.TouchSlider == 'undefined') {
return false; return false;
}, },
getLeft: function(elem) { getLeft: function(elem) {
return parseInt(VMM.Element.css(elem, 'left').substring(0, VMM.Element.css(elem, 'left').length - 2), 10); return parseInt(VMM.Lib.css(elem, 'left').substring(0, VMM.Lib.css(elem, 'left').length - 2), 10);
}, },
getTop: function(elem) { getTop: function(elem) {
return parseInt(VMM.Element.css(elem, 'top').substring(0, VMM.Element.css(elem, 'top').length - 2), 10); return parseInt(VMM.Lib.css(elem, 'top').substring(0, VMM.Lib.css(elem, 'top').length - 2), 10);
}, },
touchStart: function(elem, e) { touchStart: function(elem, e) {
VMM.Element.css(elem, '-webkit-transition-duration', '0'); VMM.Lib.css(elem, '-webkit-transition-duration', '0');
VMM.TouchSlider.startX = e.originalEvent.touches[0].screenX; VMM.TouchSlider.startX = e.originalEvent.touches[0].screenX;
VMM.TouchSlider.startY = e.originalEvent.touches[0].screenY; VMM.TouchSlider.startY = e.originalEvent.touches[0].screenY;
@ -82,9 +82,9 @@ if(typeof VMM != 'undefined' && typeof VMM.TouchSlider == 'undefined') {
//This means they dragged to the right past the first item //This means they dragged to the right past the first item
if (VMM.TouchSlider.vertical) { if (VMM.TouchSlider.vertical) {
VMM.Element.animate(elem, 1000, "", {"top": 0}); VMM.Lib.animate(elem, 1000, "", {"top": 0});
} else { } else {
VMM.Element.animate(elem, 1000, "", {"left": 0}); VMM.Lib.animate(elem, 1000, "", {"left": 0});
} }
VMM.TouchSlider.startX = null; VMM.TouchSlider.startX = null;
@ -139,7 +139,7 @@ if(typeof VMM != 'undefined' && typeof VMM.TouchSlider == 'undefined') {
} else { } else {
trace("not sticky"); trace("not sticky");
//VMM.TouchSlider.doSlide(elem, Math.min(0, newLeft), '0.5s'); //VMM.TouchSlider.doSlide(elem, Math.min(0, newLeft), '0.5s');
VMM.Element.animate(elem, 500, "", {"left": Math.min(0, newLeft)}); VMM.Lib.animate(elem, 500, "", {"left": Math.min(0, newLeft)});
} }
*/ */
@ -148,9 +148,9 @@ if(typeof VMM != 'undefined' && typeof VMM.TouchSlider == 'undefined') {
}, },
doSlide: function(elem, x, duration) { doSlide: function(elem, x, duration) {
VMM.Element.css(elem, '-webkit-transition-property', 'left'); VMM.Lib.css(elem, '-webkit-transition-property', 'left');
VMM.Element.css(elem, '-webkit-transition-duration', duration); VMM.Lib.css(elem, '-webkit-transition-duration', duration);
VMM.Element.css(elem, 'left', x); VMM.Lib.css(elem, 'left', x);
}, },
touchMove: function(elem, e) { touchMove: function(elem, e) {
@ -163,22 +163,22 @@ if(typeof VMM != 'undefined' && typeof VMM.TouchSlider == 'undefined') {
if (VMM.TouchSlider.vertical) { if (VMM.TouchSlider.vertical) {
if (VMM.TouchSlider.startY > e.originalEvent.touches[0].screenY) { if (VMM.TouchSlider.startY > e.originalEvent.touches[0].screenY) {
VMM.Element.css(elem, 'top', -(VMM.TouchSlider.startY - e.originalEvent.touches[0].screenY - VMM.TouchSlider.startTop)); VMM.Lib.css(elem, 'top', -(VMM.TouchSlider.startY - e.originalEvent.touches[0].screenY - VMM.TouchSlider.startTop));
VMM.TouchSlider.slidingTop = true; VMM.TouchSlider.slidingTop = true;
} else { } else {
var top = (e.originalEvent.touches[0].screenY - VMM.TouchSlider.startY + VMM.TouchSlider.startTop); var top = (e.originalEvent.touches[0].screenY - VMM.TouchSlider.startY + VMM.TouchSlider.startTop);
VMM.Element.css(elem, 'top', -(VMM.TouchSlider.startY - e.originalEvent.touches[0].screenY - VMM.TouchSlider.startTop)); VMM.Lib.css(elem, 'top', -(VMM.TouchSlider.startY - e.originalEvent.touches[0].screenY - VMM.TouchSlider.startTop));
VMM.TouchSlider.slidingTop = false; VMM.TouchSlider.slidingTop = false;
} }
} else { } else {
if (VMM.TouchSlider.startX > e.originalEvent.touches[0].screenX) { if (VMM.TouchSlider.startX > e.originalEvent.touches[0].screenX) {
VMM.Element.css(elem, 'left', -(VMM.TouchSlider.startX - e.originalEvent.touches[0].screenX - VMM.TouchSlider.startLeft)); VMM.Lib.css(elem, 'left', -(VMM.TouchSlider.startX - e.originalEvent.touches[0].screenX - VMM.TouchSlider.startLeft));
VMM.TouchSlider.slidingLeft = true; VMM.TouchSlider.slidingLeft = true;
} else { } else {
var left = (e.originalEvent.touches[0].screenX - VMM.TouchSlider.startX + VMM.TouchSlider.startLeft); var left = (e.originalEvent.touches[0].screenX - VMM.TouchSlider.startX + VMM.TouchSlider.startLeft);
VMM.Element.css(elem, 'left', -(VMM.TouchSlider.startX - e.originalEvent.touches[0].screenX - VMM.TouchSlider.startLeft)); VMM.Lib.css(elem, 'left', -(VMM.TouchSlider.startX - e.originalEvent.touches[0].screenX - VMM.TouchSlider.startLeft));
VMM.TouchSlider.slidingLeft = false; VMM.TouchSlider.slidingLeft = false;
} }

8
timeline-min.js vendored

File diff suppressed because one or more lines are too long

505
timeline.js

File diff suppressed because it is too large Load Diff
Loading…
Cancel
Save