fixed error when rules plugin is included but not used

tahajahangir · Jun 1, 2012 · 37a247a · 37a247a
1 parent e6c2762
commit 37a247a
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/dist/jstree.js b/dist/jstree.js
@@ -4859,9 +4859,9 @@ Sorts items alphabetically (or using any other function)
 					obj = obj.data('jstree');
 					return {
 						'type'				: false,
-						'max_depth'			: obj.max_depth || -1,
-						'max_children'		: obj.max_children || -1,
-						'valid_children'	: obj.valid_children || -1
+						'max_depth'			: obj && obj.max_depth ? obj.max_depth : -1,
+						'max_children'		: obj && obj.max_children ? obj.max_children : -1,
+						'valid_children'	: obj && obj.valid_children ? obj.valid_children  : -1
 					};
 				}
 				if(!obj || !obj.length) { return false; }

diff --git a/dist/jstree.min.js b/dist/jstree.min.js
diff --git a/src/jstree.rules.js b/src/jstree.rules.js
@@ -22,9 +22,9 @@ Sorts items alphabetically (or using any other function)
 					obj = obj.data('jstree');
 					return {
 						'type'				: false,
-						'max_depth'			: obj.max_depth || -1,
-						'max_children'		: obj.max_children || -1,
-						'valid_children'	: obj.valid_children || -1
+						'max_depth'			: obj && obj.max_depth ? obj.max_depth : -1,
+						'max_children'		: obj && obj.max_children ? obj.max_children : -1,
+						'valid_children'	: obj && obj.valid_children ? obj.valid_children  : -1
 					};
 				}
 				if(!obj || !obj.length) { return false; }