Skip to content

Commit

Permalink
codestyle as @Cybran111 suggested
Browse files Browse the repository at this point in the history
  • Loading branch information
anxolerd committed Aug 22, 2015
1 parent 5c7845d commit 03be2fa
Showing 1 changed file with 6 additions and 6 deletions.
12 changes: 6 additions & 6 deletions project/static/src/js/gallery.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,15 @@

"use strict";

require("magnific-popup");

var DIRECTIONS = {
LEFT: -1,
NONE: 0,
RIGHT: 1,
}

$.fn.doScroll = function(duration, direction) {
var $elem = this;
var target = this[0];
var startPosition = target.scrollLeft;

Expand All @@ -19,30 +20,29 @@
delta = -target.scrollLeft;
break;
case DIRECTIONS.RIGHT:
delta = target.scrollWidth - $elem.width() - startPosition;
delta = target.scrollWidth - this.width() - startPosition;
break;
default:
return;
}
var dur = duration * (delta / target.scrollWidth);
var startTime = Date.now();

function performScroll() {
var performScroll = (function () {
var fraction = Math.min(1, Math.abs((Date.now() - startTime) / dur));
if (isNaN(fraction)) { return; } // prevent endless scrolling

target.scrollLeft = startPosition + delta * fraction;

if (fraction < 1 && ($elem.hasClass("play"))) {
if (fraction < 1 && (this.hasClass("play"))) {
setTimeout(performScroll, 15);
}
}
}).bind(this);

performScroll();
}

document.addEventListener("DOMContentLoaded", (function () {
require("magnific-popup");
var gallery = $("#gallery");
gallery.magnificPopup({
delegate: "a",
Expand Down

0 comments on commit 03be2fa

Please sign in to comment.