Browse Source

Removed unused if else from DragSlider. closes #248

pull/300/merge v2.20
Zach Wise 12 years ago
parent
commit
61164291af
  1. 6
      compiled/js/timeline-min.js
  2. 20
      compiled/js/timeline.js
  3. 2
      source/js/Core

6
compiled/js/timeline-min.js vendored

File diff suppressed because one or more lines are too long

20
compiled/js/timeline.js

@ -4633,8 +4633,6 @@ if(typeof VMM != 'undefined' && typeof VMM.TextElement == 'undefined') {
/* DRAG SLIDER /* DRAG SLIDER
================================================== */ ================================================== */
if(typeof VMM != 'undefined' && typeof VMM.DragSlider == 'undefined') { if(typeof VMM != 'undefined' && typeof VMM.DragSlider == 'undefined') {
// VMM.DragSlider.createSlidePanel(drag_object, move_object, w, padding, sticky);
// VMM.DragSlider.cancelSlide();
VMM.DragSlider = function() { VMM.DragSlider = function() {
var drag = { var drag = {
@ -4768,11 +4766,6 @@ if(typeof VMM != 'undefined' && typeof VMM.DragSlider == 'undefined') {
function onDragMove(e) { function onDragMove(e) {
dragMove(e.data.element, e); dragMove(e.data.element, e);
if (Math.abs(drag.left.start) > getLeft(elem)) {
}
return false; return false;
} }
@ -4813,8 +4806,6 @@ if(typeof VMM != 'undefined' && typeof VMM.DragSlider == 'undefined') {
e.preventDefault(); e.preventDefault();
e.stopPropagation(); e.stopPropagation();
} }
//VMM.Lib.css(elem, 'left', drag_to);
} }
function dragMomentum(elem, e) { function dragMomentum(elem, e) {
@ -4859,23 +4850,12 @@ if(typeof VMM != 'undefined' && typeof VMM.DragSlider == 'undefined') {
if (!is_sticky) { if (!is_sticky) {
if (drag_info.time > 0) { if (drag_info.time > 0) {
if (drag.touch) { if (drag.touch) {
//VMM.Lib.css(elem, '-webkit-transition-property', 'left');
//VMM.Lib.css(elem, '-webkit-transition-duration', drag_info.time);
//VMM.Lib.css(elem, 'left', drag_info.left);
//VMM.Lib.animate(elem, drag_info.time, "easeOutQuad", {"left": drag_info.left});
VMM.Lib.animate(elem, drag_info.time, "easeOutCirc", {"left": drag_info.left}); VMM.Lib.animate(elem, drag_info.time, "easeOutCirc", {"left": drag_info.left});
//VMM.Lib.css(elem, 'webkitTransition', '');
//VMM.Lib.css(elem, 'webkitTransition', '-webkit-transform ' + drag_info.time + 'ms cubic-bezier(0.33, 0.66, 0.66, 1)');
//VMM.Lib.css(elem, 'webkitTransform', 'translate3d(' + drag_info.left + 'px, 0, 0)');
} else { } else {
VMM.Lib.animate(elem, drag_info.time, drag.ease, {"left": drag_info.left}); VMM.Lib.animate(elem, drag_info.time, drag.ease, {"left": drag_info.left});
} }
} }
} }
} }
function getLeft(elem) { function getLeft(elem) {

2
source/js/Core

@ -1 +1 @@
Subproject commit 3a123ddfa09e25f42d3be8d9242828da7e1d5ded Subproject commit ac10df0681aeb2de91b78953fb4c3a244fb285f0
Loading…
Cancel
Save