Skip to content

Commit 66fab19

Browse files
committed
fix table in table bug
1 parent 804a1f7 commit 66fab19

File tree

4 files changed

+19
-5
lines changed

4 files changed

+19
-5
lines changed

CHANGELOG.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
== 0.1.9 - 18 December 2013
2+
* Fix table in table bug (thanks liuspcn)
3+
14
== 0.1.8 - 16 December 2013
25
* Fix support alphanumeric id (you can use "-" symbol in id)
36

js/jquery.treegrid.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* jQuery treegrid Plugin 0.1.8
2+
* jQuery treegrid Plugin 0.1.9
33
* https://github.com/maxazan/jquery-treegrid
44
*
55
* Copyright 2013, Pomazan Max
@@ -51,7 +51,7 @@
5151
expander.remove();
5252
}
5353
$(tpl).prependTo(cell).click(function() {
54-
$($(this).parents('tr')).treegrid('toggle');
54+
$($(this).closest('tr')).treegrid('toggle');
5555
});
5656
return $this;
5757
},
@@ -538,7 +538,7 @@
538538
return treegridContainer.find('tr.' + templateClass);
539539
},
540540
getTreeGridContainer: function() {
541-
return $(this).parents('table');
541+
return $(this).closest('table');
542542
},
543543
getRootNodes: function(treegridContainer) {
544544
var result = $.grep(treegridContainer.find('tr'), function(element) {

test.html

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,9 @@
1111
<div id="qunit-fixture"></div>
1212
<script src="tests/qunit-1.12.0.js"></script>
1313
<script src="tests/tests.js"></script>
14+
<table>
15+
<tr>
16+
<td>
1417
<table id='tree-1' border="1" cellpadding="0" cellspacing="0">
1518
<tr id="tree-head-1">
1619
<th>1</th><th>2</th>
@@ -57,6 +60,9 @@
5760
</tr>
5861

5962
</table>
63+
</td>
64+
</tr>
65+
</table>
6066
<hr>
6167
<table id='tree-2' border="1" cellpadding="0" cellspacing="0">
6268
<tr>
@@ -97,6 +103,7 @@
97103
</tr>
98104
</table>
99105
<hr>
106+
100107
<table id='tree-3' border="1" cellpadding="0" cellspacing="0">
101108
<tr>
102109
<th>1</th><th>2</th>
@@ -135,7 +142,10 @@
135142
<td>2</td><td>Simple text of ...</td>
136143
</tr>
137144
</table>
138-
145+
146+
<hr>
147+
148+
139149
<script src="http://ajax.googleapis.com/ajax/libs/jquery/1.10.2/jquery.min.js"></script>
140150
<script src="js/jquery.treegrid.js"></script>
141151
<script src="js/jquery.cookie.js"></script>
@@ -144,6 +154,7 @@
144154
$("#tree-1").treegrid({initialState: 'collapsed'});
145155
$("#tree-2").treegrid({treeColumn:1, initialState: 'expanded', 'saveState': true, 'saveStateName': saveStateName});
146156
$("#tree-3").treegrid({initialState: 'collapsed'});
157+
$("#tree-4").treegrid();
147158
</script>
148159
</body>
149160
</html>

treegrid.jquery.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
"tree",
1212
"ui"
1313
],
14-
"version": "0.1.8",
14+
"version": "0.1.9",
1515
"title": "TreeGrid plugin for jQuery",
1616
"author": {
1717
"name": "Pomazan Max"

0 commit comments

Comments
 (0)