Merge 9baf903 into b5c808a

maykinmedia · Dec 8, 2017 · a85911f · a85911f
2 parents b5c808a + 9baf903
commit a85911f
Show file tree

Hide file tree

Showing 4 changed files with 143 additions and 8 deletions.
diff --git a/dist/dual-listbox.js b/dist/dual-listbox.js
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "dual-listbox",
-  "version": "1.0.9",
+  "version": "1.1.0",
   "description": "Dual listbox for multi-select elements",
   "main": "dist/dual-listbox.js",
   "directories": {

diff --git a/src/dual-listbox.js b/src/dual-listbox.js
@@ -159,9 +159,15 @@ class DualListbox {
     _actionAllSelected(event) {
         event.preventDefault();
 
-        while (this.available.length > 0) {
-            this.addSelected(this.available[0]);
-        }
+        let selected = [];
+        this.available.forEach((item) => {
+            if (item.style.display !== "none"){
+                selected.push(item);
+            }
+        });
+        selected.forEach((item) => {
+            this.addSelected(item);
+        });
     }
 
     /**
@@ -193,9 +199,15 @@ class DualListbox {
     _actionAllDeselected(event) {
         event.preventDefault();
 
-        while (this.selected.length > 0) {
-            this.removeSelected(this.selected[0]);
-        }
+        let deselected = [];
+        this.selected.forEach((item) => {
+            if (item.style.display !== "none"){
+                deselected.push(item);
+            }
+        });
+        deselected.forEach((item) => {
+            this.removeSelected(item);
+        });
     }
 
     /**