Merge pull request #8 from cristinawithout/destroy-event

Destroy jstree on willDestroyElement. Send eventDidDestroy.
ritesh83 · Apr 17, 2015 · 8774002 · 8774002
2 parents 781de32 + 18d2dd2
commit 8774002
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 7 deletions.
diff --git a/README.md b/README.md
@@ -51,12 +51,13 @@ in your controller.
 
 The following events have basic support included. More are on the way.
 
-| jsTree Event   | Ember Action        |
-|----------------|---------------------|
-| changed.jstree | eventDidChange      |
-| init.jstree    | eventDidInit        |
-| ready.jstree   | eventDidBecomeReady |
-| redraw.jstree  | eventDidRedraw      |
+| jsTree Event           | Ember Action          |
+|------------------------|-----------------------|
+| changed.jstree         | eventDidChange        |
+| init.jstree            | eventDidInit          |
+| ready.jstree           | eventDidBecomeReady   |
+| redraw.jstree          | eventDidRedraw        |
+| (destroyed - no event) | eventDidDestroy       |
 
 **Note:** In the meantime, you can add event listeners yourself by calling them on a mapped `treeObject` property.
 

diff --git a/addon/components/ember-jstree.js b/addon/components/ember-jstree.js
@@ -32,6 +32,10 @@ export default Ember.Component.extend(InboundActions, EmberJstreeActions, {
         this.set('treeObject', treeObject);
     },
 
+    willDestroyElement: function() {
+        this.send('destroy');
+    },
+
     searchCallback: function(str, node) {
         if(typeof node.original === 'object') {
             if(node.original[this.search_property]) {
@@ -110,7 +114,7 @@ export default Ember.Component.extend(InboundActions, EmberJstreeActions, {
     _setupContextMenus: function(pluginsArray) {
         var contextmenuOptions = this.get('contextmenuOptions');
         var self = this;
-        
+
         if (null === pluginsArray) {
             return;
         }

diff --git a/addon/mixins/ember-jstree-actions.js b/addon/mixins/ember-jstree-actions.js
@@ -23,6 +23,7 @@ export default Ember.Mixin.create({
             var o = this.get('treeObject');
             if (null !== o) {
                 o.jstree(true).destroy();
+                this.sendAction('eventDidDestroy');
             }
         },