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

Added constraints to the mouse wheel scroll.

pull/177/head
Zach Wise 13 years ago
parent
0c590ec45d
commit
d1428e6064
6 changed files with 35 additions and 85 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. 2
      compiled/js/timeline-embed.js
  2. 6
      compiled/js/timeline-min.js
  3. 55
      compiled/js/timeline.js
  4. 2
      source/js/Embed/Embed.js
  5. 48
      source/js/VMM.Timeline.TimeNav.js
  6. 7
      source/js/VMM.Timeline.js

2
compiled/js/timeline-embed.js
View File

File diff suppressed because one or more lines are too long

6
compiled/js/timeline-min.js vendored
View File

File diff suppressed because one or more lines are too long

55
compiled/js/timeline.js
Unescape View File

@ -6342,7 +6342,7 @@ if(typeof VMM != 'undefined' && typeof VMM.Timeline == 'undefined') {
timeline_id = "#timeline"; timeline_id = "#timeline";
} }
version = "1.61"; version = "1.62";
trace("TIMELINE VERSION " + version); trace("TIMELINE VERSION " + version);
@ -6386,6 +6386,11 @@ if(typeof VMM != 'undefined' && typeof VMM.Timeline == 'undefined') {
density: 4, density: 4,
minor_width: 0, minor_width: 0,
minor_left: 0, minor_left: 0,
contstraint: {
left: 0,
right: 0,
right_min: 0
},
multiplier: { multiplier: {
current: 6, current: 6,
min: .1, min: .1,
@ -6967,6 +6972,8 @@ if(typeof VMM.Timeline != 'undefined' && typeof VMM.Timeline.TimeNav == 'undefin
}; };
function reSize(firstrun) { function reSize(firstrun) {
config.nav.contstraint.left = (config.width/2);
config.nav.contstraint.right = config.nav.contstraint.right_min - (config.width/2);
VMM.Lib.css($timenavline, "left", Math.round(config.width/2)+2); VMM.Lib.css($timenavline, "left", Math.round(config.width/2)+2);
VMM.Lib.css($timenavindicator, "left", Math.round(config.width/2)-8); VMM.Lib.css($timenavindicator, "left", Math.round(config.width/2)-8);
goToMarker(config.current_slide, config.ease, config.duration, true, firstrun); goToMarker(config.current_slide, config.ease, config.duration, true, firstrun);
@ -7036,14 +7043,9 @@ if(typeof VMM.Timeline != 'undefined' && typeof VMM.Timeline.TimeNav == 'undefin
e = e.originalEvent; e = e.originalEvent;
} }
if (e.wheelDelta) { if (e.wheelDelta) {
trace("wheelDelta " + e.wheelDelta);
delta = e.wheelDelta/6; delta = e.wheelDelta/6;
trace("wheelDelta1 " + delta);
} else if (e.detail) { } else if (e.detail) {
trace("detail " + e.detail);
delta = -e.detail*12; delta = -e.detail*12;
trace("detail");
} }
if (delta) { if (delta) {
if (e.preventDefault) { if (e.preventDefault) {
@ -7054,16 +7056,14 @@ if(typeof VMM.Timeline != 'undefined' && typeof VMM.Timeline.TimeNav == 'undefin
// Webkit // Webkit
if (typeof e.wheelDeltaY != 'undefined' ) { if (typeof e.wheelDeltaY != 'undefined' ) {
delta = e.wheelDeltaY/6; delta = e.wheelDeltaY/6;
trace("deltaY " + e.wheelDeltaY);
} }
trace(delta);
// Stop from scrolling too far // Stop from scrolling too far
scroll_to = VMM.Lib.position($timenav).left + delta; scroll_to = VMM.Lib.position($timenav).left + delta;
if (scroll_to > 0) { if (scroll_to > config.nav.contstraint.left) {
scroll_to = config.width/2;
} else if (scoll_to < 0) { } else if (scroll_to < config.nav.contstraint.right) {
scroll_to = config.nav.contstraint.right;
} }
VMM.Lib.stop($timenav); VMM.Lib.stop($timenav);
@ -7833,11 +7833,13 @@ if(typeof VMM.Timeline != 'undefined' && typeof VMM.Timeline.TimeNav == 'undefin
if (pos > config.nav.minor_width) { if (pos > config.nav.minor_width) {
config.nav.minor_width = pos; config.nav.minor_width = pos;
} }
if (pos < config.nav.minor_left) { if (pos < config.nav.minor_left) {
config.nav.minor_left = pos; config.nav.minor_left = pos;
trace("MINOR " + pos); config.nav.contstraint.right_min = pos;
config.nav.contstraint.right = config.nav.contstraint.right_min - (config.width/2);
} }
} }
@ -8136,33 +8138,6 @@ if(typeof VMM.Timeline != 'undefined' && typeof VMM.Timeline.TimeNav == 'undefin
VMM.bindEvent(layout, onMouseScroll, 'DOMMouseScroll'); VMM.bindEvent(layout, onMouseScroll, 'DOMMouseScroll');
VMM.bindEvent(layout, onMouseScroll, 'mousewheel'); VMM.bindEvent(layout, onMouseScroll, 'mousewheel');
/*
function handle(delta) {
if (delta < 0)
else
}
function wheel(event){
var delta = 0;
if (!event) event = window.event;
if (event.wheelDelta) {
delta = event.wheelDelta/120;
} else if (event.detail) {
delta = -event.detail/3;
}
if (delta)
handle(delta);
if (event.preventDefault)
event.preventDefault();
event.returnValue = false;
}
if (window.addEventListener)
window.addEventListener('DOMMouseScroll', wheel, false);
window.onmousewheel = document.onmousewheel = wheel;
*/
VMM.fireEvent(layout, "LOADED"); VMM.fireEvent(layout, "LOADED");
_active = true; _active = true;

2
source/js/Embed/Embed.js
Unescape View File

@ -49,7 +49,7 @@ function getScriptPath(scriptname) {
/* VARS /* VARS
================================================== */ ================================================== */
var timelinejs, t, te, x, isCDN = false, var timelinejs, t, te, x, isCDN = false,
timeline_js_version = "1.59", timeline_js_version = "1.62",
jquery_version_required = "1.7.1", jquery_version_required = "1.7.1",
jquery_version = "", jquery_version = "",
ready = { ready = {

48
source/js/VMM.Timeline.TimeNav.js
Unescape View File

@ -124,6 +124,8 @@ if(typeof VMM.Timeline != 'undefined' && typeof VMM.Timeline.TimeNav == 'undefin
}; };
function reSize(firstrun) { function reSize(firstrun) {
config.nav.contstraint.left = (config.width/2);
config.nav.contstraint.right = config.nav.contstraint.right_min - (config.width/2);
VMM.Lib.css($timenavline, "left", Math.round(config.width/2)+2); VMM.Lib.css($timenavline, "left", Math.round(config.width/2)+2);
VMM.Lib.css($timenavindicator, "left", Math.round(config.width/2)-8); VMM.Lib.css($timenavindicator, "left", Math.round(config.width/2)-8);
goToMarker(config.current_slide, config.ease, config.duration, true, firstrun); goToMarker(config.current_slide, config.ease, config.duration, true, firstrun);
@ -193,14 +195,9 @@ if(typeof VMM.Timeline != 'undefined' && typeof VMM.Timeline.TimeNav == 'undefin
e = e.originalEvent; e = e.originalEvent;
} }
if (e.wheelDelta) { if (e.wheelDelta) {
trace("wheelDelta " + e.wheelDelta);
delta = e.wheelDelta/6; delta = e.wheelDelta/6;
trace("wheelDelta1 " + delta);
} else if (e.detail) { } else if (e.detail) {
trace("detail " + e.detail);
delta = -e.detail*12; delta = -e.detail*12;
trace("detail");
} }
if (delta) { if (delta) {
if (e.preventDefault) { if (e.preventDefault) {
@ -211,16 +208,14 @@ if(typeof VMM.Timeline != 'undefined' && typeof VMM.Timeline.TimeNav == 'undefin
// Webkit // Webkit
if (typeof e.wheelDeltaY != 'undefined' ) { if (typeof e.wheelDeltaY != 'undefined' ) {
delta = e.wheelDeltaY/6; delta = e.wheelDeltaY/6;
trace("deltaY " + e.wheelDeltaY);
} }
trace(delta);
// Stop from scrolling too far // Stop from scrolling too far
scroll_to = VMM.Lib.position($timenav).left + delta; scroll_to = VMM.Lib.position($timenav).left + delta;
if (scroll_to > 0) { if (scroll_to > config.nav.contstraint.left) {
scroll_to = config.width/2;
} else if (scoll_to < 0) { } else if (scroll_to < config.nav.contstraint.right) {
scroll_to = config.nav.contstraint.right;
} }
VMM.Lib.stop($timenav); VMM.Lib.stop($timenav);
@ -990,11 +985,13 @@ if(typeof VMM.Timeline != 'undefined' && typeof VMM.Timeline.TimeNav == 'undefin
if (pos > config.nav.minor_width) { if (pos > config.nav.minor_width) {
config.nav.minor_width = pos; config.nav.minor_width = pos;
} }
if (pos < config.nav.minor_left) { if (pos < config.nav.minor_left) {
config.nav.minor_left = pos; config.nav.minor_left = pos;
trace("MINOR " + pos); config.nav.contstraint.right_min = pos;
config.nav.contstraint.right = config.nav.contstraint.right_min - (config.width/2);
} }
} }
@ -1293,33 +1290,6 @@ if(typeof VMM.Timeline != 'undefined' && typeof VMM.Timeline.TimeNav == 'undefin
VMM.bindEvent(layout, onMouseScroll, 'DOMMouseScroll'); VMM.bindEvent(layout, onMouseScroll, 'DOMMouseScroll');
VMM.bindEvent(layout, onMouseScroll, 'mousewheel'); VMM.bindEvent(layout, onMouseScroll, 'mousewheel');
/*
function handle(delta) {
if (delta < 0)
else
}
function wheel(event){
var delta = 0;
if (!event) event = window.event;
if (event.wheelDelta) {
delta = event.wheelDelta/120;
} else if (event.detail) {
delta = -event.detail/3;
}
if (delta)
handle(delta);
if (event.preventDefault)
event.preventDefault();
event.returnValue = false;
}
if (window.addEventListener)
window.addEventListener('DOMMouseScroll', wheel, false);
window.onmousewheel = document.onmousewheel = wheel;
*/
VMM.fireEvent(layout, "LOADED"); VMM.fireEvent(layout, "LOADED");
_active = true; _active = true;

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

@ -81,7 +81,7 @@ if(typeof VMM != 'undefined' && typeof VMM.Timeline == 'undefined') {
timeline_id = "#timeline"; timeline_id = "#timeline";
} }
version = "1.61"; version = "1.62";
trace("TIMELINE VERSION " + version); trace("TIMELINE VERSION " + version);
@ -125,6 +125,11 @@ if(typeof VMM != 'undefined' && typeof VMM.Timeline == 'undefined') {
density: 4, density: 4,
minor_width: 0, minor_width: 0,
minor_left: 0, minor_left: 0,
contstraint: {
left: 0,
right: 0,
right_min: 0
},
multiplier: { multiplier: {
current: 6, current: 6,
min: .1, min: .1,

Write Preview
Loading…
Cancel
Save