support plain javascript objects

Author: Aarondorn2

addon/components/x-tree-children.js

@@ -1,6 +1,6 @@
 import Component from '@ember/component';
 import layout from '../templates/components/x-tree-children';
-import { get, setProperties } from '@ember/object';
+import { setProperties } from '@ember/object';
 
 export default Component.extend({
   layout,
@@ -9,9 +9,9 @@ export default Component.extend({
 
   actions: {
     updateCheckbox() {
-      if (this.get('recursiveCheck')) {
-        let model = this.get('model');
-        let children = get(model, 'children');
+      if (this.recursiveCheck) {
+        let model = this.model;
+        let children = model.children;
 
         if (children.length) {
           let isChecked = false;

addon/components/x-tree-node.js

@@ -1,5 +1,5 @@
 import Component from '@ember/component';
-import { computed, get, setProperties }  from '@ember/object';
+import { computed, set, setProperties }  from '@ember/object';
 import layout from '../templates/components/x-tree-node';
 
 export default Component.extend({
@@ -13,45 +13,45 @@ export default Component.extend({
   recursiveCheck: false,
 
   isChosen: computed('model.id', 'chosenId', function() {
-    return this.get('model.id') === this.get('chosenId');
+    return this.model.id === this.chosenId;
   }),
 
   click() {
-    let select = this.get('onSelect');
+    let select = this.onSelect;
     if (select) {
-      let model = this.get('model');
-      let wasChecked = model.get('isChecked');
+      let model = this.model;
+      let wasChecked = model.isChecked;
 
       select(model);
 
-      let isChecked = model.get('isChecked');
-      if (isChecked !== wasChecked && this.get('recursiveCheck')) {
+      let isChecked = model.isChecked;
+      if (isChecked !== wasChecked && this.recursiveCheck) {
         this.setChildCheckboxesRecursively(model, isChecked);
         this.updateCheckbox();
       }
     }
   },
 
   mouseEnter() {
-    this.set('model.isSelected', true);
+    set(this, 'model.isSelected', true);
 
-    let hover = this.get('onHover');
+    let hover = this.onHover;
     if (hover) {
-      hover(this.get('model'));
+      hover(this.model);
     }
   },
 
   mouseLeave() {
-    this.set('model.isSelected', false);
+    set(this, 'model.isSelected', false);
 
-    let hoverOut = this.get('onHoverOut');
+    let hoverOut = this.onHoverOut;
     if (hoverOut) {
-      hoverOut(this.get('model'));
+      hoverOut(this.model);
     }
   },
 
   setChildCheckboxesRecursively(node, isChecked) {
-    let children = get(node, 'children');
+    let children = node.children;
     if (children.length) {
       children.forEach(child => {
         setProperties(child, {
@@ -69,14 +69,14 @@ export default Component.extend({
       event.stopPropagation();
 
       let isChecked = this.toggleProperty('model.isChecked');
-      let model = this.get('model');
+      let model = this.model;
 
-      if (this.get('recursiveCheck')) {
+      if (this.recursiveCheck) {
         this.setChildCheckboxesRecursively(model, isChecked);
         this.updateCheckbox();
       }
 
-      let check = this.get('onCheck');
+      let check = this.onCheck;
       if (check) {
         check(model);
       }

addon/components/x-tree.js

@@ -1,7 +1,7 @@
 import Component from '@ember/component';
 import layout from '../templates/components/x-tree';
 import { getDescendents, getAncestors } from '../utils/tree';
-import { get, set }  from '@ember/object';
+import { set }  from '@ember/object';
 
 export default Component.extend({
   layout,
@@ -14,23 +14,23 @@ export default Component.extend({
 
   init() {
     this._super(...arguments);
-    let tree = this.get('model');
+    let tree = this.model;
 
     // Make sure chosen item is highlighted and expanded-to in the tree
-    let chosenId = this.get('chosenId');
+    let chosenId = this.chosenId;
     if (chosenId) {
       let chosen = getDescendents(tree).findBy('id', chosenId);
       if (chosen) {
         getAncestors(tree, chosen).forEach(x => {
-          if (get(x, 'id') !== chosenId) {
+          if (x.id !== chosenId) {
             set(x, 'isExpanded', true);
           }
         });
       }
     }
 
     // Expand to given depth
-    let expandDepth = this.get('expandDepth');
+    let expandDepth = this.expandDepth;
     if (expandDepth) {
       getDescendents(tree, expandDepth).setEach('isExpanded', true);
     }

addon/utils/tree.js

@@ -31,16 +31,16 @@ export function buildTree(model, options = {}) {
 
     // Defaults
     set(node, 'children', A());
-    set(node, 'isVisible', get(node, 'isVisible') || true);
-    set(node, 'isExpanded', get(node, 'isExpanded') || false);
+    set(node, 'isVisible', node.isVisible || true);
+    set(node, 'isExpanded', node.isExpanded || false);
 
-    tree[get(node, 'id')] = node;
+    tree[node.id] = node;
   });
 
   // Connect all children to their parent
   model.forEach(node => {
     let child = tree[get(node, options.valueKey || 'id')];
-    let parent = get(node, 'parentId');
+    let parent = node.parentId;
 
     if (isEmpty(parent)) {
       roots.pushObject(child);
@@ -74,7 +74,7 @@ export function getDescendents(tree, depth = -1) {
 // Returns a flat list of ancestors, including the child
 export function getAncestors(tree, childNode) {
   let ancestors = A();
-  let childId = get(childNode, 'id');
+  let childId = childNode.id;
 
   tree.forEach(node => {
     if (!ancestors.isAny('id', childId)) {
@@ -94,5 +94,5 @@ export function getAncestors(tree, childNode) {
 
 // Returns the parent of a child
 export function getParent(list, childNode) {
-  return list.find(x => x.children.find(y => y.id === childNode.get('id')));
+  return list.find(x => x.children.find(y => y.id === childNode.id));
 }