Permalink
Browse files

Merge branch 'trac/7485' of https://github.com/silverstripe-rebelalli…

…ance/sapphire into silverstripe-rebelalliance-trac/7485
  • Loading branch information...
chillu committed Jun 17, 2012
2 parents 5f9b54c + c12db51 commit 69ae8266ef50a8094c4910b09f44ae2d001a9829
Showing with 6 additions and 2 deletions.
  1. +1 −1 admin/javascript/LeftAndMain.AddForm.js
  2. +5 −1 admin/javascript/LeftAndMain.Tree.js
@@ -32,7 +32,7 @@
fromTree: {
onselect_node: function(e, data){
self.refresh(data.rslt.obj);
this.refresh(data.rslt.obj);
}
},
@@ -100,7 +100,11 @@
}
}
});
});
})
// Make some jstree events delegatable
.bind('select_node.jstree check_node.jstree', function(e, data) {
$(document).triggerHandler(e, data);
})
},
onremove: function(){
this.jstree('destroy');

0 comments on commit 69ae826

Please sign in to comment.