Skip to content

Commit

Permalink
Merge pull request loryjs#247 from meandmax/add-new-built-version
Browse files Browse the repository at this point in the history
Update all deps and build new dist and demo artifacts
  • Loading branch information
meandmax committed Mar 30, 2016
2 parents 0f0a642 + 040322b commit 0bc0a95
Show file tree
Hide file tree
Showing 10 changed files with 128 additions and 89 deletions.
6 changes: 6 additions & 0 deletions .eslintrc
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,11 @@
indent: [2, 4],
no-multi-spaces: [2, { exceptions: { "VariableDeclarator": true } }],
semi: [2, "always"]
},
"ecmaFeatures": {
"modules": true
},
parserOptions: {
sourceType: "module"
}
}
48 changes: 28 additions & 20 deletions demo/js/jquery.lory.js
Original file line number Diff line number Diff line change
Expand Up @@ -79,11 +79,12 @@ return /******/ (function(modules) { // webpackBootstrap

'use strict';

var _extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; /* globals jQuery */

Object.defineProperty(exports, "__esModule", {
value: true
});

var _extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; /* globals jQuery */

exports.lory = lory;

var _detectPrefixes = __webpack_require__(2);
Expand All @@ -103,20 +104,20 @@ return /******/ (function(modules) { // webpackBootstrap
var slice = Array.prototype.slice;

function lory(slider, opts) {
var position = undefined;
var slidesWidth = undefined;
var frameWidth = undefined;
var slides = undefined;
var position = void 0;
var slidesWidth = void 0;
var frameWidth = void 0;
var slides = void 0;

/**
* slider DOM elements
*/
var frame = undefined;
var slideContainer = undefined;
var prevCtrl = undefined;
var nextCtrl = undefined;
var prefixes = undefined;
var transitionEndCallback = undefined;
var frame = void 0;
var slideContainer = void 0;
var prevCtrl = void 0;
var nextCtrl = void 0;
var prefixes = void 0;
var transitionEndCallback = void 0;

var index = 0;
var options = {};
Expand All @@ -136,6 +137,7 @@ return /******/ (function(modules) { // webpackBootstrap
var _options = options;
var classNameActiveSlide = _options.classNameActiveSlide;


slides.forEach(function (element, index) {
if (element.classList.contains(classNameActiveSlide)) {
element.classList.remove(classNameActiveSlide);
Expand All @@ -156,6 +158,7 @@ return /******/ (function(modules) { // webpackBootstrap
var _options2 = options;
var infinite = _options2.infinite;


var front = slideArray.slice(0, infinite);
var back = slideArray.slice(slideArray.length - infinite, slideArray.length);

Expand Down Expand Up @@ -224,6 +227,7 @@ return /******/ (function(modules) { // webpackBootstrap
var ease = _options3.ease;
var classNameActiveSlide = _options3.classNameActiveSlide;


var duration = slideSpeed;

var nextSlide = direction ? index + 1 : index - 1;
Expand Down Expand Up @@ -317,6 +321,7 @@ return /******/ (function(modules) { // webpackBootstrap
var enableMouseEvents = _options4.enableMouseEvents;
var classNameActiveSlide = _options4.classNameActiveSlide;


frame = slider.getElementsByClassName(classNameFrame)[0];
slideContainer = frame.getElementsByClassName(classNameSlideContainer)[0];
prevCtrl = slider.getElementsByClassName(classNamePrevCtrl)[0];
Expand Down Expand Up @@ -366,6 +371,7 @@ return /******/ (function(modules) { // webpackBootstrap
var ease = _options5.ease;
var rewindSpeed = _options5.rewindSpeed;


slidesWidth = slideContainer.getBoundingClientRect().width || slideContainer.offsetWidth;
frameWidth = frame.getBoundingClientRect().width || frame.offsetWidth;

Expand Down Expand Up @@ -452,9 +458,9 @@ return /******/ (function(modules) { // webpackBootstrap

// event handling

var touchOffset = undefined;
var delta = undefined;
var isScrolling = undefined;
var touchOffset = void 0;
var delta = void 0;
var isScrolling = void 0;

function onTransitionEnd() {
if (transitionEndCallback) {
Expand Down Expand Up @@ -482,6 +488,7 @@ return /******/ (function(modules) { // webpackBootstrap
var pageX = touches.pageX;
var pageY = touches.pageY;


touchOffset = {
x: pageX,
y: pageY,
Expand All @@ -502,6 +509,7 @@ return /******/ (function(modules) { // webpackBootstrap
var pageX = touches.pageX;
var pageY = touches.pageY;


delta = {
x: pageX - touchOffset.x,
y: pageY - touchOffset.y
Expand Down Expand Up @@ -622,16 +630,16 @@ return /******/ (function(modules) { // webpackBootstrap
* Detecting prefixes for saving time and bytes
*/
function detectPrefixes() {
var transform = undefined;
var transition = undefined;
var transitionEnd = undefined;
var hasTranslate3d = undefined;
var transform = void 0;
var transition = void 0;
var transitionEnd = void 0;
var hasTranslate3d = void 0;

(function () {
var el = document.createElement('_');
var style = el.style;

var prop = undefined;
var prop = void 0;

if (style[prop = 'webkitTransition'] === '') {
transitionEnd = 'webkitTransitionEnd';
Expand Down
2 changes: 1 addition & 1 deletion demo/js/jquery.lory.min.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 0bc0a95

Please sign in to comment.