v3.2.2

patrickkunka · Nov 11, 2017 · e232deb · e232deb
1 parent 26f079f
commit e232deb
Show file tree

Hide file tree

Showing 21 changed files with 1,040 additions and 61 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,12 @@
 Change Log
 ==========
 
+## 3.2.2
+- Fixes issue where multiple toggle controls are not automatically activated when a compound selector is specified to `load.filter`.
+- Fixes issue where calling `.toggleOff()` and passing a non-existent selector will deactivate all other active toggles.
+- Fixes issue where padding whitespace around a DOM string when calling `.insert()` caused an exception.
+- Adds additional demos for non-standard UI.
+
 ## 3.2.1
 - Additional edge-case work relating to Dataset API fix in v3.2.0.
 - Addition of `.forceRender()` mixer API method.

diff --git a/demos/checkboxes/index.html b/demos/checkboxes/index.html
@@ -0,0 +1,86 @@
+<!DOCTYPE html>
+<html>
+    <head>
+        <meta name="viewport" content="width=device-width, initial-scale=1">
+
+        <link href="../reset.css" rel="stylesheet"/>
+        <link href="./style.css" rel="stylesheet"/>
+
+        <title>MixItUp Demo - Checkboxes</title>
+    </head>
+    <body>
+        <div class="controls">
+            <div class="checkbox-group">
+                <div class="checkbox">
+                    <label class="checkbox-label">Green</label>
+                    <input type="checkbox" value=".green"/>
+                </div>
+
+                <div class="checkbox">
+                    <label class="checkbox-label">Blue</label>
+                    <input type="checkbox" value=".blue"/>
+                </div>
+
+                <div class="checkbox">
+                    <label class="checkbox-label">Pink</label>
+                    <input type="checkbox" value=".pink"/>
+                </div>
+            </div>
+
+            <button type="button" class="control" data-sort="default:asc">Asc</button>
+            <button type="button" class="control" data-sort="default:desc">Desc</button>
+        </div>
+
+        <div class="container">
+            <div class="mix green"></div>
+            <div class="mix green"></div>
+            <div class="mix blue"></div>
+            <div class="mix pink"></div>
+            <div class="mix green"></div>
+            <div class="mix blue"></div>
+            <div class="mix pink"></div>
+            <div class="mix blue"></div>
+
+            <div class="gap"></div>
+            <div class="gap"></div>
+            <div class="gap"></div>
+        </div>
+
+        <script src="../mixitup.min.js"></script>
+
+        <script>
+            // In this example, we must bind a 'change' event handler to
+            // our checkboxes, then interact with the mixer via
+            // its .filter() API methods.
+
+            var containerEl = document.querySelector('.container');
+            var checkboxGroup = document.querySelector('.checkbox-group');
+            var checkboxes = checkboxGroup.querySelectorAll('input[type="checkbox"]');
+
+            var mixer = mixitup(containerEl);
+
+            checkboxGroup.addEventListener('change', function() {
+                var selectors = [];
+
+                // Iterate through all checkboxes, pushing the
+                // values of those that are checked into an array
+
+                for (var i = 0; i < checkboxes.length; i++) {
+                    var checkbox = checkboxes[i];
+
+                    if (checkbox.checked) selectors.push(checkbox.value);
+                }
+
+                // If there are values in the array, join it into a string
+                // using your desired logic, and send to the mixer's .filter()
+                // method, otherwise filter by 'all'
+
+                var selectorString = selectors.length > 0 ?
+                    selectors.join(',') : // or '.' for AND logic
+                    'all';
+
+                mixer.filter(selectorString);
+            });
+        </script>
+    </body>
+</html>
diff --git a/demos/checkboxes/style.css b/demos/checkboxes/style.css
@@ -0,0 +1,200 @@
+html,
+body {
+    height: 100%;
+    background: #f2f2f2;
+}
+
+*,
+*:before,
+*:after {
+    box-sizing: border-box;
+}
+
+/* Controls
+---------------------------------------------------------------------- */
+
+.controls {
+    padding: 1rem;
+    background: #333;
+    font-size: 0.1px;
+}
+
+.control {
+    position: relative;
+    display: inline-block;
+    width: 2.7rem;
+    height: 2.7rem;
+    background: #444;
+    cursor: pointer;
+    font-size: 0.1px;
+    color: white;
+    transition: background 150ms;
+}
+
+.control:hover {
+    background: #3f3f3f;
+}
+
+.control[data-filter]:after {
+    content: '';
+    position: absolute;
+    width: 10px;
+    height: 10px;
+    top: calc(50% - 6px);
+    left: calc(50% - 6px);
+    border: 2px solid currentColor;
+    border-radius: 2px;
+    background: currentColor;
+    transition: background-color 150ms, border-color 150ms;
+}
+
+.control[data-sort]:after {
+    content: '';
+    position: absolute;
+    width: 10px;
+    height: 10px;
+    border-top: 2px solid;
+    border-left: 2px solid;
+    top: calc(50% - 6px);
+    left: calc(50% - 6px);
+    transform:  translateY(1px) rotate(45deg);
+}
+
+.control[data-sort*=":desc"]:after {
+    transform:  translateY(-4px) rotate(-135deg);
+}
+
+.mixitup-control-active {
+    background: #393939;
+}
+
+.mixitup-control-active[data-filter]:after {
+    background: transparent;
+}
+
+.control:first-of-type {
+    border-radius: 3px 0 0 3px;
+}
+
+.control:last-of-type {
+    border-radius: 0 3px 3px 0;
+}
+
+.checkbox-group {
+    display: inline-block;
+    padding: .5rem;
+    background: #2a2a2a;
+    margin-right: .75rem;
+    vertical-align: top;
+}
+
+.checkbox {
+    text-align: justify;
+}
+
+.checkbox:after {
+    content: '';
+    display: inline-block;
+    width: 100%;
+}
+
+.checkbox-input,
+.checkbox-label {
+    display: inline-block;
+}
+
+.checkbox-label {
+    color: white;
+    font-family: 'helvetica-neue', arial, sans-serif;
+    font-size: .9rem;
+    margin-right: .5rem;
+}
+
+/* Container
+---------------------------------------------------------------------- */
+
+.container {
+    padding: 1rem;
+    text-align: justify;
+    font-size: 0.1px;
+}
+
+.container:after {
+    content: '';
+    display: inline-block;
+    width: 100%;
+}
+
+/* Target Elements
+---------------------------------------------------------------------- */
+
+.mix,
+.gap {
+    display: inline-block;
+    vertical-align: top;
+}
+
+.mix {
+    background: #fff;
+    border-top: .5rem solid currentColor;
+    border-radius: 2px;
+    margin-bottom: 1rem;
+    position: relative;
+}
+
+.mix:before {
+    content: '';
+    display: inline-block;
+    padding-top: 56.25%;
+}
+
+.mix.green {
+    color: #91e6c7;
+}
+
+.mix.pink {
+    color: #d595aa;
+}
+
+.mix.blue {
+    color: #5ecdde;
+}
+
+/* Grid Breakpoints
+---------------------------------------------------------------------- */
+
+/* 2 Columns */
+
+.mix,
+.gap {
+    width: calc(100%/2 - (((2 - 1) * 1rem) / 2));
+}
+
+/* 3 Columns */
+
+@media screen and (min-width: 541px) {
+    .mix,
+    .gap {
+        width: calc(100%/3 - (((3 - 1) * 1rem) / 3));
+    }
+}
+
+/* 4 Columns */
+
+@media screen and (min-width: 961px) {
+    .mix,
+    .gap {
+        width: calc(100%/4 - (((4 - 1) * 1rem) / 4));
+    }
+}
+
+/* 5 Columns */
+
+@media screen and (min-width: 1281px) {
+    .mix,
+    .gap {
+        width: calc(100%/5 - (((5 - 1) * 1rem) / 5));
+    }
+}
+
+
diff --git a/demos/index.html b/demos/index.html
@@ -31,6 +31,14 @@ <h2>Filtering</h2>
             <li><a href="./filtering-by-text-input/">Filtering by Text Input</a></li>
         </ul>
 
+        <h2>Non-standard UI</h2>
+
+        <ul>
+            <li><a href="./select-dropdowns/">Select Dropdowns</a></li>
+            <li><a href="./checkboxes/">Checkboxes</a></li>
+            <li><a href="./radio-buttons/">Radio Buttons</a></li>
+        </ul>
+
         <h2>Sorting</h2>
 
         <ul>

diff --git a/demos/mixitup.min.js b/demos/mixitup.min.js