Skip to content

Commit 0b0add6

Browse files
chore(): Bump v3.2.1
1 parent ccf66b3 commit 0b0add6

File tree

5 files changed

+36
-36
lines changed

5 files changed

+36
-36
lines changed

dist/glide.esm.js

+11-11
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*!
2-
* Glide.js v3.2.0
2+
* Glide.js v3.2.1
33
* (c) 2013-2018 Jędrzej Chałubek <[email protected]> (http://jedrzejchalubek.com/)
44
* Released under the MIT License.
55
*/
@@ -474,6 +474,10 @@ function mergeOptions(defaults, settings) {
474474
}
475475
}
476476

477+
if (settings.hasOwnProperty('breakpoints')) {
478+
options.breakpoints = _extends({}, defaults.breakpoints, settings.breakpoints);
479+
}
480+
477481
return options;
478482
}
479483

@@ -634,7 +638,7 @@ var Glide = function () {
634638
value: function update() {
635639
var settings = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
636640

637-
this.settings = _extends({}, this.settings, settings);
641+
this.settings = mergeOptions(this.settings, settings);
638642

639643
if (settings.hasOwnProperty('startAt')) {
640644
this.index = settings.startAt;
@@ -3526,17 +3530,13 @@ function Breakpoints (Glide, Components, Events) {
35263530
var settings = Glide.settings;
35273531

35283532
/**
3529-
* Holds reference to breakpoints object in settings
3533+
* Holds reference to breakpoints object in settings. Sorts breakpoints
3534+
* from smaller to larger. It is required in order to proper
3535+
* matching currently active breakpoint settings.
35303536
*
35313537
* @type {Object}
35323538
*/
3533-
var points = settings.breakpoints;
3534-
3535-
/**
3536-
* Sort breakpoints from smaller to larger. It is required in order
3537-
* to proper matching currently active breakpoint settings.
3538-
*/
3539-
points = sortBreakpoints(points);
3539+
var points = sortBreakpoints(settings.breakpoints);
35403540

35413541
/**
35423542
* Cache initial settings before overwritting.
@@ -3578,7 +3578,7 @@ function Breakpoints (Glide, Components, Events) {
35783578
* - window resize to update slider
35793579
*/
35803580
Binder.on('resize', window, throttle(function () {
3581-
_extends(settings, Breakpoints.match(points));
3581+
Glide.settings = mergeOptions(settings, Breakpoints.match(points));
35823582
}, Glide.settings.throttle));
35833583

35843584
/**

dist/glide.js

+11-11
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*!
2-
* Glide.js v3.2.0
2+
* Glide.js v3.2.1
33
* (c) 2013-2018 Jędrzej Chałubek <[email protected]> (http://jedrzejchalubek.com/)
44
* Released under the MIT License.
55
*/
@@ -480,6 +480,10 @@
480480
}
481481
}
482482

483+
if (settings.hasOwnProperty('breakpoints')) {
484+
options.breakpoints = _extends({}, defaults.breakpoints, settings.breakpoints);
485+
}
486+
483487
return options;
484488
}
485489

@@ -640,7 +644,7 @@
640644
value: function update() {
641645
var settings = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
642646

643-
this.settings = _extends({}, this.settings, settings);
647+
this.settings = mergeOptions(this.settings, settings);
644648

645649
if (settings.hasOwnProperty('startAt')) {
646650
this.index = settings.startAt;
@@ -3532,17 +3536,13 @@
35323536
var settings = Glide.settings;
35333537

35343538
/**
3535-
* Holds reference to breakpoints object in settings
3539+
* Holds reference to breakpoints object in settings. Sorts breakpoints
3540+
* from smaller to larger. It is required in order to proper
3541+
* matching currently active breakpoint settings.
35363542
*
35373543
* @type {Object}
35383544
*/
3539-
var points = settings.breakpoints;
3540-
3541-
/**
3542-
* Sort breakpoints from smaller to larger. It is required in order
3543-
* to proper matching currently active breakpoint settings.
3544-
*/
3545-
points = sortBreakpoints(points);
3545+
var points = sortBreakpoints(settings.breakpoints);
35463546

35473547
/**
35483548
* Cache initial settings before overwritting.
@@ -3584,7 +3584,7 @@
35843584
* - window resize to update slider
35853585
*/
35863586
Binder.on('resize', window, throttle(function () {
3587-
_extends(settings, Breakpoints.match(points));
3587+
Glide.settings = mergeOptions(settings, Breakpoints.match(points));
35883588
}, Glide.settings.throttle));
35893589

35903590
/**

0 commit comments

Comments
 (0)