Skip to content

Commit f8c73e8

Browse files
jedrzejchalubekjedrzejchalubek
committed
Bump v3.0.1
1 parent 561c5da commit f8c73e8

File tree

5 files changed

+198
-93
lines changed

5 files changed

+198
-93
lines changed

‎dist/glide.esm.js

+65-30
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*!
2-
* Glide.js v3.0.0
2+
* Glide.js v3.0.1
33
* (c) 2013-2018 Jędrzej Chałubek <[email protected]> (http://jedrzejchalubek.com/)
44
* Released under the MIT License.
55
*/
@@ -244,7 +244,20 @@ var createClass = function () {
244244

245245

246246

247+
var defineProperty = function (obj, key, value) {
248+
if (key in obj) {
249+
Object.defineProperty(obj, key, {
250+
value: value,
251+
enumerable: true,
252+
configurable: true,
253+
writable: true
254+
});
255+
} else {
256+
obj[key] = value;
257+
}
247258

259+
return obj;
260+
};
248261

249262
var _extends = Object.assign || function (target) {
250263
for (var i = 1; i < arguments.length; i++) {
@@ -423,6 +436,54 @@ function mount(glide, extensions, events) {
423436
return components;
424437
}
425438

439+
/**
440+
* Defines getter and setter property on the specified object.
441+
*
442+
* @param {Object} obj Object where property has to be defined.
443+
* @param {String} prop Name of the defined property.
444+
* @param {Object} definition Get and set definitions for the property.
445+
* @return {Void}
446+
*/
447+
function define(obj, prop, definition) {
448+
Object.defineProperty(obj, prop, definition);
449+
}
450+
451+
/**
452+
* Sorts aphabetically object keys.
453+
*
454+
* @param {Object} obj
455+
* @return {Object}
456+
*/
457+
function sortKeys(obj) {
458+
return Object.keys(obj).sort().reduce(function (r, k) {
459+
r[k] = obj[k];
460+
461+
return r[k], r;
462+
}, {});
463+
}
464+
465+
/**
466+
* Deeply merges two objects.
467+
*
468+
* @param {Object} target
469+
* @param {Object} source
470+
* @return {Object}
471+
*/
472+
function merge(target, source) {
473+
if (isObject(target) && isObject(source)) {
474+
Object.keys(source).forEach(function (key) {
475+
if (isObject(source[key])) {
476+
if (!target[key]) _extends(target, defineProperty({}, key, {}));
477+
merge(target[key], source[key]);
478+
} else {
479+
_extends(target, defineProperty({}, key, source[key]));
480+
}
481+
});
482+
}
483+
484+
return _extends({}, target);
485+
}
486+
426487
var EventsBus = function () {
427488
/**
428489
* Construct a EventBus instance.
@@ -501,8 +562,7 @@ var EventsBus = function () {
501562
}();
502563

503564
var Glide$2 = function () {
504-
/**
505-
* Construct glide.
565+
/** * Construct glide.
506566
*
507567
* @param {String} selector
508568
* @param {Object} options
@@ -515,8 +575,9 @@ var Glide$2 = function () {
515575
this._e = new EventsBus();
516576

517577
this.disabled = false;
578+
518579
this.selector = selector;
519-
this.settings = _extends({}, defaults, options);
580+
this.settings = merge(defaults, options);
520581
this.index = this.settings.startAt;
521582
}
522583

@@ -797,32 +858,6 @@ var Glide$2 = function () {
797858
return Glide;
798859
}();
799860

800-
/**
801-
* Defines getter and setter property on the specified object.
802-
*
803-
* @param {Object} obj Object where property has to be defined.
804-
* @param {String} prop Name of the defined property.
805-
* @param {Object} definition Get and set definitions for the property.
806-
* @return {Void}
807-
*/
808-
function define(obj, prop, definition) {
809-
Object.defineProperty(obj, prop, definition);
810-
}
811-
812-
/**
813-
* Sorts aphabetically object keys.
814-
*
815-
* @param {Object} obj
816-
* @return {Object}
817-
*/
818-
function sortKeys(obj) {
819-
return Object.keys(obj).sort().reduce(function (r, k) {
820-
r[k] = obj[k];
821-
822-
return r[k], r;
823-
}, {});
824-
}
825-
826861
var Run = function (Glide, Components, Events) {
827862
var Run = {
828863
/**

‎dist/glide.js

+65-30
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*!
2-
* Glide.js v3.0.0
2+
* Glide.js v3.0.1
33
* (c) 2013-2018 Jędrzej Chałubek <[email protected]> (http://jedrzejchalubek.com/)
44
* Released under the MIT License.
55
*/
@@ -250,7 +250,20 @@ var createClass = function () {
250250

251251

252252

253+
var defineProperty = function (obj, key, value) {
254+
if (key in obj) {
255+
Object.defineProperty(obj, key, {
256+
value: value,
257+
enumerable: true,
258+
configurable: true,
259+
writable: true
260+
});
261+
} else {
262+
obj[key] = value;
263+
}
253264

265+
return obj;
266+
};
254267

255268
var _extends = Object.assign || function (target) {
256269
for (var i = 1; i < arguments.length; i++) {
@@ -429,6 +442,54 @@ function mount(glide, extensions, events) {
429442
return components;
430443
}
431444

445+
/**
446+
* Defines getter and setter property on the specified object.
447+
*
448+
* @param {Object} obj Object where property has to be defined.
449+
* @param {String} prop Name of the defined property.
450+
* @param {Object} definition Get and set definitions for the property.
451+
* @return {Void}
452+
*/
453+
function define(obj, prop, definition) {
454+
Object.defineProperty(obj, prop, definition);
455+
}
456+
457+
/**
458+
* Sorts aphabetically object keys.
459+
*
460+
* @param {Object} obj
461+
* @return {Object}
462+
*/
463+
function sortKeys(obj) {
464+
return Object.keys(obj).sort().reduce(function (r, k) {
465+
r[k] = obj[k];
466+
467+
return r[k], r;
468+
}, {});
469+
}
470+
471+
/**
472+
* Deeply merges two objects.
473+
*
474+
* @param {Object} target
475+
* @param {Object} source
476+
* @return {Object}
477+
*/
478+
function merge(target, source) {
479+
if (isObject(target) && isObject(source)) {
480+
Object.keys(source).forEach(function (key) {
481+
if (isObject(source[key])) {
482+
if (!target[key]) _extends(target, defineProperty({}, key, {}));
483+
merge(target[key], source[key]);
484+
} else {
485+
_extends(target, defineProperty({}, key, source[key]));
486+
}
487+
});
488+
}
489+
490+
return _extends({}, target);
491+
}
492+
432493
var EventsBus = function () {
433494
/**
434495
* Construct a EventBus instance.
@@ -507,8 +568,7 @@ var EventsBus = function () {
507568
}();
508569

509570
var Glide$2 = function () {
510-
/**
511-
* Construct glide.
571+
/** * Construct glide.
512572
*
513573
* @param {String} selector
514574
* @param {Object} options
@@ -521,8 +581,9 @@ var Glide$2 = function () {
521581
this._e = new EventsBus();
522582

523583
this.disabled = false;
584+
524585
this.selector = selector;
525-
this.settings = _extends({}, defaults, options);
586+
this.settings = merge(defaults, options);
526587
this.index = this.settings.startAt;
527588
}
528589

@@ -803,32 +864,6 @@ var Glide$2 = function () {
803864
return Glide;
804865
}();
805866

806-
/**
807-
* Defines getter and setter property on the specified object.
808-
*
809-
* @param {Object} obj Object where property has to be defined.
810-
* @param {String} prop Name of the defined property.
811-
* @param {Object} definition Get and set definitions for the property.
812-
* @return {Void}
813-
*/
814-
function define(obj, prop, definition) {
815-
Object.defineProperty(obj, prop, definition);
816-
}
817-
818-
/**
819-
* Sorts aphabetically object keys.
820-
*
821-
* @param {Object} obj
822-
* @return {Object}
823-
*/
824-
function sortKeys(obj) {
825-
return Object.keys(obj).sort().reduce(function (r, k) {
826-
r[k] = obj[k];
827-
828-
return r[k], r;
829-
}, {});
830-
}
831-
832867
var Run = function (Glide, Components, Events) {
833868
var Run = {
834869
/**

0 commit comments

Comments
 (0)