Skip to content

Commit 0b62466

Browse files
committed
Merge pull request #101 from KingHenne/fix/resize-handler
fix(lory.js): call reset() *before* dispatching resize event
2 parents c87b162 + f7a8942 commit 0b62466

11 files changed

Lines changed: 238 additions & 313 deletions

File tree

demo/js/jquery.lory.js

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ return /******/ (function(modules) { // webpackBootstrap
7979

8080
'use strict';
8181

82-
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; };
82+
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 */
8383

8484
Object.defineProperty(exports, "__esModule", {
8585
value: true
@@ -100,8 +100,6 @@ return /******/ (function(modules) { // webpackBootstrap
100100

101101
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
102102

103-
function _instanceof(left, right) { if (right != null && right[Symbol.hasInstance]) { return right[Symbol.hasInstance](left); } else { return left instanceof right; } } /* globals jQuery */
104-
105103
var slice = Array.prototype.slice;
106104

107105
function lory(slider, opts) {
@@ -126,7 +124,7 @@ return /******/ (function(modules) { // webpackBootstrap
126124
/**
127125
* if object is jQuery convert to native DOM element
128126
*/
129-
if (typeof jQuery !== 'undefined' && _instanceof(slider, jQuery)) {
127+
if (typeof jQuery !== 'undefined' && slider instanceof jQuery) {
130128
slider = slider[0];
131129
}
132130

@@ -353,7 +351,7 @@ return /******/ (function(modules) { // webpackBootstrap
353351
slideContainer.addEventListener('click', onClick);
354352
}
355353

356-
window.addEventListener('resize', onResize);
354+
options.window.addEventListener('resize', onResize);
357355

358356
dispatchSliderEvent('after', 'init');
359357
}
@@ -439,7 +437,7 @@ return /******/ (function(modules) { // webpackBootstrap
439437
slideContainer.removeEventListener('mouseleave', onTouchend);
440438
slideContainer.removeEventListener('click', onClick);
441439

442-
window.removeEventListener('resize', onResize);
440+
options.window.removeEventListener('resize', onResize);
443441

444442
if (prevCtrl) {
445443
prevCtrl.removeEventListener('click', prev);
@@ -588,11 +586,11 @@ return /******/ (function(modules) { // webpackBootstrap
588586
}
589587

590588
function onResize(event) {
589+
reset();
590+
591591
dispatchSliderEvent('on', 'resize', {
592592
event: event
593593
});
594-
595-
reset();
596594
}
597595

598596
// trigger initial setup
@@ -851,7 +849,13 @@ return /******/ (function(modules) { // webpackBootstrap
851849
* enables mouse events for swiping on desktop devices
852850
* @enableMouseEvents {boolean}
853851
*/
854-
enableMouseEvents: false
852+
enableMouseEvents: false,
853+
854+
/**
855+
* window instance
856+
* @window {object}
857+
*/
858+
window: window
855859
};
856860

857861
/***/ }

demo/js/jquery.lory.min.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)