upgrade d_js

oom-components · Aug 5, 2017 · 151111d · 151111d
1 parent 6ec33bb
commit 151111d
Show file tree

Hide file tree

Showing 6 changed files with 28 additions and 31 deletions.
diff --git a/package.json b/package.json
@@ -36,6 +36,6 @@
     "webpack": "^3.0.0"
   },
   "dependencies": {
-    "d_js": "^1.10.0"
+    "d_js": "^2.0.0"
   }
 }
diff --git a/src/AjaxSource.js b/src/AjaxSource.js
@@ -1,4 +1,3 @@
-import d from 'd_js';
 import Source from './Source.js';
 
 export default class AjaxSource extends Source {

diff --git a/src/DatalistSource.js b/src/DatalistSource.js
@@ -48,7 +48,7 @@ export default class DatalistSource extends Source {
                 parent.element.appendChild(suggestion.element);
                 this.result.push(suggestion);
             } else if (suggestion.element.parentElement === parent.element) {
-                parent.element.removeChild(suggestion.element);
+                suggestion.element.remove();
             }
         });
 
@@ -70,9 +70,14 @@ function getAvailableOptions(element) {
     const data = [];
 
     d.getAll({ optgroup: element }).forEach(optgroup => {
+        const options = [];
+        d
+            .getAll({ option: optgroup })
+            .forEach(option => options.push(createItem(option)));
+
         data.push({
             label: optgroup.label,
-            options: d.getAll({ option: optgroup }).map(createItem)
+            options: options
         });
     });
 

diff --git a/src/Group.js b/src/Group.js
@@ -1,15 +1,12 @@
-import d from 'd_js';
-
 export default class Group {
     constructor(data, settings = {}) {
         this.data = data;
         this.label = settings.label ? data[settings.label] : data.label;
 
-        this.element = d.parse('<ul></ul>');
-        this.wrapperElement = d.parse(
-            `<li><strong>${this.label}</strong></li>`
-        );
-        this.wrapperElement.appendChild(this.element);
+        this.element = document.createElement('ul');
+        this.wrapperElement = document.createElement('li');
+        this.wrapperElement.innerHTML = `<strong>${this.label}</strong>`;
+        this.wrapperElement.append(this.element);
     }
 
     load(data) {
@@ -18,7 +15,7 @@ export default class Group {
     }
 
     append(child) {
-        this.element.appendChild(child);
+        this.element.append(child);
     }
 
     refresh(parent, query, selected) {
@@ -30,10 +27,10 @@ export default class Group {
 
         if (ul.childElementCount) {
             if (element.parentElement !== parent) {
-                parent.appendChild(element);
+                parent.append(element);
             }
         } else if (element.parentElement === parent) {
-            parent.removeChild(element);
+            element.remove();
         }
     }
 }
diff --git a/src/Source.js b/src/Source.js
@@ -14,13 +14,11 @@ export default class Source {
         this.result = [];
         this.current = 0;
 
-        this.element = d.parse('<ul></ul>');
-        (this.settings.parent || document.body).appendChild(this.element);
+        this.element = document.createElement('ul');
+        (this.settings.parent || document.body).append(this.element);
 
-        var self = this;
-
-        d.delegate('mouseenter', this.element, 'li', function(e, target) {
-            self.selectByElement(target);
+        d.delegate('mouseenter', this.element, 'li', (e, target) => {
+            this.selectByElement(target);
         });
     }
 
@@ -142,7 +140,7 @@ export default class Source {
                 } else if (
                     suggestion.wrapperElement.parentElement === this.element
                 ) {
-                    this.element.removeChild(suggestion.wrapperElement);
+                    suggestion.wrapperElement.remove();
                 }
             } else {
                 callback(suggestion, this);
@@ -151,6 +149,6 @@ export default class Source {
     }
 
     destroy() {
-        d.remove(this.element);
+        this.element.remove();
     }
 }
diff --git a/src/Suggestion.js b/src/Suggestion.js
@@ -1,5 +1,3 @@
-import d from 'd_js';
-
 export default class Suggestion {
     constructor(data, settings = {}, group) {
         this.data = data;
@@ -10,29 +8,29 @@ export default class Suggestion {
             : data.label || this.value;
 
         //Render
+        this.element = document.createElement('li');
+
         if (typeof settings.render === 'function') {
-            this.element = d.parse(`<li>${settings.render(this)}</li>`);
+            this.element.innerHTML = settings.render(this);
         } else {
-            this.element = d.parse(`<li>${this.data.label || this.value}</li>`);
+            this.element.innerHTML = this.data.label || this.value;
         }
     }
 
     refresh(parent, query, selected) {
         if (this.match(query)) {
-            parent.appendChild(this.element);
+            parent.append(this.element);
             this.unselect();
             selected.push(this);
         } else {
             if (this.element.parentElement === parent) {
-                parent.removeChild(this.element);
+                this.element.remove();
             }
         }
     }
 
     detach() {
-        if (this.element.parentElement) {
-            this.element.parentElement.removeChild(this.element);
-        }
+        this.element.remove();
     }
 
     scroll(parent, scrollGroup) {