Skip to content

Commit

Permalink
not returning content would break the tree
Browse files Browse the repository at this point in the history
  • Loading branch information
@vakata
vakata committed Oct 2, 2012
1 parent 8ca0a34 commit 1ed13a3
Show file tree
Hide file tree
Showing 26 changed files with 250 additions and 51 deletions.
32 changes: 18 additions & 14 deletions dist/jstree.js
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/*! jstree - v1.0.0 - 2012-09-11
/*! jstree - v1.0.0 - 2012-10-01
* http://jstree.com
* Copyright (c) 2012 Ivan Bozhanov; Licensed MIT, GPL */

Expand Down Expand Up @@ -2437,6 +2437,8 @@ Some static functions and variables, unless you know exactly what you are doing
if(this.data.core.rtl) { this.get_container().addClass("jstree-rtl"); }
this.data.core.ready = false;

if($.support.touch) { this.get_container().addTouch(); }

this.get_container()
.bind("__construct.jstree", $.proxy(function () {
// defer, so that events bound AFTER creating the instance (like __ready) are still handled
Expand All @@ -2453,19 +2455,21 @@ Some static functions and variables, unless you know exactly what you are doing
}, this))
.bind("load_node.jstree", $.proxy(function (e, data) {
// data.rslt.status
if(data.rslt.obj === -1) {
// only detach for root (checkbox three-state will not work otherwise)
// also - if you could use async clean_node won't be such an issue
var ul = this.get_container_ul().detach();
this.clean_node(ul.children('li'));
this.get_container().prepend(ul);
}
else {
this.clean_node(data.rslt.obj.find('> ul > li'));
}
if(!this.data.core.ready && !this.get_container_ul().find('.jstree-loading:eq(0)').length) {
this.data.core.ready = true;
this.__trigger("__ready");
if(data.rslt.status) {
if(data.rslt.obj === -1) {
// only detach for root (checkbox three-state will not work otherwise)
// also - if you could use async clean_node won't be such an issue
var ul = this.get_container_ul().detach();
this.clean_node(ul.children('li'));
this.get_container().prepend(ul);
}
else {
this.clean_node(data.rslt.obj.find('> ul > li'));
}
if(!this.data.core.ready && !this.get_container_ul().find('.jstree-loading:eq(0)').length) {
this.data.core.ready = true;
this.__trigger("__ready");
}
}
}, this))
.bind("__loaded.jstree", $.proxy(function (e, data) {
Expand Down
4 changes: 2 additions & 2 deletions dist/jstree.min.js
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion docs/files/jstree-checkbox-js.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
</div><!--Content-->


<div id=Footer>Copyright &copy; 2010 Ivan Bozhanov&nbsp; &middot;&nbsp; Updated September 11th, 2012&nbsp; &middot;&nbsp; <a href="http://www.naturaldocs.org">Generated by Natural Docs</a></div><!--Footer-->
<div id=Footer>Copyright &copy; 2010 Ivan Bozhanov&nbsp; &middot;&nbsp; Updated October 1st, 2012&nbsp; &middot;&nbsp; <a href="http://www.naturaldocs.org">Generated by Natural Docs</a></div><!--Footer-->


<div id=Menu><div class=MTitle>jstree<div class=MSubTitle>jquery treeview plugin</div></div><div class=MEntry><div class=MGroup><a href="javascript:ToggleMenu('MGroupContent1')">Core</a><div class=MGroupContent id=MGroupContent1><div class=MEntry><div class=MFile><a href="jstree-js.html">jstree.js</a></div></div><div class=MEntry><div class=MFile><a href="vakata-js.html">vakata.js</a></div></div></div></div></div><div class=MEntry><div class=MGroup><a href="javascript:ToggleMenu('MGroupContent2')">Plugins</a><div class=MGroupContent id=MGroupContent2><div class=MEntry><div class=MFile><a href="jstree-html-js.html">jstree.<wbr>html.js</a></div></div><div class=MEntry><div class=MFile><a href="jstree-json-js.html">jstree.<wbr>json.js</a></div></div><div class=MEntry><div class=MFile><a href="jstree-themes-js.html">jstree.<wbr>themes.js</a></div></div><div class=MEntry><div class=MFile><a href="jstree-ui-js.html">jstree.<wbr>ui.js</a></div></div><div class=MEntry><div class=MFile><a href="jstree-state-js.html">jstree.<wbr>state.js</a></div></div><div class=MEntry><div class=MFile><a href="jstree-contextmenu-js.html">jstree.<wbr>contextmenu.js</a></div></div><div class=MEntry><div class=MFile><a href="jstree-hotkeys-js.html">jstree.<wbr>hotkeys.js</a></div></div><div class=MEntry><div class=MFile><a href="jstree-sort-js.html">jstree.<wbr>sort.js</a></div></div><div class=MEntry><div class=MFile><a href="jstree-dnd-js.html">jstree.<wbr>dnd.js</a></div></div><div class=MEntry><div class=MFile><a href="jstree-unique-js.html">jstree.<wbr>unique.js</a></div></div><div class=MEntry><div class=MFile id=MSelected>jstree.<wbr>checkbox.js</div></div><div class=MEntry><div class=MFile><a href="jstree-xml-js.html">jstree.<wbr>xml.js</a></div></div><div class=MEntry><div class=MFile><a href="jstree-rules-js.html">jstree.<wbr>rules.js</a></div></div><div class=MEntry><div class=MFile><a href="jstree-search-js.html">jstree.<wbr>search.js</a></div></div></div></div></div><div class=MEntry><div class=MGroup><a href="javascript:ToggleMenu('MGroupContent3')">Index</a><div class=MGroupContent id=MGroupContent3><div class=MEntry><div class=MIndex><a href="../index/General.html">Everything</a></div></div><div class=MEntry><div class=MIndex><a href="../index/Events.html">Events</a></div></div><div class=MEntry><div class=MIndex><a href="../index/Files.html">Files</a></div></div><div class=MEntry><div class=MIndex><a href="../index/Functions.html">Functions</a></div></div><div class=MEntry><div class=MIndex><a href="../index/Variables.html">Variables</a></div></div><div class=MEntry><div class=MIndex><a href="../index/Classes.html">Classes</a></div></div></div></div></div><script type="text/javascript"><!--
Expand Down
2 changes: 1 addition & 1 deletion docs/files/jstree-contextmenu-js.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
</div><!--Content-->


<div id=Footer>Copyright &copy; 2010 Ivan Bozhanov&nbsp; &middot;&nbsp; Updated September 11th, 2012&nbsp; &middot;&nbsp; <a href="http://www.naturaldocs.org">Generated by Natural Docs</a></div><!--Footer-->
<div id=Footer>Copyright &copy; 2010 Ivan Bozhanov&nbsp; &middot;&nbsp; Updated October 1st, 2012&nbsp; &middot;&nbsp; <a href="http://www.naturaldocs.org">Generated by Natural Docs</a></div><!--Footer-->


<div id=Menu><div class=MTitle>jstree<div class=MSubTitle>jquery treeview plugin</div></div><div class=MEntry><div class=MGroup><a href="javascript:ToggleMenu('MGroupContent1')">Core</a><div class=MGroupContent id=MGroupContent1><div class=MEntry><div class=MFile><a href="jstree-js.html">jstree.js</a></div></div><div class=MEntry><div class=MFile><a href="vakata-js.html">vakata.js</a></div></div></div></div></div><div class=MEntry><div class=MGroup><a href="javascript:ToggleMenu('MGroupContent2')">Plugins</a><div class=MGroupContent id=MGroupContent2><div class=MEntry><div class=MFile><a href="jstree-html-js.html">jstree.<wbr>html.js</a></div></div><div class=MEntry><div class=MFile><a href="jstree-json-js.html">jstree.<wbr>json.js</a></div></div><div class=MEntry><div class=MFile><a href="jstree-themes-js.html">jstree.<wbr>themes.js</a></div></div><div class=MEntry><div class=MFile><a href="jstree-ui-js.html">jstree.<wbr>ui.js</a></div></div><div class=MEntry><div class=MFile><a href="jstree-state-js.html">jstree.<wbr>state.js</a></div></div><div class=MEntry><div class=MFile id=MSelected>jstree.<wbr>contextmenu.js</div></div><div class=MEntry><div class=MFile><a href="jstree-hotkeys-js.html">jstree.<wbr>hotkeys.js</a></div></div><div class=MEntry><div class=MFile><a href="jstree-sort-js.html">jstree.<wbr>sort.js</a></div></div><div class=MEntry><div class=MFile><a href="jstree-dnd-js.html">jstree.<wbr>dnd.js</a></div></div><div class=MEntry><div class=MFile><a href="jstree-unique-js.html">jstree.<wbr>unique.js</a></div></div><div class=MEntry><div class=MFile><a href="jstree-checkbox-js.html">jstree.<wbr>checkbox.js</a></div></div><div class=MEntry><div class=MFile><a href="jstree-xml-js.html">jstree.<wbr>xml.js</a></div></div><div class=MEntry><div class=MFile><a href="jstree-rules-js.html">jstree.<wbr>rules.js</a></div></div><div class=MEntry><div class=MFile><a href="jstree-search-js.html">jstree.<wbr>search.js</a></div></div></div></div></div><div class=MEntry><div class=MGroup><a href="javascript:ToggleMenu('MGroupContent3')">Index</a><div class=MGroupContent id=MGroupContent3><div class=MEntry><div class=MIndex><a href="../index/General.html">Everything</a></div></div><div class=MEntry><div class=MIndex><a href="../index/Events.html">Events</a></div></div><div class=MEntry><div class=MIndex><a href="../index/Files.html">Files</a></div></div><div class=MEntry><div class=MIndex><a href="../index/Functions.html">Functions</a></div></div><div class=MEntry><div class=MIndex><a href="../index/Variables.html">Variables</a></div></div><div class=MEntry><div class=MIndex><a href="../index/Classes.html">Classes</a></div></div></div></div></div><script type="text/javascript"><!--
Expand Down
2 changes: 1 addition & 1 deletion docs/files/jstree-dnd-js.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
</div><!--Content-->


<div id=Footer>Copyright &copy; 2010 Ivan Bozhanov&nbsp; &middot;&nbsp; Updated September 11th, 2012&nbsp; &middot;&nbsp; <a href="http://www.naturaldocs.org">Generated by Natural Docs</a></div><!--Footer-->
<div id=Footer>Copyright &copy; 2010 Ivan Bozhanov&nbsp; &middot;&nbsp; Updated October 1st, 2012&nbsp; &middot;&nbsp; <a href="http://www.naturaldocs.org">Generated by Natural Docs</a></div><!--Footer-->


<div id=Menu><div class=MTitle>jstree<div class=MSubTitle>jquery treeview plugin</div></div><div class=MEntry><div class=MGroup><a href="javascript:ToggleMenu('MGroupContent1')">Core</a><div class=MGroupContent id=MGroupContent1><div class=MEntry><div class=MFile><a href="jstree-js.html">jstree.js</a></div></div><div class=MEntry><div class=MFile><a href="vakata-js.html">vakata.js</a></div></div></div></div></div><div class=MEntry><div class=MGroup><a href="javascript:ToggleMenu('MGroupContent2')">Plugins</a><div class=MGroupContent id=MGroupContent2><div class=MEntry><div class=MFile><a href="jstree-html-js.html">jstree.<wbr>html.js</a></div></div><div class=MEntry><div class=MFile><a href="jstree-json-js.html">jstree.<wbr>json.js</a></div></div><div class=MEntry><div class=MFile><a href="jstree-themes-js.html">jstree.<wbr>themes.js</a></div></div><div class=MEntry><div class=MFile><a href="jstree-ui-js.html">jstree.<wbr>ui.js</a></div></div><div class=MEntry><div class=MFile><a href="jstree-state-js.html">jstree.<wbr>state.js</a></div></div><div class=MEntry><div class=MFile><a href="jstree-contextmenu-js.html">jstree.<wbr>contextmenu.js</a></div></div><div class=MEntry><div class=MFile><a href="jstree-hotkeys-js.html">jstree.<wbr>hotkeys.js</a></div></div><div class=MEntry><div class=MFile><a href="jstree-sort-js.html">jstree.<wbr>sort.js</a></div></div><div class=MEntry><div class=MFile id=MSelected>jstree.<wbr>dnd.js</div></div><div class=MEntry><div class=MFile><a href="jstree-unique-js.html">jstree.<wbr>unique.js</a></div></div><div class=MEntry><div class=MFile><a href="jstree-checkbox-js.html">jstree.<wbr>checkbox.js</a></div></div><div class=MEntry><div class=MFile><a href="jstree-xml-js.html">jstree.<wbr>xml.js</a></div></div><div class=MEntry><div class=MFile><a href="jstree-rules-js.html">jstree.<wbr>rules.js</a></div></div><div class=MEntry><div class=MFile><a href="jstree-search-js.html">jstree.<wbr>search.js</a></div></div></div></div></div><div class=MEntry><div class=MGroup><a href="javascript:ToggleMenu('MGroupContent3')">Index</a><div class=MGroupContent id=MGroupContent3><div class=MEntry><div class=MIndex><a href="../index/General.html">Everything</a></div></div><div class=MEntry><div class=MIndex><a href="../index/Events.html">Events</a></div></div><div class=MEntry><div class=MIndex><a href="../index/Files.html">Files</a></div></div><div class=MEntry><div class=MIndex><a href="../index/Functions.html">Functions</a></div></div><div class=MEntry><div class=MIndex><a href="../index/Variables.html">Variables</a></div></div><div class=MEntry><div class=MIndex><a href="../index/Classes.html">Classes</a></div></div></div></div></div><script type="text/javascript"><!--
Expand Down
2 changes: 1 addition & 1 deletion docs/files/jstree-hotkeys-js.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
</div><!--Content-->


<div id=Footer>Copyright &copy; 2010 Ivan Bozhanov&nbsp; &middot;&nbsp; Updated September 11th, 2012&nbsp; &middot;&nbsp; <a href="http://www.naturaldocs.org">Generated by Natural Docs</a></div><!--Footer-->
<div id=Footer>Copyright &copy; 2010 Ivan Bozhanov&nbsp; &middot;&nbsp; Updated October 1st, 2012&nbsp; &middot;&nbsp; <a href="http://www.naturaldocs.org">Generated by Natural Docs</a></div><!--Footer-->


<div id=Menu><div class=MTitle>jstree<div class=MSubTitle>jquery treeview plugin</div></div><div class=MEntry><div class=MGroup><a href="javascript:ToggleMenu('MGroupContent1')">Core</a><div class=MGroupContent id=MGroupContent1><div class=MEntry><div class=MFile><a href="jstree-js.html">jstree.js</a></div></div><div class=MEntry><div class=MFile><a href="vakata-js.html">vakata.js</a></div></div></div></div></div><div class=MEntry><div class=MGroup><a href="javascript:ToggleMenu('MGroupContent2')">Plugins</a><div class=MGroupContent id=MGroupContent2><div class=MEntry><div class=MFile><a href="jstree-html-js.html">jstree.<wbr>html.js</a></div></div><div class=MEntry><div class=MFile><a href="jstree-json-js.html">jstree.<wbr>json.js</a></div></div><div class=MEntry><div class=MFile><a href="jstree-themes-js.html">jstree.<wbr>themes.js</a></div></div><div class=MEntry><div class=MFile><a href="jstree-ui-js.html">jstree.<wbr>ui.js</a></div></div><div class=MEntry><div class=MFile><a href="jstree-state-js.html">jstree.<wbr>state.js</a></div></div><div class=MEntry><div class=MFile><a href="jstree-contextmenu-js.html">jstree.<wbr>contextmenu.js</a></div></div><div class=MEntry><div class=MFile id=MSelected>jstree.<wbr>hotkeys.js</div></div><div class=MEntry><div class=MFile><a href="jstree-sort-js.html">jstree.<wbr>sort.js</a></div></div><div class=MEntry><div class=MFile><a href="jstree-dnd-js.html">jstree.<wbr>dnd.js</a></div></div><div class=MEntry><div class=MFile><a href="jstree-unique-js.html">jstree.<wbr>unique.js</a></div></div><div class=MEntry><div class=MFile><a href="jstree-checkbox-js.html">jstree.<wbr>checkbox.js</a></div></div><div class=MEntry><div class=MFile><a href="jstree-xml-js.html">jstree.<wbr>xml.js</a></div></div><div class=MEntry><div class=MFile><a href="jstree-rules-js.html">jstree.<wbr>rules.js</a></div></div><div class=MEntry><div class=MFile><a href="jstree-search-js.html">jstree.<wbr>search.js</a></div></div></div></div></div><div class=MEntry><div class=MGroup><a href="javascript:ToggleMenu('MGroupContent3')">Index</a><div class=MGroupContent id=MGroupContent3><div class=MEntry><div class=MIndex><a href="../index/General.html">Everything</a></div></div><div class=MEntry><div class=MIndex><a href="../index/Events.html">Events</a></div></div><div class=MEntry><div class=MIndex><a href="../index/Files.html">Files</a></div></div><div class=MEntry><div class=MIndex><a href="../index/Functions.html">Functions</a></div></div><div class=MEntry><div class=MIndex><a href="../index/Variables.html">Variables</a></div></div><div class=MEntry><div class=MIndex><a href="../index/Classes.html">Classes</a></div></div></div></div></div><script type="text/javascript"><!--
Expand Down
2 changes: 1 addition & 1 deletion docs/files/jstree-html-js.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
</div><!--Content-->


<div id=Footer>Copyright &copy; 2010 Ivan Bozhanov&nbsp; &middot;&nbsp; Updated September 11th, 2012&nbsp; &middot;&nbsp; <a href="http://www.naturaldocs.org">Generated by Natural Docs</a></div><!--Footer-->
<div id=Footer>Copyright &copy; 2010 Ivan Bozhanov&nbsp; &middot;&nbsp; Updated October 1st, 2012&nbsp; &middot;&nbsp; <a href="http://www.naturaldocs.org">Generated by Natural Docs</a></div><!--Footer-->


<div id=Menu><div class=MTitle>jstree<div class=MSubTitle>jquery treeview plugin</div></div><div class=MEntry><div class=MGroup><a href="javascript:ToggleMenu('MGroupContent1')">Core</a><div class=MGroupContent id=MGroupContent1><div class=MEntry><div class=MFile><a href="jstree-js.html">jstree.js</a></div></div><div class=MEntry><div class=MFile><a href="vakata-js.html">vakata.js</a></div></div></div></div></div><div class=MEntry><div class=MGroup><a href="javascript:ToggleMenu('MGroupContent2')">Plugins</a><div class=MGroupContent id=MGroupContent2><div class=MEntry><div class=MFile id=MSelected>jstree.<wbr>html.js</div></div><div class=MEntry><div class=MFile><a href="jstree-json-js.html">jstree.<wbr>json.js</a></div></div><div class=MEntry><div class=MFile><a href="jstree-themes-js.html">jstree.<wbr>themes.js</a></div></div><div class=MEntry><div class=MFile><a href="jstree-ui-js.html">jstree.<wbr>ui.js</a></div></div><div class=MEntry><div class=MFile><a href="jstree-state-js.html">jstree.<wbr>state.js</a></div></div><div class=MEntry><div class=MFile><a href="jstree-contextmenu-js.html">jstree.<wbr>contextmenu.js</a></div></div><div class=MEntry><div class=MFile><a href="jstree-hotkeys-js.html">jstree.<wbr>hotkeys.js</a></div></div><div class=MEntry><div class=MFile><a href="jstree-sort-js.html">jstree.<wbr>sort.js</a></div></div><div class=MEntry><div class=MFile><a href="jstree-dnd-js.html">jstree.<wbr>dnd.js</a></div></div><div class=MEntry><div class=MFile><a href="jstree-unique-js.html">jstree.<wbr>unique.js</a></div></div><div class=MEntry><div class=MFile><a href="jstree-checkbox-js.html">jstree.<wbr>checkbox.js</a></div></div><div class=MEntry><div class=MFile><a href="jstree-xml-js.html">jstree.<wbr>xml.js</a></div></div><div class=MEntry><div class=MFile><a href="jstree-rules-js.html">jstree.<wbr>rules.js</a></div></div><div class=MEntry><div class=MFile><a href="jstree-search-js.html">jstree.<wbr>search.js</a></div></div></div></div></div><div class=MEntry><div class=MGroup><a href="javascript:ToggleMenu('MGroupContent3')">Index</a><div class=MGroupContent id=MGroupContent3><div class=MEntry><div class=MIndex><a href="../index/General.html">Everything</a></div></div><div class=MEntry><div class=MIndex><a href="../index/Events.html">Events</a></div></div><div class=MEntry><div class=MIndex><a href="../index/Files.html">Files</a></div></div><div class=MEntry><div class=MIndex><a href="../index/Functions.html">Functions</a></div></div><div class=MEntry><div class=MIndex><a href="../index/Variables.html">Variables</a></div></div><div class=MEntry><div class=MIndex><a href="../index/Classes.html">Classes</a></div></div></div></div></div><script type="text/javascript"><!--
Expand Down
Loading

0 comments on commit 1ed13a3

Please sign in to comment.