v3.1.8

patrickkunka · Mar 4, 2017 · 39d92ae · 39d92ae
1 parent 752a4d6
commit 39d92ae
Show file tree

Hide file tree

Showing 6 changed files with 42 additions and 26 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,10 @@
 Change Log
 ==========
 
+## 3.1.8
+
+- Adds ability to bind live controls where multiple parents exist. Required for Pagination 3.2.0.
+
 ## 3.1.7
 
 - Fixed duplicate hook `beforeCacheDom` in `Target#cacheDom`. Now renamed to `afterCacheDom`.

diff --git a/demos/mixitup.min.js b/demos/mixitup.min.js
diff --git a/dist/mixitup.js b/dist/mixitup.js
@@ -1,7 +1,7 @@
 /**!
- * MixItUp v3.1.7
+ * MixItUp v3.1.8
  * A high-performance, dependency-free library for animated filtering, sorting and more
- * Build dcb11d27-0cb4-45f7-949b-e3742b467160
+ * Build 8b4a57ae-dad2-4d16-bc0b-024c6a7b1cb0
  *
  * @copyright Copyright 2014-2017 KunkaLabs Limited.
  * @author    KunkaLabs Limited.
@@ -5206,7 +5206,7 @@
                 controlElements     = null,
                 el                  = null,
                 parent              = null,
-                delagator           = null,
+                delagators          = null,
                 control             = null,
                 i                   = -1,
                 j                   = -1;
@@ -5229,20 +5229,26 @@
             for (i = 0; definition = mixitup.controlDefinitions[i]; i++) {
                 if (self.config.controls.live || definition.live) {
                     if (definition.parent) {
-                        delagator = self.dom[definition.parent];
+                        delagators = self.dom[definition.parent];
 
-                        if (!delagator) continue;
+                        if (!delagators || delagators.length < 0) continue;
+
+                        if (typeof delagators.length !== 'number') {
+                            delagators = [delagators];
+                        }
                     } else {
-                        delagator = parent;
+                        delagators = [parent];
                     }
 
-                    control = self.getControl(delagator,  definition.type, definition.selector);
+                    for (j = 0; (el = delagators[j]); j++) {
+                        control = self.getControl(el,  definition.type, definition.selector);
 
-                    self.controls.push(control);
+                        self.controls.push(control);
+                    }
                 } else {
                     controlElements = parent.querySelectorAll(self.config.selectors.control + definition.selector);
 
-                    for (j = 0; el = controlElements[j]; j++) {
+                    for (j = 0; (el = controlElements[j]); j++) {
                         control = self.getControl(el, definition.type, '');
 
                         if (!control) continue;
@@ -10475,5 +10481,5 @@
     mixitup.BaseStatic.call(mixitup.constructor);
 
     mixitup.NAME = 'mixitup';
-    mixitup.CORE_VERSION = '3.1.7';
+    mixitup.CORE_VERSION = '3.1.8';
 })(window);
diff --git a/dist/mixitup.min.js b/dist/mixitup.min.js
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "mixitup",
   "title": "MixItUp",
-  "version": "3.1.7",
+  "version": "3.1.8",
   "description": "A high-performance, dependency-free library for animated filtering, sorting and more",
   "author": "KunkaLabs Limited",
   "homepage": "https://www.kunkalabs.com/mixitup/",

diff --git a/src/mixer.js b/src/mixer.js
@@ -323,7 +323,7 @@ h.extend(mixitup.Mixer.prototype,
             controlElements     = null,
             el                  = null,
             parent              = null,
-            delagator           = null,
+            delagators          = null,
             control             = null,
             i                   = -1,
             j                   = -1;
@@ -346,20 +346,26 @@ h.extend(mixitup.Mixer.prototype,
         for (i = 0; definition = mixitup.controlDefinitions[i]; i++) {
             if (self.config.controls.live || definition.live) {
                 if (definition.parent) {
-                    delagator = self.dom[definition.parent];
+                    delagators = self.dom[definition.parent];
 
-                    if (!delagator) continue;
+                    if (!delagators || delagators.length < 0) continue;
+
+                    if (typeof delagators.length !== 'number') {
+                        delagators = [delagators];
+                    }
                 } else {
-                    delagator = parent;
+                    delagators = [parent];
                 }
 
-                control = self.getControl(delagator,  definition.type, definition.selector);
+                for (j = 0; (el = delagators[j]); j++) {
+                    control = self.getControl(el,  definition.type, definition.selector);
 
-                self.controls.push(control);
+                    self.controls.push(control);
+                }
             } else {
                 controlElements = parent.querySelectorAll(self.config.selectors.control + definition.selector);
 
-                for (j = 0; el = controlElements[j]; j++) {
+                for (j = 0; (el = controlElements[j]); j++) {
                     control = self.getControl(el, definition.type, '');
 
                     if (!control) continue;