chore(): Bump v3.2.1

glidejs · Jul 22, 2018 · 0b0add6 · 0b0add6
1 parent ccf66b3
commit 0b0add6
Show file tree

Hide file tree

Showing 5 changed files with 36 additions and 36 deletions.
diff --git a/dist/glide.esm.js b/dist/glide.esm.js
@@ -1,5 +1,5 @@
 /*!
- * Glide.js v3.2.0
+ * Glide.js v3.2.1
  * (c) 2013-2018 Jędrzej Chałubek <jedrzej.chalubek@gmail.com> (http://jedrzejchalubek.com/)
  * Released under the MIT License.
  */
@@ -474,6 +474,10 @@ function mergeOptions(defaults, settings) {
     }
   }
 
+  if (settings.hasOwnProperty('breakpoints')) {
+    options.breakpoints = _extends({}, defaults.breakpoints, settings.breakpoints);
+  }
+
   return options;
 }
 
@@ -634,7 +638,7 @@ var Glide = function () {
     value: function update() {
       var settings = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
 
-      this.settings = _extends({}, this.settings, settings);
+      this.settings = mergeOptions(this.settings, settings);
 
       if (settings.hasOwnProperty('startAt')) {
         this.index = settings.startAt;
@@ -3526,17 +3530,13 @@ function Breakpoints (Glide, Components, Events) {
   var settings = Glide.settings;
 
   /**
-   * Holds reference to breakpoints object in settings
+   * Holds reference to breakpoints object in settings. Sorts breakpoints
+   * from smaller to larger. It is required in order to proper
+   * matching currently active breakpoint settings.
    *
    * @type {Object}
    */
-  var points = settings.breakpoints;
-
-  /**
-   * Sort breakpoints from smaller to larger. It is required in order
-   * to proper matching currently active breakpoint settings.
-   */
-  points = sortBreakpoints(points);
+  var points = sortBreakpoints(settings.breakpoints);
 
   /**
    * Cache initial settings before overwritting.
@@ -3578,7 +3578,7 @@ function Breakpoints (Glide, Components, Events) {
    * - window resize to update slider
    */
   Binder.on('resize', window, throttle(function () {
-    _extends(settings, Breakpoints.match(points));
+    Glide.settings = mergeOptions(settings, Breakpoints.match(points));
   }, Glide.settings.throttle));
 
   /**

diff --git a/dist/glide.js b/dist/glide.js
@@ -1,5 +1,5 @@
 /*!
- * Glide.js v3.2.0
+ * Glide.js v3.2.1
  * (c) 2013-2018 Jędrzej Chałubek <jedrzej.chalubek@gmail.com> (http://jedrzejchalubek.com/)
  * Released under the MIT License.
  */
@@ -480,6 +480,10 @@
       }
     }
 
+    if (settings.hasOwnProperty('breakpoints')) {
+      options.breakpoints = _extends({}, defaults.breakpoints, settings.breakpoints);
+    }
+
     return options;
   }
 
@@ -640,7 +644,7 @@
       value: function update() {
         var settings = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
 
-        this.settings = _extends({}, this.settings, settings);
+        this.settings = mergeOptions(this.settings, settings);
 
         if (settings.hasOwnProperty('startAt')) {
           this.index = settings.startAt;
@@ -3532,17 +3536,13 @@
     var settings = Glide.settings;
 
     /**
-     * Holds reference to breakpoints object in settings
+     * Holds reference to breakpoints object in settings. Sorts breakpoints
+     * from smaller to larger. It is required in order to proper
+     * matching currently active breakpoint settings.
      *
      * @type {Object}
      */
-    var points = settings.breakpoints;
-
-    /**
-     * Sort breakpoints from smaller to larger. It is required in order
-     * to proper matching currently active breakpoint settings.
-     */
-    points = sortBreakpoints(points);
+    var points = sortBreakpoints(settings.breakpoints);
 
     /**
      * Cache initial settings before overwritting.
@@ -3584,7 +3584,7 @@
      * - window resize to update slider
      */
     Binder.on('resize', window, throttle(function () {
-      _extends(settings, Breakpoints.match(points));
+      Glide.settings = mergeOptions(settings, Breakpoints.match(points));
     }, Glide.settings.throttle));
 
     /**