From 804a1f7a594d5b8eaf355b4a8ddae6dd93da13dc Mon Sep 17 00:00:00 2001
From: maxazan
Date: Mon, 16 Dec 2013 16:54:21 +0200
Subject: [PATCH 01/12] fix: "-" symbol in id
---
CHANGELOG.txt | 3 +++
js/jquery.treegrid.js | 12 ++++++------
treegrid.jquery.json | 2 +-
3 files changed, 10 insertions(+), 7 deletions(-)
diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index ac6cdb6..e893f91 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -1,3 +1,6 @@
+== 0.1.8 - 16 December 2013
+* Fix support alphanumeric id (you can use "-" symbol in id)
+
== 0.1.7 - 15 November 2013
* Fix isLast method. https://github.com/maxazan/jquery-treegrid/issues/4
* Add isFirst method
diff --git a/js/jquery.treegrid.js b/js/jquery.treegrid.js
index e6d3c88..b2696d8 100644
--- a/js/jquery.treegrid.js
+++ b/js/jquery.treegrid.js
@@ -1,5 +1,5 @@
/*
- * jQuery treegrid Plugin 0.1.7
+ * jQuery treegrid Plugin 0.1.8
* https://github.com/maxazan/jquery-treegrid
*
* Copyright 2013, Pomazan Max
@@ -516,14 +516,14 @@
return $(this).find('.treegrid-expander');
},
getNodeId: function() {
- var template = /treegrid-(\w+)/;
+ var template = /treegrid-([A-Za-z0-9_-]+)/;
if (template.test($(this).attr('class'))) {
return template.exec($(this).attr('class'))[1];
}
return null;
},
getParentNodeId: function() {
- var template = /treegrid-parent-(\w+)/;
+ var template = /treegrid-parent-([A-Za-z0-9_-]+)/;
if (template.test($(this).attr('class'))) {
return template.exec($(this).attr('class'))[1];
}
@@ -543,8 +543,8 @@
getRootNodes: function(treegridContainer) {
var result = $.grep(treegridContainer.find('tr'), function(element) {
var classNames = $(element).attr('class');
- var templateClass = /treegrid-(\w+)/;
- var templateParentClass = /treegrid-parent-(\w+)/;
+ var templateClass = /treegrid-([A-Za-z0-9_-]+)/;
+ var templateParentClass = /treegrid-parent-([A-Za-z0-9_-]+)/;
return templateClass.test(classNames) && !templateParentClass.test(classNames);
});
return $(result);
@@ -552,7 +552,7 @@
getAllNodes: function(treegridContainer) {
var result = $.grep(treegridContainer.find('tr'), function(element) {
var classNames = $(element).attr('class');
- var templateClass = /treegrid-(\w+)/;
+ var templateClass = /treegrid-([A-Za-z0-9_-]+)/;
return templateClass.test(classNames);
});
return $(result);
diff --git a/treegrid.jquery.json b/treegrid.jquery.json
index f2c905a..7a67ad1 100644
--- a/treegrid.jquery.json
+++ b/treegrid.jquery.json
@@ -11,7 +11,7 @@
"tree",
"ui"
],
- "version": "0.1.7",
+ "version": "0.1.8",
"title": "TreeGrid plugin for jQuery",
"author": {
"name": "Pomazan Max"
From 66fab1915744d0015de0149f2d9780adfb356fe1 Mon Sep 17 00:00:00 2001
From: maxazan
Date: Wed, 18 Dec 2013 13:55:59 +0200
Subject: [PATCH 02/12] fix table in table bug
---
CHANGELOG.txt | 3 +++
js/jquery.treegrid.js | 6 +++---
test.html | 13 ++++++++++++-
treegrid.jquery.json | 2 +-
4 files changed, 19 insertions(+), 5 deletions(-)
diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index e893f91..b768dcd 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -1,3 +1,6 @@
+== 0.1.9 - 18 December 2013
+* Fix table in table bug (thanks liuspcn)
+
== 0.1.8 - 16 December 2013
* Fix support alphanumeric id (you can use "-" symbol in id)
diff --git a/js/jquery.treegrid.js b/js/jquery.treegrid.js
index b2696d8..f7902e0 100644
--- a/js/jquery.treegrid.js
+++ b/js/jquery.treegrid.js
@@ -1,5 +1,5 @@
/*
- * jQuery treegrid Plugin 0.1.8
+ * jQuery treegrid Plugin 0.1.9
* https://github.com/maxazan/jquery-treegrid
*
* Copyright 2013, Pomazan Max
@@ -51,7 +51,7 @@
expander.remove();
}
$(tpl).prependTo(cell).click(function() {
- $($(this).parents('tr')).treegrid('toggle');
+ $($(this).closest('tr')).treegrid('toggle');
});
return $this;
},
@@ -538,7 +538,7 @@
return treegridContainer.find('tr.' + templateClass);
},
getTreeGridContainer: function() {
- return $(this).parents('table');
+ return $(this).closest('table');
},
getRootNodes: function(treegridContainer) {
var result = $.grep(treegridContainer.find('tr'), function(element) {
diff --git a/test.html b/test.html
index 2f82db2..f80b4a6 100644
--- a/test.html
+++ b/test.html
@@ -11,6 +11,9 @@
+
+
| 1 | 2 |
@@ -135,7 +142,10 @@
2 | Simple text of ... |
-
+
+
+
+
@@ -144,6 +154,7 @@
$("#tree-1").treegrid({initialState: 'collapsed'});
$("#tree-2").treegrid({treeColumn:1, initialState: 'expanded', 'saveState': true, 'saveStateName': saveStateName});
$("#tree-3").treegrid({initialState: 'collapsed'});
+ $("#tree-4").treegrid();