Skip to content

Commit 8774002

Browse files
committed
Merge pull request #8 from cristinawithout/destroy-event
Destroy jstree on willDestroyElement. Send eventDidDestroy.
2 parents 781de32 + 18d2dd2 commit 8774002

File tree

3 files changed

+13
-7
lines changed

3 files changed

+13
-7
lines changed

README.md

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -51,12 +51,13 @@ in your controller.
5151

5252
The following events have basic support included. More are on the way.
5353

54-
| jsTree Event | Ember Action |
55-
|----------------|---------------------|
56-
| changed.jstree | eventDidChange |
57-
| init.jstree | eventDidInit |
58-
| ready.jstree | eventDidBecomeReady |
59-
| redraw.jstree | eventDidRedraw |
54+
| jsTree Event | Ember Action |
55+
|------------------------|-----------------------|
56+
| changed.jstree | eventDidChange |
57+
| init.jstree | eventDidInit |
58+
| ready.jstree | eventDidBecomeReady |
59+
| redraw.jstree | eventDidRedraw |
60+
| (destroyed - no event) | eventDidDestroy |
6061

6162
**Note:** In the meantime, you can add event listeners yourself by calling them on a mapped `treeObject` property.
6263

addon/components/ember-jstree.js

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,10 @@ export default Ember.Component.extend(InboundActions, EmberJstreeActions, {
3232
this.set('treeObject', treeObject);
3333
},
3434

35+
willDestroyElement: function() {
36+
this.send('destroy');
37+
},
38+
3539
searchCallback: function(str, node) {
3640
if(typeof node.original === 'object') {
3741
if(node.original[this.search_property]) {
@@ -110,7 +114,7 @@ export default Ember.Component.extend(InboundActions, EmberJstreeActions, {
110114
_setupContextMenus: function(pluginsArray) {
111115
var contextmenuOptions = this.get('contextmenuOptions');
112116
var self = this;
113-
117+
114118
if (null === pluginsArray) {
115119
return;
116120
}

addon/mixins/ember-jstree-actions.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ export default Ember.Mixin.create({
2323
var o = this.get('treeObject');
2424
if (null !== o) {
2525
o.jstree(true).destroy();
26+
this.sendAction('eventDidDestroy');
2627
}
2728
},
2829

0 commit comments

Comments
 (0)